Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 5 additions & 6 deletions packages/node/src/sdk/initOtel.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import moduleModule from 'module';
import { DiagLogLevel, diag } from '@opentelemetry/api';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
Expand Down Expand Up @@ -127,11 +127,10 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
],
});

// Initialize the provider
provider.register({
propagator: new SentryPropagator(),
contextManager: new SentryContextManager(),
});
// Register as globals
trace.setGlobalTracerProvider(provider);
propagation.setGlobalPropagator(new SentryPropagator());
context.setGlobalContextManager(new SentryContextManager());

return provider;
}
Expand Down
8 changes: 4 additions & 4 deletions packages/opentelemetry/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import {
setOpenTelemetryContextAsyncContextStrategy,
} from '@sentry/opentelemetry';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { context, propagation, trace } from '@opentelemetry/api';

function setupSentry() {
Sentry.init({
Expand All @@ -77,10 +78,9 @@ function setupSentry() {
const SentryContextManager = wrapContextManagerClass(AsyncLocalStorageContextManager);

// Initialize the provider
provider.register({
propagator: new SentryPropagator(),
contextManager: new SentryContextManager(),
});
trace.setGlobalTracerProvider(provider);
propagation.setGlobalPropagator(new SentryPropagator());
context.setGlobalContextManager(new SentryContextManager());

setOpenTelemetryContextAsyncContextStrategy();
}
Expand Down
10 changes: 4 additions & 6 deletions packages/opentelemetry/test/helpers/initOtel.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DiagLogLevel, diag } from '@opentelemetry/api';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
Expand Down Expand Up @@ -69,11 +69,9 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
// We use a custom context manager to keep context in sync with sentry scope
const SentryContextManager = wrapContextManagerClass(AsyncLocalStorageContextManager);

// Initialize the provider
provider.register({
propagator: new SentryPropagator(),
contextManager: new SentryContextManager(),
});
trace.setGlobalTracerProvider(provider);
propagation.setGlobalPropagator(new SentryPropagator());
context.setGlobalContextManager(new SentryContextManager());

return provider;
}
10 changes: 4 additions & 6 deletions packages/vercel-edge/src/sdk.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DiagLogLevel, diag } from '@opentelemetry/api';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand Down Expand Up @@ -171,11 +171,9 @@ export function setupOtel(client: VercelEdgeClient): void {

const SentryContextManager = wrapContextManagerClass(AsyncLocalStorageContextManager);

// Initialize the provider
provider.register({
propagator: new SentryPropagator(),
contextManager: new SentryContextManager(),
});
trace.setGlobalTracerProvider(provider);
propagation.setGlobalPropagator(new SentryPropagator());
context.setGlobalContextManager(new SentryContextManager());

client.traceProvider = provider;
}
Expand Down
Loading