chore(aws-lambda): migrate SEMATTRS_* to ATTR_*

Author: trivikr

plugins/node/opentelemetry-instrumentation-aws-lambda/src/instrumentation.ts

@@ -40,9 +40,13 @@ import {
 } from '@opentelemetry/api';
 import {
   SEMATTRS_FAAS_EXECUTION,
-  SEMRESATTRS_CLOUD_ACCOUNT_ID,
   SEMRESATTRS_FAAS_ID,
 } from '@opentelemetry/semantic-conventions';
+import {
+  ATTR_FAAS_INVOCATION_ID,
+  ATTR_CLOUD_ACCOUNT_ID,
+  ATTR_CLOUD_RESOURCE_ID,
+} from '@opentelemetry/semantic-conventions/incubating';
 import { ATTR_FAAS_COLDSTART } from '@opentelemetry/semantic-conventions/incubating';
 
 import {
@@ -238,11 +242,12 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
           kind: SpanKind.SERVER,
           attributes: {
             [SEMATTRS_FAAS_EXECUTION]: context.awsRequestId,
+            [ATTR_FAAS_INVOCATION_ID]: context.awsRequestId,
             [SEMRESATTRS_FAAS_ID]: context.invokedFunctionArn,
-            [SEMRESATTRS_CLOUD_ACCOUNT_ID]:
-              AwsLambdaInstrumentation._extractAccountId(
-                context.invokedFunctionArn
-              ),
+            [ATTR_CLOUD_RESOURCE_ID]: context.invokedFunctionArn,
+            [ATTR_CLOUD_ACCOUNT_ID]: AwsLambdaInstrumentation._extractAccountId(
+              context.invokedFunctionArn
+            ),
             [ATTR_FAAS_COLDSTART]: requestIsColdStart,
           },
         },

plugins/node/opentelemetry-instrumentation-aws-lambda/test/integrations/lambda-handler.test.ts

@@ -38,6 +38,7 @@ import {
   SEMATTRS_FAAS_EXECUTION,
   SEMRESATTRS_FAAS_NAME,
 } from '@opentelemetry/semantic-conventions';
+import { ATTR_FAAS_INVOCATION_ID } from '@opentelemetry/semantic-conventions/incubating';
 import {
   Context as OtelContext,
   context,
@@ -63,6 +64,10 @@ const assertSpanSuccess = (span: ReadableSpan) => {
     span.attributes[SEMATTRS_FAAS_EXECUTION],
     'aws_request_id'
   );
+  assert.strictEqual(
+    span.attributes[ATTR_FAAS_INVOCATION_ID],
+    'aws_request_id'
+  );
   assert.strictEqual(span.attributes['faas.id'], 'my_arn');
   assert.strictEqual(span.status.code, SpanStatusCode.UNSET);
   assert.strictEqual(span.status.message, undefined);
@@ -75,6 +80,10 @@ const assertSpanFailure = (span: ReadableSpan) => {
     span.attributes[SEMATTRS_FAAS_EXECUTION],
     'aws_request_id'
   );
+  assert.strictEqual(
+    span.attributes[ATTR_FAAS_INVOCATION_ID],
+    'aws_request_id'
+  );
   assert.strictEqual(span.attributes['faas.id'], 'my_arn');
   assert.strictEqual(span.status.code, SpanStatusCode.ERROR);
   assert.strictEqual(span.status.message, 'handler error');