.

Author: Luca Forstner

dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts

@@ -45,6 +45,7 @@ sentryTest('sends a segment span envelope', async ({ getLocalTestUrl, page }) =>
     data: {
       'sentry.origin': 'manual',
       'sentry.sample_rate': 1,
+      'sentry.override_trace_sample_rate': true, // This should probably not be here but for now it will be.
       'sentry.source': 'custom',
     },
     description: 'standalone_segment_span',

packages/browser/test/tracing/browserTracingIntegration.test.ts

@@ -18,6 +18,7 @@ global.window.TextDecoder = TextDecoder;
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   TRACING_DEFAULTS,
@@ -103,6 +104,7 @@ describe('browserTracingIntegration', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
         [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
+        [SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE]: true,
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
       },
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
@@ -174,6 +176,7 @@ describe('browserTracingIntegration', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
         [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
+        [SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE]: true,
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
       },
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
@@ -288,6 +291,7 @@ describe('browserTracingIntegration', () => {
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
           [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
+          [SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE]: true,
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
         },
         span_id: expect.stringMatching(/[a-f0-9]{16}/),
@@ -323,6 +327,7 @@ describe('browserTracingIntegration', () => {
         data: {
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE]: true,
           [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
           testy: 'yes',

packages/core/src/envelope.ts

@@ -1,4 +1,5 @@
 import type { Client } from './client';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE } from './semanticAttributes';
 import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext';
 import type { SentrySpan } from './tracing/sentrySpan';
 import type {
@@ -141,6 +142,8 @@ export function createSpanEnvelope(spans: [SentrySpan, ...SentrySpan[]], client?
   const items: SpanItem[] = [];
   for (const span of spans) {
     const spanJson = convertToSpanJSON(span);
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete spanJson.data[SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE];
     if (spanJson) {
       items.push(createSpanEnvelopeItem(spanJson));
     }

packages/core/src/tracing/sampling.ts

@@ -21,7 +21,7 @@ export function sampleSpan(
     return [false];
   }
 
-  let shouldUpdateSampleRateOnDsc = false;
+  let shouldUpdateSampleRateOnDsc = undefined;
 
   // we would have bailed already if neither `tracesSampler` nor `tracesSampleRate` nor `enableTracing` were defined, so one of these should
   // work; prefer the hook if so

packages/core/src/tracing/sentrySpan.ts

@@ -351,7 +351,8 @@ export class SentrySpan implements Span {
     delete this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME];
     delete this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE];
     spans.forEach(span => {
-      span.data && delete span.data[SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME];
+      delete span.data[SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME];
+      delete span.data[SEMANTIC_ATTRIBUTE_SENTRY_OVERRIDE_TRACE_SAMPLE_RATE];
     });
     // eslint-enabled-next-line @typescript-eslint/no-dynamic-delete