Skip to content

fix(node-otel): Suppress tracing for generated sentry spans #9142

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.

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
merged 1 commit into from
Oct 2, 2023
Merged
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
8 changes: 6 additions & 2 deletions packages/opentelemetry-node/src/spanprocessor.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Context } from '@opentelemetry/api';
import { SpanKind, trace } from '@opentelemetry/api';
import { context, SpanKind, trace } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import type { Span as OtelSpan, SpanProcessor as OtelSpanProcessor } from '@opentelemetry/sdk-trace-base';
import { addGlobalEventProcessor, addTracingExtensions, getCurrentHub, Transaction } from '@sentry/core';
import type { DynamicSamplingContext, Span as SentrySpan, TraceparentData, TransactionContext } from '@sentry/types';
Expand Down Expand Up @@ -121,7 +122,10 @@ export class SentrySpanProcessor implements OtelSpanProcessor {
updateSpanWithOtelData(sentrySpan, otelSpan);
}

sentrySpan.finish(convertOtelTimeToSeconds(otelSpan.endTime));
// Ensure we do not capture any OTEL spans for finishing (and sending) this
context.with(suppressTracing(context.active()), () => {
sentrySpan.finish(convertOtelTimeToSeconds(otelSpan.endTime));
});

clearSpan(otelSpanId);
}
Expand Down