Merge branch 'main' into trentm-semconv-up-instr-graphql

Author: david-luna

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

@@ -22,7 +22,7 @@ import * as sinon from 'sinon';
 import { INVALID_SPAN_CONTEXT, context, trace, Span } from '@opentelemetry/api';
 import { diag, DiagLogLevel } from '@opentelemetry/api';
 import { hrTimeToMilliseconds } from '@opentelemetry/core';
-import { SEMRESATTRS_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import { ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 import { resourceFromAttributes } from '@opentelemetry/resources';
 import {
   InMemorySpanExporter,
@@ -53,7 +53,7 @@ const tracer = tracerProvider.getTracer('default');
 
 // Setup LoggerProvider for "log sending" tests.
 const resource = resourceFromAttributes({
-  [SEMRESATTRS_SERVICE_NAME]: 'test-instrumentation-pino',
+  [ATTR_SERVICE_NAME]: 'test-instrumentation-pino',
 });
 const loggerProvider = new LoggerProvider({ resource });
 const memExporter = new InMemoryLogRecordExporter();

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

@@ -22,7 +22,7 @@ import {
   InstrumentationNodeModuleFile,
   isWrapped,
 } from '@opentelemetry/instrumentation';
-import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
+import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
 
 import * as http from 'http';
 import type * as Router from 'router';
@@ -166,7 +166,7 @@ export class RouterInstrumentation extends InstrumentationBase {
       [AttributeNames.NAME]: fnName,
       [AttributeNames.VERSION]: this._moduleVersion,
       [AttributeNames.TYPE]: type,
-      [SEMATTRS_HTTP_ROUTE]: route,
+      [ATTR_HTTP_ROUTE]: route,
     };
 
     const parent = api.context.active();