Skip to content

Commit a592136

Browse files
andreiborzaandreiborza
committed
Remove leftover NodeTracerProvider
1 parent a13ee96 commit a592136

File tree

26 files changed

+52
-54
lines changed

26 files changed

+52
-54
lines changed

‎dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"dependencies": {
1414
"@opentelemetry/api": "^1.9.0",
15-
"@opentelemetry/sdk-trace-node": "^1.25.1",
15+
"@opentelemetry/sdk-trace-node": "^2.0.0",
1616
"@sentry/node": "latest || *",
1717
"@sentry/opentelemetry": "latest || *",
1818
"@types/express": "4.17.17",

‎dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"test:assert": "pnpm test"
1212
},
1313
"dependencies": {
14-
"@opentelemetry/sdk-node": "0.52.1",
15-
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
14+
"@opentelemetry/sdk-node": "0.200.0",
15+
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
1616
"@sentry/core": "latest || *",
1717
"@sentry/node": "latest || *",
1818
"@sentry/opentelemetry": "latest || *",

‎dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
"test:assert": "pnpm test"
1212
},
1313
"dependencies": {
14-
"@opentelemetry/sdk-trace-node": "1.26.0",
15-
"@opentelemetry/exporter-trace-otlp-http": "0.53.0",
14+
"@opentelemetry/sdk-trace-node": "2.0.0",
15+
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
1616
"@opentelemetry/instrumentation-undici": "0.6.0",
17-
"@opentelemetry/instrumentation-http": "0.53.0",
18-
"@opentelemetry/instrumentation": "0.53.0",
17+
"@opentelemetry/instrumentation-http": "0.200.0",
18+
"@opentelemetry/instrumentation": "0.200.0",
1919
"@sentry/core": "latest || *",
2020
"@sentry/node": "latest || *",
2121
"@sentry/opentelemetry": "latest || *",

‎dev-packages/e2e-tests/test-applications/node-otel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"test:assert": "pnpm test"
1212
},
1313
"dependencies": {
14-
"@opentelemetry/sdk-node": "0.52.1",
15-
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
14+
"@opentelemetry/sdk-node": "0.200.0",
15+
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
1616
"@sentry/core": "latest || *",
1717
"@sentry/node": "latest || *",
1818
"@sentry/opentelemetry": "latest || *",

‎packages/node/src/sdk/client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as os from 'node:os';
22
import type { Tracer } from '@opentelemetry/api';
33
import { trace } from '@opentelemetry/api';
44
import { registerInstrumentations } from '@opentelemetry/instrumentation';
5-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
5+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
66
import type { DynamicSamplingContext, Scope, ServerRuntimeClientOptions, TraceContext } from '@sentry/core';
77
import { SDK_VERSION, ServerRuntimeClient, applySdkMetadata, logger } from '@sentry/core';
88
import { getTraceContextForScope } from '@sentry/opentelemetry';
@@ -14,7 +14,7 @@ const DEFAULT_CLIENT_REPORT_FLUSH_INTERVAL_MS = 60_000; // 60s was chosen arbitr
1414

1515
/** A client for using Sentry with Node & OpenTelemetry. */
1616
export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
17-
public traceProvider: NodeTracerProvider | undefined;
17+
public traceProvider: BasicTracerProvider | undefined;
1818
private _tracer: Tracer | undefined;
1919
private _clientReportInterval: NodeJS.Timeout | undefined;
2020
private _clientReportOnExitFlushListener: (() => void) | undefined;

‎packages/node/src/sdk/initOtel.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ function getPreloadMethods(integrationNames?: string[]): ((() => void) & { id: s
108108
}
109109

110110
/** Just exported for tests. */
111-
export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOptions = {}): NodeTracerProvider {
111+
export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOptions = {}): BasicTracerProvider {
112112
// Create and configure NodeTracerProvider
113113
const provider = new BasicTracerProvider({
114114
sampler: new SentrySampler(client),

‎packages/node/src/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Span as WriteableSpan } from '@opentelemetry/api';
22
import type { Instrumentation } from '@opentelemetry/instrumentation';
3-
import type { ReadableSpan, SpanProcessor } from '@opentelemetry/sdk-trace-node';
3+
import type { ReadableSpan, SpanProcessor } from '@opentelemetry/sdk-trace-base';
44
import type { ClientOptions, Options, SamplingContext, Scope, Span, TracePropagationTargets } from '@sentry/core';
55

66
import type { NodeTransportOptions } from './transports';

‎packages/node/test/helpers/mockSdkInit.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
2-
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2+
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
33
import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
44
import type { NodeClient } from '../../src';
55

@@ -27,7 +27,7 @@ export function mockSdkInit(options?: Partial<NodeClientOptions>) {
2727
});
2828
}
2929

30-
export function cleanupOtel(_provider?: NodeTracerProvider): void {
30+
export function cleanupOtel(_provider?: BasicTracerProvider): void {
3131
const provider = getProvider(_provider);
3232

3333
if (!provider) {
@@ -43,14 +43,14 @@ export function cleanupOtel(_provider?: NodeTracerProvider): void {
4343
propagation.disable();
4444
}
4545

46-
export function getProvider(_provider?: NodeTracerProvider): NodeTracerProvider | undefined {
46+
export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
4747
let provider = _provider || getClient<NodeClient>()?.traceProvider || trace.getTracerProvider();
4848

4949
if (provider instanceof ProxyTracerProvider) {
5050
provider = provider.getDelegate();
5151
}
5252

53-
if (!(provider instanceof NodeTracerProvider)) {
53+
if (!(provider instanceof BasicTracerProvider)) {
5454
return undefined;
5555
}
5656

‎packages/node/test/integration/transactions.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TraceFlags, context, trace } from '@opentelemetry/api';
2-
import type { SpanProcessor } from '@opentelemetry/sdk-trace-node';
2+
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
33
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
44
import { logger } from '@sentry/core';
55
import type { TransactionEvent } from '@sentry/core';

‎packages/opentelemetry/src/custom/client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Tracer } from '@opentelemetry/api';
22
import { trace } from '@opentelemetry/api';
3-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
3+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
44
import type { Client } from '@sentry/core';
55
import { SDK_VERSION } from '@sentry/core';
66
import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../types';
@@ -23,7 +23,7 @@ export function wrapClientClass<
2323
>(ClientClass: ClassConstructor): WrappedClassConstructor {
2424
// @ts-expect-error We just assume that this is non-abstract, if you pass in an abstract class this would make it non-abstract
2525
class OpenTelemetryClient extends ClientClass implements OpenTelemetryClientInterface {
26-
public traceProvider: NodeTracerProvider | undefined;
26+
public traceProvider: BasicTracerProvider | undefined;
2727
private _tracer: Tracer | undefined;
2828

2929
public constructor(...args: any[]) {

‎packages/opentelemetry/src/sampler.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import type { Context, Span, TraceState as TraceStateInterface } from '@opentelemetry/api';
33
import { SpanKind, isSpanContextValid, trace } from '@opentelemetry/api';
44
import { TraceState } from '@opentelemetry/core';
5-
import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-node';
6-
import { SamplingDecision } from '@opentelemetry/sdk-trace-node';
5+
import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base';
6+
import { SamplingDecision } from '@opentelemetry/sdk-trace-base';
77
import {
88
ATTR_HTTP_REQUEST_METHOD,
99
ATTR_URL_FULL,

‎packages/opentelemetry/src/spanExporter.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-lines */
22
import type { Span } from '@opentelemetry/api';
33
import { SpanKind } from '@opentelemetry/api';
4-
import type { ReadableSpan } from '@opentelemetry/sdk-trace-node';
4+
import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
55
import { ATTR_HTTP_RESPONSE_STATUS_CODE, SEMATTRS_HTTP_STATUS_CODE } from '@opentelemetry/semantic-conventions';
66
import type {
77
SpanAttributes,

‎packages/opentelemetry/src/spanProcessor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { Context } from '@opentelemetry/api';
22
import { ROOT_CONTEXT, trace } from '@opentelemetry/api';
3-
import type { ReadableSpan, Span, SpanProcessor as SpanProcessorInterface } from '@opentelemetry/sdk-trace-node';
3+
import type { ReadableSpan, Span, SpanProcessor as SpanProcessorInterface } from '@opentelemetry/sdk-trace-base';
44
import {
55
addChildSpanToSpan,
66
getClient,

‎packages/opentelemetry/src/types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { Span as WriteableSpan, SpanKind, Tracer } from '@opentelemetry/api';
2-
import type { NodeTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-node';
2+
import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
33
import type { Scope, Span, StartSpanOptions } from '@sentry/core';
44

55
export interface OpenTelemetryClient {
66
tracer: Tracer;
7-
traceProvider: NodeTracerProvider | undefined;
7+
traceProvider: BasicTracerProvider | undefined;
88
}
99

1010
export interface OpenTelemetrySpanContext extends StartSpanOptions {

‎packages/opentelemetry/src/utils/getRequestSpanData.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Span } from '@opentelemetry/api';
2-
import type { ReadableSpan } from '@opentelemetry/sdk-trace-node';
2+
import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
33
import {
44
ATTR_HTTP_REQUEST_METHOD,
55
ATTR_URL_FULL,

‎packages/opentelemetry/src/utils/groupSpansWithParents.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { ReadableSpan } from '@opentelemetry/sdk-trace-node';
1+
import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
22
import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from '../semanticAttributes';
33

44
export interface SpanNode {

‎packages/opentelemetry/src/utils/spanTypes.ts

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { SpanKind, SpanStatus } from '@opentelemetry/api';
2-
import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-node';
2+
import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base';
33

44
import type { AbstractSpan } from '../types';
55

@@ -52,9 +52,7 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
5252
* This is necessary because the base `Span` type does not have a kind,
5353
* so in places where we are passed a generic span, we need to check if we want to access it.
5454
*/
55-
export function spanHasParentId<SpanType extends AbstractSpan>(
56-
span: SpanType,
57-
): span is SpanType {
55+
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
5856
const castSpan = span as ReadableSpan;
5957
return !!castSpan.parentSpanContext?.spanId;
6058
}

‎packages/opentelemetry/test/asyncContextStrategy.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
1+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
22
import {
33
Scope as ScopeClass,
44
getCurrentScope,
@@ -16,7 +16,7 @@ import { setupOtel } from './helpers/initOtel';
1616
import { cleanupOtel } from './helpers/mockSdkInit';
1717

1818
describe('asyncContextStrategy', () => {
19-
let provider: NodeTracerProvider | undefined;
19+
let provider: BasicTracerProvider | undefined;
2020

2121
beforeEach(() => {
2222
getCurrentScope().clear();

‎packages/opentelemetry/test/helpers/mockSdkInit.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
2-
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2+
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
33
import type { ClientOptions, Options } from '@sentry/core';
44
import { getClient } from '@sentry/core';
55

66
import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
77
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
88
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
99
import { init as initTestClient } from './TestClient';
10+
import type { TestClientInterface } from './TestClient';
1011
import { initOtel } from './initOtel';
11-
import type { OpenTelemetryClient } from '../../src/types';
1212

1313
const PUBLIC_DSN = 'https://username@domain/123';
1414

@@ -35,7 +35,7 @@ export function mockSdkInit(options?: Partial<ClientOptions>) {
3535
init({ dsn: PUBLIC_DSN, ...options });
3636
}
3737

38-
export async function cleanupOtel(_provider?: NodeTracerProvider): Promise<void> {
38+
export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void> {
3939
clearOpenTelemetrySetupCheck();
4040

4141
const provider = getProvider(_provider);
@@ -53,14 +53,14 @@ export async function cleanupOtel(_provider?: NodeTracerProvider): Promise<void>
5353
await flush();
5454
}
5555

56-
export function getProvider(_provider?: NodeTracerProvider): NodeTracerProvider | undefined {
57-
let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
56+
export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
57+
let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();
5858

5959
if (provider instanceof ProxyTracerProvider) {
6060
provider = provider.getDelegate();
6161
}
6262

63-
if (!(provider instanceof NodeTracerProvider)) {
63+
if (!(provider instanceof BasicTracerProvider)) {
6464
return undefined;
6565
}
6666

‎packages/opentelemetry/test/integration/transactions.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { SpanContext } from '@opentelemetry/api';
22
import { ROOT_CONTEXT } from '@opentelemetry/api';
33
import { TraceFlags, context, trace } from '@opentelemetry/api';
4-
import type { SpanProcessor } from '@opentelemetry/sdk-trace-node';
4+
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
55
import {
66
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
77
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,

‎packages/opentelemetry/test/sampler.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SpanKind, context, trace } from '@opentelemetry/api';
22
import { TraceState } from '@opentelemetry/core';
3-
import { SamplingDecision } from '@opentelemetry/sdk-trace-node';
3+
import { SamplingDecision } from '@opentelemetry/sdk-trace-base';
44
import { ATTR_HTTP_REQUEST_METHOD } from '@opentelemetry/semantic-conventions';
55
import { generateSpanId, generateTraceId } from '@sentry/core';
66
import { describe, afterEach, vi, expect, it } from 'vitest';

‎packages/opentelemetry/test/trace.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import type { Span, TimeInput } from '@opentelemetry/api';
33
import { ROOT_CONTEXT } from '@opentelemetry/api';
44
import { SpanKind } from '@opentelemetry/api';
55
import { TraceFlags, context, trace } from '@opentelemetry/api';
6-
import type { ReadableSpan } from '@opentelemetry/sdk-trace-node';
7-
import { Span as SpanClass } from '@opentelemetry/sdk-trace-node';
6+
import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
7+
import { Span as SpanClass } from '@opentelemetry/sdk-trace-base';
88
import {
99
SEMANTIC_ATTRIBUTE_SENTRY_OP,
1010
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,

‎packages/opentelemetry/test/utils/getActiveSpan.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { trace } from '@opentelemetry/api';
2-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
2+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
33
import { getRootSpan } from '@sentry/core';
44
import { describe, afterEach, beforeEach, expect, it } from 'vitest';
55

@@ -9,7 +9,7 @@ import { setupOtel } from '../helpers/initOtel';
99
import { cleanupOtel } from '../helpers/mockSdkInit';
1010

1111
describe('getActiveSpan', () => {
12-
let provider: NodeTracerProvider | undefined;
12+
let provider: BasicTracerProvider | undefined;
1313

1414
beforeEach(() => {
1515
const client = new TestClient(getDefaultTestClientOptions());
@@ -94,7 +94,7 @@ describe('getActiveSpan', () => {
9494
});
9595

9696
describe('getRootSpan', () => {
97-
let provider: NodeTracerProvider | undefined;
97+
let provider: BasicTracerProvider | undefined;
9898

9999
beforeEach(() => {
100100
const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));

‎packages/opentelemetry/test/utils/setupCheck.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
1+
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
22
import { describe, afterEach, beforeEach, expect, it } from 'vitest';
33

44
import { SentrySampler } from '../../src/sampler';
@@ -9,7 +9,7 @@ import { setupOtel } from '../helpers/initOtel';
99
import { cleanupOtel } from '../helpers/mockSdkInit';
1010

1111
describe('openTelemetrySetupCheck', () => {
12-
let provider: NodeTracerProvider | undefined;
12+
let provider: BasicTracerProvider | undefined;
1313

1414
beforeEach(() => {
1515
cleanupOtel(provider);
@@ -34,7 +34,7 @@ describe('openTelemetrySetupCheck', () => {
3434

3535
it('returns partial setup parts', () => {
3636
const client = new TestClient(getDefaultTestClientOptions());
37-
provider = new NodeTracerProvider({
37+
provider = new BasicTracerProvider({
3838
sampler: new SentrySampler(client),
3939
spanProcessors: [new SentrySpanProcessor()],
4040
});

‎packages/opentelemetry/test/utils/setupEventContextTrace.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
1+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
22
import { captureException, setCurrentClient } from '@sentry/core';
33
import { describe, afterEach, beforeEach, expect, it, vi, afterAll } from 'vitest';
44

@@ -13,7 +13,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
1313
describe('setupEventContextTrace', () => {
1414
const beforeSend = vi.fn(() => null);
1515
let client: TestClientInterface;
16-
let provider: NodeTracerProvider | undefined;
16+
let provider: BasicTracerProvider | undefined;
1717

1818
beforeEach(() => {
1919
client = new TestClient(

‎packages/vercel-edge/src/client.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { ServerRuntimeClientOptions } from '@sentry/core';
22
import { applySdkMetadata } from '@sentry/core';
33
import { ServerRuntimeClient } from '@sentry/core';
44

5-
import type { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
5+
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
66
import type { VercelEdgeClientOptions } from './types';
77

88
declare const process: {
@@ -16,7 +16,7 @@ declare const process: {
1616
* @see ServerRuntimeClient for usage documentation.
1717
*/
1818
export class VercelEdgeClient extends ServerRuntimeClient<VercelEdgeClientOptions> {
19-
public traceProvider: NodeTracerProvider | undefined;
19+
public traceProvider: BasicTracerProvider | undefined;
2020

2121
/**
2222
* Creates a new Vercel Edge Runtime SDK instance.

0 commit comments

Comments
 (0)