From ab79b96d2de8fa7399c8feb436ce7dd37de010ad Mon Sep 17 00:00:00 2001 From: Trent Mick Date: Tue, 27 May 2025 13:46:11 -0700 Subject: [PATCH] refactor(instrumentation-connect): update semconv usage to ATTR_ exports Refs: https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2377 --- .../node/opentelemetry-instrumentation-connect/README.md | 2 +- .../src/instrumentation.ts | 4 ++-- .../test/instrumentation.test.ts | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/node/opentelemetry-instrumentation-connect/README.md b/plugins/node/opentelemetry-instrumentation-connect/README.md index 604ee668b4..36e8c1842b 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/README.md +++ b/plugins/node/opentelemetry-instrumentation-connect/README.md @@ -55,7 +55,7 @@ See [examples/connect](https://github.com/open-telemetry/opentelemetry-js-contri ## Semantic Conventions -This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which implements Semantic Convention [Version 1.7.0](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/semantic_conventions/README.md) +This package implements Semantic Convention v1.33.1. Attributes collected: diff --git a/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts index 8d5ecb3f82..e89a301474 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-connect/src/instrumentation.ts @@ -32,7 +32,7 @@ import { InstrumentationNodeModuleDefinition, isWrapped, } from '@opentelemetry/instrumentation'; -import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; import { replaceCurrentStackRoute, addNewStackLayer, @@ -101,7 +101,7 @@ export class ConnectInstrumentation extends InstrumentationBase { const spanName = `${connectTypeName} - ${connectName}`; const options: SpanOptions = { attributes: { - [SEMATTRS_HTTP_ROUTE]: routeName.length > 0 ? routeName : '/', + [ATTR_HTTP_ROUTE]: routeName.length > 0 ? routeName : '/', [AttributeNames.CONNECT_TYPE]: connectType, [AttributeNames.CONNECT_NAME]: connectName, }, diff --git a/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts b/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts index f5dd85f757..64de40ed75 100644 --- a/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts +++ b/plugins/node/opentelemetry-instrumentation-connect/test/instrumentation.test.ts @@ -17,7 +17,7 @@ import * as assert from 'assert'; import { context, trace } from '@opentelemetry/api'; import { RPCType, setRPCMetadata, RPCMetadata } from '@opentelemetry/core'; -import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { @@ -145,7 +145,7 @@ describe('connect', () => { assert.deepStrictEqual(span.attributes, { 'connect.type': 'middleware', 'connect.name': ANONYMOUS_NAME, - [SEMATTRS_HTTP_ROUTE]: '/', + [ATTR_HTTP_ROUTE]: '/', }); assert.strictEqual(span.name, 'middleware - anonymous'); }); @@ -164,7 +164,7 @@ describe('connect', () => { assert.deepStrictEqual(span.attributes, { 'connect.type': 'middleware', 'connect.name': 'middleware1', - [SEMATTRS_HTTP_ROUTE]: '/', + [ATTR_HTTP_ROUTE]: '/', }); assert.strictEqual(span.name, 'middleware - middleware1'); }); @@ -182,7 +182,7 @@ describe('connect', () => { assert.deepStrictEqual(span.attributes, { 'connect.type': 'request_handler', 'connect.name': '/foo', - [SEMATTRS_HTTP_ROUTE]: '/foo', + [ATTR_HTTP_ROUTE]: '/foo', }); assert.strictEqual(span.name, 'request handler - /foo'); });