removed lambda function name/arn attributes and tests

Author: liustve

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-metric-attribute-generator.ts

@@ -401,12 +401,6 @@ export class AwsMetricAttributeGenerator implements MetricAttributeGenerator {
         remoteResourceType = NORMALIZED_STEPFUNCTIONS_SERVICE_NAME + '::Activity';
         remoteResourceIdentifier = AwsMetricAttributeGenerator.escapeDelimiters(this.simplifyARNAttribute(activityArn));
         cloudFormationIdentifier = AwsMetricAttributeGenerator.escapeDelimiters(activityArn);
-      } else if (AwsSpanProcessingUtil.isKeyPresent(span, AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME)) {
-        remoteResourceType = NORMALIZED_LAMBDA_SERVICE_NAME + '::Function';
-        remoteResourceIdentifier = AwsMetricAttributeGenerator.escapeDelimiters(
-          span.attributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME]
-        );
-        cloudFormationIdentifier = span.attributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN];
       } else if (AwsSpanProcessingUtil.isKeyPresent(span, AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_RESOURCE_MAPPING_ID)) {
         remoteResourceType = NORMALIZED_LAMBDA_SERVICE_NAME + '::EventSourceMapping';
         remoteResourceIdentifier = AwsMetricAttributeGenerator.escapeDelimiters(

aws-distro-opentelemetry-node-autoinstrumentation/test/aws-metric-attribute-generator.test.ts

@@ -774,17 +774,7 @@ describe('AwsMetricAttributeGeneratorTest', () => {
     validateRemoteResourceAttributes('AWS::SecretsManager::Secret', 'testSecret');
     mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_SECRETSMANAGER_SECRET_ARN, undefined);
 
-    // Validate behaviour of AWS_LAMBDA_FUNCTION_NAME, AWS_LAMBDA_FUNCTION_ARN, and AWS_LAMBDA_RESOURCE_MAPPING_ID attributes then remove them.
-    mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME, 'aws_lambda_function_name');
-    mockAttribute(
-      AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN,
-      'arn:aws:lambda:us-east-1:123456789012:function:aws_lambda_function_name'
-    );
-
-    validateRemoteResourceAttributes('AWS::Lambda::Function', 'aws_lambda_function_name');
-    mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME, undefined);
-    mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN, undefined);
-
+    // Validate behaviour of AWS_LAMBDA_RESOURCE_MAPPING_ID attribute then remove it.
     mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_RESOURCE_MAPPING_ID, 'aws_lambda_resource_mapping_id');
     validateRemoteResourceAttributes('AWS::Lambda::EventSourceMapping', 'aws_lambda_resource_mapping_id');
     mockAttribute(AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_RESOURCE_MAPPING_ID, undefined);

aws-distro-opentelemetry-node-autoinstrumentation/test/patches/aws/services/lamba.test.ts

@@ -30,43 +30,7 @@ describe('Lambda', () => {
       },
     });
   });
