From e7650585d75303eb318f3a2a9bbd7d41020f2328 Mon Sep 17 00:00:00 2001
From: JamieDanielson <jamieedanielson@gmail.com>
Date: Wed, 18 Sep 2024 17:30:36 -0400
Subject: [PATCH 1/3] update to use new ATTR

---
 .../src/clientUtils.ts                        | 10 ++---
 .../src/instrumentation.ts                    | 37 +++++++++----------
 .../src/serverUtils.ts                        | 10 ++---
 .../test/protobuf-ts-utils.ts                 | 25 +++++++++----
 .../test/utils/assertionUtils.ts              | 14 +++----
 5 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts
index 0974b239482..7c16f331bee 100644
--- 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
index 3daec0b63c5..9a23c20ccee 100644
--- 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
index c22d9dfca63..3d84dafd02d 100644
--- 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,7 +131,7 @@ 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,
@@ -139,7 +139,7 @@ function clientStreamAndUnaryHandler<RequestType, ResponseType>(
       });
     } 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
index 95233aa52ec..15dbc863db3 100644
--- 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
index ccc35cf7ad9..4597297d013 100644
--- 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
   );
 };

From 70062cba71ed5d3f19e2f0bd062d31d7c6ae3d34 Mon Sep 17 00:00:00 2001
From: JamieDanielson <jamieedanielson@gmail.com>
Date: Thu, 19 Sep 2024 17:25:11 -0400
Subject: [PATCH 2/3] use old semattrs to avoid potential breaking

---
 .../src/clientUtils.ts                        | 10 ++---
 .../src/instrumentation.ts                    | 39 +++++++++++--------
 .../src/serverUtils.ts                        | 10 ++---
 .../test/protobuf-ts-utils.ts                 | 10 ++---
 .../test/utils/assertionUtils.ts              | 14 +++----
 5 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/clientUtils.ts
