chore(instrumentation-undici): update semconv usage to modern exports (#3074)

Author: trentm

package-lock.json

@@ -62,7 +62,8 @@
   },
   "dependencies": {
     "@opentelemetry/core": "^2.0.0",
-    "@opentelemetry/instrumentation": "^0.205.0"
+    "@opentelemetry/instrumentation": "^0.205.0",
+    "@opentelemetry/semantic-conventions": "^1.24.0"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/instrumentation-undici#readme",
   "sideEffects": false

packages/instrumentation-undici/package.json

@@ -33,6 +33,26 @@ import {
   trace,
   ValueType,
 } from '@opentelemetry/api';
+import {
+  hrTime,
+  hrTimeDuration,
+  hrTimeToMilliseconds,
+} from '@opentelemetry/core';
+import {
+  ATTR_ERROR_TYPE,
+  ATTR_HTTP_REQUEST_METHOD,
+  ATTR_HTTP_REQUEST_METHOD_ORIGINAL,
+  ATTR_HTTP_RESPONSE_STATUS_CODE,
+  ATTR_NETWORK_PEER_ADDRESS,
+  ATTR_NETWORK_PEER_PORT,
+  ATTR_SERVER_ADDRESS,
+  ATTR_SERVER_PORT,
+  ATTR_URL_FULL,
+  ATTR_URL_PATH,
+  ATTR_URL_QUERY,
+  ATTR_URL_SCHEME,
+  ATTR_USER_AGENT_ORIGINAL,
+} from '@opentelemetry/semantic-conventions';
 
 /** @knipignore */
 import { PACKAGE_NAME, PACKAGE_VERSION } from './version';
@@ -45,12 +65,6 @@ import {
   ResponseHeadersMessage,
 } from './internal-types';
 import { UndiciInstrumentationConfig, UndiciRequest } from './types';
-import { SemanticAttributes } from './enums/SemanticAttributes';
-import {
-  hrTime,
-  hrTimeDuration,
-  hrTimeToMilliseconds,
-} from '@opentelemetry/core';
 
 interface InstrumentationRecord {
   span: Span;
@@ -244,21 +258,21 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
     const urlScheme = requestUrl.protocol.replace(':', '');
     const requestMethod = this.getRequestMethod(request.method);
     const attributes: Attributes = {
-      [SemanticAttributes.HTTP_REQUEST_METHOD]: requestMethod,
-      [SemanticAttributes.HTTP_REQUEST_METHOD_ORIGINAL]: request.method,
-      [SemanticAttributes.URL_FULL]: requestUrl.toString(),
-      [SemanticAttributes.URL_PATH]: requestUrl.pathname,
-      [SemanticAttributes.URL_QUERY]: requestUrl.search,
-      [SemanticAttributes.URL_SCHEME]: urlScheme,
+      [ATTR_HTTP_REQUEST_METHOD]: requestMethod,
+      [ATTR_HTTP_REQUEST_METHOD_ORIGINAL]: request.method,
+      [ATTR_URL_FULL]: requestUrl.toString(),
+      [ATTR_URL_PATH]: requestUrl.pathname,
+      [ATTR_URL_QUERY]: requestUrl.search,
+      [ATTR_URL_SCHEME]: urlScheme,
     };
 
     const schemePorts: Record<string, string> = { https: '443', http: '80' };
     const serverAddress = requestUrl.hostname;
     const serverPort = requestUrl.port || schemePorts[urlScheme];
 
-    attributes[SemanticAttributes.SERVER_ADDRESS] = serverAddress;
+    attributes[ATTR_SERVER_ADDRESS] = serverAddress;
     if (serverPort && !isNaN(Number(serverPort))) {
-      attributes[SemanticAttributes.SERVER_PORT] = Number(serverPort);
+      attributes[ATTR_SERVER_PORT] = Number(serverPort);
     }
 
     // Get user agent from headers
@@ -272,7 +286,7 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
       const userAgent = Array.isArray(userAgentValues)
         ? userAgentValues[userAgentValues.length - 1]
         : userAgentValues;
-      attributes[SemanticAttributes.USER_AGENT_ORIGINAL] = userAgent;
+      attributes[ATTR_USER_AGENT_ORIGINAL] = userAgent;
     }
 
     // Get attributes from the hook if present
@@ -355,8 +369,8 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
     const { span } = record;
     const { remoteAddress, remotePort } = socket;
     const spanAttributes: Attributes = {
-      [SemanticAttributes.NETWORK_PEER_ADDRESS]: remoteAddress,
-      [SemanticAttributes.NETWORK_PEER_PORT]: remotePort,
+      [ATTR_NETWORK_PEER_ADDRESS]: remoteAddress,
+      [ATTR_NETWORK_PEER_PORT]: remotePort,
     };
 
     // After hooks have been processed (which may modify request headers)
@@ -393,7 +407,7 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
 
     const { span, attributes } = record;
     const spanAttributes: Attributes = {
-      [SemanticAttributes.HTTP_RESPONSE_STATUS_CODE]: response.statusCode,
+      [ATTR_HTTP_RESPONSE_STATUS_CODE]: response.statusCode,
     };
 
     const config = this.getConfig();
@@ -487,7 +501,7 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
     this._recordFromReq.delete(request);
 
     // Record metrics (with the error)
-    attributes[SemanticAttributes.ERROR_TYPE] = error.message;
+    attributes[ATTR_ERROR_TYPE] = error.message;
     this.recordRequestDuration(attributes, startTime);
   }
 
@@ -496,12 +510,12 @@ export class UndiciInstrumentation extends InstrumentationBase<UndiciInstrumenta
     const metricsAttributes: Attributes = {};
     // Get the attribs already in span attributes
     const keysToCopy = [
-      SemanticAttributes.HTTP_RESPONSE_STATUS_CODE,
-      SemanticAttributes.HTTP_REQUEST_METHOD,
-      SemanticAttributes.SERVER_ADDRESS,
-      SemanticAttributes.SERVER_PORT,
-      SemanticAttributes.URL_SCHEME,
-      SemanticAttributes.ERROR_TYPE,
+      ATTR_HTTP_RESPONSE_STATUS_CODE,
+      ATTR_HTTP_REQUEST_METHOD,
+      ATTR_SERVER_ADDRESS,
+      ATTR_SERVER_PORT,
+      ATTR_URL_SCHEME,
+      ATTR_ERROR_TYPE,
     ];
     keysToCopy.forEach(key => {
       if (key in attributes) {