Skip to content

Commit eb1a87c

Browse files
authored
feat(otel): Remove @sentry/tracing dependency from opentelemetry-node (#7572)
1 parent ff469ab commit eb1a87c

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

packages/opentelemetry-node/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
},
1818
"dependencies": {
1919
"@sentry/core": "7.44.2",
20-
"@sentry/tracing": "7.44.2",
2120
"@sentry/types": "7.44.2",
2221
"@sentry/utils": "7.44.2"
2322
},
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
import '@sentry/tracing';
2-
31
export { SentrySpanProcessor } from './spanprocessor';
42
export { SentryPropagator } from './propagator';

packages/opentelemetry-node/src/spanprocessor.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Context } from '@opentelemetry/api';
22
import { SpanKind, trace } from '@opentelemetry/api';
33
import type { Span as OtelSpan, SpanProcessor as OtelSpanProcessor } from '@opentelemetry/sdk-trace-base';
44
import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
5-
import { addGlobalEventProcessor, getCurrentHub, Transaction } from '@sentry/core';
5+
import { addGlobalEventProcessor, addTracingExtensions, getCurrentHub, Transaction } from '@sentry/core';
66
import type { DynamicSamplingContext, Span as SentrySpan, TraceparentData, TransactionContext } from '@sentry/types';
77
import { isString, logger } from '@sentry/utils';
88

@@ -22,6 +22,8 @@ export const SENTRY_SPAN_PROCESSOR_MAP: Map<SentrySpan['spanId'], SentrySpan> =
2222
*/
2323
export class SentrySpanProcessor implements OtelSpanProcessor {
2424
public constructor() {
25+
addTracingExtensions();
26+
2527
addGlobalEventProcessor(event => {
2628
const otelSpan = trace && trace.getActiveSpan && (trace.getActiveSpan() as OtelSpan | undefined);
2729
if (!otelSpan) {

packages/opentelemetry-node/test/propagator.test.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import {
77
TraceFlags,
88
} from '@opentelemetry/api';
99
import { suppressTracing } from '@opentelemetry/core';
10-
import { Hub, makeMain } from '@sentry/core';
11-
import { addExtensionMethods, Transaction } from '@sentry/tracing';
10+
import { addTracingExtensions, Hub, makeMain, Transaction } from '@sentry/core';
1211
import type { TransactionContext } from '@sentry/types';
1312

1413
import {
@@ -21,7 +20,7 @@ import { SentryPropagator } from '../src/propagator';
2120
import { SENTRY_SPAN_PROCESSOR_MAP } from '../src/spanprocessor';
2221

2322
beforeAll(() => {
24-
addExtensionMethods();
23+
addTracingExtensions();
2524
});
2625

2726
describe('SentryPropagator', () => {

packages/opentelemetry-node/test/spanprocessor.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import { Resource } from '@opentelemetry/resources';
44
import type { Span as OtelSpan } from '@opentelemetry/sdk-trace-base';
55
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
66
import { SemanticAttributes, SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
7-
import { createTransport, Hub, makeMain } from '@sentry/core';
7+
import type { SpanStatusType } from '@sentry/core';
8+
import { addTracingExtensions, createTransport, Hub, makeMain, Span as SentrySpan, Transaction } from '@sentry/core';
89
import { NodeClient } from '@sentry/node';
9-
import type { SpanStatusType } from '@sentry/tracing';
10-
import { addExtensionMethods, Span as SentrySpan, Transaction } from '@sentry/tracing';
1110
import { resolvedSyncPromise } from '@sentry/utils';
1211

1312
import { SENTRY_SPAN_PROCESSOR_MAP, SentrySpanProcessor } from '../src/spanprocessor';
@@ -24,7 +23,7 @@ const DEFAULT_NODE_CLIENT_OPTIONS = {
2423
// Integration Test of SentrySpanProcessor
2524

2625
beforeAll(() => {
27-
addExtensionMethods();
26+
addTracingExtensions();
2827
});
2928

3029
describe('SentrySpanProcessor', () => {

0 commit comments

Comments
 (0)