Skip to content
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