update to use new ATTR

open-telemetry · Sep 18, 2024 · e765058 · e765058
1 parent cdfefb8
commit e765058
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 44 deletions.
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts
@@ -26,7 +26,7 @@ import type {
 } from './internal-types';
 
 import { propagation, context } from '@opentelemetry/api';
-import { SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
+import { ATTR_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions/incubating';
 import { AttributeNames } from './enums/AttributeNames';
 import { GRPC_STATUS_CODE_OK } from './status-code';
 import {
@@ -81,14 +81,14 @@ export function patchedCallback(
     if (err) {
       if (err.code) {
         span.setStatus(_grpcStatusCodeToSpanStatus(err.code));
-        span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, err.code);
+        span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, err.code);
       }
       span.setAttributes({
         [AttributeNames.GRPC_ERROR_NAME]: err.name,
         [AttributeNames.GRPC_ERROR_MESSAGE]: err.message,
       });
     } else {
-      span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+      span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
     }
 
     span.end();
@@ -130,7 +130,7 @@ export function patchResponseStreamEvents(span: Span, call: EventEmitter) {
     span.setAttributes({
       [AttributeNames.GRPC_ERROR_NAME]: err.name,
       [AttributeNames.GRPC_ERROR_MESSAGE]: err.message,
-      [SEMATTRS_RPC_GRPC_STATUS_CODE]: err.code,
+      [ATTR_RPC_GRPC_STATUS_CODE]: err.code,
     });
 
     endSpan();
@@ -142,7 +142,7 @@ export function patchResponseStreamEvents(span: Span, call: EventEmitter) {
     }
 
     span.setStatus(_grpcStatusCodeToSpanStatus(status.code));
-    span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, status.code);
+    span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, status.code);
 
     endSpan();
   });

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
@@ -56,12 +56,12 @@ import {
   InstrumentationBase,
 } from '@opentelemetry/instrumentation';
 import {
-  SEMATTRS_NET_PEER_NAME,
-  SEMATTRS_NET_PEER_PORT,
-  SEMATTRS_RPC_METHOD,
-  SEMATTRS_RPC_SERVICE,
-  SEMATTRS_RPC_SYSTEM,
-} from '@opentelemetry/semantic-conventions';
+  ATTR_NET_PEER_NAME,
+  ATTR_NET_PEER_PORT,
+  ATTR_RPC_METHOD,
+  ATTR_RPC_SERVICE,
+  ATTR_RPC_SYSTEM,
+} from '@opentelemetry/semantic-conventions/incubating';
 
 import {
   shouldNotTraceServerCall,
@@ -241,9 +241,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
                   const span = instrumentation.tracer
                     .startSpan(spanName, spanOptions)
                     .setAttributes({
-                      [SEMATTRS_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
-                      [SEMATTRS_RPC_METHOD]: method,
-                      [SEMATTRS_RPC_SERVICE]: service,
+                      [ATTR_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+                      [ATTR_RPC_METHOD]: method,
+                      [ATTR_RPC_SERVICE]: service,
                     });
 
                   instrumentation._metadataCapture.server.captureRequestMetadata(
@@ -435,9 +435,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
         const span = instrumentation.tracer
           .startSpan(name, { kind: SpanKind.CLIENT })
           .setAttributes({
-            [SEMATTRS_RPC_SYSTEM]: 'grpc',
-            [SEMATTRS_RPC_METHOD]: method,
-            [SEMATTRS_RPC_SERVICE]: service,
+            [ATTR_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+            [ATTR_RPC_METHOD]: method,
+            [ATTR_RPC_SERVICE]: service,
           });
         instrumentation.extractNetMetadata(this, span);
 
@@ -480,9 +480,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
     const span = this.tracer
       .startSpan(name, { kind: SpanKind.CLIENT })
       .setAttributes({
-        [SEMATTRS_RPC_SYSTEM]: 'grpc',
-        [SEMATTRS_RPC_METHOD]: methodAttributeValue,
-        [SEMATTRS_RPC_SERVICE]: service,
+        [ATTR_RPC_SYSTEM]: 'grpc',
+        [ATTR_RPC_METHOD]: methodAttributeValue,
+        [ATTR_RPC_SERVICE]: service,
       });
 
     if (metadata != null) {
@@ -495,11 +495,8 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
     // set net.peer.* from target (e.g., "dns:otel-productcatalogservice:8080") as a hint to APMs
     const parsedUri = URI_REGEX.exec(client.getChannel().getTarget());
     if (parsedUri != null && parsedUri.groups != null) {
-      span.setAttribute(SEMATTRS_NET_PEER_NAME, parsedUri.groups['name']);
-      span.setAttribute(
-        SEMATTRS_NET_PEER_PORT,
-        parseInt(parsedUri.groups['port'])
-      );
+      span.setAttribute(ATTR_NET_PEER_NAME, parsedUri.groups['name']);
+      span.setAttribute(ATTR_NET_PEER_PORT, parseInt(parsedUri.groups['port']));
     }
   }
 

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/serverUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/serverUtils.ts
@@ -38,7 +38,7 @@ import type {
 import type { IgnoreMatcher } from './types';
 
 import { context, SpanStatusCode } from '@opentelemetry/api';
-import { SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
+import { ATTR_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions/incubating';
 
 import {
   _grpcStatusCodeToOpenTelemetryStatusCode,
@@ -81,7 +81,7 @@ function serverStreamAndBidiHandler<RequestType, ResponseType>(
     span.setStatus({
       code: SpanStatusCode.UNSET,
     });
-    span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+    span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
 
     endSpan();
   });
@@ -101,7 +101,7 @@ function serverStreamAndBidiHandler<RequestType, ResponseType>(
     span.setAttributes({
       [AttributeNames.GRPC_ERROR_NAME]: err.name,
       [AttributeNames.GRPC_ERROR_MESSAGE]: err.message,
-      [SEMATTRS_RPC_GRPC_STATUS_CODE]: err.code,
+      [ATTR_RPC_GRPC_STATUS_CODE]: err.code,
     });
     endSpan();
   });
@@ -131,15 +131,15 @@ function clientStreamAndUnaryHandler<RequestType, ResponseType>(
           code: _grpcStatusCodeToOpenTelemetryStatusCode(err.code),
           message: err.message,
         });
-        span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, err.code);
+        span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, err.code);
       }
       span.setAttributes({
         [AttributeNames.GRPC_ERROR_NAME]: err.name,
         [AttributeNames.GRPC_ERROR_MESSAGE]: err.message,
       });
     } else {
       span.setStatus({ code: SpanStatusCode.UNSET });
-      span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+      span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
     }
 
     span.end();

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/protobuf-ts-utils.ts
@@ -22,9 +22,10 @@ import {
 } from '@opentelemetry/sdk-trace-base';
 import { assertPropagation, assertSpan } from './utils/assertionUtils';
 import {
-  SEMATTRS_RPC_METHOD,
-  SEMATTRS_RPC_SERVICE,
-} from '@opentelemetry/semantic-conventions';
+  ATTR_RPC_METHOD,
+  ATTR_RPC_SERVICE,
+} from '@opentelemetry/semantic-conventions/incubating';
+import { AttributeValues } from '../src/enums/AttributeValues';
 
 export type SpanAssertionFunction = (
   exporter: InMemorySpanExporter,
@@ -61,10 +62,20 @@ function validateSpans(
   );
   assertPropagation(serverSpan, clientSpan);
 
-  assertSpan('grpc', serverSpan, SpanKind.SERVER, validations);
-  assertSpan('grpc', clientSpan, SpanKind.CLIENT, validations);
-  assert.strictEqual(clientSpan.attributes[SEMATTRS_RPC_METHOD], rpcMethod);
-  assert.strictEqual(clientSpan.attributes[SEMATTRS_RPC_SERVICE], rpcService);
+  assertSpan(
+    AttributeValues.RPC_SYSTEM,
+    serverSpan,
+    SpanKind.SERVER,
+    validations
+  );
+  assertSpan(
+    AttributeValues.RPC_SYSTEM,
+    clientSpan,
+    SpanKind.CLIENT,
+    validations
+  );
+  assert.strictEqual(clientSpan.attributes[ATTR_RPC_METHOD], rpcMethod);
+  assert.strictEqual(clientSpan.attributes[ATTR_RPC_SERVICE], rpcService);
 }
 
 export function assertNoSpansExported(

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/utils/assertionUtils.ts
@@ -23,10 +23,10 @@ import {
   hrTimeToMicroseconds,
 } from '@opentelemetry/core';
 import {
-  SEMATTRS_NET_PEER_NAME,
-  SEMATTRS_NET_PEER_PORT,
-  SEMATTRS_RPC_GRPC_STATUS_CODE,
-} from '@opentelemetry/semantic-conventions';
+  ATTR_NET_PEER_NAME,
+  ATTR_NET_PEER_PORT,
+  ATTR_RPC_GRPC_STATUS_CODE,
+} from '@opentelemetry/semantic-conventions/incubating';
 
 export const grpcStatusCodeToOpenTelemetryStatusCode = (
   status: GrpcStatus
@@ -70,11 +70,11 @@ export const assertSpan = (
     validations.netPeerPort !== undefined
   ) {
     assert.strictEqual(
-      span.attributes[SEMATTRS_NET_PEER_NAME],
+      span.attributes[ATTR_NET_PEER_NAME],
       validations.netPeerName
     );
     assert.strictEqual(
-      span.attributes[SEMATTRS_NET_PEER_PORT],
+      span.attributes[ATTR_NET_PEER_PORT],
       validations.netPeerPort
     );
   }
@@ -86,7 +86,7 @@ export const assertSpan = (
     grpcStatusCodeToOpenTelemetryStatusCode(validations.status)
   );
   assert.strictEqual(
-    span.attributes[SEMATTRS_RPC_GRPC_STATUS_CODE],
+    span.attributes[ATTR_RPC_GRPC_STATUS_CODE],
     validations.status
   );
 };