Skip to content

Commit 7cc0006

Browse files
committed
Remove leftover NodeTracerProvider
1 parent 498a2ae commit 7cc0006

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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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[]) {

0 commit comments

Comments
 (0)