index 7c16f331bee..0974b239482 100644
--- 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 { ATTR_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions/incubating';
+import { SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
 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(ATTR_RPC_GRPC_STATUS_CODE, err.code);
+        span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, err.code);
       }
       span.setAttributes({
         [AttributeNames.GRPC_ERROR_NAME]: err.name,
         [AttributeNames.GRPC_ERROR_MESSAGE]: err.message,
       });
     } else {
-      span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+      span.setAttribute(SEMATTRS_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,
-      [ATTR_RPC_GRPC_STATUS_CODE]: err.code,
+      [SEMATTRS_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(ATTR_RPC_GRPC_STATUS_CODE, status.code);
+    span.setAttribute(SEMATTRS_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
index 9a23c20ccee..139c83ee012 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
@@ -56,12 +56,14 @@ import {
   InstrumentationBase,
 } from '@opentelemetry/instrumentation';
 import {
-  ATTR_NET_PEER_NAME,
-  ATTR_NET_PEER_PORT,
-  ATTR_RPC_METHOD,
-  ATTR_RPC_SERVICE,
-  ATTR_RPC_SYSTEM,
-} from '@opentelemetry/semantic-conventions/incubating';
+  ATTR_CLIENT_ADDRESS,
+  ATTR_CLIENT_PORT,
+  SEMATTRS_NET_PEER_NAME,
+  SEMATTRS_NET_PEER_PORT,
+  SEMATTRS_RPC_METHOD,
+  SEMATTRS_RPC_SERVICE,
+  SEMATTRS_RPC_SYSTEM,
+} from '@opentelemetry/semantic-conventions';
 
 import {
   shouldNotTraceServerCall,
@@ -241,9 +243,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
                   const span = instrumentation.tracer
                     .startSpan(spanName, spanOptions)
                     .setAttributes({
-                      [ATTR_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
-                      [ATTR_RPC_METHOD]: method,
-                      [ATTR_RPC_SERVICE]: service,
+                      [SEMATTRS_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+                      [SEMATTRS_RPC_METHOD]: method,
+                      [SEMATTRS_RPC_SERVICE]: service,
                     });
 
                   instrumentation._metadataCapture.server.captureRequestMetadata(
@@ -435,9 +437,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
         const span = instrumentation.tracer
           .startSpan(name, { kind: SpanKind.CLIENT })
           .setAttributes({
-            [ATTR_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
-            [ATTR_RPC_METHOD]: method,
-            [ATTR_RPC_SERVICE]: service,
+            [SEMATTRS_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+            [SEMATTRS_RPC_METHOD]: method,
+            [SEMATTRS_RPC_SERVICE]: service,
           });
         instrumentation.extractNetMetadata(this, span);
 
@@ -480,9 +482,9 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
     const span = this.tracer
       .startSpan(name, { kind: SpanKind.CLIENT })
       .setAttributes({
-        [ATTR_RPC_SYSTEM]: 'grpc',
-        [ATTR_RPC_METHOD]: methodAttributeValue,
-        [ATTR_RPC_SERVICE]: service,
+        [SEMATTRS_RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+        [SEMATTRS_RPC_METHOD]: methodAttributeValue,
+        [SEMATTRS_RPC_SERVICE]: service,
       });
 
     if (metadata != null) {
@@ -495,8 +497,11 @@ 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(ATTR_NET_PEER_NAME, parsedUri.groups['name']);
-      span.setAttribute(ATTR_NET_PEER_PORT, parseInt(parsedUri.groups['port']));
+      span.setAttribute(SEMATTRS_NET_PEER_NAME, parsedUri.groups['name']);
+      span.setAttribute(
+        SEMATTRS_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
index 3d84dafd02d..c22d9dfca63 100644
--- 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 { ATTR_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions/incubating';
+import { SEMATTRS_RPC_GRPC_STATUS_CODE } from '@opentelemetry/semantic-conventions';
 
 import {
   _grpcStatusCodeToOpenTelemetryStatusCode,
@@ -81,7 +81,7 @@ function serverStreamAndBidiHandler<RequestType, ResponseType>(
     span.setStatus({
       code: SpanStatusCode.UNSET,
     });
-    span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+    span.setAttribute(SEMATTRS_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,
-      [ATTR_RPC_GRPC_STATUS_CODE]: err.code,
+      [SEMATTRS_RPC_GRPC_STATUS_CODE]: err.code,
     });
     endSpan();
   });
@@ -131,7 +131,7 @@ function clientStreamAndUnaryHandler<RequestType, ResponseType>(
           code: _grpcStatusCodeToOpenTelemetryStatusCode(err.code),
           message: err.message,
         });
-        span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, err.code);
+        span.setAttribute(SEMATTRS_RPC_GRPC_STATUS_CODE, err.code);
       }
       span.setAttributes({
         [AttributeNames.GRPC_ERROR_NAME]: err.name,
@@ -139,7 +139,7 @@ function clientStreamAndUnaryHandler<RequestType, ResponseType>(
       });
     } else {
       span.setStatus({ code: SpanStatusCode.UNSET });
-      span.setAttribute(ATTR_RPC_GRPC_STATUS_CODE, GRPC_STATUS_CODE_OK);
+      span.setAttribute(SEMATTRS_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
index 15dbc863db3..de357226328 100644
--- 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,9 @@ import {
 } from '@opentelemetry/sdk-trace-base';
 import { assertPropagation, assertSpan } from './utils/assertionUtils';
 import {
-  ATTR_RPC_METHOD,
-  ATTR_RPC_SERVICE,
-} from '@opentelemetry/semantic-conventions/incubating';
+  SEMATTRS_RPC_METHOD,
+  SEMATTRS_RPC_SERVICE,
+} from '@opentelemetry/semantic-conventions';
 import { AttributeValues } from '../src/enums/AttributeValues';
 
 export type SpanAssertionFunction = (
@@ -74,8 +74,8 @@ function validateSpans(
     SpanKind.CLIENT,
     validations
   );
-  assert.strictEqual(clientSpan.attributes[ATTR_RPC_METHOD], rpcMethod);
-  assert.strictEqual(clientSpan.attributes[ATTR_RPC_SERVICE], rpcService);
+  assert.strictEqual(clientSpan.attributes[SEMATTRS_RPC_METHOD], rpcMethod);
+  assert.strictEqual(clientSpan.attributes[SEMATTRS_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
index 4597297d013..ccc35cf7ad9 100644
--- 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 {
-  ATTR_NET_PEER_NAME,
-  ATTR_NET_PEER_PORT,
-  ATTR_RPC_GRPC_STATUS_CODE,
-} from '@opentelemetry/semantic-conventions/incubating';
+  SEMATTRS_NET_PEER_NAME,
+  SEMATTRS_NET_PEER_PORT,
+  SEMATTRS_RPC_GRPC_STATUS_CODE,
+} from '@opentelemetry/semantic-conventions';
 
 export const grpcStatusCodeToOpenTelemetryStatusCode = (
   status: GrpcStatus
@@ -70,11 +70,11 @@ export const assertSpan = (
     validations.netPeerPort !== undefined
   ) {
     assert.strictEqual(
-      span.attributes[ATTR_NET_PEER_NAME],
+      span.attributes[SEMATTRS_NET_PEER_NAME],
       validations.netPeerName
     );
     assert.strictEqual(
-      span.attributes[ATTR_NET_PEER_PORT],
+      span.attributes[SEMATTRS_NET_PEER_PORT],
       validations.netPeerPort
     );
   }
@@ -86,7 +86,7 @@ export const assertSpan = (
     grpcStatusCodeToOpenTelemetryStatusCode(validations.status)
   );
   assert.strictEqual(
-    span.attributes[ATTR_RPC_GRPC_STATUS_CODE],
+    span.attributes[SEMATTRS_RPC_GRPC_STATUS_CODE],
     validations.status
   );
 };

From 5d949bc00a0defb5c523aa4eede0cd84154b8c22 Mon Sep 17 00:00:00 2001
From: JamieDanielson <jamieedanielson@gmail.com>
Date: Thu, 19 Sep 2024 17:41:26 -0400
Subject: [PATCH 3/3] wip: add semconv stability opt-in logic

---
 .../src/instrumentation.ts                    | 59 ++++++++++++++++---
 .../src/types.ts                              | 15 +++++
 .../test/helper.ts                            |  2 +
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
index 139c83ee012..9a1aa048021 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts
@@ -41,8 +41,10 @@ import type {
   metadataCaptureType,
 } from './internal-types';
 import type { GrpcInstrumentationConfig } from './types';
+import { SemconvStability } from './types';
 
 import {
+  Attributes,
   context,
   propagation,
   ROOT_CONTEXT,
@@ -51,6 +53,7 @@ import {
   trace,
   Span,
 } from '@opentelemetry/api';
+import { getEnv } from '@opentelemetry/core';
 import {
   InstrumentationNodeModuleDefinition,
   InstrumentationBase,
@@ -92,9 +95,21 @@ import { VERSION } from './version';
 export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentationConfig> {
   private _metadataCapture: metadataCaptureType;
 
+  private _semconvStability = SemconvStability.OLD;
+
   constructor(config: GrpcInstrumentationConfig = {}) {
     super('@opentelemetry/instrumentation-grpc', VERSION, config);
     this._metadataCapture = this._createMetadataCapture();
+
+    for (const entry in getEnv().OTEL_SEMCONV_STABILITY_OPT_IN) {
+      if (entry.toLowerCase() === 'http/dup') {
+        // http/dup takes highest precedence. If it is found, there is no need to read the rest of the list
+        this._semconvStability = SemconvStability.DUPLICATE;
+        break;
+      } else if (entry.toLowerCase() === 'http') {
+        this._semconvStability = SemconvStability.STABLE;
+      }
+    }
   }
 
   init() {
@@ -328,7 +343,11 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
           service,
           metadata
         );
-        instrumentation.extractNetMetadata(this, span);
+        instrumentation.extractNetMetadata(
+          this,
+          span,
+          instrumentation._semconvStability
+        );
 
         // Callback is only present when there is no responseStream
         if (!hasResponseStream) {
@@ -441,7 +460,11 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
             [SEMATTRS_RPC_METHOD]: method,
             [SEMATTRS_RPC_SERVICE]: service,
           });
-        instrumentation.extractNetMetadata(this, span);
+        instrumentation.extractNetMetadata(
+          this,
+          span,
+          instrumentation._semconvStability
+        );
 
         instrumentation._metadataCapture.client.captureRequestMetadata(
           span,
@@ -493,15 +516,33 @@ export class GrpcInstrumentation extends InstrumentationBase<GrpcInstrumentation
     return span;
   }
 
-  private extractNetMetadata(client: grpcJs.Client, span: Span) {
+  private extractNetMetadata(
+    client: grpcJs.Client,
+    span: Span,
+    semconvStability: SemconvStability
+  ) {
     // 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'])
-      );
+    const hostname = parsedUri?.groups?.name;
+    const port = parseInt(parsedUri?.groups?.port ?? '');
+    const oldAttributes: Attributes = {
+      [SEMATTRS_NET_PEER_NAME]: hostname,
+      [SEMATTRS_NET_PEER_PORT]: port,
+    };
+    const newAttributes: Attributes = {
+      [ATTR_CLIENT_ADDRESS]: hostname,
+      [ATTR_CLIENT_PORT]: port,
+    };
+    switch (semconvStability) {
+      case SemconvStability.STABLE:
+        span.setAttributes(newAttributes);
+        break;
+      case SemconvStability.OLD:
+        span.setAttributes(oldAttributes);
+        break;
+      case SemconvStability.DUPLICATE:
+        span.setAttributes({ ...oldAttributes, ...newAttributes });
+        break;
     }
   }
 
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts
index 430476b7a47..37a7690889f 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/types.ts
@@ -35,3 +35,18 @@ export interface GrpcInstrumentationConfig extends InstrumentationConfig {
     };
   };
 }
+
+/**
+ * Tracks whether this instrumentation emits old experimental,
+ * new stable, or both semantic conventions.
+ *
+ * Enum values chosen such that the enum may be used as a bitmask.
+ */
+export const enum SemconvStability {
+  /** Emit only stable semantic conventions */
+  STABLE = 0x1,
+  /** Emit only old semantic convetions */
+  OLD = 0x2,
+  /** Emit both stable and old semantic convetions */
+  DUPLICATE = 0x1 | 0x2,
+}
diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts
index 131dde04b4b..3e7cce5983b 100644
--- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts
+++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts
@@ -51,6 +51,7 @@ import { assertPropagation, assertSpan } from './utils/assertionUtils';
 import { promisify } from 'util';
 import type { GrpcInstrumentation } from '../src';
 import * as path from 'path';
+import { SemconvStability } from '../src/types';
 
 const PROTO_PATH = path.resolve(__dirname, './fixtures/grpc-test.proto');
 const memoryExporter = new InMemorySpanExporter();
@@ -969,6 +970,7 @@ export const runTests = (
             },
           },
         });
+        plugin['_semconvStability'] = SemconvStability.OLD;
 
         plugin.setTracerProvider(provider);
         plugin.enable();