properly generate traceParent

Author: Lms24

packages/core/src/utils/spanUtils.ts

@@ -17,7 +17,7 @@ import type { SpanStatus } from '../types-hoist/spanStatus';
 import { addNonEnumerableProperty } from '../utils/object';
 import { generateSpanId } from '../utils/propagationContext';
 import { timestampInSeconds } from '../utils/time';
-import { generateSentryTraceHeader } from '../utils/tracing';
+import { generateSentryTraceHeader, generateTraceparentHeader } from '../utils/tracing';
 import { consoleSandbox } from './debug-logger';
 import { _getSpanForScope } from './spanOnScope';
 
@@ -77,6 +77,15 @@ export function spanToTraceHeader(span: Span): string {
   return generateSentryTraceHeader(traceId, spanId, sampled);
 }
 
+/**
+ * Convert a Span to a W3C traceparent header.
+ */
+export function spanToTraceparentHeader(span: Span): string {
+  const { traceId, spanId } = span.spanContext();
+  const sampled = spanIsSampled(span);
+  return generateTraceparentHeader(traceId, spanId, sampled);
+}
+
 /**
  *  Converts the span links array to a flattened version to be sent within an envelope.
  *

packages/core/src/utils/traceData.ts

@@ -9,8 +9,8 @@ import type { Span } from '../types-hoist/span';
 import type { SerializedTraceData } from '../types-hoist/tracing';
 import { dynamicSamplingContextToSentryBaggageHeader } from './baggage';
 import { debug } from './debug-logger';
-import { getActiveSpan, spanToTraceHeader } from './spanUtils';
-import { extractTraceparentData, generateSentryTraceHeader, TRACEPARENT_REGEXP } from './tracing';
+import { getActiveSpan, spanToTraceHeader, spanToTraceparentHeader } from './spanUtils';
+import { generateSentryTraceHeader, generateTraceparentHeader, TRACEPARENT_REGEXP } from './tracing';
 
 /**
  * Extracts trace propagation data from the current span or from the client's scope (via transaction or propagation
@@ -58,7 +58,7 @@ export function getTraceData(
   };
 
   if (options.propagateTraceparent) {
-    const traceparent = _sentryTraceToTraceParentHeader(sentryTrace);
+    const traceparent = span ? spanToTraceparentHeader(span) : scopeToTraceparentHeader(scope);
     if (traceparent) {
       traceData.traceparent = traceparent;
     }
@@ -75,22 +75,7 @@ function scopeToTraceHeader(scope: Scope): string {
   return generateSentryTraceHeader(traceId, propagationSpanId, sampled);
 }
 
-/**
- * Builds a W3C traceparent header from the given sentry-trace header.
- *
- * Why parse that header and not create traceparent from primitives?
- * We want these two headers to always have the same ids. The easiest way to do this is to take
- * one of them as the source of truth (sentry-trace) and derive the other from it.
- *
- * Most importantly, this guarantees parentSpanId consistency between sentry-trace and traceparent
- * in tracing without performance (TwP) mode, where we always generate a random parentSpanId.
- *
- * Exported for testing
- */
-export function _sentryTraceToTraceParentHeader(sentryTrace: string): string | undefined {
-  const { traceId, parentSpanId, parentSampled } = extractTraceparentData(sentryTrace) || {};
-  if (!traceId || !parentSpanId) {
-    return undefined;
-  }
-  return `00-${traceId}-${parentSpanId}-${parentSampled ? '01' : '00'}`;
+function scopeToTraceparentHeader(scope: Scope): string {
+  const { traceId, sampled, propagationSpanId } = scope.getPropagationContext();
+  return generateTraceparentHeader(traceId, propagationSpanId, sampled);
 }

packages/core/src/utils/tracing.ts

@@ -102,6 +102,17 @@ export function generateSentryTraceHeader(
   return `${traceId}-${spanId}${sampledString}`;
 }
 
+/**
+ * Creates a W3C traceparent header from the given trace and span ids.
+ */
+export function generateTraceparentHeader(
+  traceId: string | undefined = generateTraceId(),
+  spanId: string | undefined = generateSpanId(),
+  sampled?: boolean,
+): string {
+  return `00-${traceId}-${spanId}-${sampled ? '01' : '00'}`;
+}
+
 /**
  * Given any combination of an incoming trace, generate a sample rand based on its defined semantics.
  *