From b830f87dfe18aae0ed99f65a47840010a16f3ed1 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Fri, 24 Mar 2023 11:55:20 +0100
Subject: [PATCH 01/50] ci: Fix CodeQL by skipping tsconfig.json (#7607)

---
 .github/codeql/codeql-config.yml      | 4 ++++
 .github/workflows/codeql-analysis.yml | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 .github/codeql/codeql-config.yml

diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000000..d3ccaa70d705
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+paths-ignore:
+  # Our tsconfig files contain comments, which CodeQL complains about
+  - '**/tsconfig.json'
+  - '**/tsconfig.*.json'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0f6954bc53eb..db6ba7c55ac5 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,6 +50,7 @@ jobs:
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
+          config-file: ./.github/codeql/codeql-config.yml
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.

From dce26c91c54d526fee9cf65caf72ef71b453f86f Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Fri, 24 Mar 2023 12:15:49 +0100
Subject: [PATCH 02/50] build(tracing-internal): Remove circular dependency
 (#7608)

No need to depend on @sentry/browser as devDependency, which Nx complains about.

I copied the TestClient from Replay, where we had the same issue.
---
 packages/tracing-internal/package.json        |  1 -
 .../test/browser/backgroundtab.test.ts        |  4 +-
 .../test/browser/browsertracing.test.ts       |  9 ++--
 .../test/browser/request.test.ts              |  4 +-
 .../tracing-internal/test/utils/TestClient.ts | 44 +++++++++++++++++++
 5 files changed, 53 insertions(+), 9 deletions(-)
 create mode 100644 packages/tracing-internal/test/utils/TestClient.ts

diff --git a/packages/tracing-internal/package.json b/packages/tracing-internal/package.json
index 54aec71caa3b..6e88e16aba29 100644
--- a/packages/tracing-internal/package.json
+++ b/packages/tracing-internal/package.json
@@ -22,7 +22,6 @@
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry/browser": "7.45.0",
     "@types/express": "^4.17.14"
   },
   "scripts": {
diff --git a/packages/tracing-internal/test/browser/backgroundtab.test.ts b/packages/tracing-internal/test/browser/backgroundtab.test.ts
index 2c4ca381df3b..0826d5f72884 100644
--- a/packages/tracing-internal/test/browser/backgroundtab.test.ts
+++ b/packages/tracing-internal/test/browser/backgroundtab.test.ts
@@ -1,10 +1,10 @@
-import { BrowserClient } from '@sentry/browser';
 import { Hub, makeMain } from '@sentry/core';
 import { JSDOM } from 'jsdom';
 
 import { addExtensionMethods } from '../../../tracing/src';
 import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils';
 import { registerBackgroundTabDetection } from '../../src/browser/backgroundtab';
+import { TestClient } from '../utils/TestClient';
 
 describe('registerBackgroundTabDetection', () => {
   let events: Record<string, any> = {};
@@ -15,7 +15,7 @@ describe('registerBackgroundTabDetection', () => {
     global.document = dom.window.document;
 
     const options = getDefaultBrowserClientOptions({ tracesSampleRate: 1 });
-    hub = new Hub(new BrowserClient(options));
+    hub = new Hub(new TestClient(options));
     makeMain(hub);
 
     // If we do not add extension methods, invoking hub.startTransaction returns undefined
diff --git a/packages/tracing-internal/test/browser/browsertracing.test.ts b/packages/tracing-internal/test/browser/browsertracing.test.ts
index e599648c2930..01e5f8990e9b 100644
--- a/packages/tracing-internal/test/browser/browsertracing.test.ts
+++ b/packages/tracing-internal/test/browser/browsertracing.test.ts
@@ -1,4 +1,3 @@
-import { BrowserClient, WINDOW } from '@sentry/browser';
 import { Hub, makeMain, TRACING_DEFAULTS } from '@sentry/core';
 import * as hubExtensions from '@sentry/core';
 import type { BaseTransportOptions, ClientOptions, DsnComponents } from '@sentry/types';
@@ -12,6 +11,8 @@ import type { BrowserTracingOptions } from '../../src/browser/browsertracing';
 import { BrowserTracing, getMetaContent } from '../../src/browser/browsertracing';
 import { defaultRequestInstrumentationOptions } from '../../src/browser/request';
 import { instrumentRoutingWithDefaults } from '../../src/browser/router';
+import { WINDOW } from '../../src/browser/types';
+import { TestClient } from '../utils/TestClient';
 
 let mockChangeHistory: ({ to, from }: { to: string; from?: string }) => void = () => undefined;
 
@@ -61,7 +62,7 @@ describe('BrowserTracing', () => {
   beforeEach(() => {
     jest.useFakeTimers();
     const options = getDefaultBrowserClientOptions({ tracesSampleRate: 1 });
-    hub = new Hub(new BrowserClient(options));
+    hub = new Hub(new TestClient(options));
     makeMain(hub);
     document.head.innerHTML = '';
 
@@ -599,7 +600,7 @@ describe('BrowserTracing', () => {
 
       const tracesSampler = jest.fn();
       const options = getDefaultBrowserClientOptions({ tracesSampler });
-      hub.bindClient(new BrowserClient(options));
+      hub.bindClient(new TestClient(options));
       // setting up the BrowserTracing integration automatically starts a pageload transaction
       createBrowserTracing(true);
 
@@ -616,7 +617,7 @@ describe('BrowserTracing', () => {
 
       const tracesSampler = jest.fn();
       const options = getDefaultBrowserClientOptions({ tracesSampler });
-      hub.bindClient(new BrowserClient(options));
+      hub.bindClient(new TestClient(options));
       // setting up the BrowserTracing integration normally automatically starts a pageload transaction, but that's not
       // what we're testing here
       createBrowserTracing(true, { startTransactionOnPageLoad: false });
diff --git a/packages/tracing-internal/test/browser/request.test.ts b/packages/tracing-internal/test/browser/request.test.ts
index 4ca971a4947c..5e89ac99f451 100644
--- a/packages/tracing-internal/test/browser/request.test.ts
+++ b/packages/tracing-internal/test/browser/request.test.ts
@@ -1,4 +1,3 @@
-import { BrowserClient } from '@sentry/browser';
 import * as sentryCore from '@sentry/core';
 import * as utils from '@sentry/utils';
 
@@ -7,6 +6,7 @@ import { addExtensionMethods, Span, spanStatusfromHttpCode } from '../../../trac
 import { getDefaultBrowserClientOptions } from '../../../tracing/test/testutils';
 import type { FetchData, XHRData } from '../../src/browser/request';
 import { fetchCallback, instrumentOutgoingRequests, shouldAttachHeaders, xhrCallback } from '../../src/browser/request';
+import { TestClient } from '../utils/TestClient';
 
 beforeAll(() => {
   addExtensionMethods();
@@ -54,7 +54,7 @@ describe('callbacks', () => {
 
   beforeAll(() => {
     const options = getDefaultBrowserClientOptions({ tracesSampleRate: 1 });
-    hub = new sentryCore.Hub(new BrowserClient(options));
+    hub = new sentryCore.Hub(new TestClient(options));
     sentryCore.makeMain(hub);
   });
 
diff --git a/packages/tracing-internal/test/utils/TestClient.ts b/packages/tracing-internal/test/utils/TestClient.ts
new file mode 100644
index 000000000000..ad39b82084a9
--- /dev/null
+++ b/packages/tracing-internal/test/utils/TestClient.ts
@@ -0,0 +1,44 @@
+import { BaseClient, createTransport, initAndBind } from '@sentry/core';
+import type { BrowserClientReplayOptions, ClientOptions, Event, SeverityLevel } from '@sentry/types';
+import { resolvedSyncPromise } from '@sentry/utils';
+
+export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {}
+
+export class TestClient extends BaseClient<TestClientOptions> {
+  public constructor(options: TestClientOptions) {
+    super(options);
+  }
+
+  public eventFromException(exception: any): PromiseLike<Event> {
+    return resolvedSyncPromise({
+      exception: {
+        values: [
+          {
+            /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+            type: exception.name,
+            value: exception.message,
+            /* eslint-enable @typescript-eslint/no-unsafe-member-access */
+          },
+        ],
+      },
+    });
+  }
+
+  public eventFromMessage(message: string, level: SeverityLevel = 'info'): PromiseLike<Event> {
+    return resolvedSyncPromise({ message, level });
+  }
+}
+
+export function init(options: TestClientOptions): void {
+  initAndBind(TestClient, options);
+}
+
+export function getDefaultClientOptions(options: Partial<ClientOptions> = {}): ClientOptions {
+  return {
+    integrations: [],
+    dsn: 'https://username@domain/123',
+    transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => resolvedSyncPromise({})),
+    stackParser: () => [],
+    ...options,
+  };
+}

From 11704a3271411842e178f07e424d427ca42d01b8 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Fri, 24 Mar 2023 13:03:49 +0100
Subject: [PATCH 03/50] feat(sveltekit): Add meta tag for backend -> frontend
 (#7574)

---
 packages/sveltekit/src/server/handle.ts       | 21 +++++-
 packages/sveltekit/test/server/handle.test.ts | 71 +++++++++++++++----
 2 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
index aab69c085048..8020a35c7377 100644
--- a/packages/sveltekit/src/server/handle.ts
+++ b/packages/sveltekit/src/server/handle.ts
@@ -1,14 +1,15 @@
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import type { Span } from '@sentry/core';
-import { trace } from '@sentry/core';
+import { getActiveTransaction, trace } from '@sentry/core';
 import { captureException } from '@sentry/node';
 import {
   addExceptionMechanism,
   baggageHeaderToDynamicSamplingContext,
+  dynamicSamplingContextToSentryBaggageHeader,
   extractTraceparentData,
   objectify,
 } from '@sentry/utils';
-import type { Handle } from '@sveltejs/kit';
+import type { Handle, ResolveOptions } from '@sveltejs/kit';
 import * as domain from 'domain';
 
 function sendErrorToSentry(e: unknown): unknown {
@@ -34,6 +35,20 @@ function sendErrorToSentry(e: unknown): unknown {
   return objectifiedErr;
 }
 
+export const transformPageChunk: NonNullable<ResolveOptions['transformPageChunk']> = ({ html }) => {
+  const transaction = getActiveTransaction();
+  if (transaction) {
+    const traceparentData = transaction.toTraceparent();
+    const dynamicSamplingContext = dynamicSamplingContextToSentryBaggageHeader(transaction.getDynamicSamplingContext());
+    const content = `<meta name="sentry-trace" content="${traceparentData}"/>
+      <meta name="baggage" content="${dynamicSamplingContext}"/>
+      %sveltekit.head%`;
+    return html.replace('%sveltekit.head%', content);
+  }
+
+  return html;
+};
+
 /**
  * A SvelteKit handle function that wraps the request for Sentry error and
  * performance monitoring.
@@ -68,7 +83,7 @@ export const sentryHandle: Handle = ({ event, resolve }) => {
         },
       },
       async (span?: Span) => {
-        const res = await resolve(event);
+        const res = await resolve(event, { transformPageChunk });
         if (span) {
           span.setHttpStatus(res.status);
         }
diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts
index cf17b56aaa90..f260d2daf310 100644
--- a/packages/sveltekit/test/server/handle.test.ts
+++ b/packages/sveltekit/test/server/handle.test.ts
@@ -4,7 +4,7 @@ import type { Transaction } from '@sentry/types';
 import type { Handle } from '@sveltejs/kit';
 import { vi } from 'vitest';
 
-import { sentryHandle } from '../../src/server/handle';
+import { sentryHandle, transformPageChunk } from '../../src/server/handle';
 import { getDefaultNodeClientOptions } from '../utils';
 
 const mockCaptureException = vi.fn();
@@ -94,22 +94,22 @@ function resolve(type: Type, isError: boolean): Parameters<Handle>[0]['resolve']
 let hub: Hub;
 let client: NodeClient;
 
-describe('handleSentry', () => {
-  beforeAll(() => {
-    addTracingExtensions();
-  });
+beforeAll(() => {
+  addTracingExtensions();
+});
 
-  beforeEach(() => {
-    mockScope = new Scope();
-    const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
-    client = new NodeClient(options);
-    hub = new Hub(client);
-    makeMain(hub);
+beforeEach(() => {
+  mockScope = new Scope();
+  const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
+  client = new NodeClient(options);
+  hub = new Hub(client);
+  makeMain(hub);
 
-    mockCaptureException.mockClear();
-    mockAddExceptionMechanism.mockClear();
-  });
+  mockCaptureException.mockClear();
+  mockAddExceptionMechanism.mockClear();
+});
 
+describe('handleSentry', () => {
   describe.each([
     // isSync, isError, expectedResponse
     [Type.Sync, true, undefined],
@@ -247,5 +247,48 @@ describe('handleSentry', () => {
         );
       }
     });
+
+    it('calls `transformPageChunk`', async () => {
+      const mockResolve = vi.fn().mockImplementation(resolve(type, isError));
+      const event = mockEvent();
+      try {
+        await sentryHandle({ event, resolve: mockResolve });
+      } catch (e) {
+        expect(e).toBeInstanceOf(Error);
+        expect(e.message).toEqual(type);
+      }
+
+      expect(mockResolve).toHaveBeenCalledTimes(1);
+      expect(mockResolve).toHaveBeenCalledWith(event, { transformPageChunk: expect.any(Function) });
+    });
+  });
+});
+
+describe('transformPageChunk', () => {
+  const html = `<!DOCTYPE html>
+  <html lang="en">
+    <head>
+      <meta charset="utf-8" />
+      <link rel="icon" href="%sveltekit.assets%/favicon.png" />
+      <meta name="viewport" content="width=device-width" />
+      %sveltekit.head%
+    </head>
+    <body data-sveltekit-preload-data="hover">
+      <div style="display: contents">%sveltekit.body%</div>
+    </body>
+  </html>`;
+
+  it('does not add meta tags if no active transaction', () => {
+    const transformed = transformPageChunk({ html, done: true });
+    expect(transformed).toEqual(html);
+  });
+
+  it('adds meta tags if there is an active transaction', () => {
+    const transaction = hub.startTransaction({ name: 'test' });
+    hub.getScope().setSpan(transaction);
+    const transformed = transformPageChunk({ html, done: true }) as string;
+
+    expect(transformed.includes('<meta name="sentry-trace"')).toEqual(true);
+    expect(transformed.includes('<meta name="baggage"')).toEqual(true);
   });
 });

From 68c2301bd1218108443ee97e6419907c71becee1 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Fri, 24 Mar 2023 14:10:05 +0100
Subject: [PATCH 04/50] build: Remove `test/tsconfig.json` files (#7606)

---
 packages/angular/test/tsconfig.json                  | 8 --------
 packages/browser/test/tsconfig.json                  | 8 --------
 packages/core/test/tsconfig.json                     | 8 --------
 packages/gatsby/test/tsconfig.json                   | 8 --------
 packages/hub/test/tsconfig.json                      | 8 --------
 packages/integrations/test/tsconfig.json             | 8 --------
 packages/nextjs/test/tsconfig.json                   | 3 ---
 packages/node-integration-tests/suites/tsconfig.json | 8 --------
 packages/node/test/tsconfig.json                     | 8 --------
 packages/react/test/tsconfig.json                    | 8 --------
 packages/remix/test/tsconfig.json                    | 8 --------
 packages/replay-worker/test/tsconfig.json            | 7 -------
 packages/replay/test/tsconfig.json                   | 7 -------
 packages/serverless/test/tsconfig.json               | 8 --------
 packages/svelte/test/tsconfig.json                   | 8 --------
 packages/tracing/test/tsconfig.json                  | 7 -------
 packages/utils/test/tsconfig.json                    | 8 --------
 packages/vue/test/tsconfig.json                      | 8 --------
 tsconfig-templates/test/tsconfig.json                | 8 --------
 19 files changed, 144 deletions(-)
 delete mode 100644 packages/angular/test/tsconfig.json
 delete mode 100644 packages/browser/test/tsconfig.json
 delete mode 100644 packages/core/test/tsconfig.json
 delete mode 100644 packages/gatsby/test/tsconfig.json
 delete mode 100644 packages/hub/test/tsconfig.json
 delete mode 100644 packages/integrations/test/tsconfig.json
 delete mode 100644 packages/node-integration-tests/suites/tsconfig.json
 delete mode 100644 packages/node/test/tsconfig.json
 delete mode 100644 packages/react/test/tsconfig.json
 delete mode 100644 packages/remix/test/tsconfig.json
 delete mode 100644 packages/replay-worker/test/tsconfig.json
 delete mode 100644 packages/replay/test/tsconfig.json
 delete mode 100644 packages/serverless/test/tsconfig.json
 delete mode 100644 packages/svelte/test/tsconfig.json
 delete mode 100644 packages/tracing/test/tsconfig.json
 delete mode 100644 packages/utils/test/tsconfig.json
 delete mode 100644 packages/vue/test/tsconfig.json
 delete mode 100644 tsconfig-templates/test/tsconfig.json

diff --git a/packages/angular/test/tsconfig.json b/packages/angular/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/angular/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/browser/test/tsconfig.json b/packages/browser/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/browser/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/core/test/tsconfig.json b/packages/core/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/core/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/gatsby/test/tsconfig.json b/packages/gatsby/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/gatsby/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/hub/test/tsconfig.json b/packages/hub/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/hub/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/integrations/test/tsconfig.json b/packages/integrations/test/tsconfig.json
deleted file mode 100644
index c4023463fcbc..000000000000
--- a/packages/integrations/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*", "../../replay/test/unit/coreHandlers/extendednetworkbreadcrumbs.test.ts"]
-}
diff --git a/packages/nextjs/test/tsconfig.json b/packages/nextjs/test/tsconfig.json
index fd214f0667a5..5c0c9dfa01bb 100644
--- a/packages/nextjs/test/tsconfig.json
+++ b/packages/nextjs/test/tsconfig.json
@@ -1,6 +1,3 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
 {
   "extends": "../tsconfig.test.json",
 
diff --git a/packages/node-integration-tests/suites/tsconfig.json b/packages/node-integration-tests/suites/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/node-integration-tests/suites/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/node/test/tsconfig.json b/packages/node/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/node/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/react/test/tsconfig.json b/packages/react/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/react/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/remix/test/tsconfig.json b/packages/remix/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/remix/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/replay-worker/test/tsconfig.json b/packages/replay-worker/test/tsconfig.json
deleted file mode 100644
index 6c6ff4423fde..000000000000
--- a/packages/replay-worker/test/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/replay/test/tsconfig.json b/packages/replay/test/tsconfig.json
deleted file mode 100644
index 6c6ff4423fde..000000000000
--- a/packages/replay/test/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/serverless/test/tsconfig.json b/packages/serverless/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/serverless/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/svelte/test/tsconfig.json b/packages/svelte/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/svelte/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/tracing/test/tsconfig.json b/packages/tracing/test/tsconfig.json
deleted file mode 100644
index 6c6ff4423fde..000000000000
--- a/packages/tracing/test/tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/utils/test/tsconfig.json b/packages/utils/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/utils/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/packages/vue/test/tsconfig.json b/packages/vue/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/packages/vue/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}
diff --git a/tsconfig-templates/test/tsconfig.json b/tsconfig-templates/test/tsconfig.json
deleted file mode 100644
index 074ceb45a9db..000000000000
--- a/tsconfig-templates/test/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-// TODO Once https://github.com/microsoft/TypeScript/issues/33094 is done (if it ever is), this file can disappear, as
-// it's purely a placeholder to satisfy VSCode.
-
-{
-  "extends": "../tsconfig.test.json",
-
-  "include": ["./**/*"]
-}

From a2103f37794740573f6fce0f549e24bd06d08cbb Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Fri, 24 Mar 2023 14:11:29 +0100
Subject: [PATCH 05/50] feat(replay): Capture replay mutation breadcrumbs & add
 experiment (#7568)

---
 .../largeMutations/defaultOptions/init.js     | 16 +++++
 .../defaultOptions/template.html              | 41 +++++++++++
 .../largeMutations/defaultOptions/test.ts     | 67 ++++++++++++++++++
 .../largeMutations/mutationLimit/init.js      | 20 ++++++
 .../mutationLimit/template.html               | 41 +++++++++++
 .../largeMutations/mutationLimit/test.ts      | 69 +++++++++++++++++++
 packages/replay/src/replay.ts                 | 53 +++++++++-----
 packages/replay/src/types.ts                  |  3 +-
 8 files changed, 290 insertions(+), 20 deletions(-)
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/template.html
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/template.html
 create mode 100644 packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts

diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
new file mode 100644
index 000000000000..f64b8fff4e50
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 500,
+  flushMaxDelay: 500,
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 0,
+  replaysSessionSampleRate: 1.0,
+  replaysOnErrorSampleRate: 0.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/template.html b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/template.html
new file mode 100644
index 000000000000..331a03a58b92
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/template.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="button-add">Add items</button>
+    <button id="button-modify">Modify items</button>
+    <button id="button-remove">Remove items</button>
+    <ul class="list"></ul>
+
+    <script>
+      document.querySelector('#button-add').addEventListener('click', () => {
+        const list = document.querySelector('.list');
+        for (let i = 0; i < 1000; i++) {
+          const li = document.createElement('li');
+          li.textContent = `test list item: ${i}`;
+          li.setAttribute('id', `${i}`);
+          list.appendChild(li);
+        }
+      });
+
+      document.querySelector('#button-modify').addEventListener('click', () => {
+        document.querySelectorAll('li').forEach(li => {
+          el.setAttribute('js-is-checked', new Date().toISOString());
+          el.setAttribute('js-is-checked-2', new Date().toISOString());
+          el.setAttribute('js-is-checked-3', 'yes');
+          el.setAttribute('js-is-checked-4', 'yes');
+          el.setAttribute('js-is-checked-5', 'yes');
+          el.setAttribute('js-is-checked-6', 'yes');
+        });
+      });
+
+      document.querySelector('#button-remove').addEventListener('click', () => {
+        document.querySelectorAll('li').forEach(li => {
+          document.querySelector('ul').removeChild(li);
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
new file mode 100644
index 000000000000..29d0f3ada164
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
@@ -0,0 +1,67 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
+
+sentryTest(
+  'handles large mutations with default options',
+  async ({ getLocalTestPath, page, forceFlushReplay, browserName }) => {
+    if (shouldSkipReplayTest() || ['webkit', 'firefox'].includes(browserName)) {
+      sentryTest.skip();
+    }
+
+    const reqPromise0 = waitForReplayRequest(page, 0);
+    const reqPromise0b = waitForReplayRequest(page, 1);
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    await page.goto(url);
+    await forceFlushReplay();
+    const res0 = await reqPromise0;
+    await reqPromise0b;
+    // A second request is sent right after initial snapshot, we want to wait for that to settle before we continue
+
+    const reqPromise1 = waitForReplayRequest(page);
+
+    void page.click('#button-add');
+    await forceFlushReplay();
+    const res1 = await reqPromise1;
+
+    const reqPromise2 = waitForReplayRequest(page);
+
+    void page.click('#button-modify');
+    await forceFlushReplay();
+    const res2 = await reqPromise2;
+
+    const reqPromise3 = waitForReplayRequest(page);
+
+    void page.click('#button-remove');
+    await forceFlushReplay();
+    const res3 = await reqPromise3;
+
+    const replayData0 = getReplayRecordingContent(res0);
+    const replayData1 = getReplayRecordingContent(res1);
+    const replayData2 = getReplayRecordingContent(res2);
+    const replayData3 = getReplayRecordingContent(res3);
+
+    expect(replayData0.fullSnapshots.length).toBe(1);
+    expect(replayData0.incrementalSnapshots.length).toBe(0);
+
+    expect(replayData1.fullSnapshots.length).toBe(0);
+    expect(replayData1.incrementalSnapshots.length).toBeGreaterThan(0);
+
+    expect(replayData2.fullSnapshots.length).toBe(0);
+    expect(replayData2.incrementalSnapshots.length).toBeGreaterThan(0);
+
+    expect(replayData3.fullSnapshots.length).toBe(0);
+    expect(replayData3.incrementalSnapshots.length).toBeGreaterThan(0);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
new file mode 100644
index 000000000000..5c30f352959c
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 500,
+  flushMaxDelay: 500,
+  _experiments: {
+    mutationLimit: 250,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 0,
+  replaysSessionSampleRate: 1.0,
+  replaysOnErrorSampleRate: 0.0,
+  debug: true,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/template.html b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/template.html
new file mode 100644
index 000000000000..331a03a58b92
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/template.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="button-add">Add items</button>
+    <button id="button-modify">Modify items</button>
+    <button id="button-remove">Remove items</button>
+    <ul class="list"></ul>
+
+    <script>
+      document.querySelector('#button-add').addEventListener('click', () => {
+        const list = document.querySelector('.list');
+        for (let i = 0; i < 1000; i++) {
+          const li = document.createElement('li');
+          li.textContent = `test list item: ${i}`;
+          li.setAttribute('id', `${i}`);
+          list.appendChild(li);
+        }
+      });
+
+      document.querySelector('#button-modify').addEventListener('click', () => {
+        document.querySelectorAll('li').forEach(li => {
+          el.setAttribute('js-is-checked', new Date().toISOString());
+          el.setAttribute('js-is-checked-2', new Date().toISOString());
+          el.setAttribute('js-is-checked-3', 'yes');
+          el.setAttribute('js-is-checked-4', 'yes');
+          el.setAttribute('js-is-checked-5', 'yes');
+          el.setAttribute('js-is-checked-6', 'yes');
+        });
+      });
+
+      document.querySelector('#button-remove').addEventListener('click', () => {
+        document.querySelectorAll('li').forEach(li => {
+          document.querySelector('ul').removeChild(li);
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts
new file mode 100644
index 000000000000..5d5dbb9d3f93
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts
@@ -0,0 +1,69 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
+
+sentryTest(
+  'handles large mutations with _experiments.mutationLimit configured',
+  async ({ getLocalTestPath, page, forceFlushReplay, browserName }) => {
+    if (shouldSkipReplayTest() || ['webkit', 'firefox'].includes(browserName)) {
+      sentryTest.skip();
+    }
+
+    const reqPromise0 = waitForReplayRequest(page, 0);
+    const reqPromise0b = waitForReplayRequest(page, 1);
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    await page.goto(url);
+    const res0 = await reqPromise0;
+    await reqPromise0b;
+    // A second request is sent right after initial snapshot, we want to wait for that to settle before we continue
+
+    const reqPromise1 = waitForReplayRequest(page);
+
+    void page.click('#button-add');
+    await forceFlushReplay();
+    const res1 = await reqPromise1;
+
+    const reqPromise2 = waitForReplayRequest(page);
+
+    void page.click('#button-modify');
+    await forceFlushReplay();
+    const res2 = await reqPromise2;
+
+    const reqPromise3 = waitForReplayRequest(page);
+
+    void page.click('#button-remove');
+    await forceFlushReplay();
+    const res3 = await reqPromise3;
+
+    const replayData0 = getReplayRecordingContent(res0);
+    const replayData1 = getReplayRecordingContent(res1);
+    const replayData2 = getReplayRecordingContent(res2);
+    const replayData3 = getReplayRecordingContent(res3);
+
+    expect(replayData0.fullSnapshots.length).toBe(1);
+    expect(replayData0.incrementalSnapshots.length).toBe(0);
+
+    // This includes both a full snapshot as well as some incremental snapshots
+    expect(replayData1.fullSnapshots.length).toBe(1);
+    expect(replayData1.incrementalSnapshots.length).toBeGreaterThan(0);
+
+    // This does not trigger mutations, for whatever reason - so no full snapshot either!
+    expect(replayData2.fullSnapshots.length).toBe(0);
+    expect(replayData2.incrementalSnapshots.length).toBeGreaterThan(0);
+
+    // This includes both a full snapshot as well as some incremental snapshots
+    expect(replayData3.fullSnapshots.length).toBe(1);
+    expect(replayData3.incrementalSnapshots.length).toBeGreaterThan(0);
+  },
+);
diff --git a/packages/replay/src/replay.ts b/packages/replay/src/replay.ts
index df2f3e6c9774..8bb426874442 100644
--- a/packages/replay/src/replay.ts
+++ b/packages/replay/src/replay.ts
@@ -207,23 +207,7 @@ export class ReplayContainer implements ReplayContainerInterface {
         // instead, we'll always keep the last 60 seconds of replay before an error happened
         ...(this.recordingMode === 'error' && { checkoutEveryNms: ERROR_CHECKOUT_TIME }),
         emit: getHandleRecordingEmit(this),
-        onMutation: (mutations: unknown[]) => {
-          if (this._options._experiments.captureMutationSize) {
-            const count = mutations.length;
-
-            if (count > 500) {
-              const breadcrumb = createBreadcrumb({
-                category: 'replay.mutations',
-                data: {
-                  count,
-                },
-              });
-              this._createCustomBreadcrumb(breadcrumb);
-            }
-          }
-          // `true` means we use the regular mutation handling by rrweb
-          return true;
-        },
+        onMutation: this._onMutationHandler,
       });
     } catch (err) {
       this._handleException(err);
@@ -622,10 +606,10 @@ export class ReplayContainer implements ReplayContainerInterface {
    * Trigger rrweb to take a full snapshot which will cause this plugin to
    * create a new Replay event.
    */
-  private _triggerFullSnapshot(): void {
+  private _triggerFullSnapshot(checkout = true): void {
     try {
       __DEBUG_BUILD__ && logger.log('[Replay] Taking full rrweb snapshot');
-      record.takeFullSnapshot(true);
+      record.takeFullSnapshot(checkout);
     } catch (err) {
       this._handleException(err);
     }
@@ -839,4 +823,35 @@ export class ReplayContainer implements ReplayContainerInterface {
       saveSession(this.session);
     }
   }
+
+  /** Handler for rrweb.record.onMutation */
+  private _onMutationHandler = (mutations: unknown[]): boolean => {
+    const count = mutations.length;
+
+    const mutationLimit = this._options._experiments.mutationLimit || 0;
+    const mutationBreadcrumbLimit = this._options._experiments.mutationBreadcrumbLimit || 1000;
+    const overMutationLimit = mutationLimit && count > mutationLimit;
+
+    // Create a breadcrumb if a lot of mutations happen at the same time
+    // We can show this in the UI as an information with potential performance improvements
+    if (count > mutationBreadcrumbLimit || overMutationLimit) {
+      const breadcrumb = createBreadcrumb({
+        category: 'replay.mutations',
+        data: {
+          count,
+        },
+      });
+      this._createCustomBreadcrumb(breadcrumb);
+    }
+
+    if (overMutationLimit) {
+      // We want to skip doing an incremental snapshot if there are too many mutations
+      // Instead, we do a full snapshot
+      this._triggerFullSnapshot(false);
+      return false;
+    }
+
+    // `true` means we use the regular mutation handling by rrweb
+    return true;
+  };
 }
diff --git a/packages/replay/src/types.ts b/packages/replay/src/types.ts
index 1ea691f3ec4e..c2982eb5d8cb 100644
--- a/packages/replay/src/types.ts
+++ b/packages/replay/src/types.ts
@@ -110,7 +110,8 @@ export interface ReplayPluginOptions extends SessionOptions {
   _experiments: Partial<{
     captureExceptions: boolean;
     traceInternals: boolean;
-    captureMutationSize: boolean;
+    mutationLimit: number;
+    mutationBreadcrumbLimit: number;
   }>;
 }
 

From 5abe629405a32825cb62fdff5acc9a3ab65a9ef6 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 24 Mar 2023 14:50:34 +0100
Subject: [PATCH 06/50] ref(sveltekit): Distinguish spans of server-only and
 universal load functions (#7609)

Adjust the span ops of `load` functions to distinguish between spans of server-only and universal `load` functions (`+page.ts` vs `+page.server.ts`):
---
 packages/sveltekit/src/server/load.ts       | 2 +-
 packages/sveltekit/test/server/load.test.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/sveltekit/src/server/load.ts b/packages/sveltekit/src/server/load.ts
index 2d44aad94fef..068a1f4d0f8d 100644
--- a/packages/sveltekit/src/server/load.ts
+++ b/packages/sveltekit/src/server/load.ts
@@ -58,7 +58,7 @@ export function wrapLoadWithSentry<T extends ServerLoad | Load>(origLoad: T): T
       const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
 
       const traceLoadContext: TransactionContext = {
-        op: 'function.sveltekit.load',
+        op: `function.sveltekit${isServerOnlyLoad(event) ? '.server' : ''}.load`,
         name: routeId ? routeId : event.url.pathname,
         status: 'ok',
         metadata: {
diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts
index 3b3f308cafcf..69c31a74595d 100644
--- a/packages/sveltekit/test/server/load.test.ts
+++ b/packages/sveltekit/test/server/load.test.ts
@@ -202,7 +202,7 @@ describe('wrapLoadWithSentry', () => {
         expect(mockTrace).toHaveBeenCalledTimes(1);
         expect(mockTrace).toHaveBeenCalledWith(
           {
-            op: 'function.sveltekit.load',
+            op: 'function.sveltekit.server.load',
             name: '/users/[id]',
             parentSampled: true,
             parentSpanId: '1234567890abcdef',
@@ -233,7 +233,7 @@ describe('wrapLoadWithSentry', () => {
         expect(mockTrace).toHaveBeenCalledTimes(1);
         expect(mockTrace).toHaveBeenCalledWith(
           {
-            op: 'function.sveltekit.load',
+            op: 'function.sveltekit.server.load',
             name: '/users/[id]',
             status: 'ok',
             metadata: {
@@ -252,7 +252,7 @@ describe('wrapLoadWithSentry', () => {
         expect(mockTrace).toHaveBeenCalledTimes(1);
         expect(mockTrace).toHaveBeenCalledWith(
           {
-            op: 'function.sveltekit.load',
+            op: 'function.sveltekit.server.load',
             name: '/users/[id]',
             parentSampled: true,
             parentSpanId: '1234567890abcdef',

From e1af1e6b9b781d55a10ac9df7b7090a59056d895 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Fri, 24 Mar 2023 13:59:40 +0000
Subject: [PATCH 07/50] feat(node): Auto discovery only returns integrations
 where dependency loads (#7603)

Co-authored-by: Abhijeet Prasad <aprasad@sentry.io>
---
 packages/node/src/tracing/index.ts            |  6 ++-
 packages/tracing-internal/src/index.ts        |  1 +
 .../src/node/integrations/apollo.ts           | 50 +++++++++++++------
 .../src/node/integrations/graphql.ts          | 20 ++++++--
 .../src/node/integrations/lazy.ts             | 25 +++++++---
 .../src/node/integrations/mongo.ts            | 19 +++++--
 .../src/node/integrations/mysql.ts            | 14 ++++--
 .../src/node/integrations/postgres.ts         | 16 ++++--
 8 files changed, 110 insertions(+), 41 deletions(-)

diff --git a/packages/node/src/tracing/index.ts b/packages/node/src/tracing/index.ts
index 15c4e2889b3f..2b4be9d41e70 100644
--- a/packages/node/src/tracing/index.ts
+++ b/packages/node/src/tracing/index.ts
@@ -1,3 +1,4 @@
+import type { LazyLoadedIntegration } from '@sentry-internal/tracing';
 import { lazyLoadedNodePerformanceMonitoringIntegrations } from '@sentry-internal/tracing';
 import type { Integration } from '@sentry/types';
 import { logger } from '@sentry/utils';
@@ -14,11 +15,12 @@ export function autoDiscoverNodePerformanceMonitoringIntegrations(): Integration
         return undefined;
       }
     })
-    .filter(integration => !!integration) as Integration[];
+    .filter(integration => !!integration) as LazyLoadedIntegration[];
 
   if (loadedIntegrations.length === 0) {
     logger.warn('Performance monitoring integrations could not be automatically loaded.');
   }
 
-  return loadedIntegrations;
+  // Only return integrations where their dependencies loaded successfully.
+  return loadedIntegrations.filter(integration => !!integration.loadDependency());
 }
diff --git a/packages/tracing-internal/src/index.ts b/packages/tracing-internal/src/index.ts
index c4e17c25294f..da9b94aac666 100644
--- a/packages/tracing-internal/src/index.ts
+++ b/packages/tracing-internal/src/index.ts
@@ -10,6 +10,7 @@ export {
   Prisma,
   lazyLoadedNodePerformanceMonitoringIntegrations,
 } from './node';
+export type { LazyLoadedIntegration } from './node';
 
 export {
   BrowserTracing,
diff --git a/packages/tracing-internal/src/node/integrations/apollo.ts b/packages/tracing-internal/src/node/integrations/apollo.ts
index 3a076444af5e..5a9c0219a00c 100644
--- a/packages/tracing-internal/src/node/integrations/apollo.ts
+++ b/packages/tracing-internal/src/node/integrations/apollo.ts
@@ -1,7 +1,8 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor } from '@sentry/types';
 import { arrayify, fill, isThenable, loadModule, logger } from '@sentry/utils';
 
+import type { LazyLoadedIntegration } from './lazy';
 import { shouldDisableAutoInstrumentation } from './utils/node-utils';
 
 interface ApolloOptions {
@@ -16,8 +17,24 @@ type ApolloModelResolvers = {
   [key: string]: ApolloResolverGroup;
 };
 
+type GraphQLModule = {
+  GraphQLFactory: {
+    prototype: {
+      create: (resolvers: ApolloModelResolvers[]) => unknown;
+    };
+  };
+};
+
+type ApolloModule = {
+  ApolloServerBase: {
+    prototype: {
+      constructSchema: (config: unknown) => unknown;
+    };
+  };
+};
+
 /** Tracing integration for Apollo */
-export class Apollo implements Integration {
+export class Apollo implements LazyLoadedIntegration<GraphQLModule & ApolloModule> {
   /**
    * @inheritDoc
    */
@@ -30,6 +47,8 @@ export class Apollo implements Integration {
 
   private readonly _useNest: boolean;
 
+  private _module?: GraphQLModule & ApolloModule;
+
   /**
    * @inheritDoc
    */
@@ -41,6 +60,17 @@ export class Apollo implements Integration {
     this._useNest = !!options.useNestjs;
   }
 
+  /** @inheritdoc */
+  public loadDependency(): (GraphQLModule & ApolloModule) | undefined {
+    if (this._useNest) {
+      this._module = this._module || loadModule('@nestjs/graphql');
+    } else {
+      this._module = this._module || loadModule('apollo-server-core');
+    }
+
+    return this._module;
+  }
+
   /**
    * @inheritDoc
    */
@@ -51,13 +81,7 @@ export class Apollo implements Integration {
     }
 
     if (this._useNest) {
-      const pkg = loadModule<{
-        GraphQLFactory: {
-          prototype: {
-            create: (resolvers: ApolloModelResolvers[]) => unknown;
-          };
-        };
-      }>('@nestjs/graphql');
+      const pkg = this.loadDependency();
 
       if (!pkg) {
         __DEBUG_BUILD__ && logger.error('Apollo-NestJS Integration was unable to require @nestjs/graphql package.');
@@ -90,13 +114,7 @@ export class Apollo implements Integration {
         },
       );
     } else {
-      const pkg = loadModule<{
-        ApolloServerBase: {
-          prototype: {
-            constructSchema: (config: unknown) => unknown;
-          };
-        };
-      }>('apollo-server-core');
+      const pkg = this.loadDependency();
 
       if (!pkg) {
         __DEBUG_BUILD__ && logger.error('Apollo Integration was unable to require apollo-server-core package.');
diff --git a/packages/tracing-internal/src/node/integrations/graphql.ts b/packages/tracing-internal/src/node/integrations/graphql.ts
index 12f04b7c1e57..027419ae8ce8 100644
--- a/packages/tracing-internal/src/node/integrations/graphql.ts
+++ b/packages/tracing-internal/src/node/integrations/graphql.ts
@@ -1,11 +1,16 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor } from '@sentry/types';
 import { fill, isThenable, loadModule, logger } from '@sentry/utils';
 
+import type { LazyLoadedIntegration } from './lazy';
 import { shouldDisableAutoInstrumentation } from './utils/node-utils';
 
+type GraphQLModule = {
+  [method: string]: (...args: unknown[]) => unknown;
+};
+
 /** Tracing integration for graphql package */
-export class GraphQL implements Integration {
+export class GraphQL implements LazyLoadedIntegration<GraphQLModule> {
   /**
    * @inheritDoc
    */
@@ -16,6 +21,13 @@ export class GraphQL implements Integration {
    */
   public name: string = GraphQL.id;
 
+  private _module?: GraphQLModule;
+
+  /** @inheritdoc */
+  public loadDependency(): GraphQLModule | undefined {
+    return (this._module = this._module || loadModule('graphql/execution/execute.js'));
+  }
+
   /**
    * @inheritDoc
    */
@@ -25,9 +37,7 @@ export class GraphQL implements Integration {
       return;
     }
 
-    const pkg = loadModule<{
-      [method: string]: (...args: unknown[]) => unknown;
-    }>('graphql/execution/execute.js');
+    const pkg = this.loadDependency();
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('GraphQL Integration was unable to require graphql/execution package.');
diff --git a/packages/tracing-internal/src/node/integrations/lazy.ts b/packages/tracing-internal/src/node/integrations/lazy.ts
index f53ff756cd48..635f5b082bee 100644
--- a/packages/tracing-internal/src/node/integrations/lazy.ts
+++ b/packages/tracing-internal/src/node/integrations/lazy.ts
@@ -1,46 +1,55 @@
 import type { Integration, IntegrationClass } from '@sentry/types';
 import { dynamicRequire } from '@sentry/utils';
 
-export const lazyLoadedNodePerformanceMonitoringIntegrations: (() => Integration)[] = [
+export interface LazyLoadedIntegration<T = object> extends Integration {
+  /**
+   * Loads the integration's dependency and caches it so it doesn't have to be loaded again.
+   *
+   * If this returns undefined, the dependency could not be loaded.
+   */
+  loadDependency(): T | undefined;
+}
+
+export const lazyLoadedNodePerformanceMonitoringIntegrations: (() => LazyLoadedIntegration)[] = [
   () => {
     const integration = dynamicRequire(module, './apollo') as {
-      Apollo: IntegrationClass<Integration>;
+      Apollo: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Apollo();
   },
   () => {
     const integration = dynamicRequire(module, './apollo') as {
-      Apollo: IntegrationClass<Integration>;
+      Apollo: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Apollo({ useNestjs: true });
   },
   () => {
     const integration = dynamicRequire(module, './graphql') as {
-      GraphQL: IntegrationClass<Integration>;
+      GraphQL: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.GraphQL();
   },
   () => {
     const integration = dynamicRequire(module, './mongo') as {
-      Mongo: IntegrationClass<Integration>;
+      Mongo: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Mongo();
   },
   () => {
     const integration = dynamicRequire(module, './mongo') as {
-      Mongo: IntegrationClass<Integration>;
+      Mongo: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Mongo({ mongoose: true });
   },
   () => {
     const integration = dynamicRequire(module, './mysql') as {
-      Mysql: IntegrationClass<Integration>;
+      Mysql: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Mysql();
   },
   () => {
     const integration = dynamicRequire(module, './postgres') as {
-      Postgres: IntegrationClass<Integration>;
+      Postgres: IntegrationClass<LazyLoadedIntegration>;
     };
     return new integration.Postgres();
   },
diff --git a/packages/tracing-internal/src/node/integrations/mongo.ts b/packages/tracing-internal/src/node/integrations/mongo.ts
index 37335358c82e..5364f234df8d 100644
--- a/packages/tracing-internal/src/node/integrations/mongo.ts
+++ b/packages/tracing-internal/src/node/integrations/mongo.ts
@@ -1,7 +1,8 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration, SpanContext } from '@sentry/types';
+import type { EventProcessor, SpanContext } from '@sentry/types';
 import { fill, isThenable, loadModule, logger } from '@sentry/utils';
 
+import type { LazyLoadedIntegration } from './lazy';
 import { shouldDisableAutoInstrumentation } from './utils/node-utils';
 
 // This allows us to use the same array for both defaults options and the type itself.
@@ -98,8 +99,10 @@ function isCursor(maybeCursor: MongoCursor): maybeCursor is MongoCursor {
   return maybeCursor && typeof maybeCursor === 'object' && maybeCursor.once && typeof maybeCursor.once === 'function';
 }
 
+type MongoModule = { Collection: MongoCollection };
+
 /** Tracing integration for mongo package */
-export class Mongo implements Integration {
+export class Mongo implements LazyLoadedIntegration<MongoModule> {
   /**
    * @inheritDoc
    */
@@ -114,6 +117,8 @@ export class Mongo implements Integration {
   private _describeOperations?: boolean | Operation[];
   private _useMongoose: boolean;
 
+  private _module?: MongoModule;
+
   /**
    * @inheritDoc
    */
@@ -123,6 +128,12 @@ export class Mongo implements Integration {
     this._useMongoose = !!options.useMongoose;
   }
 
+  /** @inheritdoc */
+  public loadDependency(): MongoModule | undefined {
+    const moduleName = this._useMongoose ? 'mongoose' : 'mongodb';
+    return (this._module = this._module || loadModule(moduleName));
+  }
+
   /**
    * @inheritDoc
    */
@@ -132,10 +143,10 @@ export class Mongo implements Integration {
       return;
     }
 
-    const moduleName = this._useMongoose ? 'mongoose' : 'mongodb';
-    const pkg = loadModule<{ Collection: MongoCollection }>(moduleName);
+    const pkg = this.loadDependency();
 
     if (!pkg) {
+      const moduleName = this._useMongoose ? 'mongoose' : 'mongodb';
       __DEBUG_BUILD__ && logger.error(`Mongo Integration was unable to require \`${moduleName}\` package.`);
       return;
     }
diff --git a/packages/tracing-internal/src/node/integrations/mysql.ts b/packages/tracing-internal/src/node/integrations/mysql.ts
index 6e6a80ac59a6..529e3b859bc2 100644
--- a/packages/tracing-internal/src/node/integrations/mysql.ts
+++ b/packages/tracing-internal/src/node/integrations/mysql.ts
@@ -1,7 +1,8 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor } from '@sentry/types';
 import { fill, loadModule, logger } from '@sentry/utils';
 
+import type { LazyLoadedIntegration } from './lazy';
 import { shouldDisableAutoInstrumentation } from './utils/node-utils';
 
 interface MysqlConnection {
@@ -9,7 +10,7 @@ interface MysqlConnection {
 }
 
 /** Tracing integration for node-mysql package */
-export class Mysql implements Integration {
+export class Mysql implements LazyLoadedIntegration<MysqlConnection> {
   /**
    * @inheritDoc
    */
@@ -20,6 +21,13 @@ export class Mysql implements Integration {
    */
   public name: string = Mysql.id;
 
+  private _module?: MysqlConnection;
+
+  /** @inheritdoc */
+  public loadDependency(): MysqlConnection | undefined {
+    return (this._module = this._module || loadModule('mysql/lib/Connection.js'));
+  }
+
   /**
    * @inheritDoc
    */
@@ -29,7 +37,7 @@ export class Mysql implements Integration {
       return;
     }
 
-    const pkg = loadModule<MysqlConnection>('mysql/lib/Connection.js');
+    const pkg = this.loadDependency();
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('Mysql Integration was unable to require `mysql` package.');
diff --git a/packages/tracing-internal/src/node/integrations/postgres.ts b/packages/tracing-internal/src/node/integrations/postgres.ts
index 41ad31b20660..be7e299cf6aa 100644
--- a/packages/tracing-internal/src/node/integrations/postgres.ts
+++ b/packages/tracing-internal/src/node/integrations/postgres.ts
@@ -1,7 +1,8 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor } from '@sentry/types';
 import { fill, isThenable, loadModule, logger } from '@sentry/utils';
 
+import type { LazyLoadedIntegration } from './lazy';
 import { shouldDisableAutoInstrumentation } from './utils/node-utils';
 
 interface PgClient {
@@ -14,8 +15,10 @@ interface PgOptions {
   usePgNative?: boolean;
 }
 
+type PGModule = { Client: PgClient; native: { Client: PgClient } };
+
 /** Tracing integration for node-postgres package */
-export class Postgres implements Integration {
+export class Postgres implements LazyLoadedIntegration<PGModule> {
   /**
    * @inheritDoc
    */
@@ -28,10 +31,17 @@ export class Postgres implements Integration {
 
   private _usePgNative: boolean;
 
+  private _module?: PGModule;
+
   public constructor(options: PgOptions = {}) {
     this._usePgNative = !!options.usePgNative;
   }
 
+  /** @inheritdoc */
+  public loadDependency(): PGModule | undefined {
+    return (this._module = this._module || loadModule('pg'));
+  }
+
   /**
    * @inheritDoc
    */
@@ -41,7 +51,7 @@ export class Postgres implements Integration {
       return;
     }
 
-    const pkg = loadModule<{ Client: PgClient; native: { Client: PgClient } }>('pg');
+    const pkg = this.loadDependency();
 
     if (!pkg) {
       __DEBUG_BUILD__ && logger.error('Postgres Integration was unable to require `pg` package.');

From a2bd1e097720757952415f3b94ef92ba925c775e Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 27 Mar 2023 09:29:11 +0200
Subject: [PATCH 08/50] test: Try to fix flaky tests? (#7597)

---
 .../startTransaction/basic_usage/subject.js   | 51 ++++++++++---------
 .../protocol_fn_identifiers/test.ts           |  7 +++
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js b/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js
index c75bd2718326..e46009e46b35 100644
--- a/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js
+++ b/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js
@@ -1,30 +1,35 @@
-const transaction = Sentry.startTransaction({ name: 'test_transaction_1' });
-const span_1 = transaction.startChild({
-  op: 'span_1',
-  data: {
-    foo: 'bar',
-    baz: [1, 2, 3],
-  },
-});
-for (let i = 0; i < 2000; i++);
+async function run() {
+  const transaction = Sentry.startTransaction({ name: 'test_transaction_1' });
+  const span_1 = transaction.startChild({
+    op: 'span_1',
+    data: {
+      foo: 'bar',
+      baz: [1, 2, 3],
+    },
+  });
 
-// span_1 finishes
-span_1.finish();
+  await new Promise(resolve => setTimeout(resolve, 1));
 
-// span_2 doesn't finish
-const span_2 = transaction.startChild({ op: 'span_2' });
-for (let i = 0; i < 4000; i++);
+  // span_1 finishes
+  span_1.finish();
 
-const span_3 = transaction.startChild({ op: 'span_3' });
-for (let i = 0; i < 4000; i++);
+  // span_2 doesn't finish
+  const span_2 = transaction.startChild({ op: 'span_2' });
+  await new Promise(resolve => setTimeout(resolve, 1));
 
-// span_4 is the child of span_3 but doesn't finish.
-const span_4 = span_3.startChild({ op: 'span_4', data: { qux: 'quux' } });
+  const span_3 = transaction.startChild({ op: 'span_3' });
+  await new Promise(resolve => setTimeout(resolve, 1));
 
-// span_5 is another child of span_3 but finishes.
-const span_5 = span_3.startChild({ op: 'span_5' }).finish();
+  // span_4 is the child of span_3 but doesn't finish.
+  const span_4 = span_3.startChild({ op: 'span_4', data: { qux: 'quux' } });
 
-// span_3 also finishes
-span_3.finish();
+  // span_5 is another child of span_3 but finishes.
+  const span_5 = span_3.startChild({ op: 'span_5' }).finish();
 
-transaction.finish();
+  // span_3 also finishes
+  span_3.finish();
+
+  transaction.finish();
+}
+
+run();
diff --git a/packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts b/packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
index ce2142169bdc..c4ef75913334 100644
--- a/packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
+++ b/packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
@@ -12,6 +12,10 @@ sentryTest(
     const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
     const frames = eventData.exception?.values?.[0].stacktrace?.frames;
 
+    expect(eventData).toBeDefined();
+    expect(eventData.exception?.values).toBeDefined();
+    expect(frames).toBeDefined();
+
     runInChromium(() => {
       expect(frames).toMatchObject([
         { function: '?' },
@@ -57,6 +61,9 @@ sentryTest(
 
     const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
+    expect(eventData).toBeDefined();
+    expect(eventData.exception?.values).toBeDefined();
+    expect(eventData.exception?.values?.[0].stacktrace).toBeDefined();
     expect(eventData.exception?.values?.[0].stacktrace?.frames).toMatchObject(
       Array(7).fill({ filename: expect.stringMatching(/^file:\/?/) }),
     );

From b589685d5060edd4bc9dc00ee414764f865b2ebf Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Mon, 27 Mar 2023 13:41:47 +0200
Subject: [PATCH 09/50] fix(nextjs): Rewrite `abs_path` frames (#7619)

---
 packages/nextjs/src/client/index.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index ece6bf78db6a..650f0607a2a2 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -77,21 +77,26 @@ function addClientIntegrations(options: BrowserOptions): void {
     // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
     iteratee: frame => {
       try {
-        const { origin } = new URL(frame.filename as string);
-        frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
+        const { origin: absPathOrigin } = new URL(frame.abs_path as string);
+        const { origin: filenameOrigin } = new URL(frame.filename as string);
+        frame.abs_path = frame.abs_path?.replace(absPathOrigin, 'app://').replace(assetPrefixPath, '');
+        frame.filename = frame.filename?.replace(filenameOrigin, 'app://').replace(assetPrefixPath, '');
       } catch (err) {
         // Filename wasn't a properly formed URL, so there's nothing we can do
       }
 
+      // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
+      // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
       if (frame.filename && frame.filename.startsWith('app:///_next')) {
-        // We need to URI-decode the filename because Next.js has wildcard routes like "/users/[id].js" which show up as "/users/%5id%5.js" in Error stacktraces.
-        // The corresponding sources that Next.js generates have proper brackets so we also need proper brackets in the frame so that source map resolving works.
         frame.filename = decodeURI(frame.filename);
       }
+      if (frame.abs_path && frame.abs_path.startsWith('app:///_next')) {
+        frame.abs_path = decodeURI(frame.abs_path);
+      }
 
       if (
-        frame.filename &&
-        frame.filename.match(
+        frame.abs_path &&
+        frame.abs_path.match(
           /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
         )
       ) {

From 02d065d55160606fab64839fcad063f8ee3520d8 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 27 Mar 2023 15:46:46 +0200
Subject: [PATCH 10/50] build(cdn): Make integration CDN bundles build in
 parallel (#7621)

---
 packages/integrations/package.json            | 2 +-
 packages/integrations/rollup.bundle.config.js | 2 +-
 packages/integrations/scripts/buildBundles.ts | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/integrations/package.json b/packages/integrations/package.json
index 473b81051b1a..a2d6a0e162c1 100644
--- a/packages/integrations/package.json
+++ b/packages/integrations/package.json
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "build": "run-p build:transpile build:types build:bundle",
-    "build:bundle": "ts-node scripts/buildBundles.ts",
+    "build:bundle": "ts-node scripts/buildBundles.ts --parallel",
     "build:dev": "run-p build:transpile build:types",
     "build:transpile": "rollup -c rollup.npm.config.js",
     "build:types": "tsc -p tsconfig.types.json",
diff --git a/packages/integrations/rollup.bundle.config.js b/packages/integrations/rollup.bundle.config.js
index 067a062e17f6..7c4d2d15e2a6 100644
--- a/packages/integrations/rollup.bundle.config.js
+++ b/packages/integrations/rollup.bundle.config.js
@@ -12,7 +12,7 @@ const baseBundleConfig = makeBaseBundleConfig({
   entrypoints: [`src/${file}`],
   jsVersion,
   licenseTitle: '@sentry/integrations',
-  outputFileBase: ({ name: entrypoint }) => `bundles/${entrypoint}${jsVersion === 'ES5' ? '.es5' : ''}`,
+  outputFileBase: ({ name: entrypoint }) => `bundles/${entrypoint}${jsVersion === 'es5' ? '.es5' : ''}`,
 });
 
 // TODO We only need `commonjs` for localforage (used in the offline plugin). Once that's fixed, this can come out.
diff --git a/packages/integrations/scripts/buildBundles.ts b/packages/integrations/scripts/buildBundles.ts
index 82cef7c4b507..98a2a3456300 100644
--- a/packages/integrations/scripts/buildBundles.ts
+++ b/packages/integrations/scripts/buildBundles.ts
@@ -33,7 +33,7 @@ async function buildBundle(integration: string, jsVersion: string): Promise<void
 if (runParallel) {
   // We're building a bundle for each integration and each JavaScript version.
   const tasks = getIntegrations().reduce(
-    (tasks, integration) => [...tasks, buildBundle(integration, 'ES5'), buildBundle(integration, 'ES6')],
+    (tasks, integration) => [...tasks, buildBundle(integration, 'es5'), buildBundle(integration, 'es6')],
     [] as Promise<void>[],
   );
 
@@ -49,8 +49,8 @@ if (runParallel) {
 } else {
   void (async () => {
     for (const integration of getIntegrations()) {
-      await buildBundle(integration, 'ES5');
-      await buildBundle(integration, 'ES6');
+      await buildBundle(integration, 'es5');
+      await buildBundle(integration, 'es6');
     }
     // eslint-disable-next-line no-console
     console.log('\nIntegration bundles built successfully');

From 2e5d85010b3a9671d209bc7a74a8d588911a03b8 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Mon, 27 Mar 2023 15:45:56 +0100
Subject: [PATCH 11/50] chore(browser): Add attribution and licences for stack
 parsers (#7620)

---
 packages/browser/src/stack-parsers.ts  |  25 ++++++
 packages/utils/src/node-stack-trace.ts | 114 +++++++++++++++++++++++++
 packages/utils/src/stacktrace.ts       |  94 +-------------------
 3 files changed, 143 insertions(+), 90 deletions(-)
 create mode 100644 packages/utils/src/node-stack-trace.ts

diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts
index 6419f3660e9d..256e7d75fd31 100644
--- a/packages/browser/src/stack-parsers.ts
+++ b/packages/browser/src/stack-parsers.ts
@@ -1,3 +1,28 @@
+// This was originally forked from https://github.com/csnover/TraceKit, and was largely
+// re - written as part of raven - js.
+//
+// This code was later copied to the JavaScript mono - repo and further modified and
+// refactored over the years.
+
+// Copyright (c) 2013 Onur Can Cakmak onur.cakmak@gmail.com and all TraceKit contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files(the 'Software'), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify,
+// merge, publish, distribute, sublicense, and / or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies
+// or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+// PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 import type { StackFrame, StackLineParser, StackLineParserFn } from '@sentry/types';
 import { createStackParser } from '@sentry/utils';
 
diff --git a/packages/utils/src/node-stack-trace.ts b/packages/utils/src/node-stack-trace.ts
new file mode 100644
index 000000000000..7797eb327bbe
--- /dev/null
+++ b/packages/utils/src/node-stack-trace.ts
@@ -0,0 +1,114 @@
+// This code was originally forked from https://github.com/felixge/node-stack-trace
+// Since then it has been highly modified to fit our needs.
+
+// Copyright (c) 2011 Felix Geisendörfer (felix@debuggable.com)//
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions://
+//
+//  The above copyright notice and this permission notice shall be included in
+//  all copies or substantial portions of the Software.//
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+//  THE SOFTWARE.
+
+import type { StackLineParserFn } from '@sentry/types';
+
+export type GetModuleFn = (filename: string | undefined) => string | undefined;
+
+/** Node Stack line parser */
+// eslint-disable-next-line complexity
+export function node(getModule?: GetModuleFn): StackLineParserFn {
+  const FILENAME_MATCH = /^\s*[-]{4,}$/;
+  const FULL_MATCH = /at (?:async )?(?:(.+?)\s+\()?(?:(.+):(\d+):(\d+)?|([^)]+))\)?/;
+
+  // eslint-disable-next-line complexity
+  return (line: string) => {
+    const lineMatch = line.match(FULL_MATCH);
+
+    if (lineMatch) {
+      let object: string | undefined;
+      let method: string | undefined;
+      let functionName: string | undefined;
+      let typeName: string | undefined;
+      let methodName: string | undefined;
+
+      if (lineMatch[1]) {
+        functionName = lineMatch[1];
+
+        let methodStart = functionName.lastIndexOf('.');
+        if (functionName[methodStart - 1] === '.') {
+          methodStart--;
+        }
+
+        if (methodStart > 0) {
+          object = functionName.slice(0, methodStart);
+          method = functionName.slice(methodStart + 1);
+          const objectEnd = object.indexOf('.Module');
+          if (objectEnd > 0) {
+            functionName = functionName.slice(objectEnd + 1);
+            object = object.slice(0, objectEnd);
+          }
+        }
+        typeName = undefined;
+      }
+
+      if (method) {
+        typeName = object;
+        methodName = method;
+      }
+
+      if (method === '<anonymous>') {
+        methodName = undefined;
+        functionName = undefined;
+      }
+
+      if (functionName === undefined) {
+        methodName = methodName || '<anonymous>';
+        functionName = typeName ? `${typeName}.${methodName}` : methodName;
+      }
+
+      let filename = lineMatch[2] && lineMatch[2].startsWith('file://') ? lineMatch[2].slice(7) : lineMatch[2];
+      const isNative = lineMatch[5] === 'native';
+
+      if (!filename && lineMatch[5] && !isNative) {
+        filename = lineMatch[5];
+      }
+
+      const isInternal =
+        isNative || (filename && !filename.startsWith('/') && !filename.startsWith('.') && !filename.includes(':\\'));
+
+      // in_app is all that's not an internal Node function or a module within node_modules
+      // note that isNative appears to return true even for node core libraries
+      // see https://github.com/getsentry/raven-node/issues/176
+
+      const in_app = !isInternal && filename !== undefined && !filename.includes('node_modules/');
+
+      return {
+        filename,
+        module: getModule ? getModule(filename) : undefined,
+        function: functionName,
+        lineno: parseInt(lineMatch[3], 10) || undefined,
+        colno: parseInt(lineMatch[4], 10) || undefined,
+        in_app,
+      };
+    }
+
+    if (line.match(FILENAME_MATCH)) {
+      return {
+        filename: line,
+      };
+    }
+
+    return undefined;
+  };
+}
diff --git a/packages/utils/src/stacktrace.ts b/packages/utils/src/stacktrace.ts
index 78eb1c0eba5d..2cce7a7879ae 100644
--- a/packages/utils/src/stacktrace.ts
+++ b/packages/utils/src/stacktrace.ts
@@ -1,4 +1,7 @@
-import type { StackFrame, StackLineParser, StackLineParserFn, StackParser } from '@sentry/types';
+import type { StackFrame, StackLineParser, StackParser } from '@sentry/types';
+
+import type { GetModuleFn } from './node-stack-trace';
+import { node } from './node-stack-trace';
 
 const STACKTRACE_FRAME_LIMIT = 50;
 // Used to sanitize webpack (error: *) wrapped stack errors
@@ -116,95 +119,6 @@ export function getFunctionName(fn: unknown): string {
   }
 }
 
-type GetModuleFn = (filename: string | undefined) => string | undefined;
-
-// eslint-disable-next-line complexity
-function node(getModule?: GetModuleFn): StackLineParserFn {
-  const FILENAME_MATCH = /^\s*[-]{4,}$/;
-  const FULL_MATCH = /at (?:async )?(?:(.+?)\s+\()?(?:(.+):(\d+):(\d+)?|([^)]+))\)?/;
-
-  // eslint-disable-next-line complexity
-  return (line: string) => {
-    const lineMatch = line.match(FULL_MATCH);
-
-    if (lineMatch) {
-      let object: string | undefined;
-      let method: string | undefined;
-      let functionName: string | undefined;
-      let typeName: string | undefined;
-      let methodName: string | undefined;
-
-      if (lineMatch[1]) {
-        functionName = lineMatch[1];
-
-        let methodStart = functionName.lastIndexOf('.');
-        if (functionName[methodStart - 1] === '.') {
-          methodStart--;
-        }
-
-        if (methodStart > 0) {
-          object = functionName.slice(0, methodStart);
-          method = functionName.slice(methodStart + 1);
-          const objectEnd = object.indexOf('.Module');
-          if (objectEnd > 0) {
-            functionName = functionName.slice(objectEnd + 1);
-            object = object.slice(0, objectEnd);
-          }
-        }
-        typeName = undefined;
-      }
-
-      if (method) {
-        typeName = object;
-        methodName = method;
-      }
-
-      if (method === '<anonymous>') {
-        methodName = undefined;
-        functionName = undefined;
-      }
-
-      if (functionName === undefined) {
-        methodName = methodName || '<anonymous>';
-        functionName = typeName ? `${typeName}.${methodName}` : methodName;
-      }
-
-      let filename = lineMatch[2] && lineMatch[2].startsWith('file://') ? lineMatch[2].slice(7) : lineMatch[2];
-      const isNative = lineMatch[5] === 'native';
-
-      if (!filename && lineMatch[5] && !isNative) {
-        filename = lineMatch[5];
-      }
-
-      const isInternal =
-        isNative || (filename && !filename.startsWith('/') && !filename.startsWith('.') && !filename.includes(':\\'));
-
-      // in_app is all that's not an internal Node function or a module within node_modules
-      // note that isNative appears to return true even for node core libraries
-      // see https://github.com/getsentry/raven-node/issues/176
-
-      const in_app = !isInternal && filename !== undefined && !filename.includes('node_modules/');
-
-      return {
-        filename,
-        module: getModule ? getModule(filename) : undefined,
-        function: functionName,
-        lineno: parseInt(lineMatch[3], 10) || undefined,
-        colno: parseInt(lineMatch[4], 10) || undefined,
-        in_app,
-      };
-    }
-
-    if (line.match(FILENAME_MATCH)) {
-      return {
-        filename: line,
-      };
-    }
-
-    return undefined;
-  };
-}
-
 /**
  * Node.js stack line parser
  *

From f6ce5c9bff6db025117f3ee6d974e7a5b7ab82a6 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 27 Mar 2023 16:54:02 +0200
Subject: [PATCH 12/50] fix(sveltekit): Fix `<meta>` tag injection (#7612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apparently, the `%sveltekit.head%` placeholder isn't present in the html that's passed to `transformPageChunk`. Hence our `<meta>` tag injection logic introduced in #7574  didn't find the anchor point where to inject the tags. This PR fixes the injection, by simply appending it to an open `<head>` tag. It's not pretty but it should do the trick 🤞 (we can revisit if this breaks folks).
---
 packages/sveltekit/src/server/handle.ts       | 8 ++++----
 packages/sveltekit/test/server/handle.test.ts | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
index 8020a35c7377..23319713bf87 100644
--- a/packages/sveltekit/src/server/handle.ts
+++ b/packages/sveltekit/src/server/handle.ts
@@ -40,10 +40,10 @@ export const transformPageChunk: NonNullable<ResolveOptions['transformPageChunk'
   if (transaction) {
     const traceparentData = transaction.toTraceparent();
     const dynamicSamplingContext = dynamicSamplingContextToSentryBaggageHeader(transaction.getDynamicSamplingContext());
-    const content = `<meta name="sentry-trace" content="${traceparentData}"/>
-      <meta name="baggage" content="${dynamicSamplingContext}"/>
-      %sveltekit.head%`;
-    return html.replace('%sveltekit.head%', content);
+    const content = `<head>
+      <meta name="sentry-trace" content="${traceparentData}"/>
+      <meta name="baggage" content="${dynamicSamplingContext}"/>`;
+    return html.replace('<head>', content);
   }
 
   return html;
diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts
index f260d2daf310..ac94e72dd292 100644
--- a/packages/sveltekit/test/server/handle.test.ts
+++ b/packages/sveltekit/test/server/handle.test.ts
@@ -271,7 +271,6 @@ describe('transformPageChunk', () => {
       <meta charset="utf-8" />
       <link rel="icon" href="%sveltekit.assets%/favicon.png" />
       <meta name="viewport" content="width=device-width" />
-      %sveltekit.head%
     </head>
     <body data-sveltekit-preload-data="hover">
       <div style="display: contents">%sveltekit.body%</div>

From 0fab403c7a86cac9e7ae5a6bebd7a4c566035ac1 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Mon, 27 Mar 2023 17:35:37 +0200
Subject: [PATCH 13/50] fix(core): Remove `abs_path` from stack trace
 (reverting #7167) (#7623)

---
 packages/browser/src/stack-parsers.ts         |   1 -
 .../test/unit/tracekit/chromium.test.ts       | 367 ++-----------
 .../test/unit/tracekit/firefox.test.ts        | 346 ++----------
 .../browser/test/unit/tracekit/ie.test.ts     |  74 +--
 .../browser/test/unit/tracekit/misc.test.ts   |  24 +-
 .../browser/test/unit/tracekit/opera.test.ts  | 149 +-----
 .../test/unit/tracekit/react-native.test.ts   | 495 +++---------------
 .../browser/test/unit/tracekit/react.test.ts  |  36 +-
 .../browser/test/unit/tracekit/safari.test.ts | 219 ++------
 packages/core/src/utils/prepareEvent.ts       |  24 +-
 packages/core/test/lib/prepareEvent.test.ts   |  10 +-
 .../tests/devErrorSymbolification.test.ts     |   1 -
 packages/nextjs/src/client/index.ts           |  13 +-
 .../devErrorSymbolicationEventProcessor.ts    |   2 +-
 packages/types/src/debugMeta.ts               |   2 +-
 15 files changed, 231 insertions(+), 1532 deletions(-)

diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts
index 256e7d75fd31..e4c66755f232 100644
--- a/packages/browser/src/stack-parsers.ts
+++ b/packages/browser/src/stack-parsers.ts
@@ -38,7 +38,6 @@ const GECKO_PRIORITY = 50;
 function createFrame(filename: string, func: string, lineno?: number, colno?: number): StackFrame {
   const frame: StackFrame = {
     filename,
-    abs_path: filename, // As opposed to filename, abs_path is immutable (I can't control your actions but don't touch it!)
     function: func,
     in_app: true, // All browser frames are considered in_app
   };
diff --git a/packages/browser/test/unit/tracekit/chromium.test.ts b/packages/browser/test/unit/tracekit/chromium.test.ts
index 0d600cc28dd1..b0df582ebeef 100644
--- a/packages/browser/test/unit/tracekit/chromium.test.ts
+++ b/packages/browser/test/unit/tracekit/chromium.test.ts
@@ -9,7 +9,7 @@ describe('Tracekit - Chrome Tests', () => {
     expect(ex).toEqual({
       value: 'foo',
       type: 'bar',
-      stacktrace: { frames: [{ filename: 'native', abs_path: 'native', function: 'Array.forEach', in_app: true }] },
+      stacktrace: { frames: [{ filename: 'native', function: 'Array.forEach', in_app: true }] },
     });
   });
 
@@ -33,38 +33,10 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 24,
-            colno: 4,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 20,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 16,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 13,
-            colno: 17,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 24, colno: 4, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 20, colno: 5, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 16, colno: 5, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 13, colno: 17, in_app: true },
         ],
       },
     });
@@ -90,7 +62,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
             function: 'I.e.fn.(anonymous function) [as index]',
             lineno: 10,
             colno: 3651,
@@ -98,7 +69,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
             function: 'HTMLButtonElement.onclick',
             lineno: 107,
             colno: 146,
@@ -106,7 +76,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
             function: 'dumpExceptionError',
             lineno: 41,
             colno: 27,
@@ -139,7 +108,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'webpack:///./~/react-proxy/modules/createPrototypeProxy.js?',
-            abs_path: 'webpack:///./~/react-proxy/modules/createPrototypeProxy.js?',
             function: 'TESTTESTTEST.proxiedMethod',
             lineno: 44,
             colno: 30,
@@ -147,7 +115,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'webpack:///./~/react-transform-catch-errors/lib/index.js?',
-            abs_path: 'webpack:///./~/react-transform-catch-errors/lib/index.js?',
             function: 'TESTTESTTEST.tryRender',
             lineno: 34,
             colno: 31,
@@ -155,7 +122,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'webpack:///./src/components/test/test.jsx?',
-            abs_path: 'webpack:///./src/components/test/test.jsx?',
             function: 'TESTTESTTEST.render',
             lineno: 272,
             colno: 32,
@@ -163,7 +129,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'webpack:///./src/components/test/test.jsx?',
-            abs_path: 'webpack:///./src/components/test/test.jsx?',
             function: 'TESTTESTTEST.eval',
             lineno: 295,
             colno: 108,
@@ -194,46 +159,11 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: '?',
-            lineno: 31,
-            colno: 13,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'Object.speak',
-            lineno: 21,
-            colno: 17,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'eval',
-            lineno: 21,
-            colno: 17,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'foo',
-            lineno: 21,
-            colno: 17,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'baz',
-            lineno: 21,
-            colno: 17,
-            in_app: true,
-          },
+          { filename: 'http://localhost:8080/file.js', function: '?', lineno: 31, colno: 13, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'Object.speak', lineno: 21, colno: 17, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'eval', lineno: 21, colno: 17, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'foo', lineno: 21, colno: 17, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'baz', lineno: 21, colno: 17, in_app: true },
         ],
       },
     });
@@ -263,7 +193,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
-            abs_path: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
             function: 'n.handle',
             lineno: 7,
             colno: 2863,
@@ -271,7 +200,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
-            abs_path: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
             function: 'n.fire',
             lineno: 7,
             colno: 3019,
@@ -279,7 +207,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
-            abs_path: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
             function: '?',
             lineno: 1,
             colno: 6911,
@@ -287,7 +214,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'blob:http%3A//localhost%3A8080/d4eefe0f-361a-4682-b217-76587d9f712a',
-            abs_path: 'blob:http%3A//localhost%3A8080/d4eefe0f-361a-4682-b217-76587d9f712a',
             function: '?',
             lineno: 15,
             colno: 10978,
@@ -295,7 +221,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
-            abs_path: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
             function: 'Object.d [as add]',
             lineno: 31,
             colno: 30039,
@@ -303,13 +228,12 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
-            abs_path: 'blob:http%3A//localhost%3A8080/abfc40e9-4742-44ed-9dcd-af8f99a29379',
             function: 's',
             lineno: 31,
             colno: 29146,
             in_app: true,
           },
-          { filename: 'native', abs_path: 'native', function: 'Error', in_app: true },
+          { filename: 'native', function: 'Error', in_app: true },
         ],
       },
     });
@@ -332,7 +256,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'examplescheme://examplehost/cd351f7250857e22ceaa.worker.js',
-            abs_path: 'examplescheme://examplehost/cd351f7250857e22ceaa.worker.js',
             function: '?',
             lineno: 70179,
             colno: 15,
@@ -361,31 +284,10 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: '?',
-            lineno: 24,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'foo',
-            lineno: 19,
-            colno: 19,
-            in_app: true,
-          },
-          { filename: '<anonymous>', abs_path: '<anonymous>', function: 'Array.map', in_app: true },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'fooIterator',
-            lineno: 20,
-            colno: 17,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/test', function: '?', lineno: 24, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'foo', lineno: 19, colno: 19, in_app: true },
+          { filename: '<anonymous>', function: 'Array.map', in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'fooIterator', lineno: 20, colno: 17, in_app: true },
         ],
       },
     });
@@ -415,79 +317,16 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 50,
-            colno: 19,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Foo.testMethod',
-            lineno: 44,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 39,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'eval',
-            lineno: 37,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test',
-            lineno: 33,
-            colno: 23,
-            in_app: true,
-          },
-          { filename: '<anonymous>', abs_path: '<anonymous>', function: 'Array.map', in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 34,
-            colno: 17,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Object.callback',
-            lineno: 25,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callAnotherThing',
-            lineno: 20,
-            colno: 16,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Object.aha',
-            lineno: 19,
-            colno: 13,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 50, colno: 19, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Foo.testMethod', lineno: 44, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 39, colno: 5, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'eval', lineno: 37, colno: 5, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 23, in_app: true },
+          { filename: '<anonymous>', function: 'Array.map', in_app: true },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 34, colno: 17, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Object.callback', lineno: 25, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 20, colno: 16, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Object.aha', lineno: 19, colno: 13, in_app: true },
         ],
       },
     });
@@ -510,30 +349,9 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test',
-            lineno: 33,
-            colno: 23,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Object.callback',
-            lineno: 25,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callAnotherThing',
-            lineno: 20,
-            colno: 16,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 23, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Object.callback', lineno: 25, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 20, colno: 16, in_app: true },
         ],
       },
     });
@@ -557,31 +375,10 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'Global code',
-            lineno: 24,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'foo',
-            lineno: 19,
-            colno: 9,
-            in_app: true,
-          },
-          { filename: 'native code', abs_path: 'native code', function: 'Array.prototype.map', in_app: true },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'fooIterator',
-            lineno: 20,
-            colno: 11,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/test', function: 'Global code', lineno: 24, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'foo', lineno: 19, colno: 9, in_app: true },
+          { filename: 'native code', function: 'Array.prototype.map', in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'fooIterator', lineno: 20, colno: 11, in_app: true },
         ],
       },
     });
@@ -611,72 +408,22 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
+          { filename: 'http://localhost:5000/', function: 'Anonymous function', lineno: 50, colno: 8, in_app: true },
           {
             filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Anonymous function',
-            lineno: 50,
-            colno: 8,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
             function: 'Foo.prototype.testMethod',
             lineno: 44,
             colno: 7,
             in_app: true,
           },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 39,
-            colno: 5,
-            in_app: true,
-          },
-          { filename: 'eval code', abs_path: 'eval code', function: 'eval code', lineno: 1, colno: 1, in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test',
-            lineno: 33,
-            colno: 5,
-            in_app: true,
-          },
-          { filename: 'native code', abs_path: 'native code', function: 'Array.prototype.map', in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'Anonymous function',
-            lineno: 34,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callback',
-            lineno: 25,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callAnotherThing',
-            lineno: 18,
-            colno: 6,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 19,
-            colno: 7,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 39, colno: 5, in_app: true },
+          { filename: 'eval code', function: 'eval code', lineno: 1, colno: 1, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 5, in_app: true },
+          { filename: 'native code', function: 'Array.prototype.map', in_app: true },
+          { filename: 'http://localhost:5000/', function: 'Anonymous function', lineno: 34, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callback', lineno: 25, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 18, colno: 6, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 19, colno: 7, in_app: true },
         ],
       },
     });
@@ -699,7 +446,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'C:\\Users\\user\\path\\to\\file.js',
-            abs_path: 'C:\\Users\\user\\path\\to\\file.js',
             function: 'TESTTESTTEST.someMethod',
             lineno: 295,
             colno: 108,
@@ -732,7 +478,6 @@ describe('Tracekit - Chrome Tests', () => {
         frames: [
           {
             filename: 'react-dom.development.js?f8c1',
-            abs_path: 'react-dom.development.js?f8c1',
             function: 'commitLayoutEffects',
             in_app: true,
             lineno: 23426,
@@ -740,7 +485,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'react-dom.development.js?f8c1',
-            abs_path: 'react-dom.development.js?f8c1',
             function: 'commitLifeCycles',
             in_app: true,
             lineno: 20663,
@@ -748,7 +492,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'genericDiscoverQuery.tsx?33f8',
-            abs_path: 'genericDiscoverQuery.tsx?33f8',
             function: '_GenericDiscoverQuery.componentDidMount',
             in_app: true,
             lineno: 152,
@@ -756,7 +499,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'genericDiscoverQuery.tsx?33f8',
-            abs_path: 'genericDiscoverQuery.tsx?33f8',
             function: '_GenericDiscoverQuery.eval [as fetchData]',
             in_app: true,
             lineno: 256,
@@ -764,7 +506,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'genericDiscoverQuery.tsx?33f8',
-            abs_path: 'genericDiscoverQuery.tsx?33f8',
             function: 'doDiscoverQuery',
             in_app: true,
             lineno: 328,
@@ -772,7 +513,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'api.tsx',
-            abs_path: 'api.tsx',
             function: 'Client.requestPromise',
             in_app: true,
             lineno: 554,
@@ -802,10 +542,9 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'ChunkLoadError',
       stacktrace: {
         frames: [
-          { filename: '<anonymous>', abs_path: '<anonymous>', function: 'Array.reduce', in_app: true },
+          { filename: '<anonymous>', function: 'Array.reduce', in_app: true },
           {
             filename: 'webpack/runtime/ensure chunk',
-            abs_path: 'webpack/runtime/ensure chunk',
             function: '?',
             in_app: true,
             lineno: 6,
@@ -813,7 +552,6 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: 'webpack/runtime/jsonp chunk loading',
-            abs_path: 'webpack/runtime/jsonp chunk loading',
             function: 'key',
             in_app: true,
             lineno: 27,
@@ -821,15 +559,12 @@ describe('Tracekit - Chrome Tests', () => {
           },
           {
             filename: '/_static/dist/sentry/chunks/app_bootstrap_initializeLocale_tsx.abcdefg.js',
-            abs_path: '/_static/dist/sentry/chunks/app_bootstrap_initializeLocale_tsx.abcdefg.js',
             function: '?',
             in_app: true,
           },
           {
             filename:
               'https://s1.sentry-cdn.com/_static/dist/sentry/chunks/app_bootstrap_initializeLocale_tsx.abcdefg.js',
-            abs_path:
-              'https://s1.sentry-cdn.com/_static/dist/sentry/chunks/app_bootstrap_initializeLocale_tsx.abcdefg.js',
             function: '?',
             in_app: true,
           },
@@ -857,22 +592,8 @@ describe('Tracekit - Chrome Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 50,
-            colno: 19,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 39,
-            colno: 5,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 50, colno: 19, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 39, colno: 5, in_app: true },
         ],
       },
     });
diff --git a/packages/browser/test/unit/tracekit/firefox.test.ts b/packages/browser/test/unit/tracekit/firefox.test.ts
index 9a062d0a123b..f75dd7ccf010 100644
--- a/packages/browser/test/unit/tracekit/firefox.test.ts
+++ b/packages/browser/test/unit/tracekit/firefox.test.ts
@@ -26,55 +26,13 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'TypeError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://127.0.0.1:8000/js/file.js',
-            abs_path: 'http://127.0.0.1:8000/js/file.js',
-            function: '?',
-            lineno: 24,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/file.js',
-            abs_path: 'http://127.0.0.1:8000/js/file.js',
-            function: 'foo',
-            lineno: 20,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/file.js',
-            abs_path: 'http://127.0.0.1:8000/js/file.js',
-            function: 'bar',
-            lineno: 16,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/file.js',
-            abs_path: 'http://127.0.0.1:8000/js/file.js',
-            function: 'bar',
-            lineno: 13,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/stacktrace.js',
-            abs_path: 'http://127.0.0.1:8000/js/stacktrace.js',
-            function: 'printStackTrace',
-            lineno: 18,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/stacktrace.js',
-            abs_path: 'http://127.0.0.1:8000/js/stacktrace.js',
-            function: '?',
-            lineno: 31,
-            in_app: true,
-          },
-          {
-            filename: 'http://127.0.0.1:8000/js/stacktrace.js',
-            abs_path: 'http://127.0.0.1:8000/js/stacktrace.js',
-            function: '?',
-            lineno: 44,
-            in_app: true,
-          },
+          { filename: 'http://127.0.0.1:8000/js/file.js', function: '?', lineno: 24, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/file.js', function: 'foo', lineno: 20, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/file.js', function: 'bar', lineno: 16, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/file.js', function: 'bar', lineno: 13, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/stacktrace.js', function: 'printStackTrace', lineno: 18, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/stacktrace.js', function: '?', lineno: 31, in_app: true },
+          { filename: 'http://127.0.0.1:8000/js/stacktrace.js', function: '?', lineno: 44, in_app: true },
         ],
       },
     });
@@ -104,55 +62,13 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'file:///G:/js/file.js',
-            abs_path: 'file:///G:/js/file.js',
-            function: '?',
-            lineno: 24,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/file.js',
-            abs_path: 'file:///G:/js/file.js',
-            function: 'foo',
-            lineno: 20,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/file.js',
-            abs_path: 'file:///G:/js/file.js',
-            function: 'bar',
-            lineno: 16,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/file.js',
-            abs_path: 'file:///G:/js/file.js',
-            function: 'bar',
-            lineno: 13,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/stacktrace.js',
-            abs_path: 'file:///G:/js/stacktrace.js',
-            function: 'printStackTrace',
-            lineno: 18,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/stacktrace.js',
-            abs_path: 'file:///G:/js/stacktrace.js',
-            function: '?',
-            lineno: 31,
-            in_app: true,
-          },
-          {
-            filename: 'file:///G:/js/stacktrace.js',
-            abs_path: 'file:///G:/js/stacktrace.js',
-            function: '?',
-            lineno: 44,
-            in_app: true,
-          },
+          { filename: 'file:///G:/js/file.js', function: '?', lineno: 24, in_app: true },
+          { filename: 'file:///G:/js/file.js', function: 'foo', lineno: 20, in_app: true },
+          { filename: 'file:///G:/js/file.js', function: 'bar', lineno: 16, in_app: true },
+          { filename: 'file:///G:/js/file.js', function: 'bar', lineno: 13, in_app: true },
+          { filename: 'file:///G:/js/stacktrace.js', function: 'printStackTrace', lineno: 18, in_app: true },
+          { filename: 'file:///G:/js/stacktrace.js', function: '?', lineno: 31, in_app: true },
+          { filename: 'file:///G:/js/stacktrace.js', function: '?', lineno: 44, in_app: true },
         ],
       },
     });
@@ -178,27 +94,9 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'onclick',
-            lineno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'dumpException3',
-            lineno: 52,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 48,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'onclick', lineno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'dumpException3', lineno: 52, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 48, in_app: true },
         ],
       },
     });
@@ -225,30 +123,9 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '.plugin/e.fn[c]/<',
-            lineno: 1,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 1,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 41,
-            colno: 13,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: '.plugin/e.fn[c]/<', lineno: 1, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 1, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 41, colno: 13, in_app: true },
         ],
       },
     });
@@ -281,33 +158,11 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'NS_ERROR_FAILURE',
       stacktrace: {
         frames: [
-          {
-            filename: 'file:///path/to/index.html',
-            abs_path: 'file:///path/to/index.html',
-            function: '?',
-            lineno: 23,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'file:///path/to/file.js',
-            abs_path: 'file:///path/to/file.js',
-            function: 'bar',
-            lineno: 20,
-            colno: 3,
-            in_app: true,
-          },
-          {
-            filename: 'file:///path/to/file.js',
-            abs_path: 'file:///path/to/file.js',
-            function: 'App.prototype.foo',
-            lineno: 15,
-            colno: 2,
-            in_app: true,
-          },
+          { filename: 'file:///path/to/index.html', function: '?', lineno: 23, colno: 1, in_app: true },
+          { filename: 'file:///path/to/file.js', function: 'bar', lineno: 20, colno: 3, in_app: true },
+          { filename: 'file:///path/to/file.js', function: 'App.prototype.foo', lineno: 15, colno: 2, in_app: true },
           {
             filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
             function: '[2]</Bar.prototype._baz/</<',
             lineno: 703,
             colno: 28,
@@ -340,7 +195,6 @@ describe('Tracekit - Firefox Tests', () => {
         frames: [
           {
             filename: 'resource://path/data/content/bundle.js',
-            abs_path: 'resource://path/data/content/bundle.js',
             function: 'wrapped',
             lineno: 7270,
             colno: 25,
@@ -348,7 +202,6 @@ describe('Tracekit - Firefox Tests', () => {
           },
           {
             filename: 'resource://path/data/content/vendor.bundle.js',
-            abs_path: 'resource://path/data/content/vendor.bundle.js',
             function: 'dispatchEvent',
             lineno: 18,
             colno: 23028,
@@ -356,7 +209,6 @@ describe('Tracekit - Firefox Tests', () => {
           },
           {
             filename: 'resource://path/data/content/bundle.js',
-            abs_path: 'resource://path/data/content/bundle.js',
             function: 'render',
             lineno: 5529,
             colno: 16,
@@ -389,43 +241,11 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: '?',
-            lineno: 33,
-            colno: 9,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'speak',
-            lineno: 26,
-            colno: 17,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'eval',
-            lineno: 26,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'foo',
-            lineno: 26,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:8080/file.js',
-            abs_path: 'http://localhost:8080/file.js',
-            function: 'baz',
-            lineno: 26,
-            in_app: true,
-          },
+          { filename: 'http://localhost:8080/file.js', function: '?', lineno: 33, colno: 9, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'speak', lineno: 26, colno: 17, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'eval', lineno: 26, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'foo', lineno: 26, in_app: true },
+          { filename: 'http://localhost:8080/file.js', function: 'baz', lineno: 26, in_app: true },
         ],
       },
     });
@@ -447,30 +267,9 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: '?',
-            lineno: 24,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'foo',
-            lineno: 19,
-            colno: 19,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'fooIterator',
-            lineno: 20,
-            colno: 17,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/test', function: '?', lineno: 24, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'foo', lineno: 19, colno: 19, in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'fooIterator', lineno: 20, colno: 17, in_app: true },
         ],
       },
     });
@@ -498,77 +297,15 @@ describe('Tracekit - Firefox Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 50,
-            colno: 19,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'testMethod',
-            lineno: 44,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 39,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'eval',
-            lineno: 39,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test',
-            lineno: 33,
-            colno: 23,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test/<',
-            lineno: 34,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callback',
-            lineno: 25,
-            colno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callAnotherThing',
-            lineno: 20,
-            colno: 15,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 19,
-            colno: 13,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 50, colno: 19, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'testMethod', lineno: 44, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 39, colno: 5, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'eval', lineno: 39, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 23, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'test/<', lineno: 34, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callback', lineno: 25, colno: 7, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 20, colno: 15, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 19, colno: 13, in_app: true },
         ],
       },
     });
@@ -595,7 +332,6 @@ describe('Tracekit - Firefox Tests', () => {
           {
             colno: 1018410,
             filename: 'https://www.random_website.com/main.4a4119c3cdfd10266d84.js',
-            abs_path: 'https://www.random_website.com/main.4a4119c3cdfd10266d84.js',
             function: 'handleProfileResult',
             in_app: true,
             lineno: 146,
@@ -603,7 +339,6 @@ describe('Tracekit - Firefox Tests', () => {
           {
             colno: 333807,
             filename: 'https://www.random_website.com/vendor.d1cae9cfc9917df88de7.js',
-            abs_path: 'https://www.random_website.com/vendor.d1cae9cfc9917df88de7.js',
             function: 'detectChanges',
             in_app: true,
             lineno: 1,
@@ -611,7 +346,6 @@ describe('Tracekit - Firefox Tests', () => {
           {
             colno: 296021,
             filename: 'https://www.random_website.com/vendor.d1cae9cfc9917df88de7.js',
-            abs_path: 'https://www.random_website.com/vendor.d1cae9cfc9917df88de7.js',
             function: 'us',
             in_app: true,
             lineno: 1,
diff --git a/packages/browser/test/unit/tracekit/ie.test.ts b/packages/browser/test/unit/tracekit/ie.test.ts
index 6417a7043c32..544542b0dcaf 100644
--- a/packages/browser/test/unit/tracekit/ie.test.ts
+++ b/packages/browser/test/unit/tracekit/ie.test.ts
@@ -23,30 +23,9 @@ describe('Tracekit - IE Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 82,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 46,
-            colno: 9,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'Anonymous function',
-            lineno: 48,
-            colno: 13,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 82, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 46, colno: 9, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'Anonymous function', lineno: 48, colno: 13, in_app: true },
         ],
       },
     });
@@ -73,30 +52,9 @@ describe('Tracekit - IE Tests', () => {
       type: 'TypeError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 108,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 45,
-            colno: 13,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'Anonymous function',
-            lineno: 47,
-            colno: 21,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 108, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 45, colno: 13, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'Anonymous function', lineno: 47, colno: 21, in_app: true },
         ],
       },
     });
@@ -122,23 +80,9 @@ describe('Tracekit - IE Tests', () => {
       type: 'ReferenceError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 109,
-            colno: 1,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 58,
-            colno: 17,
-            in_app: true,
-          },
-          { filename: 'eval code', abs_path: 'eval code', function: 'eval code', lineno: 1, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 109, colno: 1, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 58, colno: 17, in_app: true },
+          { filename: 'eval code', function: 'eval code', lineno: 1, colno: 1, in_app: true },
         ],
       },
     });
diff --git a/packages/browser/test/unit/tracekit/misc.test.ts b/packages/browser/test/unit/tracekit/misc.test.ts
index dbe718c9410f..e9db457ea196 100644
--- a/packages/browser/test/unit/tracekit/misc.test.ts
+++ b/packages/browser/test/unit/tracekit/misc.test.ts
@@ -19,27 +19,9 @@ describe('Tracekit - Misc Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 4287,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 4283,
-            in_app: true,
-          },
-          {
-            filename: 'file:///path/to/file.js',
-            abs_path: 'file:///path/to/file.js',
-            function: '?',
-            lineno: 878,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 4287, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 4283, in_app: true },
+          { filename: 'file:///path/to/file.js', function: '?', lineno: 878, in_app: true },
         ],
       },
     });
diff --git a/packages/browser/test/unit/tracekit/opera.test.ts b/packages/browser/test/unit/tracekit/opera.test.ts
index 08d7119fb5bb..e86855dc172a 100644
--- a/packages/browser/test/unit/tracekit/opera.test.ts
+++ b/packages/browser/test/unit/tracekit/opera.test.ts
@@ -37,55 +37,13 @@ describe('Tracekit - Opera Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 15,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 11,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 7,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 4,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'printStackTrace',
-            lineno: 18,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 27,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 42,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 15, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 11, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 7, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 4, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'printStackTrace', lineno: 18, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 27, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 42, in_app: true },
         ],
       },
     });
@@ -125,62 +83,13 @@ describe('Tracekit - Opera Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 15,
-            colno: 3,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 11,
-            colno: 4,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 7,
-            colno: 4,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 4,
-            colno: 5,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'printStackTrace',
-            lineno: 18,
-            colno: 4,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'run',
-            lineno: 27,
-            colno: 8,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'createException',
-            lineno: 42,
-            colno: 12,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 15, colno: 3, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 11, colno: 4, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 7, colno: 4, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 4, colno: 5, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'printStackTrace', lineno: 18, colno: 4, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'run', lineno: 27, colno: 8, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'createException', lineno: 42, colno: 12, in_app: true },
         ],
       },
     });
@@ -213,7 +122,6 @@ describe('Tracekit - Opera Tests', () => {
         frames: [
           {
             filename: 'http://localhost:8000/ExceptionLab.html',
-            abs_path: 'http://localhost:8000/ExceptionLab.html',
             function: '<anonymous function>',
             lineno: 1,
             colno: 0,
@@ -221,7 +129,6 @@ describe('Tracekit - Opera Tests', () => {
           },
           {
             filename: 'http://localhost:8000/ExceptionLab.html',
-            abs_path: 'http://localhost:8000/ExceptionLab.html',
             function: 'dumpException3',
             lineno: 46,
             colno: 8,
@@ -229,7 +136,6 @@ describe('Tracekit - Opera Tests', () => {
           },
           {
             filename: 'http://localhost:8000/ExceptionLab.html',
-            abs_path: 'http://localhost:8000/ExceptionLab.html',
             function: '<anonymous function>',
             lineno: 48,
             colno: 12,
@@ -258,30 +164,9 @@ describe('Tracekit - Opera Tests', () => {
       type: 'TypeError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 108,
-            colno: 168,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 52,
-            colno: 15,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 47,
-            colno: 22,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 108, colno: 168, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 52, colno: 15, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 47, colno: 22, in_app: true },
         ],
       },
     });
diff --git a/packages/browser/test/unit/tracekit/react-native.test.ts b/packages/browser/test/unit/tracekit/react-native.test.ts
index 7615a27c4afe..9a74e46007b1 100644
--- a/packages/browser/test/unit/tracekit/react-native.test.ts
+++ b/packages/browser/test/unit/tracekit/react-native.test.ts
@@ -22,41 +22,18 @@ describe('Tracekit - React Native Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
+          { filename: 'index.android.bundle', function: 'P', lineno: 93, colno: 714, in_app: true },
+          { filename: 'index.android.bundle', function: 'Object.y', lineno: 93, colno: 571, in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'P',
-            lineno: 93,
-            colno: 714,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'Object.y',
-            lineno: 93,
-            colno: 571,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 's.touchableHandleResponderRelease',
             lineno: 198,
             colno: 5615,
             in_app: true,
           },
+          { filename: 'index.android.bundle', function: 's._receiveSignal', lineno: 198, colno: 8309, in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 's._receiveSignal',
-            lineno: 198,
-            colno: 8309,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 's._performSideEffectsForTransition',
             lineno: 198,
             colno: 9608,
@@ -64,20 +41,12 @@ describe('Tracekit - React Native Tests', () => {
           },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 's.touchableHandlePress',
             lineno: 214,
             colno: 2048,
             in_app: true,
           },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'Object.onPress',
-            lineno: 2342,
-            colno: 3773,
-            in_app: true,
-          },
+          { filename: 'index.android.bundle', function: 'Object.onPress', lineno: 2342, colno: 3773, in_app: true },
         ],
       },
     });
@@ -100,12 +69,10 @@ describe('Tracekit - React Native Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          { filename: '[native code]', abs_path: '[native code]', function: 'forEach', in_app: true },
+          { filename: '[native code]', function: 'forEach', in_app: true },
           {
             filename:
               '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
-            abs_path:
-              '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
             function: 'p',
             lineno: 96,
             colno: 385,
@@ -114,8 +81,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
-            abs_path:
-              '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
             function: 'onResponderRelease',
             lineno: 221,
             colno: 5666,
@@ -124,8 +89,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
-            abs_path:
-              '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
             function: 'value',
             lineno: 221,
             colno: 7656,
@@ -134,8 +97,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
-            abs_path:
-              '/data/user/0/com.sentrytest/files/.expo-internal/bundle-613EDD44F3305B9D75D4679663900F2BCDDDC326F247CA3202A3A4219FD412D3',
             function: 'onPress',
             lineno: 595,
             colno: 658,
@@ -172,8 +133,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/native/ReactNativeBaseComponent.js',
             function: 'this',
             lineno: 74,
             colno: 41,
@@ -182,8 +141,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactMultiChild.js',
             function: 'children',
             lineno: 264,
             colno: 10,
@@ -192,8 +149,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactReconciler.js',
             function: 'child',
             lineno: 68,
             colno: 25,
@@ -202,8 +157,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
             function: '_currentElement',
             lineno: 346,
             colno: 40,
@@ -212,8 +165,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
             function: 'renderedElement',
             lineno: 484,
             colno: 29,
@@ -222,8 +173,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
             function: '_renderValidatedComponent',
             lineno: 1075,
             colno: 15,
@@ -232,8 +181,6 @@ describe('Tracekit - React Native Tests', () => {
           {
             filename:
               '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
-            abs_path:
-              '/home/username/sample-workspace/sampleapp.collect.react/node_modules/react-native/Libraries/Renderer/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js',
             function: '_renderValidatedComponentWithoutOwnerOrContext',
             lineno: 1050,
             colno: 29,
@@ -241,7 +188,6 @@ describe('Tracekit - React Native Tests', () => {
           },
           {
             filename: '/home/username/sample-workspace/sampleapp.collect.react/src/components/GpsMonitorScene.js',
-            abs_path: '/home/username/sample-workspace/sampleapp.collect.react/src/components/GpsMonitorScene.js',
             function: 'render',
             lineno: 78,
             colno: 24,
@@ -303,260 +249,73 @@ describe('Tracekit - React Native Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 29,
-            colno: 927,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 29,
-            colno: 2417,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: '?',
-            lineno: 29,
-            colno: 955,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 29,
-            colno: 3016,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'receiveTouches',
-            lineno: 156,
-            colno: 918,
-            in_app: true,
-          },
+          { filename: '[native code]', function: '?', in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 29, colno: 927, in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 29, colno: 2417, in_app: true },
+          { filename: 'index.android.bundle', function: '?', lineno: 29, colno: 955, in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 29, colno: 3016, in_app: true },
+          { filename: 'index.android.bundle', function: 'receiveTouches', lineno: 156, colno: 918, in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: '_receiveRootNodeIDEvent',
             lineno: 156,
             colno: 544,
             in_app: true,
           },
+          { filename: 'index.android.bundle', function: 'u', lineno: 93, colno: 150, in_app: true },
+          { filename: 'index.android.bundle', function: 'i', lineno: 93, colno: 90, in_app: true },
+          { filename: 'index.android.bundle', function: 'i', lineno: 176, colno: 358, in_app: true },
+          { filename: 'index.android.bundle', function: 'batchedUpdates', lineno: 188, colno: 464, in_app: true },
+          { filename: 'index.android.bundle', function: 'perform', lineno: 177, colno: 596, in_app: true },
+          { filename: 'index.android.bundle', function: 'c', lineno: 93, colno: 60, in_app: true },
+          { filename: 'index.android.bundle', function: 'a', lineno: 93, colno: 276, in_app: true },
+          { filename: 'index.android.bundle', function: '?', lineno: 156, colno: 572, in_app: true },
+          { filename: 'index.android.bundle', function: 'handleTopLevel', lineno: 157, colno: 174, in_app: true },
+          { filename: 'index.android.bundle', function: 's', lineno: 157, colno: 88, in_app: true },
+          { filename: 'index.android.bundle', function: 'processEventQueue', lineno: 146, colno: 1432, in_app: true },
+          { filename: 'index.android.bundle', function: 'i', lineno: 149, colno: 80, in_app: true },
+          { filename: '[native code]', function: 'forEach', in_app: true },
+          { filename: 'index.android.bundle', function: 'g', lineno: 146, colno: 604, in_app: true },
+          { filename: 'index.android.bundle', function: 'v', lineno: 146, colno: 501, in_app: true },
+          { filename: 'index.android.bundle', function: 'a', lineno: 95, colno: 567, in_app: true },
+          { filename: 'index.android.bundle', function: 'c', lineno: 95, colno: 365, in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'u',
-            lineno: 93,
-            colno: 150,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'i',
-            lineno: 93,
-            colno: 90,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'i',
-            lineno: 176,
-            colno: 358,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'batchedUpdates',
-            lineno: 188,
-            colno: 464,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'perform',
-            lineno: 177,
-            colno: 596,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'c',
-            lineno: 93,
-            colno: 60,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'a',
-            lineno: 93,
-            colno: 276,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: '?',
-            lineno: 156,
-            colno: 572,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'handleTopLevel',
-            lineno: 157,
-            colno: 174,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 's',
-            lineno: 157,
-            colno: 88,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'processEventQueue',
-            lineno: 146,
-            colno: 1432,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'i',
-            lineno: 149,
-            colno: 80,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'forEach', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'g',
-            lineno: 146,
-            colno: 604,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'v',
-            lineno: 146,
-            colno: 501,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'a',
-            lineno: 95,
-            colno: 567,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'c',
-            lineno: 95,
-            colno: 365,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 'invokeGuardedCallbackAndCatchFirstError',
             lineno: 79,
             colno: 580,
             in_app: true,
           },
+          { filename: 'index.android.bundle', function: 'invokeGuardedCallback', lineno: 79, colno: 459, in_app: true },
+          { filename: 'index.android.bundle', function: 'u', lineno: 79, colno: 142, in_app: true },
+          { filename: '[native code]', function: '?', in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'invokeGuardedCallback',
-            lineno: 79,
-            colno: 459,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'u',
-            lineno: 79,
-            colno: 142,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 'touchableHandleResponderRelease',
             lineno: 252,
             colno: 4735,
             in_app: true,
           },
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
+          { filename: '[native code]', function: '?', in_app: true },
+          { filename: 'index.android.bundle', function: '_receiveSignal', lineno: 252, colno: 7291, in_app: true },
+          { filename: '[native code]', function: '?', in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: '_receiveSignal',
-            lineno: 252,
-            colno: 7291,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: '_performSideEffectsForTransition',
             lineno: 252,
             colno: 8508,
             in_app: true,
           },
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
+          { filename: '[native code]', function: '?', in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: 'touchableHandlePress',
             lineno: 258,
             colno: 1497,
             in_app: true,
           },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'onPress',
-            lineno: 12,
-            colno: 2336,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 12,
-            colno: 1917,
-            in_app: true,
-          },
+          { filename: 'index.android.bundle', function: 'onPress', lineno: 12, colno: 2336, in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 12, colno: 1917, in_app: true },
         ],
       },
     });
@@ -601,168 +360,38 @@ describe('Tracekit - React Native Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
+          { filename: 'index.android.bundle', function: 'value', lineno: 1, colno: 31561, in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 1, colno: 32776, in_app: true },
+          { filename: 'index.android.bundle', function: 'anonymous', lineno: 1, colno: 31603, in_app: true },
+          { filename: 'index.android.bundle', function: 'value', lineno: 1, colno: 33176, in_app: true },
+          { filename: 'native', function: 'apply', in_app: true },
+          { filename: 'index.android.bundle', function: 'receiveTouches', lineno: 1, colno: 122512, in_app: true },
+          { filename: 'index.android.bundle', function: 'Ue', lineno: 1, colno: 77571, in_app: true },
+          { filename: 'index.android.bundle', function: 'Ne', lineno: 1, colno: 77238, in_app: true },
+          { filename: 'index.android.bundle', function: '_e', lineno: 1, colno: 127755, in_app: true },
+          { filename: 'index.android.bundle', function: 'anonymous', lineno: 1, colno: 77747, in_app: true },
+          { filename: 'index.android.bundle', function: 'z', lineno: 1, colno: 74642, in_app: true },
+          { filename: 'native', function: 'forEach', in_app: true },
+          { filename: 'index.android.bundle', function: 'A', lineno: 1, colno: 74709, in_app: true },
+          { filename: 'index.android.bundle', function: 'N', lineno: 1, colno: 74267, in_app: true },
+          { filename: 'index.android.bundle', function: 'C', lineno: 1, colno: 74126, in_app: true },
+          { filename: 'native', function: 'apply', in_app: true },
+          { filename: 'index.android.bundle', function: 'k', lineno: 1, colno: 74094, in_app: true },
+          { filename: 'native', function: 'apply', in_app: true },
+          { filename: 'index.android.bundle', function: 'b', lineno: 1, colno: 74037, in_app: true },
+          { filename: 'native', function: 'apply', in_app: true },
+          { filename: 'native', function: 'onResponderRelease', in_app: true },
+          { filename: 'native', function: 'touchableHandleResponderRelease', in_app: true },
+          { filename: 'native', function: '_receiveSignal', in_app: true },
           {
             filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 1,
-            colno: 31561,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 1,
-            colno: 32776,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'anonymous',
-            lineno: 1,
-            colno: 31603,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'value',
-            lineno: 1,
-            colno: 33176,
-            in_app: true,
-          },
-          {
-            filename: 'native',
-            abs_path: 'native',
-            function: 'apply',
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'receiveTouches',
-            lineno: 1,
-            colno: 122512,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'Ue',
-            lineno: 1,
-            colno: 77571,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'Ne',
-            lineno: 1,
-            colno: 77238,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: '_e',
-            lineno: 1,
-            colno: 127755,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'anonymous',
-            lineno: 1,
-            colno: 77747,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'z',
-            lineno: 1,
-            colno: 74642,
-            in_app: true,
-          },
-          {
-            filename: 'native',
-            abs_path: 'native',
-            function: 'forEach',
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'A',
-            lineno: 1,
-            colno: 74709,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'N',
-            lineno: 1,
-            colno: 74267,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'C',
-            lineno: 1,
-            colno: 74126,
-            in_app: true,
-          },
-          { filename: 'native', abs_path: 'native', function: 'apply', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'k',
-            lineno: 1,
-            colno: 74094,
-            in_app: true,
-          },
-          { filename: 'native', abs_path: 'native', function: 'apply', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'b',
-            lineno: 1,
-            colno: 74037,
-            in_app: true,
-          },
-          { filename: 'native', abs_path: 'native', function: 'apply', in_app: true },
-          { filename: 'native', abs_path: 'native', function: 'onResponderRelease', in_app: true },
-          { filename: 'native', abs_path: 'native', function: 'touchableHandleResponderRelease', in_app: true },
-          { filename: 'native', abs_path: 'native', function: '_receiveSignal', in_app: true },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
             function: '_performSideEffectsForTransition',
             lineno: 1,
             colno: 230843,
             in_app: true,
           },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'anonymous',
-            lineno: 1,
-            colno: 224280,
-            in_app: true,
-          },
-          {
-            filename: 'index.android.bundle',
-            abs_path: 'index.android.bundle',
-            function: 'onPress',
-            lineno: 1,
-            colno: 452701,
-            in_app: true,
-          },
+          { filename: 'index.android.bundle', function: 'anonymous', lineno: 1, colno: 224280, in_app: true },
+          { filename: 'index.android.bundle', function: 'onPress', lineno: 1, colno: 452701, in_app: true },
         ],
       },
     });
diff --git a/packages/browser/test/unit/tracekit/react.test.ts b/packages/browser/test/unit/tracekit/react.test.ts
index 5ebaa602ed06..d949a4dee0eb 100644
--- a/packages/browser/test/unit/tracekit/react.test.ts
+++ b/packages/browser/test/unit/tracekit/react.test.ts
@@ -23,17 +23,9 @@ describe('Tracekit - React Tests', () => {
       type: 'Invariant Violation',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'f',
-            lineno: 1,
-            colno: 980,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: 'f', lineno: 1, colno: 980, in_app: true },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'ho',
             lineno: 1,
             colno: 68735,
@@ -41,7 +33,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'a',
             lineno: 1,
             colno: 21841,
@@ -49,7 +40,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: '?',
             lineno: 1,
             colno: 21738,
@@ -80,17 +70,9 @@ describe('Tracekit - React Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'f',
-            lineno: 1,
-            colno: 980,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: 'f', lineno: 1, colno: 980, in_app: true },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'ho',
             lineno: 1,
             colno: 68735,
@@ -98,7 +80,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'a',
             lineno: 1,
             colno: 21841,
@@ -106,7 +87,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: '?',
             lineno: 1,
             colno: 21738,
@@ -138,17 +118,9 @@ describe('Tracekit - React Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'f',
-            lineno: 1,
-            colno: 980,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: 'f', lineno: 1, colno: 980, in_app: true },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'ho',
             lineno: 1,
             colno: 68735,
@@ -156,7 +128,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: 'a',
             lineno: 1,
             colno: 21841,
@@ -164,7 +135,6 @@ describe('Tracekit - React Tests', () => {
           },
           {
             filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            abs_path: 'http://localhost:5000/static/js/foo.chunk.js',
             function: '?',
             lineno: 1,
             colno: 21738,
diff --git a/packages/browser/test/unit/tracekit/safari.test.ts b/packages/browser/test/unit/tracekit/safari.test.ts
index c2ff37cdfe4c..657ffc7daecc 100644
--- a/packages/browser/test/unit/tracekit/safari.test.ts
+++ b/packages/browser/test/unit/tracekit/safari.test.ts
@@ -22,28 +22,10 @@ describe('Tracekit - Safari Tests', () => {
       type: 'foo',
       stacktrace: {
         frames: [
-          { filename: '[native code]', abs_path: '[native code]', function: '?', in_app: true },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'onclick',
-            lineno: 82,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'dumpException3',
-            lineno: 52,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 48,
-            in_app: true,
-          },
+          { filename: '[native code]', function: '?', in_app: true },
+          { filename: 'http://path/to/file.js', function: 'onclick', lineno: 82, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'dumpException3', lineno: 52, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 48, in_app: true },
         ],
       },
     });
@@ -66,30 +48,9 @@ describe('Tracekit - Safari Tests', () => {
       type: 'TypeError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 108,
-            colno: 107,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 52,
-            colno: 15,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 48,
-            colno: 22,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 108, colno: 107, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 52, colno: 15, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 48, colno: 22, in_app: true },
         ],
       },
     });
@@ -113,30 +74,9 @@ describe('Tracekit - Safari Tests', () => {
       type: 'TypeError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 108,
-            colno: 23,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 52,
-            colno: 15,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: '?',
-            lineno: 47,
-            colno: 22,
-            in_app: true,
-          },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 108, colno: 23, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 52, colno: 15, in_app: true },
+          { filename: 'http://path/to/file.js', function: '?', lineno: 47, colno: 22, in_app: true },
         ],
       },
     });
@@ -164,23 +104,9 @@ describe('Tracekit - Safari Tests', () => {
       type: 'ReferenceError',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'bar',
-            lineno: 109,
-            colno: 91,
-            in_app: true,
-          },
-          {
-            filename: 'http://path/to/file.js',
-            abs_path: 'http://path/to/file.js',
-            function: 'foo',
-            lineno: 58,
-            colno: 21,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'eval', in_app: true },
+          { filename: 'http://path/to/file.js', function: 'bar', lineno: 109, colno: 91, in_app: true },
+          { filename: 'http://path/to/file.js', function: 'foo', lineno: 58, colno: 21, in_app: true },
+          { filename: '[native code]', function: 'eval', in_app: true },
         ],
       },
     });
@@ -205,7 +131,6 @@ describe('Tracekit - Safari Tests', () => {
           frames: [
             {
               filename: 'safari-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/topee-content.js',
-              abs_path: 'safari-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/topee-content.js',
               function: '?',
               lineno: 3313,
               colno: 26,
@@ -213,7 +138,6 @@ describe('Tracekit - Safari Tests', () => {
             },
             {
               filename: 'safari-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/commons.js',
-              abs_path: 'safari-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/commons.js',
               function: 'ClipperError',
               lineno: 223036,
               colno: 10,
@@ -239,10 +163,9 @@ describe('Tracekit - Safari Tests', () => {
         type: 'TypeError',
         stacktrace: {
           frames: [
-            { filename: '[native code]', abs_path: '[native code]', function: 'promiseReactionJob', in_app: true },
+            { filename: '[native code]', function: 'promiseReactionJob', in_app: true },
             {
               filename: 'safari-extension://com.grammarly.safari.extension.ext2-W8F64X92K3/ee7759dd/Grammarly.js',
-              abs_path: 'safari-extension://com.grammarly.safari.extension.ext2-W8F64X92K3/ee7759dd/Grammarly.js',
               function: '?',
               lineno: 2,
               colno: 1588410,
@@ -250,7 +173,6 @@ describe('Tracekit - Safari Tests', () => {
             },
             {
               filename: 'safari-extension://com.grammarly.safari.extension.ext2-W8F64X92K3/ee7759dd/Grammarly.js',
-              abs_path: 'safari-extension://com.grammarly.safari.extension.ext2-W8F64X92K3/ee7759dd/Grammarly.js',
               function: 'isClaimed',
               lineno: 2,
               colno: 929865,
@@ -279,7 +201,6 @@ describe('Tracekit - Safari Tests', () => {
           frames: [
             {
               filename: 'safari-web-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/topee-content.js',
-              abs_path: 'safari-web-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/topee-content.js',
               function: '?',
               lineno: 3313,
               colno: 26,
@@ -287,7 +208,6 @@ describe('Tracekit - Safari Tests', () => {
             },
             {
               filename: 'safari-web-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/commons.js',
-              abs_path: 'safari-web-extension://3284871F-A480-4FFC-8BC4-3F362C752446/2665fee0/commons.js',
               function: 'ClipperError',
               lineno: 223036,
               colno: 10,
@@ -313,10 +233,9 @@ describe('Tracekit - Safari Tests', () => {
         type: 'TypeError',
         stacktrace: {
           frames: [
-            { filename: '[native code]', abs_path: '[native code]', function: 'promiseReactionJob', in_app: true },
+            { filename: '[native code]', function: 'promiseReactionJob', in_app: true },
             {
               filename: 'safari-web-extension://46434E60-F5BD-48A4-80C8-A422C5D16897/scripts/content-script.js',
-              abs_path: 'safari-web-extension://46434E60-F5BD-48A4-80C8-A422C5D16897/scripts/content-script.js',
               function: '?',
               lineno: 29,
               colno: 56027,
@@ -324,7 +243,6 @@ describe('Tracekit - Safari Tests', () => {
             },
             {
               filename: 'safari-web-extension://46434E60-F5BD-48A4-80C8-A422C5D16897/scripts/content-script.js',
-              abs_path: 'safari-web-extension://46434E60-F5BD-48A4-80C8-A422C5D16897/scripts/content-script.js',
               function: 'p_',
               lineno: 29,
               colno: 33314,
@@ -353,31 +271,10 @@ describe('Tracekit - Safari Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'global code',
-            lineno: 24,
-            colno: 10,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'foo',
-            lineno: 19,
-            colno: 22,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'map', in_app: true },
-          {
-            filename: 'http://localhost:5000/test',
-            abs_path: 'http://localhost:5000/test',
-            function: 'fooIterator',
-            lineno: 20,
-            colno: 26,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/test', function: 'global code', lineno: 24, colno: 10, in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'foo', lineno: 19, colno: 22, in_app: true },
+          { filename: '[native code]', function: 'map', in_app: true },
+          { filename: 'http://localhost:5000/test', function: 'fooIterator', lineno: 20, colno: 26, in_app: true },
         ],
       },
     });
@@ -408,73 +305,17 @@ describe('Tracekit - Safari Tests', () => {
       type: 'Error',
       stacktrace: {
         frames: [
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 50,
-            colno: 29,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'testMethod',
-            lineno: 44,
-            colno: 10,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 39,
-            colno: 9,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'eval', in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'test',
-            lineno: 33,
-            colno: 26,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'map', in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: '?',
-            lineno: 34,
-            colno: 25,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callback',
-            lineno: 25,
-            colno: 23,
-            in_app: true,
-          },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'callAnotherThing',
-            lineno: 20,
-            colno: 16,
-            in_app: true,
-          },
-          { filename: '[native code]', abs_path: '[native code]', function: 'aha', in_app: true },
-          {
-            filename: 'http://localhost:5000/',
-            abs_path: 'http://localhost:5000/',
-            function: 'aha',
-            lineno: 19,
-            colno: 22,
-            in_app: true,
-          },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 50, colno: 29, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'testMethod', lineno: 44, colno: 10, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 39, colno: 9, in_app: true },
+          { filename: '[native code]', function: 'eval', in_app: true },
+          { filename: 'http://localhost:5000/', function: 'test', lineno: 33, colno: 26, in_app: true },
+          { filename: '[native code]', function: 'map', in_app: true },
+          { filename: 'http://localhost:5000/', function: '?', lineno: 34, colno: 25, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callback', lineno: 25, colno: 23, in_app: true },
+          { filename: 'http://localhost:5000/', function: 'callAnotherThing', lineno: 20, colno: 16, in_app: true },
+          { filename: '[native code]', function: 'aha', in_app: true },
+          { filename: 'http://localhost:5000/', function: 'aha', lineno: 19, colno: 22, in_app: true },
         ],
       },
     });
diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts
index 043dc208bf49..09c6f87dfa8e 100644
--- a/packages/core/src/utils/prepareEvent.ts
+++ b/packages/core/src/utils/prepareEvent.ts
@@ -124,27 +124,27 @@ export function applyDebugMetadata(event: Event, stackParser: StackParser): void
     return;
   }
 
-  // Build a map of abs_path -> debug_id
-  const absPathDebugIdMap = Object.keys(debugIdMap).reduce<Record<string, string>>((acc, debugIdStackTrace) => {
+  // Build a map of filename -> debug_id
+  const filenameDebugIdMap = Object.keys(debugIdMap).reduce<Record<string, string>>((acc, debugIdStackTrace) => {
     const parsedStack = stackParser(debugIdStackTrace);
     for (const stackFrame of parsedStack) {
-      if (stackFrame.abs_path) {
-        acc[stackFrame.abs_path] = debugIdMap[debugIdStackTrace];
+      if (stackFrame.filename) {
+        acc[stackFrame.filename] = debugIdMap[debugIdStackTrace];
         break;
       }
     }
     return acc;
   }, {});
 
-  // Get a Set of abs_paths in the stack trace
-  const errorAbsPaths = new Set<string>();
+  // Get a Set of filenames in the stack trace
+  const errorFileNames = new Set<string>();
   try {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     event!.exception!.values!.forEach(exception => {
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       exception.stacktrace!.frames!.forEach(frame => {
-        if (frame.abs_path) {
-          errorAbsPaths.add(frame.abs_path);
+        if (frame.filename) {
+          errorFileNames.add(frame.filename);
         }
       });
     });
@@ -156,12 +156,12 @@ export function applyDebugMetadata(event: Event, stackParser: StackParser): void
   event.debug_meta = event.debug_meta || {};
   event.debug_meta.images = event.debug_meta.images || [];
   const images = event.debug_meta.images;
-  errorAbsPaths.forEach(absPath => {
-    if (absPathDebugIdMap[absPath]) {
+  errorFileNames.forEach(filename => {
+    if (filenameDebugIdMap[filename]) {
       images.push({
         type: 'sourcemap',
-        code_file: absPath,
-        debug_id: absPathDebugIdMap[absPath],
+        code_file: filename,
+        debug_id: filenameDebugIdMap[filename],
       });
     }
   });
diff --git a/packages/core/test/lib/prepareEvent.test.ts b/packages/core/test/lib/prepareEvent.test.ts
index b4cac98355e0..d08b4ace221d 100644
--- a/packages/core/test/lib/prepareEvent.test.ts
+++ b/packages/core/test/lib/prepareEvent.test.ts
@@ -15,7 +15,7 @@ describe('applyDebugMetadata', () => {
       'filename4.js\nfilename4.js': 'cccccccc-cccc-4ccc-cccc-cccccccccc',
     };
 
-    const stackParser = createStackParser([0, line => ({ filename: line, abs_path: line })]);
+    const stackParser = createStackParser([0, line => ({ filename: line })]);
 
     const event: Event = {
       exception: {
@@ -23,10 +23,10 @@ describe('applyDebugMetadata', () => {
           {
             stacktrace: {
               frames: [
-                { abs_path: 'filename1.js', filename: 'filename1.js' },
-                { abs_path: 'filename2.js', filename: 'filename2.js' },
-                { abs_path: 'filename1.js', filename: 'filename1.js' },
-                { abs_path: 'filename3.js', filename: 'filename3.js' },
+                { filename: 'filename1.js' },
+                { filename: 'filename2.js' },
+                { filename: 'filename1.js' },
+                { filename: 'filename3.js' },
               ],
             },
           },
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/tests/devErrorSymbolification.test.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/tests/devErrorSymbolification.test.ts
index 2f7173cee315..f4841c2a6b16 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/tests/devErrorSymbolification.test.ts
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/tests/devErrorSymbolification.test.ts
@@ -23,7 +23,6 @@ test.describe('dev mode error symbolification', () => {
       expect.objectContaining({
         function: 'onClick',
         filename: 'components/client-error-debug-tools.tsx',
-        abs_path: 'webpack-internal:///(app-client)/./components/client-error-debug-tools.tsx',
         lineno: 54,
         colno: 16,
         in_app: true,
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index 650f0607a2a2..d0be07a3c8d0 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -77,10 +77,8 @@ function addClientIntegrations(options: BrowserOptions): void {
     // Turn `<origin>/<path>/_next/static/...` into `app:///_next/static/...`
     iteratee: frame => {
       try {
-        const { origin: absPathOrigin } = new URL(frame.abs_path as string);
-        const { origin: filenameOrigin } = new URL(frame.filename as string);
-        frame.abs_path = frame.abs_path?.replace(absPathOrigin, 'app://').replace(assetPrefixPath, '');
-        frame.filename = frame.filename?.replace(filenameOrigin, 'app://').replace(assetPrefixPath, '');
+        const { origin } = new URL(frame.filename as string);
+        frame.filename = frame.filename?.replace(origin, 'app://').replace(assetPrefixPath, '');
       } catch (err) {
         // Filename wasn't a properly formed URL, so there's nothing we can do
       }
@@ -90,13 +88,10 @@ function addClientIntegrations(options: BrowserOptions): void {
       if (frame.filename && frame.filename.startsWith('app:///_next')) {
         frame.filename = decodeURI(frame.filename);
       }
-      if (frame.abs_path && frame.abs_path.startsWith('app:///_next')) {
-        frame.abs_path = decodeURI(frame.abs_path);
-      }
 
       if (
-        frame.abs_path &&
-        frame.abs_path.match(
+        frame.filename &&
+        frame.filename.match(
           /^app:\/\/\/_next\/static\/chunks\/(main-|main-app-|polyfills-|webpack-|framework-|framework\.)[0-9a-f]+\.js$/,
         )
       ) {
diff --git a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
index 2315f246cc91..7e3fd8baae24 100644
--- a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
+++ b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
@@ -126,7 +126,7 @@ export async function devErrorSymbolicationEventProcessor(event: Event, hint: Ev
             if (!resolvedFrame || !resolvedFrame.originalStackFrame || !resolvedFrame.originalCodeFrame) {
               return {
                 ...frame,
-                platform: frame.abs_path?.startsWith('node:internal') ? 'nodejs' : undefined, // simple hack that will prevent a source mapping error from showing up
+                platform: frame.filename?.startsWith('node:internal') ? 'nodejs' : undefined, // simple hack that will prevent a source mapping error from showing up
                 in_app: false,
               };
             }
diff --git a/packages/types/src/debugMeta.ts b/packages/types/src/debugMeta.ts
index 2a6f201874da..da3cf958857b 100644
--- a/packages/types/src/debugMeta.ts
+++ b/packages/types/src/debugMeta.ts
@@ -17,6 +17,6 @@ interface WasmDebugImage {
 
 interface SourceMapDebugImage {
   type: 'sourcemap';
-  code_file: string; // abs_path
+  code_file: string; // filename
   debug_id: string; // uuid
 }

From 0ed4f8799233f821852cb4525c696c92a99c3f9d Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Mon, 27 Mar 2023 17:37:38 +0200
Subject: [PATCH 14/50] build(cdn): Move tracing CDN bundle generation to
 `@sentry/browser` (#7617)

---
 .github/workflows/build.yml                   | 21 ++---
 .size-limit.js                                |  6 +-
 .../browser-integration-tests/package.json    |  6 ++
 .../startTransaction/basic_usage/test.ts      | 10 ++-
 .../startTransaction/circular_data/test.ts    |  6 +-
 .../startTransaction/setMeasurement/test.ts   |  6 +-
 .../suites/replay/dsc/test.ts                 |  8 +-
 .../browserTracingIntegrationShim/test.ts     |  7 +-
 .../suites/tracing/browserTracingShim/test.ts |  7 +-
 .../backgroundtab-custom/test.ts              |  6 +-
 .../backgroundtab-pageload/test.ts            |  4 +-
 .../browsertracing/interactions/test.ts       | 10 ++-
 .../long-tasks-disabled/test.ts               |  4 +-
 .../browsertracing/long-tasks-enabled/test.ts |  4 +-
 .../tracing/browsertracing/meta/test.ts       | 18 +++-
 .../tracing/browsertracing/navigation/test.ts |  6 +-
 .../tracing/browsertracing/pageload/test.ts   |  6 +-
 .../customTargets/test.ts                     |  5 ++
 .../customTargetsAndOrigins/test.ts           |  5 ++
 .../customTracingOrigins/test.ts              |  5 ++
 .../defaultTargetsMatch/test.ts               |  5 ++
 .../defaultTargetsNoMatch/test.ts             |  5 ++
 .../envelope-header-transaction-name/test.ts  | 10 ++-
 .../suites/tracing/envelope-header/test.ts    | 10 ++-
 .../tracing/metrics/connection-rtt/test.ts    |  4 +-
 .../metrics/pageload-browser-spans/test.ts    |  6 +-
 .../metrics/pageload-resource-spans/test.ts   |  6 +-
 .../tracing/metrics/web-vitals-cls/test.ts    |  4 +-
 .../tracing/metrics/web-vitals-fid/test.ts    |  4 +-
 .../tracing/metrics/web-vitals-fp-fcp/test.ts |  8 +-
 .../tracing/metrics/web-vitals-lcp/test.ts    |  4 +-
 .../tracing/metrics/web-vitals-ttfb/test.ts   |  6 +-
 .../suites/tracing/request/fetch/test.ts      | 10 ++-
 .../suites/tracing/request/xhr/test.ts        | 10 ++-
 .../utils/generatePlugin.ts                   | 48 +++++-----
 .../utils/helpers.ts                          | 12 +++
 packages/browser/package.json                 |  8 +-
 packages/browser/rollup.bundle.config.js      | 49 ++++++++---
 packages/browser/src/exports.ts               |  1 -
 packages/browser/src/index.bundle.replay.ts   |  1 +
 .../src/index.bundle.tracing.replay.ts        | 17 ++++
 .../src/index.bundle.tracing.ts}              |  8 +-
 packages/browser/src/index.bundle.ts          |  1 +
 packages/browser/src/index.ts                 |  1 +
 .../unit/index.bundle.tracing.replay.test.ts} |  4 +-
 .../test/unit/index.bundle.tracing.test.ts}   |  4 +-
 .../test-apps/booking-app/with-replay.html    |  2 +-
 .../test-apps/booking-app/with-sentry.html    |  2 +-
 .../test-apps/jank/with-replay.html           |  2 +-
 .../test-apps/jank/with-sentry.html           |  2 +-
 packages/tracing/package.json                 |  7 +-
 packages/tracing/rollup.bundle.config.js      | 28 ------
 packages/tracing/src/index.bundle.base.ts     | 87 -------------------
 packages/tracing/src/index.bundle.replay.ts   | 11 ---
 packages/tracing/tsconfig.types.json          |  6 --
 55 files changed, 296 insertions(+), 247 deletions(-)
 create mode 100644 packages/browser/src/index.bundle.tracing.replay.ts
 rename packages/{tracing/src/index.bundle.ts => browser/src/index.bundle.tracing.ts} (59%)
 rename packages/{tracing/test/index.bundle.replay.test.ts => browser/test/unit/index.bundle.tracing.replay.test.ts} (85%)
 rename packages/{tracing/test/index.bundle.test.ts => browser/test/unit/index.bundle.tracing.test.ts} (87%)
 delete mode 100644 packages/tracing/rollup.bundle.config.js
 delete mode 100644 packages/tracing/src/index.bundle.base.ts
 delete mode 100644 packages/tracing/src/index.bundle.replay.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6004a046f126..4ac4a75e150b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -371,7 +371,6 @@ jobs:
           path: |
             ${{ github.workspace }}/packages/browser/build/bundles/**
             ${{ github.workspace }}/packages/integrations/build/bundles/**
-            ${{ github.workspace }}/packages/tracing/build/bundles/**
             ${{ github.workspace }}/packages/replay/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
 
@@ -482,7 +481,7 @@ jobs:
           yarn test:integration
 
   job_browser_playwright_tests:
-    name: Playwright (${{ matrix.bundle }})${{ (matrix.tracing_only && ' tracing only') || '' }} Tests
+    name: Playwright (${{ matrix.bundle }}) Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-20.04
@@ -499,16 +498,13 @@ jobs:
           - bundle_es6_min
           - bundle_replay_es6
           - bundle_replay_es6_min
-        tracing_only:
-          - true
-          - false
-        exclude:
-          # `tracing_only` only makes a difference for bundles - tests of the esm and cjs builds always include the
-          # tracing tests
-          - bundle: esm
-            tracing_only: false
-          - bundle: cjs
-            tracing_only: false
+          - bundle_tracing_es5
+          - bundle_tracing_es5_min
+          - bundle_tracing_es6
+          - bundle_tracing_es6_min
+          - bundle_tracing_replay_es6
+          - bundle_tracing_replay_es6_min
+
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
@@ -543,7 +539,6 @@ jobs:
       - name: Run Playwright tests
         env:
           PW_BUNDLE: ${{ matrix.bundle }}
-          PW_TRACING_ONLY: ${{ matrix.tracing_only }}
         run: |
           cd packages/browser-integration-tests
           yarn test:ci
diff --git a/.size-limit.js b/.size-limit.js
index edc8a5466235..863b3628ebb1 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -53,13 +53,13 @@ module.exports = [
   },
   {
     name: '@sentry/browser + @sentry/tracing - ES5 CDN Bundle (gzipped + minified)',
-    path: 'packages/tracing/build/bundles/bundle.tracing.es5.min.js',
+    path: 'packages/browser/build/bundles/bundle.tracing.es5.min.js',
     gzip: true,
     limit: '37 KB',
   },
   {
     name: '@sentry/browser + @sentry/tracing - ES6 CDN Bundle (gzipped + minified)',
-    path: 'packages/tracing/build/bundles/bundle.tracing.min.js',
+    path: 'packages/browser/build/bundles/bundle.tracing.min.js',
     gzip: true,
     limit: '35 KB',
   },
@@ -80,7 +80,7 @@ module.exports = [
   },
   {
     name: '@sentry/browser + @sentry/tracing + @sentry/replay - ES6 CDN Bundle (gzipped + minified)',
-    path: 'packages/tracing/build/bundles/bundle.tracing.replay.min.js',
+    path: 'packages/browser/build/bundles/bundle.tracing.replay.min.js',
     gzip: true,
     limit: '80 KB',
   },
diff --git a/packages/browser-integration-tests/package.json b/packages/browser-integration-tests/package.json
index 242fe0ce0d5e..9b3c52e62ab0 100644
--- a/packages/browser-integration-tests/package.json
+++ b/packages/browser-integration-tests/package.json
@@ -25,6 +25,12 @@
     "test:bundle:es6:min": "PW_BUNDLE=bundle_es6_min yarn test",
     "test:bundle:replay:es6": "PW_BUNDLE=bundle_replay_es6 yarn test",
     "test:bundle:replay:es6:min": "PW_BUNDLE=bundle_replay_es6_min yarn test",
+    "test:bundle:tracing:es5": "PW_BUNDLE=bundle_tracing_es5 yarn test",
+    "test:bundle:tracing:es5:min": "PW_BUNDLE=bundle_tracing_es5_min yarn test",
+    "test:bundle:tracing:es6": "PW_BUNDLE=bundle_tracing_es6 yarn test",
+    "test:bundle:tracing:es6:min": "PW_BUNDLE=bundle_tracing_es6_min yarn test",
+    "test:bundle:tracing:replay:es6": "PW_BUNDLE=bundle_tracing_replay_es6 yarn test",
+    "test:bundle:tracing:replay:es6:min": "PW_BUNDLE=bundle_tracing_replay_es6_min yarn test",
     "test:cjs": "PW_BUNDLE=cjs yarn test",
     "test:esm": "PW_BUNDLE=esm yarn test",
     "test:ci": "playwright test ./suites --browser='all' --reporter='line'",
diff --git a/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts b/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts
index 7b42d280248d..2fba18b0804b 100644
--- a/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts
+++ b/packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should report a transaction in an envelope', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
@@ -13,6 +17,10 @@ sentryTest('should report a transaction in an envelope', async ({ getLocalTestPa
 });
 
 sentryTest('should report finished spans as children of the root transaction', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
diff --git a/packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts b/packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts
index 88ed63b08864..1870f679b3da 100644
--- a/packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts
+++ b/packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should be able to handle circular data', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
diff --git a/packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts b/packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts
index fecda098bf43..fe45323474f0 100644
--- a/packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts
+++ b/packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should attach measurement to transaction', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const event = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
diff --git a/packages/browser-integration-tests/suites/replay/dsc/test.ts b/packages/browser-integration-tests/suites/replay/dsc/test.ts
index 0819e9f7bf71..f4cca11e2339 100644
--- a/packages/browser-integration-tests/suites/replay/dsc/test.ts
+++ b/packages/browser-integration-tests/suites/replay/dsc/test.ts
@@ -2,12 +2,16 @@ import { expect } from '@playwright/test';
 import type { EventEnvelopeHeaders } from '@sentry/types';
 
 import { sentryTest } from '../../../utils/fixtures';
-import { envelopeHeaderRequestParser, getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import {
+  envelopeHeaderRequestParser,
+  getFirstSentryEnvelopeRequest,
+  shouldSkipTracingTest,
+} from '../../../utils/helpers';
 import { getReplaySnapshot, shouldSkipReplayTest, waitForReplayRunning } from '../../../utils/replayHelpers';
 
 sentryTest('should add replay_id to dsc of transactions', async ({ getLocalTestPath, page, browserName }) => {
   // This is flaky on webkit, so skipping there...
-  if (shouldSkipReplayTest() || browserName === 'webkit') {
+  if (shouldSkipReplayTest() || shouldSkipTracingTest() || browserName === 'webkit') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts b/packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
index 5d2b96232d16..e37181ee815b 100644
--- a/packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
@@ -1,14 +1,13 @@
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../utils/helpers';
 
 sentryTest(
   'exports a shim Integrations.BrowserTracing integration for non-tracing bundles',
   async ({ getLocalTestPath, page }) => {
-    const bundle = process.env.PW_BUNDLE;
-    const tracingOnly = Boolean(process.env.PW_TRACING_ONLY);
-
-    if (!bundle || !bundle.startsWith('bundle_') || tracingOnly) {
+    // Skip in tracing tests
+    if (!shouldSkipTracingTest()) {
       sentryTest.skip();
     }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browserTracingShim/test.ts b/packages/browser-integration-tests/suites/tracing/browserTracingShim/test.ts
index 74cb8b2fce9f..7b6027694734 100644
--- a/packages/browser-integration-tests/suites/tracing/browserTracingShim/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browserTracingShim/test.ts
@@ -1,12 +1,11 @@
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../utils/helpers';
 
 sentryTest('exports a shim BrowserTracing integration for non-tracing bundles', async ({ getLocalTestPath, page }) => {
-  const bundle = process.env.PW_BUNDLE;
-  const tracingOnly = Boolean(process.env.PW_TRACING_ONLY);
-
-  if (!bundle || !bundle.startsWith('bundle_') || tracingOnly) {
+  // Skip in tracing tests
+  if (!shouldSkipTracingTest()) {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts
index 8b201b7d7bbf..eca82197d80c 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-custom/test.ts
@@ -3,13 +3,17 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 async function getPropertyValue(handle: JSHandle, prop: string) {
   return (await handle.getProperty(prop))?.jsonValue();
 }
 
 sentryTest('should finish a custom transaction when the page goes background', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const pageloadTransaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-pageload/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-pageload/test.ts
index af7de77b93f7..17f5920c57de 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-pageload/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/backgroundtab-pageload/test.ts
@@ -2,13 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest(
   'should finish pageload transaction when the page goes background',
   async ({ browserName, getLocalTestPath, page }) => {
     // TODO: This is flakey on firefox... trace.status is sometimes undefined
-    if (['firefox'].includes(browserName)) {
+    if (shouldSkipTracingTest() || ['firefox'].includes(browserName)) {
       sentryTest.skip();
     }
     const url = await getLocalTestPath({ testDir: __dirname });
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/interactions/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/interactions/test.ts
index faff888fc2e8..9b161699b9c0 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/interactions/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/interactions/test.ts
@@ -3,7 +3,11 @@ import { expect } from '@playwright/test';
 import type { Event, Span, SpanContext, Transaction } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+import {
+  getFirstSentryEnvelopeRequest,
+  getMultipleSentryEnvelopeRequests,
+  shouldSkipTracingTest,
+} from '../../../../utils/helpers';
 
 type TransactionJSON = ReturnType<Transaction['toJSON']> & {
   spans: ReturnType<Span['toJSON']>[];
@@ -17,7 +21,7 @@ const wait = (time: number) => new Promise(res => setTimeout(res, time));
 sentryTest('should capture interaction transaction.', async ({ browserName, getLocalTestPath, page }) => {
   const supportedBrowsers = ['chromium', 'firefox'];
 
-  if (!supportedBrowsers.includes(browserName)) {
+  if (shouldSkipTracingTest() || !supportedBrowsers.includes(browserName)) {
     sentryTest.skip();
   }
 
@@ -54,7 +58,7 @@ sentryTest('should capture interaction transaction.', async ({ browserName, getL
 sentryTest('should create only one transaction per interaction', async ({ browserName, getLocalTestPath, page }) => {
   const supportedBrowsers = ['chromium', 'firefox'];
 
-  if (!supportedBrowsers.includes(browserName)) {
+  if (shouldSkipTracingTest() || !supportedBrowsers.includes(browserName)) {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-disabled/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-disabled/test.ts
index c392258570d9..6dab208d1c4e 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-disabled/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-disabled/test.ts
@@ -3,11 +3,11 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should not capture long task when flag is disabled.', async ({ browserName, getLocalTestPath, page }) => {
   // Long tasks only work on chrome
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-enabled/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-enabled/test.ts
index 9ee877e39268..54da1074c1c5 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-enabled/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/long-tasks-enabled/test.ts
@@ -3,11 +3,11 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should capture long task.', async ({ browserName, getLocalTestPath, page }) => {
   // Long tasks only work on chrome
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/meta/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/meta/test.ts
index c447f41c8660..ae89fd383cbb 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/meta/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/meta/test.ts
@@ -2,11 +2,19 @@ import { expect } from '@playwright/test';
 import type { Event, EventEnvelopeHeaders } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { envelopeHeaderRequestParser, getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import {
+  envelopeHeaderRequestParser,
+  getFirstSentryEnvelopeRequest,
+  shouldSkipTracingTest,
+} from '../../../../utils/helpers';
 
 sentryTest(
   'should create a pageload transaction based on `sentry-trace` <meta>',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
@@ -24,6 +32,10 @@ sentryTest(
 sentryTest(
   'should pick up `baggage` <meta> tag, propagate the content in transaction and not add own data',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const envHeader = await getFirstSentryEnvelopeRequest<EventEnvelopeHeaders>(page, url, envelopeHeaderRequestParser);
@@ -41,6 +53,10 @@ sentryTest(
 sentryTest(
   "should create a navigation that's not influenced by `sentry-trace` <meta>",
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const pageloadRequest = await getFirstSentryEnvelopeRequest<Event>(page, url);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/navigation/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/navigation/test.ts
index 77157951f494..5a46a65a4392 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/navigation/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/navigation/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should create a navigation transaction on page navigation', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const pageloadRequest = await getFirstSentryEnvelopeRequest<Event>(page, url);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
index fc7de0b067b7..7624b26466e5 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should create a pageload transaction', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargets/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargets/test.ts
index ca1deada91d0..d7cf60e3e726 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargets/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargets/test.ts
@@ -2,10 +2,15 @@ import type { Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest(
   'should attach `sentry-trace` and `baggage` header to request matching tracePropagationTargets',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargetsAndOrigins/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargetsAndOrigins/test.ts
index 6e3fea23e09b..19c949ad07a7 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargetsAndOrigins/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTargetsAndOrigins/test.ts
@@ -2,10 +2,15 @@ import type { Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest(
   '[pre-v8] should prefer custom tracePropagationTargets over tracingOrigins',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTracingOrigins/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTracingOrigins/test.ts
index 0983c53a5622..47c24618492a 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTracingOrigins/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/customTracingOrigins/test.ts
@@ -2,10 +2,15 @@ import type { Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest(
   '[pre-v8] should attach `sentry-trace` and `baggage` header to request matching tracingOrigins',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsMatch/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsMatch/test.ts
index c046912e6621..3edbd3d3c99b 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsMatch/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsMatch/test.ts
@@ -2,10 +2,15 @@ import type { Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest(
   'should attach `sentry-trace` and `baggage` header to request matching default tracePropagationTargets',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsNoMatch/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsNoMatch/test.ts
index 0767ced38bb5..445fa0fdba70 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsNoMatch/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/tracePropagationTargets/defaultTargetsNoMatch/test.ts
@@ -2,10 +2,15 @@ import type { Request } from '@playwright/test';
 import { expect } from '@playwright/test';
 
 import { sentryTest } from '../../../../../utils/fixtures';
+import { shouldSkipTracingTest } from '../../../../../utils/helpers';
 
 sentryTest(
   'should not attach `sentry-trace` and `baggage` header to request not matching default tracePropagationTargets',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts b/packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
index 8d5b75e4907c..bc94930e0be5 100644
--- a/packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
@@ -2,11 +2,19 @@ import { expect } from '@playwright/test';
 import type { EventEnvelopeHeaders } from '@sentry/types';
 
 import { sentryTest } from '../../../utils/fixtures';
-import { envelopeHeaderRequestParser, getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import {
+  envelopeHeaderRequestParser,
+  getFirstSentryEnvelopeRequest,
+  shouldSkipTracingTest,
+} from '../../../utils/helpers';
 
 sentryTest(
   'should only include transaction name if source is better than an unparameterized URL',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const envHeader = await getFirstSentryEnvelopeRequest<EventEnvelopeHeaders>(page, url, envelopeHeaderRequestParser);
diff --git a/packages/browser-integration-tests/suites/tracing/envelope-header/test.ts b/packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
index b70ae62b4903..b8df56e72f7c 100644
--- a/packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
@@ -2,11 +2,19 @@ import { expect } from '@playwright/test';
 import type { EventEnvelopeHeaders } from '@sentry/types';
 
 import { sentryTest } from '../../../utils/fixtures';
-import { envelopeHeaderRequestParser, getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
+import {
+  envelopeHeaderRequestParser,
+  getFirstSentryEnvelopeRequest,
+  shouldSkipTracingTest,
+} from '../../../utils/helpers';
 
 sentryTest(
   'should send dynamic sampling context data in trace envelope header of a transaction envelope',
   async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
     const url = await getLocalTestPath({ testDir: __dirname });
 
     const envHeader = await getFirstSentryEnvelopeRequest<EventEnvelopeHeaders>(page, url, envelopeHeaderRequestParser);
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
index 273609e97d15..4dbb8f186d42 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
@@ -3,10 +3,10 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest.beforeEach(({ browserName }) => {
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 });
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
index 8b8ca6b0f7b8..b60cdce9703b 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should add browser-related spans to pageload transaction', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
index 83ae9580d84d..e98cb5b3d9b2 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
@@ -3,9 +3,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should add resource spans to pageload transaction', async ({ getLocalTestPath, page, browser }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   // Intercepting asset requests to avoid network-related flakiness and random retries (on Firefox).
   await page.route('**/path/to/image.svg', (route: Route) => route.fulfill({ path: `${__dirname}/assets/image.svg` }));
   await page.route('**/path/to/script.js', (route: Route) => route.fulfill({ path: `${__dirname}/assets/script.js` }));
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
index a445cc967147..0dee366c75f4 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
@@ -2,10 +2,10 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest.beforeEach(async ({ browserName, page }) => {
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
index 966760096add..55e0b4d0e833 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
@@ -2,11 +2,11 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should capture a FID vital.', async ({ browserName, getLocalTestPath, page }) => {
   // FID measurement is not generated on webkit
-  if (browserName === 'webkit') {
+  if (shouldSkipTracingTest() || browserName === 'webkit') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
index b120e580a55c..3a97c62d7f68 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
@@ -2,11 +2,11 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should capture FP vital.', async ({ browserName, getLocalTestPath, page }) => {
   // FP is not generated on webkit or firefox
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 
@@ -24,6 +24,10 @@ sentryTest('should capture FP vital.', async ({ browserName, getLocalTestPath, p
 });
 
 sentryTest('should capture FCP vital.', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
index 7511abf60d09..63bfde0a6c46 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
@@ -3,10 +3,10 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should capture a LCP vital with element details.', async ({ browserName, getLocalTestPath, page }) => {
-  if (browserName !== 'chromium') {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
     sentryTest.skip();
   }
 
diff --git a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
index 81d5f1f7430e..0a4b1e6d3da6 100644
--- a/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
@@ -2,9 +2,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should capture TTFB vital.', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
diff --git a/packages/browser-integration-tests/suites/tracing/request/fetch/test.ts b/packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
index a5b8185e20f1..7b374422a2f3 100644
--- a/packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
@@ -3,9 +3,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
+import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should create spans for multiple fetch requests', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   // Because we fetch from http://example.com, fetch will throw a CORS error in firefox and webkit.
@@ -38,6 +42,10 @@ sentryTest('should create spans for multiple fetch requests', async ({ getLocalT
 });
 
 sentryTest('should attach `sentry-trace` header to multiple fetch requests', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const requests = (
diff --git a/packages/browser-integration-tests/suites/tracing/request/xhr/test.ts b/packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
index 39b2a37749b8..c1553e495999 100644
--- a/packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
@@ -3,9 +3,13 @@ import { expect } from '@playwright/test';
 import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
 
 sentryTest('should create spans for multiple XHR requests', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
@@ -26,6 +30,10 @@ sentryTest('should create spans for multiple XHR requests', async ({ getLocalTes
 });
 
 sentryTest('should attach `sentry-trace` header to multiple XHR requests', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const requests = (
diff --git a/packages/browser-integration-tests/utils/generatePlugin.ts b/packages/browser-integration-tests/utils/generatePlugin.ts
index 0c37e15b2426..7ca686992bc3 100644
--- a/packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/packages/browser-integration-tests/utils/generatePlugin.ts
@@ -6,8 +6,9 @@ import type { Compiler } from 'webpack';
 
 const PACKAGES_DIR = '../../packages';
 
-const tracingOnly = process.env.PW_TRACING_ONLY === 'true';
-
+/**
+ * Possible values: See BUNDLE_PATHS.browser
+ */
 const bundleKey = process.env.PW_BUNDLE;
 
 // `esm` and `cjs` builds are modules that can be imported / aliased by webpack
@@ -26,16 +27,12 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     bundle_es6_min: 'build/bundles/bundle.min.js',
     bundle_replay_es6: 'build/bundles/bundle.replay.js',
     bundle_replay_es6_min: 'build/bundles/bundle.replay.min.js',
-  },
-  tracing: {
-    cjs: 'build/npm/cjs/index.js',
-    esm: 'build/npm/esm/index.js',
-    bundle_es5: 'build/bundles/bundle.tracing.es5.js',
-    bundle_es5_min: 'build/bundles/bundle.tracing.es5.min.js',
-    bundle_es6: 'build/bundles/bundle.tracing.js',
-    bundle_es6_min: 'build/bundles/bundle.tracing.min.js',
-    bundle_replay_es6: 'build/bundles/bundle.tracing.replay.js',
-    bundle_replay_es6_min: 'build/bundles/bundle.tracing.replay.min.js',
+    bundle_tracing_es5: 'build/bundles/bundle.tracing.es5.js',
+    bundle_tracing_es5_min: 'build/bundles/bundle.tracing.es5.min.js',
+    bundle_tracing_es6: 'build/bundles/bundle.tracing.js',
+    bundle_tracing_es6_min: 'build/bundles/bundle.tracing.min.js',
+    bundle_tracing_replay_es6: 'build/bundles/bundle.tracing.replay.js',
+    bundle_tracing_replay_es6_min: 'build/bundles/bundle.tracing.replay.min.js',
   },
   integrations: {
     cjs: 'build/npm/cjs/index.js',
@@ -44,16 +41,12 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     bundle_es5_min: 'build/bundles/[INTEGRATION_NAME].es5.min.js',
     bundle_es6: 'build/bundles/[INTEGRATION_NAME].js',
     bundle_es6_min: 'build/bundles/[INTEGRATION_NAME].min.js',
-    bundle_replay_es6: 'build/bundles/[INTEGRATION_NAME].js',
-    bundle_replay_es6_min: 'build/bundles/[INTEGRATION_NAME].min.js',
   },
   wasm: {
     cjs: 'build/npm/cjs/index.js',
     esm: 'build/npm/esm/index.js',
     bundle_es6: 'build/bundles/wasm.js',
     bundle_es6_min: 'build/bundles/wasm.min.js',
-    bundle_replay_es6: 'build/bundles/wasm.js',
-    bundle_replay_es6_min: 'build/bundles/wasm.min.js',
   },
 };
 
@@ -100,7 +93,6 @@ function generateSentryAlias(): Record<string, string> {
 }
 
 class SentryScenarioGenerationPlugin {
-  public requiresTracing: boolean = false;
   public requiredIntegrations: string[] = [];
   public requiresWASMIntegration: boolean = false;
 
@@ -114,8 +106,8 @@ class SentryScenarioGenerationPlugin {
             // To help Webpack resolve Sentry modules in `import` statements in cases where they're provided in bundles rather than in `node_modules`
             '@sentry/browser': 'Sentry',
             '@sentry/tracing': 'Sentry',
-            '@sentry/integrations': 'Sentry.Integrations',
             '@sentry/replay': 'Sentry',
+            '@sentry/integrations': 'Sentry.Integrations',
             '@sentry/wasm': 'Sentry.Integrations',
           }
         : {};
@@ -127,9 +119,7 @@ class SentryScenarioGenerationPlugin {
         parser.hooks.import.tap(
           this._name,
           (statement: { specifiers: [{ imported: { name: string } }] }, source: string) => {
-            if (source === '@sentry/tracing') {
-              this.requiresTracing = true;
-            } else if (source === '@sentry/integrations') {
+            if (source === '@sentry/integrations') {
               this.requiredIntegrations.push(statement.specifiers[0].imported.name.toLowerCase());
             } else if (source === '@sentry/wasm') {
               this.requiresWASMIntegration = true;
@@ -142,10 +132,14 @@ class SentryScenarioGenerationPlugin {
     compiler.hooks.compilation.tap(this._name, compilation => {
       HtmlWebpackPlugin.getHooks(compilation).alterAssetTags.tapAsync(this._name, (data, cb) => {
         if (useBundle && bundleKey) {
-          const useTracingBundle = tracingOnly || this.requiresTracing;
-          const bundleName = useTracingBundle ? 'tracing' : 'browser';
+          const bundleName = 'browser';
+          const bundlePath = BUNDLE_PATHS[bundleName][bundleKey];
+
+          // Convert e.g. bundle_tracing_es5_min to bundle_es5_min
+          const integrationBundleKey = bundleKey.replace('_replay', '').replace('_tracing', '');
+
           const bundleObject = createHtmlTagObject('script', {
-            src: path.resolve(PACKAGES_DIR, bundleName, BUNDLE_PATHS[bundleName][bundleKey]),
+            src: path.resolve(PACKAGES_DIR, bundleName, bundlePath),
           });
 
           this.requiredIntegrations.forEach(integration => {
@@ -153,16 +147,16 @@ class SentryScenarioGenerationPlugin {
               src: path.resolve(
                 PACKAGES_DIR,
                 'integrations',
-                BUNDLE_PATHS['integrations'][bundleKey].replace('[INTEGRATION_NAME]', integration),
+                BUNDLE_PATHS['integrations'][integrationBundleKey].replace('[INTEGRATION_NAME]', integration),
               ),
             });
 
             data.assetTags.scripts.unshift(integrationObject);
           });
 
-          if (this.requiresWASMIntegration && BUNDLE_PATHS['wasm'][bundleKey]) {
+          if (this.requiresWASMIntegration && BUNDLE_PATHS['wasm'][integrationBundleKey]) {
             const wasmObject = createHtmlTagObject('script', {
-              src: path.resolve(PACKAGES_DIR, 'wasm', BUNDLE_PATHS['wasm'][bundleKey]),
+              src: path.resolve(PACKAGES_DIR, 'wasm', BUNDLE_PATHS['wasm'][integrationBundleKey]),
             });
 
             data.assetTags.scripts.unshift(wasmObject);
diff --git a/packages/browser-integration-tests/utils/helpers.ts b/packages/browser-integration-tests/utils/helpers.ts
index 25630ceba2fd..bbdb0c2d0655 100644
--- a/packages/browser-integration-tests/utils/helpers.ts
+++ b/packages/browser-integration-tests/utils/helpers.ts
@@ -125,6 +125,18 @@ export function waitForErrorRequest(page: Page): Promise<Request> {
   });
 }
 
+/**
+ * We can only test tracing tests in certain bundles/packages:
+ * - NPM (ESM, CJS)
+ * - CDN bundles that contain Tracing
+ *
+ * @returns `true` if we should skip the tracing test
+ */
+export function shouldSkipTracingTest(): boolean {
+  const bundle = process.env.PW_BUNDLE as string | undefined;
+  return bundle != null && !bundle.includes('tracing') && !bundle.includes('esm') && !bundle.includes('cjs');
+}
+
 /**
  * Waits until a number of requests matching urlRgx at the given URL arrive.
  * If the timout option is configured, this function will abort waiting, even if it hasn't reveived the configured
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 6c04362b76b2..7fff37cdc75f 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -49,12 +49,14 @@
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",
     "build:dev": "yarn build",
-    "build:bundle": "rollup --config rollup.bundle.config.js",
+    "build:bundle": "run-p build:bundle:es5 build:bundle:es6",
+    "build:bundle:es5": "JS_VERSION=es5 rollup -c rollup.bundle.config.js",
+    "build:bundle:es6": "JS_VERSION=es6 rollup -c rollup.bundle.config.js",
     "build:transpile": "rollup -c rollup.npm.config.js",
     "build:types": "tsc -p tsconfig.types.json",
     "build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
     "build:dev:watch": "yarn build:watch",
-    "build:bundle:watch": "rollup --config rollup.bundle.config.js --watch",
+    "build:bundle:watch": "rollup -c rollup.bundle.config.js --watch",
     "build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
     "build:tarball": "ts-node ../../scripts/prepack.ts --bundles && npm pack ./build/npm",
@@ -66,7 +68,7 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --format stylish",
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
-    "validate:es5": "es-check es5 build/bundles/bundle.es5.js",
+    "validate:es5": "es-check es5 'build/bundles/*.es5*.js'",
     "size:check": "run-p size:check:es5 size:check:es6",
     "size:check:es5": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES5: \",$1,\"kB\";}'",
     "size:check:es6": "cat build/bundles/bundle.es6.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES6: \",$1,\"kB\";}'",
diff --git a/packages/browser/rollup.bundle.config.js b/packages/browser/rollup.bundle.config.js
index 6ef24dd841a5..3bb87e0c5e7b 100644
--- a/packages/browser/rollup.bundle.config.js
+++ b/packages/browser/rollup.bundle.config.js
@@ -2,7 +2,13 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/ind
 
 const builds = [];
 
-['es5', 'es6'].forEach(jsVersion => {
+const targets = process.env.JS_VERSION ? [process.env.JS_VERSION] : ['es5', 'es6'];
+
+if (targets.some(target => target !== 'es5' && target !== 'es6')) {
+  throw new Error('JS_VERSION must be either "es5" or "es6"');
+}
+
+targets.forEach(jsVersion => {
   const baseBundleConfig = makeBaseBundleConfig({
     bundleType: 'standalone',
     entrypoints: ['src/index.bundle.ts'],
@@ -11,18 +17,39 @@ const builds = [];
     outputFileBase: () => `bundles/bundle${jsVersion === 'es5' ? '.es5' : ''}`,
   });
 
-  builds.push(...makeBundleConfigVariants(baseBundleConfig));
-});
+  const tracingBaseBundleConfig = makeBaseBundleConfig({
+    bundleType: 'standalone',
+    entrypoints: ['src/index.bundle.tracing.ts'],
+    jsVersion,
+    licenseTitle: '@sentry/browser & @sentry/tracing',
+    outputFileBase: () => `bundles/bundle.tracing${jsVersion === 'es5' ? '.es5' : ''}`,
+  });
 
-// Full bundle incl. replay only available for es6
-const replayBaseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.replay.ts'],
-  jsVersion: 'es6',
-  licenseTitle: '@sentry/browser & @sentry/replay',
-  outputFileBase: () => 'bundles/bundle.replay',
+  builds.push(...makeBundleConfigVariants(baseBundleConfig), ...makeBundleConfigVariants(tracingBaseBundleConfig));
 });
 
-builds.push(...makeBundleConfigVariants(replayBaseBundleConfig));
+if (targets.includes('es6')) {
+  // Replay bundles only available for es6
+  const replayBaseBundleConfig = makeBaseBundleConfig({
+    bundleType: 'standalone',
+    entrypoints: ['src/index.bundle.replay.ts'],
+    jsVersion: 'es6',
+    licenseTitle: '@sentry/browser & @sentry/replay',
+    outputFileBase: () => 'bundles/bundle.replay',
+  });
+
+  const tracingReplayBaseBundleConfig = makeBaseBundleConfig({
+    bundleType: 'standalone',
+    entrypoints: ['src/index.bundle.tracing.replay.ts'],
+    jsVersion: 'es6',
+    licenseTitle: '@sentry/browser & @sentry/tracing & @sentry/replay',
+    outputFileBase: () => 'bundles/bundle.tracing.replay',
+  });
+
+  builds.push(
+    ...makeBundleConfigVariants(replayBaseBundleConfig),
+    ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
+  );
+}
 
 export default builds;
diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
index 7fdd9ba2d5fe..321ebd2c6c51 100644
--- a/packages/browser/src/exports.ts
+++ b/packages/browser/src/exports.ts
@@ -9,7 +9,6 @@ export type {
   // eslint-disable-next-line deprecation/deprecation
   Severity,
   SeverityLevel,
-  Span,
   StackFrame,
   Stacktrace,
   Thread,
diff --git a/packages/browser/src/index.bundle.replay.ts b/packages/browser/src/index.bundle.replay.ts
index 9a220d0ecca9..affadece35da 100644
--- a/packages/browser/src/index.bundle.replay.ts
+++ b/packages/browser/src/index.bundle.replay.ts
@@ -11,3 +11,4 @@ Sentry.Integrations.BrowserTracing = BrowserTracing;
 
 export * from './index.bundle.base';
 export { BrowserTracing, addTracingExtensions, Replay };
+// Note: We do not export a shim for `Span` here, as that is quite complex and would blow up the bundle
diff --git a/packages/browser/src/index.bundle.tracing.replay.ts b/packages/browser/src/index.bundle.tracing.replay.ts
new file mode 100644
index 000000000000..418aeb61bd18
--- /dev/null
+++ b/packages/browser/src/index.bundle.tracing.replay.ts
@@ -0,0 +1,17 @@
+import { addExtensionMethods, BrowserTracing, Span } from '@sentry-internal/tracing';
+import { Replay } from '@sentry/replay';
+
+import * as Sentry from './index.bundle.base';
+
+// TODO (v8): Remove this as it was only needed for backwards compatibility
+// We want replay to be available under Sentry.Replay, to be consistent
+// with the NPM package version.
+Sentry.Integrations.Replay = Replay;
+
+Sentry.Integrations.BrowserTracing = BrowserTracing;
+
+// We are patching the global object with our hub extension methods
+addExtensionMethods();
+
+export { Replay, BrowserTracing, Span, addExtensionMethods };
+export * from './index.bundle.base';
diff --git a/packages/tracing/src/index.bundle.ts b/packages/browser/src/index.bundle.tracing.ts
similarity index 59%
rename from packages/tracing/src/index.bundle.ts
rename to packages/browser/src/index.bundle.tracing.ts
index 8169e348b0a7..3aa5d960d19a 100644
--- a/packages/tracing/src/index.bundle.ts
+++ b/packages/browser/src/index.bundle.tracing.ts
@@ -1,5 +1,6 @@
 // This is exported so the loader does not fail when switching off Replay
 import { Replay } from '@sentry-internal/integration-shims';
+import { addExtensionMethods, BrowserTracing, Span } from '@sentry-internal/tracing';
 
 import * as Sentry from './index.bundle.base';
 
@@ -8,5 +9,10 @@ import * as Sentry from './index.bundle.base';
 // with the NPM package version.
 Sentry.Integrations.Replay = Replay;
 
-export { Replay };
+Sentry.Integrations.BrowserTracing = BrowserTracing;
+
+// We are patching the global object with our hub extension methods
+addExtensionMethods();
+
+export { Replay, BrowserTracing, Span, addExtensionMethods };
 export * from './index.bundle.base';
diff --git a/packages/browser/src/index.bundle.ts b/packages/browser/src/index.bundle.ts
index d16c008e7575..869139e7e591 100644
--- a/packages/browser/src/index.bundle.ts
+++ b/packages/browser/src/index.bundle.ts
@@ -10,3 +10,4 @@ Sentry.Integrations.BrowserTracing = BrowserTracing;
 
 export * from './index.bundle.base';
 export { BrowserTracing, addTracingExtensions, Replay };
+// Note: We do not export a shim for `Span` here, as that is quite complex and would blow up the bundle
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index b3c0e7750bd2..75137f210816 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -30,6 +30,7 @@ export {
   trace,
 } from '@sentry/core';
 export type { SpanStatusType } from '@sentry/core';
+export type { Span } from '@sentry/types';
 export { makeBrowserOfflineTransport } from './transports/offline';
 export { onProfilingStartRouteTransaction } from './profiling/hubextensions';
 export { BrowserProfilingIntegration } from './profiling/integration';
diff --git a/packages/tracing/test/index.bundle.replay.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts
similarity index 85%
rename from packages/tracing/test/index.bundle.replay.test.ts
rename to packages/browser/test/unit/index.bundle.tracing.replay.test.ts
index b860e6336679..ac951e24445d 100644
--- a/packages/tracing/test/index.bundle.replay.test.ts
+++ b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts
@@ -1,9 +1,9 @@
 import { BrowserTracing } from '@sentry-internal/tracing';
 import { Replay } from '@sentry/browser';
 
-import * as TracingReplayBundle from '../src/index.bundle.replay';
+import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
 
-describe('index.bundle.replay', () => {
+describe('index.bundle.tracing.replay', () => {
   it('has correct exports', () => {
     Object.keys(TracingReplayBundle.Integrations).forEach(key => {
       // Skip BrowserTracing because it doesn't have a static id field.
diff --git a/packages/tracing/test/index.bundle.test.ts b/packages/browser/test/unit/index.bundle.tracing.test.ts
similarity index 87%
rename from packages/tracing/test/index.bundle.test.ts
rename to packages/browser/test/unit/index.bundle.tracing.test.ts
index db1cb7b9f433..1f92a02858ac 100644
--- a/packages/tracing/test/index.bundle.test.ts
+++ b/packages/browser/test/unit/index.bundle.tracing.test.ts
@@ -1,9 +1,9 @@
 import { Replay as ReplayShim } from '@sentry-internal/integration-shims';
 import { BrowserTracing } from '@sentry-internal/tracing';
 
-import * as TracingBundle from '../src/index.bundle';
+import * as TracingBundle from '../../src/index.bundle.tracing';
 
-describe('index.bundle', () => {
+describe('index.bundle.tracing', () => {
   it('has correct exports', () => {
     Object.keys(TracingBundle.Integrations).forEach(key => {
       // Skip BrowserTracing because it doesn't have a static id field.
diff --git a/packages/overhead-metrics/test-apps/booking-app/with-replay.html b/packages/overhead-metrics/test-apps/booking-app/with-replay.html
index 9c4e0da222a7..7f471cc12c94 100644
--- a/packages/overhead-metrics/test-apps/booking-app/with-replay.html
+++ b/packages/overhead-metrics/test-apps/booking-app/with-replay.html
@@ -215,7 +215,7 @@ <h1>This is a test app.</h1>
     </div>
 
     <script src="./main.js"></script>
-    <script src="../../../tracing/build/bundles/bundle.tracing.replay.min.js"></script>
+    <script src="../../../browser/build/bundles/bundle.tracing.replay.min.js"></script>
     <script type="text/javascript">
       Sentry.init({
         dsn: 'https://d16ae2d36f9249849c7964e9a3a8a608@o447951.ingest.sentry.io/5429213',
diff --git a/packages/overhead-metrics/test-apps/booking-app/with-sentry.html b/packages/overhead-metrics/test-apps/booking-app/with-sentry.html
index dcef1b45ef3c..cd122c172ad2 100644
--- a/packages/overhead-metrics/test-apps/booking-app/with-sentry.html
+++ b/packages/overhead-metrics/test-apps/booking-app/with-sentry.html
@@ -215,7 +215,7 @@ <h1>This is a test app.</h1>
     </div>
 
     <script src="./main.js"></script>
-    <script src="../../../tracing/build/bundles/bundle.tracing.min.js"></script>
+    <script src="../../../browser/build/bundles/bundle.tracing.min.js"></script>
     <script type="text/javascript">
       Sentry.init({
         dsn: 'https://d16ae2d36f9249849c7964e9a3a8a608@o447951.ingest.sentry.io/5429213',
diff --git a/packages/overhead-metrics/test-apps/jank/with-replay.html b/packages/overhead-metrics/test-apps/jank/with-replay.html
index 436c7fc054f6..16e1a6a6ea47 100644
--- a/packages/overhead-metrics/test-apps/jank/with-replay.html
+++ b/packages/overhead-metrics/test-apps/jank/with-replay.html
@@ -25,7 +25,7 @@
     <link rel="stylesheet" type="text/css" href="styles.css" />
 
     <script src="app.js"></script>
-    <script src="../../../tracing/build/bundles/bundle.tracing.replay.min.js"></script>
+    <script src="../../../browser/build/bundles/bundle.tracing.replay.min.js"></script>
     <script type="text/javascript">
       Sentry.init({
         dsn: 'https://d16ae2d36f9249849c7964e9a3a8a608@o447951.ingest.sentry.io/5429213',
diff --git a/packages/overhead-metrics/test-apps/jank/with-sentry.html b/packages/overhead-metrics/test-apps/jank/with-sentry.html
index 5b4dcf032b23..8beacb69b440 100644
--- a/packages/overhead-metrics/test-apps/jank/with-sentry.html
+++ b/packages/overhead-metrics/test-apps/jank/with-sentry.html
@@ -25,7 +25,7 @@
     <link rel="stylesheet" type="text/css" href="styles.css" />
 
     <script src="app.js"></script>
-    <script src="../../../tracing/build/bundles/bundle.tracing.min.js"></script>
+    <script src="../../../browser/build/bundles/bundle.tracing.min.js"></script>
     <script type="text/javascript">
       Sentry.init({
         dsn: 'https://d16ae2d36f9249849c7964e9a3a8a608@o447951.ingest.sentry.io/5429213',
diff --git a/packages/tracing/package.json b/packages/tracing/package.json
index 27867a60511d..618d31bee7b6 100644
--- a/packages/tracing/package.json
+++ b/packages/tracing/package.json
@@ -27,13 +27,11 @@
     "@types/express": "^4.17.14"
   },
   "scripts": {
-    "build": "run-p build:transpile build:types build:bundle",
-    "build:bundle": "yarn rollup --config rollup.bundle.config.js",
+    "build": "run-p build:transpile build:types",
     "build:dev": "run-p build:transpile build:types",
     "build:transpile": "rollup -c rollup.npm.config.js",
     "build:types": "tsc -p tsconfig.types.json",
-    "build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
-    "build:bundle:watch": "rollup --config rollup.bundle.config.js --watch",
+    "build:watch": "run-p build:transpile:watch build:types:watch",
     "build:dev:watch": "run-p build:transpile:watch build:types:watch",
     "build:transpile:watch": "rollup -c rollup.npm.config.js --watch",
     "build:types:watch": "tsc -p tsconfig.types.json --watch",
@@ -46,7 +44,6 @@
     "lint": "run-s lint:prettier lint:eslint",
     "lint:eslint": "eslint . --format stylish",
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
-    "validate:es5": "es-check es5 build/bundles/bundle.tracing.es5.js",
     "test:unit": "jest",
     "test": "jest",
     "test:watch": "jest --watch",
diff --git a/packages/tracing/rollup.bundle.config.js b/packages/tracing/rollup.bundle.config.js
deleted file mode 100644
index a1ff70411f00..000000000000
--- a/packages/tracing/rollup.bundle.config.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { makeBaseBundleConfig, makeBundleConfigVariants } from '../../rollup/index.js';
-
-const builds = [];
-
-['es5', 'es6'].forEach(jsVersion => {
-  const baseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.ts'],
-    jsVersion,
-    licenseTitle: '@sentry/tracing & @sentry/browser',
-    outputFileBase: () => `bundles/bundle.tracing${jsVersion === 'es5' ? '.es5' : ''}`,
-  });
-
-  builds.push(...makeBundleConfigVariants(baseBundleConfig));
-});
-
-// Full bundle incl. replay only available for es6
-const replayBaseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'standalone',
-  entrypoints: ['src/index.bundle.replay.ts'],
-  jsVersion: 'es6',
-  licenseTitle: '@sentry/tracing & @sentry/browser & @sentry/replay',
-  outputFileBase: () => 'bundles/bundle.tracing.replay',
-});
-
-builds.push(...makeBundleConfigVariants(replayBaseBundleConfig));
-
-export default builds;
diff --git a/packages/tracing/src/index.bundle.base.ts b/packages/tracing/src/index.bundle.base.ts
deleted file mode 100644
index bdc0a69337e8..000000000000
--- a/packages/tracing/src/index.bundle.base.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-export type {
-  Breadcrumb,
-  Request,
-  SdkInfo,
-  Event,
-  Exception,
-  // eslint-disable-next-line deprecation/deprecation
-  Severity,
-  SeverityLevel,
-  StackFrame,
-  Stacktrace,
-  Thread,
-  User,
-} from '@sentry/types';
-
-export type { BrowserOptions, ReportDialogOptions } from '@sentry/browser';
-
-export {
-  addGlobalEventProcessor,
-  addBreadcrumb,
-  captureException,
-  captureEvent,
-  captureMessage,
-  configureScope,
-  getHubFromCarrier,
-  getCurrentHub,
-  Hub,
-  Scope,
-  setContext,
-  setExtra,
-  setExtras,
-  setTag,
-  setTags,
-  setUser,
-  startTransaction,
-  makeFetchTransport,
-  makeXHRTransport,
-  withScope,
-} from '@sentry/browser';
-
-export { BrowserClient } from '@sentry/browser';
-export {
-  defaultIntegrations,
-  defaultStackParser,
-  forceLoad,
-  init,
-  lastEventId,
-  onLoad,
-  showReportDialog,
-  flush,
-  close,
-  wrap,
-} from '@sentry/browser';
-export { SDK_VERSION } from '@sentry/browser';
-
-import { addExtensionMethods, BrowserTracing } from '@sentry-internal/tracing';
-import { Integrations as BrowserIntegrations } from '@sentry/browser';
-import type { Integration } from '@sentry/types';
-import { GLOBAL_OBJ } from '@sentry/utils';
-
-export { Span } from '@sentry/core';
-
-let windowIntegrations = {};
-
-// This block is needed to add compatibility with the integrations packages when used with a CDN
-if (GLOBAL_OBJ.Sentry && GLOBAL_OBJ.Sentry.Integrations) {
-  windowIntegrations = GLOBAL_OBJ.Sentry.Integrations;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const INTEGRATIONS: Record<string, new (...args: any[]) => Integration> = {
-  ...windowIntegrations,
-  ...BrowserIntegrations,
-  BrowserTracing,
-};
-
-export { INTEGRATIONS as Integrations };
-// Though in this case exporting `BrowserTracing` separately (in addition to exporting it as part of
-// `Sentry.Integrations`) doesn't gain us any bundle size advantage (we're making the bundle here, not the user, and we
-// can't leave anything out of ours), it does bring the API for using the integration in line with that recommended for
-// users bundling Sentry themselves.
-export { BrowserTracing };
-
-// We are patching the global object with our hub extension methods
-addExtensionMethods();
-
-export { addExtensionMethods };
diff --git a/packages/tracing/src/index.bundle.replay.ts b/packages/tracing/src/index.bundle.replay.ts
deleted file mode 100644
index d0901d0fdbf8..000000000000
--- a/packages/tracing/src/index.bundle.replay.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Replay } from '@sentry/browser';
-
-import * as Sentry from './index.bundle.base';
-
-// TODO (v8): Remove this as it was only needed for backwards compatibility
-// We want replay to be available under Sentry.Replay, to be consistent
-// with the NPM package version.
-Sentry.Integrations.Replay = Replay;
-
-export { Replay };
-export * from './index.bundle.base';
diff --git a/packages/tracing/tsconfig.types.json b/packages/tracing/tsconfig.types.json
index 0abe8142d426..374fd9bc9364 100644
--- a/packages/tracing/tsconfig.types.json
+++ b/packages/tracing/tsconfig.types.json
@@ -1,12 +1,6 @@
 {
   "extends": "./tsconfig.json",
 
-  // We don't need types for this because we don't ship it in our npm bundle. Skipping it here also lets us get around
-  // the fact that it introduces a dependency on `@sentry/browser` which doesn't exist anywhere else in the SDK, which
-  // then prevents us from building that and this at the same time when doing a parallellized build from the repo root
-  // level.
-  "exclude": ["src/index.bundle.ts", "src/index.bundle.replay.ts"],
-
   "compilerOptions": {
     "declaration": true,
     "declarationMap": true,

From 6162fb8355b16fb68aed67d38ecccf3ad68a508c Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Mon, 27 Mar 2023 16:46:53 +0100
Subject: [PATCH 15/50] chore(browser): Add attribution and licences for stack
 parsers (#7620)


From 46f996e9018a2a6cf82ed7a2d247edb7481e6b9a Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 27 Mar 2023 19:47:08 +0200
Subject: [PATCH 16/50] feat(node): Undici integration (#7582)

---
 packages/node/src/integrations/index.ts       |   1 +
 .../node/src/integrations/undici/index.ts     | 220 +++++++++++++++
 .../node/src/integrations/undici/types.ts     | 252 ++++++++++++++++++
 3 files changed, 473 insertions(+)
 create mode 100644 packages/node/src/integrations/undici/index.ts
 create mode 100644 packages/node/src/integrations/undici/types.ts

diff --git a/packages/node/src/integrations/index.ts b/packages/node/src/integrations/index.ts
index 167a482e5b5f..79fd4f93541a 100644
--- a/packages/node/src/integrations/index.ts
+++ b/packages/node/src/integrations/index.ts
@@ -8,3 +8,4 @@ export { ContextLines } from './contextlines';
 export { Context } from './context';
 export { RequestData } from './requestdata';
 export { LocalVariables } from './localvariables';
+export { Undici } from './undici';
diff --git a/packages/node/src/integrations/undici/index.ts b/packages/node/src/integrations/undici/index.ts
new file mode 100644
index 000000000000..8edc5e326cea
--- /dev/null
+++ b/packages/node/src/integrations/undici/index.ts
@@ -0,0 +1,220 @@
+import type { Hub } from '@sentry/core';
+import type { EventProcessor, Integration } from '@sentry/types';
+import {
+  dynamicRequire,
+  dynamicSamplingContextToSentryBaggageHeader,
+  parseSemver,
+  stringMatchesSomePattern,
+  stripUrlQueryAndFragment,
+} from '@sentry/utils';
+
+import type { NodeClient } from '../../client';
+import { isSentryRequest } from '../utils/http';
+import type { DiagnosticsChannel, RequestCreateMessage, RequestEndMessage, RequestErrorMessage } from './types';
+
+const NODE_VERSION = parseSemver(process.versions.node);
+
+export enum ChannelName {
+  // https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/docs/api/DiagnosticsChannel.md#undicirequestcreate
+  RequestCreate = 'undici:request:create',
+  RequestEnd = 'undici:request:headers',
+  RequestError = 'undici:request:error',
+}
+
+export interface UndiciOptions {
+  /**
+   * Whether breadcrumbs should be recorded for requests
+   * Defaults to true
+   */
+  breadcrumbs: boolean;
+}
+
+const DEFAULT_UNDICI_OPTIONS: UndiciOptions = {
+  breadcrumbs: true,
+};
+
+/**
+ * Instruments outgoing HTTP requests made with the `undici` package via
+ * Node's `diagnostics_channel` API.
+ *
+ * Supports Undici 4.7.0 or higher.
+ *
+ * Requires Node 16.17.0 or higher.
+ */
+export class Undici implements Integration {
+  /**
+   * @inheritDoc
+   */
+  public static id: string = 'Undici';
+
+  /**
+   * @inheritDoc
+   */
+  public name: string = Undici.id;
+
+  private readonly _options: UndiciOptions;
+
+  public constructor(_options: Partial<UndiciOptions> = {}) {
+    this._options = {
+      ...DEFAULT_UNDICI_OPTIONS,
+      ..._options,
+    };
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public setupOnce(_addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+    // Requires Node 16+ to use the diagnostics_channel API.
+    if (NODE_VERSION.major && NODE_VERSION.major < 16) {
+      return;
+    }
+
+    let ds: DiagnosticsChannel | undefined;
+    try {
+      // eslint-disable-next-line @typescript-eslint/no-var-requires
+      ds = dynamicRequire(module, 'diagnostics_channel') as DiagnosticsChannel;
+    } catch (e) {
+      // no-op
+    }
+
+    if (!ds || !ds.subscribe) {
+      return;
+    }
+
+    // https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/docs/api/DiagnosticsChannel.md
+    ds.subscribe(ChannelName.RequestCreate, message => {
+      const { request } = message as RequestCreateMessage;
+
+      const url = new URL(request.path, request.origin);
+      const stringUrl = url.toString();
+
+      if (isSentryRequest(stringUrl)) {
+        return;
+      }
+
+      const hub = getCurrentHub();
+      const client = hub.getClient<NodeClient>();
+      const scope = hub.getScope();
+
+      const activeSpan = scope.getSpan();
+
+      if (activeSpan && client) {
+        const clientOptions = client.getOptions();
+
+        // eslint-disable-next-line deprecation/deprecation
+        const shouldCreateSpan = clientOptions.shouldCreateSpanForRequest
+          ? // eslint-disable-next-line deprecation/deprecation
+            clientOptions.shouldCreateSpanForRequest(stringUrl)
+          : true;
+
+        if (shouldCreateSpan) {
+          const data: Record<string, unknown> = {};
+          const params = url.searchParams.toString();
+          if (params) {
+            data['http.query'] = `?${params}`;
+          }
+          if (url.hash) {
+            data['http.fragment'] = url.hash;
+          }
+
+          const span = activeSpan.startChild({
+            op: 'http.client',
+            description: `${request.method || 'GET'} ${stripUrlQueryAndFragment(stringUrl)}`,
+            data,
+          });
+          request.__sentry__ = span;
+
+          // eslint-disable-next-line deprecation/deprecation
+          const shouldPropagate = clientOptions.tracePropagationTargets
+            ? // eslint-disable-next-line deprecation/deprecation
+              stringMatchesSomePattern(stringUrl, clientOptions.tracePropagationTargets)
+            : true;
+
+          if (shouldPropagate) {
+            // TODO: Only do this based on tracePropagationTargets
+            request.addHeader('sentry-trace', span.toTraceparent());
+            if (span.transaction) {
+              const dynamicSamplingContext = span.transaction.getDynamicSamplingContext();
+              const sentryBaggageHeader = dynamicSamplingContextToSentryBaggageHeader(dynamicSamplingContext);
+              if (sentryBaggageHeader) {
+                request.addHeader('baggage', sentryBaggageHeader);
+              }
+            }
+          }
+        }
+      }
+    });
+
+    ds.subscribe(ChannelName.RequestEnd, message => {
+      const { request, response } = message as RequestEndMessage;
+
+      const url = new URL(request.path, request.origin);
+      const stringUrl = url.toString();
+
+      if (isSentryRequest(stringUrl)) {
+        return;
+      }
+
+      const span = request.__sentry__;
+      if (span) {
+        span.setHttpStatus(response.statusCode);
+        span.finish();
+      }
+
+      if (this._options.breadcrumbs) {
+        getCurrentHub().addBreadcrumb(
+          {
+            category: 'http',
+            data: {
+              method: request.method,
+              status_code: response.statusCode,
+              url: stringUrl,
+            },
+            type: 'http',
+          },
+          {
+            event: 'response',
+            request,
+            response,
+          },
+        );
+      }
+    });
+
+    ds.subscribe(ChannelName.RequestError, message => {
+      const { request } = message as RequestErrorMessage;
+
+      const url = new URL(request.path, request.origin);
+      const stringUrl = url.toString();
+
+      if (isSentryRequest(stringUrl)) {
+        return;
+      }
+
+      const span = request.__sentry__;
+      if (span) {
+        span.setStatus('internal_error');
+        span.finish();
+      }
+
+      if (this._options.breadcrumbs) {
+        getCurrentHub().addBreadcrumb(
+          {
+            category: 'http',
+            data: {
+              method: request.method,
+              url: stringUrl,
+            },
+            level: 'error',
+            type: 'http',
+          },
+          {
+            event: 'error',
+            request,
+          },
+        );
+      }
+    });
+  }
+}
diff --git a/packages/node/src/integrations/undici/types.ts b/packages/node/src/integrations/undici/types.ts
new file mode 100644
index 000000000000..9cbafeacfbb4
--- /dev/null
+++ b/packages/node/src/integrations/undici/types.ts
@@ -0,0 +1,252 @@
+// Vendored from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/5a94716c6788f654aea7999a5fc28f4f1e7c48ad/types/node/diagnostics_channel.d.ts
+
+import type { Span } from '@sentry/core';
+
+// License:
+// This project is licensed under the MIT license.
+// Copyrights are respective of each contributor listed at the beginning of each definition file.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files(the "Software"), to deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE AUTHORS
+// OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+// Vendored code starts here:
+
+type ChannelListener = (message: unknown, name: string | symbol) => void;
+
+/**
+ * The `diagnostics_channel` module provides an API to create named channels
+ * to report arbitrary message data for diagnostics purposes.
+ *
+ * It can be accessed using:
+ *
+ * ```js
+ * import diagnostics_channel from 'diagnostics_channel';
+ * ```
+ *
+ * It is intended that a module writer wanting to report diagnostics messages
+ * will create one or many top-level channels to report messages through.
+ * Channels may also be acquired at runtime but it is not encouraged
+ * due to the additional overhead of doing so. Channels may be exported for
+ * convenience, but as long as the name is known it can be acquired anywhere.
+ *
+ * If you intend for your module to produce diagnostics data for others to
+ * consume it is recommended that you include documentation of what named
+ * channels are used along with the shape of the message data. Channel names
+ * should generally include the module name to avoid collisions with data from
+ * other modules.
+ * @experimental
+ * @see [source](https://github.com/nodejs/node/blob/v18.0.0/lib/diagnostics_channel.js)
+ */
+export interface DiagnosticsChannel {
+  /**
+   * Check if there are active subscribers to the named channel. This is helpful if
+   * the message you want to send might be expensive to prepare.
+   *
+   * This API is optional but helpful when trying to publish messages from very
+   * performance-sensitive code.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * if (diagnostics_channel.hasSubscribers('my-channel')) {
+   *   // There are subscribers, prepare and publish message
+   * }
+   * ```
+   * @since v15.1.0, v14.17.0
+   * @param name The channel name
+   * @return If there are active subscribers
+   */
+  hasSubscribers(name: string | symbol): boolean;
+  /**
+   * This is the primary entry-point for anyone wanting to interact with a named
+   * channel. It produces a channel object which is optimized to reduce overhead at
+   * publish time as much as possible.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * const channel = diagnostics_channel.channel('my-channel');
+   * ```
+   * @since v15.1.0, v14.17.0
+   * @param name The channel name
+   * @return The named channel object
+   */
+  channel(name: string | symbol): Channel;
+  /**
+   * Register a message handler to subscribe to this channel. This message handler will be run synchronously
+   * whenever a message is published to the channel. Any errors thrown in the message handler will
+   * trigger an 'uncaughtException'.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * diagnostics_channel.subscribe('my-channel', (message, name) => {
+   *   // Received data
+   * });
+   * ```
+   *
+   * @since v18.7.0, v16.17.0
+   * @param name The channel name
+   * @param onMessage The handler to receive channel messages
+   */
+  subscribe(name: string | symbol, onMessage: ChannelListener): void;
+  /**
+   * Remove a message handler previously registered to this channel with diagnostics_channel.subscribe(name, onMessage).
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * function onMessage(message, name) {
+   *  // Received data
+   * }
+   *
+   * diagnostics_channel.subscribe('my-channel', onMessage);
+   *
+   * diagnostics_channel.unsubscribe('my-channel', onMessage);
+   * ```
+   *
+   * @since v18.7.0, v16.17.0
+   * @param name The channel name
+   * @param onMessage The previous subscribed handler to remove
+   * @returns `true` if the handler was found, `false` otherwise
+   */
+  unsubscribe(name: string | symbol, onMessage: ChannelListener): boolean;
+}
+
+/**
+ * The class `Channel` represents an individual named channel within the data
+ * pipeline. It is use to track subscribers and to publish messages when there
+ * are subscribers present. It exists as a separate object to avoid channel
+ * lookups at publish time, enabling very fast publish speeds and allowing
+ * for heavy use while incurring very minimal cost. Channels are created with {@link channel}, constructing a channel directly
+ * with `new Channel(name)` is not supported.
+ * @since v15.1.0, v14.17.0
+ */
+interface ChannelI {
+  readonly name: string | symbol;
+  /**
+   * Check if there are active subscribers to this channel. This is helpful if
+   * the message you want to send might be expensive to prepare.
+   *
+   * This API is optional but helpful when trying to publish messages from very
+   * performance-sensitive code.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * const channel = diagnostics_channel.channel('my-channel');
+   *
+   * if (channel.hasSubscribers) {
+   *   // There are subscribers, prepare and publish message
+   * }
+   * ```
+   * @since v15.1.0, v14.17.0
+   */
+  readonly hasSubscribers: boolean;
+
+  /**
+   * Publish a message to any subscribers to the channel. This will
+   * trigger message handlers synchronously so they will execute within
+   * the same context.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * const channel = diagnostics_channel.channel('my-channel');
+   *
+   * channel.publish({
+   *   some: 'message'
+   * });
+   * ```
+   * @since v15.1.0, v14.17.0
+   * @param message The message to send to the channel subscribers
+   */
+  publish(message: unknown): void;
+  /**
+   * Register a message handler to subscribe to this channel. This message handler
+   * will be run synchronously whenever a message is published to the channel. Any
+   * errors thrown in the message handler will trigger an `'uncaughtException'`.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * const channel = diagnostics_channel.channel('my-channel');
+   *
+   * channel.subscribe((message, name) => {
+   *   // Received data
+   * });
+   * ```
+   * @since v15.1.0, v14.17.0
+   * @param onMessage The handler to receive channel messages
+   */
+  subscribe(onMessage: ChannelListener): void;
+  /**
+   * Remove a message handler previously registered to this channel with `channel.subscribe(onMessage)`.
+   *
+   * ```js
+   * import diagnostics_channel from 'diagnostics_channel';
+   *
+   * const channel = diagnostics_channel.channel('my-channel');
+   *
+   * function onMessage(message, name) {
+   *   // Received data
+   * }
+   *
+   * channel.subscribe(onMessage);
+   *
+   * channel.unsubscribe(onMessage);
+   * ```
+   * @since v15.1.0, v14.17.0
+   * @param onMessage The previous subscribed handler to remove
+   * @return `true` if the handler was found, `false` otherwise.
+   */
+  unsubscribe(onMessage: ChannelListener): void;
+}
+
+export interface Channel extends ChannelI {
+  new (name: string | symbol): void;
+}
+
+// https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/types/diagnostics-channel.d.ts
+export interface UndiciRequest {
+  origin?: string | URL;
+  completed: boolean;
+  // Originally was Dispatcher.HttpMethod, but did not want to vendor that in.
+  method?: string;
+  path: string;
+  headers: string;
+  addHeader(key: string, value: string): Request;
+}
+
+export interface UndiciResponse {
+  statusCode: number;
+  statusText: string;
+  headers: Array<Buffer>;
+}
+
+export interface RequestWithSentry extends UndiciRequest {
+  __sentry__?: Span;
+}
+
+export interface RequestCreateMessage {
+  request: RequestWithSentry;
+}
+
+export interface RequestEndMessage {
+  request: RequestWithSentry;
+  response: UndiciResponse;
+}
+
+export interface RequestErrorMessage {
+  request: RequestWithSentry;
+  error: Error;
+}

From ee595842e1f6730d2e7d85e172721a08e5b394a0 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Mon, 27 Mar 2023 20:08:25 +0200
Subject: [PATCH 17/50] chore(node): Remove src/declarations.d.ts (#7627)

---
 packages/node/src/declarations.d.ts | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 packages/node/src/declarations.d.ts

diff --git a/packages/node/src/declarations.d.ts b/packages/node/src/declarations.d.ts
deleted file mode 100644
index 843b79454518..000000000000
--- a/packages/node/src/declarations.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-declare module 'async-limiter';

From 7d080dc074755c3a000c208bf00136934b3a71f0 Mon Sep 17 00:00:00 2001
From: Billy Vong <billyvg@users.noreply.github.com>
Date: Mon, 27 Mar 2023 18:02:43 -0400
Subject: [PATCH 18/50] feat(replay): Add `responseStatus`, `decodedBodySize`
 to perf entries (#7613)

Add a few more properties to `resource` performance entries (e.g. script, img, etc).

* Adds `responseStatus` which is new in Chrome 109 for status code
* Adds `decodedBodySize` so that we can tell user if their resource was compressed or not.
---
 .../utils/replayEventTemplates.ts             |  18 +++
 .../tests/fixtures/ReplayRecordingData.ts     |  20 ++-
 .../src/coreHandlers/addNetworkBreadcrumb.ts  |   7 +-
 .../replay/src/coreHandlers/handleFetch.ts    |   4 +-
 .../replay/src/coreHandlers/handleHistory.ts  |   4 +-
 .../coreHandlers/handleNetworkBreadcrumbs.ts  |   6 +-
 packages/replay/src/coreHandlers/handleXhr.ts |   4 +-
 packages/replay/src/types.ts                  | 136 +++++++++++++++++-
 packages/replay/src/util/addMemoryEntry.ts    |   4 +-
 .../src/util/createPerformanceEntries.ts      |  82 ++++++++---
 .../replay/src/util/createPerformanceSpans.ts |   4 +-
 .../replay/test/integration/session.test.ts   |  15 +-
 12 files changed, 261 insertions(+), 43 deletions(-)

diff --git a/packages/browser-integration-tests/utils/replayEventTemplates.ts b/packages/browser-integration-tests/utils/replayEventTemplates.ts
index 8891f5aaeb6d..9adc95b260cd 100644
--- a/packages/browser-integration-tests/utils/replayEventTemplates.ts
+++ b/packages/browser-integration-tests/utils/replayEventTemplates.ts
@@ -66,7 +66,16 @@ export const expectedNavigationPerformanceSpan = {
   startTimestamp: expect.any(Number),
   endTimestamp: expect.any(Number),
   data: {
+    decodedBodySize: expect.any(Number),
+    encodedBodySize: expect.any(Number),
     duration: expect.any(Number),
+    domInteractive: expect.any(Number),
+    domContentLoadedEventEnd: expect.any(Number),
+    domContentLoadedEventStart: expect.any(Number),
+    loadEventStart: expect.any(Number),
+    loadEventEnd: expect.any(Number),
+    domComplete: expect.any(Number),
+    redirectCount: expect.any(Number),
     size: expect.any(Number),
   },
 };
@@ -85,7 +94,16 @@ export const expectedReloadPerformanceSpan = {
   startTimestamp: expect.any(Number),
   endTimestamp: expect.any(Number),
   data: {
+    decodedBodySize: expect.any(Number),
+    encodedBodySize: expect.any(Number),
     duration: expect.any(Number),
+    domInteractive: expect.any(Number),
+    domContentLoadedEventEnd: expect.any(Number),
+    domContentLoadedEventStart: expect.any(Number),
+    loadEventStart: expect.any(Number),
+    loadEventEnd: expect.any(Number),
+    domComplete: expect.any(Number),
+    redirectCount: expect.any(Number),
     size: expect.any(Number),
   },
 };
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts b/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
index 318fc368f7b9..6648bfd059a4 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
+++ b/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
@@ -143,7 +143,19 @@ export const ReplayRecordingData = [
           description: 'http://localhost:3000/',
           startTimestamp: expect.any(Number),
           endTimestamp: expect.any(Number),
-          data: { size: expect.any(Number), duration: expect.any(Number) },
+          data: {
+            decodedBodySize: expect.any(Number),
+            encodedBodySize: expect.any(Number),
+            duration: expect.any(Number),
+            domInteractive: expect.any(Number),
+            domContentLoadedEventEnd: expect.any(Number),
+            domContentLoadedEventStart: expect.any(Number),
+            loadEventStart: expect.any(Number),
+            loadEventEnd: expect.any(Number),
+            domComplete: expect.any(Number),
+            redirectCount: expect.any(Number),
+            size: expect.any(Number),
+          },
         },
       },
     },
@@ -157,7 +169,11 @@ export const ReplayRecordingData = [
           description: expect.stringMatching(/http:\/\/localhost:3000\/static\/js\/main.(\w+).js/),
           startTimestamp: expect.any(Number),
           endTimestamp: expect.any(Number),
-          data: { size: expect.any(Number), encodedBodySize: expect.any(Number) },
+          data: {
+            decodedBodySize: expect.any(Number),
+            encodedBodySize: expect.any(Number),
+            size: expect.any(Number),
+          },
         },
       },
     },
diff --git a/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts b/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts
index 19f5a17a1c9f..829c661fef72 100644
--- a/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts
+++ b/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts
@@ -1,9 +1,12 @@
-import type { ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { createPerformanceSpans } from '../util/createPerformanceSpans';
 import { shouldFilterRequest } from '../util/shouldFilterRequest';
 
 /** Add a performance entry breadcrumb */
-export function addNetworkBreadcrumb(replay: ReplayContainer, result: ReplayPerformanceEntry | null): void {
+export function addNetworkBreadcrumb(
+  replay: ReplayContainer,
+  result: ReplayPerformanceEntry<NetworkRequestData> | null,
+): void {
   if (!replay.isEnabled()) {
     return;
   }
diff --git a/packages/replay/src/coreHandlers/handleFetch.ts b/packages/replay/src/coreHandlers/handleFetch.ts
index 2569706d7c33..61355be7edec 100644
--- a/packages/replay/src/coreHandlers/handleFetch.ts
+++ b/packages/replay/src/coreHandlers/handleFetch.ts
@@ -1,10 +1,10 @@
 import type { HandlerDataFetch } from '@sentry/types';
 
-import type { ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
 
 /** only exported for tests */
-export function handleFetch(handlerData: HandlerDataFetch): null | ReplayPerformanceEntry {
+export function handleFetch(handlerData: HandlerDataFetch): null | ReplayPerformanceEntry<NetworkRequestData> {
   const { startTimestamp, endTimestamp, fetchData, response } = handlerData;
 
   if (!endTimestamp) {
diff --git a/packages/replay/src/coreHandlers/handleHistory.ts b/packages/replay/src/coreHandlers/handleHistory.ts
index f75998689c01..a72618a2203f 100644
--- a/packages/replay/src/coreHandlers/handleHistory.ts
+++ b/packages/replay/src/coreHandlers/handleHistory.ts
@@ -1,4 +1,4 @@
-import type { ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { HistoryData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { createPerformanceSpans } from '../util/createPerformanceSpans';
 
 interface HistoryHandlerData {
@@ -6,7 +6,7 @@ interface HistoryHandlerData {
   to: string;
 }
 
-function handleHistory(handlerData: HistoryHandlerData): ReplayPerformanceEntry {
+function handleHistory(handlerData: HistoryHandlerData): ReplayPerformanceEntry<HistoryData> {
   const { from, to } = handlerData;
 
   const now = Date.now() / 1000;
diff --git a/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts b/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
index e9ad5d9ea209..e46ae19e160a 100644
--- a/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
+++ b/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
@@ -12,7 +12,7 @@ import type {
 } from '@sentry/types';
 import { addInstrumentationHandler, logger } from '@sentry/utils';
 
-import type { ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
 import { handleFetchSpanListener } from './handleFetch';
 import { handleXhrSpanListener } from './handleXhr';
@@ -148,7 +148,7 @@ function _makeNetworkReplayBreadcrumb(
   type: string,
   breadcrumb: Breadcrumb & { data: FetchBreadcrumbData | XhrBreadcrumbData },
   hint: FetchBreadcrumbHint | XhrBreadcrumbHint,
-): ReplayPerformanceEntry | null {
+): ReplayPerformanceEntry<NetworkRequestData> | null {
   const { startTimestamp, endTimestamp } = hint;
 
   if (!endTimestamp) {
@@ -167,7 +167,7 @@ function _makeNetworkReplayBreadcrumb(
     return null;
   }
 
-  const result: ReplayPerformanceEntry & { data: object } = {
+  const result: ReplayPerformanceEntry<NetworkRequestData> = {
     type,
     start: startTimestamp / 1000,
     end: endTimestamp / 1000,
diff --git a/packages/replay/src/coreHandlers/handleXhr.ts b/packages/replay/src/coreHandlers/handleXhr.ts
index f78c41fc831e..4079016e79ac 100644
--- a/packages/replay/src/coreHandlers/handleXhr.ts
+++ b/packages/replay/src/coreHandlers/handleXhr.ts
@@ -1,10 +1,10 @@
 import type { HandlerDataXhr } from '@sentry/types';
 
-import type { ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
 
 /** only exported for tests */
-export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry | null {
+export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry<NetworkRequestData> | null {
   const { startTimestamp, endTimestamp, xhr } = handlerData;
 
   if (!startTimestamp || !endTimestamp || !xhr.__sentry_xhr__) {
diff --git a/packages/replay/src/types.ts b/packages/replay/src/types.ts
index c2982eb5d8cb..3ea18f157bf1 100644
--- a/packages/replay/src/types.ts
+++ b/packages/replay/src/types.ts
@@ -35,11 +35,135 @@ export interface WorkerRequest {
 // PerformancePaintTiming and PerformanceNavigationTiming are only available with TS 4.4 and newer
 // Therefore, we're exporting them here to make them available in older TS versions
 export type PerformancePaintTiming = PerformanceEntry;
-export type PerformanceNavigationTiming = PerformanceEntry & {
-  type: string;
-  transferSize: number;
-  domComplete: number;
+export type PerformanceNavigationTiming = PerformanceEntry &
+  PerformanceResourceTiming & {
+    type: string;
+    transferSize: number;
+
+    /**
+     * A DOMHighResTimeStamp representing the time immediately before the user agent
+     * sets the document's readyState to "interactive".
+     */
+    domInteractive: number;
+
+    /**
+     * A DOMHighResTimeStamp representing the time immediately before the current
+     * document's DOMContentLoaded event handler starts.
+     */
+    domContentLoadedEventStart: number;
+    /**
+     * A DOMHighResTimeStamp representing the time immediately after the current
+     * document's DOMContentLoaded event handler completes.
+     */
+    domContentLoadedEventEnd: number;
+
+    /**
+     * A DOMHighResTimeStamp representing the time immediately before the current
+     * document's load event handler starts.
+     */
+    loadEventStart: number;
+
+    /**
+     * A DOMHighResTimeStamp representing the time immediately after the current
+     * document's load event handler completes.
+     */
+    loadEventEnd: number;
+
+    /**
+     * A DOMHighResTimeStamp representing the time immediately before the user agent
+     * sets the document's readyState to "complete".
+     */
+    domComplete: number;
+
+    /**
+     * A number representing the number of redirects since the last non-redirect
+     * navigation in the current browsing context.
+     */
+    redirectCount: number;
+  };
+export type ExperimentalPerformanceResourceTiming = PerformanceResourceTiming & {
+  // Experimental, see: https://developer.mozilla.org/en-US/docs/Web/API/PerformanceResourceTiming/responseStatus
+  // Requires Chrome 109
+  responseStatus?: number;
+};
+
+export type PaintData = undefined;
+
+/**
+ * See https://developer.mozilla.org/en-US/docs/Web/API/PerformanceNavigationTiming
+ *
+ * Note `navigation.push` will not have any data
+ */
+export type NavigationData = Partial<
+  Pick<
+    PerformanceNavigationTiming,
+    | 'decodedBodySize'
+    | 'encodedBodySize'
+    | 'duration'
+    | 'domInteractive'
+    | 'domContentLoadedEventEnd'
+    | 'domContentLoadedEventStart'
+    | 'loadEventStart'
+    | 'loadEventEnd'
+    | 'domComplete'
+    | 'redirectCount'
+  >
+> & {
+  /**
+   * Transfer size of resource
+   */
+  size?: number;
+};
+
+export type ResourceData = Pick<PerformanceResourceTiming, 'decodedBodySize' | 'encodedBodySize'> & {
+  /**
+   * Transfer size of resource
+   */
+  size: number;
+  /**
+   * HTTP status code. Note this is experimental and not available on all browsers.
+   */
+  statusCode?: number;
 };
+
+export interface LargestContentfulPaintData {
+  /**
+   * Render time (in ms) of the LCP
+   */
+  value: number;
+  size: number;
+  /**
+   * The recording id of the LCP node. -1 if not found
+   */
+  nodeId?: number;
+}
+
+/**
+ * Entries that come from window.performance
+ */
+export type AllPerformanceEntryData = PaintData | NavigationData | ResourceData | LargestContentfulPaintData;
+
+export interface MemoryData {
+  memory: {
+    jsHeapSizeLimit: number;
+    totalJSHeapSize: number;
+    usedJSHeapSize: number;
+  };
+}
+
+export interface NetworkRequestData {
+  method?: string;
+  statusCode?: number;
+  requestBodySize?: number;
+  responseBodySize?: number;
+}
+
+export interface HistoryData {
+  previous: string;
+}
+
+export type AllEntryData = AllPerformanceEntryData | MemoryData | NetworkRequestData | HistoryData;
+
 /**
  * The response from the worker
  */
@@ -319,7 +443,7 @@ export interface ReplayContainer {
   setInitialState(): void;
 }
 
-export interface ReplayPerformanceEntry {
+export interface ReplayPerformanceEntry<T> {
   /**
    * One of these types https://developer.mozilla.org/en-US/docs/Web/API/PerformanceEntry/entryType
    */
@@ -343,5 +467,5 @@ export interface ReplayPerformanceEntry {
   /**
    * Additional unstructured data to be included
    */
-  data?: Record<string, unknown>;
+  data: T;
 }
diff --git a/packages/replay/src/util/addMemoryEntry.ts b/packages/replay/src/util/addMemoryEntry.ts
index 92431e45f2d4..0a67e81dd471 100644
--- a/packages/replay/src/util/addMemoryEntry.ts
+++ b/packages/replay/src/util/addMemoryEntry.ts
@@ -1,8 +1,8 @@
 import { WINDOW } from '../constants';
-import type { AddEventResult, ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { AddEventResult, MemoryData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { createPerformanceSpans } from './createPerformanceSpans';
 
-type ReplayMemoryEntry = ReplayPerformanceEntry & { data: { memory: MemoryInfo } };
+type ReplayMemoryEntry = ReplayPerformanceEntry<MemoryData> & { data: { memory: MemoryInfo } };
 
 interface MemoryInfo {
   jsHeapSizeLimit: number;
diff --git a/packages/replay/src/util/createPerformanceEntries.ts b/packages/replay/src/util/createPerformanceEntries.ts
index 304ab817001c..1dbb07829fb3 100644
--- a/packages/replay/src/util/createPerformanceEntries.ts
+++ b/packages/replay/src/util/createPerformanceEntries.ts
@@ -4,14 +4,23 @@ import { browserPerformanceTimeOrigin } from '@sentry/utils';
 import { WINDOW } from '../constants';
 import type {
   AllPerformanceEntry,
+  AllPerformanceEntryData,
+  ExperimentalPerformanceResourceTiming,
+  LargestContentfulPaintData,
+  NavigationData,
+  PaintData,
   PerformanceNavigationTiming,
   PerformancePaintTiming,
   ReplayPerformanceEntry,
+  ResourceData,
 } from '../types';
 
 // Map entryType -> function to normalize data for event
 // @ts-ignore TODO: entry type does not fit the create* functions entry type
-const ENTRY_TYPES: Record<string, (entry: AllPerformanceEntry) => null | ReplayPerformanceEntry> = {
+const ENTRY_TYPES: Record<
+  string,
+  (entry: AllPerformanceEntry) => null | ReplayPerformanceEntry<AllPerformanceEntryData>
+> = {
   // @ts-ignore TODO: entry type does not fit the create* functions entry type
   resource: createResourceEntry,
   paint: createPaintEntry,
@@ -24,11 +33,13 @@ const ENTRY_TYPES: Record<string, (entry: AllPerformanceEntry) => null | ReplayP
 /**
  * Create replay performance entries from the browser performance entries.
  */
-export function createPerformanceEntries(entries: AllPerformanceEntry[]): ReplayPerformanceEntry[] {
-  return entries.map(createPerformanceEntry).filter(Boolean) as ReplayPerformanceEntry[];
+export function createPerformanceEntries(
+  entries: AllPerformanceEntry[],
+): ReplayPerformanceEntry<AllPerformanceEntryData>[] {
+  return entries.map(createPerformanceEntry).filter(Boolean) as ReplayPerformanceEntry<AllPerformanceEntryData>[];
 }
 
-function createPerformanceEntry(entry: AllPerformanceEntry): ReplayPerformanceEntry | null {
+function createPerformanceEntry(entry: AllPerformanceEntry): ReplayPerformanceEntry<AllPerformanceEntryData> | null {
   if (ENTRY_TYPES[entry.entryType] === undefined) {
     return null;
   }
@@ -42,9 +53,7 @@ function getAbsoluteTime(time: number): number {
   return ((browserPerformanceTimeOrigin || WINDOW.performance.timeOrigin) + time) / 1000;
 }
 
-// TODO: type definition!
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-function createPaintEntry(entry: PerformancePaintTiming) {
+function createPaintEntry(entry: PerformancePaintTiming): ReplayPerformanceEntry<PaintData> {
   const { duration, entryType, name, startTime } = entry;
 
   const start = getAbsoluteTime(startTime);
@@ -53,14 +62,28 @@ function createPaintEntry(entry: PerformancePaintTiming) {
     name,
     start,
     end: start + duration,
+    data: undefined,
   };
 }
 
-// TODO: type definition!
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-function createNavigationEntry(entry: PerformanceNavigationTiming) {
-  // TODO: There looks to be some more interesting bits in here (domComplete, domContentLoaded)
-  const { entryType, name, duration, domComplete, startTime, transferSize, type } = entry;
+function createNavigationEntry(entry: PerformanceNavigationTiming): ReplayPerformanceEntry<NavigationData> | null {
+  const {
+    entryType,
+    name,
+    decodedBodySize,
+    duration,
+    domComplete,
+    encodedBodySize,
+    domContentLoadedEventStart,
+    domContentLoadedEventEnd,
+    domInteractive,
+    loadEventStart,
+    loadEventEnd,
+    redirectCount,
+    startTime,
+    transferSize,
+    type,
+  } = entry;
 
   // Ignore entries with no duration, they do not seem to be useful and cause dupes
   if (duration === 0) {
@@ -74,15 +97,34 @@ function createNavigationEntry(entry: PerformanceNavigationTiming) {
     name,
     data: {
       size: transferSize,
+      decodedBodySize,
+      encodedBodySize,
       duration,
+      domInteractive,
+      domContentLoadedEventStart,
+      domContentLoadedEventEnd,
+      loadEventStart,
+      loadEventEnd,
+      domComplete,
+      redirectCount,
     },
   };
 }
 
-// TODO: type definition!
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-function createResourceEntry(entry: PerformanceResourceTiming) {
-  const { entryType, initiatorType, name, responseEnd, startTime, encodedBodySize, transferSize } = entry;
+function createResourceEntry(
+  entry: ExperimentalPerformanceResourceTiming,
+): ReplayPerformanceEntry<ResourceData> | null {
+  const {
+    entryType,
+    initiatorType,
+    name,
+    responseEnd,
+    startTime,
+    decodedBodySize,
+    encodedBodySize,
+    responseStatus,
+    transferSize,
+  } = entry;
 
   // Core SDK handles these
   if (['fetch', 'xmlhttprequest'].includes(initiatorType)) {
@@ -96,14 +138,16 @@ function createResourceEntry(entry: PerformanceResourceTiming) {
     name,
     data: {
       size: transferSize,
+      statusCode: responseStatus,
+      decodedBodySize,
       encodedBodySize,
     },
   };
 }
 
-// TODO: type definition!
-// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-function createLargestContentfulPaint(entry: PerformanceEntry & { size: number; element: Node }) {
+function createLargestContentfulPaint(
+  entry: PerformanceEntry & { size: number; element: Node },
+): ReplayPerformanceEntry<LargestContentfulPaintData> {
   const { entryType, startTime, size } = entry;
 
   let startTimeOrNavigationActivation = 0;
diff --git a/packages/replay/src/util/createPerformanceSpans.ts b/packages/replay/src/util/createPerformanceSpans.ts
index 33e0b4248aed..cd7a20ddf74a 100644
--- a/packages/replay/src/util/createPerformanceSpans.ts
+++ b/packages/replay/src/util/createPerformanceSpans.ts
@@ -1,6 +1,6 @@
 import { EventType } from '@sentry-internal/rrweb';
 
-import type { AddEventResult, ReplayContainer, ReplayPerformanceEntry } from '../types';
+import type { AddEventResult, AllEntryData, ReplayContainer, ReplayPerformanceEntry } from '../types';
 import { addEvent } from './addEvent';
 
 /**
@@ -8,7 +8,7 @@ import { addEvent } from './addEvent';
  */
 export function createPerformanceSpans(
   replay: ReplayContainer,
-  entries: ReplayPerformanceEntry[],
+  entries: ReplayPerformanceEntry<AllEntryData>[],
 ): Promise<AddEventResult | null>[] {
   return entries.map(({ type, start, end, name, data }) =>
     addEvent(replay, {
diff --git a/packages/replay/test/integration/session.test.ts b/packages/replay/test/integration/session.test.ts
index 2492b5ee913b..4720e7b65bc6 100644
--- a/packages/replay/test/integration/session.test.ts
+++ b/packages/replay/test/integration/session.test.ts
@@ -149,10 +149,23 @@ describe('Integration | session', () => {
     replay.addUpdate(() => {
       createPerformanceSpans(replay, [
         {
-          type: 'navigation.navigate',
+          type: 'navigation.navigate' as const,
           name: 'foo',
           start: BASE_TIMESTAMP + ELAPSED,
           end: BASE_TIMESTAMP + ELAPSED + 100,
+          data: {
+            decodedBodySize: 1,
+            encodedBodySize: 2,
+            duration: 0,
+            domInteractive: 0,
+            domContentLoadedEventEnd: 0,
+            domContentLoadedEventStart: 0,
+            loadEventStart: 0,
+            loadEventEnd: 0,
+            domComplete: 0,
+            redirectCount: 0,
+            size: 0,
+          },
         },
       ]);
       return true;

From d330c2fa55df2ad4b61051dd97c8df036d54081f Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 28 Mar 2023 13:37:55 +0200
Subject: [PATCH 19/50] test(utils): Add test for global rate limit response
 with scope (#7631)

Add a small test to check if the SDK parses a rate limit response that has no category but a scope: `60::organization`. This came up in Slack and in https://github.com/getsentry/ops/pull/6446#discussion_r1150245408.
---
 packages/utils/test/ratelimit.test.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/utils/test/ratelimit.test.ts b/packages/utils/test/ratelimit.test.ts
index 978774c78ea3..e9447aefcc73 100644
--- a/packages/utils/test/ratelimit.test.ts
+++ b/packages/utils/test/ratelimit.test.ts
@@ -186,4 +186,14 @@ describe('updateRateLimits()', () => {
     const updatedRateLimits = updateRateLimits(rateLimits, { statusCode: 200 }, 0);
     expect(updatedRateLimits).toEqual(rateLimits);
   });
+
+  test('should apply a global rate limit with a scope on a 429 status code', () => {
+    const rateLimits: RateLimits = {};
+    const headers = {
+      'retry-after': null,
+      'x-sentry-rate-limits': '60::organization',
+    };
+    const updatedRateLimits = updateRateLimits(rateLimits, { statusCode: 429, headers }, 0);
+    expect(updatedRateLimits.all).toEqual(60_000);
+  });
 });

From 3ba82652e0acea4b1f5a065301a14ddb91a43592 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 28 Mar 2023 13:41:30 +0200
Subject: [PATCH 20/50] feat(core): Add `ignoreTransactions` option (#7594)

This works similar to `ignoreErrors`, but matches transaction names.
---
 .../core/src/integrations/inboundfilters.ts   | 18 ++++++
 .../lib/integrations/inboundfilters.test.ts   | 63 +++++++++++++++++++
 packages/types/src/options.ts                 |  6 ++
 3 files changed, 87 insertions(+)

diff --git a/packages/core/src/integrations/inboundfilters.ts b/packages/core/src/integrations/inboundfilters.ts
index e790e3daf4b5..7c2319596ebd 100644
--- a/packages/core/src/integrations/inboundfilters.ts
+++ b/packages/core/src/integrations/inboundfilters.ts
@@ -10,6 +10,7 @@ export interface InboundFiltersOptions {
   allowUrls: Array<string | RegExp>;
   denyUrls: Array<string | RegExp>;
   ignoreErrors: Array<string | RegExp>;
+  ignoreTransactions: Array<string | RegExp>;
   ignoreInternal: boolean;
 }
 
@@ -63,6 +64,7 @@ export function _mergeOptions(
       ...(clientOptions.ignoreErrors || []),
       ...DEFAULT_IGNORE_ERRORS,
     ],
+    ignoreTransactions: [...(internalOptions.ignoreTransactions || []), ...(clientOptions.ignoreTransactions || [])],
     ignoreInternal: internalOptions.ignoreInternal !== undefined ? internalOptions.ignoreInternal : true,
   };
 }
@@ -81,6 +83,13 @@ export function _shouldDropEvent(event: Event, options: Partial<InboundFiltersOp
       );
     return true;
   }
+  if (_isIgnoredTransaction(event, options.ignoreTransactions)) {
+    __DEBUG_BUILD__ &&
+      logger.warn(
+        `Event dropped due to being matched by \`ignoreTransactions\` option.\nEvent: ${getEventDescription(event)}`,
+      );
+    return true;
+  }
   if (_isDeniedUrl(event, options.denyUrls)) {
     __DEBUG_BUILD__ &&
       logger.warn(
@@ -111,6 +120,15 @@ function _isIgnoredError(event: Event, ignoreErrors?: Array<string | RegExp>): b
   return _getPossibleEventMessages(event).some(message => stringMatchesSomePattern(message, ignoreErrors));
 }
 
+function _isIgnoredTransaction(event: Event, ignoreTransactions?: Array<string | RegExp>): boolean {
+  if (event.type !== 'transaction' || !ignoreTransactions || !ignoreTransactions.length) {
+    return false;
+  }
+
+  const name = event.transaction;
+  return name ? stringMatchesSomePattern(name, ignoreTransactions) : false;
+}
+
 function _isDeniedUrl(event: Event, denyUrls?: Array<string | RegExp>): boolean {
   // TODO: Use Glob instead?
   if (!denyUrls || !denyUrls.length) {
diff --git a/packages/core/test/lib/integrations/inboundfilters.test.ts b/packages/core/test/lib/integrations/inboundfilters.test.ts
index 7537f19d4d5d..51b5e9106d64 100644
--- a/packages/core/test/lib/integrations/inboundfilters.test.ts
+++ b/packages/core/test/lib/integrations/inboundfilters.test.ts
@@ -179,6 +179,17 @@ const MALFORMED_EVENT: Event = {
 
 const TRANSACTION_EVENT: Event = {
   message: 'transaction message',
+  transaction: 'transaction name',
+  type: 'transaction',
+};
+
+const TRANSACTION_EVENT_2: Event = {
+  transaction: 'transaction name 2',
+  type: 'transaction',
+};
+
+const TRANSACTION_EVENT_3: Event = {
+  transaction: 'other name',
   type: 'transaction',
 };
 
@@ -284,6 +295,58 @@ describe('InboundFilters', () => {
     });
   });
 
+  describe('ignoreTransactions', () => {
+    it('string filter with partial match', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: ['name'],
+      });
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(null);
+    });
+
+    it('ignores error event for filtering', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: ['capture'],
+      });
+      expect(eventProcessor(MESSAGE_EVENT, {})).toBe(MESSAGE_EVENT);
+    });
+
+    it('string filter with exact match', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: ['transaction name'],
+      });
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(null);
+    });
+
+    it('regexp filter with partial match', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: [/name/],
+      });
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(null);
+    });
+
+    it('regexp filter with exact match', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: [/^transaction name$/],
+      });
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(null);
+      expect(eventProcessor(TRANSACTION_EVENT_2, {})).toBe(TRANSACTION_EVENT_2);
+    });
+
+    it('can use multiple filters', () => {
+      const eventProcessor = createInboundFiltersEventProcessor({
+        ignoreTransactions: ['transaction name 2', /transaction/],
+      });
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(null);
+      expect(eventProcessor(TRANSACTION_EVENT_2, {})).toBe(null);
+      expect(eventProcessor(TRANSACTION_EVENT_3, {})).toBe(TRANSACTION_EVENT_3);
+    });
+
+    it('uses default filters', () => {
+      const eventProcessor = createInboundFiltersEventProcessor();
+      expect(eventProcessor(TRANSACTION_EVENT, {})).toBe(TRANSACTION_EVENT);
+    });
+  });
+
   describe('denyUrls/allowUrls', () => {
     it('should filter captured message based on its stack trace using string filter', () => {
       const eventProcessorDeny = createInboundFiltersEventProcessor({
diff --git a/packages/types/src/options.ts b/packages/types/src/options.ts
index 0dce43ec4669..0f8a163b2615 100644
--- a/packages/types/src/options.ts
+++ b/packages/types/src/options.ts
@@ -162,6 +162,12 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
    */
   ignoreErrors?: Array<string | RegExp>;
 
+  /**
+   * A pattern for transaction names which should not be sent to Sentry.
+   * By default, all transactions will be sent.
+   */
+  ignoreTransactions?: Array<string | RegExp>;
+
   /**
    * A URL to an envelope tunnel endpoint. An envelope tunnel is an HTTP endpoint
    * that accepts Sentry envelopes for forwarding. This can be used to force data

From 849297a3193825233c29a5673e5b861beb0f6f40 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 28 Mar 2023 16:26:42 +0200
Subject: [PATCH 21/50] feat(tracing): Ensure `pageload` transaction starts at
 timeOrigin (#7632)

---
 .../tracing/browsertracing/pageload/init.js   | 11 ++++++++
 .../tracing/browsertracing/pageload/test.ts   |  5 ++++
 .../browsertracing/pageloadDelayed/init.js    | 14 ++++++++++
 .../browsertracing/pageloadDelayed/test.ts    | 26 +++++++++++++++++++
 .../tracing-internal/src/browser/router.ts    |  4 ++-
 5 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 packages/browser-integration-tests/suites/tracing/browsertracing/pageload/init.js
 create mode 100644 packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/init.js
 create mode 100644 packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/test.ts

diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/init.js b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/init.js
new file mode 100644
index 000000000000..2340df528aa7
--- /dev/null
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/init.js
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/browser';
+import { Integrations } from '@sentry/tracing';
+
+window.Sentry = Sentry;
+window._testBaseTimestamp = performance.timeOrigin / 1000;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [new Integrations.BrowserTracing()],
+  tracesSampleRate: 1,
+});
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
index 7624b26466e5..6a186b63b02a 100644
--- a/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/pageload/test.ts
@@ -12,6 +12,11 @@ sentryTest('should create a pageload transaction', async ({ getLocalTestPath, pa
   const url = await getLocalTestPath({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const timeOrigin = await page.evaluate<number>('window._testBaseTimestamp');
+
+  const { start_timestamp: startTimestamp } = eventData;
+
+  expect(startTimestamp).toBeCloseTo(timeOrigin, 1);
 
   expect(eventData.contexts?.trace?.op).toBe('pageload');
   expect(eventData.spans?.length).toBeGreaterThan(0);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/init.js b/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/init.js
new file mode 100644
index 000000000000..ff6345dec8f2
--- /dev/null
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/init.js
@@ -0,0 +1,14 @@
+import * as Sentry from '@sentry/browser';
+import { Integrations } from '@sentry/tracing';
+
+window.Sentry = Sentry;
+window._testBaseTimestamp = performance.timeOrigin / 1000;
+
+setTimeout(() => {
+  window._testTimeoutTimestamp = (performance.timeOrigin + performance.now()) / 1000;
+  Sentry.init({
+    dsn: 'https://public@dsn.ingest.sentry.io/1337',
+    integrations: [new Integrations.BrowserTracing()],
+    tracesSampleRate: 1,
+  });
+}, 250);
diff --git a/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/test.ts b/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/test.ts
new file mode 100644
index 000000000000..882c08d23c5e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/tracing/browsertracing/pageloadDelayed/test.ts
@@ -0,0 +1,26 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest('should create a pageload transaction when initialized delayed', async ({ getLocalTestPath, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestPath({ testDir: __dirname });
+
+  const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const timeOrigin = await page.evaluate<number>('window._testBaseTimestamp');
+  const timeoutTimestamp = await page.evaluate<number>('window._testTimeoutTimestamp');
+
+  const { start_timestamp: startTimestamp } = eventData;
+
+  expect(startTimestamp).toBeCloseTo(timeOrigin, 1);
+  expect(startTimestamp).toBeLessThan(timeoutTimestamp);
+
+  expect(eventData.contexts?.trace?.op).toBe('pageload');
+  expect(eventData.spans?.length).toBeGreaterThan(0);
+  expect(eventData.transaction_info?.source).toEqual('url');
+});
diff --git a/packages/tracing-internal/src/browser/router.ts b/packages/tracing-internal/src/browser/router.ts
index b66fdee30e9d..e4e5f901dd0b 100644
--- a/packages/tracing-internal/src/browser/router.ts
+++ b/packages/tracing-internal/src/browser/router.ts
@@ -1,5 +1,5 @@
 import type { Transaction, TransactionContext } from '@sentry/types';
-import { addInstrumentationHandler, logger } from '@sentry/utils';
+import { addInstrumentationHandler, browserPerformanceTimeOrigin, logger } from '@sentry/utils';
 
 import { WINDOW } from './types';
 
@@ -22,6 +22,8 @@ export function instrumentRoutingWithDefaults<T extends Transaction>(
   if (startTransactionOnPageLoad) {
     activeTransaction = customStartTransaction({
       name: WINDOW.location.pathname,
+      // pageload should always start at timeOrigin
+      startTimestamp: browserPerformanceTimeOrigin,
       op: 'pageload',
       metadata: { source: 'url' },
     });

From 0743e988d6e160a530b07cb80b9ec4cb17ba9b39 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 28 Mar 2023 18:52:21 +0200
Subject: [PATCH 22/50] chore(vue): Add attribution license (#7633)

---
 packages/vue/src/errorhandler.ts              |  2 +-
 packages/vue/src/tracing.ts                   |  2 +-
 packages/vue/src/{ => vendor}/components.ts   | 28 +++++++++++++++++--
 packages/vue/test/errorHandler.test.ts        |  2 +-
 .../vue/test/{ => vendor}/components.test.ts  |  2 +-
 5 files changed, 30 insertions(+), 6 deletions(-)
 rename packages/vue/src/{ => vendor}/components.ts (65%)
 rename packages/vue/test/{ => vendor}/components.test.ts (98%)

diff --git a/packages/vue/src/errorhandler.ts b/packages/vue/src/errorhandler.ts
index 032ecc2386c8..fd4a1d564343 100644
--- a/packages/vue/src/errorhandler.ts
+++ b/packages/vue/src/errorhandler.ts
@@ -1,7 +1,7 @@
 import { getCurrentHub } from '@sentry/browser';
 
-import { formatComponentName, generateComponentTrace } from './components';
 import type { Options, ViewModel, Vue } from './types';
+import { formatComponentName, generateComponentTrace } from './vendor/components';
 
 type UnknownFunc = (...args: unknown[]) => void;
 
diff --git a/packages/vue/src/tracing.ts b/packages/vue/src/tracing.ts
index f68bbc6a19f3..55b7b7304baa 100644
--- a/packages/vue/src/tracing.ts
+++ b/packages/vue/src/tracing.ts
@@ -2,9 +2,9 @@ import { getCurrentHub } from '@sentry/browser';
 import type { Span, Transaction } from '@sentry/types';
 import { logger, timestampInSeconds } from '@sentry/utils';
 
-import { formatComponentName } from './components';
 import { DEFAULT_HOOKS } from './constants';
 import type { Hook, Operation, TracingOptions, ViewModel, Vue } from './types';
+import { formatComponentName } from './vendor/components';
 
 const VUE_OP = 'ui.vue';
 
diff --git a/packages/vue/src/components.ts b/packages/vue/src/vendor/components.ts
similarity index 65%
rename from packages/vue/src/components.ts
rename to packages/vue/src/vendor/components.ts
index 22ef3e530384..d6bb5b113590 100644
--- a/packages/vue/src/components.ts
+++ b/packages/vue/src/vendor/components.ts
@@ -1,6 +1,30 @@
-import type { ViewModel } from './types';
+import type { ViewModel } from '../types';
+
+// Vendored from https://github.com/vuejs/vue/blob/612fb89547711cacb030a3893a0065b785802860/src/core/util/debug.js
+// with types only changes.
+
+// The MIT License (MIT)
+
+// Copyright (c) 2013-present, Yuxi (Evan) You
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
 
-// Vendored directly from https://github.com/vuejs/vue/blob/master/src/core/util/debug.js with types only changes.
 const classifyRE = /(?:^|[-_])(\w)/g;
 const classify = (str: string): string => str.replace(classifyRE, c => c.toUpperCase()).replace(/[-_]/g, '');
 
diff --git a/packages/vue/test/errorHandler.test.ts b/packages/vue/test/errorHandler.test.ts
index e7530c91304e..a85b368967fc 100644
--- a/packages/vue/test/errorHandler.test.ts
+++ b/packages/vue/test/errorHandler.test.ts
@@ -1,8 +1,8 @@
 import { getCurrentHub } from '@sentry/browser';
 
-import { generateComponentTrace } from '../src/components';
 import { attachErrorHandler } from '../src/errorhandler';
 import type { Operation, Options, ViewModel, Vue } from '../src/types';
+import { generateComponentTrace } from '../src/vendor/components';
 
 describe('attachErrorHandler', () => {
   describe('attachProps', () => {
diff --git a/packages/vue/test/components.test.ts b/packages/vue/test/vendor/components.test.ts
similarity index 98%
rename from packages/vue/test/components.test.ts
rename to packages/vue/test/vendor/components.test.ts
index 2d0928fcf617..77b54889326a 100644
--- a/packages/vue/test/components.test.ts
+++ b/packages/vue/test/vendor/components.test.ts
@@ -1,4 +1,4 @@
-import { formatComponentName } from '../src/components';
+import { formatComponentName } from '../../src/vendor/components';
 
 describe('formatComponentName', () => {
   describe('when the vm is not defined', () => {

From 30f2c24affc4688dda4da719e2436190fa090ff3 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Wed, 29 Mar 2023 09:06:57 +0200
Subject: [PATCH 23/50] feat(replay): Add experiment to capture
 request/response bodies (#7589)

---
 .../fetch/captureBodies/init.js               |  20 +
 .../fetch/captureBodies/test.ts               | 101 +++
 .../fetch/captureBodiesJSON/init.js           |  20 +
 .../fetch/captureBodiesJSON/test.ts           | 101 +++
 .../fetch/captureNonTextBodies/init.js        |  20 +
 .../fetch/captureNonTextBodies/test.ts        | 104 +++
 .../fetch/contentLengthHeader/test.ts         |   4 +-
 .../fetch/noContentLengthHeader/test.ts       |   4 +-
 .../{nonTextBody => nonTextBodySizes}/test.ts |   8 +-
 .../{requestBody => requestBodySize}/test.ts  |   7 +-
 .../xhr/captureBodies/init.js                 |  20 +
 .../xhr/captureBodies/test.ts                 |  99 +++
 .../xhr/captureBodiesJSON/init.js             |  20 +
 .../xhr/captureBodiesJSON/test.ts             |  99 +++
 .../xhr/captureNonTextBodies/init.js          |  20 +
 .../xhr/captureNonTextBodies/test.ts          | 102 +++
 .../xhr/contentLengthHeader/test.ts           |   2 +-
 .../xhr/noContentLengthHeader/test.ts         |   2 +-
 .../{nonTextBody => nonTextBodySizes}/test.ts |   4 +-
 .../{requestBody => requestBodySize}/test.ts  |   4 +-
 .../utils/replayEventTemplates.ts             |   6 +-
 packages/replay/src/constants.ts              |   3 +
 packages/replay/src/coreHandlers/handleDom.ts |   2 +-
 .../replay/src/coreHandlers/handleFetch.ts    |   9 +-
 .../coreHandlers/handleNetworkBreadcrumbs.ts  | 239 +------
 .../replay/src/coreHandlers/handleScope.ts    |   2 +-
 packages/replay/src/coreHandlers/handleXhr.ts |  13 +-
 .../{ => util}/addBreadcrumbEvent.ts          |   4 +-
 .../{ => util}/addNetworkBreadcrumb.ts        |   6 +-
 .../src/coreHandlers/util/fetchUtils.ts       | 168 +++++
 .../src/coreHandlers/util/networkUtils.ts     | 156 +++++
 .../replay/src/coreHandlers/util/xhrUtils.ts  |  97 +++
 packages/replay/src/types.ts                  |  45 +-
 .../unit/coreHandlers/handleFetch.test.ts     |   5 +-
 .../handleNetworkBreadcrumbs.test.ts          | 656 +++++++++++++++---
 .../test/unit/coreHandlers/handleXhr.test.ts  |   5 +-
 .../coreHandlers/util/networkUtils.test.ts    |  65 ++
 37 files changed, 1897 insertions(+), 345 deletions(-)
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/test.ts
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts
 rename packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/{nonTextBody => nonTextBodySizes}/test.ts (96%)
 rename packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/{requestBody => requestBodySize}/test.ts (93%)
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/test.ts
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/init.js
 create mode 100644 packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts
 rename packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/{nonTextBody => nonTextBodySizes}/test.ts (97%)
 rename packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/{requestBody => requestBodySize}/test.ts (96%)
 rename packages/replay/src/coreHandlers/{ => util}/addBreadcrumbEvent.ts (90%)
 rename packages/replay/src/coreHandlers/{ => util}/addNetworkBreadcrumb.ts (79%)
 create mode 100644 packages/replay/src/coreHandlers/util/fetchUtils.ts
 create mode 100644 packages/replay/src/coreHandlers/util/networkUtils.ts
 create mode 100644 packages/replay/src/coreHandlers/util/xhrUtils.ts
 create mode 100644 packages/replay/test/unit/coreHandlers/util/networkUtils.test.ts

diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts
new file mode 100644
index 000000000000..6acea7308b67
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodies/test.ts
@@ -0,0 +1,101 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures text requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipReplayTest()) {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', route => {
+      return route.fulfill({
+        status: 200,
+        body: 'response body',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.evaluate(() => {
+      /* eslint-disable */
+      fetch('http://localhost:7654/foo', {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          Cache: 'no-cache',
+        },
+        body: 'input body',
+      }).then(() => {
+        // @ts-ignore Sentry is a global
+        Sentry.captureException('test error');
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'fetch',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 10,
+        response_body_size: 13,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.fetch')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: {
+            size: 10,
+            body: 'input body',
+          },
+          response: {
+            size: 13,
+            body: 'response body',
+          },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.fetch',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/test.ts
new file mode 100644
index 000000000000..b3f7715fabc3
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureBodiesJSON/test.ts
@@ -0,0 +1,101 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures JSON requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipReplayTest()) {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', route => {
+      return route.fulfill({
+        status: 200,
+        body: JSON.stringify({ res: 'this' }),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.evaluate(() => {
+      /* eslint-disable */
+      fetch('http://localhost:7654/foo', {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          Cache: 'no-cache',
+        },
+        body: '{"foo":"bar"}',
+      }).then(() => {
+        // @ts-ignore Sentry is a global
+        Sentry.captureException('test error');
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'fetch',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 13,
+        response_body_size: 14,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.fetch')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: {
+            size: 13,
+            body: { foo: 'bar' },
+          },
+          response: {
+            size: 14,
+            body: { res: 'this' },
+          },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.fetch',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts
new file mode 100644
index 000000000000..bfcc0bf1dd48
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureNonTextBodies/test.ts
@@ -0,0 +1,104 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures non-text fetch requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipReplayTest()) {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', route => {
+      return route.fulfill({
+        status: 200,
+        body: Buffer.from('<html>Hello world</html>'),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.evaluate(() => {
+      const body = new URLSearchParams();
+      body.append('name', 'Anne');
+      body.append('age', '32');
+
+      /* eslint-disable */
+      fetch('http://localhost:7654/foo', {
+        method: 'POST',
+        headers: {
+          Accept: 'application/json',
+          Cache: 'no-cache',
+        },
+        body: body,
+      }).then(() => {
+        // @ts-ignore Sentry is a global
+        Sentry.captureException('test error');
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'fetch',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 16,
+        response_body_size: 24,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.fetch')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: {
+            size: 16,
+            body: 'name=Anne&age=32',
+          },
+          response: {
+            size: 24,
+            body: '<html>Hello world</html>',
+          },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.fetch',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts
index 27c429c9be98..85e37a5e8b6b 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/contentLengthHeader/test.ts
@@ -79,8 +79,10 @@ sentryTest('parses response_body_size from Content-Length header if available',
     {
       data: {
         method: 'GET',
-        responseBodySize: 789,
         statusCode: 200,
+        response: {
+          size: 789,
+        },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts
index 31f8d65bc7e7..21780e2e447a 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/noContentLengthHeader/test.ts
@@ -78,8 +78,10 @@ sentryTest('does not capture response_body_size without Content-Length header',
     {
       data: {
         method: 'GET',
-        responseBodySize: 29,
         statusCode: 200,
+        response: {
+          size: 29,
+        },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBody/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBodySizes/test.ts
similarity index 96%
rename from packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBody/test.ts
rename to packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBodySizes/test.ts
index d2c167110a8a..b9d77ceda1c5 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBody/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/nonTextBodySizes/test.ts
@@ -81,9 +81,13 @@ sentryTest('calculates body sizes for non-string bodies', async ({ getLocalTestP
     {
       data: {
         method: 'POST',
-        requestBodySize: 26,
-        responseBodySize: 24,
         statusCode: 200,
+        request: {
+          size: 26,
+        },
+        response: {
+          size: 24,
+        },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBody/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBodySize/test.ts
similarity index 93%
rename from packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBody/test.ts
rename to packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBodySize/test.ts
index 0f77394b6e5d..572fd168bff5 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBody/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/requestBodySize/test.ts
@@ -8,7 +8,7 @@ import {
   waitForReplayRequest,
 } from '../../../../../utils/replayHelpers';
 
-sentryTest('captures request_body_size when body is sent', async ({ getLocalTestPath, page }) => {
+sentryTest('captures request body size when body is sent', async ({ getLocalTestPath, page }) => {
   if (shouldSkipReplayTest()) {
     sentryTest.skip();
   }
@@ -70,7 +70,6 @@ sentryTest('captures request_body_size when body is sent', async ({ getLocalTest
       url: 'http://localhost:7654/foo',
     },
   });
-  expect(eventData!.breadcrumbs![0].data!.request_body_size).toEqual(13);
 
   const replayReq1 = await replayRequestPromise1;
   const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
@@ -78,8 +77,10 @@ sentryTest('captures request_body_size when body is sent', async ({ getLocalTest
     {
       data: {
         method: 'POST',
-        requestBodySize: 13,
         statusCode: 200,
+        request: {
+          size: 13,
+        },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts
new file mode 100644
index 000000000000..1bf9732d0c1f
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodies/test.ts
@@ -0,0 +1,99 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures text xhr requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page, browserName }) => {
+    // These are a bit flaky on non-chromium browsers
+    if (shouldSkipReplayTest() || browserName !== 'chromium') {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', route => {
+      return route.fulfill({
+        status: 200,
+        body: 'response body',
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': '',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    void page.evaluate(() => {
+      /* eslint-disable */
+      const xhr = new XMLHttpRequest();
+
+      xhr.open('POST', 'http://localhost:7654/foo');
+      xhr.setRequestHeader('Accept', 'application/json');
+      xhr.setRequestHeader('Content-Type', 'application/json');
+      xhr.setRequestHeader('Cache', 'no-cache');
+      xhr.send('input body');
+
+      xhr.addEventListener('readystatechange', function () {
+        if (xhr.readyState === 4) {
+          // @ts-ignore Sentry is a global
+          setTimeout(() => Sentry.captureException('test error', 0));
+        }
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'xhr',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 10,
+        response_body_size: 13,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.xhr')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: { size: 10, body: 'input body' },
+          response: { size: 13, body: 'response body' },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.xhr',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/test.ts
new file mode 100644
index 000000000000..5a86540b450d
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureBodiesJSON/test.ts
@@ -0,0 +1,99 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures JSON xhr requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page, browserName }) => {
+    // These are a bit flaky on non-chromium browsers
+    if (shouldSkipReplayTest() || browserName !== 'chromium') {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', route => {
+      return route.fulfill({
+        status: 200,
+        body: JSON.stringify({ res: 'this' }),
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': '',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    void page.evaluate(() => {
+      /* eslint-disable */
+      const xhr = new XMLHttpRequest();
+
+      xhr.open('POST', 'http://localhost:7654/foo');
+      xhr.setRequestHeader('Accept', 'application/json');
+      xhr.setRequestHeader('Content-Type', 'application/json');
+      xhr.setRequestHeader('Cache', 'no-cache');
+      xhr.send('{"foo":"bar"}');
+
+      xhr.addEventListener('readystatechange', function () {
+        if (xhr.readyState === 4) {
+          // @ts-ignore Sentry is a global
+          setTimeout(() => Sentry.captureException('test error', 0));
+        }
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'xhr',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 13,
+        response_body_size: 14,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.xhr')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: { size: 13, body: { foo: 'bar' } },
+          response: { size: 14, body: { res: 'this' } },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.xhr',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/init.js b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/init.js
new file mode 100644
index 000000000000..ff7729968b4e
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/init.js
@@ -0,0 +1,20 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = new Sentry.Replay({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  _experiments: {
+    captureNetworkBodies: true,
+  },
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  // We ensure to sample for errors, so by default nothing is sent
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts
new file mode 100644
index 000000000000..054d1a970595
--- /dev/null
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureNonTextBodies/test.ts
@@ -0,0 +1,102 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
+import {
+  getCustomRecordingEvents,
+  shouldSkipReplayTest,
+  waitForReplayRequest,
+} from '../../../../../utils/replayHelpers';
+
+sentryTest(
+  'captures non-text fetch requestBody & responseBody when experiment is configured',
+  async ({ getLocalTestPath, page, browserName }) => {
+    // These are a bit flaky on non-chromium browsers
+    if (shouldSkipReplayTest() || browserName !== 'chromium') {
+      sentryTest.skip();
+    }
+
+    await page.route('**/foo', async route => {
+      return route.fulfill({
+        status: 200,
+        body: Buffer.from('<html>Hello world</html>'),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+    });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', route => {
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    const requestPromise = waitForErrorRequest(page);
+    const replayRequestPromise1 = waitForReplayRequest(page, 0);
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.evaluate(() => {
+      /* eslint-disable */
+      const xhr = new XMLHttpRequest();
+
+      const body = new URLSearchParams();
+      body.append('name', 'Anne');
+      body.append('age', '32');
+
+      xhr.open('POST', 'http://localhost:7654/foo');
+      xhr.setRequestHeader('Accept', 'application/json');
+      xhr.setRequestHeader('Content-Type', 'application/json');
+      xhr.setRequestHeader('Cache', 'no-cache');
+      xhr.send(body);
+
+      xhr.addEventListener('readystatechange', function () {
+        if (xhr.readyState === 4) {
+          // @ts-ignore Sentry is a global
+          setTimeout(() => Sentry.captureException('test error', 0));
+        }
+      });
+      /* eslint-enable */
+    });
+
+    const request = await requestPromise;
+    const eventData = envelopeRequestParser(request);
+
+    expect(eventData.exception?.values).toHaveLength(1);
+
+    expect(eventData?.breadcrumbs?.length).toBe(1);
+    expect(eventData!.breadcrumbs![0]).toEqual({
+      timestamp: expect.any(Number),
+      category: 'xhr',
+      type: 'http',
+      data: {
+        method: 'POST',
+        request_body_size: 16,
+        response_body_size: 24,
+        status_code: 200,
+        url: 'http://localhost:7654/foo',
+      },
+    });
+
+    const replayReq1 = await replayRequestPromise1;
+    const { performanceSpans: performanceSpans1 } = getCustomRecordingEvents(replayReq1);
+    expect(performanceSpans1.filter(span => span.op === 'resource.xhr')).toEqual([
+      {
+        data: {
+          method: 'POST',
+          statusCode: 200,
+          request: { size: 16, body: 'name=Anne&age=32' },
+          response: { size: 24, body: '<html>Hello world</html>' },
+        },
+        description: 'http://localhost:7654/foo',
+        endTimestamp: expect.any(Number),
+        op: 'resource.xhr',
+        startTimestamp: expect.any(Number),
+      },
+    ]);
+  },
+);
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts
index 4ee170939530..0db738a467e0 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/contentLengthHeader/test.ts
@@ -86,8 +86,8 @@ sentryTest(
       {
         data: {
           method: 'GET',
-          responseBodySize: 789,
           statusCode: 200,
+          response: { size: 789 },
         },
         description: 'http://localhost:7654/foo',
         endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts
index 9a9bd633c71f..18284361f17a 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/noContentLengthHeader/test.ts
@@ -86,8 +86,8 @@ sentryTest(
       {
         data: {
           method: 'GET',
-          responseBodySize: 29,
           statusCode: 200,
+          response: { size: 29 },
         },
         description: 'http://localhost:7654/foo',
         endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBody/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBodySizes/test.ts
similarity index 97%
rename from packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBody/test.ts
rename to packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBodySizes/test.ts
index 0210283fea60..80aadc4ebdfa 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBody/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/nonTextBodySizes/test.ts
@@ -84,9 +84,9 @@ sentryTest('calculates body sizes for non-string bodies', async ({ getLocalTestP
     {
       data: {
         method: 'POST',
-        requestBodySize: 26,
-        responseBodySize: 24,
         statusCode: 200,
+        request: { size: 26 },
+        response: { size: 24 },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBody/test.ts b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBodySize/test.ts
similarity index 96%
rename from packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBody/test.ts
rename to packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBodySize/test.ts
index 470fe57c51ba..7e473e980114 100644
--- a/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBody/test.ts
+++ b/packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/requestBodySize/test.ts
@@ -8,7 +8,7 @@ import {
   waitForReplayRequest,
 } from '../../../../../utils/replayHelpers';
 
-sentryTest('captures request_body_size when body is sent', async ({ getLocalTestPath, page, browserName }) => {
+sentryTest('captures request body size when body is sent', async ({ getLocalTestPath, page, browserName }) => {
   // These are a bit flaky on non-chromium browsers
   if (shouldSkipReplayTest() || browserName !== 'chromium') {
     sentryTest.skip();
@@ -81,8 +81,8 @@ sentryTest('captures request_body_size when body is sent', async ({ getLocalTest
     {
       data: {
         method: 'POST',
-        requestBodySize: 13,
         statusCode: 200,
+        request: { size: 13 },
       },
       description: 'http://localhost:7654/foo',
       endTimestamp: expect.any(Number),
diff --git a/packages/browser-integration-tests/utils/replayEventTemplates.ts b/packages/browser-integration-tests/utils/replayEventTemplates.ts
index 9adc95b260cd..2c4b887032e0 100644
--- a/packages/browser-integration-tests/utils/replayEventTemplates.ts
+++ b/packages/browser-integration-tests/utils/replayEventTemplates.ts
@@ -156,8 +156,8 @@ export const expectedFetchPerformanceSpan = {
   data: {
     method: 'POST',
     statusCode: 200,
-    responseBodySize: 11,
-    requestBodySize: 3,
+    request: { size: 3 },
+    response: { size: 11 },
   },
 };
 
@@ -169,7 +169,7 @@ export const expectedXHRPerformanceSpan = {
   data: {
     method: 'GET',
     statusCode: 200,
-    responseBodySize: 11,
+    response: { size: 11 },
   },
 };
 
diff --git a/packages/replay/src/constants.ts b/packages/replay/src/constants.ts
index c3550cb988c3..57c30fdad662 100644
--- a/packages/replay/src/constants.ts
+++ b/packages/replay/src/constants.ts
@@ -28,3 +28,6 @@ export const ERROR_CHECKOUT_TIME = 60_000;
 
 export const RETRY_BASE_INTERVAL = 5000;
 export const RETRY_MAX_COUNT = 3;
+
+/* The max (uncompressed) size in bytes of a network body. Any body larger than this will be dropped. */
+export const NETWORK_BODY_MAX_SIZE = 300_000;
diff --git a/packages/replay/src/coreHandlers/handleDom.ts b/packages/replay/src/coreHandlers/handleDom.ts
index 8d005afa1b46..8878f2b71966 100644
--- a/packages/replay/src/coreHandlers/handleDom.ts
+++ b/packages/replay/src/coreHandlers/handleDom.ts
@@ -5,7 +5,7 @@ import { htmlTreeAsString } from '@sentry/utils';
 
 import type { ReplayContainer } from '../types';
 import { createBreadcrumb } from '../util/createBreadcrumb';
-import { addBreadcrumbEvent } from './addBreadcrumbEvent';
+import { addBreadcrumbEvent } from './util/addBreadcrumbEvent';
 import { getAttributesToRecord } from './util/getAttributesToRecord';
 
 interface DomHandlerData {
diff --git a/packages/replay/src/coreHandlers/handleFetch.ts b/packages/replay/src/coreHandlers/handleFetch.ts
index 61355be7edec..1358701ab8f3 100644
--- a/packages/replay/src/coreHandlers/handleFetch.ts
+++ b/packages/replay/src/coreHandlers/handleFetch.ts
@@ -1,7 +1,7 @@
 import type { HandlerDataFetch } from '@sentry/types';
 
 import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
-import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
+import { addNetworkBreadcrumb } from './util/addNetworkBreadcrumb';
 
 /** only exported for tests */
 export function handleFetch(handlerData: HandlerDataFetch): null | ReplayPerformanceEntry<NetworkRequestData> {
@@ -11,18 +11,17 @@ export function handleFetch(handlerData: HandlerDataFetch): null | ReplayPerform
     return null;
   }
 
-  const { method, request_body_size: requestBodySize, response_body_size: responseBodySize } = fetchData;
+  // This is only used as a fallback, so we know the body sizes are never set here
+  const { method, url } = fetchData;
 
   return {
     type: 'resource.fetch',
     start: startTimestamp / 1000,
     end: endTimestamp / 1000,
-    name: fetchData.url,
+    name: url,
     data: {
       method,
       statusCode: response && (response as Response).status,
-      requestBodySize,
-      responseBodySize,
     },
   };
 }
diff --git a/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts b/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
index e46ae19e160a..62351494f86d 100644
--- a/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
+++ b/packages/replay/src/coreHandlers/handleNetworkBreadcrumbs.ts
@@ -3,41 +3,28 @@ import type {
   Breadcrumb,
   BreadcrumbHint,
   FetchBreadcrumbData,
-  FetchBreadcrumbHint,
-  HandlerDataFetch,
-  SentryWrappedXMLHttpRequest,
   TextEncoderInternal,
   XhrBreadcrumbData,
-  XhrBreadcrumbHint,
 } from '@sentry/types';
 import { addInstrumentationHandler, logger } from '@sentry/utils';
 
-import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
-import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
+import type { FetchHint, ReplayContainer, XhrHint } from '../types';
 import { handleFetchSpanListener } from './handleFetch';
 import { handleXhrSpanListener } from './handleXhr';
-
-type RequestBody = null | Blob | BufferSource | FormData | URLSearchParams | string;
-
-type XhrHint = XhrBreadcrumbHint & { xhr: XMLHttpRequest & SentryWrappedXMLHttpRequest; input?: RequestBody };
-type FetchHint = FetchBreadcrumbHint & {
-  input: HandlerDataFetch['args'];
-  response: Response;
-};
+import { captureFetchBreadcrumbToReplay, enrichFetchBreadcrumb } from './util/fetchUtils';
+import { captureXhrBreadcrumbToReplay, enrichXhrBreadcrumb } from './util/xhrUtils';
 
 interface ExtendedNetworkBreadcrumbsOptions {
   replay: ReplayContainer;
   textEncoder: TextEncoderInternal;
+  captureBodies: boolean;
 }
 
 /**
- * This will enrich the xhr/fetch breadcrumbs with additional information.
- *
- * This adds:
- * * request_body_size
- * * response_body_size
- *
- * to the breadcrumb data.
+ * This method does two things:
+ * - It enriches the regular XHR/fetch breadcrumbs with request/response size data
+ * - It captures the XHR/fetch breadcrumbs to the replay
+ *   (enriching it with further data that is _not_ added to the regular breadcrumbs)
  */
 export function handleNetworkBreadcrumbs(replay: ReplayContainer): void {
   const client = getCurrentHub().getClient();
@@ -48,6 +35,7 @@ export function handleNetworkBreadcrumbs(replay: ReplayContainer): void {
     const options: ExtendedNetworkBreadcrumbsOptions = {
       replay,
       textEncoder,
+      captureBodies: replay.getOptions()._experiments.captureNetworkBodies || false,
     };
 
     if (client && client.on) {
@@ -74,220 +62,27 @@ export function beforeAddNetworkBreadcrumb(
 
   try {
     if (_isXhrBreadcrumb(breadcrumb) && _isXhrHint(hint)) {
-      _handleXhrBreadcrumb(breadcrumb, hint, options);
+      // This has to be sync, as we need to ensure the breadcrumb is enriched in the same tick
+      // Because the hook runs synchronously, and the breadcrumb is afterwards passed on
+      // So any async mutations to it will not be reflected in the final breadcrumb
+      enrichXhrBreadcrumb(breadcrumb, hint, options);
+
+      void captureXhrBreadcrumbToReplay(breadcrumb, hint, options);
     }
 
     if (_isFetchBreadcrumb(breadcrumb) && _isFetchHint(hint)) {
       // This has to be sync, as we need to ensure the breadcrumb is enriched in the same tick
       // Because the hook runs synchronously, and the breadcrumb is afterwards passed on
       // So any async mutations to it will not be reflected in the final breadcrumb
-      _enrichFetchBreadcrumb(breadcrumb, hint, options);
+      enrichFetchBreadcrumb(breadcrumb, hint, options);
 
-      void _handleFetchBreadcrumb(breadcrumb, hint, options);
+      void captureFetchBreadcrumbToReplay(breadcrumb, hint, options);
     }
   } catch (e) {
     __DEBUG_BUILD__ && logger.warn('Error when enriching network breadcrumb');
   }
 }
 
-function _handleXhrBreadcrumb(
-  breadcrumb: Breadcrumb & { data: XhrBreadcrumbData },
-  hint: XhrHint,
-  options: ExtendedNetworkBreadcrumbsOptions,
-): void {
-  // Enriches the breadcrumb overall
-  _enrichXhrBreadcrumb(breadcrumb, hint, options);
-
-  // Create a replay performance entry from this breadcrumb
-  const result = _makeNetworkReplayBreadcrumb('resource.xhr', breadcrumb, hint);
-  addNetworkBreadcrumb(options.replay, result);
-}
-
-async function _handleFetchBreadcrumb(
-  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
-  hint: FetchHint,
-  options: ExtendedNetworkBreadcrumbsOptions,
-): Promise<void> {
-  const fullBreadcrumb = await _parseFetchResponse(breadcrumb, hint, options);
-
-  // Create a replay performance entry from this breadcrumb
-  const result = _makeNetworkReplayBreadcrumb('resource.fetch', fullBreadcrumb, hint);
-  addNetworkBreadcrumb(options.replay, result);
-}
-
-// This does async operations on the breadcrumb for replay
-async function _parseFetchResponse(
-  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
-  hint: FetchBreadcrumbHint,
-  options: ExtendedNetworkBreadcrumbsOptions,
-): Promise<Breadcrumb & { data: FetchBreadcrumbData }> {
-  if (breadcrumb.data.response_body_size || !hint.response) {
-    return breadcrumb;
-  }
-
-  // If no Content-Length header exists, we try to get the size from the response body
-  try {
-    // We have to clone this, as the body can only be read once
-    const response = (hint.response as Response).clone();
-    const body = await response.text();
-
-    if (body.length) {
-      return {
-        ...breadcrumb,
-        data: { ...breadcrumb.data, response_body_size: getBodySize(body, options.textEncoder) },
-      };
-    }
-  } catch {
-    // just ignore if something fails here
-  }
-
-  return breadcrumb;
-}
-
-function _makeNetworkReplayBreadcrumb(
-  type: string,
-  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData | XhrBreadcrumbData },
-  hint: FetchBreadcrumbHint | XhrBreadcrumbHint,
-): ReplayPerformanceEntry<NetworkRequestData> | null {
-  const { startTimestamp, endTimestamp } = hint;
-
-  if (!endTimestamp) {
-    return null;
-  }
-
-  const {
-    url,
-    method,
-    status_code: statusCode,
-    request_body_size: requestBodySize,
-    response_body_size: responseBodySize,
-  } = breadcrumb.data;
-
-  if (url === undefined) {
-    return null;
-  }
-
-  const result: ReplayPerformanceEntry<NetworkRequestData> = {
-    type,
-    start: startTimestamp / 1000,
-    end: endTimestamp / 1000,
-    name: url,
-    data: {
-      method,
-      statusCode,
-    },
-  };
-
-  if (requestBodySize) {
-    result.data.requestBodySize = requestBodySize;
-  }
-  if (responseBodySize) {
-    result.data.responseBodySize = responseBodySize;
-  }
-
-  return result;
-}
-
-function _enrichXhrBreadcrumb(
-  breadcrumb: Breadcrumb & { data: XhrBreadcrumbData },
-  hint: XhrHint,
-  options: ExtendedNetworkBreadcrumbsOptions,
-): void {
-  const { xhr, input } = hint;
-
-  const reqSize = getBodySize(input, options.textEncoder);
-  const resSize = xhr.getResponseHeader('content-length')
-    ? parseContentSizeHeader(xhr.getResponseHeader('content-length'))
-    : getBodySize(xhr.response, options.textEncoder);
-
-  if (reqSize !== undefined) {
-    breadcrumb.data.request_body_size = reqSize;
-  }
-  if (resSize !== undefined) {
-    breadcrumb.data.response_body_size = resSize;
-  }
-}
-
-function _enrichFetchBreadcrumb(
-  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
-  hint: FetchHint,
-  options: ExtendedNetworkBreadcrumbsOptions,
-): void {
-  const { input, response } = hint;
-
-  const body = getFetchBody(input);
-  const reqSize = getBodySize(body, options.textEncoder);
-  const resSize = response ? parseContentSizeHeader(response.headers.get('content-length')) : undefined;
-
-  if (reqSize !== undefined) {
-    breadcrumb.data.request_body_size = reqSize;
-  }
-  if (resSize !== undefined) {
-    breadcrumb.data.response_body_size = resSize;
-  }
-}
-
-/** only exported for tests */
-export function getBodySize(
-  body: RequestInit['body'],
-  textEncoder: TextEncoder | TextEncoderInternal,
-): number | undefined {
-  if (!body) {
-    return undefined;
-  }
-
-  try {
-    if (typeof body === 'string') {
-      return textEncoder.encode(body).length;
-    }
-
-    if (body instanceof URLSearchParams) {
-      return textEncoder.encode(body.toString()).length;
-    }
-
-    if (body instanceof FormData) {
-      // This is a bit simplified, but gives us a decent estimate
-      // This converts e.g. { name: 'Anne Smith', age: 13 } to 'name=Anne+Smith&age=13'
-      // @ts-ignore passing FormData to URLSearchParams actually works
-      const formDataStr = new URLSearchParams(body).toString();
-      return textEncoder.encode(formDataStr).length;
-    }
-
-    if (body instanceof Blob) {
-      return body.size;
-    }
-
-    if (body instanceof ArrayBuffer) {
-      return body.byteLength;
-    }
-
-    // Currently unhandled types: ArrayBufferView, ReadableStream
-  } catch {
-    // just return undefined
-  }
-
-  return undefined;
-}
-
-/** only exported for tests */
-export function parseContentSizeHeader(header: string | null | undefined): number | undefined {
-  if (!header) {
-    return undefined;
-  }
-
-  const size = parseInt(header, 10);
-  return isNaN(size) ? undefined : size;
-}
-
-function getFetchBody(fetchArgs: unknown[] = []): RequestInit['body'] | undefined {
-  // We only support getting the body from the fetch options
-  if (fetchArgs.length !== 2 || typeof fetchArgs[1] !== 'object') {
-    return undefined;
-  }
-
-  return (fetchArgs[1] as RequestInit).body;
-}
-
 function _isXhrBreadcrumb(breadcrumb: Breadcrumb): breadcrumb is Breadcrumb & { data: XhrBreadcrumbData } {
   return breadcrumb.category === 'xhr';
 }
diff --git a/packages/replay/src/coreHandlers/handleScope.ts b/packages/replay/src/coreHandlers/handleScope.ts
index 79d8aa541a37..88624e94efb8 100644
--- a/packages/replay/src/coreHandlers/handleScope.ts
+++ b/packages/replay/src/coreHandlers/handleScope.ts
@@ -2,7 +2,7 @@ import type { Breadcrumb, Scope } from '@sentry/types';
 
 import type { ReplayContainer } from '../types';
 import { createBreadcrumb } from '../util/createBreadcrumb';
-import { addBreadcrumbEvent } from './addBreadcrumbEvent';
+import { addBreadcrumbEvent } from './util/addBreadcrumbEvent';
 
 let _LAST_BREADCRUMB: null | Breadcrumb = null;
 
diff --git a/packages/replay/src/coreHandlers/handleXhr.ts b/packages/replay/src/coreHandlers/handleXhr.ts
index 4079016e79ac..eca1994c80b5 100644
--- a/packages/replay/src/coreHandlers/handleXhr.ts
+++ b/packages/replay/src/coreHandlers/handleXhr.ts
@@ -1,7 +1,7 @@
 import type { HandlerDataXhr } from '@sentry/types';
 
 import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
-import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
+import { addNetworkBreadcrumb } from './util/addNetworkBreadcrumb';
 
 /** only exported for tests */
 export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry<NetworkRequestData> | null {
@@ -11,13 +11,8 @@ export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry<N
     return null;
   }
 
-  const {
-    method,
-    url,
-    status_code: statusCode,
-    request_body_size: requestBodySize,
-    response_body_size: responseBodySize,
-  } = xhr.__sentry_xhr__;
+  // This is only used as a fallback, so we know the body sizes are never set here
+  const { method, url, status_code: statusCode } = xhr.__sentry_xhr__;
 
   if (url === undefined) {
     return null;
@@ -31,8 +26,6 @@ export function handleXhr(handlerData: HandlerDataXhr): ReplayPerformanceEntry<N
     data: {
       method,
       statusCode,
-      requestBodySize,
-      responseBodySize,
     },
   };
 }
diff --git a/packages/replay/src/coreHandlers/addBreadcrumbEvent.ts b/packages/replay/src/coreHandlers/util/addBreadcrumbEvent.ts
similarity index 90%
rename from packages/replay/src/coreHandlers/addBreadcrumbEvent.ts
rename to packages/replay/src/coreHandlers/util/addBreadcrumbEvent.ts
index 70fe932910a6..b3e44d8deb3d 100644
--- a/packages/replay/src/coreHandlers/addBreadcrumbEvent.ts
+++ b/packages/replay/src/coreHandlers/util/addBreadcrumbEvent.ts
@@ -1,8 +1,8 @@
 import { EventType } from '@sentry-internal/rrweb';
 import type { Breadcrumb } from '@sentry/types';
 
-import type { ReplayContainer } from '../types';
-import { addEvent } from '../util/addEvent';
+import type { ReplayContainer } from '../../types';
+import { addEvent } from '../../util/addEvent';
 
 /**
  * Add a breadcrumb event to replay.
diff --git a/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts b/packages/replay/src/coreHandlers/util/addNetworkBreadcrumb.ts
similarity index 79%
rename from packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts
rename to packages/replay/src/coreHandlers/util/addNetworkBreadcrumb.ts
index 829c661fef72..b67b27e6ab7f 100644
--- a/packages/replay/src/coreHandlers/addNetworkBreadcrumb.ts
+++ b/packages/replay/src/coreHandlers/util/addNetworkBreadcrumb.ts
@@ -1,6 +1,6 @@
-import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../types';
-import { createPerformanceSpans } from '../util/createPerformanceSpans';
-import { shouldFilterRequest } from '../util/shouldFilterRequest';
+import type { NetworkRequestData, ReplayContainer, ReplayPerformanceEntry } from '../../types';
+import { createPerformanceSpans } from '../../util/createPerformanceSpans';
+import { shouldFilterRequest } from '../../util/shouldFilterRequest';
 
 /** Add a performance entry breadcrumb */
 export function addNetworkBreadcrumb(
diff --git a/packages/replay/src/coreHandlers/util/fetchUtils.ts b/packages/replay/src/coreHandlers/util/fetchUtils.ts
new file mode 100644
index 000000000000..1cdcf92f34af
--- /dev/null
+++ b/packages/replay/src/coreHandlers/util/fetchUtils.ts
@@ -0,0 +1,168 @@
+import type { Breadcrumb, FetchBreadcrumbData, TextEncoderInternal } from '@sentry/types';
+import { logger } from '@sentry/utils';
+
+import type {
+  FetchHint,
+  NetworkBody,
+  ReplayContainer,
+  ReplayNetworkRequestData,
+  ReplayNetworkRequestOrResponse,
+} from '../../types';
+import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
+import {
+  buildNetworkRequestOrResponse,
+  getBodySize,
+  getBodyString,
+  getNetworkBody,
+  makeNetworkReplayBreadcrumb,
+  parseContentLengthHeader,
+} from './networkUtils';
+
+/**
+ * Capture a fetch breadcrumb to a replay.
+ * This adds additional data (where approriate).
+ */
+export async function captureFetchBreadcrumbToReplay(
+  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
+  hint: FetchHint,
+  options: { captureBodies: boolean; textEncoder: TextEncoderInternal; replay: ReplayContainer },
+): Promise<void> {
+  try {
+    const data = await _prepareFetchData(breadcrumb, hint, options);
+
+    // Create a replay performance entry from this breadcrumb
+    const result = makeNetworkReplayBreadcrumb('resource.fetch', data);
+    addNetworkBreadcrumb(options.replay, result);
+  } catch (error) {
+    __DEBUG_BUILD__ && logger.error('[Replay] Failed to capture fetch breadcrumb', error);
+  }
+}
+
+/**
+ * Enrich a breadcrumb with additional data.
+ * This has to be sync & mutate the given breadcrumb,
+ * as the breadcrumb is afterwards consumed by other handlers.
+ */
+export function enrichFetchBreadcrumb(
+  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
+  hint: FetchHint,
+  options: { textEncoder: TextEncoderInternal },
+): void {
+  const { input, response } = hint;
+
+  const body = _getFetchRequestArgBody(input);
+  const reqSize = getBodySize(body, options.textEncoder);
+  const resSize = response ? parseContentLengthHeader(response.headers.get('content-length')) : undefined;
+
+  if (reqSize !== undefined) {
+    breadcrumb.data.request_body_size = reqSize;
+  }
+  if (resSize !== undefined) {
+    breadcrumb.data.response_body_size = resSize;
+  }
+}
+
+async function _prepareFetchData(
+  breadcrumb: Breadcrumb & { data: FetchBreadcrumbData },
+  hint: FetchHint,
+  options: { captureBodies: boolean; textEncoder: TextEncoderInternal },
+): Promise<ReplayNetworkRequestData> {
+  const { startTimestamp, endTimestamp } = hint;
+
+  const {
+    url,
+    method,
+    status_code: statusCode,
+    request_body_size: requestBodySize,
+    response_body_size: responseBodySize,
+  } = breadcrumb.data;
+
+  const request = _getRequestInfo(options, hint.input, requestBodySize);
+  const response = await _getResponseInfo(options, hint.response, responseBodySize);
+
+  return {
+    startTimestamp,
+    endTimestamp,
+    url,
+    method,
+    statusCode: statusCode || 0,
+    request,
+    response,
+  };
+}
+
+function _getRequestInfo(
+  { captureBodies }: { captureBodies: boolean },
+  input: FetchHint['input'],
+  requestBodySize?: number,
+): ReplayNetworkRequestOrResponse | undefined {
+  if (!captureBodies) {
+    return buildNetworkRequestOrResponse(requestBodySize, undefined);
+  }
+
+  // We only want to transmit string or string-like bodies
+  const requestBody = _getFetchRequestArgBody(input);
+  const body = getNetworkBody(getBodyString(requestBody));
+  return buildNetworkRequestOrResponse(requestBodySize, body);
+}
+
+async function _getResponseInfo(
+  { captureBodies, textEncoder }: { captureBodies: boolean; textEncoder: TextEncoderInternal },
+  response: Response,
+  responseBodySize?: number,
+): Promise<ReplayNetworkRequestOrResponse | undefined> {
+  if (!captureBodies && responseBodySize !== undefined) {
+    return buildNetworkRequestOrResponse(responseBodySize, undefined);
+  }
+
+  // Only clone the response if we need to
+  try {
+    // We have to clone this, as the body can only be read once
+    const res = response.clone();
+    const { body, bodyText } = await _parseFetchBody(res);
+
+    const size =
+      bodyText && bodyText.length && responseBodySize === undefined
+        ? getBodySize(bodyText, textEncoder)
+        : responseBodySize;
+
+    if (captureBodies) {
+      return buildNetworkRequestOrResponse(size, body);
+    }
+
+    return buildNetworkRequestOrResponse(size, undefined);
+  } catch {
+    // fallback
+    return buildNetworkRequestOrResponse(responseBodySize, undefined);
+  }
+}
+
+async function _parseFetchBody(
+  response: Response,
+): Promise<{ body?: NetworkBody | undefined; bodyText?: string | undefined }> {
+  let bodyText: string;
+
+  try {
+    bodyText = await response.text();
+  } catch {
+    return {};
+  }
+
+  try {
+    const body = JSON.parse(bodyText);
+    return { body, bodyText };
+  } catch {
+    // just send bodyText
+  }
+
+  return { bodyText, body: bodyText };
+}
+
+function _getFetchRequestArgBody(fetchArgs: unknown[] = []): RequestInit['body'] | undefined {
+  // We only support getting the body from the fetch options
+  if (fetchArgs.length !== 2 || typeof fetchArgs[1] !== 'object') {
+    return undefined;
+  }
+
+  return (fetchArgs[1] as RequestInit).body;
+}
diff --git a/packages/replay/src/coreHandlers/util/networkUtils.ts b/packages/replay/src/coreHandlers/util/networkUtils.ts
new file mode 100644
index 000000000000..4c5271ddf30d
--- /dev/null
+++ b/packages/replay/src/coreHandlers/util/networkUtils.ts
@@ -0,0 +1,156 @@
+import type { TextEncoderInternal } from '@sentry/types';
+import { dropUndefinedKeys } from '@sentry/utils';
+
+import { NETWORK_BODY_MAX_SIZE } from '../../constants';
+import type {
+  NetworkBody,
+  NetworkRequestData,
+  ReplayNetworkRequestData,
+  ReplayNetworkRequestOrResponse,
+  ReplayPerformanceEntry,
+} from '../../types';
+
+/** Get the size of a body. */
+export function getBodySize(
+  body: RequestInit['body'],
+  textEncoder: TextEncoder | TextEncoderInternal,
+): number | undefined {
+  if (!body) {
+    return undefined;
+  }
+
+  try {
+    if (typeof body === 'string') {
+      return textEncoder.encode(body).length;
+    }
+
+    if (body instanceof URLSearchParams) {
+      return textEncoder.encode(body.toString()).length;
+    }
+
+    if (body instanceof FormData) {
+      const formDataStr = _serializeFormData(body);
+      return textEncoder.encode(formDataStr).length;
+    }
+
+    if (body instanceof Blob) {
+      return body.size;
+    }
+
+    if (body instanceof ArrayBuffer) {
+      return body.byteLength;
+    }
+
+    // Currently unhandled types: ArrayBufferView, ReadableStream
+  } catch {
+    // just return undefined
+  }
+
+  return undefined;
+}
+
+/** Convert a Content-Length header to number/undefined.  */
+export function parseContentLengthHeader(header: string | null | undefined): number | undefined {
+  if (!header) {
+    return undefined;
+  }
+
+  const size = parseInt(header, 10);
+  return isNaN(size) ? undefined : size;
+}
+
+/** Get the string representation of a body. */
+export function getBodyString(body: unknown): string | undefined {
+  if (typeof body === 'string') {
+    return body;
+  }
+
+  if (body instanceof URLSearchParams) {
+    return body.toString();
+  }
+
+  if (body instanceof FormData) {
+    return _serializeFormData(body);
+  }
+
+  return undefined;
+}
+
+/** Convert ReplayNetworkRequestData to a PerformanceEntry. */
+export function makeNetworkReplayBreadcrumb(
+  type: string,
+  data: ReplayNetworkRequestData | null,
+): ReplayPerformanceEntry<NetworkRequestData> | null {
+  if (!data) {
+    return null;
+  }
+
+  const { startTimestamp, endTimestamp, url, method, statusCode, request, response } = data;
+
+  const result: ReplayPerformanceEntry<NetworkRequestData> = {
+    type,
+    start: startTimestamp / 1000,
+    end: endTimestamp / 1000,
+    name: url,
+    data: dropUndefinedKeys({
+      method,
+      statusCode,
+      request,
+      response,
+    }),
+  };
+
+  return result;
+}
+
+/** Get either a JSON network body, or a text representation. */
+export function getNetworkBody(bodyText: string | undefined): NetworkBody | undefined {
+  if (!bodyText) {
+    return;
+  }
+
+  try {
+    return JSON.parse(bodyText);
+  } catch {
+    // return text
+  }
+
+  return bodyText;
+}
+
+/** Build the request or response part of a replay network breadcrumb. */
+export function buildNetworkRequestOrResponse(
+  bodySize: number | undefined,
+  body: NetworkBody | undefined,
+): ReplayNetworkRequestOrResponse | undefined {
+  if (!bodySize) {
+    return undefined;
+  }
+
+  if (!body) {
+    return {
+      size: bodySize,
+    };
+  }
+
+  const info: ReplayNetworkRequestOrResponse = {
+    size: bodySize,
+  };
+
+  if (bodySize < NETWORK_BODY_MAX_SIZE) {
+    info.body = body;
+  } else {
+    info._meta = {
+      errors: ['MAX_BODY_SIZE_EXCEEDED'],
+    };
+  }
+
+  return info;
+}
+
+function _serializeFormData(formData: FormData): string {
+  // This is a bit simplified, but gives us a decent estimate
+  // This converts e.g. { name: 'Anne Smith', age: 13 } to 'name=Anne+Smith&age=13'
+  // @ts-ignore passing FormData to URLSearchParams actually works
+  return new URLSearchParams(formData).toString();
+}
diff --git a/packages/replay/src/coreHandlers/util/xhrUtils.ts b/packages/replay/src/coreHandlers/util/xhrUtils.ts
new file mode 100644
index 000000000000..efd881d85ece
--- /dev/null
+++ b/packages/replay/src/coreHandlers/util/xhrUtils.ts
@@ -0,0 +1,97 @@
+import type { Breadcrumb, TextEncoderInternal, XhrBreadcrumbData } from '@sentry/types';
+import { logger } from '@sentry/utils';
+
+import type { ReplayContainer, ReplayNetworkRequestData, XhrHint } from '../../types';
+import { addNetworkBreadcrumb } from './addNetworkBreadcrumb';
+import {
+  buildNetworkRequestOrResponse,
+  getBodySize,
+  getBodyString,
+  getNetworkBody,
+  makeNetworkReplayBreadcrumb,
+  parseContentLengthHeader,
+} from './networkUtils';
+
+/**
+ * Capture an XHR breadcrumb to a replay.
+ * This adds additional data (where approriate).
+ */
+export async function captureXhrBreadcrumbToReplay(
+  breadcrumb: Breadcrumb & { data: XhrBreadcrumbData },
+  hint: XhrHint,
+  options: { replay: ReplayContainer; captureBodies: boolean },
+): Promise<void> {
+  try {
+    const data = _prepareXhrData(breadcrumb, hint, options);
+
+    // Create a replay performance entry from this breadcrumb
+    const result = makeNetworkReplayBreadcrumb('resource.xhr', data);
+    addNetworkBreadcrumb(options.replay, result);
+  } catch (error) {
+    __DEBUG_BUILD__ && logger.error('[Replay] Failed to capture fetch breadcrumb', error);
+  }
+}
+
+/**
+ * Enrich a breadcrumb with additional data.
+ * This has to be sync & mutate the given breadcrumb,
+ * as the breadcrumb is afterwards consumed by other handlers.
+ */
+export function enrichXhrBreadcrumb(
+  breadcrumb: Breadcrumb & { data: XhrBreadcrumbData },
+  hint: XhrHint,
+  options: { textEncoder: TextEncoderInternal },
+): void {
+  const { xhr, input } = hint;
+
+  const reqSize = getBodySize(input, options.textEncoder);
+  const resSize = xhr.getResponseHeader('content-length')
+    ? parseContentLengthHeader(xhr.getResponseHeader('content-length'))
+    : getBodySize(xhr.response, options.textEncoder);
+
+  if (reqSize !== undefined) {
+    breadcrumb.data.request_body_size = reqSize;
+  }
+  if (resSize !== undefined) {
+    breadcrumb.data.response_body_size = resSize;
+  }
+}
+
+function _prepareXhrData(
+  breadcrumb: Breadcrumb & { data: XhrBreadcrumbData },
+  hint: XhrHint,
+  options: { captureBodies: boolean },
+): ReplayNetworkRequestData | null {
+  const { startTimestamp, endTimestamp, input } = hint;
+
+  const {
+    url,
+    method,
+    status_code: statusCode,
+    request_body_size: requestBodySize,
+    response_body_size: responseBodySize,
+  } = breadcrumb.data;
+
+  if (!url) {
+    return null;
+  }
+
+  const request = buildNetworkRequestOrResponse(
+    requestBodySize,
+    options.captureBodies ? getNetworkBody(getBodyString(input)) : undefined,
+  );
+  const response = buildNetworkRequestOrResponse(
+    responseBodySize,
+    options.captureBodies ? getNetworkBody(hint.xhr.responseText) : undefined,
+  );
+
+  return {
+    startTimestamp,
+    endTimestamp,
+    url,
+    method,
+    statusCode: statusCode || 0,
+    request,
+    response,
+  };
+}
diff --git a/packages/replay/src/types.ts b/packages/replay/src/types.ts
index 3ea18f157bf1..f6d4566d2d7c 100644
--- a/packages/replay/src/types.ts
+++ b/packages/replay/src/types.ts
@@ -1,4 +1,11 @@
-import type { ReplayRecordingData, ReplayRecordingMode } from '@sentry/types';
+import type {
+  FetchBreadcrumbHint,
+  HandlerDataFetch,
+  ReplayRecordingData,
+  ReplayRecordingMode,
+  SentryWrappedXMLHttpRequest,
+  XhrBreadcrumbHint,
+} from '@sentry/types';
 
 import type { eventWithTime, recordOptions } from './types/rrweb';
 
@@ -236,6 +243,7 @@ export interface ReplayPluginOptions extends SessionOptions {
     traceInternals: boolean;
     mutationLimit: number;
     mutationBreadcrumbLimit: number;
+    captureNetworkBodies: boolean;
   }>;
 }
 
@@ -469,3 +477,38 @@ export interface ReplayPerformanceEntry<T> {
    */
   data: T;
 }
+
+type RequestBody = null | Blob | BufferSource | FormData | URLSearchParams | string;
+
+export type XhrHint = XhrBreadcrumbHint & {
+  xhr: XMLHttpRequest & SentryWrappedXMLHttpRequest;
+  input?: RequestBody;
+};
+export type FetchHint = FetchBreadcrumbHint & {
+  input: HandlerDataFetch['args'];
+  response: Response;
+};
+
+export type NetworkBody = Record<string, unknown> | string;
+
+type NetworkMetaError = 'MAX_BODY_SIZE_EXCEEDED';
+
+interface NetworkMeta {
+  errors?: NetworkMetaError[];
+}
+
+export interface ReplayNetworkRequestOrResponse {
+  size?: number;
+  body?: NetworkBody;
+  _meta?: NetworkMeta;
+}
+
+export type ReplayNetworkRequestData = {
+  startTimestamp: number;
+  endTimestamp: number;
+  url: string;
+  method?: string;
+  statusCode: number;
+  request?: ReplayNetworkRequestOrResponse;
+  response?: ReplayNetworkRequestOrResponse;
+};
diff --git a/packages/replay/test/unit/coreHandlers/handleFetch.test.ts b/packages/replay/test/unit/coreHandlers/handleFetch.test.ts
index 55acbda699ad..3938b351d796 100644
--- a/packages/replay/test/unit/coreHandlers/handleFetch.test.ts
+++ b/packages/replay/test/unit/coreHandlers/handleFetch.test.ts
@@ -45,7 +45,8 @@ describe('Unit | coreHandlers | handleFetch', () => {
     expect(handleFetch(data)).toEqual(null);
   });
 
-  it('passes request/response size through if available', function () {
+  // This cannot happen as of now, this test just shows the expected behavior
+  it('ignores request/response sizes', function () {
     const data = {
       ...DEFAULT_DATA,
       fetchData: {
@@ -58,8 +59,6 @@ describe('Unit | coreHandlers | handleFetch', () => {
     expect(handleFetch(data)?.data).toEqual({
       method: 'GET',
       statusCode: 200,
-      requestBodySize: 123,
-      responseBodySize: 456,
     });
   });
 });
diff --git a/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts b/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
index 1a1c5ac13d6b..6a5f344cbdc0 100644
--- a/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
+++ b/packages/replay/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
@@ -8,80 +8,29 @@ import type {
 import { TextEncoder } from 'util';
 
 import { BASE_TIMESTAMP } from '../..';
-import {
-  beforeAddNetworkBreadcrumb,
-  getBodySize,
-  parseContentSizeHeader,
-} from '../../../src/coreHandlers/handleNetworkBreadcrumbs';
+import { NETWORK_BODY_MAX_SIZE } from '../../../src/constants';
+import { beforeAddNetworkBreadcrumb } from '../../../src/coreHandlers/handleNetworkBreadcrumbs';
 import type { EventBufferArray } from '../../../src/eventBuffer/EventBufferArray';
 import type { ReplayContainer } from '../../../src/types';
 import { setupReplayContainer } from '../../utils/setupReplayContainer';
 
 jest.useFakeTimers();
 
-describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
-  describe('parseContentSizeHeader()', () => {
-    it.each([
-      [undefined, undefined],
-      [null, undefined],
-      ['', undefined],
-      ['12', 12],
-      ['abc', undefined],
-    ])('works with %s header value', (headerValue, size) => {
-      expect(parseContentSizeHeader(headerValue)).toBe(size);
-    });
-  });
-
-  describe('getBodySize()', () => {
-    const textEncoder = new TextEncoder();
-
-    it('works with empty body', () => {
-      expect(getBodySize(undefined, textEncoder)).toBe(undefined);
-      expect(getBodySize(null, textEncoder)).toBe(undefined);
-      expect(getBodySize('', textEncoder)).toBe(undefined);
-    });
-
-    it('works with string body', () => {
-      expect(getBodySize('abcd', textEncoder)).toBe(4);
-      // Emojis are correctly counted as mutliple characters
-      expect(getBodySize('With emoji: 😈', textEncoder)).toBe(16);
-    });
+async function waitForReplayEventBuffer() {
+  // Need one Promise.resolve() per await in the util functions
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+}
 
-    it('works with URLSearchParams', () => {
-      const params = new URLSearchParams();
-      params.append('name', 'Jane');
-      params.append('age', '42');
-      params.append('emoji', '😈');
-
-      expect(getBodySize(params, textEncoder)).toBe(35);
-    });
-
-    it('works with FormData', () => {
-      const formData = new FormData();
-      formData.append('name', 'Jane');
-      formData.append('age', '42');
-      formData.append('emoji', '😈');
-
-      expect(getBodySize(formData, textEncoder)).toBe(35);
-    });
-
-    it('works with Blob', () => {
-      const blob = new Blob(['<html>Hello world: 😈</html>'], { type: 'text/html' });
-
-      expect(getBodySize(blob, textEncoder)).toBe(30);
-    });
-
-    it('works with ArrayBuffer', () => {
-      const arrayBuffer = new ArrayBuffer(8);
-
-      expect(getBodySize(arrayBuffer, textEncoder)).toBe(8);
-    });
-  });
+const LARGE_BODY = 'a'.repeat(NETWORK_BODY_MAX_SIZE + 1);
 
+describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
   describe('beforeAddNetworkBreadcrumb()', () => {
     let options: {
       replay: ReplayContainer;
       textEncoder: TextEncoderInternal;
+      captureBodies: boolean;
     };
 
     beforeEach(() => {
@@ -90,21 +39,25 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
       options = {
         textEncoder: new TextEncoder(),
         replay: setupReplayContainer(),
+        captureBodies: false,
       };
 
       jest.runAllTimers();
     });
 
-    it('ignores breadcrumb without data', () => {
+    it('ignores breadcrumb without data', async () => {
       const breadcrumb: Breadcrumb = {};
       const hint: BreadcrumbHint = {};
       beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
 
       expect(breadcrumb).toEqual({});
+
+      await waitForReplayEventBuffer();
+
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([]);
     });
 
-    it('ignores non-network breadcrumbs', () => {
+    it('ignores non-network breadcrumbs', async () => {
       const breadcrumb: Breadcrumb = {
         category: 'foo',
         data: {},
@@ -116,6 +69,9 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         category: 'foo',
         data: {},
       });
+
+      await waitForReplayEventBuffer();
+
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([]);
     });
 
@@ -151,7 +107,7 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       });
 
-      jest.runAllTimers();
+      await waitForReplayEventBuffer();
 
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
         {
@@ -162,9 +118,13 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
                 statusCode: 200,
+                request: {
+                  size: 10,
+                },
+                response: {
+                  size: 13,
+                },
               },
               description: 'https://example.com',
               endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
@@ -202,7 +162,7 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       });
 
-      jest.runAllTimers();
+      await waitForReplayEventBuffer();
 
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
         {
@@ -259,8 +219,7 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       });
 
-      jest.runAllTimers();
-      await Promise.resolve();
+      await waitForReplayEventBuffer();
 
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
         {
@@ -271,8 +230,12 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             payload: {
               data: {
                 method: 'GET',
-                requestBodySize: 10,
-                responseBodySize: 13,
+                request: {
+                  size: 10,
+                },
+                response: {
+                  size: 13,
+                },
                 statusCode: 200,
               },
               description: 'https://example.com',
@@ -316,8 +279,7 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       });
 
-      jest.runAllTimers();
-      await Promise.resolve();
+      await waitForReplayEventBuffer();
 
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
         {
@@ -372,9 +334,208 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       });
 
-      await Promise.resolve();
-      jest.runAllTimers();
-      await Promise.resolve();
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                statusCode: 200,
+                response: {
+                  size: 13,
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.fetch',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('adds fetch request/response body if configured', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+
+      const mockResponse = {
+        headers: {
+          get: () => '13',
+        },
+        clone: () => mockResponse,
+        text: () => Promise.resolve('test response'),
+      } as unknown as Response;
+
+      const hint: FetchBreadcrumbHint = {
+        input: ['GET', { body: 'test input' }],
+        response: mockResponse,
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          request_body_size: 10,
+          response_body_size: 13,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: 10,
+                  body: 'test input',
+                },
+                response: {
+                  size: 13,
+                  body: 'test response',
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.fetch',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('adds fetch request/response body as JSON if configured', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+
+      const mockResponse = {
+        headers: {
+          get: () => '',
+        },
+        clone: () => mockResponse,
+        text: () => Promise.resolve('{"this":"is","json":true}'),
+      } as unknown as Response;
+
+      const hint: FetchBreadcrumbHint = {
+        input: ['GET', { body: '{"that":"is","json":true}' }],
+        response: mockResponse,
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          request_body_size: 25,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: 25,
+                  body: { that: 'is', json: true },
+                },
+                response: {
+                  size: 25,
+                  body: { this: 'is', json: true },
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.fetch',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('skips fetch request/response body if configured & no body found', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+
+      const mockResponse = {
+        headers: {
+          get: () => '',
+        },
+        clone: () => mockResponse,
+        text: () => Promise.resolve(''),
+      } as unknown as Response;
+
+      const hint: FetchBreadcrumbHint = {
+        input: ['GET', { body: undefined }],
+        response: mockResponse,
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
 
       expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
         {
@@ -384,8 +545,8 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
             tag: 'performanceSpan',
             payload: {
               data: {
+                method: 'GET',
                 statusCode: 200,
-                responseBodySize: 13,
               },
               description: 'https://example.com',
               endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
@@ -396,5 +557,344 @@ describe('Unit | coreHandlers | handleNetworkBreadcrumbs', () => {
         },
       ]);
     });
+
+    it('skips fetch request/response body if configured & too large', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+
+      const mockResponse = {
+        headers: {
+          get: () => '',
+        },
+        clone: () => mockResponse,
+        text: () => Promise.resolve(LARGE_BODY),
+      } as unknown as Response;
+
+      const hint: FetchBreadcrumbHint = {
+        input: ['GET', { body: LARGE_BODY }],
+        response: mockResponse,
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'fetch',
+        data: {
+          method: 'GET',
+          request_body_size: LARGE_BODY.length,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: LARGE_BODY.length,
+                  _meta: {
+                    errors: ['MAX_BODY_SIZE_EXCEEDED'],
+                  },
+                },
+                response: {
+                  size: LARGE_BODY.length,
+                  _meta: {
+                    errors: ['MAX_BODY_SIZE_EXCEEDED'],
+                  },
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.fetch',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('adds xhr request/response body if configured', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+      const xhr = new XMLHttpRequest();
+      Object.defineProperty(xhr, 'response', {
+        value: 'test response',
+      });
+      Object.defineProperty(xhr, 'responseText', {
+        value: 'test response',
+      });
+      const hint: XhrBreadcrumbHint = {
+        xhr,
+        input: 'test input',
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          request_body_size: 10,
+          response_body_size: 13,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: 10,
+                  body: 'test input',
+                },
+                response: {
+                  size: 13,
+                  body: 'test response',
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.xhr',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('adds xhr JSON request/response body if configured', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+      const xhr = new XMLHttpRequest();
+      Object.defineProperty(xhr, 'response', {
+        value: '{"this":"is","json":true}',
+      });
+      Object.defineProperty(xhr, 'responseText', {
+        value: '{"this":"is","json":true}',
+      });
+      const hint: XhrBreadcrumbHint = {
+        xhr,
+        input: '{"that":"is","json":true}',
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          request_body_size: 25,
+          response_body_size: 25,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: 25,
+                  body: { that: 'is', json: true },
+                },
+                response: {
+                  size: 25,
+                  body: { this: 'is', json: true },
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.xhr',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('skips xhr request/response body if configured & no body found', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+      const xhr = new XMLHttpRequest();
+      Object.defineProperty(xhr, 'response', {
+        value: '',
+      });
+      Object.defineProperty(xhr, 'responseText', {
+        value: '',
+      });
+      const hint: XhrBreadcrumbHint = {
+        xhr,
+        input: '',
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.xhr',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
+
+    it('skip xhr request/response body if configured & body too large', async () => {
+      options.captureBodies = true;
+
+      const breadcrumb: Breadcrumb = {
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          url: 'https://example.com',
+          status_code: 200,
+        },
+      };
+      const xhr = new XMLHttpRequest();
+      Object.defineProperty(xhr, 'response', {
+        value: LARGE_BODY,
+      });
+      Object.defineProperty(xhr, 'responseText', {
+        value: LARGE_BODY,
+      });
+      const hint: XhrBreadcrumbHint = {
+        xhr,
+        input: LARGE_BODY,
+        startTimestamp: BASE_TIMESTAMP + 1000,
+        endTimestamp: BASE_TIMESTAMP + 2000,
+      };
+      beforeAddNetworkBreadcrumb(options, breadcrumb, hint);
+
+      expect(breadcrumb).toEqual({
+        category: 'xhr',
+        data: {
+          method: 'GET',
+          request_body_size: LARGE_BODY.length,
+          response_body_size: LARGE_BODY.length,
+          status_code: 200,
+          url: 'https://example.com',
+        },
+      });
+
+      await waitForReplayEventBuffer();
+
+      expect((options.replay.eventBuffer as EventBufferArray).events).toEqual([
+        {
+          type: 5,
+          timestamp: (BASE_TIMESTAMP + 1000) / 1000,
+          data: {
+            tag: 'performanceSpan',
+            payload: {
+              data: {
+                method: 'GET',
+                statusCode: 200,
+                request: {
+                  size: LARGE_BODY.length,
+                  _meta: {
+                    errors: ['MAX_BODY_SIZE_EXCEEDED'],
+                  },
+                },
+                response: {
+                  size: LARGE_BODY.length,
+                  _meta: {
+                    errors: ['MAX_BODY_SIZE_EXCEEDED'],
+                  },
+                },
+              },
+              description: 'https://example.com',
+              endTimestamp: (BASE_TIMESTAMP + 2000) / 1000,
+              op: 'resource.xhr',
+              startTimestamp: (BASE_TIMESTAMP + 1000) / 1000,
+            },
+          },
+        },
+      ]);
+    });
   });
 });
diff --git a/packages/replay/test/unit/coreHandlers/handleXhr.test.ts b/packages/replay/test/unit/coreHandlers/handleXhr.test.ts
index 536b6edc6896..0d19ba10c59d 100644
--- a/packages/replay/test/unit/coreHandlers/handleXhr.test.ts
+++ b/packages/replay/test/unit/coreHandlers/handleXhr.test.ts
@@ -38,7 +38,8 @@ describe('Unit | coreHandlers | handleXhr', () => {
     expect(handleXhr(data)).toEqual(null);
   });
 
-  it('passes request/response size through if available', function () {
+  // This cannot happen as of now, this test just shows the expected behavior
+  it('ignores request/response sizes', function () {
     const data: HandlerDataXhr = {
       ...DEFAULT_DATA,
       xhr: {
@@ -54,8 +55,6 @@ describe('Unit | coreHandlers | handleXhr', () => {
     expect(handleXhr(data)?.data).toEqual({
       method: 'GET',
       statusCode: 200,
-      requestBodySize: 123,
-      responseBodySize: 456,
     });
   });
 });
diff --git a/packages/replay/test/unit/coreHandlers/util/networkUtils.test.ts b/packages/replay/test/unit/coreHandlers/util/networkUtils.test.ts
new file mode 100644
index 000000000000..2d407221b77a
--- /dev/null
+++ b/packages/replay/test/unit/coreHandlers/util/networkUtils.test.ts
@@ -0,0 +1,65 @@
+import { TextEncoder } from 'util';
+
+import { getBodySize, parseContentLengthHeader } from '../../../../src/coreHandlers/util/networkUtils';
+
+jest.useFakeTimers();
+
+describe('Unit | coreHandlers | util | networkUtils', () => {
+  describe('parseContentLengthHeader()', () => {
+    it.each([
+      [undefined, undefined],
+      [null, undefined],
+      ['', undefined],
+      ['12', 12],
+      ['abc', undefined],
+    ])('works with %s header value', (headerValue, size) => {
+      expect(parseContentLengthHeader(headerValue)).toBe(size);
+    });
+  });
+
+  describe('getBodySize()', () => {
+    const textEncoder = new TextEncoder();
+
+    it('works with empty body', () => {
+      expect(getBodySize(undefined, textEncoder)).toBe(undefined);
+      expect(getBodySize(null, textEncoder)).toBe(undefined);
+      expect(getBodySize('', textEncoder)).toBe(undefined);
+    });
+
+    it('works with string body', () => {
+      expect(getBodySize('abcd', textEncoder)).toBe(4);
+      // Emojis are correctly counted as mutliple characters
+      expect(getBodySize('With emoji: 😈', textEncoder)).toBe(16);
+    });
+
+    it('works with URLSearchParams', () => {
+      const params = new URLSearchParams();
+      params.append('name', 'Jane');
+      params.append('age', '42');
+      params.append('emoji', '😈');
+
+      expect(getBodySize(params, textEncoder)).toBe(35);
+    });
+
+    it('works with FormData', () => {
+      const formData = new FormData();
+      formData.append('name', 'Jane');
+      formData.append('age', '42');
+      formData.append('emoji', '😈');
+
+      expect(getBodySize(formData, textEncoder)).toBe(35);
+    });
+
+    it('works with Blob', () => {
+      const blob = new Blob(['<html>Hello world: 😈</html>'], { type: 'text/html' });
+
+      expect(getBodySize(blob, textEncoder)).toBe(30);
+    });
+
+    it('works with ArrayBuffer', () => {
+      const arrayBuffer = new ArrayBuffer(8);
+
+      expect(getBodySize(arrayBuffer, textEncoder)).toBe(8);
+    });
+  });
+});

From 2974ff1f59afe0654cb901edf9d8d16e867c7b67 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 29 Mar 2023 09:22:01 +0200
Subject: [PATCH 24/50] fix(nextjs): Use Next.js internal AsyncStorage (#7630)

---
 packages/nextjs/rollup.npm.config.js          |  8 ++-
 .../src/config/loaders/wrappingLoader.ts      | 47 ++++++++++++++---
 .../templates/requestAsyncStorageShim.ts      | 15 ++++++
 .../serverComponentWrapperTemplate.ts         | 52 +++++++------------
 4 files changed, 83 insertions(+), 39 deletions(-)
 create mode 100644 packages/nextjs/src/config/templates/requestAsyncStorageShim.ts

diff --git a/packages/nextjs/rollup.npm.config.js b/packages/nextjs/rollup.npm.config.js
index 19e349f70f8f..b573988d3759 100644
--- a/packages/nextjs/rollup.npm.config.js
+++ b/packages/nextjs/rollup.npm.config.js
@@ -28,6 +28,7 @@ export default [
         'src/config/templates/apiWrapperTemplate.ts',
         'src/config/templates/middlewareWrapperTemplate.ts',
         'src/config/templates/serverComponentWrapperTemplate.ts',
+        'src/config/templates/requestAsyncStorageShim.ts',
       ],
 
       packageSpecificConfig: {
@@ -43,7 +44,12 @@ export default [
           // make it so Rollup calms down about the fact that we're combining default and named exports
           exports: 'named',
         },
-        external: ['@sentry/nextjs', 'next/headers', '__SENTRY_WRAPPING_TARGET_FILE__'],
+        external: [
+          '@sentry/nextjs',
+          'next/dist/client/components/request-async-storagee',
+          '__SENTRY_WRAPPING_TARGET_FILE__',
+          '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__',
+        ],
       },
     }),
   ),
diff --git a/packages/nextjs/src/config/loaders/wrappingLoader.ts b/packages/nextjs/src/config/loaders/wrappingLoader.ts
index fb3e76be72f0..e76af7126a27 100644
--- a/packages/nextjs/src/config/loaders/wrappingLoader.ts
+++ b/packages/nextjs/src/config/loaders/wrappingLoader.ts
@@ -1,11 +1,21 @@
 import commonjs from '@rollup/plugin-commonjs';
 import { stringMatchesSomePattern } from '@sentry/utils';
+import * as chalk from 'chalk';
 import * as fs from 'fs';
 import * as path from 'path';
 import { rollup } from 'rollup';
 
 import type { LoaderThis } from './types';
 
+// Just a simple placeholder to make referencing module consistent
+const SENTRY_WRAPPER_MODULE_NAME = 'sentry-wrapper-module';
+
+// Needs to end in .cjs in order for the `commonjs` plugin to pick it up
+const WRAPPING_TARGET_MODULE_NAME = '__SENTRY_WRAPPING_TARGET_FILE__.cjs';
+
+// Non-public API. Can be found here: https://github.com/vercel/next.js/blob/46151dd68b417e7850146d00354f89930d10b43b/packages/next/src/client/components/request-async-storage.ts
+const NEXTJS_REQUEST_ASYNC_STORAGE_MODULE_PATH = 'next/dist/client/components/request-async-storagee';
+
 const apiWrapperTemplatePath = path.resolve(__dirname, '..', 'templates', 'apiWrapperTemplate.js');
 const apiWrapperTemplateCode = fs.readFileSync(apiWrapperTemplatePath, { encoding: 'utf8' });
 
@@ -15,6 +25,10 @@ const pageWrapperTemplateCode = fs.readFileSync(pageWrapperTemplatePath, { encod
 const middlewareWrapperTemplatePath = path.resolve(__dirname, '..', 'templates', 'middlewareWrapperTemplate.js');
 const middlewareWrapperTemplateCode = fs.readFileSync(middlewareWrapperTemplatePath, { encoding: 'utf8' });
 
+const requestAsyncStorageShimPath = path.resolve(__dirname, '..', 'templates', 'requestAsyncStorageShim.js');
+const requestAsyncStorageModuleExists = moduleExists(NEXTJS_REQUEST_ASYNC_STORAGE_MODULE_PATH);
+let showedMissingAsyncStorageModuleWarning = false;
+
 const serverComponentWrapperTemplatePath = path.resolve(
   __dirname,
   '..',
@@ -23,12 +37,6 @@ const serverComponentWrapperTemplatePath = path.resolve(
 );
 const serverComponentWrapperTemplateCode = fs.readFileSync(serverComponentWrapperTemplatePath, { encoding: 'utf8' });
 
-// Just a simple placeholder to make referencing module consistent
-const SENTRY_WRAPPER_MODULE_NAME = 'sentry-wrapper-module';
-
-// Needs to end in .cjs in order for the `commonjs` plugin to pick it up
-const WRAPPING_TARGET_MODULE_NAME = '__SENTRY_WRAPPING_TARGET_FILE__.cjs';
-
 type LoaderOptions = {
   pagesDir: string;
   appDir: string;
@@ -37,6 +45,15 @@ type LoaderOptions = {
   wrappingTargetKind: 'page' | 'api-route' | 'middleware' | 'server-component';
 };
 
+function moduleExists(id: string): boolean {
+  try {
+    require.resolve(id);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
 /**
  * Replace the loaded file with a wrapped version the original file. In the wrapped version, the original file is loaded,
  * any data-fetching functions (`getInitialProps`, `getStaticProps`, and `getServerSideProps`) or API routes it contains
@@ -126,6 +143,24 @@ export default function wrappingLoader(
 
     templateCode = serverComponentWrapperTemplateCode;
 
+    if (requestAsyncStorageModuleExists) {
+      templateCode = templateCode.replace(
+        /__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__/g,
+        NEXTJS_REQUEST_ASYNC_STORAGE_MODULE_PATH,
+      );
+    } else {
+      if (!showedMissingAsyncStorageModuleWarning) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `${chalk.yellow('warn')}  - The Sentry SDK could not access the ${chalk.bold.cyan(
+            'RequestAsyncStorage',
+          )} module. Certain features may not work. There is nothing you can do to fix this yourself, but future SDK updates may resolve this.\n`,
+        );
+        showedMissingAsyncStorageModuleWarning = true;
+      }
+      templateCode = templateCode.replace(/__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__/g, requestAsyncStorageShimPath);
+    }
+
     templateCode = templateCode.replace(/__ROUTE__/g, parameterizedPagesRoute.replace(/\\/g, '\\\\'));
 
     const componentTypeMatch = path.posix
diff --git a/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts
new file mode 100644
index 000000000000..bc0e23000815
--- /dev/null
+++ b/packages/nextjs/src/config/templates/requestAsyncStorageShim.ts
@@ -0,0 +1,15 @@
+export interface RequestAsyncStorage {
+  getStore: () =>
+    | {
+        headers: {
+          get: Headers['get'];
+        };
+      }
+    | undefined;
+}
+
+export const requestAsyncStorage: RequestAsyncStorage = {
+  getStore: () => {
+    return undefined;
+  },
+};
diff --git a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
index 7a8e755a147a..3f5ef8349c30 100644
--- a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
@@ -1,28 +1,21 @@
-/*
- * This file is a template for the code which will be substituted when our webpack loader handles non-API files in the
- * `pages/` directory.
- *
- * We use `__SENTRY_WRAPPING_TARGET_FILE__` as a placeholder for the path to the file being wrapped. Because it's not a real package,
- * this causes both TS and ESLint to complain, hence the pragma comments below.
- */
-
-// @ts-ignore See above
+// @ts-ignore Because we cannot be sure if the RequestAsyncStorage module exists (it is not part of the Next.js public
+// API) we use a shim if it doesn't exist. The logic for this is in the wrapping loader.
 // eslint-disable-next-line import/no-unresolved
-import * as wrapee from '__SENTRY_WRAPPING_TARGET_FILE__';
+import { requestAsyncStorage } from '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__';
+// @ts-ignore We use `__SENTRY_WRAPPING_TARGET_FILE__` as a placeholder for the path to the file being wrapped.
+// eslint-disable-next-line import/no-unresolved
+import * as serverComponentModule from '__SENTRY_WRAPPING_TARGET_FILE__';
 // eslint-disable-next-line import/no-extraneous-dependencies
 import * as Sentry from '@sentry/nextjs';
-// @ts-ignore This template is only used with the app directory so we know that this dependency exists.
-// eslint-disable-next-line import/no-unresolved
-import { headers } from 'next/headers';
 
-declare function headers(): { get: (header: string) => string | undefined };
+import type { RequestAsyncStorage } from './requestAsyncStorageShim';
 
-type ServerComponentModule = {
+declare const requestAsyncStorage: RequestAsyncStorage;
+
+declare const serverComponentModule: {
   default: unknown;
 };
 
-const serverComponentModule = wrapee as ServerComponentModule;
-
 const serverComponent = serverComponentModule.default;
 
 let wrappedServerComponent;
@@ -32,21 +25,16 @@ if (typeof serverComponent === 'function') {
   // is technically a userfile so it gets the loader magic applied.
   wrappedServerComponent = new Proxy(serverComponent, {
     apply: (originalFunction, thisArg, args) => {
-      let sentryTraceHeader: string | undefined = undefined;
-      let baggageHeader: string | undefined = undefined;
-
-      // If we call the headers function inside the build phase, Next.js will automatically mark the server component as
-      // dynamic(SSR) which we do not want in case the users have a static component.
-      if (process.env.NEXT_PHASE !== 'phase-production-build') {
-        // try/catch because calling headers() when a previously statically generated page is being revalidated causes a
-        // runtime error in next.js as switching a page from static to dynamic during runtime is not allowed
-        try {
-          const headersList = headers();
-          sentryTraceHeader = headersList.get('sentry-trace');
-          baggageHeader = headersList.get('baggage');
-        } catch {
-          /** empty */
-        }
+      let sentryTraceHeader: string | undefined | null = undefined;
+      let baggageHeader: string | undefined | null = undefined;
+
+      // We try-catch here just in case the API around `requestAsyncStorage` changes unexpectedly since it is not public API
+      try {
+        const requestAsyncStore = requestAsyncStorage.getStore();
+        sentryTraceHeader = requestAsyncStore?.headers.get('sentry-trace');
+        baggageHeader = requestAsyncStore?.headers.get('baggage');
+      } catch (e) {
+        /** empty */
       }
 
       return Sentry.wrapServerComponentWithSentry(originalFunction, {

From f033ede657a5d556611870ce7ada5942b393641d Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 10:22:04 +0200
Subject: [PATCH 25/50] chore(utils): Add license to vendor attribution (#7635)

---
 .../buildPolyfills/_asyncNullishCoalesce.ts   | 24 +++++++++-
 .../src/buildPolyfills/_asyncOptionalChain.ts | 24 ++++++++++
 .../_asyncOptionalChainDelete.ts              | 24 ++++++++++
 .../buildPolyfills/_createNamedExportFrom.ts  | 24 ++++++++++
 .../src/buildPolyfills/_createStarExport.ts   | 24 ++++++++++
 .../src/buildPolyfills/_interopDefault.ts     | 19 ++++++++
 .../src/buildPolyfills/_interopNamespace.ts   | 19 ++++++++
 .../_interopNamespaceDefaultOnly.ts           | 19 ++++++++
 .../buildPolyfills/_interopRequireDefault.ts  | 24 ++++++++++
 .../buildPolyfills/_interopRequireWildcard.ts | 24 ++++++++++
 .../src/buildPolyfills/_nullishCoalesce.ts    | 24 ++++++++++
 .../src/buildPolyfills/_optionalChain.ts      | 24 ++++++++++
 .../buildPolyfills/_optionalChainDelete.ts    | 24 ++++++++++
 packages/utils/src/path.ts                    | 23 ++++++++-
 packages/utils/src/string.ts                  | 19 +-------
 packages/utils/src/supports.ts                | 22 +--------
 .../utils/src/vendor/escapeStringForRegex.ts  | 34 ++++++++++++++
 packages/utils/src/vendor/supportsHistory.ts  | 47 +++++++++++++++++++
 18 files changed, 403 insertions(+), 39 deletions(-)
 create mode 100644 packages/utils/src/vendor/escapeStringForRegex.ts
 create mode 100644 packages/utils/src/vendor/supportsHistory.ts

diff --git a/packages/utils/src/buildPolyfills/_asyncNullishCoalesce.ts b/packages/utils/src/buildPolyfills/_asyncNullishCoalesce.ts
index 6030dae0d939..032b31011f96 100644
--- a/packages/utils/src/buildPolyfills/_asyncNullishCoalesce.ts
+++ b/packages/utils/src/buildPolyfills/_asyncNullishCoalesce.ts
@@ -1,4 +1,26 @@
-// adapted from Sucrase (https://github.com/alangpierce/sucrase)
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 import { _nullishCoalesce } from './_nullishCoalesce';
 
diff --git a/packages/utils/src/buildPolyfills/_asyncOptionalChain.ts b/packages/utils/src/buildPolyfills/_asyncOptionalChain.ts
index 1d939833b9bd..37489b5c9232 100644
--- a/packages/utils/src/buildPolyfills/_asyncOptionalChain.ts
+++ b/packages/utils/src/buildPolyfills/_asyncOptionalChain.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { GenericFunction } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_asyncOptionalChainDelete.ts b/packages/utils/src/buildPolyfills/_asyncOptionalChainDelete.ts
index ea84435db75e..9cef4fd791f0 100644
--- a/packages/utils/src/buildPolyfills/_asyncOptionalChainDelete.ts
+++ b/packages/utils/src/buildPolyfills/_asyncOptionalChainDelete.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import { _asyncOptionalChain } from './_asyncOptionalChain';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_createNamedExportFrom.ts b/packages/utils/src/buildPolyfills/_createNamedExportFrom.ts
index 678e7024b7a1..2193609e64f7 100644
--- a/packages/utils/src/buildPolyfills/_createNamedExportFrom.ts
+++ b/packages/utils/src/buildPolyfills/_createNamedExportFrom.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { GenericObject } from './types';
 
 declare const exports: GenericObject;
diff --git a/packages/utils/src/buildPolyfills/_createStarExport.ts b/packages/utils/src/buildPolyfills/_createStarExport.ts
index 38d4ae340a85..377d51e10a84 100644
--- a/packages/utils/src/buildPolyfills/_createStarExport.ts
+++ b/packages/utils/src/buildPolyfills/_createStarExport.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { GenericObject } from './types';
 
 declare const exports: GenericObject;
diff --git a/packages/utils/src/buildPolyfills/_interopDefault.ts b/packages/utils/src/buildPolyfills/_interopDefault.ts
index 2b56c164b698..3a8c29d1bbaf 100644
--- a/packages/utils/src/buildPolyfills/_interopDefault.ts
+++ b/packages/utils/src/buildPolyfills/_interopDefault.ts
@@ -1,3 +1,22 @@
+// https://github.com/rollup/rollup/tree/c2cda424e69686671ba010d628c0f70c43a563f8
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software,
+// and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 import type { RequireResult } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_interopNamespace.ts b/packages/utils/src/buildPolyfills/_interopNamespace.ts
index 1401d986e9a1..ed596090ff73 100644
--- a/packages/utils/src/buildPolyfills/_interopNamespace.ts
+++ b/packages/utils/src/buildPolyfills/_interopNamespace.ts
@@ -1,3 +1,22 @@
+// https://github.com/rollup/rollup/tree/c2cda424e69686671ba010d628c0f70c43a563f8
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software,
+// and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 import type { RequireResult } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_interopNamespaceDefaultOnly.ts b/packages/utils/src/buildPolyfills/_interopNamespaceDefaultOnly.ts
index 98d96e329119..a3b1de3ab3b5 100644
--- a/packages/utils/src/buildPolyfills/_interopNamespaceDefaultOnly.ts
+++ b/packages/utils/src/buildPolyfills/_interopNamespaceDefaultOnly.ts
@@ -1,3 +1,22 @@
+// https://github.com/rollup/rollup/tree/c2cda424e69686671ba010d628c0f70c43a563f8
+// The MIT License (MIT)
+//
+// Copyright (c) 2017 [these people](https://github.com/rollup/rollup/graphs/contributors)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software,
+// and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions
+// of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+// LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
+// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 import type { RequireResult } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_interopRequireDefault.ts b/packages/utils/src/buildPolyfills/_interopRequireDefault.ts
index 480d3561fc4e..74122265c07e 100644
--- a/packages/utils/src/buildPolyfills/_interopRequireDefault.ts
+++ b/packages/utils/src/buildPolyfills/_interopRequireDefault.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { RequireResult } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_interopRequireWildcard.ts b/packages/utils/src/buildPolyfills/_interopRequireWildcard.ts
index b545d90c5652..5be829e3e48a 100644
--- a/packages/utils/src/buildPolyfills/_interopRequireWildcard.ts
+++ b/packages/utils/src/buildPolyfills/_interopRequireWildcard.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { RequireResult } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_nullishCoalesce.ts b/packages/utils/src/buildPolyfills/_nullishCoalesce.ts
index 70ba98a2bd8f..a11cd469bf11 100644
--- a/packages/utils/src/buildPolyfills/_nullishCoalesce.ts
+++ b/packages/utils/src/buildPolyfills/_nullishCoalesce.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 /**
  * Polyfill for the nullish coalescing operator (`??`).
  *
diff --git a/packages/utils/src/buildPolyfills/_optionalChain.ts b/packages/utils/src/buildPolyfills/_optionalChain.ts
index 3bb00a465c53..a7ea8338d744 100644
--- a/packages/utils/src/buildPolyfills/_optionalChain.ts
+++ b/packages/utils/src/buildPolyfills/_optionalChain.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import type { GenericFunction } from './types';
 
 /**
diff --git a/packages/utils/src/buildPolyfills/_optionalChainDelete.ts b/packages/utils/src/buildPolyfills/_optionalChainDelete.ts
index 61147bedc5b5..04bffc8ab385 100644
--- a/packages/utils/src/buildPolyfills/_optionalChainDelete.ts
+++ b/packages/utils/src/buildPolyfills/_optionalChainDelete.ts
@@ -1,3 +1,27 @@
+// https://github.com/alangpierce/sucrase/tree/265887868966917f3b924ce38dfad01fbab1329f
+//
+// The MIT License (MIT)
+//
+// Copyright (c) 2012-2018 various contributors (see AUTHORS)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
 import { _optionalChain } from './_optionalChain';
 
 /**
diff --git a/packages/utils/src/path.ts b/packages/utils/src/path.ts
index 46f68b1b16a5..16534a7ef358 100644
--- a/packages/utils/src/path.ts
+++ b/packages/utils/src/path.ts
@@ -1,5 +1,26 @@
 // Slightly modified (no IE8 support, ES6) and transcribed to TypeScript
-// https://raw.githubusercontent.com/calvinmetcalf/rollup-plugin-node-builtins/master/src/es6/path.js
+// https://github.com/calvinmetcalf/rollup-plugin-node-builtins/blob/63ab8aacd013767445ca299e468d9a60a95328d7/src/es6/path.js
+//
+// Copyright Joyent, Inc.and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /** JSDoc */
 function normalizeArray(parts: string[], allowAboveRoot?: boolean): string[] {
diff --git a/packages/utils/src/string.ts b/packages/utils/src/string.ts
index 7557d1d2af77..73efe8ef625e 100644
--- a/packages/utils/src/string.ts
+++ b/packages/utils/src/string.ts
@@ -1,5 +1,7 @@
 import { isRegExp, isString } from './is';
 
+export { escapeStringForRegex } from './vendor/escapeStringForRegex';
+
 /**
  * Truncates given string to the maximum characters count
  *
@@ -127,20 +129,3 @@ export function stringMatchesSomePattern(
 ): boolean {
   return patterns.some(pattern => isMatchingPattern(testString, pattern, requireExactStringMatch));
 }
-
-/**
- * Given a string, escape characters which have meaning in the regex grammar, such that the result is safe to feed to
- * `new RegExp()`.
- *
- * Based on https://github.com/sindresorhus/escape-string-regexp. Vendored to a) reduce the size by skipping the runtime
- * type-checking, and b) ensure it gets down-compiled for old versions of Node (the published package only supports Node
- * 12+).
- *
- * @param regexString The string to escape
- * @returns An version of the string with all special regex characters escaped
- */
-export function escapeStringForRegex(regexString: string): string {
-  // escape the hyphen separately so we can also replace it with a unicode literal hyphen, to avoid the problems
-  // discussed in https://github.com/sindresorhus/escape-string-regexp/issues/20.
-  return regexString.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d');
-}
diff --git a/packages/utils/src/supports.ts b/packages/utils/src/supports.ts
index 83669c000401..b491a297349d 100644
--- a/packages/utils/src/supports.ts
+++ b/packages/utils/src/supports.ts
@@ -4,6 +4,8 @@ import { getGlobalObject } from './worldwide';
 // eslint-disable-next-line deprecation/deprecation
 const WINDOW = getGlobalObject<Window>();
 
+export { supportsHistory } from './vendor/supportsHistory';
+
 /**
  * Tells whether current environment supports ErrorEvent objects
  * {@link supportsErrorEvent}.
@@ -156,23 +158,3 @@ export function supportsReferrerPolicy(): boolean {
     return false;
   }
 }
-
-/**
- * Tells whether current environment supports History API
- * {@link supportsHistory}.
- *
- * @returns Answer to the given question.
- */
-export function supportsHistory(): boolean {
-  // NOTE: in Chrome App environment, touching history.pushState, *even inside
-  //       a try/catch block*, will cause Chrome to output an error to console.error
-  // borrowed from: https://github.com/angular/angular.js/pull/13945/files
-  /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const chrome = (WINDOW as any).chrome;
-  const isChromePackagedApp = chrome && chrome.app && chrome.app.runtime;
-  /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-  const hasHistoryApi = 'history' in WINDOW && !!WINDOW.history.pushState && !!WINDOW.history.replaceState;
-
-  return !isChromePackagedApp && hasHistoryApi;
-}
diff --git a/packages/utils/src/vendor/escapeStringForRegex.ts b/packages/utils/src/vendor/escapeStringForRegex.ts
new file mode 100644
index 000000000000..2b55452802ad
--- /dev/null
+++ b/packages/utils/src/vendor/escapeStringForRegex.ts
@@ -0,0 +1,34 @@
+// Based on https://github.com/sindresorhus/escape-string-regexp but with modifications to:
+//   a) reduce the size by skipping the runtime type - checking
+//   b) ensure it gets down - compiled for old versions of Node(the published package only supports Node 12+).
+//
+// MIT License
+//
+// Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+// documentation files(the "Software"), to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense, and / or sell copies of the Software, and
+// to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+// the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+/**
+ * Given a string, escape characters which have meaning in the regex grammar, such that the result is safe to feed to
+ * `new RegExp()`.
+ *
+ * @param regexString The string to escape
+ * @returns An version of the string with all special regex characters escaped
+ */
+export function escapeStringForRegex(regexString: string): string {
+  // escape the hyphen separately so we can also replace it with a unicode literal hyphen, to avoid the problems
+  // discussed in https://github.com/sindresorhus/escape-string-regexp/issues/20.
+  return regexString.replace(/[|\\{}()[\]^$+*?.]/g, '\\$&').replace(/-/g, '\\x2d');
+}
diff --git a/packages/utils/src/vendor/supportsHistory.ts b/packages/utils/src/vendor/supportsHistory.ts
new file mode 100644
index 000000000000..8dc16b43f1cc
--- /dev/null
+++ b/packages/utils/src/vendor/supportsHistory.ts
@@ -0,0 +1,47 @@
+// Based on https://github.com/angular/angular.js/pull/13945/files
+// The MIT License
+
+// Copyright (c) 2010-2016 Google, Inc. http://angularjs.org
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import { getGlobalObject } from '../worldwide';
+
+// eslint-disable-next-line deprecation/deprecation
+const WINDOW = getGlobalObject<Window>();
+
+/**
+ * Tells whether current environment supports History API
+ * {@link supportsHistory}.
+ *
+ * @returns Answer to the given question.
+ */
+export function supportsHistory(): boolean {
+  // NOTE: in Chrome App environment, touching history.pushState, *even inside
+  //       a try/catch block*, will cause Chrome to output an error to console.error
+  // borrowed from: https://github.com/angular/angular.js/pull/13945/files
+  /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const chrome = (WINDOW as any).chrome;
+  const isChromePackagedApp = chrome && chrome.app && chrome.app.runtime;
+  /* eslint-enable @typescript-eslint/no-unsafe-member-access */
+  const hasHistoryApi = 'history' in WINDOW && !!WINDOW.history.pushState && !!WINDOW.history.replaceState;
+
+  return !isChromePackagedApp && hasHistoryApi;
+}

From 32675e81282c4ce57f955b1a01db3e69872efa9f Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 11:29:46 +0200
Subject: [PATCH 26/50] test(node): Add tests for Undici (#7628)

---
 packages/node/package.json                    |   3 +-
 .../node/src/integrations/undici/index.ts     |   7 +-
 .../node/src/integrations/undici/types.ts     |   2 +-
 .../node/test/integrations/undici.test.ts     | 320 ++++++++++++++++++
 packages/node/test/utils.ts                   |  18 +
 yarn.lock                                     |   7 +
 6 files changed, 353 insertions(+), 4 deletions(-)
 create mode 100644 packages/node/test/integrations/undici.test.ts
 create mode 100644 packages/node/test/utils.ts

diff --git a/packages/node/package.json b/packages/node/package.json
index 655cb05fad08..f9dbdc9fa334 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -31,7 +31,8 @@
     "@types/lru-cache": "^5.1.0",
     "@types/node": "~10.17.0",
     "express": "^4.17.1",
-    "nock": "^13.0.5"
+    "nock": "^13.0.5",
+    "undici": "^5.21.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/node/src/integrations/undici/index.ts b/packages/node/src/integrations/undici/index.ts
index 8edc5e326cea..11549b5d75dc 100644
--- a/packages/node/src/integrations/undici/index.ts
+++ b/packages/node/src/integrations/undici/index.ts
@@ -33,6 +33,10 @@ const DEFAULT_UNDICI_OPTIONS: UndiciOptions = {
   breadcrumbs: true,
 };
 
+// Please note that you cannot use `console.log` to debug the callbacks registered to the `diagnostics_channel` API.
+// To debug, you can use `writeFileSync` to write to a file:
+// https://nodejs.org/api/async_hooks.html#printing-in-asynchook-callbacks
+
 /**
  * Instruments outgoing HTTP requests made with the `undici` package via
  * Node's `diagnostics_channel` API.
@@ -89,7 +93,7 @@ export class Undici implements Integration {
       const url = new URL(request.path, request.origin);
       const stringUrl = url.toString();
 
-      if (isSentryRequest(stringUrl)) {
+      if (isSentryRequest(stringUrl) || request.__sentry__ !== undefined) {
         return;
       }
 
@@ -132,7 +136,6 @@ export class Undici implements Integration {
             : true;
 
           if (shouldPropagate) {
-            // TODO: Only do this based on tracePropagationTargets
             request.addHeader('sentry-trace', span.toTraceparent());
             if (span.transaction) {
               const dynamicSamplingContext = span.transaction.getDynamicSamplingContext();
diff --git a/packages/node/src/integrations/undici/types.ts b/packages/node/src/integrations/undici/types.ts
index 9cbafeacfbb4..c2d2db125195 100644
--- a/packages/node/src/integrations/undici/types.ts
+++ b/packages/node/src/integrations/undici/types.ts
@@ -20,7 +20,7 @@ import type { Span } from '@sentry/core';
 
 // Vendored code starts here:
 
-type ChannelListener = (message: unknown, name: string | symbol) => void;
+export type ChannelListener = (message: unknown, name: string | symbol) => void;
 
 /**
  * The `diagnostics_channel` module provides an API to create named channels
diff --git a/packages/node/test/integrations/undici.test.ts b/packages/node/test/integrations/undici.test.ts
new file mode 100644
index 000000000000..d16a18497e0a
--- /dev/null
+++ b/packages/node/test/integrations/undici.test.ts
@@ -0,0 +1,320 @@
+import type { Transaction } from '@sentry/core';
+import { Hub, makeMain } from '@sentry/core';
+import * as http from 'http';
+import type { fetch as FetchType } from 'undici';
+
+import { NodeClient } from '../../src/client';
+import { Undici } from '../../src/integrations/undici';
+import { getDefaultNodeClientOptions } from '../helper/node-client-options';
+import { conditionalTest } from '../utils';
+
+const SENTRY_DSN = 'https://0@0.ingest.sentry.io/0';
+
+let hub: Hub;
+let fetch: typeof FetchType;
+
+beforeAll(async () => {
+  await setupTestServer();
+  try {
+    // need to conditionally require `undici` because it's not available in Node 10
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    fetch = require('undici').fetch;
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('Undici integration tests are skipped because undici is not installed.');
+  }
+});
+
+const DEFAULT_OPTIONS = getDefaultNodeClientOptions({
+  dsn: SENTRY_DSN,
+  tracesSampleRate: 1,
+  integrations: [new Undici()],
+});
+
+beforeEach(() => {
+  const client = new NodeClient(DEFAULT_OPTIONS);
+  hub = new Hub(client);
+  makeMain(hub);
+});
+
+afterEach(() => {
+  requestHeaders = {};
+  setTestServerOptions({ statusCode: 200 });
+});
+
+afterAll(() => {
+  getTestServer()?.close();
+});
+
+conditionalTest({ min: 16 })('Undici integration', () => {
+  it.each([
+    [
+      'simple url',
+      'http://localhost:18099',
+      undefined,
+      {
+        description: 'GET http://localhost:18099/',
+        op: 'http.client',
+      },
+    ],
+    [
+      'url with query',
+      'http://localhost:18099?foo=bar',
+      undefined,
+      {
+        description: 'GET http://localhost:18099/',
+        op: 'http.client',
+        data: {
+          'http.query': '?foo=bar',
+        },
+      },
+    ],
+    [
+      'url with POST method',
+      'http://localhost:18099',
+      { method: 'POST' },
+      {
+        description: 'POST http://localhost:18099/',
+      },
+    ],
+    [
+      'url with POST method',
+      'http://localhost:18099',
+      { method: 'POST' },
+      {
+        description: 'POST http://localhost:18099/',
+      },
+    ],
+    [
+      'url with GET as default',
+      'http://localhost:18099',
+      { method: undefined },
+      {
+        description: 'GET http://localhost:18099/',
+      },
+    ],
+  ])('creates a span with a %s', async (_: string, request, requestInit, expected) => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    await fetch(request, requestInit);
+
+    expect(transaction.spanRecorder?.spans.length).toBe(2);
+
+    const span = transaction.spanRecorder?.spans[1];
+    expect(span).toEqual(expect.objectContaining(expected));
+  });
+
+  it('creates a span with internal errors', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    try {
+      await fetch('http://a-url-that-no-exists.com');
+    } catch (e) {
+      // ignore
+    }
+
+    expect(transaction.spanRecorder?.spans.length).toBe(2);
+
+    const span = transaction.spanRecorder?.spans[1];
+    expect(span).toEqual(expect.objectContaining({ status: 'internal_error' }));
+  });
+
+  it('does not create a span for sentry requests', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    try {
+      await fetch(`${SENTRY_DSN}/sub/route`, {
+        method: 'POST',
+      });
+    } catch (e) {
+      // ignore
+    }
+
+    expect(transaction.spanRecorder?.spans.length).toBe(1);
+  });
+
+  it('does not create a span if there is no active spans', async () => {
+    try {
+      await fetch(`${SENTRY_DSN}/sub/route`, { method: 'POST' });
+    } catch (e) {
+      // ignore
+    }
+
+    expect(hub.getScope().getSpan()).toBeUndefined();
+  });
+
+  it('does create a span if `shouldCreateSpanForRequest` is defined', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    const client = new NodeClient({ ...DEFAULT_OPTIONS, shouldCreateSpanForRequest: url => url.includes('yes') });
+    hub.bindClient(client);
+
+    await fetch('http://localhost:18099/no', { method: 'POST' });
+
+    expect(transaction.spanRecorder?.spans.length).toBe(1);
+
+    await fetch('http://localhost:18099/yes', { method: 'POST' });
+
+    expect(transaction.spanRecorder?.spans.length).toBe(2);
+  });
+
+  it('attaches the sentry trace and baggage headers', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    await fetch('http://localhost:18099', { method: 'POST' });
+
+    expect(transaction.spanRecorder?.spans.length).toBe(2);
+    const span = transaction.spanRecorder?.spans[1];
+
+    expect(requestHeaders['sentry-trace']).toEqual(span?.toTraceparent());
+    expect(requestHeaders['baggage']).toEqual(
+      `sentry-environment=production,sentry-transaction=test-transaction,sentry-public_key=0,sentry-trace_id=${transaction.traceId},sentry-sample_rate=1`,
+    );
+  });
+
+  it('does not attach headers if `shouldCreateSpanForRequest` does not create a span', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    const client = new NodeClient({ ...DEFAULT_OPTIONS, shouldCreateSpanForRequest: url => url.includes('yes') });
+    hub.bindClient(client);
+
+    await fetch('http://localhost:18099/no', { method: 'POST' });
+
+    expect(requestHeaders['sentry-trace']).toBeUndefined();
+    expect(requestHeaders['baggage']).toBeUndefined();
+
+    await fetch('http://localhost:18099/yes', { method: 'POST' });
+
+    expect(requestHeaders['sentry-trace']).toBeDefined();
+    expect(requestHeaders['baggage']).toBeDefined();
+  });
+
+  it('uses tracePropagationTargets', async () => {
+    const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
+    hub.getScope().setSpan(transaction);
+
+    const client = new NodeClient({ ...DEFAULT_OPTIONS, tracePropagationTargets: ['/yes'] });
+    hub.bindClient(client);
+
+    expect(transaction.spanRecorder?.spans.length).toBe(1);
+
+    await fetch('http://localhost:18099/no', { method: 'POST' });
+
+    expect(transaction.spanRecorder?.spans.length).toBe(2);
+
+    expect(requestHeaders['sentry-trace']).toBeUndefined();
+    expect(requestHeaders['baggage']).toBeUndefined();
+
+    await fetch('http://localhost:18099/yes', { method: 'POST' });
+
+    expect(transaction.spanRecorder?.spans.length).toBe(3);
+
+    expect(requestHeaders['sentry-trace']).toBeDefined();
+    expect(requestHeaders['baggage']).toBeDefined();
+  });
+
+  it('adds a breadcrumb on request', async () => {
+    expect.assertions(1);
+
+    const client = new NodeClient({
+      ...DEFAULT_OPTIONS,
+      beforeBreadcrumb: breadcrumb => {
+        expect(breadcrumb).toEqual({
+          category: 'http',
+          data: {
+            method: 'POST',
+            status_code: 200,
+            url: 'http://localhost:18099/',
+          },
+          type: 'http',
+          timestamp: expect.any(Number),
+        });
+        return breadcrumb;
+      },
+    });
+    hub.bindClient(client);
+
+    await fetch('http://localhost:18099', { method: 'POST' });
+  });
+
+  it('adds a breadcrumb on errored request', async () => {
+    expect.assertions(1);
+
+    const client = new NodeClient({
+      ...DEFAULT_OPTIONS,
+      beforeBreadcrumb: breadcrumb => {
+        expect(breadcrumb).toEqual({
+          category: 'http',
+          data: {
+            method: 'GET',
+            url: 'http://a-url-that-no-exists.com/',
+          },
+          level: 'error',
+          type: 'http',
+          timestamp: expect.any(Number),
+        });
+        return breadcrumb;
+      },
+    });
+    hub.bindClient(client);
+
+    try {
+      await fetch('http://a-url-that-no-exists.com');
+    } catch (e) {
+      // ignore
+    }
+  });
+});
+
+interface TestServerOptions {
+  statusCode: number;
+  responseHeaders?: Record<string, string | string[] | undefined>;
+}
+
+let testServer: http.Server | undefined;
+
+let requestHeaders: any = {};
+
+let testServerOptions: TestServerOptions = {
+  statusCode: 200,
+};
+
+function setTestServerOptions(options: TestServerOptions): void {
+  testServerOptions = { ...options };
+}
+
+function getTestServer(): http.Server | undefined {
+  return testServer;
+}
+
+function setupTestServer() {
+  testServer = http.createServer((req, res) => {
+    const chunks: Buffer[] = [];
+
+    req.on('data', data => {
+      chunks.push(data);
+    });
+
+    req.on('end', () => {
+      requestHeaders = req.headers;
+    });
+
+    res.writeHead(testServerOptions.statusCode, testServerOptions.responseHeaders);
+    res.end();
+
+    // also terminate socket because keepalive hangs connection a bit
+    res.connection.end();
+  });
+
+  testServer.listen(18099, 'localhost');
+
+  return new Promise(resolve => {
+    testServer?.on('listening', resolve);
+  });
+}
diff --git a/packages/node/test/utils.ts b/packages/node/test/utils.ts
new file mode 100644
index 000000000000..1394183f928d
--- /dev/null
+++ b/packages/node/test/utils.ts
@@ -0,0 +1,18 @@
+import { parseSemver } from '@sentry/utils';
+
+/**
+ * Returns`describe` or `describe.skip` depending on allowed major versions of Node.
+ *
+ * @param {{ min?: number; max?: number }} allowedVersion
+ * @return {*}  {jest.Describe}
+ */
+export const conditionalTest = (allowedVersion: { min?: number; max?: number }): jest.Describe => {
+  const NODE_VERSION = parseSemver(process.versions.node).major;
+  if (!NODE_VERSION) {
+    return describe.skip as jest.Describe;
+  }
+
+  return NODE_VERSION < (allowedVersion.min || -Infinity) || NODE_VERSION > (allowedVersion.max || Infinity)
+    ? (describe.skip as jest.Describe)
+    : (describe as any);
+};
diff --git a/yarn.lock b/yarn.lock
index 7f4e13e3108b..6726a721b75c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26448,6 +26448,13 @@ undici@5.20.0:
   dependencies:
     busboy "^1.6.0"
 
+undici@^5.21.0:
+  version "5.21.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.21.0.tgz#b00dfc381f202565ab7f52023222ab862bb2494f"
+  integrity sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==
+  dependencies:
+    busboy "^1.6.0"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"

From b068c68103e7edbd4199e0fc258776169a35e957 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 12:15:06 +0200
Subject: [PATCH 27/50] chore(remix): Add license text to vendored files
 (#7629)

---
 packages/remix/src/utils/instrumentServer.ts  | 109 +--------------
 packages/remix/src/utils/types.ts             |   8 ++
 .../src/utils/{ => vendor}/getIpAddress.ts    |  22 +++
 packages/remix/src/utils/vendor/response.ts   | 126 ++++++++++++++++++
 packages/remix/src/utils/web-fetch.ts         |  28 +++-
 .../remix/test/utils/getIpAddress.test.ts     |   2 +-
 6 files changed, 186 insertions(+), 109 deletions(-)
 rename packages/remix/src/utils/{ => vendor}/getIpAddress.ts (66%)
 create mode 100644 packages/remix/src/utils/vendor/response.ts

diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
index 825198426eec..8e916d75ffc4 100644
--- a/packages/remix/src/utils/instrumentServer.ts
+++ b/packages/remix/src/utils/instrumentServer.ts
@@ -24,31 +24,16 @@ import type {
   ReactRouterDomPkg,
   RemixRequest,
   RequestHandler,
-  RouteMatch,
   ServerBuild,
   ServerRoute,
   ServerRouteManifest,
 } from './types';
+import { extractData, getRequestMatch, isResponse, json, matchServerRoutes } from './vendor/response';
 import { normalizeRemixRequest } from './web-fetch';
 
 // Flag to track if the core request handler is instrumented.
 export let isRequestHandlerWrapped = false;
 
-// Taken from Remix Implementation
-// https://github.com/remix-run/remix/blob/32300ec6e6e8025602cea63e17a2201989589eab/packages/remix-server-runtime/responses.ts#L60-L77
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isResponse(value: any): value is Response {
-  return (
-    value != null &&
-    /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-    typeof value.status === 'number' &&
-    typeof value.statusText === 'string' &&
-    typeof value.headers === 'object' &&
-    typeof value.body !== 'undefined'
-    /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-  );
-}
-
 const redirectStatusCodes = new Set([301, 302, 303, 307, 308]);
 function isRedirectResponse(response: Response): boolean {
   return redirectStatusCodes.has(response.status);
@@ -58,21 +43,6 @@ function isCatchResponse(response: Response): boolean {
   return response.headers.get('X-Remix-Catch') != null;
 }
 
-// Based on Remix Implementation
-// https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/data.ts#L131-L145
-async function extractData(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('Content-Type');
-
-  // Cloning the response to avoid consuming the original body stream
-  const responseClone = response.clone();
-
-  if (contentType && /\bapplication\/json\b/.test(contentType)) {
-    return responseClone.json();
-  }
-
-  return responseClone.text();
-}
-
 async function extractResponseError(response: Response): Promise<unknown> {
   const responseData = await extractData(response);
 
@@ -94,9 +64,11 @@ async function captureRemixServerException(err: Error, name: string, request: Re
     return;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let normalizedRequest: Record<string, unknown> = request as unknown as any;
 
   try {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     normalizedRequest = normalizeRemixRequest(request as unknown as any);
   } catch (e) {
     __DEBUG_BUILD__ && logger.warn('Failed to normalize Remix request');
@@ -245,29 +217,6 @@ function getTraceAndBaggage(): { sentryTrace?: string; sentryBaggage?: string }
   return {};
 }
 
-// https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/responses.ts#L1-L4
-export type JsonFunction = <Data>(data: Data, init?: number | ResponseInit) => Response;
-
-/**
- * This is a shortcut for creating `application/json` responses. Converts `data`
- * to JSON and sets the `Content-Type` header.
- *
- * @see https://remix.run/api/remix#json
- *
- * https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/responses.ts#L12-L24
- */
-const json: JsonFunction = (data, init = {}) => {
-  const responseInit = typeof init === 'number' ? { status: init } : init;
-  const headers = new Headers(responseInit.headers);
-  if (!headers.has('Content-Type')) {
-    headers.set('Content-Type', 'application/json; charset=utf-8');
-  }
-  return new Response(JSON.stringify(data), {
-    ...responseInit,
-    headers,
-  });
-};
-
 function makeWrappedRootLoader(origLoader: DataFunction): DataFunction {
   return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
     const res = await origLoader.call(this, args);
@@ -307,31 +256,6 @@ export function createRoutes(manifest: ServerRouteManifest, parentId?: string):
     }));
 }
 
-// Remix Implementation:
-// https://github.com/remix-run/remix/blob/38e127b1d97485900b9c220d93503de0deb1fc81/packages/remix-server-runtime/routeMatching.ts#L12-L24
-//
-// Changed so that `matchRoutes` function is passed in.
-function matchServerRoutes(
-  routes: ServerRoute[],
-  pathname: string,
-  pkg?: ReactRouterDomPkg,
-): RouteMatch<ServerRoute>[] | null {
-  if (!pkg) {
-    return null;
-  }
-
-  const matches = pkg.matchRoutes(routes, pathname);
-  if (!matches) {
-    return null;
-  }
-
-  return matches.map(match => ({
-    params: match.params,
-    pathname: match.pathname,
-    route: match.route,
-  }));
-}
-
 /**
  * Starts a new transaction for the given request to be used by different `RequestHandler` wrappers.
  *
@@ -445,33 +369,6 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
   };
 }
 
-// https://github.com/remix-run/remix/blob/97999d02493e8114c39d48b76944069d58526e8d/packages/remix-server-runtime/server.ts#L573-L586
-function isIndexRequestUrl(url: URL): boolean {
-  for (const param of url.searchParams.getAll('index')) {
-    // only use bare `?index` params without a value
-    // ✅ /foo?index
-    // ✅ /foo?index&index=123
-    // ✅ /foo?index=123&index
-    // ❌ /foo?index=123
-    if (param === '') {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-// https://github.com/remix-run/remix/blob/97999d02493e8114c39d48b76944069d58526e8d/packages/remix-server-runtime/server.ts#L588-L596
-function getRequestMatch(url: URL, matches: RouteMatch<ServerRoute>[]): RouteMatch<ServerRoute> {
-  const match = matches.slice(-1)[0];
-
-  if (!isIndexRequestUrl(url) && match.route.id.endsWith('/index')) {
-    return matches.slice(-2)[0];
-  }
-
-  return match;
-}
-
 /**
  * Instruments `remix` ServerBuild for performance tracing and error tracking.
  */
diff --git a/packages/remix/src/utils/types.ts b/packages/remix/src/utils/types.ts
index 225a3ea1ad56..e57b8ad15e34 100644
--- a/packages/remix/src/utils/types.ts
+++ b/packages/remix/src/utils/types.ts
@@ -1,7 +1,15 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable max-lines */
 /* eslint-disable @typescript-eslint/ban-types */
 // Types vendored from @remix-run/server-runtime@1.6.0:
 // https://github.com/remix-run/remix/blob/f3691d51027b93caa3fd2cdfe146d7b62a6eb8f2/packages/remix-server-runtime/server.ts
+// Copyright 2021 Remix Software Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 import type * as Express from 'express';
 import type { Agent } from 'https';
 import type { ComponentType } from 'react';
diff --git a/packages/remix/src/utils/getIpAddress.ts b/packages/remix/src/utils/vendor/getIpAddress.ts
similarity index 66%
rename from packages/remix/src/utils/getIpAddress.ts
rename to packages/remix/src/utils/vendor/getIpAddress.ts
index a756c424f40e..d63e31779aac 100644
--- a/packages/remix/src/utils/getIpAddress.ts
+++ b/packages/remix/src/utils/vendor/getIpAddress.ts
@@ -1,5 +1,27 @@
 // Vendored / modified from @sergiodxa/remix-utils
+
 // https://github.com/sergiodxa/remix-utils/blob/02af80e12829a53696bfa8f3c2363975cf59f55e/src/server/get-client-ip-address.ts
+// MIT License
+
+// Copyright (c) 2021 Sergio Xalambrí
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 import { isIP } from 'net';
 
diff --git a/packages/remix/src/utils/vendor/response.ts b/packages/remix/src/utils/vendor/response.ts
new file mode 100644
index 000000000000..ab5e02425c8e
--- /dev/null
+++ b/packages/remix/src/utils/vendor/response.ts
@@ -0,0 +1,126 @@
+// Copyright 2021 Remix Software Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import type { ReactRouterDomPkg, RouteMatch, ServerRoute } from '../types';
+
+/**
+ * Based on Remix Implementation
+ *
+ * https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/data.ts#L131-L145
+ */
+export async function extractData(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('Content-Type');
+
+  // Cloning the response to avoid consuming the original body stream
+  const responseClone = response.clone();
+
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return responseClone.json();
+  }
+
+  return responseClone.text();
+}
+
+/**
+ * Taken from Remix Implementation
+ *
+ * https://github.com/remix-run/remix/blob/32300ec6e6e8025602cea63e17a2201989589eab/packages/remix-server-runtime/responses.ts#L60-L77
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isResponse(value: any): value is Response {
+  return (
+    value != null &&
+    /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+    typeof value.status === 'number' &&
+    typeof value.statusText === 'string' &&
+    typeof value.headers === 'object' &&
+    typeof value.body !== 'undefined'
+    /* eslint-enable @typescript-eslint/no-unsafe-member-access */
+  );
+}
+
+// https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/responses.ts#L1-L4
+export type JsonFunction = <Data>(data: Data, init?: number | ResponseInit) => Response;
+
+/**
+ * This is a shortcut for creating `application/json` responses. Converts `data`
+ * to JSON and sets the `Content-Type` header.
+ *
+ * @see https://remix.run/api/remix#json
+ *
+ * https://github.com/remix-run/remix/blob/7688da5c75190a2e29496c78721456d6e12e3abe/packages/remix-server-runtime/responses.ts#L12-L24
+ */
+export const json: JsonFunction = (data, init = {}) => {
+  const responseInit = typeof init === 'number' ? { status: init } : init;
+  const headers = new Headers(responseInit.headers);
+  if (!headers.has('Content-Type')) {
+    headers.set('Content-Type', 'application/json; charset=utf-8');
+  }
+  return new Response(JSON.stringify(data), {
+    ...responseInit,
+    headers,
+  });
+};
+
+/**
+ * Remix Implementation:
+ * https://github.com/remix-run/remix/blob/38e127b1d97485900b9c220d93503de0deb1fc81/packages/remix-server-runtime/routeMatching.ts#L12-L24
+ *
+ * Changed so that `matchRoutes` function is passed in.
+ */
+export function matchServerRoutes(
+  routes: ServerRoute[],
+  pathname: string,
+  pkg?: ReactRouterDomPkg,
+): RouteMatch<ServerRoute>[] | null {
+  if (!pkg) {
+    return null;
+  }
+
+  const matches = pkg.matchRoutes(routes, pathname);
+  if (!matches) {
+    return null;
+  }
+
+  return matches.map(match => ({
+    params: match.params,
+    pathname: match.pathname,
+    route: match.route,
+  }));
+}
+
+/**
+ * https://github.com/remix-run/remix/blob/97999d02493e8114c39d48b76944069d58526e8d/packages/remix-server-runtime/server.ts#L573-L586
+ */
+export function isIndexRequestUrl(url: URL): boolean {
+  for (const param of url.searchParams.getAll('index')) {
+    // only use bare `?index` params without a value
+    // ✅ /foo?index
+    // ✅ /foo?index&index=123
+    // ✅ /foo?index=123&index
+    // ❌ /foo?index=123
+    if (param === '') {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * https://github.com/remix-run/remix/blob/97999d02493e8114c39d48b76944069d58526e8d/packages/remix-server-runtime/server.ts#L588-L596
+ */
+export function getRequestMatch(url: URL, matches: RouteMatch<ServerRoute>[]): RouteMatch<ServerRoute> {
+  const match = matches.slice(-1)[0];
+
+  if (!isIndexRequestUrl(url) && match.route.id.endsWith('/index')) {
+    return matches.slice(-2)[0];
+  }
+
+  return match;
+}
diff --git a/packages/remix/src/utils/web-fetch.ts b/packages/remix/src/utils/web-fetch.ts
index 853eac775c84..1e69a77b5dba 100644
--- a/packages/remix/src/utils/web-fetch.ts
+++ b/packages/remix/src/utils/web-fetch.ts
@@ -1,10 +1,31 @@
 // Based on Remix's implementation of Fetch API
-// https://github.com/remix-run/web-std-io/tree/main/packages/fetch
+// https://github.com/remix-run/web-std-io/blob/d2a003fe92096aaf97ab2a618b74875ccaadc280/packages/fetch/
+// The MIT License (MIT)
+
+// Copyright (c) 2016 - 2020 Node Fetch Team
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
 
 import { logger } from '@sentry/utils';
 
-import { getClientIPAddress } from './getIpAddress';
 import type { RemixRequest } from './types';
+import { getClientIPAddress } from './vendor/getIpAddress';
 
 /*
  * Symbol extractor utility to be able to access internal fields of Remix requests.
@@ -17,7 +38,9 @@ const getInternalSymbols = (
 } => {
   const symbols = Object.getOwnPropertySymbols(request);
   return {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     bodyInternalsSymbol: symbols.find(symbol => symbol.toString().includes('Body internals')) as any,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     requestInternalsSymbol: symbols.find(symbol => symbol.toString().includes('Request internals')) as any,
   };
 };
@@ -42,6 +65,7 @@ export const getSearch = (parsedURL: URL): string => {
  * Vendored / modified from:
  * https://github.com/remix-run/web-std-io/blob/f715b354c8c5b8edc550c5442dec5712705e25e7/packages/fetch/src/request.js#L259
  */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const normalizeRemixRequest = (request: RemixRequest): Record<string, any> => {
   const { requestInternalsSymbol, bodyInternalsSymbol } = getInternalSymbols(request);
 
diff --git a/packages/remix/test/utils/getIpAddress.test.ts b/packages/remix/test/utils/getIpAddress.test.ts
index f5cf1df07068..9e05dec9515a 100644
--- a/packages/remix/test/utils/getIpAddress.test.ts
+++ b/packages/remix/test/utils/getIpAddress.test.ts
@@ -1,4 +1,4 @@
-import { getClientIPAddress } from '../../src/utils/getIpAddress';
+import { getClientIPAddress } from '../../src/utils/vendor/getIpAddress';
 
 class Headers {
   private _headers: Record<string, string> = {};

From 773f1802b20382540eed3b6bafb595dc289de423 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 29 Mar 2023 12:35:23 +0200
Subject: [PATCH 28/50] fix(sveltekit): Handle nested server calls in
 `sentryHandle` (#7598)

Previously, we always created a new domain when entering the `sentryHandle` function. This caused "nested" SvelteKit Server calls to create new transaction whenever a new domain was created in the `sentryHandle` function because the active span is bound to the domain. This fix introduces a check if there is an active transaction, in which case we just execute the handler and don't create a new domain, as we are already in this active domain.

As a result, nested SK server calls become a span of the parent server call instead of a new transaction.
---
 packages/sveltekit/src/server/handle.ts       | 64 +++++++++++--------
 packages/sveltekit/test/server/handle.test.ts | 46 ++++++++++++-
 2 files changed, 82 insertions(+), 28 deletions(-)

diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
index 23319713bf87..fa6c10648741 100644
--- a/packages/sveltekit/src/server/handle.ts
+++ b/packages/sveltekit/src/server/handle.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import type { Span } from '@sentry/core';
-import { getActiveTransaction, trace } from '@sentry/core';
+import { getActiveTransaction, getCurrentHub, trace } from '@sentry/core';
 import { captureException } from '@sentry/node';
 import {
   addExceptionMechanism,
@@ -64,32 +64,42 @@ export const transformPageChunk: NonNullable<ResolveOptions['transformPageChunk'
  * // export const handle = sequence(sentryHandle, yourCustomHandle);
  * ```
  */
-export const sentryHandle: Handle = ({ event, resolve }) => {
+export const sentryHandle: Handle = input => {
+  // if there is an active transaction, we know that this handle call is nested and hence
+  // we don't create a new domain for it. If we created one, nested server calls would
+  // create new transactions instead of adding a child span to the currently active span.
+  if (getCurrentHub().getScope().getSpan()) {
+    return instrumentHandle(input);
+  }
   return domain.create().bind(() => {
-    const sentryTraceHeader = event.request.headers.get('sentry-trace');
-    const baggageHeader = event.request.headers.get('baggage');
-    const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
-    const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
-
-    return trace(
-      {
-        op: 'http.server',
-        name: `${event.request.method} ${event.route.id}`,
-        status: 'ok',
-        ...traceparentData,
-        metadata: {
-          source: 'route',
-          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
-        },
-      },
-      async (span?: Span) => {
-        const res = await resolve(event, { transformPageChunk });
-        if (span) {
-          span.setHttpStatus(res.status);
-        }
-        return res;
-      },
-      sendErrorToSentry,
-    );
+    return instrumentHandle(input);
   })();
 };
+
+function instrumentHandle({ event, resolve }: Parameters<Handle>[0]): ReturnType<Handle> {
+  const sentryTraceHeader = event.request.headers.get('sentry-trace');
+  const baggageHeader = event.request.headers.get('baggage');
+  const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
+  const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
+
+  return trace(
+    {
+      op: 'http.server',
+      name: `${event.request.method} ${event.route.id}`,
+      status: 'ok',
+      ...traceparentData,
+      metadata: {
+        source: 'route',
+        dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+      },
+    },
+    async (span?: Span) => {
+      const res = await resolve(event, { transformPageChunk });
+      if (span) {
+        span.setHttpStatus(res.status);
+      }
+      return res;
+    },
+    sendErrorToSentry,
+  );
+}
diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts
index ac94e72dd292..785aad1ca06e 100644
--- a/packages/sveltekit/test/server/handle.test.ts
+++ b/packages/sveltekit/test/server/handle.test.ts
@@ -129,7 +129,7 @@ describe('handleSentry', () => {
       expect(response).toEqual(mockResponse);
     });
 
-    it('creates a transaction', async () => {
+    it("creates a transaction if there's no active span", async () => {
       let ref: any = undefined;
       client.on('finishTransaction', (transaction: Transaction) => {
         ref = transaction;
@@ -149,6 +149,50 @@ describe('handleSentry', () => {
       expect(ref.metadata.source).toEqual('route');
 
       expect(ref.endTimestamp).toBeDefined();
+      expect(ref.spanRecorder.spans).toHaveLength(1);
+    });
+
+    it('creates a child span for nested server calls (i.e. if there is an active span)', async () => {
+      let ref: any = undefined;
+      let txnCount = 0;
+      client.on('finishTransaction', (transaction: Transaction) => {
+        ref = transaction;
+        ++txnCount;
+      });
+
+      try {
+        await sentryHandle({
+          event: mockEvent(),
+          resolve: async _ => {
+            // simulateing a nested load call:
+            await sentryHandle({
+              event: mockEvent({ route: { id: 'api/users/details/[id]' } }),
+              resolve: resolve(type, isError),
+            });
+            return mockResponse;
+          },
+        });
+      } catch (e) {
+        //
+      }
+
+      expect(txnCount).toEqual(1);
+      expect(ref).toBeDefined();
+
+      expect(ref.name).toEqual('GET /users/[id]');
+      expect(ref.op).toEqual('http.server');
+      expect(ref.status).toEqual(isError ? 'internal_error' : 'ok');
+      expect(ref.metadata.source).toEqual('route');
+
+      expect(ref.endTimestamp).toBeDefined();
+
+      expect(ref.spanRecorder.spans).toHaveLength(2);
+      expect(ref.spanRecorder.spans).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ op: 'http.server', description: 'GET /users/[id]' }),
+          expect.objectContaining({ op: 'http.server', description: 'GET api/users/details/[id]' }),
+        ]),
+      );
     });
 
     it('creates a transaction from sentry-trace header', async () => {

From e7a0b1cd54394767824645fb32a5baf766dd06c5 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 29 Mar 2023 12:39:04 +0200
Subject: [PATCH 29/50] fix(nextjs): Add loading component type to server
 component wrapping (#7639)

---
 packages/nextjs/src/config/loaders/wrappingLoader.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/nextjs/src/config/loaders/wrappingLoader.ts b/packages/nextjs/src/config/loaders/wrappingLoader.ts
index e76af7126a27..92ced3a342e7 100644
--- a/packages/nextjs/src/config/loaders/wrappingLoader.ts
+++ b/packages/nextjs/src/config/loaders/wrappingLoader.ts
@@ -182,6 +182,9 @@ export default function wrappingLoader(
         case 'not-found':
           componentType = 'Not-found';
           break;
+        case 'loading':
+          componentType = 'Loading';
+          break;
         default:
           componentType = 'Unknown';
       }

From 96194325c9b8da28bb09eb1abee3a2fccbdbc0c6 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 29 Mar 2023 13:30:16 +0200
Subject: [PATCH 30/50] tests(e2e): Undo intentional error (#7643)

---
 packages/nextjs/rollup.npm.config.js                 | 2 +-
 packages/nextjs/src/config/loaders/wrappingLoader.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nextjs/rollup.npm.config.js b/packages/nextjs/rollup.npm.config.js
index b573988d3759..f9c498c8f39e 100644
--- a/packages/nextjs/rollup.npm.config.js
+++ b/packages/nextjs/rollup.npm.config.js
@@ -46,7 +46,7 @@ export default [
         },
         external: [
           '@sentry/nextjs',
-          'next/dist/client/components/request-async-storagee',
+          'next/dist/client/components/request-async-storage',
           '__SENTRY_WRAPPING_TARGET_FILE__',
           '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__',
         ],
diff --git a/packages/nextjs/src/config/loaders/wrappingLoader.ts b/packages/nextjs/src/config/loaders/wrappingLoader.ts
index 92ced3a342e7..2f0686ae490a 100644
--- a/packages/nextjs/src/config/loaders/wrappingLoader.ts
+++ b/packages/nextjs/src/config/loaders/wrappingLoader.ts
@@ -14,7 +14,7 @@ const SENTRY_WRAPPER_MODULE_NAME = 'sentry-wrapper-module';
 const WRAPPING_TARGET_MODULE_NAME = '__SENTRY_WRAPPING_TARGET_FILE__.cjs';
 
 // Non-public API. Can be found here: https://github.com/vercel/next.js/blob/46151dd68b417e7850146d00354f89930d10b43b/packages/next/src/client/components/request-async-storage.ts
-const NEXTJS_REQUEST_ASYNC_STORAGE_MODULE_PATH = 'next/dist/client/components/request-async-storagee';
+const NEXTJS_REQUEST_ASYNC_STORAGE_MODULE_PATH = 'next/dist/client/components/request-async-storage';
 
 const apiWrapperTemplatePath = path.resolve(__dirname, '..', 'templates', 'apiWrapperTemplate.js');
 const apiWrapperTemplateCode = fs.readFileSync(apiWrapperTemplatePath, { encoding: 'utf8' });

From ccd5f271fc07b4c7f6e60f55b74f1bd707eb8003 Mon Sep 17 00:00:00 2001
From: Billy Vong <billyvg@users.noreply.github.com>
Date: Wed, 29 Mar 2023 08:00:02 -0400
Subject: [PATCH 31/50] meta: Add CODEOWNERS (for replay only) (#7636)

This was previously removed, but we are re-adding for just Replay related items.
---
 CODEOWNERS | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 000000000000..c8925d8cc981
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,3 @@
+packages/replay                                   @getsentry/replay-sdk
+packages/replay-worker                            @getsentry/replay-sdk
+packages/browser-integration-tests/suites/replay  @getsentry/replay-sdk

From 0643828c9e86b2a443f7a60800d4cacc36f662ef Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 29 Mar 2023 15:06:49 +0200
Subject: [PATCH 32/50] fix(nextjs): Don't report `NEXT_NOT_FOUND` and
 `NEXT_REDIRECT` errors (#7642)

---
 .../nextjs-app-dir/app/layout.tsx             |  6 +++++
 .../nextjs-app-dir/app/not-found.tsx          |  3 +++
 .../app/server-component/not-found/page.tsx   |  7 ++++++
 .../app/server-component/redirect/page.tsx    |  7 ++++++
 .../nextjs-app-dir/tests/transactions.test.ts | 22 ++++++++++++++++
 .../src/common/nextNavigationErrorUtils.ts    | 21 ++++++++++++++++
 .../server/wrapServerComponentWithSentry.ts   | 25 +++++++++++++------
 7 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/not-found/page.tsx
 create mode 100644 packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/redirect/page.tsx
 create mode 100644 packages/nextjs/src/common/nextNavigationErrorUtils.ts

diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/app/layout.tsx b/packages/e2e-tests/test-applications/nextjs-app-dir/app/layout.tsx
index 35c4704735e7..b93ad29e53cb 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/app/layout.tsx
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/app/layout.tsx
@@ -29,6 +29,12 @@ export default function Layout({ children }: { children: React.ReactNode }) {
             <li>
               <Link href="/server-component/parameter/foo/bar/baz">/server-component/parameter/foo/bar/baz</Link>
             </li>
+            <li>
+              <Link href="/not-found">/not-found</Link>
+            </li>
+            <li>
+              <Link href="/redirect">/redirect</Link>
+            </li>
           </ul>
           <TransactionContextProvider>{children}</TransactionContextProvider>
         </div>
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/app/not-found.tsx b/packages/e2e-tests/test-applications/nextjs-app-dir/app/not-found.tsx
index 5e7b156553a6..87ce52a19e73 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/app/not-found.tsx
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/app/not-found.tsx
@@ -1,7 +1,10 @@
+import { ClientErrorDebugTools } from '../components/client-error-debug-tools';
+
 export default function NotFound() {
   return (
     <div style={{ border: '1px solid lightgrey', padding: '12px' }}>
       <h2>Not found (/)</h2>;
+      <ClientErrorDebugTools />
     </div>
   );
 }
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/not-found/page.tsx b/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/not-found/page.tsx
new file mode 100644
index 000000000000..c88c2d097d4f
--- /dev/null
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/not-found/page.tsx
@@ -0,0 +1,7 @@
+import { notFound } from 'next/navigation';
+
+export const dynamic = 'force-dynamic';
+
+export default function Page() {
+  notFound();
+}
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/redirect/page.tsx b/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/redirect/page.tsx
new file mode 100644
index 000000000000..3df1746a97ff
--- /dev/null
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/app/server-component/redirect/page.tsx
@@ -0,0 +1,7 @@
+import { redirect } from 'next/navigation';
+
+export const dynamic = 'force-dynamic';
+
+export default function Page() {
+  redirect('/');
+}
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
index 5ef4e6f28b5f..8dac4e58e5ba 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
@@ -89,4 +89,26 @@ if (process.env.TEST_ENV === 'production') {
       )
       .toBe(200);
   });
+
+  test('Should not set an error status on a server component transaction when it redirects', async ({ page }) => {
+    const serverComponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
+      return transactionEvent?.transaction === 'Page Server Component (/server-component/redirect)';
+    });
+
+    await page.goto('/server-component/redirect');
+
+    expect((await serverComponentTransactionPromise).contexts?.trace?.status).not.toBe('internal_error');
+  });
+
+  test('Should set a "not_found" status on a server component transaction when notFound() is called', async ({
+    page,
+  }) => {
+    const serverComponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => {
+      return transactionEvent?.transaction === 'Page Server Component (/server-component/not-found)';
+    });
+
+    await page.goto('/server-component/not-found');
+
+    expect((await serverComponentTransactionPromise).contexts?.trace?.status).toBe('not_found');
+  });
 }
diff --git a/packages/nextjs/src/common/nextNavigationErrorUtils.ts b/packages/nextjs/src/common/nextNavigationErrorUtils.ts
new file mode 100644
index 000000000000..d4a67791525f
--- /dev/null
+++ b/packages/nextjs/src/common/nextNavigationErrorUtils.ts
@@ -0,0 +1,21 @@
+import { isError } from '@sentry/utils';
+
+/**
+ * Determines whether input is a Next.js not-found error.
+ * https://beta.nextjs.org/docs/api-reference/notfound#notfound
+ */
+export function isNotFoundNavigationError(subject: unknown): boolean {
+  return isError(subject) && (subject as Error & { digest?: unknown }).digest === 'NEXT_NOT_FOUND';
+}
+
+/**
+ * Determines whether input is a Next.js redirect error.
+ * https://beta.nextjs.org/docs/api-reference/redirect#redirect
+ */
+export function isRedirectNavigationError(subject: unknown): boolean {
+  return (
+    isError(subject) &&
+    typeof (subject as Error & { digest?: unknown }).digest === 'string' &&
+    (subject as Error & { digest: string }).digest.startsWith('NEXT_REDIRECT;') // a redirect digest looks like "NEXT_REDIRECT;[redirect path]"
+  );
+}
diff --git a/packages/nextjs/src/server/wrapServerComponentWithSentry.ts b/packages/nextjs/src/server/wrapServerComponentWithSentry.ts
index 12ff9ceb5f72..2c25e8811409 100644
--- a/packages/nextjs/src/server/wrapServerComponentWithSentry.ts
+++ b/packages/nextjs/src/server/wrapServerComponentWithSentry.ts
@@ -2,6 +2,7 @@ import { addTracingExtensions, captureException, getCurrentHub, startTransaction
 import { baggageHeaderToDynamicSamplingContext, extractTraceparentData } from '@sentry/utils';
 import * as domain from 'domain';
 
+import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
 
 /**
@@ -45,12 +46,24 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
           currentScope.setSpan(transaction);
         }
 
+        const handleErrorCase = (e: unknown): void => {
+          if (isNotFoundNavigationError(e)) {
+            // We don't want to report "not-found"s
+            transaction.setStatus('not_found');
+          } else if (isRedirectNavigationError(e)) {
+            // We don't want to report redirects
+          } else {
+            transaction.setStatus('internal_error');
+            captureException(e);
+          }
+
+          transaction.finish();
+        };
+
         try {
           maybePromiseResult = originalFunction.apply(thisArg, args);
         } catch (e) {
-          transaction.setStatus('internal_error');
-          captureException(e);
-          transaction.finish();
+          handleErrorCase(e);
           throw e;
         }
 
@@ -60,10 +73,8 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
             () => {
               transaction.finish();
             },
-            (e: Error) => {
-              transaction.setStatus('internal_error');
-              captureException(e);
-              transaction.finish();
+            e => {
+              handleErrorCase(e);
             },
           );
 

From 8a25d000899ac78f85d1f48528fd431e8b96b232 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Wed, 29 Mar 2023 14:38:32 +0100
Subject: [PATCH 33/50] fix(node): Convert debugging code to callbacks to fix
 memory leak in `LocalVariables` integration (#7637)

---
 .../LocalVariables/local-variables-caught.mjs |   2 +
 .../node/src/integrations/localvariables.ts   | 230 ++++++++++++------
 .../test/integrations/localvariables.test.ts  | 180 ++++++++++++--
 3 files changed, 318 insertions(+), 94 deletions(-)

diff --git a/packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.mjs b/packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.mjs
index 175ff0702d30..dfb46f29326e 100644
--- a/packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.mjs
+++ b/packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-caught.mjs
@@ -22,6 +22,8 @@ function one(name) {
   const obj = {
     name,
     num: 5,
+    functionsShouldNotBeIncluded: () => {},
+    functionsShouldNotBeIncluded2() {},
   };
 
   const ty = new Some();
diff --git a/packages/node/src/integrations/localvariables.ts b/packages/node/src/integrations/localvariables.ts
index d96047239d62..0b5f8865e1ca 100644
--- a/packages/node/src/integrations/localvariables.ts
+++ b/packages/node/src/integrations/localvariables.ts
@@ -4,14 +4,53 @@ import { LRUMap } from 'lru_map';
 
 import type { NodeClientOptions } from '../types';
 
+type Variables = Record<string, unknown>;
+type OnPauseEvent = InspectorNotification<Debugger.PausedEventDataType>;
 export interface DebugSession {
   /** Configures and connects to the debug session */
-  configureAndConnect(
-    onPause: (message: InspectorNotification<Debugger.PausedEventDataType>) => void,
-    captureAll: boolean,
-  ): void;
+  configureAndConnect(onPause: (message: OnPauseEvent, complete: () => void) => void, captureAll: boolean): void;
   /** Gets local variables for an objectId */
-  getLocalVariables(objectId: string): Promise<Record<string, unknown>>;
+  getLocalVariables(objectId: string, callback: (vars: Variables) => void): void;
+}
+
+type Next<T> = (result: T) => void;
+type Add<T> = (fn: Next<T>) => void;
+type CallbackWrapper<T> = { add: Add<T>; next: Next<T> };
+
+/** Creates a container for callbacks to be called sequentially */
+export function createCallbackList<T>(complete: Next<T>): CallbackWrapper<T> {
+  // A collection of callbacks to be executed last to first
+  let callbacks: Next<T>[] = [];
+
+  let completedCalled = false;
+  function checkedComplete(result: T): void {
+    callbacks = [];
+    if (completedCalled) {
+      return;
+    }
+    completedCalled = true;
+    complete(result);
+  }
+
+  // complete should be called last
+  callbacks.push(checkedComplete);
+
+  function add(fn: Next<T>): void {
+    callbacks.push(fn);
+  }
+
+  function next(result: T): void {
+    const popped = callbacks.pop() || checkedComplete;
+
+    try {
+      popped(result);
+    } catch (_) {
+      // If there is an error, we still want to call the complete callback
+      checkedComplete(result);
+    }
+  }
+
+  return { add, next };
 }
 
 /**
@@ -41,86 +80,109 @@ class AsyncSession implements DebugSession {
     were reported any more. We probably missed a place where we need to await the promise, too.
     */
 
-    // Node can be build without inspector support so this can throw
+    // Node can be built without inspector support so this can throw
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { Session } = require('inspector');
     this._session = new Session();
   }
 
   /** @inheritdoc */
-  public configureAndConnect(
-    onPause: (message: InspectorNotification<Debugger.PausedEventDataType>) => void,
-    captureAll: boolean,
-  ): void {
+  public configureAndConnect(onPause: (event: OnPauseEvent, complete: () => void) => void, captureAll: boolean): void {
     this._session.connect();
-    this._session.on('Debugger.paused', onPause);
+
+    this._session.on('Debugger.paused', event => {
+      onPause(event, () => {
+        // After the pause work is complete, resume execution or the exception context memory is leaked
+        this._session.post('Debugger.resume');
+      });
+    });
+
     this._session.post('Debugger.enable');
-    // We only want to pause on uncaught exceptions
     this._session.post('Debugger.setPauseOnExceptions', { state: captureAll ? 'all' : 'uncaught' });
   }
 
   /** @inheritdoc */
-  public async getLocalVariables(objectId: string): Promise<Record<string, unknown>> {
-    const props = await this._getProperties(objectId);
-    const unrolled: Record<string, unknown> = {};
-
-    for (const prop of props) {
-      if (prop?.value?.objectId && prop?.value.className === 'Array') {
-        unrolled[prop.name] = await this._unrollArray(prop.value.objectId);
-      } else if (prop?.value?.objectId && prop?.value?.className === 'Object') {
-        unrolled[prop.name] = await this._unrollObject(prop.value.objectId);
-      } else if (prop?.value?.value || prop?.value?.description) {
-        unrolled[prop.name] = prop.value.value || `<${prop.value.description}>`;
+  public getLocalVariables(objectId: string, complete: (vars: Variables) => void): void {
+    this._getProperties(objectId, props => {
+      const { add, next } = createCallbackList<Variables>(complete);
+
+      for (const prop of props) {
+        if (prop?.value?.objectId && prop?.value.className === 'Array') {
+          const id = prop.value.objectId;
+          add(vars => this._unrollArray(id, prop.name, vars, next));
+        } else if (prop?.value?.objectId && prop?.value?.className === 'Object') {
+          const id = prop.value.objectId;
+          add(vars => this._unrollObject(id, prop.name, vars, next));
+        } else if (prop?.value?.value || prop?.value?.description) {
+          add(vars => this._unrollOther(prop, vars, next));
+        }
       }
-    }
 
-    return unrolled;
+      next({});
+    });
   }
 
   /**
    * Gets all the PropertyDescriptors of an object
    */
-  private _getProperties(objectId: string): Promise<Runtime.PropertyDescriptor[]> {
-    return new Promise((resolve, reject) => {
-      this._session.post(
-        'Runtime.getProperties',
-        {
-          objectId,
-          ownProperties: true,
-        },
-        (err, params) => {
-          if (err) {
-            reject(err);
-          } else {
-            resolve(params.result);
-          }
-        },
-      );
-    });
+  private _getProperties(objectId: string, next: (result: Runtime.PropertyDescriptor[]) => void): void {
+    this._session.post(
+      'Runtime.getProperties',
+      {
+        objectId,
+        ownProperties: true,
+      },
+      (err, params) => {
+        if (err) {
+          next([]);
+        } else {
+          next(params.result);
+        }
+      },
+    );
   }
 
   /**
    * Unrolls an array property
    */
-  private async _unrollArray(objectId: string): Promise<unknown> {
-    const props = await this._getProperties(objectId);
-    return props
-      .filter(v => v.name !== 'length' && !isNaN(parseInt(v.name, 10)))
-      .sort((a, b) => parseInt(a.name, 10) - parseInt(b.name, 10))
-      .map(v => v?.value?.value);
+  private _unrollArray(objectId: string, name: string, vars: Variables, next: (vars: Variables) => void): void {
+    this._getProperties(objectId, props => {
+      vars[name] = props
+        .filter(v => v.name !== 'length' && !isNaN(parseInt(v.name, 10)))
+        .sort((a, b) => parseInt(a.name, 10) - parseInt(b.name, 10))
+        .map(v => v?.value?.value);
+
+      next(vars);
+    });
   }
 
   /**
    * Unrolls an object property
    */
-  private async _unrollObject(objectId: string): Promise<Record<string, unknown>> {
-    const props = await this._getProperties(objectId);
-    return props
-      .map<[string, unknown]>(v => [v.name, v?.value?.value])
-      .reduce((obj, [key, val]) => {
-        obj[key] = val;
-        return obj;
-      }, {} as Record<string, unknown>);
+  private _unrollObject(objectId: string, name: string, vars: Variables, next: (obj: Variables) => void): void {
+    this._getProperties(objectId, props => {
+      vars[name] = props
+        .map<[string, unknown]>(v => [v.name, v?.value?.value])
+        .reduce((obj, [key, val]) => {
+          obj[key] = val;
+          return obj;
+        }, {} as Variables);
+
+      next(vars);
+    });
+  }
+
+  /**
+   * Unrolls other properties
+   */
+  private _unrollOther(prop: Runtime.PropertyDescriptor, vars: Variables, next: (vars: Variables) => void): void {
+    if (prop?.value?.value) {
+      vars[prop.name] = prop.value.value;
+    } else if (prop?.value?.description && prop?.value?.type !== 'function') {
+      vars[prop.name] = `<${prop.value.description}>`;
+    }
+
+    next(vars);
   }
 }
 
@@ -178,7 +240,7 @@ function hashFromStack(stackParser: StackParser, stack: string | undefined): str
 
 export interface FrameVariables {
   function: string;
-  vars?: Record<string, unknown>;
+  vars?: Variables;
 }
 
 /** There are no options yet. This allows them to be added later without breaking changes */
@@ -200,7 +262,7 @@ export class LocalVariables implements Integration {
 
   public readonly name: string = LocalVariables.id;
 
-  private readonly _cachedFrames: LRUMap<string, Promise<FrameVariables[]>> = new LRUMap(20);
+  private readonly _cachedFrames: LRUMap<string, FrameVariables[]> = new LRUMap(20);
 
   public constructor(
     private readonly _options: Options = {},
@@ -221,7 +283,8 @@ export class LocalVariables implements Integration {
   ): void {
     if (this._session && clientOptions?.includeLocalVariables) {
       this._session.configureAndConnect(
-        ev => this._handlePaused(clientOptions.stackParser, ev as InspectorNotification<PausedExceptionEvent>),
+        (ev, complete) =>
+          this._handlePaused(clientOptions.stackParser, ev as InspectorNotification<PausedExceptionEvent>, complete),
         !!this._options.captureAllExceptions,
       );
 
@@ -232,11 +295,13 @@ export class LocalVariables implements Integration {
   /**
    * Handle the pause event
    */
-  private async _handlePaused(
+  private _handlePaused(
     stackParser: StackParser,
     { params: { reason, data, callFrames } }: InspectorNotification<PausedExceptionEvent>,
-  ): Promise<void> {
+    complete: () => void,
+  ): void {
     if (reason !== 'exception' && reason !== 'promiseRejection') {
+      complete();
       return;
     }
 
@@ -244,35 +309,50 @@ export class LocalVariables implements Integration {
     const exceptionHash = hashFromStack(stackParser, data?.description);
 
     if (exceptionHash == undefined) {
+      complete();
       return;
     }
 
-    const framePromises = callFrames.map(async ({ scopeChain, functionName, this: obj }) => {
+    const { add, next } = createCallbackList<FrameVariables[]>(frames => {
+      this._cachedFrames.set(exceptionHash, frames);
+      complete();
+    });
+
+    // Because we're queuing up and making all these calls synchronously, we can potentially overflow the stack
+    // For this reason we only attempt to get local variables for the first 5 frames
+    for (let i = 0; i < Math.min(callFrames.length, 5); i++) {
+      const { scopeChain, functionName, this: obj } = callFrames[i];
+
       const localScope = scopeChain.find(scope => scope.type === 'local');
 
       // obj.className is undefined in ESM modules
       const fn = obj.className === 'global' || !obj.className ? functionName : `${obj.className}.${functionName}`;
 
       if (localScope?.object.objectId === undefined) {
-        return { function: fn };
+        add(frames => {
+          frames[i] = { function: fn };
+          next(frames);
+        });
+      } else {
+        const id = localScope.object.objectId;
+        add(frames =>
+          this._session?.getLocalVariables(id, vars => {
+            frames[i] = { function: fn, vars };
+            next(frames);
+          }),
+        );
       }
+    }
 
-      const vars = await this._session?.getLocalVariables(localScope.object.objectId);
-
-      return { function: fn, vars };
-    });
-
-    // We add the un-awaited promise to the cache rather than await here otherwise the event processor
-    // can be called before we're finished getting all the vars
-    this._cachedFrames.set(exceptionHash, Promise.all(framePromises));
+    next([]);
   }
 
   /**
    * Adds local variables event stack frames.
    */
-  private async _addLocalVariables(event: Event): Promise<Event> {
+  private _addLocalVariables(event: Event): Event {
     for (const exception of event?.exception?.values || []) {
-      await this._addLocalVariablesToException(exception);
+      this._addLocalVariablesToException(exception);
     }
 
     return event;
@@ -281,7 +361,7 @@ export class LocalVariables implements Integration {
   /**
    * Adds local variables to the exception stack frames.
    */
-  private async _addLocalVariablesToException(exception: Exception): Promise<void> {
+  private _addLocalVariablesToException(exception: Exception): void {
     const hash = hashFrames(exception?.stacktrace?.frames);
 
     if (hash === undefined) {
@@ -290,7 +370,7 @@ export class LocalVariables implements Integration {
 
     // Check if we have local variables for an exception that matches the hash
     // delete is identical to get but also removes the entry from the cache
-    const cachedFrames = await this._cachedFrames.delete(hash);
+    const cachedFrames = this._cachedFrames.delete(hash);
 
     if (cachedFrames === undefined) {
       return;
diff --git a/packages/node/test/integrations/localvariables.test.ts b/packages/node/test/integrations/localvariables.test.ts
index 8653b048b257..37e980c9cb96 100644
--- a/packages/node/test/integrations/localvariables.test.ts
+++ b/packages/node/test/integrations/localvariables.test.ts
@@ -4,7 +4,7 @@ import type { LRUMap } from 'lru_map';
 
 import { defaultStackParser } from '../../src';
 import type { DebugSession, FrameVariables } from '../../src/integrations/localvariables';
-import { LocalVariables } from '../../src/integrations/localvariables';
+import { createCallbackList, LocalVariables } from '../../src/integrations/localvariables';
 import { getDefaultNodeClientOptions } from '../../test/helper/node-client-options';
 
 interface ThrowOn {
@@ -13,12 +13,12 @@ interface ThrowOn {
 }
 
 class MockDebugSession implements DebugSession {
-  private _onPause?: (message: InspectorNotification<Debugger.PausedEventDataType>) => void;
+  private _onPause?: (message: InspectorNotification<Debugger.PausedEventDataType>, callback: () => void) => void;
 
   constructor(private readonly _vars: Record<string, Record<string, unknown>>, private readonly _throwOn?: ThrowOn) {}
 
   public configureAndConnect(
-    onPause: (message: InspectorNotification<Debugger.PausedEventDataType>) => void,
+    onPause: (message: InspectorNotification<Debugger.PausedEventDataType>, callback: () => void) => void,
     _captureAll: boolean,
   ): void {
     if (this._throwOn?.configureAndConnect) {
@@ -28,21 +28,23 @@ class MockDebugSession implements DebugSession {
     this._onPause = onPause;
   }
 
-  public async getLocalVariables(objectId: string): Promise<Record<string, unknown>> {
+  public getLocalVariables(objectId: string, callback: (vars: Record<string, unknown>) => void): void {
     if (this._throwOn?.getLocalVariables) {
       throw new Error('getLocalVariables should not be called');
     }
 
-    return this._vars[objectId];
+    callback(this._vars[objectId]);
   }
 
-  public runPause(message: InspectorNotification<Debugger.PausedEventDataType>) {
-    this._onPause?.(message);
+  public runPause(message: InspectorNotification<Debugger.PausedEventDataType>): Promise<void> {
+    return new Promise(resolve => {
+      this._onPause?.(message, resolve);
+    });
   }
 }
 
 interface LocalVariablesPrivate {
-  _cachedFrames: LRUMap<string, Promise<FrameVariables[]>>;
+  _cachedFrames: LRUMap<string, FrameVariables[]>;
   _setup(addGlobalEventProcessor: (callback: EventProcessor) => void, clientOptions: ClientOptions): void;
 }
 
@@ -106,6 +108,43 @@ const exceptionEvent = {
   },
 };
 
+const exceptionEvent100Frames = {
+  method: 'Debugger.paused',
+  params: {
+    reason: 'exception',
+    data: {
+      description:
+        'Error: Some  error\n' +
+        '    at two (/dist/javascript/src/main.js:23:9)\n' +
+        '    at one (/dist/javascript/src/main.js:19:3)\n' +
+        '    at Timeout._onTimeout (/dist/javascript/src/main.js:40:5)\n' +
+        '    at listOnTimeout (node:internal/timers:559:17)\n' +
+        '    at process.processTimers (node:internal/timers:502:7)',
+    },
+    callFrames: new Array(100).fill({
+      callFrameId: '-6224981551105448869.1.0',
+      functionName: 'two',
+      location: { scriptId: '134', lineNumber: 22 },
+      url: '',
+      scopeChain: [
+        {
+          type: 'local',
+          object: {
+            type: 'object',
+            className: 'Object',
+            objectId: '-6224981551105448869.1.2',
+          },
+          name: 'two',
+        },
+      ],
+      this: {
+        type: 'object',
+        className: 'global',
+      },
+    }),
+  },
+};
+
 describe('LocalVariables', () => {
   it('Adds local variables to stack frames', async () => {
     expect.assertions(7);
@@ -128,19 +167,19 @@ describe('LocalVariables', () => {
 
     expect(eventProcessor).toBeDefined();
 
-    session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
 
     expect((localVariables as unknown as LocalVariablesPrivate)._cachedFrames.size).toBe(1);
 
-    let frames: Promise<FrameVariables[]> | undefined;
+    let frames: FrameVariables[] | undefined;
 
-    (localVariables as unknown as LocalVariablesPrivate)._cachedFrames.forEach(promise => {
-      frames = promise;
+    (localVariables as unknown as LocalVariablesPrivate)._cachedFrames.forEach(f => {
+      frames = f;
     });
 
     expect(frames).toBeDefined();
 
-    const vars = await (frames as Promise<FrameVariables[]>);
+    const vars = frames as FrameVariables[];
 
     expect(vars).toEqual([
       { function: 'two', vars: { name: 'tim' } },
@@ -206,6 +245,41 @@ describe('LocalVariables', () => {
     expect((localVariables as unknown as LocalVariablesPrivate)._cachedFrames.size).toBe(0);
   });
 
+  it('Only considers the first 5 frames', async () => {
+    expect.assertions(4);
+
+    const session = new MockDebugSession({});
+    const localVariables = new LocalVariables({}, session);
+    const options = getDefaultNodeClientOptions({
+      stackParser: defaultStackParser,
+      includeLocalVariables: true,
+    });
+
+    let eventProcessor: EventProcessor | undefined;
+
+    (localVariables as unknown as LocalVariablesPrivate)._setup(callback => {
+      eventProcessor = callback;
+    }, options);
+
+    expect(eventProcessor).toBeDefined();
+
+    await session.runPause(exceptionEvent100Frames);
+
+    expect((localVariables as unknown as LocalVariablesPrivate)._cachedFrames.size).toBe(1);
+
+    let frames: FrameVariables[] | undefined;
+
+    (localVariables as unknown as LocalVariablesPrivate)._cachedFrames.forEach(f => {
+      frames = f;
+    });
+
+    expect(frames).toBeDefined();
+
+    const vars = frames as FrameVariables[];
+
+    expect(vars.length).toEqual(5);
+  });
+
   it('Should not lookup variables for non-exception reasons', async () => {
     expect.assertions(1);
 
@@ -223,7 +297,7 @@ describe('LocalVariables', () => {
       params: { ...exceptionEvent.params, reason: 'non-exception-reason' },
     };
 
-    session.runPause(nonExceptionEvent);
+    await session.runPause(nonExceptionEvent);
 
     expect((localVariables as unknown as LocalVariablesPrivate)._cachedFrames.size).toBe(0);
   });
@@ -278,12 +352,80 @@ describe('LocalVariables', () => {
 
     (localVariables as unknown as LocalVariablesPrivate)._setup(_ => {}, options);
 
-    session.runPause(exceptionEvent);
-    session.runPause(exceptionEvent);
-    session.runPause(exceptionEvent);
-    session.runPause(exceptionEvent);
-    session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
+    await session.runPause(exceptionEvent);
 
     expect((localVariables as unknown as LocalVariablesPrivate)._cachedFrames.size).toBe(1);
   });
+
+  describe('createCallbackList', () => {
+    it('Should call callbacks in reverse order', done => {
+      const log: number[] = [];
+
+      const { add, next } = createCallbackList<number>(n => {
+        expect(log).toEqual([5, 4, 3, 2, 1]);
+        expect(n).toBe(15);
+        done();
+      });
+
+      add(n => {
+        log.push(1);
+        next(n + 1);
+      });
+
+      add(n => {
+        log.push(2);
+        next(n + 1);
+      });
+
+      add(n => {
+        log.push(3);
+        next(n + 1);
+      });
+
+      add(n => {
+        log.push(4);
+        next(n + 1);
+      });
+
+      add(n => {
+        log.push(5);
+        next(n + 11);
+      });
+
+      next(0);
+    });
+
+    it('only calls complete once even if multiple next', done => {
+      const { add, next } = createCallbackList<number>(n => {
+        expect(n).toBe(1);
+        done();
+      });
+
+      add(n => {
+        next(n + 1);
+        // We dont actually do this in our code...
+        next(n + 1);
+      });
+
+      next(0);
+    });
+
+    it('calls completed if added closure throws', done => {
+      const { add, next } = createCallbackList<number>(n => {
+        expect(n).toBe(10);
+        done();
+      });
+
+      add(n => {
+        throw new Error('test');
+        next(n + 1);
+      });
+
+      next(10);
+    });
+  });
 });

From 3a91a626de81f982e5336063b7cea618a068e946 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Wed, 29 Mar 2023 16:02:19 +0200
Subject: [PATCH 34/50] fix(nextjs): Show errors and warnings only once during
 build (#7651)

---
 packages/nextjs/src/config/webpack.ts | 55 ++++++++++++++++++---------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index f4e2ce71de29..4cce69f5c2c0 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -28,6 +28,13 @@ const RUNTIME_TO_SDK_ENTRYPOINT_MAP = {
   edge: './edge',
 } as const;
 
+// Next.js runs webpack 3 times, once for the client, the server, and for edge. Because we don't want to print certain
+// warnings 3 times, we keep track of them here.
+let showedMissingAuthTokenErrorMsg = false;
+let showedMissingOrgSlugErrorMsg = false;
+let showedMissingProjectSlugErrorMsg = false;
+let showedHiddenSourceMapsWarningMsg = false;
+
 // TODO: merge default SentryWebpackPlugin ignore with their SentryWebpackPlugin ignore or ignoreFile
 // TODO: merge default SentryWebpackPlugin include with their SentryWebpackPlugin include
 // TODO: drop merged keys from override check? `includeDefaults` option?
@@ -649,12 +656,15 @@ export function getWebpackPluginOptions(
               )} environment variable during the build.`;
           }
 
-          // eslint-disable-next-line no-console
-          console.error(
-            `${errorMessagePrefix} ${chalk.bold(
-              'No Sentry auth token configured.',
-            )} Source maps will not be uploaded.\n${msg}\n`,
-          );
+          if (!showedMissingAuthTokenErrorMsg) {
+            // eslint-disable-next-line no-console
+            console.error(
+              `${errorMessagePrefix} ${chalk.bold(
+                'No Sentry auth token configured.',
+              )} Source maps will not be uploaded.\n${msg}\n`,
+            );
+            showedMissingAuthTokenErrorMsg = true;
+          }
 
           return;
         }
@@ -672,12 +682,15 @@ export function getWebpackPluginOptions(
             )} environment variable to the to your organization slug during the build.`;
           }
 
-          // eslint-disable-next-line no-console
-          console.error(
-            `${errorMessagePrefix} ${chalk.bold(
-              'No Sentry organization slug configured.',
-            )} Source maps will not be uploaded.\n${msg}\n`,
-          );
+          if (!showedMissingOrgSlugErrorMsg) {
+            // eslint-disable-next-line no-console
+            console.error(
+              `${errorMessagePrefix} ${chalk.bold(
+                'No Sentry organization slug configured.',
+              )} Source maps will not be uploaded.\n${msg}\n`,
+            );
+            showedMissingOrgSlugErrorMsg = true;
+          }
 
           return;
         }
@@ -695,12 +708,15 @@ export function getWebpackPluginOptions(
             )} environment variable to the name of your Sentry project during the build.`;
           }
 
-          // eslint-disable-next-line no-console
-          console.error(
-            `${errorMessagePrefix} ${chalk.bold(
-              'No Sentry project slug configured.',
-            )} Source maps will not be uploaded.\n${msg}\n`,
-          );
+          if (!showedMissingProjectSlugErrorMsg) {
+            // eslint-disable-next-line no-console
+            console.error(
+              `${errorMessagePrefix} ${chalk.bold(
+                'No Sentry project slug configured.',
+              )} Source maps will not be uploaded.\n${msg}\n`,
+            );
+            showedMissingProjectSlugErrorMsg = true;
+          }
 
           return;
         }
@@ -775,7 +791,7 @@ function handleSourcemapHidingOptionWarning(userSentryOptions: UserSentryOptions
   const _sentry_ = codeFormat('sentry');
   const _nextConfigJS_ = codeFormat('next.config.js');
 
-  if (isServer && userSentryOptions.hideSourceMaps === undefined) {
+  if (isServer && userSentryOptions.hideSourceMaps === undefined && !showedHiddenSourceMapsWarningMsg) {
     // eslint-disable-next-line no-console
     console.warn(
       `\n${_warningPrefix_} In order to be able to deminify errors, ${_sentryNextjs_} creates sourcemaps and uploads ` +
@@ -787,6 +803,7 @@ function handleSourcemapHidingOptionWarning(userSentryOptions: UserSentryOptions
         'https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/#use-hidden-source-map for more ' +
         'information.\n',
     );
+    showedHiddenSourceMapsWarningMsg = true;
   }
 
   // TODO (v8): Remove the check above in favor of the one below

From 1b04113b7df6af3aec4ed1cf8e2cb3be381169db Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 16:29:19 +0200
Subject: [PATCH 35/50] ref(node): Clean up Undici options (#7646)

---
 .../node/src/integrations/undici/index.ts     | 44 ++++++++++--------
 packages/node/src/types.ts                    | 20 ++++----
 .../node/test/integrations/undici.test.ts     | 46 +++++++++++++++++--
 3 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/packages/node/src/integrations/undici/index.ts b/packages/node/src/integrations/undici/index.ts
index 11549b5d75dc..80c48a996f71 100644
--- a/packages/node/src/integrations/undici/index.ts
+++ b/packages/node/src/integrations/undici/index.ts
@@ -27,12 +27,13 @@ export interface UndiciOptions {
    * Defaults to true
    */
   breadcrumbs: boolean;
+  /**
+   * Function determining whether or not to create spans to track outgoing requests to the given URL.
+   * By default, spans will be created for all outgoing requests.
+   */
+  shouldCreateSpanForRequest: (url: string) => boolean;
 }
 
-const DEFAULT_UNDICI_OPTIONS: UndiciOptions = {
-  breadcrumbs: true,
-};
-
 // Please note that you cannot use `console.log` to debug the callbacks registered to the `diagnostics_channel` API.
 // To debug, you can use `writeFileSync` to write to a file:
 // https://nodejs.org/api/async_hooks.html#printing-in-asynchook-callbacks
@@ -60,8 +61,8 @@ export class Undici implements Integration {
 
   public constructor(_options: Partial<UndiciOptions> = {}) {
     this._options = {
-      ...DEFAULT_UNDICI_OPTIONS,
-      ..._options,
+      breadcrumbs: _options.breadcrumbs === undefined ? true : _options.breadcrumbs,
+      shouldCreateSpanForRequest: _options.shouldCreateSpanForRequest || (() => true),
     };
   }
 
@@ -88,6 +89,11 @@ export class Undici implements Integration {
 
     // https://github.com/nodejs/undici/blob/e6fc80f809d1217814c044f52ed40ef13f21e43c/docs/api/DiagnosticsChannel.md
     ds.subscribe(ChannelName.RequestCreate, message => {
+      const hub = getCurrentHub();
+      if (!hub.getIntegration(Undici)) {
+        return;
+      }
+
       const { request } = message as RequestCreateMessage;
 
       const url = new URL(request.path, request.origin);
@@ -97,7 +103,6 @@ export class Undici implements Integration {
         return;
       }
 
-      const hub = getCurrentHub();
       const client = hub.getClient<NodeClient>();
       const scope = hub.getScope();
 
@@ -105,12 +110,7 @@ export class Undici implements Integration {
 
       if (activeSpan && client) {
         const clientOptions = client.getOptions();
-
-        // eslint-disable-next-line deprecation/deprecation
-        const shouldCreateSpan = clientOptions.shouldCreateSpanForRequest
-          ? // eslint-disable-next-line deprecation/deprecation
-            clientOptions.shouldCreateSpanForRequest(stringUrl)
-          : true;
+        const shouldCreateSpan = this._options.shouldCreateSpanForRequest(stringUrl);
 
         if (shouldCreateSpan) {
           const data: Record<string, unknown> = {};
@@ -129,10 +129,8 @@ export class Undici implements Integration {
           });
           request.__sentry__ = span;
 
-          // eslint-disable-next-line deprecation/deprecation
           const shouldPropagate = clientOptions.tracePropagationTargets
-            ? // eslint-disable-next-line deprecation/deprecation
-              stringMatchesSomePattern(stringUrl, clientOptions.tracePropagationTargets)
+            ? stringMatchesSomePattern(stringUrl, clientOptions.tracePropagationTargets)
             : true;
 
           if (shouldPropagate) {
@@ -150,6 +148,11 @@ export class Undici implements Integration {
     });
 
     ds.subscribe(ChannelName.RequestEnd, message => {
+      const hub = getCurrentHub();
+      if (!hub.getIntegration(Undici)) {
+        return;
+      }
+
       const { request, response } = message as RequestEndMessage;
 
       const url = new URL(request.path, request.origin);
@@ -166,7 +169,7 @@ export class Undici implements Integration {
       }
 
       if (this._options.breadcrumbs) {
-        getCurrentHub().addBreadcrumb(
+        hub.addBreadcrumb(
           {
             category: 'http',
             data: {
@@ -186,6 +189,11 @@ export class Undici implements Integration {
     });
 
     ds.subscribe(ChannelName.RequestError, message => {
+      const hub = getCurrentHub();
+      if (!hub.getIntegration(Undici)) {
+        return;
+      }
+
       const { request } = message as RequestErrorMessage;
 
       const url = new URL(request.path, request.origin);
@@ -202,7 +210,7 @@ export class Undici implements Integration {
       }
 
       if (this._options.breadcrumbs) {
-        getCurrentHub().addBreadcrumb(
+        hub.addBreadcrumb(
           {
             category: 'http',
             data: {
diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts
index dd4713e97952..3e464d1c6457 100644
--- a/packages/node/src/types.ts
+++ b/packages/node/src/types.ts
@@ -32,19 +32,19 @@ export interface BaseNodeOptions {
    */
   includeLocalVariables?: boolean;
 
-  // TODO (v8): Remove this in v8
   /**
-   * @deprecated Moved to constructor options of the `Http` integration.
+   * List of strings/regex controlling to which outgoing requests
+   * the SDK will attach tracing headers.
+   *
+   * By default the SDK will attach those headers to all outgoing
+   * requests. If this option is provided, the SDK will match the
+   * request URL of outgoing requests against the items in this
+   * array, and only attach tracing headers if a match was found.
+   *
    * @example
    * ```js
    * Sentry.init({
-   *   integrations: [
-   *     new Sentry.Integrations.Http({
-   *       tracing: {
-   *         tracePropagationTargets: ['api.site.com'],
-   *       }
-   *     });
-   *   ],
+   *   tracePropagationTargets: ['api.site.com'],
    * });
    * ```
    */
@@ -52,7 +52,7 @@ export interface BaseNodeOptions {
 
   // TODO (v8): Remove this in v8
   /**
-   * @deprecated Moved to constructor options of the `Http` integration.
+   * @deprecated Moved to constructor options of the `Http` and `Undici` integration.
    * @example
    * ```js
    * Sentry.init({
diff --git a/packages/node/test/integrations/undici.test.ts b/packages/node/test/integrations/undici.test.ts
index d16a18497e0a..ecea01031af2 100644
--- a/packages/node/test/integrations/undici.test.ts
+++ b/packages/node/test/integrations/undici.test.ts
@@ -4,6 +4,7 @@ import * as http from 'http';
 import type { fetch as FetchType } from 'undici';
 
 import { NodeClient } from '../../src/client';
+import type { UndiciOptions } from '../../src/integrations/undici';
 import { Undici } from '../../src/integrations/undici';
 import { getDefaultNodeClientOptions } from '../helper/node-client-options';
 import { conditionalTest } from '../utils';
@@ -150,8 +151,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
     const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
     hub.getScope().setSpan(transaction);
 
-    const client = new NodeClient({ ...DEFAULT_OPTIONS, shouldCreateSpanForRequest: url => url.includes('yes') });
-    hub.bindClient(client);
+    const undoPatch = patchUndici(hub, { shouldCreateSpanForRequest: url => url.includes('yes') });
 
     await fetch('http://localhost:18099/no', { method: 'POST' });
 
@@ -160,6 +160,8 @@ conditionalTest({ min: 16 })('Undici integration', () => {
     await fetch('http://localhost:18099/yes', { method: 'POST' });
 
     expect(transaction.spanRecorder?.spans.length).toBe(2);
+
+    undoPatch();
   });
 
   it('attaches the sentry trace and baggage headers', async () => {
@@ -181,8 +183,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
     const transaction = hub.startTransaction({ name: 'test-transaction' }) as Transaction;
     hub.getScope().setSpan(transaction);
 
-    const client = new NodeClient({ ...DEFAULT_OPTIONS, shouldCreateSpanForRequest: url => url.includes('yes') });
-    hub.bindClient(client);
+    const undoPatch = patchUndici(hub, { shouldCreateSpanForRequest: url => url.includes('yes') });
 
     await fetch('http://localhost:18099/no', { method: 'POST' });
 
@@ -193,6 +194,8 @@ conditionalTest({ min: 16 })('Undici integration', () => {
 
     expect(requestHeaders['sentry-trace']).toBeDefined();
     expect(requestHeaders['baggage']).toBeDefined();
+
+    undoPatch();
   });
 
   it('uses tracePropagationTargets', async () => {
@@ -270,6 +273,16 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       // ignore
     }
   });
+
+  it('does not add a breadcrumb if disabled', async () => {
+    expect.assertions(0);
+
+    const undoPatch = patchUndici(hub, { breadcrumbs: false });
+
+    await fetch('http://localhost:18099', { method: 'POST' });
+
+    undoPatch();
+  });
 });
 
 interface TestServerOptions {
@@ -318,3 +331,28 @@ function setupTestServer() {
     testServer?.on('listening', resolve);
   });
 }
+
+function patchUndici(hub: Hub, userOptions: Partial<UndiciOptions>): () => void {
+  let options: any = {};
+  const client = hub.getClient();
+  if (client) {
+    const undici = client.getIntegration(Undici);
+    if (undici) {
+      // @ts-ignore need to access private property
+      options = { ...undici._options };
+      // @ts-ignore need to access private property
+      undici._options = Object.assign(undici._options, userOptions);
+    }
+  }
+
+  return () => {
+    const client = hub.getClient();
+    if (client) {
+      const undici = client.getIntegration(Undici);
+      if (undici) {
+        // @ts-ignore need to access private property
+        undici._options = { ...options };
+      }
+    }
+  };
+}

From 9e98330a2f25a7335d7ea08f6e4b3611fef00956 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 18:21:00 +0200
Subject: [PATCH 36/50] feat(nextjs): Add Undici integration automatically
 (#7648)

---
 packages/nextjs/src/server/index.ts    | 2 ++
 packages/nextjs/test/serverSdk.test.ts | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index 386c2ff2e4d7..1eeafddb4251 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -174,6 +174,8 @@ function addServerIntegrations(options: NodeOptions): void {
     });
   }
 
+  integrations = addOrUpdateIntegration(new Integrations.Undici(), integrations);
+
   options.integrations = integrations;
 }
 
diff --git a/packages/nextjs/test/serverSdk.test.ts b/packages/nextjs/test/serverSdk.test.ts
index 21fc17dfe185..bb55d9f6e184 100644
--- a/packages/nextjs/test/serverSdk.test.ts
+++ b/packages/nextjs/test/serverSdk.test.ts
@@ -161,6 +161,15 @@ describe('Server init()', () => {
       expect(consoleIntegration).toBeDefined();
     });
 
+    it('adds the Undici integration', () => {
+      init({});
+
+      const nodeInitOptions = nodeInit.mock.calls[0][0] as ModifiedInitOptions;
+      const undiciIntegration = findIntegrationByName(nodeInitOptions.integrations, 'Undici');
+
+      expect(undiciIntegration).toBeDefined();
+    });
+
     describe('`Http` integration', () => {
       it('adds `Http` integration with tracing enabled if `tracesSampleRate` is set', () => {
         init({ tracesSampleRate: 1.0 });

From 120ae6de8b918fd617691d43bec48083f8066878 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Wed, 29 Mar 2023 18:21:23 +0200
Subject: [PATCH 37/50] feat(sveltekit): Add Undici integration by default
 (#7650)

---
 packages/sveltekit/src/server/sdk.ts       |  9 ++++++++-
 packages/sveltekit/test/server/sdk.test.ts | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/sveltekit/src/server/sdk.ts b/packages/sveltekit/src/server/sdk.ts
index 1d1bbdbf2674..79f78b2b1908 100644
--- a/packages/sveltekit/src/server/sdk.ts
+++ b/packages/sveltekit/src/server/sdk.ts
@@ -1,6 +1,7 @@
 import { configureScope } from '@sentry/core';
 import type { NodeOptions } from '@sentry/node';
-import { init as initNodeSdk } from '@sentry/node';
+import { init as initNodeSdk, Integrations } from '@sentry/node';
+import { addOrUpdateIntegration } from '@sentry/utils';
 
 import { applySdkMetadata } from '../common/metadata';
 
@@ -11,9 +12,15 @@ import { applySdkMetadata } from '../common/metadata';
 export function init(options: NodeOptions): void {
   applySdkMetadata(options, ['sveltekit', 'node']);
 
+  addServerIntegrations(options);
+
   initNodeSdk(options);
 
   configureScope(scope => {
     scope.setTag('runtime', 'node');
   });
 }
+
+function addServerIntegrations(options: NodeOptions): void {
+  options.integrations = addOrUpdateIntegration(new Integrations.Undici(), options.integrations || []);
+}
diff --git a/packages/sveltekit/test/server/sdk.test.ts b/packages/sveltekit/test/server/sdk.test.ts
index c68be548c91c..5b1a924b6f1a 100644
--- a/packages/sveltekit/test/server/sdk.test.ts
+++ b/packages/sveltekit/test/server/sdk.test.ts
@@ -47,5 +47,20 @@ describe('Sentry server SDK', () => {
       // @ts-ignore need access to protected _tags attribute
       expect(currentScope._tags).toEqual({ runtime: 'node' });
     });
+
+    it('adds the Undici integration', () => {
+      init({});
+
+      expect(nodeInit).toHaveBeenCalledTimes(1);
+      expect(nodeInit).toHaveBeenCalledWith(
+        expect.objectContaining({
+          integrations: expect.arrayContaining([
+            expect.objectContaining({
+              name: 'Undici',
+            }),
+          ]),
+        }),
+      );
+    });
   });
 });

From a3dfde6a34b10c763d3b9162e78d82051087230c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 08:32:12 +0200
Subject: [PATCH 38/50] fix(sveltekit): Explicitly export Node SDK exports
 (#7644)

Fix Node SDK exports not being available in prod builds. For example, calling `Sentry.withScope(...)` throws an error because `withScope` is not defined on the top-level namespace. This is because for CJS, Vite puts wildcard-exported properties into the `default` property rather than onto the namespace in production builds.
---
 packages/sveltekit/src/index.client.ts |  6 ----
 packages/sveltekit/src/index.server.ts |  8 -----
 packages/sveltekit/src/server/index.ts | 50 ++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/packages/sveltekit/src/index.client.ts b/packages/sveltekit/src/index.client.ts
index 98d53afc24d2..4f1cce44fa36 100644
--- a/packages/sveltekit/src/index.client.ts
+++ b/packages/sveltekit/src/index.client.ts
@@ -1,7 +1 @@
 export * from './client';
-
-/**
- * This const serves no purpose besides being an identifier for this file that the SDK multiplexer loader can use to
- * determine that this is in fact a file that wants to be multiplexed.
- */
-export const _SENTRY_SDK_MULTIPLEXER = true;
diff --git a/packages/sveltekit/src/index.server.ts b/packages/sveltekit/src/index.server.ts
index acedc021218b..82b6fe6cbff4 100644
--- a/packages/sveltekit/src/index.server.ts
+++ b/packages/sveltekit/src/index.server.ts
@@ -1,10 +1,2 @@
 export * from './server';
 export * from './config';
-
-// This file is the main entrypoint on the server and/or when the package is `require`d
-
-/**
- * This const serves no purpose besides being an identifier for this file that the SDK multiplexer loader can use to
- * determine that this is in fact a file that wants to be multiplexed.
- */
-export const _SENTRY_SDK_MULTIPLEXER = true;
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 9109f29499d4..9a8648a5cafd 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -1,5 +1,55 @@
+// Node SDK exports
+// Unfortunately, we cannot `exprt * from '@sentry/node'` because in prod builds,
+// Vite puts these exports into a `default` property (Sentry.default) rather than
+// on the top - level namespace.
+// Hence, we export everything from the Node SDK explicitly:
+export {
+  addGlobalEventProcessor,
+  addBreadcrumb,
+  captureException,
+  captureEvent,
+  captureMessage,
+  configureScope,
+  createTransport,
+  extractTraceparentData,
+  getActiveTransaction,
+  getHubFromCarrier,
+  getCurrentHub,
+  Hub,
+  makeMain,
+  Scope,
+  startTransaction,
+  SDK_VERSION,
+  setContext,
+  setExtra,
+  setExtras,
+  setTag,
+  setTags,
+  setUser,
+  spanStatusfromHttpCode,
+  trace,
+  withScope,
+  autoDiscoverNodePerformanceMonitoringIntegrations,
+  makeNodeTransport,
+  defaultIntegrations,
+  defaultStackParser,
+  lastEventId,
+  flush,
+  close,
+  getSentryRelease,
+  addRequestDataToEvent,
+  DEFAULT_USER_INCLUDES,
+  extractRequestData,
+  deepReadDirSync,
+  Integrations,
+  Handlers,
+} from '@sentry/node';
+
+// We can still leave this for the carrier init and type exports
 export * from '@sentry/node';
 
+// -------------------------
+// SvelteKit SDK exports:
 export { init } from './sdk';
 export { handleErrorWithSentry } from './handleError';
 export { wrapLoadWithSentry } from './load';

From 6678a4a636258925c076dba922aa80918efe1143 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 08:32:36 +0200
Subject: [PATCH 39/50] doc(sveltekit): Update README (#7653)

---
 packages/sveltekit/README.md | 79 ++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 30 deletions(-)

diff --git a/packages/sveltekit/README.md b/packages/sveltekit/README.md
index 48a53c1abaae..1efb93716ca1 100644
--- a/packages/sveltekit/README.md
+++ b/packages/sveltekit/README.md
@@ -19,7 +19,9 @@ TODO: No docs yet, comment back in once we have docs
 
 ## SDK Status
 
-This SDK is currently in **Alpha state** and we're still experimenting with APIs and functionality. We therefore make no guarantees in terms of semver or breaking changes. If you want to try this SDK and come across a problem, please open a [GitHub Issue](https://github.com/getsentry/sentry-javascript/issues/new/choose).
+This SDK is currently in **Alpha state** and we're still experimenting with APIs and functionality.
+We therefore make no guarantees in terms of semver or breaking changes.
+If you want to try this SDK and come across a problem, please open a [GitHub Issue](https://github.com/getsentry/sentry-javascript/issues/new/choose).
 
 ## Compatibility
 
@@ -27,7 +29,7 @@ Currently, the minimum supported version of SvelteKit is `1.0.0`.
 
 ## General
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/svelte` for the client, with added functionality related to SvelteKit.
+This package is a wrapper around `@sentry/node` for the server and `@sentry/svelte` for the client side, with added functionality related to SvelteKit.
 
 ## Usage
 
@@ -55,7 +57,7 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
 
     Sentry.init({
       dsn: '__DSN__',
-
+      traceSampleRate: 1.0,
       // For instance, initialize Session Replay:
       replaysSessionSampleRate: 0.1,
       replaysOnErrorSampleRate: 1.0,
@@ -63,18 +65,8 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
     });
    ```
 
-4. Add our `withSentryViteConfig` wrapper around your Vite config so that the Sentry SDK is added to your application in `vite.config.(js|ts)`:
-   ```javascript
-    import { sveltekit } from '@sveltejs/kit/vite';
-    import { withSentryViteConfig } from '@sentry/sveltekit';
-
-    export default withSentryViteConfig({
-      plugins: [sveltekit()],
-      // ...
-    });
-   ```
 
-5. Create a `sentry.server.config.(js|ts)` file in the root directory of your SvelteKit project.
+4. Create a `sentry.server.config.(js|ts)` file in the root directory of your SvelteKit project.
    In this file you can configure the server-side Sentry SDK, like the Sentry Node SDK:
 
    ```javascript
@@ -82,45 +74,72 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
 
     Sentry.init({
       dsn: '__DSN__',
+      traceSampleRate: 1.0,
     });
    ```
 
-6. To catch errors in your `load` functions in `+page.(js|ts)`, wrap our `wrapLoadWithSentry` function:
-
+5. Add our `withSentryViteConfig` wrapper around your Vite config so that the Sentry SDK is added to your application in `vite.config.(js|ts)`:
    ```javascript
-    import { wrapLoadWithSentry } from '@sentry/sveltekit';
+    import { sveltekit } from '@sveltejs/kit/vite';
+    import { withSentryViteConfig } from '@sentry/sveltekit';
 
-    export const load = wrapLoadWithSentry((event) => {
-      //...
+    export default withSentryViteConfig({
+      plugins: [sveltekit()],
+      // ...
     });
    ```
 
-7. In your `hooks.client.(js|ts)` or `hooks.server.(js|ts)`, you can wrap the `handleError` function as follows:
+6. In your `hooks.client.(js|ts)` or `hooks.server.(js|ts)`, wrap the `handleError` functions as follows:
 
    ```javascript
     import { handleErrorWithSentry } from '@sentry/sveltekit';
-    import type { HandleClientError } from '@sveltejs/kit';
 
     const myErrorHandler = ((input) => {
-      console.log('This is the client error handler');
-      console.log(input.error);
-    }) satisfies HandleClientError;
+      console.error('An error occurred on the client-side');
+      return error;
+    });
 
     export const handleError = handleErrorWithSentry(myErrorHandler);
-
     // or alternatively, if you don't have a custom error handler:
     // export const handleError = handleErrorWithSentry();
    ```
 
+7. To capture performance data on the server-side, add our handler to the `handle` hook in `hooks.server.ts`:
+
+   ```javascript
+    import { sentryHandle } from '@sentry/sveltekit';
+
+    export const handle = sentryHandle;
+    // or alternatively, if you already have a handler defined, use the `sequence` function
+    // see: https://kit.svelte.dev/docs/modules#sveltejs-kit-hooks-sequence
+    // export const handle = sequence(sentryHandle, yourHandler);
+   ```
+
+8. To catch errors and performance data in your universal `load` functions (e.g. in `+page.(js|ts)`), wrap our `wrapLoadWithSentry` function around your load code:
+
+    ```javascript
+    import { wrapLoadWithSentry } from '@sentry/sveltekit';
+
+    export const load = wrapLoadWithSentry((event) => {
+      //... your load code
+    });
+    ```
+
+9. To catch errors and performance data in your server `load` functions (e.g. in `+page.server.(js|ts)`), wrap our `wrapServerLoadWithSentry` function around your load code:
+
+    ```javascript
+    import { wrapServerLoadWithSentry } from '@sentry/sveltekit';
+
+    export const load = wrapServerLoadWithSentry((event) => {
+      //... your server load code
+    });
+    ```
+
 ## Known Limitations
 
 This SDK is still under active development and several features are missing.
 Take a look at our [SvelteKit SDK Development Roadmap](https://github.com/getsentry/sentry-javascript/issues/6692) to follow the progress:
 
-- **Performance monitoring** is not yet fully supported.
-  You can add the `BrowserTracing` integration but proper instrumentation for routes, page loads and navigations is still missing.
-  This will be addressed next, as we release the next alpha builds.
-
 - **Source Maps** upload is not yet working correctly.
   We already investigated [some options](https://github.com/getsentry/sentry-javascript/discussions/5838#discussioncomment-4696985) but uploading source maps doesn't work automtatically out of the box yet.
   This will be addressed next, as we release the next alpha builds.
@@ -129,5 +148,5 @@ Take a look at our [SvelteKit SDK Development Roadmap](https://github.com/getsen
   We haven't yet tested other platforms like Vercel.
   This is on our roadmap but it will come at a later time.
 
-- We're aiming to **simplify SDK setup** in the future so that you don't have to go in and manually add our wrappers to all your `load` functions and hooks.
+- We're aiming to **simplify SDK setup** in the future so that you don't have to go in and manually add our wrappers to all your `load` functions.
   This will be addressed once the SDK supports all Sentry features.

From dc0179c0395915dfb852f272c9a183b87e38a14a Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 08:34:42 +0200
Subject: [PATCH 40/50] ref(sveltekit): Split up universal and server load
 wrappers (#7652)

 Split up the previously generic `handleLoadWithSentry` wrapper function into two functions on the server side:

* `handleLoadWithSentry` to wrap universal load on server and client
* `handleServerLoadWithSentry` to wrap server load on the server (duh)

It further adjusts types on the client as well as on the server side to return a generic. The very liberal typing of the functions' generic is on purpose because any type that's more narrowed down (e.g. `T extends Load`) would create a type error with the users' actual load types. These types (e.g. `PageData` or `ServerLayoutData`) are generated at build time per route/page. Hence, we cannot access them.
---
 packages/sveltekit/src/client/load.ts        |  18 +-
 packages/sveltekit/src/index.types.ts        |  22 +-
 packages/sveltekit/src/server/handle.ts      |  15 +-
 packages/sveltekit/src/server/index.ts       |   2 +-
 packages/sveltekit/src/server/load.ts        | 100 ++++---
 packages/sveltekit/src/server/utils.ts       |  19 ++
 packages/sveltekit/test/server/load.test.ts  | 295 +++++++++++--------
 packages/sveltekit/test/server/utils.test.ts |  55 ++++
 8 files changed, 336 insertions(+), 190 deletions(-)
 create mode 100644 packages/sveltekit/src/server/utils.ts
 create mode 100644 packages/sveltekit/test/server/utils.test.ts

diff --git a/packages/sveltekit/src/client/load.ts b/packages/sveltekit/src/client/load.ts
index 32f310e3bd2d..e7e9a6673999 100644
--- a/packages/sveltekit/src/client/load.ts
+++ b/packages/sveltekit/src/client/load.ts
@@ -1,7 +1,7 @@
 import { trace } from '@sentry/core';
 import { captureException } from '@sentry/svelte';
 import { addExceptionMechanism, objectify } from '@sentry/utils';
-import type { Load } from '@sveltejs/kit';
+import type { LoadEvent } from '@sveltejs/kit';
 
 function sendErrorToSentry(e: unknown): unknown {
   // In case we have a primitive, wrap it in the equivalent wrapper class (string -> String, etc.) so that we can
@@ -27,14 +27,18 @@ function sendErrorToSentry(e: unknown): unknown {
 }
 
 /**
- * Wrap load function with Sentry
- *
- * @param origLoad SvelteKit user defined load function
+ * @inheritdoc
  */
-export function wrapLoadWithSentry(origLoad: Load): Load {
+// The liberal generic typing of `T` is necessary because we cannot let T extend `Load`.
+// This function needs to tell TS that it returns exactly the type that it was called with
+// because SvelteKit generates the narrowed down `PageLoad` or `LayoutLoad` types
+// at build time for every route.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T): T {
   return new Proxy(origLoad, {
-    apply: (wrappingTarget, thisArg, args: Parameters<Load>) => {
-      const [event] = args;
+    apply: (wrappingTarget, thisArg, args: Parameters<T>) => {
+      // Type casting here because `T` cannot extend `Load` (see comment above function signature)
+      const event = args[0] as LoadEvent;
 
       const routeId = event.route.id;
       return trace(
diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts
index 1c1c0576729f..c29315bc0181 100644
--- a/packages/sveltekit/src/index.types.ts
+++ b/packages/sveltekit/src/index.types.ts
@@ -9,7 +9,7 @@ export * from './server';
 
 import type { Integration, Options, StackParser } from '@sentry/types';
 // eslint-disable-next-line import/no-unresolved
-import type { HandleClientError, HandleServerError, Load, ServerLoad } from '@sveltejs/kit';
+import type { HandleClientError, HandleServerError } from '@sveltejs/kit';
 
 import type * as clientSdk from './client';
 import type * as serverSdk from './server';
@@ -21,7 +21,25 @@ export declare function handleErrorWithSentry<T extends HandleClientError | Hand
   handleError?: T,
 ): ReturnType<T>;
 
-export declare function wrapLoadWithSentry<S extends ServerLoad | Load>(origLoad: S): S;
+/**
+ * Wrap a universal load function (e.g. +page.js or +layout.js) with Sentry functionality
+ *
+ * Usage:
+ *
+ * ```js
+ * // +page.js
+ *
+ * import { wrapLoadWithSentry }
+ *
+ * export const load = wrapLoadWithSentry((event) => {
+ *   // your load code
+ * });
+ * ```
+ *
+ * @param origLoad SvelteKit user defined universal `load` function
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export declare function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T): T;
 
 // We export a merged Integrations object so that users can (at least typing-wise) use all integrations everywhere.
 export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
index fa6c10648741..cc291e63f579 100644
--- a/packages/sveltekit/src/server/handle.ts
+++ b/packages/sveltekit/src/server/handle.ts
@@ -2,16 +2,12 @@
 import type { Span } from '@sentry/core';
 import { getActiveTransaction, getCurrentHub, trace } from '@sentry/core';
 import { captureException } from '@sentry/node';
-import {
-  addExceptionMechanism,
-  baggageHeaderToDynamicSamplingContext,
-  dynamicSamplingContextToSentryBaggageHeader,
-  extractTraceparentData,
-  objectify,
-} from '@sentry/utils';
+import { addExceptionMechanism, dynamicSamplingContextToSentryBaggageHeader, objectify } from '@sentry/utils';
 import type { Handle, ResolveOptions } from '@sveltejs/kit';
 import * as domain from 'domain';
 
+import { getTracePropagationData } from './utils';
+
 function sendErrorToSentry(e: unknown): unknown {
   // In case we have a primitive, wrap it in the equivalent wrapper class (string -> String, etc.) so that we can
   // store a seen flag on it.
@@ -77,10 +73,7 @@ export const sentryHandle: Handle = input => {
 };
 
 function instrumentHandle({ event, resolve }: Parameters<Handle>[0]): ReturnType<Handle> {
-  const sentryTraceHeader = event.request.headers.get('sentry-trace');
-  const baggageHeader = event.request.headers.get('baggage');
-  const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
-  const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
+  const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
 
   return trace(
     {
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 9a8648a5cafd..37143c09fea3 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -52,5 +52,5 @@ export * from '@sentry/node';
 // SvelteKit SDK exports:
 export { init } from './sdk';
 export { handleErrorWithSentry } from './handleError';
-export { wrapLoadWithSentry } from './load';
+export { wrapLoadWithSentry, wrapServerLoadWithSentry } from './load';
 export { sentryHandle } from './handle';
diff --git a/packages/sveltekit/src/server/load.ts b/packages/sveltekit/src/server/load.ts
index 068a1f4d0f8d..a050a5e904ba 100644
--- a/packages/sveltekit/src/server/load.ts
+++ b/packages/sveltekit/src/server/load.ts
@@ -1,14 +1,11 @@
 /* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import { trace } from '@sentry/core';
 import { captureException } from '@sentry/node';
-import type { DynamicSamplingContext, TraceparentData, TransactionContext } from '@sentry/types';
-import {
-  addExceptionMechanism,
-  baggageHeaderToDynamicSamplingContext,
-  extractTraceparentData,
-  objectify,
-} from '@sentry/utils';
-import type { HttpError, Load, LoadEvent, ServerLoad, ServerLoadEvent } from '@sveltejs/kit';
+import type { TransactionContext } from '@sentry/types';
+import { addExceptionMechanism, objectify } from '@sentry/utils';
+import type { HttpError, LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
+
+import { getTracePropagationData } from './utils';
 
 function isHttpError(err: unknown): err is HttpError {
   return typeof err === 'object' && err !== null && 'status' in err && 'body' in err;
@@ -45,27 +42,27 @@ function sendErrorToSentry(e: unknown): unknown {
 }
 
 /**
- * Wrap load function with Sentry
- *
- * @param origLoad SvelteKit user defined load function
+ * @inheritdoc
  */
-export function wrapLoadWithSentry<T extends ServerLoad | Load>(origLoad: T): T {
+// The liberal generic typing of `T` is necessary because we cannot let T extend `Load`.
+// This function needs to tell TS that it returns exactly the type that it was called with
+// because SvelteKit generates the narrowed down `PageLoad` or `LayoutLoad` types
+// at build time for every route.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T): T {
   return new Proxy(origLoad, {
-    apply: (wrappingTarget, thisArg, args: Parameters<ServerLoad | Load>) => {
-      const [event] = args;
+    apply: (wrappingTarget, thisArg, args: Parameters<T>) => {
+      // Type casting here because `T` cannot extend `Load` (see comment above function signature)
+      const event = args[0] as LoadEvent;
       const routeId = event.route && event.route.id;
 
-      const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
-
       const traceLoadContext: TransactionContext = {
-        op: `function.sveltekit${isServerOnlyLoad(event) ? '.server' : ''}.load`,
+        op: 'function.sveltekit.load',
         name: routeId ? routeId : event.url.pathname,
         status: 'ok',
         metadata: {
           source: routeId ? 'route' : 'url',
-          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
         },
-        ...traceparentData,
       };
 
       return trace(traceLoadContext, () => wrappingTarget.apply(thisArg, args), sendErrorToSentry);
@@ -73,30 +70,49 @@ export function wrapLoadWithSentry<T extends ServerLoad | Load>(origLoad: T): T
   });
 }
 
-function getTracePropagationData(event: ServerLoadEvent | LoadEvent): {
-  traceparentData?: TraceparentData;
-  dynamicSamplingContext?: Partial<DynamicSamplingContext>;
-} {
-  if (!isServerOnlyLoad(event)) {
-    return {};
-  }
-
-  const sentryTraceHeader = event.request.headers.get('sentry-trace');
-  const baggageHeader = event.request.headers.get('baggage');
-  const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
-  const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
-
-  return { traceparentData, dynamicSamplingContext };
-}
-
 /**
- * Our server-side wrapLoadWithSentry can be used to wrap two different kinds of `load` functions:
- *  - load functions from `+(page|layout).ts`: These can be called both on client and on server
- *  - load functions from `+(page|layout).server.ts`: These are only called on the server
+ * Wrap a server-only load function (e.g. +page.server.js or +layout.server.js) with Sentry functionality
+ *
+ * Usage:
+ *
+ * ```js
+ * // +page.serverjs
  *
- * In both cases, load events look differently. We can distinguish them by checking if the
- * event has a `request` field (which only the server-exclusive load event has).
+ * import { wrapServerLoadWithSentry }
+ *
+ * export const load = wrapServerLoadWithSentry((event) => {
+ *   // your load code
+ * });
+ * ```
+ *
+ * @param origServerLoad SvelteKit user defined server-only load function
  */
-function isServerOnlyLoad(event: ServerLoadEvent | LoadEvent): event is ServerLoadEvent {
-  return 'request' in event;
+// The liberal generic typing of `T` is necessary because we cannot let T extend `ServerLoad`.
+// This function needs to tell TS that it returns exactly the type that it was called with
+// because SvelteKit generates the narrowed down `PageServerLoad` or `LayoutServerLoad` types
+// at build time for every route.
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function wrapServerLoadWithSentry<T extends (...args: any) => any>(origServerLoad: T): T {
+  return new Proxy(origServerLoad, {
+    apply: (wrappingTarget, thisArg, args: Parameters<T>) => {
+      // Type casting here because `T` cannot extend `ServerLoad` (see comment above function signature)
+      const event = args[0] as ServerLoadEvent;
+      const routeId = event.route && event.route.id;
+
+      const { dynamicSamplingContext, traceparentData } = getTracePropagationData(event);
+
+      const traceLoadContext: TransactionContext = {
+        op: 'function.sveltekit.server.load',
+        name: routeId ? routeId : event.url.pathname,
+        status: 'ok',
+        metadata: {
+          source: routeId ? 'route' : 'url',
+          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+        },
+        ...traceparentData,
+      };
+
+      return trace(traceLoadContext, () => wrappingTarget.apply(thisArg, args), sendErrorToSentry);
+    },
+  });
 }
diff --git a/packages/sveltekit/src/server/utils.ts b/packages/sveltekit/src/server/utils.ts
new file mode 100644
index 000000000000..67c3bfe9e050
--- /dev/null
+++ b/packages/sveltekit/src/server/utils.ts
@@ -0,0 +1,19 @@
+import type { DynamicSamplingContext, TraceparentData } from '@sentry/types';
+import { baggageHeaderToDynamicSamplingContext, extractTraceparentData } from '@sentry/utils';
+import type { RequestEvent } from '@sveltejs/kit';
+
+/**
+ * Takes a request event and extracts traceparent and DSC data
+ * from the `sentry-trace` and `baggage` DSC headers.
+ */
+export function getTracePropagationData(event: RequestEvent): {
+  traceparentData?: TraceparentData;
+  dynamicSamplingContext?: Partial<DynamicSamplingContext>;
+} {
+  const sentryTraceHeader = event.request.headers.get('sentry-trace');
+  const baggageHeader = event.request.headers.get('baggage');
+  const traceparentData = sentryTraceHeader ? extractTraceparentData(sentryTraceHeader) : undefined;
+  const dynamicSamplingContext = baggageHeaderToDynamicSamplingContext(baggageHeader);
+
+  return { traceparentData, dynamicSamplingContext };
+}
diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts
index 69c31a74595d..2671b0d5d217 100644
--- a/packages/sveltekit/test/server/load.test.ts
+++ b/packages/sveltekit/test/server/load.test.ts
@@ -1,10 +1,10 @@
 import { addTracingExtensions } from '@sentry/core';
 import { Scope } from '@sentry/node';
-import type { ServerLoad } from '@sveltejs/kit';
+import type { Load, ServerLoad } from '@sveltejs/kit';
 import { error } from '@sveltejs/kit';
 import { vi } from 'vitest';
 
-import { wrapLoadWithSentry } from '../../src/server/load';
+import { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../../src/server/load';
 
 const mockCaptureException = vi.fn();
 let mockScope = new Scope();
@@ -114,16 +114,19 @@ beforeAll(() => {
   addTracingExtensions();
 });
 
-describe('wrapLoadWithSentry', () => {
-  beforeEach(() => {
-    mockCaptureException.mockClear();
-    mockAddExceptionMechanism.mockClear();
-    mockTrace.mockClear();
-    mockScope = new Scope();
-  });
+beforeEach(() => {
+  mockCaptureException.mockClear();
+  mockAddExceptionMechanism.mockClear();
+  mockTrace.mockClear();
+  mockScope = new Scope();
+});
 
+describe.each([
+  ['wrapLoadWithSentry', wrapLoadWithSentry],
+  ['wrapServerLoadWithSentry', wrapServerLoadWithSentry],
+])('Common functionality of load wrappers (%s) ', (_, sentryLoadWrapperFn) => {
   it('calls captureException', async () => {
-    async function load({ params }: Parameters<ServerLoad>[0]): Promise<ReturnType<ServerLoad>> {
+    async function load({ params }) {
       return {
         post: getById(params.id),
       };
@@ -151,12 +154,12 @@ describe('wrapLoadWithSentry', () => {
       [503, 1],
       [504, 1],
     ])('error with status code %s calls captureException %s times', async (code, times) => {
-      async function load({ params }: Parameters<ServerLoad>[0]): Promise<ReturnType<ServerLoad>> {
+      async function load({ params }) {
         throw error(code, params.id);
       }
 
       const wrappedLoad = wrapLoadWithSentry(load);
-      const res = wrappedLoad(MOCK_LOAD_ARGS);
+      const res = wrappedLoad({ ...MOCK_LOAD_ARGS });
       await expect(res).rejects.toThrow();
 
       expect(mockCaptureException).toHaveBeenCalledTimes(times);
@@ -169,14 +172,14 @@ describe('wrapLoadWithSentry', () => {
       return mockScope;
     });
 
-    async function load({ params }: Parameters<ServerLoad>[0]): Promise<ReturnType<ServerLoad>> {
+    async function load({ params }) {
       return {
         post: getById(params.id),
       };
     }
 
-    const wrappedLoad = wrapLoadWithSentry(load);
-    const res = wrappedLoad(MOCK_LOAD_ARGS);
+    const wrappedLoad = sentryLoadWrapperFn.call(this, load);
+    const res = wrappedLoad(MOCK_SERVER_ONLY_LOAD_ARGS);
     await expect(res).rejects.toThrow();
 
     expect(addEventProcessorSpy).toBeCalledTimes(1);
@@ -186,125 +189,163 @@ describe('wrapLoadWithSentry', () => {
       { handled: false, type: 'sveltekit', data: { function: 'load' } },
     );
   });
+});
+describe('wrapLoadWithSentry calls trace', () => {
+  async function load({ params }: Parameters<Load>[0]): Promise<ReturnType<Load>> {
+    return {
+      post: params.id,
+    };
+  }
+
+  it('with the context of the universal load function', async () => {
+    const wrappedLoad = wrapLoadWithSentry(load);
+    await wrappedLoad(MOCK_LOAD_ARGS);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.load',
+        name: '/users/[id]',
+        status: 'ok',
+        metadata: {
+          source: 'route',
+        },
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
+  });
 
-  describe('calls trace', () => {
-    async function load({ params }: Parameters<ServerLoad>[0]): Promise<ReturnType<ServerLoad>> {
-      return {
-        post: params.id,
-      };
-    }
+  it('falls back to the raw url if `event.route.id` is not available', async () => {
+    const wrappedLoad = wrapLoadWithSentry(load);
+    await wrappedLoad(MOCK_LOAD_NO_ROUTE_ARGS);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.load',
+        name: '/users/123',
+        status: 'ok',
+        metadata: {
+          source: 'url',
+        },
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
+  });
+});
 
-    describe('for server-only load', () => {
-      it('attaches trace data if available', async () => {
-        const wrappedLoad = wrapLoadWithSentry(load);
-        await wrappedLoad(MOCK_SERVER_ONLY_LOAD_ARGS);
-
-        expect(mockTrace).toHaveBeenCalledTimes(1);
-        expect(mockTrace).toHaveBeenCalledWith(
-          {
-            op: 'function.sveltekit.server.load',
-            name: '/users/[id]',
-            parentSampled: true,
-            parentSpanId: '1234567890abcdef',
-            status: 'ok',
-            traceId: '1234567890abcdef1234567890abcdef',
-            metadata: {
-              dynamicSamplingContext: {
-                environment: 'production',
-                public_key: 'dogsarebadatkeepingsecrets',
-                release: '1.0.0',
-                sample_rate: '1',
-                trace_id: '1234567890abcdef1234567890abcdef',
-                transaction: 'dogpark',
-                user_segment: 'segmentA',
-              },
-              source: 'route',
-            },
-          },
-          expect.any(Function),
-          expect.any(Function),
-        );
-      });
-
-      it("doesn't attach trace data if it's not available", async () => {
-        const wrappedLoad = wrapLoadWithSentry(load);
-        await wrappedLoad(MOCK_SERVER_ONLY_NO_TRACE_LOAD_ARGS);
-
-        expect(mockTrace).toHaveBeenCalledTimes(1);
-        expect(mockTrace).toHaveBeenCalledWith(
-          {
-            op: 'function.sveltekit.server.load',
-            name: '/users/[id]',
-            status: 'ok',
-            metadata: {
-              source: 'route',
-            },
-          },
-          expect.any(Function),
-          expect.any(Function),
-        );
-      });
-
-      it("doesn't attach the DSC data if the baggage header not available", async () => {
-        const wrappedLoad = wrapLoadWithSentry(load);
-        await wrappedLoad(MOCK_SERVER_ONLY_NO_BAGGAGE_LOAD_ARGS);
-
-        expect(mockTrace).toHaveBeenCalledTimes(1);
-        expect(mockTrace).toHaveBeenCalledWith(
-          {
-            op: 'function.sveltekit.server.load',
-            name: '/users/[id]',
-            parentSampled: true,
-            parentSpanId: '1234567890abcdef',
-            status: 'ok',
-            traceId: '1234567890abcdef1234567890abcdef',
-            metadata: {
-              dynamicSamplingContext: {},
-              source: 'route',
-            },
+describe('wrapServerLoadWithSentry calls trace', () => {
+  async function serverLoad({ params }: Parameters<ServerLoad>[0]): Promise<ReturnType<ServerLoad>> {
+    return {
+      post: params.id,
+    };
+  }
+
+  it('attaches trace data if available', async () => {
+    const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
+    await wrappedLoad(MOCK_SERVER_ONLY_LOAD_ARGS);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.server.load',
+        name: '/users/[id]',
+        parentSampled: true,
+        parentSpanId: '1234567890abcdef',
+        status: 'ok',
+        traceId: '1234567890abcdef1234567890abcdef',
+        metadata: {
+          dynamicSamplingContext: {
+            environment: 'production',
+            public_key: 'dogsarebadatkeepingsecrets',
+            release: '1.0.0',
+            sample_rate: '1',
+            trace_id: '1234567890abcdef1234567890abcdef',
+            transaction: 'dogpark',
+            user_segment: 'segmentA',
           },
-          expect.any(Function),
-          expect.any(Function),
-        );
-      });
-    });
+          source: 'route',
+        },
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
+  });
 
-    it('for shared load', async () => {
-      const wrappedLoad = wrapLoadWithSentry(load);
-      await wrappedLoad(MOCK_LOAD_ARGS);
-
-      expect(mockTrace).toHaveBeenCalledTimes(1);
-      expect(mockTrace).toHaveBeenCalledWith(
-        {
-          op: 'function.sveltekit.load',
-          name: '/users/[id]',
-          status: 'ok',
-          metadata: {
-            source: 'route',
-          },
+  it("doesn't attach trace data if it's not available", async () => {
+    const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
+    await wrappedLoad(MOCK_SERVER_ONLY_NO_TRACE_LOAD_ARGS);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.server.load',
+        name: '/users/[id]',
+        status: 'ok',
+        metadata: {
+          source: 'route',
         },
-        expect.any(Function),
-        expect.any(Function),
-      );
-    });
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
+  });
 
-    it('falls back to the raw url if `event.route.id` is not available', async () => {
-      const wrappedLoad = wrapLoadWithSentry(load);
-      await wrappedLoad(MOCK_LOAD_NO_ROUTE_ARGS);
-
-      expect(mockTrace).toHaveBeenCalledTimes(1);
-      expect(mockTrace).toHaveBeenCalledWith(
-        {
-          op: 'function.sveltekit.load',
-          name: '/users/123',
-          status: 'ok',
-          metadata: {
-            source: 'url',
+  it("doesn't attach the DSC data if the baggage header not available", async () => {
+    const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
+    await wrappedLoad(MOCK_SERVER_ONLY_NO_BAGGAGE_LOAD_ARGS);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.server.load',
+        name: '/users/[id]',
+        parentSampled: true,
+        parentSpanId: '1234567890abcdef',
+        status: 'ok',
+        traceId: '1234567890abcdef1234567890abcdef',
+        metadata: {
+          dynamicSamplingContext: {},
+          source: 'route',
+        },
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
+  });
+
+  it('falls back to the raw url if `event.route.id` is not available', async () => {
+    const event = { ...MOCK_SERVER_ONLY_LOAD_ARGS };
+    delete event.route;
+    const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
+    await wrappedLoad(event);
+
+    expect(mockTrace).toHaveBeenCalledTimes(1);
+    expect(mockTrace).toHaveBeenCalledWith(
+      {
+        op: 'function.sveltekit.server.load',
+        name: '/users/123',
+        parentSampled: true,
+        parentSpanId: '1234567890abcdef',
+        status: 'ok',
+        traceId: '1234567890abcdef1234567890abcdef',
+        metadata: {
+          dynamicSamplingContext: {
+            environment: 'production',
+            public_key: 'dogsarebadatkeepingsecrets',
+            release: '1.0.0',
+            sample_rate: '1',
+            trace_id: '1234567890abcdef1234567890abcdef',
+            transaction: 'dogpark',
+            user_segment: 'segmentA',
           },
+          source: 'url',
         },
-        expect.any(Function),
-        expect.any(Function),
-      );
-    });
+      },
+      expect.any(Function),
+      expect.any(Function),
+    );
   });
 });
diff --git a/packages/sveltekit/test/server/utils.test.ts b/packages/sveltekit/test/server/utils.test.ts
new file mode 100644
index 000000000000..8e5c064c338c
--- /dev/null
+++ b/packages/sveltekit/test/server/utils.test.ts
@@ -0,0 +1,55 @@
+import { getTracePropagationData } from '../../src/server/utils';
+
+const MOCK_REQUEST_EVENT: any = {
+  request: {
+    headers: {
+      get: (key: string) => {
+        if (key === 'sentry-trace') {
+          return '1234567890abcdef1234567890abcdef-1234567890abcdef-1';
+        }
+
+        if (key === 'baggage') {
+          return (
+            'sentry-environment=production,sentry-release=1.0.0,sentry-transaction=dogpark,' +
+            'sentry-user_segment=segmentA,sentry-public_key=dogsarebadatkeepingsecrets,' +
+            'sentry-trace_id=1234567890abcdef1234567890abcdef,sentry-sample_rate=1'
+          );
+        }
+
+        return null;
+      },
+    },
+  },
+};
+
+describe('getTracePropagationData', () => {
+  it('returns traceParentData and DSC if both are available', () => {
+    const event: any = MOCK_REQUEST_EVENT;
+
+    const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
+
+    expect(traceparentData).toEqual({
+      parentSampled: true,
+      parentSpanId: '1234567890abcdef',
+      traceId: '1234567890abcdef1234567890abcdef',
+    });
+
+    expect(dynamicSamplingContext).toEqual({
+      environment: 'production',
+      public_key: 'dogsarebadatkeepingsecrets',
+      release: '1.0.0',
+      sample_rate: '1',
+      trace_id: '1234567890abcdef1234567890abcdef',
+      transaction: 'dogpark',
+      user_segment: 'segmentA',
+    });
+  });
+
+  it('returns undefined if the necessary header is not avaolable', () => {
+    const event: any = { request: { headers: { get: () => undefined } } };
+    const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
+
+    expect(traceparentData).toBeUndefined();
+    expect(dynamicSamplingContext).toBeUndefined();
+  });
+});

From e055f2730a9cddefae7fe763193c569ecbbb3ba4 Mon Sep 17 00:00:00 2001
From: Ash Anand <0Calories@users.noreply.github.com>
Date: Thu, 30 Mar 2023 03:39:34 -0400
Subject: [PATCH 41/50] feat(tracing): Add custom finishReason for when
 interaction is interrupted by another (#7655)

---
 packages/core/src/tracing/idletransaction.ts        | 13 +++++++++++++
 .../tracing-internal/src/browser/browsertracing.ts  |  1 +
 2 files changed, 14 insertions(+)

diff --git a/packages/core/src/tracing/idletransaction.ts b/packages/core/src/tracing/idletransaction.ts
index 77b7d5317da1..4939a4fe58bd 100644
--- a/packages/core/src/tracing/idletransaction.ts
+++ b/packages/core/src/tracing/idletransaction.ts
@@ -251,6 +251,19 @@ export class IdleTransaction extends Transaction {
     }
   }
 
+  /**
+   * Temporary method used to externally set the transaction's `finishReason`
+   *
+   * ** WARNING**
+   * This is for the purpose of experimentation only and will be removed in the near future, do not use!
+   *
+   * @internal
+   *
+   */
+  public setFinishReason(reason: string): void {
+    this._finishReason = reason;
+  }
+
   /**
    * Restarts idle timeout, if there is no running idle timeout it will start one.
    */
diff --git a/packages/tracing-internal/src/browser/browsertracing.ts b/packages/tracing-internal/src/browser/browsertracing.ts
index 99ce53dd022b..bb4347bec26f 100644
--- a/packages/tracing-internal/src/browser/browsertracing.ts
+++ b/packages/tracing-internal/src/browser/browsertracing.ts
@@ -330,6 +330,7 @@ export class BrowserTracing implements Integration {
 
       const op = 'ui.action.click';
       if (inflightInteractionTransaction) {
+        inflightInteractionTransaction.setFinishReason('interactionInterrupted');
         inflightInteractionTransaction.finish();
         inflightInteractionTransaction = undefined;
       }

From d98ac5d53c0c9b0946a03d127610ddbabf60a411 Mon Sep 17 00:00:00 2001
From: Ash Anand <0Calories@users.noreply.github.com>
Date: Thu, 30 Mar 2023 04:24:45 -0400
Subject: [PATCH 42/50] feat(tracing): Do not create interactions if
 `navigation` or `pageload` transaction active (#7614)

Co-authored-by: Francesco Novy <francesco.novy@sentry.io>
Co-authored-by: Abhijeet Prasad <aprasad@sentry.io>
---
 .../src/browser/browsertracing.ts             | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/tracing-internal/src/browser/browsertracing.ts b/packages/tracing-internal/src/browser/browsertracing.ts
index bb4347bec26f..deb240ec4233 100644
--- a/packages/tracing-internal/src/browser/browsertracing.ts
+++ b/packages/tracing-internal/src/browser/browsertracing.ts
@@ -1,6 +1,12 @@
 /* eslint-disable max-lines */
 import type { Hub, IdleTransaction } from '@sentry/core';
-import { addTracingExtensions, extractTraceparentData, startIdleTransaction, TRACING_DEFAULTS } from '@sentry/core';
+import {
+  addTracingExtensions,
+  extractTraceparentData,
+  getActiveTransaction,
+  startIdleTransaction,
+  TRACING_DEFAULTS,
+} from '@sentry/core';
 import type { EventProcessor, Integration, Transaction, TransactionContext, TransactionSource } from '@sentry/types';
 import { baggageHeaderToDynamicSamplingContext, getDomElement, logger } from '@sentry/utils';
 
@@ -327,8 +333,17 @@ export class BrowserTracing implements Integration {
     let inflightInteractionTransaction: IdleTransaction | undefined;
     const registerInteractionTransaction = (): void => {
       const { idleTimeout, finalTimeout, heartbeatInterval } = this.options;
-
       const op = 'ui.action.click';
+
+      const currentTransaction = getActiveTransaction();
+      if (currentTransaction && currentTransaction.op && ['navigation', 'pageload'].includes(currentTransaction.op)) {
+        __DEBUG_BUILD__ &&
+          logger.warn(
+            `[Tracing] Did not create ${op} transaction because a pageload or navigation transaction is in progress.`,
+          );
+        return undefined;
+      }
+
       if (inflightInteractionTransaction) {
         inflightInteractionTransaction.setFinishReason('interactionInterrupted');
         inflightInteractionTransaction.finish();

From bb11a2eed239f8f2ad7c47ff2075e8d868deeb80 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Thu, 30 Mar 2023 11:09:30 +0200
Subject: [PATCH 43/50] feat(node): Add Sentry tRPC middleware (#7511)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Ogórek <kamil.ogorek@gmail.com>
---
 packages/node/src/handlers.ts | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/packages/node/src/handlers.ts b/packages/node/src/handlers.ts
index 4e54406704e6..5dfcb7bf0a13 100644
--- a/packages/node/src/handlers.ts
+++ b/packages/node/src/handlers.ts
@@ -10,6 +10,7 @@ import {
   extractTraceparentData,
   isString,
   logger,
+  normalize,
 } from '@sentry/utils';
 import * as domain from 'domain';
 import type * as http from 'http';
@@ -315,6 +316,49 @@ export function errorHandler(options?: {
   };
 }
 
+interface SentryTrpcMiddlewareOptions {
+  /** Whether to include procedure inputs in reported events. Defaults to `false`. */
+  attachRpcInput?: boolean;
+}
+
+interface TrpcMiddlewareArguments<T> {
+  path: string;
+  type: 'query' | 'mutation' | 'subscription';
+  next: () => T;
+  rawInput: unknown;
+}
+
+/**
+ * Sentry tRPC middleware that names the handling transaction after the called procedure.
+ *
+ * Use the Sentry tRPC middleware in combination with the Sentry server integration,
+ * e.g. Express Request Handlers or Next.js SDK.
+ */
+export async function trpcMiddleware(options: SentryTrpcMiddlewareOptions = {}) {
+  return function <T>({ path, type, next, rawInput }: TrpcMiddlewareArguments<T>): T {
+    const hub = getCurrentHub();
+    const clientOptions = hub.getClient()?.getOptions();
+    const sentryTransaction = hub.getScope()?.getTransaction();
+
+    if (sentryTransaction) {
+      sentryTransaction.setName(`trcp/${path}`, 'route');
+      sentryTransaction.op = 'rpc.server';
+
+      const trpcContext: Record<string, unknown> = {
+        procedure_type: type,
+      };
+
+      if (options.attachRpcInput !== undefined ? options.attachRpcInput : clientOptions?.sendDefaultPii) {
+        trpcContext.input = normalize(rawInput);
+      }
+
+      sentryTransaction.setContext('trpc', trpcContext);
+    }
+
+    return next();
+  };
+}
+
 // TODO (v8 / #5257): Remove this
 // eslint-disable-next-line deprecation/deprecation
 export type { ParseRequestOptions, ExpressRequest } from './requestDataDeprecated';

From cefd523350998475e43cbcf28407c96de8736be4 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 11:12:56 +0200
Subject: [PATCH 44/50] ref(sveltekit): Inject init plugin only if sentry
 config files exist (#7663)

To make our Sentry SDK setup easier, we'll instruct users to init the SDK in the hooks files rather than in the dedicated sentry.client|server.config.js files (#7661). To support this change, this PR makes the injection of our `injectSentryInitPlugin` into the users' build config depend on the existence of said sentry config files. If they don't exist, there's no need to add the plugin or adjust the server config.
---
 packages/sveltekit/src/config/vitePlugins.ts  |  8 +++--
 .../src/config/withSentryViteConfig.ts        | 32 ++++++++++++-----
 .../test/config/withSentryViteConfig.test.ts  | 34 +++++++++++++++++++
 3 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/packages/sveltekit/src/config/vitePlugins.ts b/packages/sveltekit/src/config/vitePlugins.ts
index 49df160b718a..1bb2a477b3e5 100644
--- a/packages/sveltekit/src/config/vitePlugins.ts
+++ b/packages/sveltekit/src/config/vitePlugins.ts
@@ -60,7 +60,11 @@ function addSentryConfigFileImport(
   return { code: ms.toString(), map: ms.generateMap() };
 }
 
-function getUserConfigFile(projectDir: string, platform: 'server' | 'client'): string | undefined {
+/**
+ * Looks up the sentry.{@param platform}.config.(ts|js) file
+ * @returns the file path to the file or undefined if it doesn't exist
+ */
+export function getUserConfigFile(projectDir: string, platform: 'server' | 'client'): string | undefined {
   const possibilities = [`sentry.${platform}.config.ts`, `sentry.${platform}.config.js`];
 
   for (const filename of possibilities) {
@@ -69,5 +73,5 @@ function getUserConfigFile(projectDir: string, platform: 'server' | 'client'): s
     }
   }
 
-  throw new Error(`Cannot find '${possibilities[0]}' or '${possibilities[1]}' in '${projectDir}'.`);
+  return undefined;
 }
diff --git a/packages/sveltekit/src/config/withSentryViteConfig.ts b/packages/sveltekit/src/config/withSentryViteConfig.ts
index a5fabf3241ee..94a493b14974 100644
--- a/packages/sveltekit/src/config/withSentryViteConfig.ts
+++ b/packages/sveltekit/src/config/withSentryViteConfig.ts
@@ -1,6 +1,6 @@
 import type { UserConfig, UserConfigExport } from 'vite';
 
-import { injectSentryInitPlugin } from './vitePlugins';
+import { getUserConfigFile, injectSentryInitPlugin } from './vitePlugins';
 
 /**
  * This function adds Sentry-specific configuration to your Vite config.
@@ -31,17 +31,27 @@ export function withSentryViteConfig(originalConfig: UserConfigExport): UserConf
 }
 
 function addSentryConfig(originalConfig: UserConfig): UserConfig {
+  const sentryPlugins = [];
+
+  const shouldAddInjectInitPlugin = hasSentryInitFiles();
+
+  if (shouldAddInjectInitPlugin) {
+    sentryPlugins.push(injectSentryInitPlugin);
+  }
+
   const config = {
     ...originalConfig,
-    plugins: originalConfig.plugins ? [injectSentryInitPlugin, ...originalConfig.plugins] : [injectSentryInitPlugin],
+    plugins: originalConfig.plugins ? [...sentryPlugins, ...originalConfig.plugins] : [...sentryPlugins],
   };
 
-  const mergedDevServerFileSystemConfig: UserConfig['server'] = {
-    fs: {
-      ...(config.server && config.server.fs),
-      allow: [...((config.server && config.server.fs && config.server.fs.allow) || []), '.'],
-    },
-  };
+  const mergedDevServerFileSystemConfig: UserConfig['server'] = shouldAddInjectInitPlugin
+    ? {
+        fs: {
+          ...(config.server && config.server.fs),
+          allow: [...((config.server && config.server.fs && config.server.fs.allow) || []), '.'],
+        },
+      }
+    : {};
 
   config.server = {
     ...config.server,
@@ -50,3 +60,9 @@ function addSentryConfig(originalConfig: UserConfig): UserConfig {
 
   return config;
 }
+
+function hasSentryInitFiles(): boolean {
+  const hasSentryServerInit = !!getUserConfigFile(process.cwd(), 'server');
+  const hasSentryClientInit = !!getUserConfigFile(process.cwd(), 'client');
+  return hasSentryServerInit || hasSentryClientInit;
+}
diff --git a/packages/sveltekit/test/config/withSentryViteConfig.test.ts b/packages/sveltekit/test/config/withSentryViteConfig.test.ts
index 1ed7cf5d3d51..9dc08eae487a 100644
--- a/packages/sveltekit/test/config/withSentryViteConfig.test.ts
+++ b/packages/sveltekit/test/config/withSentryViteConfig.test.ts
@@ -1,7 +1,17 @@
+import type fs from 'fs';
 import type { Plugin, UserConfig } from 'vite';
+import { vi } from 'vitest';
 
 import { withSentryViteConfig } from '../../src/config/withSentryViteConfig';
 
+let existsFile = true;
+vi.mock('fs', async () => {
+  const original = await vi.importActual<typeof fs>('fs');
+  return {
+    ...original,
+    existsSync: vi.fn().mockImplementation(() => existsFile),
+  };
+});
 describe('withSentryViteConfig', () => {
   const originalConfig = {
     plugins: [{ name: 'foo' }],
@@ -115,4 +125,28 @@ describe('withSentryViteConfig', () => {
 
     expect((sentrifiedConfig as UserConfig).server?.fs?.allow).toStrictEqual(['.']);
   });
+
+  it("doesn't add the inject init plugin or the server config if sentry config files don't exist", () => {
+    existsFile = false;
+
+    const sentrifiedConfig = withSentryViteConfig({
+      plugins: [{ name: 'some plugin' }],
+      test: {
+        include: ['src/**/*.{test,spec}.{js,ts}'],
+      },
+      server: {
+        fs: {
+          allow: ['./bar'],
+        },
+      },
+    } as UserConfig);
+
+    expect(typeof sentrifiedConfig).toBe('object');
+    const plugins = (sentrifiedConfig as UserConfig).plugins as Plugin[];
+    expect(plugins).toHaveLength(1);
+    expect(plugins[0].name).toBe('some plugin');
+    expect((sentrifiedConfig as UserConfig).server?.fs?.allow).toStrictEqual(['./bar']);
+
+    existsFile = true;
+  });
 });

From 1eb271a95cc547b4ce3c975d0b3d1ad6a624b5e6 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 11:13:22 +0200
Subject: [PATCH 45/50] doc(sveltekit): Move SDK initialization to hooks and
 restructure setup in README (#7661)

Restructures SDK setup into client, server and build setup sections. Also moves init call from dedicated files to hooks.
---
 packages/sveltekit/README.md | 77 +++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 24 deletions(-)

diff --git a/packages/sveltekit/README.md b/packages/sveltekit/README.md
index 1efb93716ca1..c64ef0b57d26 100644
--- a/packages/sveltekit/README.md
+++ b/packages/sveltekit/README.md
@@ -37,6 +37,8 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
 
 **Here's how to get started:**
 
+### 1. Prerequesits & Installation
+
 1. Ensure you've set up the [`@sveltejs/adapter-node` adapter](https://kit.svelte.dev/docs/adapter-node)
 
 2. Install the Sentry SvelteKit SDK:
@@ -49,8 +51,13 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
    yarn add @sentry/sveltekit
    ```
 
-3. Create a `sentry.client.config.(js|ts)` file in the root directory of your SvelteKit project.
-   In this file you can configure the client-side Sentry SDK just like every other browser-based SDK:
+### 2. Client-side Setup
+
+The Sentry SvelteKit SDK mostly relies on [SvelteKit Hooks](https://kit.svelte.dev/docs/hooks) to capture error and performance data.
+
+1. If you don't already have a `hooks.client.(js|ts)` file, create a new one.
+
+2. On the top of your `hooks.client.(js|ts)` file, initialize the Sentry SDK:
 
    ```javascript
     import * as Sentry from '@sentry/sveltekit';
@@ -61,42 +68,46 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
       // For instance, initialize Session Replay:
       replaysSessionSampleRate: 0.1,
       replaysOnErrorSampleRate: 1.0,
-      integrations: [new Sentry.Replay()]
+      integrations: [new Sentry.Replay()],
     });
    ```
 
-
-4. Create a `sentry.server.config.(js|ts)` file in the root directory of your SvelteKit project.
-   In this file you can configure the server-side Sentry SDK, like the Sentry Node SDK:
+3. Add our `handleErrorWithSentry` function to the `handleError` hook:
 
    ```javascript
-    import * as Sentry from '@sentry/sveltekit';
+    import { handleErrorWithSentry } from '@sentry/sveltekit';
 
-    Sentry.init({
-      dsn: '__DSN__',
-      traceSampleRate: 1.0,
+    const myErrorHandler = (({ error, event }) => {
+      console.error('An error occurred on the client side:', error, event);
     });
+
+    export const handleError = handleErrorWithSentry(myErrorHandler);
+    // or alternatively, if you don't have a custom error handler:
+    // export const handleError = handleErrorWithSentry();
    ```
 
-5. Add our `withSentryViteConfig` wrapper around your Vite config so that the Sentry SDK is added to your application in `vite.config.(js|ts)`:
-   ```javascript
-    import { sveltekit } from '@sveltejs/kit/vite';
-    import { withSentryViteConfig } from '@sentry/sveltekit';
+### 3. Server-side Setup
 
-    export default withSentryViteConfig({
-      plugins: [sveltekit()],
-      // ...
+1. If you don't already have a `hooks.server.(js|ts)` file, create a new one.
+
+2. On the top of your `hooks.server.(js|ts)` file, initialize the Sentry SDK:
+
+    ```javascript
+    import * as Sentry from '@sentry/sveltekit';
+
+    Sentry.init({
+      dsn: '__DSN__',
+      tracesSampleRate: 1.0,
     });
    ```
 
-6. In your `hooks.client.(js|ts)` or `hooks.server.(js|ts)`, wrap the `handleError` functions as follows:
+3. Add our `handleErrorWithSentry` function to the `handleError` hook:
 
    ```javascript
     import { handleErrorWithSentry } from '@sentry/sveltekit';
 
-    const myErrorHandler = ((input) => {
-      console.error('An error occurred on the client-side');
-      return error;
+    const myErrorHandler = (({ error, event }) => {
+      console.error('An error occurred on the server side:', error, event);
     });
 
     export const handleError = handleErrorWithSentry(myErrorHandler);
@@ -104,7 +115,7 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
     // export const handleError = handleErrorWithSentry();
    ```
 
-7. To capture performance data on the server-side, add our handler to the `handle` hook in `hooks.server.ts`:
+4. Add our request handler to the `handle` hook in `hooks.server.ts`:
 
    ```javascript
     import { sentryHandle } from '@sentry/sveltekit';
@@ -115,7 +126,9 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
     // export const handle = sequence(sentryHandle, yourHandler);
    ```
 
-8. To catch errors and performance data in your universal `load` functions (e.g. in `+page.(js|ts)`), wrap our `wrapLoadWithSentry` function around your load code:
+### 4. Configuring `load` Functions
+
+5. To catch errors and performance data in your universal `load` functions (e.g. in `+page.(js|ts)`), wrap our `wrapLoadWithSentry` function around your load code:
 
     ```javascript
     import { wrapLoadWithSentry } from '@sentry/sveltekit';
@@ -125,7 +138,7 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
     });
     ```
 
-9. To catch errors and performance data in your server `load` functions (e.g. in `+page.server.(js|ts)`), wrap our `wrapServerLoadWithSentry` function around your load code:
+6. To catch errors and performance data in your server `load` functions (e.g. in `+page.server.(js|ts)`), wrap our `wrapServerLoadWithSentry` function around your load code:
 
     ```javascript
     import { wrapServerLoadWithSentry } from '@sentry/sveltekit';
@@ -135,6 +148,22 @@ Although the SDK is not yet stable, you're more than welcome to give it a try an
     });
     ```
 
+### 5. Vite Setup
+
+3. Add our `withSentryViteConfig` wrapper around your Vite config so that the Sentry SDK can add its plugins to your Vite config `vite.config.(js|ts)`:
+   ```javascript
+    import { sveltekit } from '@sveltejs/kit/vite';
+    import { withSentryViteConfig } from '@sentry/sveltekit';
+
+    export default withSentryViteConfig({
+      plugins: [sveltekit()],
+      // ...
+    });
+   ```
+
+   In the near future this wrapper will add and configure our [Sentry Vite Plugin](https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/vite-plugin) to automatically upload source maps to Sentry.
+   Furthermore, if you prefer to intialize the Sentry SDK in dedicated files, instead of the hook files, you can move the `Sentry.init` code to `sentry.(client|server).config.(js|ts)` files and `withSentryViteConfig` will take care of adding them to your server and client bundles.
+
 ## Known Limitations
 
 This SDK is still under active development and several features are missing.

From 65c44ec76eb34f0427373cf8b0715c9d121efd47 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 30 Mar 2023 11:20:01 +0200
Subject: [PATCH 46/50] perf(build): Use @rollup/plugin-typescript for es5
 builds (#7665)

---
 package.json                    |  1 -
 rollup/plugins/bundlePlugins.js | 43 +++++++-----------
 yarn.lock                       | 77 +--------------------------------
 3 files changed, 18 insertions(+), 103 deletions(-)

diff --git a/package.json b/package.json
index e6a54d7d032c..33010e45cf14 100644
--- a/package.json
+++ b/package.json
@@ -110,7 +110,6 @@
     "rollup-plugin-cleanup": "3.2.1",
     "rollup-plugin-license": "^2.6.1",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.31.2",
     "sinon": "^7.3.2",
     "size-limit": "^4.5.5",
     "ts-jest": "^27.1.4",
diff --git a/rollup/plugins/bundlePlugins.js b/rollup/plugins/bundlePlugins.js
index 80f5123ca371..697de0c8a80f 100644
--- a/rollup/plugins/bundlePlugins.js
+++ b/rollup/plugins/bundlePlugins.js
@@ -5,7 +5,7 @@
  * Resolve plugin docs: https://github.com/rollup/plugins/tree/master/packages/node-resolve
  * Terser plugin docs: https://github.com/TrySound/rollup-plugin-terser#options
  * Terser docs: https://github.com/terser/terser#api-reference
- * Typescript plugin docs: https://github.com/ezolenko/rollup-plugin-typescript2
+ * Typescript plugin docs: https://github.com/rollup/plugins/tree/master/packages/typescript/#readme
  */
 
 import * as fs from 'fs';
@@ -17,7 +17,7 @@ import license from 'rollup-plugin-license';
 import resolve from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
 import { terser } from 'rollup-plugin-terser';
-import typescript from 'rollup-plugin-typescript2';
+import typescript from '@rollup/plugin-typescript';
 
 /**
  * Create a plugin to add an identification banner to the top of stand-alone bundles.
@@ -145,38 +145,27 @@ export function makeTerserPlugin() {
 export function makeTSPlugin(jsVersion) {
   const baseTSPluginOptions = {
     tsconfig: 'tsconfig.json',
-    tsconfigOverride: {
-      compilerOptions: {
-        declaration: false,
-        declarationMap: false,
-        paths: {
-          '@sentry/browser': ['../browser/src'],
-          '@sentry/core': ['../core/src'],
-          '@sentry/hub': ['../hub/src'],
-          '@sentry/types': ['../types/src'],
-          '@sentry/utils': ['../utils/src'],
-          '@sentry-internal/integration-shims': ['../integration-shims/src'],
-          '@sentry-internal/tracing': ['../tracing-internal/src'],
-        },
-        baseUrl: '.',
+    compilerOptions: {
+      declaration: false,
+      declarationMap: false,
+      paths: {
+        '@sentry/browser': ['../browser/src'],
+        '@sentry/core': ['../core/src'],
+        '@sentry/hub': ['../hub/src'],
+        '@sentry/types': ['../types/src'],
+        '@sentry/utils': ['../utils/src'],
+        '@sentry-internal/integration-shims': ['../integration-shims/src'],
+        '@sentry-internal/tracing': ['../tracing-internal/src'],
       },
+      baseUrl: '.',
     },
     include: ['*.ts+(|x)', '**/*.ts+(|x)', '../**/*.ts+(|x)'],
-    // the typescript plugin doesn't handle concurrency very well, so clean the cache between builds
-    // (see https://github.com/ezolenko/rollup-plugin-typescript2/issues/15)
-    clean: true,
-    // TODO: For the moment, the above issue seems to have stopped spamming the build with (non-blocking) errors, as it
-    // was originally. If it starts again, this will suppress that output. If we get to the end of the bundle revamp and
-    // it still seems okay, we can take this out entirely.
-    // verbosity: 0,
   };
 
   const plugin = typescript(
     deepMerge(baseTSPluginOptions, {
-      tsconfigOverride: {
-        compilerOptions: {
-          target: jsVersion,
-        },
+      compilerOptions: {
+        target: jsVersion,
       },
     }),
   );
diff --git a/yarn.lock b/yarn.lock
index 6726a721b75c..2503fd04fd5d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3992,7 +3992,7 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rollup/pluginutils@^4.1.1", "@rollup/pluginutils@^4.1.2":
+"@rollup/pluginutils@^4.1.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
   integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
@@ -4308,14 +4308,6 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
-"@ts-type/package-dts@^1.0.58":
-  version "1.0.58"
-  resolved "https://registry.yarnpkg.com/@ts-type/package-dts/-/package-dts-1.0.58.tgz#75f6fdf5f1e8f262a5081b90346439b4c4bc8d01"
-  integrity sha512-Ry5RPZDAnSz/gyLtjd2a2yNC07CZ/PCOsuDzYj3phOolIgEH68HXRw6SbsDlavnVUEenDYj5GUM10gQ5iVEbVQ==
-  dependencies:
-    "@types/semver" "^7.3.9"
-    ts-type "^2.1.4"
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -5054,7 +5046,7 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
   integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
 
-"@types/semver@^7.3.12", "@types/semver@^7.3.9":
+"@types/semver@^7.3.12":
   version "7.3.13"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
   integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
@@ -5740,16 +5732,6 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@yarn-tool/resolve-package@^1.0.40":
-  version "1.0.42"
-  resolved "https://registry.yarnpkg.com/@yarn-tool/resolve-package/-/resolve-package-1.0.42.tgz#4a72c1a77b7035dc86250744d2cdbc16292bc4f8"
-  integrity sha512-1BAsoiD6jGAaPc7mRH0UxIVXgRSTv7fnhwfKkaFUYpqsU4ZR7KIigZTMcb2bujtlzKQbNneMPQGjiqe3F8cmlw==
-  dependencies:
-    "@ts-type/package-dts" "^1.0.58"
-    pkg-dir "< 6 >= 5"
-    tslib "^2.3.1"
-    upath2 "^3.1.12"
-
 "@yarnpkg/lockfile@1.1.0", "@yarnpkg/lockfile@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
@@ -20635,13 +20617,6 @@ path-is-inside@^1.0.2:
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
 
-path-is-network-drive@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/path-is-network-drive/-/path-is-network-drive-1.0.13.tgz#c9aa0183eb72c328aa83f43def93ddcb9d7ec4d4"
-  integrity sha512-Hg74mRN6mmXV+gTm3INjFK40ncAmC/Lo4qoQaSZ+GT3hZzlKdWQSqAjqyPeW0SvObP2W073WyYEBWY9d3wOm3A==
-  dependencies:
-    tslib "^2.3.1"
-
 path-key@^2.0.0, path-key@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
@@ -20674,13 +20649,6 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-strip-sep@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/path-strip-sep/-/path-strip-sep-1.0.10.tgz#2be4e789406b298af8709ff79af716134b733b98"
-  integrity sha512-JpCy+8LAJQQTO1bQsb/84s1g+/Stm3h39aOpPRBQ/paMUGVPPZChLTOTKHoaCkc/6sKuF7yVsnq5Pe1S6xQGcA==
-  dependencies:
-    tslib "^2.3.1"
-
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -20883,13 +20851,6 @@ piscina@3.1.0:
   optionalDependencies:
     nice-napi "^1.0.2"
 
-"pkg-dir@< 6 >= 5":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760"
-  integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==
-  dependencies:
-    find-up "^5.0.0"
-
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -23537,18 +23498,6 @@ rollup-plugin-terser@^7.0.2:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup-plugin-typescript2@^0.31.2:
-  version "0.31.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.31.2.tgz#463aa713a7e2bf85b92860094b9f7fb274c5a4d8"
-  integrity sha512-hRwEYR1C8xDGVVMFJQdEVnNAeWRvpaY97g5mp3IeLnzhNXzSVq78Ye/BJ9PAaUfN4DXa/uDnqerifMOaMFY54Q==
-  dependencies:
-    "@rollup/pluginutils" "^4.1.2"
-    "@yarn-tool/resolve-package" "^1.0.40"
-    find-cache-dir "^3.3.2"
-    fs-extra "^10.0.0"
-    resolve "^1.20.0"
-    tslib "^2.3.1"
-
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -26136,14 +26085,6 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-ts-type@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/ts-type/-/ts-type-2.1.4.tgz#d268d52ac054ef3076bf1c3b2fde0d4d5496e6a3"
-  integrity sha512-wnajiiIMhn/RHJ1oPld95siKmMJrOgaT6+rMmC8vO1LORgDFEzKP2nBmEFM5b4XVe7Q0J5KcU9oRJFzju7UzrA==
-  dependencies:
-    tslib "^2.3.1"
-    typedarray-dts "^1.0.0"
-
 tsconfig-paths@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
@@ -26294,11 +26235,6 @@ type@^2.5.0:
   resolved "https://registry.yarnpkg.com/type/-/type-2.6.0.tgz#3ca6099af5981d36ca86b78442973694278a219f"
   integrity sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==
 
-typedarray-dts@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typedarray-dts/-/typedarray-dts-1.0.0.tgz#9dec9811386dbfba964c295c2606cf9a6b982d06"
-  integrity sha512-Ka0DBegjuV9IPYFT1h0Qqk5U4pccebNIJCGl8C5uU7xtOs+jpJvKGAY4fHGK25hTmXZOEUl9Cnsg5cS6K/b5DA==
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -26587,15 +26523,6 @@ untildify@^2.1.0:
   dependencies:
     os-homedir "^1.0.0"
 
-upath2@^3.1.12:
-  version "3.1.12"
-  resolved "https://registry.yarnpkg.com/upath2/-/upath2-3.1.12.tgz#441b3dfbadde21731017bd1b7beb169498efd0a9"
-  integrity sha512-yC3eZeCyCXFWjy7Nu4pgjLhXNYjuzuUmJiRgSSw6TJp8Emc+E4951HGPJf+bldFC5SL7oBLeNbtm1fGzXn2gxw==
-  dependencies:
-    path-is-network-drive "^1.0.13"
-    path-strip-sep "^1.0.10"
-    tslib "^2.3.1"
-
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"

From 9ecd152ebd37097cb2a5564ecd6480707ba669bd Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Thu, 30 Mar 2023 12:51:51 +0200
Subject: [PATCH 47/50] feat(node): Sanitize URLs in Span descriptions and
 breadcrumbs (#7667)

Co-authored-by: Alden Quimby <aldenquimby@gmail.com>
Co-authored-by: Alden Quimby <alden@freewill.com>
Co-authored-by: Michi Hoffmann <cleptric@users.noreply.github.com>
---
 packages/node/src/integrations/http.ts       | 47 ++++++++++++++++----
 packages/node/src/integrations/utils/http.ts | 29 ++++++++++--
 packages/node/test/integrations/http.test.ts | 33 ++++++++++++++
 3 files changed, 98 insertions(+), 11 deletions(-)

diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts
index ea7a9eae173d..aaa6581add9d 100644
--- a/packages/node/src/integrations/http.ts
+++ b/packages/node/src/integrations/http.ts
@@ -14,7 +14,7 @@ import { LRUMap } from 'lru_map';
 
 import type { NodeClient } from '../client';
 import type { RequestMethod, RequestMethodArgs } from './utils/http';
-import { cleanSpanDescription, extractUrl, isSentryRequest, normalizeRequestArgs } from './utils/http';
+import { cleanSpanDescription, extractRawUrl, extractUrl, isSentryRequest, normalizeRequestArgs } from './utils/http';
 
 const NODE_VERSION = parseSemver(process.versions.node);
 
@@ -129,6 +129,16 @@ type OriginalRequestMethod = RequestMethod;
 type WrappedRequestMethod = RequestMethod;
 type WrappedRequestMethodFactory = (original: OriginalRequestMethod) => WrappedRequestMethod;
 
+/**
+ * See https://develop.sentry.dev/sdk/data-handling/#structuring-data
+ */
+type RequestSpanData = {
+  url: string;
+  method: string;
+  'http.fragment'?: string;
+  'http.query'?: string;
+};
+
 /**
  * Function which creates a function which creates wrapped versions of internal `request` and `get` calls within `http`
  * and `https` modules. (NB: Not a typo - this is a creator^2!)
@@ -180,6 +190,8 @@ function _createWrappedRequestMethodFactory(
     return function wrappedMethod(this: unknown, ...args: RequestMethodArgs): http.ClientRequest {
       const requestArgs = normalizeRequestArgs(httpModule, args);
       const requestOptions = requestArgs[0];
+      // eslint-disable-next-line deprecation/deprecation
+      const rawRequestUrl = extractRawUrl(requestOptions);
       const requestUrl = extractUrl(requestOptions);
 
       // we don't want to record requests to Sentry as either breadcrumbs or spans, so just use the original method
@@ -192,16 +204,30 @@ function _createWrappedRequestMethodFactory(
 
       const scope = getCurrentHub().getScope();
 
-      if (scope && tracingOptions && shouldCreateSpan(requestUrl)) {
+      const requestSpanData: RequestSpanData = {
+        url: requestUrl,
+        method: requestOptions.method || 'GET',
+      };
+      if (requestOptions.hash) {
+        // strip leading "#"
+        requestSpanData['http.fragment'] = requestOptions.hash.substring(1);
+      }
+      if (requestOptions.search) {
+        // strip leading "?"
+        requestSpanData['http.query'] = requestOptions.search.substring(1);
+      }
+
+      if (scope && tracingOptions && shouldCreateSpan(rawRequestUrl)) {
         parentSpan = scope.getSpan();
 
         if (parentSpan) {
           requestSpan = parentSpan.startChild({
-            description: `${requestOptions.method || 'GET'} ${requestUrl}`,
+            description: `${requestSpanData.method} ${requestSpanData.url}`,
             op: 'http.client',
+            data: requestSpanData,
           });
 
-          if (shouldAttachTraceData(requestUrl)) {
+          if (shouldAttachTraceData(rawRequestUrl)) {
             const sentryTraceHeader = requestSpan.toTraceparent();
             __DEBUG_BUILD__ &&
               logger.log(
@@ -253,7 +279,7 @@ function _createWrappedRequestMethodFactory(
           // eslint-disable-next-line @typescript-eslint/no-this-alias
           const req = this;
           if (breadcrumbsEnabled) {
-            addRequestBreadcrumb('response', requestUrl, req, res);
+            addRequestBreadcrumb('response', requestSpanData, req, res);
           }
           if (requestSpan) {
             if (res.statusCode) {
@@ -268,7 +294,7 @@ function _createWrappedRequestMethodFactory(
           const req = this;
 
           if (breadcrumbsEnabled) {
-            addRequestBreadcrumb('error', requestUrl, req);
+            addRequestBreadcrumb('error', requestSpanData, req);
           }
           if (requestSpan) {
             requestSpan.setHttpStatus(500);
@@ -283,7 +309,12 @@ function _createWrappedRequestMethodFactory(
 /**
  * Captures Breadcrumb based on provided request/response pair
  */
-function addRequestBreadcrumb(event: string, url: string, req: http.ClientRequest, res?: http.IncomingMessage): void {
+function addRequestBreadcrumb(
+  event: string,
+  requestSpanData: RequestSpanData,
+  req: http.ClientRequest,
+  res?: http.IncomingMessage,
+): void {
   if (!getCurrentHub().getIntegration(Http)) {
     return;
   }
@@ -294,7 +325,7 @@ function addRequestBreadcrumb(event: string, url: string, req: http.ClientReques
       data: {
         method: req.method,
         status_code: res && res.statusCode,
-        url,
+        ...requestSpanData,
       },
       type: 'http',
     },
diff --git a/packages/node/src/integrations/utils/http.ts b/packages/node/src/integrations/utils/http.ts
index 1281f9d6329d..86902425914d 100644
--- a/packages/node/src/integrations/utils/http.ts
+++ b/packages/node/src/integrations/utils/http.ts
@@ -15,6 +15,25 @@ export function isSentryRequest(url: string): boolean {
   return dsn ? url.includes(dsn.host) : false;
 }
 
+/**
+ * Assembles a URL that's passed to the users to filter on.
+ * It can include raw (potentially PII containing) data, which we'll allow users to access to filter
+ * but won't include in spans or breadcrumbs.
+ *
+ * @param requestOptions RequestOptions object containing the component parts for a URL
+ * @returns Fully-formed URL
+ */
+// TODO (v8): This function should include auth, query and fragment (it's breaking, so we need to wait for v8)
+export function extractRawUrl(requestOptions: RequestOptions): string {
+  const protocol = requestOptions.protocol || '';
+  const hostname = requestOptions.hostname || requestOptions.host || '';
+  // Don't log standard :80 (http) and :443 (https) ports to reduce the noise
+  const port =
+    !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 ? '' : `:${requestOptions.port}`;
+  const path = requestOptions.path ? requestOptions.path : '/';
+  return `${protocol}//${hostname}${port}${path}`;
+}
+
 /**
  * Assemble a URL to be used for breadcrumbs and spans.
  *
@@ -27,9 +46,11 @@ export function extractUrl(requestOptions: RequestOptions): string {
   // Don't log standard :80 (http) and :443 (https) ports to reduce the noise
   const port =
     !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 ? '' : `:${requestOptions.port}`;
-  const path = requestOptions.path ? requestOptions.path : '/';
+  // do not include search or hash in span descriptions, per https://develop.sentry.dev/sdk/data-handling/#structuring-data
+  const path = requestOptions.pathname || '/';
+  const authority = requestOptions.auth ? `${requestOptions.auth}@` : '';
 
-  return `${protocol}//${hostname}${port}${path}`;
+  return `${protocol}//${authority}${hostname}${port}${path}`;
 }
 
 /**
@@ -59,6 +80,7 @@ export function cleanSpanDescription(
   if (requestOptions.host && !requestOptions.protocol) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
     requestOptions.protocol = (request as any)?.agent?.protocol; // worst comes to worst, this is undefined and nothing changes
+    // This URL contains the filtered authority ([filtered]:[filtered]@example.com) but no fragment or query params
     requestUrl = extractUrl(requestOptions);
   }
 
@@ -101,7 +123,8 @@ export function urlToOptions(url: URL): RequestOptions {
     options.port = Number(url.port);
   }
   if (url.username || url.password) {
-    options.auth = `${url.username}:${url.password}`;
+    // always filter authority, see https://develop.sentry.dev/sdk/data-handling/#structuring-data
+    options.auth = '[Filtered]:[Filtered]';
   }
   return options;
 }
diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts
index 7d9a4e45226b..555aad7f44b3 100644
--- a/packages/node/test/integrations/http.test.ts
+++ b/packages/node/test/integrations/http.test.ts
@@ -196,6 +196,39 @@ describe('tracing', () => {
     expect(loggerLogSpy).toBeCalledWith('HTTP Integration is skipped because of instrumenter configuration.');
   });
 
+  it('omits query and fragment from description and adds to span data instead', () => {
+    nock('http://dogs.are.great').get('/spaniel?tail=wag&cute=true#learn-more').reply(200);
+
+    const transaction = createTransactionOnScope();
+    const spans = (transaction as unknown as Span).spanRecorder?.spans as Span[];
+
+    http.get('http://dogs.are.great/spaniel?tail=wag&cute=true#learn-more');
+
+    expect(spans.length).toEqual(2);
+
+    // our span is at index 1 because the transaction itself is at index 0
+    expect(spans[1].description).toEqual('GET http://dogs.are.great/spaniel');
+    expect(spans[1].op).toEqual('http.client');
+    expect(spans[1].data.method).toEqual('GET');
+    expect(spans[1].data.url).toEqual('http://dogs.are.great/spaniel');
+    expect(spans[1].data['http.query']).toEqual('tail=wag&cute=true');
+    expect(spans[1].data['http.fragment']).toEqual('learn-more');
+  });
+
+  it('filters the authority (username and password) in span description', () => {
+    nock('http://username:password@dogs.are.great').get('/').reply(200);
+
+    const transaction = createTransactionOnScope();
+    const spans = (transaction as unknown as Span).spanRecorder?.spans as Span[];
+
+    http.get('http://username:password@dogs.are.great/');
+
+    expect(spans.length).toEqual(2);
+
+    // our span is at index 1 because the transaction itself is at index 0
+    expect(spans[1].description).toEqual('GET http://[Filtered]:[Filtered]@dogs.are.great/');
+  });
+
   describe('Tracing options', () => {
     beforeEach(() => {
       // hacky way of restoring monkey patched functions

From 1403e77d83f1cc7e6f9f08d5a030cc7e19a15b46 Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Thu, 30 Mar 2023 13:00:02 +0200
Subject: [PATCH 48/50] test: Make E2E tests async & parallelizable (#7466)

Co-authored-by: Luca Forstner <luca.forstner@sentry.io>
---
 .github/workflows/build.yml                   |   2 +-
 packages/e2e-tests/.eslintrc.js               |   2 +-
 packages/e2e-tests/.gitignore                 |   1 +
 packages/e2e-tests/README.md                  |   2 +-
 packages/e2e-tests/lib/buildApp.ts            |  80 ++++
 .../e2e-tests/lib/buildRecipeInstances.ts     |  47 ++
 packages/e2e-tests/lib/constants.ts           |   6 +
 packages/e2e-tests/lib/runAllTestApps.ts      |  84 ++++
 packages/e2e-tests/lib/runTestApp.ts          |  55 +++
 packages/e2e-tests/lib/testApp.ts             |  50 ++
 packages/e2e-tests/lib/types.ts               |  49 ++
 packages/e2e-tests/lib/utils.ts               |  69 +++
 packages/e2e-tests/lib/validate.ts            |  33 ++
 packages/e2e-tests/package.json               |   4 +-
 packages/e2e-tests/registrySetup.ts           |  96 ++++
 packages/e2e-tests/run.ts                     | 444 +-----------------
 .../create-next-app/package.json              |   4 +
 .../create-next-app/playwright.config.ts      |   4 +-
 .../create-next-app/test-recipe.json          |   2 +-
 .../create-next-app/tsconfig.json             |   3 +-
 .../create-react-app/package.json             |   4 +
 .../create-react-app/test-recipe.json         |   2 +-
 .../nextjs-app-dir/package.json               |   4 +
 .../nextjs-app-dir/playwright.config.ts       |   6 +-
 .../nextjs-app-dir/test-recipe.json           |   2 +-
 .../nextjs-app-dir/tsconfig.json              |   1 -
 .../node-express-app/package.json             |   4 +
 .../node-express-app/playwright.config.ts     |   4 +-
 .../node-express-app/src/app.ts               |   2 +-
 .../node-express-app/test-recipe.json         |   4 +-
 .../package.json                              |   4 +
 .../playwright.config.ts                      |   4 +-
 .../test-recipe.json                          |   2 +-
 .../standard-frontend-react/package.json      |   4 +
 .../playwright.config.ts                      |   4 +-
 .../standard-frontend-react/test-recipe.json  |   2 +-
 .../tests/fixtures/ReplayRecordingData.ts     |  12 +-
 packages/e2e-tests/test-recipe-schema.json    |   6 +-
 .../e2e-tests/verdaccio-config/config.yaml    |   2 +-
 yarn.lock                                     |  18 +-
 40 files changed, 659 insertions(+), 469 deletions(-)
 create mode 100644 packages/e2e-tests/lib/buildApp.ts
 create mode 100644 packages/e2e-tests/lib/buildRecipeInstances.ts
 create mode 100644 packages/e2e-tests/lib/constants.ts
 create mode 100644 packages/e2e-tests/lib/runAllTestApps.ts
 create mode 100644 packages/e2e-tests/lib/runTestApp.ts
 create mode 100644 packages/e2e-tests/lib/testApp.ts
 create mode 100644 packages/e2e-tests/lib/types.ts
 create mode 100644 packages/e2e-tests/lib/utils.ts
 create mode 100644 packages/e2e-tests/lib/validate.ts
 create mode 100644 packages/e2e-tests/registrySetup.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4ac4a75e150b..c23196e5ae80 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -185,7 +185,7 @@ jobs:
     name: Build
     needs: [job_get_metadata, job_install_deps]
     runs-on: ubuntu-20.04
-    timeout-minutes: 20
+    timeout-minutes: 30
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v3
diff --git a/packages/e2e-tests/.eslintrc.js b/packages/e2e-tests/.eslintrc.js
index 8c585e48f252..5ba76262baaf 100644
--- a/packages/e2e-tests/.eslintrc.js
+++ b/packages/e2e-tests/.eslintrc.js
@@ -3,7 +3,7 @@ module.exports = {
     node: true,
   },
   extends: ['../../.eslintrc.js'],
-  ignorePatterns: ['test-applications/**'],
+  ignorePatterns: ['test-applications/**', 'tmp/**'],
   parserOptions: {
     sourceType: 'module',
   },
diff --git a/packages/e2e-tests/.gitignore b/packages/e2e-tests/.gitignore
index 4c49bd78f1d0..a16add542a3f 100644
--- a/packages/e2e-tests/.gitignore
+++ b/packages/e2e-tests/.gitignore
@@ -1 +1,2 @@
 .env
+tmp
diff --git a/packages/e2e-tests/README.md b/packages/e2e-tests/README.md
index 2a30943f52f6..d8227481a25a 100644
--- a/packages/e2e-tests/README.md
+++ b/packages/e2e-tests/README.md
@@ -54,7 +54,7 @@ To get you started with the recipe, you can copy the following into `test-recipe
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "My New Test Application",
-  "buildCommand": "yarn install --pure-lockfile",
+  "buildCommand": "yarn install --network-concurrency 1",
   "tests": [
     {
       "testName": "My new test",
diff --git a/packages/e2e-tests/lib/buildApp.ts b/packages/e2e-tests/lib/buildApp.ts
new file mode 100644
index 000000000000..e802d691e96a
--- /dev/null
+++ b/packages/e2e-tests/lib/buildApp.ts
@@ -0,0 +1,80 @@
+/* eslint-disable no-console */
+
+import * as fs from 'fs-extra';
+import * as path from 'path';
+
+import { DEFAULT_BUILD_TIMEOUT_SECONDS } from './constants';
+import type { Env, RecipeInstance } from './types';
+import { spawnAsync } from './utils';
+
+export async function buildApp(appDir: string, recipeInstance: RecipeInstance, env: Env): Promise<void> {
+  const { recipe, label, dependencyOverrides } = recipeInstance;
+
+  const packageJsonPath = path.resolve(appDir, 'package.json');
+
+  if (dependencyOverrides) {
+    // Override dependencies
+    const packageJson: { dependencies?: Record<string, string> } = JSON.parse(
+      fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }),
+    );
+    packageJson.dependencies = packageJson.dependencies
+      ? { ...packageJson.dependencies, ...dependencyOverrides }
+      : dependencyOverrides;
+    fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), {
+      encoding: 'utf-8',
+    });
+  }
+
+  if (recipe.buildCommand) {
+    console.log(`Running build command for test application "${label}"`);
+
+    const buildResult = await spawnAsync(recipe.buildCommand, {
+      cwd: appDir,
+      timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
+      env: {
+        ...process.env,
+        ...env,
+      } as unknown as NodeJS.ProcessEnv,
+    });
+
+    if (buildResult.error) {
+      console.log(`Build failed for test application "${label}"`);
+
+      // Prepends some text to the output build command's output so we can distinguish it from logging in this script
+      console.log(buildResult.stdout.replace(/^/gm, '  [BUILD OUTPUT] '));
+      console.log(buildResult.stderr.replace(/^/gm, '  [BUILD OUTPUT] '));
+
+      console.log('[BUILD ERROR] ', buildResult.error);
+      throw buildResult.error;
+    }
+
+    if (recipe.buildAssertionCommand) {
+      console.log(`Running build assertion for test application "${label}"`);
+
+      const buildAssertionResult = await spawnAsync(
+        recipe.buildAssertionCommand,
+        {
+          cwd: appDir,
+          timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
+          env: {
+            ...process.env,
+            ...env,
+          } as unknown as NodeJS.ProcessEnv,
+        },
+        buildResult.stdout,
+      );
+
+      if (buildAssertionResult.error) {
+        console.log(`Build assertion failed for test application "${label}"`);
+
+        // Prepends some text to the output build command's output so we can distinguish it from logging in this script
+        console.log(buildAssertionResult.stdout.replace(/^/gm, '  [BUILD ASSERTION OUTPUT] '));
+        console.log(buildAssertionResult.stderr.replace(/^/gm, '  [BUILD ASSERTION OUTPUT] '));
+
+        console.log('[BUILD ASSERTION ERROR] ', buildAssertionResult.error);
+
+        throw buildAssertionResult.error;
+      }
+    }
+  }
+}
diff --git a/packages/e2e-tests/lib/buildRecipeInstances.ts b/packages/e2e-tests/lib/buildRecipeInstances.ts
new file mode 100644
index 000000000000..2820c2e055ce
--- /dev/null
+++ b/packages/e2e-tests/lib/buildRecipeInstances.ts
@@ -0,0 +1,47 @@
+import * as fs from 'fs';
+
+import type { Recipe, RecipeInput, RecipeInstance } from './types';
+
+export function buildRecipeInstances(recipePaths: string[]): RecipeInstance[] {
+  const recipes = buildRecipes(recipePaths);
+  const recipeInstances: RecipeInstance[] = [];
+
+  const basePort = 3001;
+
+  recipes.forEach((recipe, i) => {
+    recipe.versions.forEach(version => {
+      const dependencyOverrides =
+        Object.keys(version.dependencyOverrides).length > 0 ? version.dependencyOverrides : undefined;
+      const dependencyOverridesInformationString = dependencyOverrides
+        ? ` (Dependency overrides: ${JSON.stringify(dependencyOverrides)})`
+        : '';
+
+      recipeInstances.push({
+        label: `${recipe.testApplicationName}${dependencyOverridesInformationString}`,
+        recipe,
+        dependencyOverrides,
+        port: basePort + i,
+      });
+    });
+  });
+
+  return recipeInstances;
+}
+
+function buildRecipes(recipePaths: string[]): Recipe[] {
+  return recipePaths.map(recipePath => buildRecipe(recipePath));
+}
+
+function buildRecipe(recipePath: string): Recipe {
+  const recipe: RecipeInput = JSON.parse(fs.readFileSync(recipePath, 'utf-8'));
+
+  const versions = process.env.CANARY_E2E_TEST
+    ? recipe.canaryVersions ?? []
+    : recipe.versions ?? [{ dependencyOverrides: {} }];
+
+  return {
+    ...recipe,
+    path: recipePath,
+    versions,
+  };
+}
diff --git a/packages/e2e-tests/lib/constants.ts b/packages/e2e-tests/lib/constants.ts
new file mode 100644
index 000000000000..fe24b98841fd
--- /dev/null
+++ b/packages/e2e-tests/lib/constants.ts
@@ -0,0 +1,6 @@
+export const TEST_REGISTRY_CONTAINER_NAME = 'verdaccio-e2e-test-registry';
+export const DEFAULT_BUILD_TIMEOUT_SECONDS = 60 * 5;
+export const DEFAULT_TEST_TIMEOUT_SECONDS = 60 * 2;
+export const VERDACCIO_VERSION = '5.22.1';
+export const PUBLISH_PACKAGES_DOCKER_IMAGE_NAME = 'publish-packages';
+export const TMP_DIR = 'tmp';
diff --git a/packages/e2e-tests/lib/runAllTestApps.ts b/packages/e2e-tests/lib/runAllTestApps.ts
new file mode 100644
index 000000000000..b12a0ccb2bdb
--- /dev/null
+++ b/packages/e2e-tests/lib/runAllTestApps.ts
@@ -0,0 +1,84 @@
+/* eslint-disable no-console */
+import { buildRecipeInstances } from './buildRecipeInstances';
+import { buildAndTestApp } from './runTestApp';
+import type { RecipeInstance, RecipeTestResult } from './types';
+
+export async function runAllTestApps(
+  recipePaths: string[],
+  envVarsToInject: Record<string, string | undefined>,
+): Promise<void> {
+  const maxParallel = process.env.CI ? 2 : 5;
+
+  const recipeInstances = buildRecipeInstances(recipePaths);
+
+  const results = await shardPromises(
+    recipeInstances,
+    recipeInstance => buildAndTestApp(recipeInstance, envVarsToInject),
+    maxParallel,
+  );
+
+  console.log('--------------------------------------');
+  console.log('Test Result Summary:');
+
+  results.forEach(result => {
+    if (result.buildFailed) {
+      console.log(`● BUILD FAILED - ${result.label} (${result.recipe.path}`);
+    } else {
+      console.log(`● BUILD SUCCEEDED - ${result.label}`);
+      result.tests.forEach(testResult => {
+        console.log(`  ● ${testResult.result.padEnd(7, ' ')} ${testResult.testName}`);
+      });
+    }
+  });
+
+  const failed = results.filter(result => result.buildFailed || result.testFailed);
+
+  if (failed.length) {
+    console.log(`${failed.length} test(s) failed.`);
+    process.exit(1);
+  }
+
+  console.log('All tests succeeded. 🎉');
+}
+
+// Always run X promises at a time
+function shardPromises(
+  recipes: RecipeInstance[],
+  callback: (recipe: RecipeInstance) => Promise<RecipeTestResult>,
+  maxParallel: number,
+): Promise<RecipeTestResult[]> {
+  return new Promise(resolve => {
+    console.log(`Running a total of ${recipes.length} jobs, with up to ${maxParallel} jobs in parallel...`);
+    const results: RecipeTestResult[] = [];
+    const remaining = recipes.slice();
+    const running: Promise<unknown>[] = [];
+
+    function runNext(): void {
+      if (running.length < maxParallel && remaining.length > 0) {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const next = remaining.shift()!;
+        const promise = callback(next);
+
+        console.log(`Running job ${next.label}, ${remaining.length} remaining...`);
+
+        running.push(promise);
+
+        promise
+          .then(result => results.push(result))
+          .finally(() => {
+            const pos = running.indexOf(promise);
+            running.splice(pos, 1);
+
+            runNext();
+          });
+      } else if (remaining.length === 0 && running.length === 0) {
+        resolve(results);
+      }
+    }
+
+    // Initial runs
+    for (let i = 0; i < maxParallel; i++) {
+      runNext();
+    }
+  });
+}
diff --git a/packages/e2e-tests/lib/runTestApp.ts b/packages/e2e-tests/lib/runTestApp.ts
new file mode 100644
index 000000000000..f38740fe5dd0
--- /dev/null
+++ b/packages/e2e-tests/lib/runTestApp.ts
@@ -0,0 +1,55 @@
+/* eslint-disable no-console */
+
+import * as fs from 'fs-extra';
+import * as path from 'path';
+
+import { buildApp } from './buildApp';
+import { TMP_DIR } from './constants';
+import { testApp } from './testApp';
+import type { Env, RecipeInstance, RecipeTestResult } from './types';
+
+let tmpDirCount = 0;
+
+// This should never throw, we always return a result here
+export async function buildAndTestApp(
+  recipeInstance: RecipeInstance,
+  envVarsToInject: Record<string, string | undefined>,
+): Promise<RecipeTestResult> {
+  const { recipe, port } = recipeInstance;
+  const recipeDirname = path.dirname(recipe.path);
+
+  const targetDir = path.join(TMP_DIR, `${recipe.testApplicationName}-${tmpDirCount++}`);
+
+  await fs.copy(recipeDirname, targetDir);
+
+  const env: Env = {
+    ...envVarsToInject,
+    PORT: port.toString(),
+  };
+
+  try {
+    await buildApp(targetDir, recipeInstance, env);
+  } catch (error) {
+    await fs.remove(targetDir);
+
+    return {
+      ...recipeInstance,
+      buildFailed: true,
+      testFailed: false,
+      tests: [],
+    };
+  }
+
+  // This cannot throw, we always return a result here
+  const results = await testApp(targetDir, recipeInstance, env);
+
+  // Cleanup
+  await fs.remove(targetDir);
+
+  return {
+    ...recipeInstance,
+    buildFailed: false,
+    testFailed: results.some(result => result.result !== 'PASS'),
+    tests: results,
+  };
+}
diff --git a/packages/e2e-tests/lib/testApp.ts b/packages/e2e-tests/lib/testApp.ts
new file mode 100644
index 000000000000..e25418662c38
--- /dev/null
+++ b/packages/e2e-tests/lib/testApp.ts
@@ -0,0 +1,50 @@
+/* eslint-disable no-console */
+
+import { DEFAULT_TEST_TIMEOUT_SECONDS } from './constants';
+import type { Env, RecipeInstance, TestDef, TestResult } from './types';
+import { spawnAsync } from './utils';
+
+export async function testApp(appDir: string, recipeInstance: RecipeInstance, env: Env): Promise<TestResult[]> {
+  const { recipe } = recipeInstance;
+
+  const results: TestResult[] = [];
+  for (const test of recipe.tests) {
+    results.push(await runTest(appDir, recipeInstance, test, env));
+  }
+
+  return results;
+}
+
+async function runTest(appDir: string, recipeInstance: RecipeInstance, test: TestDef, env: Env): Promise<TestResult> {
+  const { recipe, label } = recipeInstance;
+  console.log(`Running test command for test application "${label}", test "${test.testName}"`);
+
+  const testResult = await spawnAsync(test.testCommand, {
+    cwd: appDir,
+    timeout: (recipe.testTimeoutSeconds ?? DEFAULT_TEST_TIMEOUT_SECONDS) * 1000,
+    env: {
+      ...process.env,
+      ...env,
+    } as unknown as NodeJS.ProcessEnv,
+  });
+
+  if (testResult.error) {
+    console.log(`Test failed for test application "${label}", test "${test.testName}"`);
+
+    // Prepends some text to the output test command's output so we can distinguish it from logging in this script
+    console.log(testResult.stdout.replace(/^/gm, '  [TEST OUTPUT] '));
+    console.log(testResult.stderr.replace(/^/gm, '  [TEST OUTPUT] '));
+
+    console.log('[TEST ERROR] ', testResult.error);
+
+    return {
+      testName: test.testName,
+      result: testResult.error?.message.includes('ETDIMEDOUT') ? 'TIMEOUT' : 'FAIL',
+    };
+  }
+
+  return {
+    testName: test.testName,
+    result: 'PASS',
+  };
+}
diff --git a/packages/e2e-tests/lib/types.ts b/packages/e2e-tests/lib/types.ts
new file mode 100644
index 000000000000..c78bc45b6bf5
--- /dev/null
+++ b/packages/e2e-tests/lib/types.ts
@@ -0,0 +1,49 @@
+export type TestResult = {
+  testName: string;
+  result: 'PASS' | 'FAIL' | 'TIMEOUT';
+};
+
+type DependencyOverrides = Record<string, string>;
+
+export interface TestDef {
+  testName: string;
+  testCommand: string;
+  timeoutSeconds?: number;
+}
+
+export interface RecipeInput {
+  testApplicationName: string;
+  buildCommand?: string;
+  buildAssertionCommand?: string;
+  buildTimeoutSeconds?: number;
+  testTimeoutSeconds?: number;
+  tests: TestDef[];
+  versions?: { dependencyOverrides: DependencyOverrides }[];
+  canaryVersions?: { dependencyOverrides: DependencyOverrides }[];
+}
+
+export interface Recipe {
+  path: string;
+  testApplicationName: string;
+  buildCommand?: string;
+  buildAssertionCommand?: string;
+  buildTimeoutSeconds?: number;
+  testTimeoutSeconds?: number;
+  tests: TestDef[];
+  versions: { dependencyOverrides: DependencyOverrides }[];
+}
+
+export interface RecipeInstance {
+  label: string;
+  recipe: Recipe;
+  dependencyOverrides?: DependencyOverrides;
+  port: number;
+}
+
+export interface RecipeTestResult extends RecipeInstance {
+  buildFailed: boolean;
+  testFailed: boolean;
+  tests: TestResult[];
+}
+
+export type Env = Record<string, string | string>;
diff --git a/packages/e2e-tests/lib/utils.ts b/packages/e2e-tests/lib/utils.ts
new file mode 100644
index 000000000000..caf2cf424171
--- /dev/null
+++ b/packages/e2e-tests/lib/utils.ts
@@ -0,0 +1,69 @@
+/* eslint-disable no-console */
+import * as childProcess from 'child_process';
+
+// https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message
+export function printCIErrorMessage(message: string): void {
+  if (process.env.CI) {
+    console.log(`::error::${message}`);
+  } else {
+    console.log(message);
+  }
+}
+
+interface SpawnAsync {
+  stdout: string;
+  stderr: string;
+  error?: Error;
+  status: number | null;
+}
+
+export function spawnAsync(
+  cmd: string,
+  options?:
+    | childProcess.SpawnOptionsWithoutStdio
+    | childProcess.SpawnOptionsWithStdioTuple<childProcess.StdioPipe, childProcess.StdioPipe, childProcess.StdioPipe>,
+  input?: string,
+): Promise<SpawnAsync> {
+  const start = Date.now();
+
+  return new Promise<SpawnAsync>(resolve => {
+    const cp = childProcess.spawn(cmd, { shell: true, ...options });
+
+    const stderr: unknown[] = [];
+    const stdout: string[] = [];
+    let error: Error | undefined;
+
+    cp.stdout.on('data', data => {
+      stdout.push(data ? (data as object).toString() : '');
+    });
+
+    cp.stderr.on('data', data => {
+      stderr.push(data ? (data as object).toString() : '');
+    });
+
+    cp.on('error', e => {
+      error = e;
+    });
+
+    cp.on('close', status => {
+      const end = Date.now();
+
+      // We manually mark this as timed out if the process takes too long
+      if (!error && status === 1 && options?.timeout && end >= start + options.timeout) {
+        error = new Error(`ETDIMEDOUT: Process timed out after ${options.timeout} ms.`);
+      }
+
+      resolve({
+        stdout: stdout.join(''),
+        stderr: stderr.join(''),
+        error: error || (status !== 0 ? new Error(`Process exited with status ${status}`) : undefined),
+        status,
+      });
+    });
+
+    if (input) {
+      cp.stdin.write(input);
+      cp.stdin.end();
+    }
+  });
+}
diff --git a/packages/e2e-tests/lib/validate.ts b/packages/e2e-tests/lib/validate.ts
new file mode 100644
index 000000000000..2abb4974ce70
--- /dev/null
+++ b/packages/e2e-tests/lib/validate.ts
@@ -0,0 +1,33 @@
+/* eslint-disable no-console */
+
+export function validate(): boolean {
+  let missingEnvVar = false;
+
+  if (!process.env.E2E_TEST_AUTH_TOKEN) {
+    console.log(
+      "No auth token configured! Please configure the E2E_TEST_AUTH_TOKEN environment variable with an auth token that has the scope 'project:read'!",
+    );
+    missingEnvVar = true;
+  }
+
+  if (!process.env.E2E_TEST_DSN) {
+    console.log('No DSN configured! Please configure the E2E_TEST_DSN environment variable with a DSN!');
+    missingEnvVar = true;
+  }
+
+  if (!process.env.E2E_TEST_SENTRY_ORG_SLUG) {
+    console.log(
+      'No Sentry organization slug configured! Please configure the E2E_TEST_SENTRY_ORG_SLUG environment variable with a Sentry organization slug!',
+    );
+    missingEnvVar = true;
+  }
+
+  if (!process.env.E2E_TEST_SENTRY_TEST_PROJECT) {
+    console.log(
+      'No Sentry project configured! Please configure the E2E_TEST_SENTRY_TEST_PROJECT environment variable with a Sentry project slug!',
+    );
+    missingEnvVar = true;
+  }
+
+  return !missingEnvVar;
+}
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 02b86527db17..73f13d1c5174 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -16,12 +16,14 @@
     "test:e2e": "run-s test:validate-configuration test:validate-test-app-setups test:run",
     "test:run": "ts-node run.ts",
     "test:validate-configuration": "ts-node validate-verdaccio-configuration.ts",
-    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts"
+    "test:validate-test-app-setups": "ts-node validate-test-app-setups.ts",
+    "clean": "rimraf tmp test-applications/**/node_modules test-applications/**/dist"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",
     "@types/node": "^14.6.4",
     "dotenv": "16.0.3",
+    "fs-extra": "11.1.0",
     "glob": "8.0.3",
     "ts-node": "10.9.1",
     "typescript": "3.8.3",
diff --git a/packages/e2e-tests/registrySetup.ts b/packages/e2e-tests/registrySetup.ts
new file mode 100644
index 000000000000..ea7dc3decca5
--- /dev/null
+++ b/packages/e2e-tests/registrySetup.ts
@@ -0,0 +1,96 @@
+/* eslint-disable no-console */
+import * as childProcess from 'child_process';
+import * as path from 'path';
+
+import { PUBLISH_PACKAGES_DOCKER_IMAGE_NAME, TEST_REGISTRY_CONTAINER_NAME, VERDACCIO_VERSION } from './lib/constants';
+
+const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
+const repositoryRoot = path.resolve(__dirname, '../..');
+
+// https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
+function groupCIOutput(groupTitle: string, fn: () => void): void {
+  if (process.env.CI) {
+    console.log(`::group::${groupTitle}`);
+    fn();
+    console.log('::endgroup::');
+  } else {
+    fn();
+  }
+}
+
+export function registrySetup(): void {
+  groupCIOutput('Test Registry Setup', () => {
+    // Stop test registry container (Verdaccio) if it was already running
+    childProcess.spawnSync('docker', ['stop', TEST_REGISTRY_CONTAINER_NAME], { stdio: 'ignore' });
+    console.log('Stopped previously running test registry');
+
+    // Start test registry (Verdaccio)
+    const startRegistryProcessResult = childProcess.spawnSync(
+      'docker',
+      [
+        'run',
+        '--detach',
+        '--rm',
+        '--name',
+        TEST_REGISTRY_CONTAINER_NAME,
+        '-p',
+        '4873:4873',
+        '-v',
+        `${__dirname}/verdaccio-config:/verdaccio/conf`,
+        `verdaccio/verdaccio:${VERDACCIO_VERSION}`,
+      ],
+      { encoding: 'utf8', stdio: 'inherit' },
+    );
+
+    if (startRegistryProcessResult.status !== 0) {
+      throw new Error('Start Registry Process failed.');
+    }
+
+    // Build container image that is uploading our packages to fake registry with specific Node.js/npm version
+    const buildPublishImageProcessResult = childProcess.spawnSync(
+      'docker',
+      [
+        'build',
+        '--tag',
+        PUBLISH_PACKAGES_DOCKER_IMAGE_NAME,
+        '--file',
+        './Dockerfile.publish-packages',
+        ...(publishScriptNodeVersion ? ['--build-arg', `NODE_VERSION=${publishScriptNodeVersion}`] : []),
+        '.',
+      ],
+      {
+        encoding: 'utf8',
+        stdio: 'inherit',
+      },
+    );
+
+    if (buildPublishImageProcessResult.status !== 0) {
+      throw new Error('Build Publish Image failed.');
+    }
+
+    // Run container that uploads our packages to fake registry
+    const publishImageContainerRunProcess = childProcess.spawnSync(
+      'docker',
+      [
+        'run',
+        '--rm',
+        '-v',
+        `${repositoryRoot}:/sentry-javascript`,
+        '--network',
+        'host',
+        PUBLISH_PACKAGES_DOCKER_IMAGE_NAME,
+      ],
+      {
+        encoding: 'utf8',
+        stdio: 'inherit',
+      },
+    );
+
+    if (publishImageContainerRunProcess.status !== 0) {
+      throw new Error('Publish Image Container failed.');
+    }
+  });
+
+  console.log('');
+  console.log('');
+}
diff --git a/packages/e2e-tests/run.ts b/packages/e2e-tests/run.ts
index 842911863f02..a4fec2c480dc 100644
--- a/packages/e2e-tests/run.ts
+++ b/packages/e2e-tests/run.ts
@@ -1,441 +1,35 @@
 /* eslint-disable max-lines */
 /* eslint-disable no-console */
-import * as childProcess from 'child_process';
 import * as dotenv from 'dotenv';
-import * as fs from 'fs';
 import * as glob from 'glob';
-import * as path from 'path';
 
-// Load environment variables from .env file locally
-dotenv.config();
+import { runAllTestApps } from './lib/runAllTestApps';
+import { validate } from './lib/validate';
+import { registrySetup } from './registrySetup';
 
-const repositoryRoot = path.resolve(__dirname, '../..');
+async function run(): Promise<void> {
+  // Load environment variables from .env file locally
+  dotenv.config();
 
-const TEST_REGISTRY_CONTAINER_NAME = 'verdaccio-e2e-test-registry';
-const VERDACCIO_VERSION = '5.15.3';
-
-const PUBLISH_PACKAGES_DOCKER_IMAGE_NAME = 'publish-packages';
-
-const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
-
-const DEFAULT_BUILD_TIMEOUT_SECONDS = 60 * 5;
-const DEFAULT_TEST_TIMEOUT_SECONDS = 60 * 2;
-
-let missingEnvVar = false;
-
-if (!process.env.E2E_TEST_AUTH_TOKEN) {
-  console.log(
-    "No auth token configured! Please configure the E2E_TEST_AUTH_TOKEN environment variable with an auth token that has the scope 'project:read'!",
-  );
-  missingEnvVar = true;
-}
-
-if (!process.env.E2E_TEST_DSN) {
-  console.log('No DSN configured! Please configure the E2E_TEST_DSN environment variable with a DSN!');
-  missingEnvVar = true;
-}
-
-if (!process.env.E2E_TEST_SENTRY_ORG_SLUG) {
-  console.log(
-    'No Sentry organization slug configured! Please configure the E2E_TEST_SENTRY_ORG_SLUG environment variable with a Sentry organization slug!',
-  );
-  missingEnvVar = true;
-}
-
-if (!process.env.E2E_TEST_SENTRY_TEST_PROJECT) {
-  console.log(
-    'No Sentry project configured! Please configure the E2E_TEST_SENTRY_TEST_PROJECT environment variable with a Sentry project slug!',
-  );
-  missingEnvVar = true;
-}
-
-if (missingEnvVar) {
-  process.exit(1);
-}
-
-const envVarsToInject = {
-  REACT_APP_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
-  NEXT_PUBLIC_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
-};
-
-// https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#grouping-log-lines
-function groupCIOutput(groupTitle: string, fn: () => void): void {
-  if (process.env.CI) {
-    console.log(`::group::${groupTitle}`);
-    fn();
-    console.log('::endgroup::');
-  } else {
-    fn();
-  }
-}
-
-// https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#setting-an-error-message
-function printCIErrorMessage(message: string): void {
-  if (process.env.CI) {
-    console.log(`::error::${message}`);
-  } else {
-    console.log(message);
-  }
-}
-
-groupCIOutput('Test Registry Setup', () => {
-  // Stop test registry container (Verdaccio) if it was already running
-  childProcess.spawnSync('docker', ['stop', TEST_REGISTRY_CONTAINER_NAME], { stdio: 'ignore' });
-  console.log('Stopped previously running test registry');
-
-  // Start test registry (Verdaccio)
-  const startRegistryProcessResult = childProcess.spawnSync(
-    'docker',
-    [
-      'run',
-      '--detach',
-      '--rm',
-      '--name',
-      TEST_REGISTRY_CONTAINER_NAME,
-      '-p',
-      '4873:4873',
-      '-v',
-      `${__dirname}/verdaccio-config:/verdaccio/conf`,
-      `verdaccio/verdaccio:${VERDACCIO_VERSION}`,
-    ],
-    { encoding: 'utf8', stdio: 'inherit' },
-  );
-
-  if (startRegistryProcessResult.status !== 0) {
+  if (!validate()) {
     process.exit(1);
   }
 
-  // Build container image that is uploading our packages to fake registry with specific Node.js/npm version
-  const buildPublishImageProcessResult = childProcess.spawnSync(
-    'docker',
-    [
-      'build',
-      '--tag',
-      PUBLISH_PACKAGES_DOCKER_IMAGE_NAME,
-      '--file',
-      './Dockerfile.publish-packages',
-      ...(publishScriptNodeVersion ? ['--build-arg', `NODE_VERSION=${publishScriptNodeVersion}`] : []),
-      '.',
-    ],
-    {
-      encoding: 'utf8',
-      stdio: 'inherit',
-    },
-  );
+  const envVarsToInject = {
+    REACT_APP_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
+    NEXT_PUBLIC_E2E_TEST_DSN: process.env.E2E_TEST_DSN,
+  };
 
-  if (buildPublishImageProcessResult.status !== 0) {
-    process.exit(1);
-  }
+  try {
+    registrySetup();
 
-  // Run container that uploads our packages to fake registry
-  const publishImageContainerRunProcess = childProcess.spawnSync(
-    'docker',
-    [
-      'run',
-      '--rm',
-      '-v',
-      `${repositoryRoot}:/sentry-javascript`,
-      '--network',
-      'host',
-      PUBLISH_PACKAGES_DOCKER_IMAGE_NAME,
-    ],
-    {
-      encoding: 'utf8',
-      stdio: 'inherit',
-    },
-  );
+    const recipePaths = glob.sync(`${__dirname}/test-applications/*/test-recipe.json`, { absolute: true });
 
-  if (publishImageContainerRunProcess.status !== 0) {
+    await runAllTestApps(recipePaths, envVarsToInject);
+  } catch (error) {
+    console.error(error);
     process.exit(1);
   }
-});
-
-const recipePaths = glob.sync(`${__dirname}/test-applications/*/test-recipe.json`, { absolute: true });
-
-let processShouldExitWithError = false;
-
-type TestResult = {
-  testName: string;
-  result: 'PASS' | 'FAIL' | 'TIMEOUT';
-};
-
-type VersionResult = {
-  dependencyOverrides?: Record<string, string>;
-  buildFailed: boolean;
-  testResults: TestResult[];
-};
-
-type RecipeResult = {
-  testApplicationName: string;
-  testApplicationPath: string;
-  versionResults: VersionResult[];
-};
-
-type Recipe = {
-  testApplicationName: string;
-  buildCommand?: string;
-  buildAssertionCommand?: string;
-  buildTimeoutSeconds?: number;
-  tests: {
-    testName: string;
-    testCommand: string;
-    timeoutSeconds?: number;
-  }[];
-  versions?: { dependencyOverrides: Record<string, string> }[];
-  canaryVersions?: { dependencyOverrides: Record<string, string> }[];
-};
-
-const recipeResults: RecipeResult[] = recipePaths.map(recipePath => {
-  const recipe: Recipe = JSON.parse(fs.readFileSync(recipePath, 'utf-8'));
-  const recipeDirname = path.dirname(recipePath);
-
-  function runRecipe(dependencyOverrides: Record<string, string> | undefined): VersionResult {
-    const dependencyOverridesInformationString = dependencyOverrides
-      ? ` (Dependency overrides: ${JSON.stringify(dependencyOverrides)})`
-      : '';
-
-    if (recipe.buildCommand) {
-      console.log(
-        `Running E2E test build command for test application "${recipe.testApplicationName}"${dependencyOverridesInformationString}`,
-      );
-      const buildCommandProcess = childProcess.spawnSync(recipe.buildCommand, {
-        cwd: path.dirname(recipePath),
-        encoding: 'utf8',
-        shell: true, // needed so we can pass the build command in as whole without splitting it up into args
-        timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
-        env: {
-          ...process.env,
-          ...envVarsToInject,
-        },
-      });
-
-      // Prepends some text to the output build command's output so we can distinguish it from logging in this script
-      console.log(buildCommandProcess.stdout.replace(/^/gm, '[BUILD OUTPUT] '));
-      console.log(buildCommandProcess.stderr.replace(/^/gm, '[BUILD OUTPUT] '));
-
-      const buildCommandProcessError: undefined | (Error & { code?: string }) = buildCommandProcess.error;
-
-      if (buildCommandProcessError?.code === 'ETIMEDOUT') {
-        processShouldExitWithError = true;
-
-        printCIErrorMessage(
-          `Build command in test application "${recipe.testApplicationName}" (${path.dirname(recipePath)}) timed out!`,
-        );
-
-        return {
-          dependencyOverrides,
-          buildFailed: true,
-          testResults: [],
-        };
-      } else if (buildCommandProcess.status !== 0) {
-        processShouldExitWithError = true;
-
-        printCIErrorMessage(
-          `Build command in test application "${recipe.testApplicationName}" (${path.dirname(recipePath)}) failed!`,
-        );
-
-        return {
-          dependencyOverrides,
-          buildFailed: true,
-          testResults: [],
-        };
-      }
-
-      if (recipe.buildAssertionCommand) {
-        console.log(
-          `Running E2E test build assertion for test application "${recipe.testApplicationName}"${dependencyOverridesInformationString}`,
-        );
-        const buildAssertionCommandProcess = childProcess.spawnSync(recipe.buildAssertionCommand, {
-          cwd: path.dirname(recipePath),
-          input: buildCommandProcess.stdout,
-          encoding: 'utf8',
-          shell: true, // needed so we can pass the build command in as whole without splitting it up into args
-          timeout: (recipe.buildTimeoutSeconds ?? DEFAULT_BUILD_TIMEOUT_SECONDS) * 1000,
-          env: {
-            ...process.env,
-            ...envVarsToInject,
-          },
-        });
-
-        // Prepends some text to the output build command's output so we can distinguish it from logging in this script
-        console.log(buildAssertionCommandProcess.stdout.replace(/^/gm, '[BUILD ASSERTION OUTPUT] '));
-        console.log(buildAssertionCommandProcess.stderr.replace(/^/gm, '[BUILD ASSERTION OUTPUT] '));
-
-        const buildAssertionCommandProcessError: undefined | (Error & { code?: string }) =
-          buildAssertionCommandProcess.error;
-
-        if (buildAssertionCommandProcessError?.code === 'ETIMEDOUT') {
-          processShouldExitWithError = true;
-
-          printCIErrorMessage(
-            `Build assertion in test application "${recipe.testApplicationName}" (${path.dirname(
-              recipePath,
-            )}) timed out!`,
-          );
-
-          return {
-            dependencyOverrides,
-            buildFailed: true,
-            testResults: [],
-          };
-        } else if (buildAssertionCommandProcess.status !== 0) {
-          processShouldExitWithError = true;
-
-          printCIErrorMessage(
-            `Build assertion in test application "${recipe.testApplicationName}" (${path.dirname(recipePath)}) failed!`,
-          );
-
-          return {
-            dependencyOverrides,
-            buildFailed: true,
-            testResults: [],
-          };
-        }
-      }
-    }
-
-    const testResults: TestResult[] = recipe.tests.map(test => {
-      console.log(
-        `Running E2E test command for test application "${recipe.testApplicationName}", test "${test.testName}"${dependencyOverridesInformationString}`,
-      );
-
-      const testProcessResult = childProcess.spawnSync(test.testCommand, {
-        cwd: path.dirname(recipePath),
-        timeout: (test.timeoutSeconds ?? DEFAULT_TEST_TIMEOUT_SECONDS) * 1000,
-        encoding: 'utf8',
-        shell: true, // needed so we can pass the test command in as whole without splitting it up into args
-        env: {
-          ...process.env,
-          ...envVarsToInject,
-        },
-      });
-
-      // Prepends some text to the output test command's output so we can distinguish it from logging in this script
-      console.log(testProcessResult.stdout.replace(/^/gm, '[TEST OUTPUT] '));
-      console.log(testProcessResult.stderr.replace(/^/gm, '[TEST OUTPUT] '));
-
-      const error: undefined | (Error & { code?: string }) = testProcessResult.error;
-
-      if (error?.code === 'ETIMEDOUT') {
-        processShouldExitWithError = true;
-        printCIErrorMessage(
-          `Test "${test.testName}" in test application "${recipe.testApplicationName}" (${path.dirname(
-            recipePath,
-          )}) timed out.`,
-        );
-        return {
-          testName: test.testName,
-          result: 'TIMEOUT',
-        };
-      } else if (testProcessResult.status !== 0) {
-        processShouldExitWithError = true;
-        printCIErrorMessage(
-          `Test "${test.testName}" in test application "${recipe.testApplicationName}" (${path.dirname(
-            recipePath,
-          )}) failed.`,
-        );
-        return {
-          testName: test.testName,
-          result: 'FAIL',
-        };
-      } else {
-        console.log(
-          `Test "${test.testName}" in test application "${recipe.testApplicationName}" (${path.dirname(
-            recipePath,
-          )}) succeeded.`,
-        );
-        return {
-          testName: test.testName,
-          result: 'PASS',
-        };
-      }
-    });
-
-    return {
-      dependencyOverrides,
-      buildFailed: false,
-      testResults,
-    };
-  }
-
-  const versionsToRun: {
-    dependencyOverrides?: Record<string, string>;
-  }[] = process.env.CANARY_E2E_TEST ? recipe.canaryVersions ?? [] : recipe.versions ?? [{}];
-
-  const versionResults = versionsToRun.map(({ dependencyOverrides }) => {
-    const packageJsonPath = path.resolve(recipeDirname, 'package.json');
-    const packageJsonBackupPath = path.resolve(recipeDirname, 'package.json.bak');
-
-    if (dependencyOverrides) {
-      // Back up original package.json
-      fs.copyFileSync(packageJsonPath, packageJsonBackupPath);
-
-      // Override dependencies
-      const packageJson: { dependencies?: Record<string, string> } = JSON.parse(
-        fs.readFileSync(packageJsonPath, { encoding: 'utf-8' }),
-      );
-      packageJson.dependencies = packageJson.dependencies
-        ? { ...packageJson.dependencies, ...dependencyOverrides }
-        : dependencyOverrides;
-      fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2), {
-        encoding: 'utf-8',
-      });
-    }
-
-    try {
-      return runRecipe(dependencyOverrides);
-    } finally {
-      if (dependencyOverrides) {
-        // Restore original package.json
-        fs.rmSync(packageJsonPath, { force: true });
-        fs.copyFileSync(packageJsonBackupPath, packageJsonPath);
-        fs.rmSync(packageJsonBackupPath, { force: true });
-      }
-    }
-  });
-
-  return {
-    testApplicationName: recipe.testApplicationName,
-    testApplicationPath: recipePath,
-    versionResults,
-  };
-});
-
-console.log('--------------------------------------');
-console.log('Test Result Summary:');
-
-recipeResults.forEach(recipeResult => {
-  recipeResult.versionResults.forEach(versionResult => {
-    const dependencyOverridesInformationString = versionResult.dependencyOverrides
-      ? ` (Dependency overrides: ${JSON.stringify(versionResult.dependencyOverrides)})`
-      : '';
-
-    if (versionResult.buildFailed) {
-      console.log(
-        `● BUILD FAILED - ${recipeResult.testApplicationName} (${path.dirname(
-          recipeResult.testApplicationPath,
-        )})${dependencyOverridesInformationString}`,
-      );
-    } else {
-      console.log(
-        `● BUILD SUCCEEDED - ${recipeResult.testApplicationName} (${path.dirname(
-          recipeResult.testApplicationPath,
-        )})${dependencyOverridesInformationString}`,
-      );
-      versionResult.testResults.forEach(testResult => {
-        console.log(`  ● ${testResult.result.padEnd(7, ' ')} ${testResult.testName}`);
-      });
-    }
-  });
-});
-
-// Stop test registry
-childProcess.spawnSync(`docker stop ${TEST_REGISTRY_CONTAINER_NAME}`, { encoding: 'utf8', stdio: 'ignore' });
-console.log('Successfully stopped test registry container'); // Output from command above is not good so we `ignore` it and emit our own
-
-if (processShouldExitWithError) {
-  console.log('Not all tests succeeded.');
-  process.exit(1);
-} else {
-  console.log('All tests succeeded.');
 }
+
+void run();
diff --git a/packages/e2e-tests/test-applications/create-next-app/package.json b/packages/e2e-tests/test-applications/create-next-app/package.json
index 5d5e829bace6..dee9275c2bdc 100644
--- a/packages/e2e-tests/test-applications/create-next-app/package.json
+++ b/packages/e2e-tests/test-applications/create-next-app/package.json
@@ -24,5 +24,9 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.27.1"
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts b/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts
index 289976304812..b2c8ace9d92d 100644
--- a/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts
+++ b/packages/e2e-tests/test-applications/create-next-app/playwright.config.ts
@@ -29,8 +29,6 @@ const config: PlaywrightTestConfig = {
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -62,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: process.env.TEST_MODE === 'prod' ? 'yarn start' : 'yarn dev',
-    port: 3000,
+    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
   },
 };
 
diff --git a/packages/e2e-tests/test-applications/create-next-app/test-recipe.json b/packages/e2e-tests/test-applications/create-next-app/test-recipe.json
index cf4bf4431929..141f9e1489c1 100644
--- a/packages/e2e-tests/test-applications/create-next-app/test-recipe.json
+++ b/packages/e2e-tests/test-applications/create-next-app/test-recipe.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "create-next-app",
-  "buildCommand": "yarn install --pure-lockfile && npx playwright install && yarn build",
+  "buildCommand": "yarn install --network-concurrency 1 && npx playwright install && yarn build",
   "tests": [
     {
       "testName": "Playwright tests - Prod Mode",
diff --git a/packages/e2e-tests/test-applications/create-next-app/tsconfig.json b/packages/e2e-tests/test-applications/create-next-app/tsconfig.json
index 3ff0501fdb85..7686eb53f6ac 100644
--- a/packages/e2e-tests/test-applications/create-next-app/tsconfig.json
+++ b/packages/e2e-tests/test-applications/create-next-app/tsconfig.json
@@ -12,8 +12,7 @@
     "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true
+    "jsx": "preserve"
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "next.config.js"],
   "exclude": ["node_modules"]
diff --git a/packages/e2e-tests/test-applications/create-react-app/package.json b/packages/e2e-tests/test-applications/create-react-app/package.json
index 201f636468ad..e0fc502238d0 100644
--- a/packages/e2e-tests/test-applications/create-react-app/package.json
+++ b/packages/e2e-tests/test-applications/create-react-app/package.json
@@ -41,5 +41,9 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/create-react-app/test-recipe.json b/packages/e2e-tests/test-applications/create-react-app/test-recipe.json
index d21ed4a6ace1..3f3c496c4857 100644
--- a/packages/e2e-tests/test-applications/create-react-app/test-recipe.json
+++ b/packages/e2e-tests/test-applications/create-react-app/test-recipe.json
@@ -1,6 +1,6 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "create-react-app",
-  "buildCommand": "yarn install --pure-lockfile && yarn build",
+  "buildCommand": "yarn install --network-concurrency 1 && yarn build",
   "tests": []
 }
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/package.json b/packages/e2e-tests/test-applications/nextjs-app-dir/package.json
index 5256c1aa8cdb..064e5d396d1f 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/package.json
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/package.json
@@ -24,5 +24,9 @@
   "devDependencies": {
     "ts-node": "10.9.1",
     "@playwright/test": "^1.27.1"
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts b/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts
index ae466dab4350..2bacdad88e2e 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.ts
@@ -7,6 +7,8 @@ if (!testEnv) {
   throw new Error('No test env defined');
 }
 
+const port = process.env.PORT ? parseInt(process.env.PORT) : 3000;
+
 /**
  * See https://playwright.dev/docs/test-configuration.
  */
@@ -34,7 +36,7 @@ const config: PlaywrightTestConfig = {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:3000',
+    baseURL: `http://localhost:${port}`,
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -54,7 +56,7 @@ const config: PlaywrightTestConfig = {
   webServer: [
     {
       command: testEnv === 'development' ? 'yarn dev' : 'yarn start',
-      port: 3000,
+      port,
     },
     {
       command: 'yarn ts-node-script start-event-proxy.ts',
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/test-recipe.json b/packages/e2e-tests/test-applications/nextjs-app-dir/test-recipe.json
index b3ec72add40f..4f6290d444d0 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/test-recipe.json
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/test-recipe.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "nextjs-13-app-dir",
-  "buildCommand": "yarn install --pure-lockfile && npx playwright install && yarn build",
+  "buildCommand": "yarn install --network-concurrency 1 && npx playwright install && yarn build",
   "buildAssertionCommand": "yarn ts-node --script-mode assert-build.ts",
   "tests": [
     {
diff --git a/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json b/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
index bacd391b697e..e78ff0d9c0e7 100644
--- a/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
+++ b/packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
@@ -13,7 +13,6 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
     "plugins": [
       {
         "name": "next"
diff --git a/packages/e2e-tests/test-applications/node-express-app/package.json b/packages/e2e-tests/test-applications/node-express-app/package.json
index 4c07eb8a1028..3bcdb79df6ba 100644
--- a/packages/e2e-tests/test-applications/node-express-app/package.json
+++ b/packages/e2e-tests/test-applications/node-express-app/package.json
@@ -19,5 +19,9 @@
   },
   "devDependencies": {
     "@playwright/test": "^1.27.1"
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts b/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts
index d665bba2d978..ef7bf3704715 100644
--- a/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts
+++ b/packages/e2e-tests/test-applications/node-express-app/playwright.config.ts
@@ -27,8 +27,6 @@ const config: PlaywrightTestConfig = {
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -60,7 +58,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: 3000,
+    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
   },
 };
 
diff --git a/packages/e2e-tests/test-applications/node-express-app/src/app.ts b/packages/e2e-tests/test-applications/node-express-app/src/app.ts
index e128e6c33882..ec4a5c73fcb6 100644
--- a/packages/e2e-tests/test-applications/node-express-app/src/app.ts
+++ b/packages/e2e-tests/test-applications/node-express-app/src/app.ts
@@ -17,7 +17,7 @@ Sentry.init({
 });
 
 const app = express();
-const port = 3000;
+const port = process.env.PORT ? parseInt(process.env.PORT) : 3000;
 
 app.use(Sentry.Handlers.requestHandler());
 app.use(Sentry.Handlers.tracingHandler());
diff --git a/packages/e2e-tests/test-applications/node-express-app/test-recipe.json b/packages/e2e-tests/test-applications/node-express-app/test-recipe.json
index e3038c8d0459..4859973cd360 100644
--- a/packages/e2e-tests/test-applications/node-express-app/test-recipe.json
+++ b/packages/e2e-tests/test-applications/node-express-app/test-recipe.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
-  "testApplicationName": "Node Express App",
-  "buildCommand": "yarn install && yarn build",
+  "testApplicationName": "node-express-app",
+  "buildCommand": "yarn install --network-concurrency 1 && yarn build",
   "tests": [
     {
       "testName": "Test express server",
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json
index cead7143f1ed..f1e97a01925a 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json
+++ b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json
@@ -46,5 +46,9 @@
     "@playwright/test": "1.26.1",
     "axios": "1.1.2",
     "serve": "14.0.1"
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
index 9249280b4c34..1a6a49424672 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
+++ b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
@@ -29,8 +29,6 @@ const config: PlaywrightTestConfig = {
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -62,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: 3000,
+    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
   },
 };
 
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/test-recipe.json b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/test-recipe.json
index 1a8f03c6bbae..fce2379a280f 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/test-recipe.json
+++ b/packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/test-recipe.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "standard-frontend-react-tracing-import",
-  "buildCommand": "yarn install --pure-lockfile && npx playwright install && yarn build",
+  "buildCommand": "yarn install --network-concurrency 1 && npx playwright install && yarn build",
   "tests": [
     {
       "testName": "Playwright tests",
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/package.json b/packages/e2e-tests/test-applications/standard-frontend-react/package.json
index 13697319b0e6..d8f6db397dcd 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react/package.json
+++ b/packages/e2e-tests/test-applications/standard-frontend-react/package.json
@@ -45,5 +45,9 @@
     "@playwright/test": "1.26.1",
     "axios": "1.1.2",
     "serve": "14.0.1"
+  },
+  "volta": {
+    "node": "16.19.0",
+    "yarn": "1.22.19"
   }
 }
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts b/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts
index 9249280b4c34..1a6a49424672 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts
+++ b/packages/e2e-tests/test-applications/standard-frontend-react/playwright.config.ts
@@ -29,8 +29,6 @@ const config: PlaywrightTestConfig = {
   use: {
     /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
     actionTimeout: 0,
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
@@ -62,7 +60,7 @@ const config: PlaywrightTestConfig = {
   /* Run your local dev server before starting the tests */
   webServer: {
     command: 'yarn start',
-    port: 3000,
+    port: process.env.PORT ? parseInt(process.env.PORT) : 3000,
   },
 };
 
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/test-recipe.json b/packages/e2e-tests/test-applications/standard-frontend-react/test-recipe.json
index 95ff8d535877..207dd5409b50 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react/test-recipe.json
+++ b/packages/e2e-tests/test-applications/standard-frontend-react/test-recipe.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../../test-recipe-schema.json",
   "testApplicationName": "standard-frontend-react",
-  "buildCommand": "yarn install --pure-lockfile && npx playwright install && yarn build",
+  "buildCommand": "yarn install --network-concurrency 1 && npx playwright install && yarn build",
   "tests": [
     {
       "testName": "Playwright tests",
diff --git a/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts b/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
index 6648bfd059a4..da5ba529edd7 100644
--- a/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
+++ b/packages/e2e-tests/test-applications/standard-frontend-react/tests/fixtures/ReplayRecordingData.ts
@@ -2,7 +2,11 @@ import { expect } from '@playwright/test';
 
 export const ReplayRecordingData = [
   [
-    { type: 4, data: { href: 'http://localhost:3000/', width: 1280, height: 720 }, timestamp: expect.any(Number) },
+    {
+      type: 4,
+      data: { href: expect.stringMatching(/http:\/\/localhost:\d+\//), width: 1280, height: 720 },
+      timestamp: expect.any(Number),
+    },
     {
       type: 2,
       data: {
@@ -105,7 +109,7 @@ export const ReplayRecordingData = [
             node: {
               type: 2,
               tagName: 'a',
-              attributes: { id: 'navigation', href: 'http://localhost:3000/user/5' },
+              attributes: { id: 'navigation', href: expect.stringMatching(/http:\/\/localhost:\d+\/user\/5/) },
               childNodes: [],
               id: 14,
             },
@@ -140,7 +144,7 @@ export const ReplayRecordingData = [
         tag: 'performanceSpan',
         payload: {
           op: 'navigation.navigate',
-          description: 'http://localhost:3000/',
+          description: expect.stringMatching(/http:\/\/localhost:\d+\//),
           startTimestamp: expect.any(Number),
           endTimestamp: expect.any(Number),
           data: {
@@ -166,7 +170,7 @@ export const ReplayRecordingData = [
         tag: 'performanceSpan',
         payload: {
           op: 'resource.script',
-          description: expect.stringMatching(/http:\/\/localhost:3000\/static\/js\/main.(\w+).js/),
+          description: expect.stringMatching(/http:\/\/localhost:\d+\/static\/js\/main.(\w+).js/),
           startTimestamp: expect.any(Number),
           endTimestamp: expect.any(Number),
           data: {
diff --git a/packages/e2e-tests/test-recipe-schema.json b/packages/e2e-tests/test-recipe-schema.json
index 178ca96ab3d0..ee14c2eb4f82 100644
--- a/packages/e2e-tests/test-recipe-schema.json
+++ b/packages/e2e-tests/test-recipe-schema.json
@@ -17,7 +17,11 @@
     },
     "buildTimeoutSeconds": {
       "type": "number",
-      "description": "Timeout for the build command in seconds. Default: 60"
+      "description": "Timeout for the build command in seconds. Default: 5 minutes"
+    },
+    "testTimeoutSeconds": {
+      "type": "number",
+      "description": "Timeout for the test command in seconds. Default: 2 minutes"
     },
     "tests": {
       "type": "array",
diff --git a/packages/e2e-tests/verdaccio-config/config.yaml b/packages/e2e-tests/verdaccio-config/config.yaml
index a5b4f7919cc8..7c5cd16df28d 100644
--- a/packages/e2e-tests/verdaccio-config/config.yaml
+++ b/packages/e2e-tests/verdaccio-config/config.yaml
@@ -204,7 +204,7 @@ middlewares:
 
 # https://verdaccio.org/docs/logger
 # log settings
-logs: { type: stdout, format: pretty, level: http }
+log: { type: stdout, format: pretty, level: http }
 #experiments:
 #  # support for npm token command
 #  token: false
diff --git a/yarn.lock b/yarn.lock
index 2503fd04fd5d..3d5eb7344ea5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13496,6 +13496,15 @@ fs-constants@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
   integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
 
+fs-extra@11.1.0, fs-extra@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
+  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
@@ -13534,15 +13543,6 @@ fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^11.1.0:
-  version "11.1.0"
-  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.0.tgz#5784b102104433bb0e090f48bfc4a30742c357ed"
-  integrity sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
 fs-extra@^4.0.2, fs-extra@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"

From d94a01713129056142b900facb0c595f2fc5ecb8 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Thu, 30 Mar 2023 12:29:23 +0100
Subject: [PATCH 49/50] fix(docs): Remove references to `@sentry/tracing` from
 READMEs (#7600)

---
 packages/angular-ivy/README.md | 15 +++++++--------
 packages/angular/README.md     | 13 ++++++-------
 packages/gatsby/README.md      |  2 +-
 packages/react/README.md       |  4 ++--
 packages/svelte/README.md      |  3 +--
 5 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/packages/angular-ivy/README.md b/packages/angular-ivy/README.md
index c96f89420559..b1d19b0a7edf 100644
--- a/packages/angular-ivy/README.md
+++ b/packages/angular-ivy/README.md
@@ -80,26 +80,25 @@ see `ErrorHandlerOptions` interface in `src/errorhandler.ts`.
 
 ### Tracing
 
-`@sentry/angular-ivy` exports a Trace Service, Directive and Decorators that leverage the `@sentry/tracing` Tracing
-integration to add Angular related spans to transactions. If the Tracing integration is not enabled, this functionality
-will not work. The service itself tracks route changes and durations, where directive and decorators are tracking
-components initializations.
+`@sentry/angular-ivy` exports a Trace Service, Directive and Decorators that leverage the tracing features to add
+Angular-related spans to transactions. If tracing is not enabled, this functionality will not work. The SDK's
+`TraceService` itself tracks route changes and durations, while directive and decorators are tracking components
+initializations.
 
 #### Install
 
 Registering a Trace Service is a 3-step process.
 
-1. Register and configure the `BrowserTracing` integration from `@sentry/tracing`, including custom Angular routing
+1. Register and configure the `BrowserTracing` integration, including custom Angular routing
    instrumentation:
 
 ```javascript
-import { init, instrumentAngularRouting } from '@sentry/angular-ivy';
-import { Integrations as TracingIntegrations } from '@sentry/tracing';
+import { init, instrumentAngularRouting, BrowserTracing } from '@sentry/angular-ivy';
 
 init({
   dsn: '__DSN__',
   integrations: [
-    new TracingIntegrations.BrowserTracing({
+    new BrowserTracing({
       tracingOrigins: ['localhost', 'https://yourserver.io/api'],
       routingInstrumentation: instrumentAngularRouting,
     }),
diff --git a/packages/angular/README.md b/packages/angular/README.md
index b03b24195fb0..9f95ac87bf01 100644
--- a/packages/angular/README.md
+++ b/packages/angular/README.md
@@ -76,26 +76,25 @@ see `ErrorHandlerOptions` interface in `src/errorhandler.ts`.
 
 ### Tracing
 
-`@sentry/angular` exports a Trace Service, Directive and Decorators that leverage the `@sentry/tracing` Tracing
-integration to add Angular related spans to transactions. If the Tracing integration is not enabled, this functionality
-will not work. The service itself tracks route changes and durations, where directive and decorators are tracking
+`@sentry/angular` exports a Trace Service, Directive and Decorators that leverage the tracing
+features to add Angular-related spans to transactions. If tracing is not enabled, this functionality
+will not work. The SDK's `TraceService` itself tracks route changes and durations, while directive and decorators are tracking
 components initializations.
 
 #### Install
 
 Registering a Trace Service is a 3-step process.
 
-1. Register and configure the `BrowserTracing` integration from `@sentry/tracing`, including custom Angular routing
+1. Register and configure the `BrowserTracing` integration, including custom Angular routing
    instrumentation:
 
 ```javascript
-import { init, instrumentAngularRouting } from '@sentry/angular';
-import { Integrations as TracingIntegrations } from '@sentry/tracing';
+import { init, instrumentAngularRouting, BrowserTracing } from '@sentry/angular';
 
 init({
   dsn: '__DSN__',
   integrations: [
-    new TracingIntegrations.BrowserTracing({
+    new BrowserTracing({
       tracingOrigins: ['localhost', 'https://yourserver.io/api'],
       routingInstrumentation: instrumentAngularRouting,
     }),
diff --git a/packages/gatsby/README.md b/packages/gatsby/README.md
index 22e181c5c70f..c20f3355e297 100644
--- a/packages/gatsby/README.md
+++ b/packages/gatsby/README.md
@@ -39,7 +39,7 @@ To automatically capture the `release` value on Vercel you will need to register
 
 ## Sentry Performance
 
-To enable tracing, supply either `tracesSampleRate` or `tracesSampler` to the options and make sure you have installed the `@sentry/tracing` package. This will also turn on the `BrowserTracing` integration for automatic instrumentation of pageloads and navigations.
+To enable tracing, supply either `tracesSampleRate` or `tracesSampler` to the options. This will turn on the `BrowserTracing` integration for automatic instrumentation of pageloads and navigations.
 
 ```javascript
 module.exports = {
diff --git a/packages/react/README.md b/packages/react/README.md
index 761083801ca1..bddbfc6845f5 100644
--- a/packages/react/README.md
+++ b/packages/react/README.md
@@ -67,8 +67,8 @@ export default App;
 
 ### Profiler
 
-`@sentry/react` exports a Profiler component that leverages the `@sentry/tracing` Tracing integration to add React related
-spans to transactions. If the Tracing integration is not enabled, the Profiler component will not work. The Profiler
+`@sentry/react` exports a Profiler component that leverages the tracing features to add React-related
+spans to transactions. If tracing is not enabled, the Profiler component will not work. The Profiler
 tracks component mount, render duration and updates. Requires React version >= 15.
 
 > app.js
diff --git a/packages/svelte/README.md b/packages/svelte/README.md
index c19ab728a2bf..4fb87a431787 100644
--- a/packages/svelte/README.md
+++ b/packages/svelte/README.md
@@ -25,13 +25,12 @@ To use the SDK, initialize Sentry in your Svelte entry point `main.js` before yo
 import App from "./App.svelte";
 
 import * as Sentry from "@sentry/svelte";
-import { BrowserTracing } from "@sentry/tracing";
 
 // Initialize the Sentry SDK here
 Sentry.init({
   dsn: "__DSN__",
   release: "my-project-name@2.3.12",
-  integrations: [new BrowserTracing()],
+  integrations: [new Sentry.BrowserTracing()],
 
   // Set tracesSampleRate to 1.0 to capture 100%
   // of transactions for performance monitoring.

From 5e288f58f1edb10d4d5b450eaca75adf6caa1407 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Thu, 30 Mar 2023 11:59:29 +0200
Subject: [PATCH 50/50] meta(changelog): Update changelog for 7.46.0

---
 CHANGELOG.md | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11c0d12188fb..ad3b305063ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,82 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.46.0
+
+### Important Changes
+
+- **feat(sveltekit)**: Add Performance Monitoring for SvelteKit
+  - feat(sveltekit): Add meta tag for backend -> frontend (#7574)
+  - fix(sveltekit): Explicitly export Node SDK exports (#7644)
+  - fix(sveltekit): Handle nested server calls in `sentryHandle` (#7598)
+  - ref(sveltekit): Split up universal and server load wrappers (#7652)
+
+This release adds support for Performance Monitoring in our SvelteKit SDK for the client/server. We've also changed how you should initialize your SDK. Please read our updated [SvelteKit README instructions](./packages/sveltekit/README.md) for more details.
+
+- **feat(core)**: Add `ignoreTransactions` option (#7594)
+
+You can now easily filter out certain transactions from being sent to Sentry based on their name.
+
+```ts
+Sentry.init({
+  ignoreTransactions: ['/api/healthcheck', '/ping'],
+})
+```
+
+- **feat(node)**: Undici integration (#7582)
+  - feat(nextjs): Add Undici integration automatically (#7648)
+  - feat(sveltekit): Add Undici integration by default (#7650)
+
+We've added an integration that automatically instruments [Undici](https://github.com/nodejs/undici) and Node server side fetch. This supports Undici `v4.7.0` or higher and requires Node `v16.7.0` or higher. After adding the integration outgoing requests made by Undici will have associated spans and breadcrumbs in Sentry.
+
+```ts
+Sentry.init({
+  integrations: [new Sentry.Integrations.Undici()],
+})
+```
+
+In our Next.js and SvelteKit SDKs, this integration is automatically added.
+
+- **feat(node)**: Add Sentry tRPC middleware (#7511)
+
+We've added a new middleware for [trpc](https://trpc.io/) that automatically adds TRPC information to Sentry transactions. This middleware is meant to be used in combination with a Sentry server integration (Next.js, Express, etc).
+
+```ts
+import { initTRPC } from '@trpc/server';
+import * as Sentry from '@sentry/node';
+
+const t = initTRPC.context().create();
+const sentryMiddleware = t.middleware(
+  Sentry.Handlers.trpcMiddleware({
+    attachRpcInput: true,
+  }),
+);
+
+const sentrifiedProcedure = t.procedure.use(sentryMiddleware);
+```
+
+- **fix(node)**: Convert debugging code to callbacks to fix memory leak in `LocalVariables` integration (#7637)
+
+This fixes a memory leak in the opt-in [`LocalVariables` integration](https://blog.sentry.io/2023/02/01/local-variables-for-nodejs-in-sentry/), which adds local variables to the stacktraces sent to Sentry. The minimum recommended version to use the `LocalVariables` is now `7.46.0`.
+
+### Additional Features and Fixes
+
+- feat(node): Auto discovery only returns integrations where dependency loads (#7603)
+- feat(node): Sanitize URLs in Span descriptions and breadcrumbs (PII) (#7667)
+- feat(replay): Add `responseStatus`, `decodedBodySize` to perf entries (#7613)
+- feat(replay): Add experiment to capture request/response bodies (#7589)
+- feat(replay): Capture replay mutation breadcrumbs & add experiment (#7568)
+- feat(tracing): Ensure `pageload` transaction starts at timeOrigin (#7632)
+- fix(core): Remove `abs_path` from stack trace (reverting #7167) (#7623)
+- fix(nextjs): Add loading component type to server component wrapping (#7639)
+- fix(nextjs): Don't report `NEXT_NOT_FOUND` and `NEXT_REDIRECT` errors (#7642)
+- fix(nextjs): Rewrite `abs_path` frames (#7619)
+- fix(nextjs): Show errors and warnings only once during build (#7651)
+- fix(nextjs): Use Next.js internal AsyncStorage (#7630)
+- fix(nextjs): Gracefully handle undefined `beforeFiles` in rewrites (#7649)
+
+Work in this release contributed by @aldenquimby and @bertho-zero. Thank you for your contributions!
+
 ## 7.45.0
 
 - build(cdn): Ensure ES5 bundles do not use non-ES5 code (#7550)