clean up DSC and sampled value logic

Lms24 · Lms24 · commit 62f5e22e35fa · 2024-04-17T12:11:07.000+02:00
fix incorrect `baggage` header in &lt;meta&gt; integration test
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/template.html b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/template.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="sentry-trace" content="12345678901234567890123456789012-1234567890123456-1" />
     <meta name="baggage"
-          content="sentry-trace_id=12345678901234567890123456789012,sentry-sample_rate=0.2,sentry-transaction=my-transaction,sentry-public_key=public,sentry-release=1.0.0,sentry-environment=prod"/>
+          content="sentry-trace_id=12345678901234567890123456789012,sentry-sample_rate=0.2,sentry-sampled=true,sentry-transaction=my-transaction,sentry-public_key=public,sentry-release=1.0.0,sentry-environment=prod"/>
   </head>
   <body>
     <button id="errorBtn">Throw Error</button>
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
@@ -10,7 +10,7 @@ import {
 const META_TAG_TRACE_ID = '12345678901234567890123456789012';
 const META_TAG_PARENT_SPAN_ID = '1234567890123456';
 const META_TAG_BAGGAGE =
-  'sentry-trace_id=12345678901234567890123456789012,sentry-sample_rate=0.2,sentry-transaction=my-transaction,sentry-public_key=public,sentry-release=1.0.0,sentry-environment=prod';
+  'sentry-trace_id=12345678901234567890123456789012,sentry-sample_rate=0.2,sentry-sampled=true,sentry-transaction=my-transaction,sentry-public_key=public,sentry-release=1.0.0,sentry-environment=prod';
 
 sentryTest(
   'create a new trace for a navigation after the <meta> tag pageload trace',
diff --git a/packages/browser/src/tracing/browserTracingIntegration.ts b/packages/browser/src/tracing/browserTracingIntegration.ts
@@ -18,7 +18,6 @@ import {
   getIsolationScope,
   getRootSpan,
   registerSpanErrorInstrumentation,
-  spanIsSampled,
   spanToJSON,
   startIdleSpan,
   withScope,
@@ -298,10 +297,13 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
         const scope = getCurrentScope();
         const oldPropagationContext = scope.getPropagationContext();
 
+        const newDsc = oldPropagationContext.dsc || getDynamicSamplingContextFromSpan(span);
+        const newDscSampled = newDsc.sampled === 'true' ? true : newDsc.sampled === 'false' ? false : undefined;
+
         const newPropagationContext = {
           ...oldPropagationContext,
-          sampled: oldPropagationContext.sampled !== undefined ? oldPropagationContext.sampled : spanIsSampled(span),
-          dsc: oldPropagationContext.dsc || getDynamicSamplingContextFromSpan(span),
+          sampled: newDscSampled,
+          dsc: newDsc,
         };
 
         scope.setPropagationContext(newPropagationContext);
