Merge branch 'develop' into cg-rr-server-loaders

Author: chargome

.github/workflows/build.yml

@@ -475,7 +475,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22]
+        node: [18, 20, 22, '^24.0.1']
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
         uses: actions/checkout@v4
@@ -713,12 +713,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: ['18.20.5', 20, 22]
+        node: ['18.20.5', 20, 22, 24]
         typescript:
           - false
         include:
           # Only check typescript for latest version (to streamline CI)
-          - node: 22
+          - node: 24
             typescript: '3.8'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
@@ -760,7 +760,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 22]
+        node: [18, 20, 22, 24]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4

.size-limit.js

@@ -47,7 +47,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
-    limit: '76 KB',
+    limit: '77 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
@@ -79,7 +79,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
     gzip: true,
-    limit: '81 KB',
+    limit: '82 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
@@ -219,7 +219,7 @@ module.exports = [
     import: createImport('init'),
     ignore: ['$app/stores'],
     gzip: true,
-    limit: '38.5 KB',
+    limit: '39 KB',
   },
   // Node SDK (ESM)
   {

CHANGELOG.md

@@ -10,6 +10,74 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.17.0
+
+- feat(node): Migrate to `@fastify/otel` ([#15542](https://github.com/getsentry/sentry-javascript/pull/15542))
+
+## 9.16.1
+
+- fix(core): Make sure logs get flushed in server-runtime-client ([#16222](https://github.com/getsentry/sentry-javascript/pull/16222))
+- ref(node): Remove vercel flushing code that does nothing ([#16217](https://github.com/getsentry/sentry-javascript/pull/16217))
+
+## 9.16.0
+
+### Important changes
+
+- **feat: Create a Vite plugin that injects sentryConfig into the global config ([#16197](https://github.com/getsentry/sentry-javascript/pull/16197))**
+
+Add a new plugin `makeConfigInjectorPlugin` within our existing vite plugin that updates the global vite config with sentry options
+
+- **feat(browser): Add option to sample linked traces consistently ([#16037](https://github.com/getsentry/sentry-javascript/pull/16037))**
+
+This PR implements consistent sampling across traces as outlined in ([#15754](https://github.com/getsentry/sentry-javascript/pull/15754))
+
+- **feat(cloudflare): Add support for durable objects ([#16180](https://github.com/getsentry/sentry-javascript/pull/16180))**
+
+This PR introduces a new `instrumentDurableObjectWithSentry` method to the SDK, which instruments durable objects. We capture both traces and errors automatically.
+
+- **feat(node): Add Prisma integration by default ([#16073](https://github.com/getsentry/sentry-javascript/pull/16073))**
+
+[Prisma integration](https://docs.sentry.io/platforms/javascript/guides/nextjs/configuration/integrations/prisma/) is enabled by default, it should work for both ESM and CJS.
+
+- **feat(react-router): Add client-side router instrumentation ([#16185](https://github.com/getsentry/sentry-javascript/pull/16185))**
+
+Adds client-side instrumentation for react router's `HydratedRouter`. To enable it, simply replace `browserTracingIntegration()` with `reactRouterTracingIntegration()` in your client-side init call.
+
+- **fix(node): Avoid double-wrapping http module ([#16177](https://github.com/getsentry/sentry-javascript/pull/16177))**
+
+When running your application in ESM mode, there have been scenarios that resulted in the `http`/`https` emitting duplicate spans for incoming requests. This was apparently caused by us double-wrapping the modules for incoming request isolation.
+
+In order to solve this problem, the modules are no longer monkey patched by us for request isolation. Instead, we register diagnostics*channel hooks to handle request isolation now.
+While this is generally not expected to break anything, there is one tiny change that \_may* affect you if you have been relying on very specific functionality:
+
+The `ignoreOutgoingRequests` option of `httpIntegration` receives the `RequestOptions` as second argument. This type is not changed, however due to how the wrapping now works, we no longer pass through the full RequestOptions, but re-construct this partially based on the generated request. For the vast majority of cases, this should be fine, but for the sake of completeness, these are the only fields that may be available there going forward - other fields that _may_ have existed before may no longer be set:
+
+```ts
+ignoreOutgoingRequests(url: string, {
+  method: string;
+  protocol: string;
+  host: string;
+  hostname: string; // same as host
+  path: string;
+  headers: OutgoingHttpHeaders;
+})
+```
+
+### Other changes
+
+- feat(cloudflare): Add logs exports ([#16165](https://github.com/getsentry/sentry-javascript/pull/16165))
+- feat(vercel-edge): Add logs export ([#16166](https://github.com/getsentry/sentry-javascript/pull/16166))
+- feat(cloudflare): Read `SENTRY_RELEASE` from `env` ([#16201](https://github.com/getsentry/sentry-javascript/pull/16201))
+- feat(node): Drop `http.server` spans with 404 status by default ([#16205](https://github.com/getsentry/sentry-javascript/pull/16205))
+- fix(browser): Respect manually set sentry tracing headers in XHR requests ([#16184](https://github.com/getsentry/sentry-javascript/pull/16184))
+- fix(core): Respect manually set sentry tracing headers in fetch calls ([#16183](https://github.com/getsentry/sentry-javascript/pull/16183))
+- fix(feedback): Prevent `removeFromDom()` from throwing ([#16030](https://github.com/getsentry/sentry-javascript/pull/16030))
+- fix(node): Use class constructor in docstring for winston transport ([#16167](https://github.com/getsentry/sentry-javascript/pull/16167))
+- fix(node): Fix vercel flushing logic & add test for it ([#16208](https://github.com/getsentry/sentry-javascript/pull/16208))
+- fix(node): Fix 404 route handling in express 5 ([#16211](https://github.com/getsentry/sentry-javascript/pull/16211))
+- fix(logs): Ensure logs can be flushed correctly ([#16216](https://github.com/getsentry/sentry-javascript/pull/16216))
+- ref(core): Switch to standardized log envelope ([#16133](https://github.com/getsentry/sentry-javascript/pull/16133))
+
 ## 9.15.0
 
 ### Important Changes

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.15.0",
+  "version": "9.17.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.50.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "9.15.0",
+    "@sentry/browser": "9.17.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "1.8.2",
     "babel-loader": "^8.2.2",

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/default/init.js

@@ -0,0 +1,21 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      linkPreviousTrace: 'in-memory',
+      consistentTraceSampling: true,
+    }),
+  ],
+  tracePropagationTargets: ['someurl.com'],
+  tracesSampler: ctx => {
+    if (ctx.attributes && ctx.attributes['sentry.origin'] === 'auto.pageload.browser') {
+      return 1;
+    }
+    return ctx.inheritOrSampleWith(0);
+  },
+  debug: true,
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/default/subject.js

@@ -0,0 +1,17 @@
+const btn1 = document.getElementById('btn1');
+
+const btn2 = document.getElementById('btn2');
+
+btn1.addEventListener('click', () => {
+  Sentry.startNewTrace(() => {
+    Sentry.startSpan({ name: 'custom root span 1', op: 'custom' }, () => {});
+  });
+});
+
+btn2.addEventListener('click', () => {
+  Sentry.startNewTrace(() => {
+    Sentry.startSpan({ name: 'custom root span 2', op: 'custom' }, async () => {
+      await fetch('https://someUrl.com');
+    });
+  });
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/default/template.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <button id="btn1">
+  </button>
+  <button id="btn2">
+  </button>
+</html>

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/default/test.ts

@@ -0,0 +1,153 @@
+import { expect } from '@playwright/test';
+import {
+  extractTraceparentData,
+  parseBaggageHeader,
+  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+  SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE,
+} from '@sentry/core';
+import { sentryTest } from '../../../../../../utils/fixtures';
+import {
+  eventAndTraceHeaderRequestParser,
+  shouldSkipTracingTest,
+  waitForTracingHeadersOnUrl,
+  waitForTransactionRequest,
+} from '../../../../../../utils/helpers';
+
+sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
+  sentryTest('Continues sampling decision from initial pageload', async ({ getLocalTestUrl, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const { pageloadTraceContext, pageloadSampleRand } = await sentryTest.step('Initial pageload', async () => {
+      const pageloadRequestPromise = waitForTransactionRequest(page, evt => {
+        return evt.contexts?.trace?.op === 'pageload';
+      });
+      await page.goto(url);
+
+      const res = eventAndTraceHeaderRequestParser(await pageloadRequestPromise);
+      const pageloadSampleRand = Number(res[1]?.sample_rand);
+      const pageloadTraceContext = res[0].contexts?.trace;
+
+      expect(pageloadTraceContext?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]).toBe(1);
+      expect(pageloadSampleRand).toBeGreaterThanOrEqual(0);
+
+      return { pageloadTraceContext: res[0].contexts?.trace, pageloadSampleRand };
+    });
+
+    const customTraceContext = await sentryTest.step('Custom trace', async () => {
+      const customTrace1RequestPromise = waitForTransactionRequest(page, evt => evt.contexts?.trace?.op === 'custom');
+      await page.locator('#btn1').click();
+      const [customTrace1Event, customTraceTraceHeader] = eventAndTraceHeaderRequestParser(
+        await customTrace1RequestPromise,
+      );
+
+      const customTraceContext = customTrace1Event.contexts?.trace;
+
+      expect(customTraceContext?.trace_id).not.toEqual(pageloadTraceContext?.trace_id);
+      // although we "continue the trace" from pageload, this is actually a root span,
+      // so there must not be a parent span id
+      expect(customTraceContext?.parent_span_id).toBeUndefined();
+
+      expect(pageloadSampleRand).toEqual(Number(customTraceTraceHeader?.sample_rand));
+
+      return customTraceContext;
+    });
+
+    await sentryTest.step('Navigation', async () => {
+      const navigation1RequestPromise = waitForTransactionRequest(
+        page,
+        evt => evt.contexts?.trace?.op === 'navigation',
+      );
+      await page.goto(`${url}#foo`);
+      const [navigationEvent, navigationTraceHeader] = eventAndTraceHeaderRequestParser(
+        await navigation1RequestPromise,
+      );
+      const navTraceContext = navigationEvent.contexts?.trace;
+
+      expect(navTraceContext?.trace_id).not.toEqual(customTraceContext?.trace_id);
+      expect(navTraceContext?.trace_id).not.toEqual(pageloadTraceContext?.trace_id);
+
+      expect(navTraceContext?.links).toEqual([
+        {
+          trace_id: customTraceContext?.trace_id,
+          span_id: customTraceContext?.span_id,
+          sampled: true,
+          attributes: {
+            [SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
+          },
+        },
+      ]);
+      expect(navTraceContext?.parent_span_id).toBeUndefined();
+
+      expect(pageloadSampleRand).toEqual(Number(navigationTraceHeader?.sample_rand));
+    });
+  });
+
+  sentryTest('Propagates continued sampling decision to outgoing requests', async ({ page, getLocalTestUrl }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    const { pageloadTraceContext, pageloadSampleRand } = await sentryTest.step('Initial pageload', async () => {
+      const pageloadRequestPromise = waitForTransactionRequest(page, evt => evt.contexts?.trace?.op === 'pageload');
+      await page.goto(url);
+
+      const res = eventAndTraceHeaderRequestParser(await pageloadRequestPromise);
+      const pageloadSampleRand = Number(res[1]?.sample_rand);
+
+      expect(pageloadSampleRand).toBeGreaterThanOrEqual(0);
+
+      const pageloadTraceContext = res[0].contexts?.trace;
+
+      expect(pageloadTraceContext?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]).toBe(1);
+
+      return { pageloadTraceContext: pageloadTraceContext, pageloadSampleRand };
+    });
+
+    await sentryTest.step('Make fetch request', async () => {
+      const fetchTracePromise = waitForTransactionRequest(page, evt => evt.contexts?.trace?.op === 'custom');
+      const tracingHeadersPromise = waitForTracingHeadersOnUrl(page, 'https://someUrl.com');
+
+      await page.locator('#btn2').click();
+
+      const { baggage, sentryTrace } = await tracingHeadersPromise;
+
+      const [fetchTraceEvent, fetchTraceTraceHeader] = eventAndTraceHeaderRequestParser(await fetchTracePromise);
+
+      const fetchTraceSampleRand = Number(fetchTraceTraceHeader?.sample_rand);
+      const fetchTraceTraceContext = fetchTraceEvent.contexts?.trace;
+      const httpClientSpan = fetchTraceEvent.spans?.find(span => span.op === 'http.client');
+
+      expect(fetchTraceSampleRand).toEqual(pageloadSampleRand);
+
+      expect(fetchTraceTraceContext?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]).toEqual(
+        pageloadTraceContext?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE],
+      );
+      expect(fetchTraceTraceContext?.trace_id).not.toEqual(pageloadTraceContext?.trace_id);
+
+      expect(sentryTrace).toBeDefined();
+      expect(baggage).toBeDefined();
+
+      expect(extractTraceparentData(sentryTrace)).toEqual({
+        traceId: fetchTraceTraceContext?.trace_id,
+        parentSpanId: httpClientSpan?.span_id,
+        parentSampled: true,
+      });
+
+      expect(parseBaggageHeader(baggage)).toEqual({
+        'sentry-environment': 'production',
+        'sentry-public_key': 'public',
+        'sentry-sample_rand': `${pageloadSampleRand}`,
+        'sentry-sample_rate': '1',
+        'sentry-sampled': 'true',
+        'sentry-trace_id': fetchTraceTraceContext?.trace_id,
+        'sentry-transaction': 'custom root span 2',
+      });
+    });
+  });
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/init.js

@@ -0,0 +1,17 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://[email protected]/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      linkPreviousTrace: 'in-memory',
+      consistentTraceSampling: true,
+    }),
+  ],
+  tracePropagationTargets: ['someurl.com'],
+  tracesSampleRate: 1,
+  debug: true,
+  sendClientReports: true,
+});

dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/subject.js

@@ -0,0 +1,17 @@
+const btn1 = document.getElementById('btn1');
+
+const btn2 = document.getElementById('btn2');
+
+btn1.addEventListener('click', () => {
+  Sentry.startNewTrace(() => {
+    Sentry.startSpan({ name: 'custom root span 1', op: 'custom' }, () => {});
+  });
+});
+
+btn2.addEventListener('click', () => {
+  Sentry.startNewTrace(() => {
+    Sentry.startSpan({ name: 'custom root span 2', op: 'custom' }, async () => {
+      await fetch('https://someUrl.com');
+    });
+  });
+});