-
-  describe('GetFunction', () => {
-    {
-      it('span has lambda functionName and function ARN in its attributes', async () => {
-        const funcName = 'testFunction';
-        const arn = 'arn:aws:lambda:us-east-1:123456789012:function:testFunction';
-
-        nock(`https://lambda.${region}.amazonaws.com/`)
-          .get(/.*/)
-          .reply(200, {
-            Configuration: {
-              FunctionArn: arn,
-            },
-          });
-
-        await lambda
-          .getFunction({
-            FunctionName: funcName,
-          })
-          .catch((err: any) => {});
-
-        const testSpans: ReadableSpan[] = getTestSpans();
-        const getFunctionNameSpans: ReadableSpan[] = testSpans.filter((s: ReadableSpan) => {
-          return s.name === 'Lambda.GetFunction';
-        });
-
-        expect(getFunctionNameSpans.length).toBe(1);
-
-        const functionAttributeSpan = getFunctionNameSpans[0];
-
-        expect(functionAttributeSpan.attributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME]).toBe(funcName);
-        expect(functionAttributeSpan.attributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN]).toBe(arn);
-        expect(functionAttributeSpan.kind).toBe(SpanKind.CLIENT);
-      });
-    }
-  });
-
+  
   describe('GetEventSourceMapping', () => {
     it('span has eventSourceMapping attribute in its attributes', async () => {
       const uuid = '14e0db71-abcd-4eb5-b481-8945cf9d10c2';

aws-distro-opentelemetry-node-autoinstrumentation/test/patches/instrumentation-patch.test.ts

@@ -27,8 +27,6 @@ import { SinonStub } from 'sinon';
 const _STREAM_NAME: string = 'streamName';
 const _BUCKET_NAME: string = 'bucketName';
 const _QUEUE_NAME: string = 'queueName';
-const _FUNCTION_NAME: string = 'testFunction';
-const _FUNCTION_ARN: string = `arn:aws:lambda:us-east-1:123456789012:function:${_FUNCTION_NAME}`;
 const _ACTIVITY_ARN: string = 'arn:aws:states:us-east-1:007003123456789012:activity:testActivity';
 const _STATE_MACHINE_ARN: string = 'arn:aws:states:us-east-1:007003123456789012:stateMachine:testStateMachine';
 const _SECRETS_ARN: string = 'arn:aws:secretsmanager:us-east-1:123456789123:secret:testId123456';
@@ -66,7 +64,6 @@ describe('InstrumentationPatchTest', () => {
     // From patching but shouldn't be applied
     expect(services.get('SNS').requestPreSpanHook).toBeTruthy();
     expect(services.get('Lambda').requestPreSpanHook).toBeTruthy();
-    expect(services.get('Lambda').responseHook).toBeTruthy();
     expect(services.get('SecretsManager')).toBeFalsy();
     expect(services.get('SFN')).toBeFalsy();
     expect(services.has('S3')).toBeFalsy();
@@ -94,7 +91,6 @@ describe('InstrumentationPatchTest', () => {
     // From patching
     expect(services.get('SNS').requestPreSpanHook).toBeTruthy();
     expect(services.get('Lambda').requestPreSpanHook).toBeTruthy();
-    expect(services.get('Lambda').responseHook).toBeTruthy();
     expect(services.has('SecretsManager')).toBeTruthy();
     expect(services.has('SFN')).toBeTruthy();
     expect(services.has('S3')).toBeTruthy();
@@ -150,8 +146,6 @@ describe('InstrumentationPatchTest', () => {
     expect(() => doExtractLambdaAttributes(services)).not.toThrow();
 
     const lambdaAttributes: Attributes = doExtractLambdaAttributes(services);
-    expect(lambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME]).toBeUndefined();
-    expect(lambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN]).toBeUndefined();
     expect(lambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_RESOURCE_MAPPING_ID]).toBeUndefined();
   });
 
@@ -215,13 +209,7 @@ describe('InstrumentationPatchTest', () => {
     const patchedAwsSdkInstrumentation: AwsInstrumentation = extractAwsSdkInstrumentation(PATCHED_INSTRUMENTATIONS);
     const services: Map<string, any> = extractServicesFromAwsSdkInstrumentation(patchedAwsSdkInstrumentation);
     const requestLambdaAttributes: Attributes = doExtractLambdaAttributes(services);
-    expect(requestLambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN]).toBeUndefined();
-    expect(requestLambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_NAME]).toEqual(_FUNCTION_NAME);
     expect(requestLambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_RESOURCE_MAPPING_ID]).toEqual(_UUID);
-
-    const responseLambdaAttributes = doResponseHookLambda(services);
-
-    expect(responseLambdaAttributes[AWS_ATTRIBUTE_KEYS.AWS_LAMBDA_FUNCTION_ARN]).toEqual(_FUNCTION_ARN);
   });
 
   it('SFN with patching', () => {
@@ -415,7 +403,6 @@ describe('InstrumentationPatchTest', () => {
       serviceName: serviceName,
       commandName: 'mockCommandName',
       commandInput: {
-        FunctionName: _FUNCTION_ARN,
         UUID: _UUID,
       },
     };
@@ -479,23 +466,6 @@ describe('InstrumentationPatchTest', () => {
     return requestMetadata.spanAttributes || {};
   }
 
-  function doResponseHookLambda(services: Map<string, ServiceExtension>): Attributes {
-    const results: Partial<NormalizedResponse> = {
-      data: {
-        Configuration: {
-          FunctionArn: _FUNCTION_ARN,
-        },
-      },
-      request: {
-        commandInput: {},
-        commandName: 'dummy_operation',
-        serviceName: 'Lambda',
-      },
-    };
-
-    return doResponseHook(services, 'Lambda', results as NormalizedResponse);
-  }
-
   function doResponseHookSecretsManager(services: Map<string, ServiceExtension>): Attributes {
     const results: Partial<NormalizedResponse> = {
       data: {