Fix?

Author: Luca Forstner

packages/core/src/tracing/trace.ts

@@ -346,7 +346,7 @@ export function continueTrace<V>(
   const transactionContext: Partial<TransactionContext> = {
     ...traceparentData,
     metadata: dropUndefinedKeys({
-      dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+      dynamicSamplingContext,
     }),
   };
 

packages/core/test/lib/tracing/trace.test.ts

@@ -1,4 +1,3 @@
-import { tracingContextFromHeaders } from '@sentry/utils';
 import {
   Hub,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,

packages/tracing-internal/src/browser/browsertracing.ts

@@ -5,8 +5,6 @@ import {
   TRACING_DEFAULTS,
   addTracingExtensions,
   getActiveTransaction,
-  spanIsSampled,
-  spanToJSON,
   startIdleTransaction,
 } from '@sentry/core';
 import type { EventProcessor, Integration, Transaction, TransactionContext, TransactionSource } from '@sentry/types';
@@ -310,23 +308,27 @@ export class BrowserTracing implements Integration {
 
     const isPageloadTransaction = context.op === 'pageload';
 
-    const sentryTrace = isPageloadTransaction ? getMetaContent('sentry-trace') : '';
-    const baggage = isPageloadTransaction ? getMetaContent('baggage') : '';
-    const { traceparentData, dynamicSamplingContext, propagationContext } = tracingContextFromHeaders(
-      sentryTrace,
-      baggage,
-    );
-
-    const expandedContext: TransactionContext = {
-      ...context,
-      ...traceparentData,
-      metadata: {
-        // eslint-disable-next-line deprecation/deprecation
-        ...context.metadata,
-        dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
-      },
-      trimEnd: true,
-    };
+    let expandedContext: TransactionContext;
+    if (isPageloadTransaction) {
+      const sentryTrace = isPageloadTransaction ? getMetaContent('sentry-trace') : '';
+      const baggage = isPageloadTransaction ? getMetaContent('baggage') : undefined;
+      const { traceparentData, dynamicSamplingContext } = tracingContextFromHeaders(sentryTrace, baggage);
+      expandedContext = {
+        ...context,
+        ...traceparentData,
+        metadata: {
+          // eslint-disable-next-line deprecation/deprecation
+          ...context.metadata,
+          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+        },
+        trimEnd: true,
+      };
+    } else {
+      expandedContext = {
+        ...context,
+        trimEnd: true,
+      };
+    }
 
     const modifiedContext = typeof beforeNavigate === 'function' ? beforeNavigate(expandedContext) : expandedContext;
 
@@ -384,24 +386,6 @@ export class BrowserTracing implements Integration {
       }
     }
 
-    // eslint-disable-next-line deprecation/deprecation
-    const scope = hub.getScope();
-
-    // If it's a pageload and there is a meta tag set
-    // use the traceparentData as the propagation context
-    if (isPageloadTransaction && traceparentData) {
-      scope.setPropagationContext(propagationContext);
-    } else {
-      // Navigation transactions should set a new propagation context based on the
-      // created idle transaction.
-      scope.setPropagationContext({
-        traceId: idleTransaction.spanContext().traceId,
-        spanId: idleTransaction.spanContext().spanId,
-        parentSpanId: spanToJSON(idleTransaction).parent_span_id,
-        sampled: spanIsSampled(idleTransaction),
-      });
-    }
-
     idleTransaction.registerBeforeFinishCallback(transaction => {
       this._collectWebVitals();
       addPerformanceEntries(transaction);

packages/utils/src/tracing.ts

@@ -59,28 +59,28 @@ export function tracingContextFromHeaders(
 
   const { traceId, parentSpanId, parentSampled } = traceparentData || {};
 
-  let propagationContext: PropagationContext;
-
   if (!traceparentData) {
-    propagationContext = {
-      traceId: traceId || uuid4(),
-      spanId: uuid4().substring(16),
+    return {
+      traceparentData,
+      dynamicSamplingContext: undefined,
+      propagationContext: {
+        traceId: traceId || uuid4(),
+        spanId: uuid4().substring(16),
+      },
     };
   } else {
-    propagationContext = {
-      traceId: traceId || uuid4(),
-      parentSpanId: parentSpanId || uuid4().substring(16),
-      spanId: uuid4().substring(16),
-      sampled: parentSampled,
-      dsc: dynamicSamplingContext || {}, // If we have traceparent data but no DSC it means we are not head of trace and we must freeze it
+    return {
+      traceparentData,
+      dynamicSamplingContext: dynamicSamplingContext || {}, // If we have traceparent data but no DSC it means we are not head of trace and we must freeze it
+      propagationContext: {
+        traceId: traceId || uuid4(),
+        parentSpanId: parentSpanId || uuid4().substring(16),
+        spanId: uuid4().substring(16),
+        sampled: parentSampled,
+        dsc: dynamicSamplingContext || {}, // If we have traceparent data but no DSC it means we are not head of trace and we must freeze it
+      },
     };
   }
-
-  return {
-    traceparentData,
-    dynamicSamplingContext: dynamicSamplingContext || {}, // If we have traceparent data but no DSC it means we are not head of trace and we must freeze it,
-    propagationContext,
-  };
 }
 
 /**