feat: Pass parentSampleRate to tracesSampler

dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts

@@ -67,7 +67,6 @@ sentryTest('should capture an INP click event span after pageload', async ({ bro
       'sentry.exclusive_time': inpValue,
       'sentry.op': 'ui.interaction.click',
       'sentry.origin': 'auto.http.browser.inp',
-      'sentry.sample_rate': 1,
       'sentry.source': 'custom',
       transaction: 'test-url',
       'user_agent.original': expect.stringContaining('Chrome'),

dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts

@@ -70,7 +70,6 @@ sentryTest(
         'sentry.exclusive_time': inpValue,
         'sentry.op': 'ui.interaction.click',
         'sentry.origin': 'auto.http.browser.inp',
-        'sentry.sample_rate': 1,
         'sentry.source': 'custom',
         transaction: 'test-route',
         'user_agent.original': expect.stringContaining('Chrome'),

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts

@@ -250,7 +250,7 @@ sentryTest(
     const navigationTraceId = navigationTraceContext?.trace_id;
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${navigationTraceId}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toEqual(
-      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${navigationTraceId},sentry-sample_rate=1,sentry-sampled=true,sentry-sample_rand=${navigationTraceHeader?.sample_rand}`,
+      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${navigationTraceId},sentry-sampled=true,sentry-sample_rand=${navigationTraceHeader?.sample_rand},sentry-sample_rate=1`,
     );
   },
 );
@@ -313,7 +313,7 @@ sentryTest(
     const navigationTraceId = navigationTraceContext?.trace_id;
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${navigationTraceId}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toEqual(
-      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${navigationTraceId},sentry-sample_rate=1,sentry-sampled=true,sentry-sample_rand=${navigationTraceHeader?.sample_rand}`,
+      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${navigationTraceId},sentry-sampled=true,sentry-sample_rand=${navigationTraceHeader?.sample_rand},sentry-sample_rate=1`,
     );
   },
 );

dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts

@@ -240,7 +240,7 @@ sentryTest(
     // sampling decision is propagated from active span sampling decision
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${pageloadTraceId}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toBe(
-      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${pageloadTraceId},sentry-sample_rate=1,sentry-sampled=true,sentry-sample_rand=${pageloadTraceHeader?.sample_rand}`,
+      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${pageloadTraceId},sentry-sampled=true,sentry-sample_rand=${pageloadTraceHeader?.sample_rand},sentry-sample_rate=1`,
     );
   },
 );
@@ -297,7 +297,7 @@ sentryTest(
     // sampling decision is propagated from active span sampling decision
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${pageloadTraceId}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toBe(
-      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${pageloadTraceId},sentry-sample_rate=1,sentry-sampled=true,sentry-sample_rand=${pageloadTraceHeader?.sample_rand}`,
+      `sentry-environment=production,sentry-public_key=public,sentry-trace_id=${pageloadTraceId},sentry-sampled=true,sentry-sample_rand=${pageloadTraceHeader?.sample_rand},sentry-sample_rate=1`,
     );
   },
 );

dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts

@@ -31,7 +31,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.browser',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
           op: 'pageload',

dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.static.test.ts

@@ -36,7 +36,6 @@ test.describe('tracing in static/pre-rendered routes', () => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.browser',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
           op: 'pageload',

dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

@@ -31,7 +31,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.browser',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
           op: 'pageload',

dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.serverIslands.test.ts

@@ -33,7 +33,6 @@ test.describe('tracing in static routes with server islands', () => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.browser',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
           op: 'pageload',
@@ -75,7 +74,6 @@ test.describe('tracing in static routes with server islands', () => {
           data: expect.objectContaining({
             'sentry.op': 'http.server',
             'sentry.origin': 'auto.http.astro',
-            'sentry.sample_rate': 1,
             'sentry.source': 'route',
           }),
           op: 'http.server',

dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.static.test.ts

@@ -36,7 +36,6 @@ test.describe('tracing in static/pre-rendered routes', () => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.browser',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
           op: 'pageload',

dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/events.test.ts

@@ -32,7 +32,6 @@ test('Event emitter', async () => {
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     data: {
       'sentry.source': 'custom',
-      'sentry.sample_rate': 1,
       'sentry.op': 'event.nestjs',
       'sentry.origin': 'auto.event.nestjs',
     },

dev-packages/e2e-tests/test-applications/nestjs-distributed-tracing/tests/propagation.test.ts

@@ -89,7 +89,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,
@@ -204,7 +203,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts

@@ -36,7 +36,6 @@ test('Sends a pageload transaction', async ({ page }) => {
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.nextjs.app_router_instrumentation',
-            'sentry.sample_rate': 1,
             'sentry.source': 'url',
           }),
         },

dev-packages/e2e-tests/test-applications/node-fastify-5/tests/propagation.test.ts

@@ -89,7 +89,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,
@@ -204,7 +203,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,

dev-packages/e2e-tests/test-applications/node-fastify/tests/propagation.test.ts

@@ -89,7 +89,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,
@@ -204,7 +203,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,

dev-packages/e2e-tests/test-applications/node-koa/tests/propagation.test.ts

@@ -89,7 +89,6 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,
@@ -204,7 +203,6 @@ test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
       'sentry.source': 'route',
       'sentry.origin': 'auto.http.otel.http',
       'sentry.op': 'http.server',
-      'sentry.sample_rate': 1,
       url: `http://localhost:3030/test-inbound-headers/${id}`,
       'otel.kind': 'SERVER',
       'http.response.status_code': 200,

dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-assign/test.ts

@@ -1,3 +1,4 @@
+import { parseBaggageHeader } from '@sentry/core';
 import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
 import type { TestAPIResponse } from '../server';
 
@@ -102,14 +103,20 @@ test('Should populate and propagate sentry baggage if sentry-trace header does n
   const response = await runner.makeRequest<TestAPIResponse>('get', '/test/express');
 
   expect(response).toBeDefined();
-  expect(response).toMatchObject({
-    test_data: {
-      host: 'somewhere.not.sentry',
-      // TraceId changes, hence we only expect that the string contains the traceid key
-      baggage: expect.stringMatching(
-        /sentry-environment=prod,sentry-release=1.0,sentry-public_key=public,sentry-trace_id=[\S]*,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress/,
-      ),
-    },
+
+  const parsedBaggage = parseBaggageHeader(response?.test_data.baggage);
+
+  expect(response?.test_data.host).toBe('somewhere.not.sentry');
+  expect(parsedBaggage).toStrictEqual({
+    'sentry-environment': 'prod',
+    'sentry-release': '1.0',
+    'sentry-public_key': 'public',
+    // TraceId changes, hence we only expect that the string contains the traceid key
+    'sentry-trace_id': expect.stringMatching(/[\S]*/),
+    'sentry-sample_rand': expect.stringMatching(/[\S]*/),
+    'sentry-sample_rate': '1',
+    'sentry-sampled': 'true',
+    'sentry-transaction': 'GET /test/express',
   });
 });
 
@@ -123,13 +130,18 @@ test('Should populate Sentry and ignore 3rd party content if sentry-trace header
   });
 
   expect(response).toBeDefined();
-  expect(response).toMatchObject({
-    test_data: {
-      host: 'somewhere.not.sentry',
-      // TraceId changes, hence we only expect that the string contains the traceid key
-      baggage: expect.stringMatching(
-        /sentry-environment=prod,sentry-release=1.0,sentry-public_key=public,sentry-trace_id=[\S]*,sentry-sample_rate=1,sentry-transaction=GET%20%2Ftest%2Fexpress/,
-      ),
-    },
+  expect(response?.test_data.host).toBe('somewhere.not.sentry');
+
+  const parsedBaggage = parseBaggageHeader(response?.test_data.baggage);
+  expect(parsedBaggage).toStrictEqual({
+    'sentry-environment': 'prod',
+    'sentry-release': '1.0',
+    'sentry-public_key': 'public',
+    // TraceId changes, hence we only expect that the string contains the traceid key
+    'sentry-trace_id': expect.stringMatching(/[\S]*/),
+    'sentry-sample_rand': expect.stringMatching(/[\S]*/),
+    'sentry-sample_rate': '1',
+    'sentry-sampled': 'true',
+    'sentry-transaction': 'GET /test/express',
   });
 });

dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts

@@ -10,6 +10,7 @@ test('envelope header for error event during active unsampled span is correct',
           public_key: 'public',
           environment: 'production',
           release: '1.0',
+          sample_rate: '0',
           sampled: 'false',
           sample_rand: expect.any(String),
         },

dev-packages/node-integration-tests/suites/sample-rand-propagation/test.ts → dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/test.ts

@@ -1,4 +1,4 @@
-import { cleanupChildProcesses, createRunner } from '../../utils/runner';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
 describe('sample_rand propagation', () => {
   afterAll(() => {

dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js

@@ -0,0 +1,39 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  transport: loggingTransport,
+});
+
+// express must be required after Sentry is initialized
+const express = require('express');
+const cors = require('cors');
+const {
+  startExpressServerAndSendPortToRunner,
+  getPortAppIsRunningOn,
+} = require('@sentry-internal/node-integration-tests');
+
+const app = express();
+
+app.use(cors());
+
+app.get('/check', (req, res) => {
+  const appPort = getPortAppIsRunningOn(app);
+  // eslint-disable-next-line no-undef
+  fetch(`http://localhost:${appPort}/bounce`)
+    .then(r => r.json())
+    .then(bounceRes => {
+      res.json({ propagatedData: bounceRes });
+    });
+});
+
+app.get('/bounce', (req, res) => {
+  res.json({
+    baggage: req.headers['baggage'],
+  });
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/test.ts

@@ -0,0 +1,25 @@
+import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+
+describe('parentSampleRate propagation with no tracing enabled', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('should propagate an incoming sample rate', async () => {
+    const runner = createRunner(__dirname, 'server.js').start();
+    const response = await runner.makeRequest('get', '/check', {
+      headers: {
+        'sentry-trace': '530699e319cc067ce440315d74acb312-414dc2a08d5d1dac-1',
+        baggage: 'sentry-sample_rate=0.1337',
+      },
+    });
+
+    expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rate=0\.1337/);
+  });
+
+  test('should not propagate a sample rate for root traces', async () => {
+    const runner = createRunner(__dirname, 'server.js').start();
+    const response = await runner.makeRequest('get', '/check');
+    expect((response as any).propagatedData.baggage).not.toMatch(/sentry-sample_rate/);
+  });
+});

dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js

@@ -0,0 +1,40 @@
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  transport: loggingTransport,
+  tracesSampleRate: 0,
+});
+
+// express must be required after Sentry is initialized
+const express = require('express');
+const cors = require('cors');
+const {
+  startExpressServerAndSendPortToRunner,
+  getPortAppIsRunningOn,
+} = require('@sentry-internal/node-integration-tests');
+
+const app = express();
+
+app.use(cors());
+
+app.get('/check', (req, res) => {
+  const appPort = getPortAppIsRunningOn(app);
+  // eslint-disable-next-line no-undef
+  fetch(`http://localhost:${appPort}/bounce`)
+    .then(r => r.json())
+    .then(bounceRes => {
+      res.json({ propagatedData: bounceRes });
+    });
+});
+
+app.get('/bounce', (req, res) => {
+  res.json({
+    baggage: req.headers['baggage'],
+  });
+});
+
+Sentry.setupExpressErrorHandler(app);
+
+startExpressServerAndSendPortToRunner(app);