diff --git a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts index 4ae3d30925..122427809a 100644 --- a/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-express/src/instrumentation.ts @@ -41,7 +41,7 @@ import { isWrapped, safeExecuteInTheMiddle, } from '@opentelemetry/instrumentation'; -import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; import { ExpressLayer, ExpressRouter, @@ -195,7 +195,7 @@ export class ExpressInstrumentation extends InstrumentationBase 0 ? route : '/', + [ATTR_HTTP_ROUTE]: route.length > 0 ? route : '/', }; const metadata = getLayerMetadata(route, layer, layerPath); const type = metadata.attributes[ diff --git a/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts index abdb7bc26f..09d3fa2c4e 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/custom-config.test.ts @@ -21,7 +21,7 @@ import { InMemorySpanExporter, SimpleSpanProcessor, } from '@opentelemetry/sdk-trace-base'; -import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; import * as assert from 'assert'; import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core'; import { ExpressLayerType } from '../src/enums/ExpressLayerType'; @@ -145,7 +145,7 @@ describe('ExpressInstrumentation', () => { .find(span => span.name.includes('request handler')); assert.notStrictEqual(requestHandlerSpan, undefined); assert.strictEqual( - requestHandlerSpan?.attributes[SEMATTRS_HTTP_ROUTE], + requestHandlerSpan?.attributes[ATTR_HTTP_ROUTE], '/mw' ); @@ -196,7 +196,7 @@ describe('ExpressInstrumentation', () => { .find(span => span.name.includes('request handler')); assert.notStrictEqual(requestHandlerSpan, undefined); assert.strictEqual( - requestHandlerSpan?.attributes[SEMATTRS_HTTP_ROUTE], + requestHandlerSpan?.attributes[ATTR_HTTP_ROUTE], '/' ); diff --git a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts index e4a45d2e38..b88d51c4d9 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/express.test.ts @@ -26,7 +26,7 @@ import * as semver from 'semver'; import { AttributeNames } from '../src/enums/AttributeNames'; import { ExpressInstrumentation } from '../src'; import { createServer, httpRequest, serverWithMiddleware } from './utils'; -import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions'; import * as testUtils from '@opentelemetry/contrib-test-utils'; const instrumentation = new ExpressInstrumentation(); @@ -119,7 +119,7 @@ describe('ExpressInstrumentation', () => { .find(span => span.name.includes('request handler')); assert.notStrictEqual(requestHandlerSpan, undefined); assert.strictEqual( - requestHandlerSpan?.attributes[SEMATTRS_HTTP_ROUTE], + requestHandlerSpan?.attributes[ATTR_HTTP_ROUTE], '/toto/:id' ); assert.strictEqual( @@ -486,7 +486,7 @@ describe('ExpressInstrumentation', () => { .getFinishedSpans() .find(span => span.name.includes('request handler')); assert.strictEqual( - requestHandlerSpan?.attributes[SEMATTRS_HTTP_ROUTE], + requestHandlerSpan?.attributes[ATTR_HTTP_ROUTE], '/double-slashes/:id' ); assert.strictEqual(rpcMetadata?.route, '/double-slashes/:id'); diff --git a/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts b/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts index bc1ffcd2e4..492026de7b 100644 --- a/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts +++ b/plugins/node/opentelemetry-instrumentation-express/test/hooks.test.ts @@ -27,7 +27,7 @@ import * as sinon from 'sinon'; import { ExpressInstrumentation } from '../src'; import { ExpressRequestInfo, SpanNameHook } from '../src/types'; import { ExpressLayerType } from '../src/enums/ExpressLayerType'; -import { SEMATTRS_HTTP_METHOD } from '@opentelemetry/semantic-conventions'; +import { ATTR_HTTP_REQUEST_METHOD } from '@opentelemetry/semantic-conventions'; const instrumentation = new ExpressInstrumentation(); instrumentation.enable(); @@ -179,7 +179,7 @@ describe('ExpressInstrumentation hooks', () => { it('should call requestHook when set in config', async () => { const requestHook = sinon.spy((span: Span, info: ExpressRequestInfo) => { - span.setAttribute(SEMATTRS_HTTP_METHOD, info.request.method); + span.setAttribute(ATTR_HTTP_REQUEST_METHOD, info.request.method); if (info.layerType) { span.setAttribute('express.layer_type', info.layerType); @@ -204,7 +204,7 @@ describe('ExpressInstrumentation hooks', () => { assert.strictEqual(spans.length, 2); sinon.assert.calledOnce(requestHook); assert.strictEqual( - requestHandlerSpan?.attributes['http.method'], + requestHandlerSpan?.attributes['http.request.method'], 'GET' ); assert.strictEqual(