Skip to content

Commit 4132f4a

Browse files
committed
Working?
1 parent d9fa8ba commit 4132f4a

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

packages/opentelemetry/src/propagator.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
baggageHeaderToDynamicSamplingContext,
88
debug,
99
generateSentryTraceHeader,
10+
generateTraceparentHeader,
1011
getClient,
1112
getCurrentScope,
1213
getDynamicSamplingContextFromScope,
@@ -54,7 +55,7 @@ export class SentryPropagator extends W3CBaggagePropagator {
5455
const activeSpan = trace.getSpan(context);
5556
const url = activeSpan && getCurrentURL(activeSpan);
5657

57-
const tracePropagationTargets = getClient()?.getOptions()?.tracePropagationTargets;
58+
const { tracePropagationTargets, propagateTraceparent } = getClient()?.getOptions() || {};
5859
if (!shouldPropagateTraceForUrl(url, tracePropagationTargets, this._urlMatchesTargetsMap)) {
5960
DEBUG_BUILD &&
6061
debug.log('[Tracing] Not injecting trace data for url because it does not match tracePropagationTargets:', url);
@@ -85,6 +86,10 @@ export class SentryPropagator extends W3CBaggagePropagator {
8586
}, baggage);
8687
}
8788

89+
if (propagateTraceparent) {
90+
setter.set(carrier, 'traceparent', generateTraceparentHeader(traceId, spanId, sampled));
91+
}
92+
8893
// We also want to avoid setting the default OTEL trace ID, if we get that for whatever reason
8994
if (traceId && traceId !== INVALID_TRACEID) {
9095
setter.set(carrier, SENTRY_TRACE_HEADER, generateSentryTraceHeader(traceId, spanId, sampled));

0 commit comments

Comments
 (0)