chore: update use of semantic conventions

Author: dyladan

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

@@ -33,7 +33,7 @@ import {
   TracerProvider,
 } from '@opentelemetry/api';
 import { CLOUD_RESOURCE } from '@opentelemetry/resources';
-import { FaasAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 
 import { Callback, Context, Handler } from 'aws-lambda';
 
@@ -120,8 +120,8 @@ export class AwsLambdaInstrumentation extends InstrumentationBase {
       const span = plugin.tracer.startSpan(name, {
         kind: SpanKind.SERVER,
         attributes: {
-          [FaasAttribute.FAAS_EXECUTION]: context.awsRequestId,
-          [FaasAttribute.FAAS_ID]: context.invokedFunctionArn,
+          [SemanticAttributes.FAAS_EXECUTION]: context.awsRequestId,
+          'faas.id': context.invokedFunctionArn,
           [CLOUD_RESOURCE.ACCOUNT_ID]: AwsLambdaInstrumentation._extractAccountId(
             context.invokedFunctionArn
           ),

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

@@ -29,10 +29,7 @@ import { NodeTracerProvider } from '@opentelemetry/node';
 import { Context } from 'aws-lambda';
 import * as assert from 'assert';
 import { SpanKind, SpanStatusCode } from '@opentelemetry/api';
-import {
-  ExceptionAttribute,
-  FaasAttribute,
-} from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 
 const memoryExporter = new InMemorySpanExporter();
 const provider = new NodeTracerProvider();
@@ -43,10 +40,10 @@ const assertSpanSuccess = (span: ReadableSpan) => {
   assert.strictEqual(span.kind, SpanKind.SERVER);
   assert.strictEqual(span.name, 'my_function');
   assert.strictEqual(
-    span.attributes[FaasAttribute.FAAS_EXECUTION],
+    span.attributes[SemanticAttributes.FAAS_EXECUTION],
     'aws_request_id'
   );
-  assert.strictEqual(span.attributes[FaasAttribute.FAAS_ID], 'my_arn');
+  assert.strictEqual(span.attributes['faas.id'], 'my_arn');
   assert.strictEqual(span.status.code, SpanStatusCode.UNSET);
   assert.strictEqual(span.status.message, undefined);
 };
@@ -55,15 +52,15 @@ const assertSpanFailure = (span: ReadableSpan) => {
   assert.strictEqual(span.kind, SpanKind.SERVER);
   assert.strictEqual(span.name, 'my_function');
   assert.strictEqual(
-    span.attributes[FaasAttribute.FAAS_EXECUTION],
+    span.attributes[SemanticAttributes.FAAS_EXECUTION],
     'aws_request_id'
   );
-  assert.strictEqual(span.attributes[FaasAttribute.FAAS_ID], 'my_arn');
+  assert.strictEqual(span.attributes['faas.id'], 'my_arn');
   assert.strictEqual(span.status.code, SpanStatusCode.ERROR);
   assert.strictEqual(span.status.message, 'handler error');
   assert.strictEqual(span.events.length, 1);
   assert.strictEqual(
-    span.events[0].attributes![ExceptionAttribute.MESSAGE],
+    span.events[0].attributes![SemanticAttributes.EXCEPTION_MESSAGE],
     'handler error'
   );
 };

plugins/node/opentelemetry-instrumentation-dns/src/dns.ts

@@ -16,7 +16,7 @@
 
 import { LookupAddress } from 'dns';
 import { diag, Span, SpanKind } from '@opentelemetry/api';
-import { GeneralAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import {
   InstrumentationBase,
   InstrumentationNodeModuleDefinition,
@@ -114,7 +114,7 @@ export class DnsInstrumentation extends InstrumentationBase<Dns> {
       const span = plugin.tracer.startSpan(name, {
         kind: SpanKind.CLIENT,
         attributes: {
-          [GeneralAttribute.NET_PEER_HOSTNAME]: hostname,
+          [SemanticAttributes.NET_PEER_NAME]: hostname,
         },
       });
 

plugins/node/opentelemetry-instrumentation-dns/test/utils/assertSpan.ts

@@ -17,7 +17,7 @@
 import { SpanKind, SpanStatus, SpanStatusCode } from '@opentelemetry/api';
 import { hrTimeToNanoseconds } from '@opentelemetry/core';
 import { ReadableSpan } from '@opentelemetry/tracing';
-import { GeneralAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import * as assert from 'assert';
 import type { LookupAddress } from 'dns';
 import { AttributeNames } from '../../src/enums/AttributeNames';
@@ -45,7 +45,7 @@ export const assertSpan = (
     span.status.message
   );
   assert.strictEqual(
-    span.attributes[GeneralAttribute.NET_PEER_HOSTNAME],
+    span.attributes[SemanticAttributes.NET_PEER_NAME],
     validations.hostname
   );
 

plugins/node/opentelemetry-instrumentation-express/src/express.ts

@@ -34,7 +34,7 @@ import {
   InstrumentationNodeModuleDefinition,
   isWrapped,
 } from '@opentelemetry/instrumentation';
-import { HttpAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 
 /**
  * This symbol is used to mark express layer as being already instrumented
@@ -183,7 +183,7 @@ export class ExpressInstrumentation extends InstrumentationBase<
           .filter(path => path !== '/' && path !== '/*')
           .join('');
         const attributes: SpanAttributes = {
-          [HttpAttribute.HTTP_ROUTE]: route.length > 0 ? route : undefined,
+          [SemanticAttributes.HTTP_ROUTE]: route.length > 0 ? route : undefined,
         };
         const metadata = getLayerMetadata(layer, layerPath);
         const type = metadata.attributes[

plugins/node/opentelemetry-instrumentation-express/test/express.test.ts

@@ -24,7 +24,7 @@ import {
 import * as assert from 'assert';
 import { CustomAttributeNames, ExpressInstrumentationSpan } from '../src/types';
 import { ExpressInstrumentation } from '../src';
-import { HttpAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 
 const instrumentation = new ExpressInstrumentation();
 instrumentation.enable();
@@ -164,7 +164,7 @@ describe('ExpressInstrumentation', () => {
           .find(span => span.name.includes('request handler'));
         assert.notStrictEqual(requestHandlerSpan, undefined);
         assert.strictEqual(
-          requestHandlerSpan?.attributes[HttpAttribute.HTTP_ROUTE],
+          requestHandlerSpan?.attributes[SemanticAttributes.HTTP_ROUTE],
           '/toto/:id'
         );
         assert.strictEqual(

plugins/node/opentelemetry-instrumentation-hapi/src/utils.ts

@@ -15,7 +15,7 @@
  */
 
 import { SpanAttributes } from '@opentelemetry/api';
-import { HttpAttribute } from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import type * as Hapi from '@hapi/hapi';
 import {
   AttributeNames,
@@ -76,8 +76,8 @@ export const getRouteMetadata = (
   if (pluginName) {
     return {
       attributes: {
-        [HttpAttribute.HTTP_ROUTE]: route.path,
-        [HttpAttribute.HTTP_METHOD]: route.method,
+        [SemanticAttributes.HTTP_ROUTE]: route.path,
+        [SemanticAttributes.HTTP_METHOD]: route.method,
         [AttributeNames.HAPI_TYPE]: HapiLayerType.PLUGIN,
         [AttributeNames.PLUGIN_NAME]: pluginName,
       },
@@ -86,8 +86,8 @@ export const getRouteMetadata = (
   }
   return {
     attributes: {
-      [HttpAttribute.HTTP_ROUTE]: route.path,
-      [HttpAttribute.HTTP_METHOD]: route.method,
+      [SemanticAttributes.HTTP_ROUTE]: route.path,
+      [SemanticAttributes.HTTP_METHOD]: route.method,
       [AttributeNames.HAPI_TYPE]: HapiLayerType.ROUTER,
     },
     name: `route - ${route.path}`,

plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts

@@ -30,10 +30,7 @@ import {
   DbStatementSerializer,
 } from './types';
 import { IORedisInstrumentation } from './ioredis';
-import {
-  DatabaseAttribute,
-  GeneralAttribute,
-} from '@opentelemetry/semantic-conventions';
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
 import { safeExecuteInTheMiddle } from '@opentelemetry/instrumentation';
 
 const endSpan = (span: Span, err: NodeJS.ErrnoException | null | undefined) => {
@@ -52,16 +49,16 @@ export const traceConnection = (tracer: Tracer, original: Function) => {
     const span = tracer.startSpan('connect', {
       kind: SpanKind.CLIENT,
       attributes: {
-        [DatabaseAttribute.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM,
-        [DatabaseAttribute.DB_STATEMENT]: 'connect',
+        [SemanticAttributes.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM,
+        [SemanticAttributes.DB_STATEMENT]: 'connect',
       },
     });
     const { host, port } = this.options;
 
     span.setAttributes({
-      [GeneralAttribute.NET_PEER_NAME]: host,
-      [GeneralAttribute.NET_PEER_PORT]: port,
-      [GeneralAttribute.NET_PEER_ADDRESS]: `redis://${host}:${port}`,
+      [SemanticAttributes.NET_PEER_NAME]: host,
+      [SemanticAttributes.NET_PEER_PORT]: port,
+      [SemanticAttributes.NET_PEER_IP]: `redis://${host}:${port}`,
     });
     try {
       const client = original.apply(this, arguments);
@@ -102,8 +99,8 @@ export const traceSendCommand = (
     const span = tracer.startSpan(cmd.name, {
       kind: SpanKind.CLIENT,
       attributes: {
-        [DatabaseAttribute.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM,
-        [DatabaseAttribute.DB_STATEMENT]: dbStatementSerializer(
+        [SemanticAttributes.DB_SYSTEM]: IORedisInstrumentation.DB_SYSTEM,
+        [SemanticAttributes.DB_STATEMENT]: dbStatementSerializer(
           cmd.name,
           cmd.args
         ),
@@ -113,9 +110,9 @@ export const traceSendCommand = (
     const { host, port } = this.options;
 
     span.setAttributes({
-      [GeneralAttribute.NET_PEER_NAME]: host,
-      [GeneralAttribute.NET_PEER_PORT]: port,
-      [GeneralAttribute.NET_PEER_ADDRESS]: `redis://${host}:${port}`,
+      [SemanticAttributes.NET_PEER_NAME]: host,
+      [SemanticAttributes.NET_PEER_PORT]: port,
+      [SemanticAttributes.NET_PEER_IP]: `redis://${host}:${port}`,
     });
 
     try {