[GEN-2222]: add instrumentation-rule for code attributes

frontend/graph/schema.graphqls

@@ -122,6 +122,7 @@ type InstrumentationRule {
   workloads: [PodWorkload!]
   instrumentationLibraries: [InstrumentationLibraryGlobalId!]
   payloadCollection: PayloadCollection
+  codeAttributes: CodeAttributes
 }
 
 input InstrumentationRuleInput {
@@ -131,6 +132,7 @@ input InstrumentationRuleInput {
   workloads: [PodWorkloadInput!]
   instrumentationLibraries: [InstrumentationLibraryGlobalIdInput!]
   payloadCollection: PayloadCollectionInput
+  codeAttributes: CodeAttributesInput
 }
 
 type InstrumentationLibraryGlobalId {
@@ -191,6 +193,24 @@ input MessagingPayloadCollectionInput {
   dropPartialPayloads: Boolean
 }
 
+type CodeAttributes {
+  column: Boolean
+  filePath: Boolean
+  function: Boolean
+  lineNumber: Boolean
+  namespace: Boolean
+  stacktrace: Boolean
+}
+
+input CodeAttributesInput {
+  column: Boolean
+  filePath: Boolean
+  function: Boolean
+  lineNumber: Boolean
+  namespace: Boolean
+  stacktrace: Boolean
+}
+
 type ApiToken {
   token: String!
   name: String!

frontend/services/instrumentationrule.go

@@ -41,6 +41,7 @@ func ListInstrumentationRules(ctx context.Context) ([]*model.InstrumentationRule
 			Workloads:                convertWorkloads(rule.Spec.Workloads),
 			InstrumentationLibraries: convertInstrumentationLibraries(rule.Spec.InstrumentationLibraries),
 			PayloadCollection:        convertPayloadCollection(rule.Spec.PayloadCollection),
+			CodeAttributes:           (*model.CodeAttributes)(rule.Spec.CodeAttributes),
 		})
 	}
 	return gqlRules, nil
@@ -111,15 +112,12 @@ func UpdateInstrumentationRule(ctx context.Context, id string, input model.Instr
 		if input.PayloadCollection.HTTPRequest != nil {
 			payloadCollection.HttpRequest = &instrumentationrules.HttpPayloadCollection{}
 		}
-
 		if input.PayloadCollection.HTTPResponse != nil {
 			payloadCollection.HttpResponse = &instrumentationrules.HttpPayloadCollection{}
 		}
-
 		if input.PayloadCollection.DbQuery != nil {
 			payloadCollection.DbQuery = &instrumentationrules.DbQueryPayloadCollection{}
 		}
-
 		if input.PayloadCollection.Messaging != nil {
 			payloadCollection.Messaging = &instrumentationrules.MessagingPayloadCollection{}
 		}
@@ -129,6 +127,34 @@ func UpdateInstrumentationRule(ctx context.Context, id string, input model.Instr
 		existingRule.Spec.PayloadCollection = nil
 	}
 
+	var codeAttributes *instrumentationrules.CodeAttributes
+	if input.CodeAttributes != nil {
+		codeAttributes = &instrumentationrules.CodeAttributes{}
+
+		if input.CodeAttributes.Column != nil {
+			codeAttributes.Column = input.CodeAttributes.Column
+		}
+		if input.CodeAttributes.FilePath != nil {
+			codeAttributes.FilePath = input.CodeAttributes.FilePath
+		}
+		if input.CodeAttributes.Function != nil {
+			codeAttributes.Function = input.CodeAttributes.Function
+		}
+		if input.CodeAttributes.LineNumber != nil {
+			codeAttributes.LineNumber = input.CodeAttributes.LineNumber
+		}
+		if input.CodeAttributes.Namespace != nil {
+			codeAttributes.Namespace = input.CodeAttributes.Namespace
+		}
+		if input.CodeAttributes.Stacktrace != nil {
+			codeAttributes.Stacktrace = input.CodeAttributes.Stacktrace
+		}
+
+		existingRule.Spec.CodeAttributes = codeAttributes
+	} else {
+		existingRule.Spec.CodeAttributes = nil
+	}
+
 	// Update rule in Kubernetes
 	updatedRule, err := kube.DefaultClient.OdigosClient.InstrumentationRules(ns).Update(ctx, existingRule, metav1.UpdateOptions{})
 	if err != nil {
@@ -143,6 +169,7 @@ func UpdateInstrumentationRule(ctx context.Context, id string, input model.Instr
 		Workloads:                convertWorkloads(updatedRule.Spec.Workloads),
 		InstrumentationLibraries: convertInstrumentationLibraries(updatedRule.Spec.InstrumentationLibraries),
 		PayloadCollection:        convertPayloadCollection(updatedRule.Spec.PayloadCollection),
+		CodeAttributes:           (*model.CodeAttributes)(updatedRule.Spec.CodeAttributes),
 	}, nil
 }
 
@@ -196,20 +223,41 @@ func CreateInstrumentationRule(ctx context.Context, input model.InstrumentationR
 		if input.PayloadCollection.HTTPRequest != nil {
 			payloadCollection.HttpRequest = &instrumentationrules.HttpPayloadCollection{}
 		}
-
 		if input.PayloadCollection.HTTPResponse != nil {
 			payloadCollection.HttpResponse = &instrumentationrules.HttpPayloadCollection{}
 		}
-
 		if input.PayloadCollection.DbQuery != nil {
 			payloadCollection.DbQuery = &instrumentationrules.DbQueryPayloadCollection{}
 		}
-
 		if input.PayloadCollection.Messaging != nil {
 			payloadCollection.Messaging = &instrumentationrules.MessagingPayloadCollection{}
 		}
 	}
 
+	var codeAttributes *instrumentationrules.CodeAttributes
+	if input.CodeAttributes != nil {
+		codeAttributes = &instrumentationrules.CodeAttributes{}
+
+		if input.CodeAttributes.Column != nil {
+			codeAttributes.Column = input.CodeAttributes.Column
+		}
+		if input.CodeAttributes.FilePath != nil {
+			codeAttributes.FilePath = input.CodeAttributes.FilePath
+		}
+		if input.CodeAttributes.Function != nil {
+			codeAttributes.Function = input.CodeAttributes.Function
+		}
+		if input.CodeAttributes.LineNumber != nil {
+			codeAttributes.LineNumber = input.CodeAttributes.LineNumber
+		}
+		if input.CodeAttributes.Namespace != nil {
+			codeAttributes.Namespace = input.CodeAttributes.Namespace
+		}
+		if input.CodeAttributes.Stacktrace != nil {
+			codeAttributes.Stacktrace = input.CodeAttributes.Stacktrace
+		}
+	}
+
 	// Define the new rule spec based on the input
 	newRule := &v1alpha1.InstrumentationRule{
 		ObjectMeta: metav1.ObjectMeta{
@@ -222,6 +270,7 @@ func CreateInstrumentationRule(ctx context.Context, input model.InstrumentationR
 			Workloads:                workloads,
 			InstrumentationLibraries: instrumentationLibraries,
 			PayloadCollection:        payloadCollection,
+			CodeAttributes:           codeAttributes,
 		},
 	}
 

frontend/webapp/assets/icons/rules/code-attributes-icon.tsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import { SVG } from '@/assets';
+import theme from '@/styles/theme';
+
+export const CodeAttributesIcon: SVG = ({ size = 16, fill = theme.text.info, rotate = 0, onClick }) => {
+  return (
+    <svg width={size} height={size} viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg' fill='none' style={{ transform: `rotate(${rotate}deg)` }} onClick={onClick}>
+      <path
+        stroke={fill}
+        strokeWidth='1.5'
+        strokeLinecap='round'
+        strokeLinejoin='round'
+        d='M8 4C6.34315 4 5 5.19391 5 6.66667V9.33333C5 10.8061 3.65685 12 2 12C3.65685 12 5 13.1939 5 14.6667V17.3333C5 18.8061 6.34315 20 8 20M16 4C17.6569 4 19 5.19391 19 6.66667V9.33333C19 10.8061 20.3431 12 22 12C20.3431 12 19 13.1939 19 14.6667V17.3333C19 18.8061 17.6569 20 16 20M12.001 12H12M15.001 12H15M9.001 12H9'
+      />
+    </svg>
+  );
+};

frontend/webapp/assets/icons/rules/index.ts

@@ -1 +1,2 @@
+export * from './code-attributes-icon';
 export * from './payload-collection-icon';

frontend/webapp/containers/main/actions/action-modal/index.tsx

@@ -60,7 +60,7 @@ export const ActionModal: React.FC<Props> = ({ isOpen, onClose }) => {
     >
       <ModalBody>
         <SectionTitle title='Select Action' description='Select an action to modify telemetry data before it`s sent to destinations. Choose an action type and configure its details.' />
-        <AutocompleteInput options={ACTION_OPTIONS} selectedOption={selectedItem} onOptionSelect={handleSelect} style={{ marginTop: '24px' }} autoFocus />
+        <AutocompleteInput options={ACTION_OPTIONS} selectedOption={selectedItem} onOptionSelect={handleSelect} style={{ marginTop: '24px' }} autoFocus={!selectedItem?.type} />
 
         {!!selectedItem?.type ? (
           <div>

frontend/webapp/containers/main/instrumentation-rules/rule-drawer/build-drawer-item.ts

@@ -1,8 +1,8 @@
 import { deriveTypeFromRule } from '@/utils';
-import { type InstrumentationRuleSpec, type InstrumentationRuleInput, PayloadCollectionType } from '@/types';
+import { type InstrumentationRuleSpec, type InstrumentationRuleInput, PayloadCollectionType, CodeAttributesType } from '@/types';
 
 const buildDrawerItem = (id: string, formData: InstrumentationRuleInput, drawerItem: InstrumentationRuleSpec): InstrumentationRuleSpec => {
-  const { ruleName, notes, disabled, payloadCollection } = formData;
+  const { ruleName, notes, disabled, payloadCollection, codeAttributes } = formData;
   const { mutable, profileName, workloads, instrumentationLibraries } = drawerItem;
 
   return {
@@ -13,14 +13,22 @@ const buildDrawerItem = (id: string, formData: InstrumentationRuleInput, drawerI
     disabled,
     mutable,
     profileName,
-    payloadCollection: {
-      [PayloadCollectionType.HTTP_REQUEST]: payloadCollection[PayloadCollectionType.HTTP_REQUEST] || undefined,
-      [PayloadCollectionType.HTTP_RESPONSE]: payloadCollection[PayloadCollectionType.HTTP_RESPONSE] || undefined,
-      [PayloadCollectionType.DB_QUERY]: payloadCollection[PayloadCollectionType.DB_QUERY] || undefined,
-      [PayloadCollectionType.MESSAGING]: payloadCollection[PayloadCollectionType.MESSAGING] || undefined,
-    },
     workloads,
     instrumentationLibraries,
+    payloadCollection: {
+      [PayloadCollectionType.HTTP_REQUEST]: payloadCollection?.[PayloadCollectionType.HTTP_REQUEST] || undefined,
+      [PayloadCollectionType.HTTP_RESPONSE]: payloadCollection?.[PayloadCollectionType.HTTP_RESPONSE] || undefined,
+      [PayloadCollectionType.DB_QUERY]: payloadCollection?.[PayloadCollectionType.DB_QUERY] || undefined,
+      [PayloadCollectionType.MESSAGING]: payloadCollection?.[PayloadCollectionType.MESSAGING] || undefined,
+    },
+    codeAttributes: {
+      [CodeAttributesType.COLUMN]: codeAttributes?.[CodeAttributesType.COLUMN] || undefined,
+      [CodeAttributesType.FILE_PATH]: codeAttributes?.[CodeAttributesType.FILE_PATH] || undefined,
+      [CodeAttributesType.FUNCTION]: codeAttributes?.[CodeAttributesType.FUNCTION] || undefined,
+      [CodeAttributesType.LINE_NUMBER]: codeAttributes?.[CodeAttributesType.LINE_NUMBER] || undefined,
+      [CodeAttributesType.NAMESPACE]: codeAttributes?.[CodeAttributesType.NAMESPACE] || undefined,
+      [CodeAttributesType.STACKTRACE]: codeAttributes?.[CodeAttributesType.STACKTRACE] || undefined,
+    },
   };
 };