Skip to content

refactor(instrumentation-restify): update semconv usage to ATTR_ exports #2861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pichlermarc merged 2 commits into from
May 28, 2025
Merged

refactor(instrumentation-restify): update semconv usage to ATTR_ exports #2861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39508bd
refactor(instrumentation-restify): update semconv usage to ATTR_ exports
trentm May 27, 2025
b34f75a
Merge branch 'main' into trentm-semconv-up-instr-restify
pichlermarc May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-restify/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
isWrapped,
safeExecuteInTheMiddle,
} from '@opentelemetry/instrumentation';
import { SEMATTRS_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import { isPromise, isAsyncFunction } from './utils';
import { getRPCMetadata, RPCType } from '@opentelemetry/core';
import type { RestifyInstrumentationConfig } from './types';
Expand Down Expand Up @@ -172,7 +172,7 @@ export class RestifyInstrumentation extends InstrumentationBase<RestifyInstrumen
[AttributeNames.VERSION]: this._moduleVersion || 'n/a',
[AttributeNames.TYPE]: metadata.type,
[AttributeNames.METHOD]: metadata.methodName,
[SEMATTRS_HTTP_ROUTE]: route,
[ATTR_HTTP_ROUTE]: route,
};
const span = this.tracer.startSpan(
spanName,
Expand Down
9 changes: 4 additions & 5 deletions plugins/node/opentelemetry-instrumentation-restify/test/restify.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/

import { context, trace, Span } from '@opentelemetry/api';
import { SEMATTRS_HTTP_METHOD } from '@opentelemetry/semantic-conventions';
import { RPCMetadata, RPCType, setRPCMetadata } from '@opentelemetry/core';
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
Expand Down Expand Up @@ -495,7 +494,7 @@ describe('Restify Instrumentation', () => {
describe('using requestHook in config', () => {
it('calls requestHook provided function when set in config', async () => {
const requestHook = (span: Span, info: RestifyRequestInfo) => {
span.setAttribute(SEMATTRS_HTTP_METHOD, info.request.method);
span.setAttribute('my.http.method', info.request.method);
span.setAttribute('restify.layer', info.layerType);
};

Expand All @@ -517,7 +516,7 @@ describe('Restify Instrumentation', () => {
// span from get
const span = memoryExporter.getFinishedSpans()[2];
assert.notStrictEqual(span, undefined);
assert.strictEqual(span.attributes[SEMATTRS_HTTP_METHOD], 'GET');
assert.strictEqual(span.attributes['my.http.method'], 'GET');
assert.strictEqual(
span.attributes['restify.layer'],
'request_handler'
Expand All @@ -529,7 +528,7 @@ describe('Restify Instrumentation', () => {

it('does not propagate an error from a requestHook that throws exception', async () => {
const requestHook = (span: Span, info: RestifyRequestInfo) => {
span.setAttribute(SEMATTRS_HTTP_METHOD, info.request.method);
span.setAttribute('my.http.method', info.request.method);

throw Error('error thrown in requestHook');
};
Expand All @@ -552,7 +551,7 @@ describe('Restify Instrumentation', () => {
// span from get
const span = memoryExporter.getFinishedSpans()[2];
assert.notStrictEqual(span, undefined);
assert.strictEqual(span.attributes[SEMATTRS_HTTP_METHOD], 'GET');
assert.strictEqual(span.attributes['my.http.method'], 'GET');
}
}
);
Expand Down