Merge branch 'develop' into timfish/feat/deno-no-deno.land-publish

Author: timfish

.github/workflows/build.yml

@@ -756,7 +756,6 @@ jobs:
       fail-fast: false
       matrix:
         node: [18, 20, 22]
-        remix: [1, 2]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4
@@ -779,7 +778,6 @@ jobs:
       - name: Run integration tests
         env:
           NODE_VERSION: ${{ matrix.node }}
-          REMIX_VERSION: ${{ matrix.remix }}
         run: |
           cd packages/remix
           yarn test:integration:ci

CHANGELOG.md

@@ -10,7 +10,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
+Work in this release was contributed by @davidturissini, @nwalters512, @aloisklink, @arturovt, @benjick, @maximepvrt, @mstrokin, and @kunal-511. Thank you for your contributions!
 
 - **feat(solidstart)!: Default to `--import` setup and add `autoInjectServerSentry` ([#14862](https://github.com/getsentry/sentry-javascript/pull/14862))**
 

dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/subject.js

@@ -1,6 +1,7 @@
 Sentry.getCurrentScope().setPropagationContext({
   parentSpanId: '1234567890123456',
   traceId: '12345678901234567890123456789012',
+  sampleRand: Math.random(),
 });
 
 Sentry.startSpan({ name: 'test_span_1' }, () => undefined);

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

@@ -47,6 +47,7 @@ sentryTest(
         sampled: 'true',
         trace_id: traceId,
         transaction: 'outer',
+        sample_rand: expect.any(String),
       },
     });
 
@@ -64,6 +65,7 @@ sentryTest(
         sampled: 'true',
         trace_id: traceId,
         transaction: 'outer',
+        sample_rand: expect.any(String),
       },
     });
 

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

@@ -33,6 +33,7 @@ sentryTest('sends a segment span envelope', async ({ getLocalTestUrl, page }) =>
       sampled: 'true',
       trace_id: traceId,
       transaction: 'standalone_segment_span',
+      sample_rand: expect.any(String),
     },
   });
 

dev-packages/browser-integration-tests/suites/replay/dsc/test.ts

@@ -62,6 +62,7 @@ sentryTest(
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
+      sample_rand: expect.any(String),
     });
   },
 );
@@ -108,6 +109,7 @@ sentryTest(
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
+      sample_rand: expect.any(String),
     });
   },
 );
@@ -161,6 +163,7 @@ sentryTest(
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
+      sample_rand: expect.any(String),
     });
   },
 );
@@ -202,6 +205,7 @@ sentryTest(
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
+      sample_rand: expect.any(String),
     });
   },
 );
@@ -247,6 +251,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
       ? {
           sample_rate: '1',
           sampled: 'true',
+          sample_rand: expect.any(String),
         }
       : {}),
   });
@@ -267,6 +272,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
       ? {
           sample_rate: '1',
           sampled: 'true',
+          sample_rand: expect.any(String),
         }
       : {}),
   });

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/template.html

@@ -5,7 +5,7 @@
     <meta name="sentry-trace" content="12312012123120121231201212312012-1121201211212012-1" />
     <meta
       name="baggage"
-      content="sentry-release=2.1.12,sentry-public_key=public,sentry-trace_id=123,sentry-sample_rate=0.3232"
+      content="sentry-release=2.1.12,sentry-public_key=public,sentry-trace_id=123,sentry-sample_rate=0.3232,sentry-sample_rand=0.42"
     />
   </head>
 </html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts

@@ -43,6 +43,7 @@ sentryTest(
       sample_rate: '0.3232',
       trace_id: '123',
       public_key: 'public',
+      sample_rand: '0.42',
     });
   },
 );

dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts

@@ -48,6 +48,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
+    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
@@ -62,6 +63,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     sample_rate: '1',
     sampled: 'true',
     trace_id: traceId,
+    sample_rand: expect.any(String),
   });
 
   // 4
@@ -73,6 +75,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
+    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
@@ -89,6 +92,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     sampled: 'true',
     trace_id: traceId,
     transaction: 'updated-root-span-1',
+    sample_rand: expect.any(String),
   });
 
   // 7
@@ -100,6 +104,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
+    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
@@ -116,6 +121,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     sampled: 'true',
     trace_id: traceId,
     transaction: 'updated-root-span-2',
+    sample_rand: expect.any(String),
   });
 
   // 10
@@ -137,6 +143,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     sampled: 'true',
     trace_id: traceId,
     transaction: 'updated-root-span-2',
+    sample_rand: expect.any(String),
   });
 
   expect(txnEvent.transaction).toEqual('updated-root-span-2');

dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts

@@ -27,6 +27,7 @@ sentryTest(
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       public_key: 'public',
       sampled: 'true',
+      sample_rand: expect.any(String),
     });
   },
 );