diff --git a/.craft.yml b/.craft.yml
index 522b6f125f00..85959ea2e984 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -89,8 +89,11 @@ targets:
 
   ## 5. Node-based Packages
   - name: npm
-    id: '@sentry/serverless'
-    includeNames: /^sentry-serverless-\d.*\.tgz$/
+    id: '@sentry/aws-serverless'
+    includeNames: /^sentry-aws-serverless-\d.*\.tgz$/
+  - name: npm
+    id: '@sentry/google-cloud-serverless'
+    includeNames: /^sentry-google-cloud-\d.*\.tgz$/
   - name: npm
     id: '@sentry/bun'
     includeNames: /^sentry-bun-\d.*\.tgz$/
diff --git a/.eslintrc.js b/.eslintrc.js
index 150c7e8efd2f..90f474319c7d 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -6,7 +6,7 @@
 module.exports = {
   root: true,
   env: {
-    es6: true,
+    es2017: true,
   },
   parserOptions: {
     ecmaVersion: 2018,
diff --git a/.github/CANARY_FAILURE_TEMPLATE.md b/.github/CANARY_FAILURE_TEMPLATE.md
index a99ec1e844f7..9e05fcfc44ae 100644
--- a/.github/CANARY_FAILURE_TEMPLATE.md
+++ b/.github/CANARY_FAILURE_TEMPLATE.md
@@ -2,4 +2,5 @@
 title: '{{ env.TITLE }}'
 labels: 'Type: Tests, Waiting for: Product Owner'
 ---
+
 Canary tests failed: {{ env.RUN_LINK }}
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 9c8ca1f159b5..13769041be38 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -34,15 +34,16 @@ body:
         - '@sentry/astro'
         - '@sentry/angular'
         - '@sentry/angular-ivy'
+        - '@sentry/aws-serverless'
         - '@sentry/bun'
         - '@sentry/deno'
         - '@sentry/ember'
         - '@sentry/gatsby'
+        - '@sentry/google-cloud-serverless'
         - '@sentry/nextjs'
         - '@sentry/node'
         - '@sentry/react'
         - '@sentry/remix'
-        - '@sentry/serverless'
         - '@sentry/svelte'
         - '@sentry/sveltekit'
         - '@sentry/vue'
diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 26b6f695069f..9526e93d55c6 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -36,3 +36,4 @@ jobs:
           version: ${{ steps.version.outputs.group1 }}
           force: false
           merge_target: master
+          craft_config_from_merge_target: true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 954734ad0ba0..9c216581322a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,7 +140,6 @@ jobs:
               - 'packages/profiling-node/**'
               - 'dev-packages/e2e-tests/test-applications/node-profiling/**'
             profiling_node_bindings:
-              - *workflow
               - 'packages/profiling-node/**'
               - 'dev-packages/e2e-tests/test-applications/node-profiling/**'
             deno:
@@ -279,39 +278,6 @@ jobs:
       # `job_build` can't see `job_install_deps` and what it returned)
       dependency_cache_key: ${{ needs.job_install_deps.outputs.dependency_cache_key }}
 
-  job_size_check:
-    name: Size Check
-    needs: [job_get_metadata, job_build]
-    timeout-minutes: 15
-    runs-on: ubuntu-20.04
-    if:
-      github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
-      needs.job_get_metadata.outputs.is_release == 'true'
-    steps:
-      - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ env.HEAD_COMMIT }}
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          # The size limit action runs `yarn` and `yarn build` when this job is executed on
-          # use Node 14 for now.
-          node-version: '14'
-      - name: Restore caches
-        uses: ./.github/actions/restore-cache
-        env:
-          DEPENDENCY_CACHE_KEY: ${{ needs.job_build.outputs.dependency_cache_key }}
-      - name: Check bundle sizes
-        uses: getsentry/size-limit-action@runForBranch
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          skip_step: build
-          main_branch: develop
-          # When on release branch, we want to always run
-          # Else, we fall back to the default handling of the action
-          run_for_branch: ${{ (needs.job_get_metadata.outputs.is_release == 'true' && 'true') || '' }}
-
   job_lint:
     name: Lint
     # Even though the linter only checks source code, not built code, it needs the built code in order check that all
@@ -336,8 +302,6 @@ jobs:
         run: yarn lint:lerna
       - name: Lint C++ files
         run: yarn lint:clang
-      - name: Validate ES5 builds
-        run: yarn validate:es5
 
   job_check_format:
     name: Check file formatting
@@ -627,28 +591,24 @@ jobs:
       matrix:
         bundle:
           - esm
-          - bundle_es5
-          - bundle_es5_min
-          - bundle_es6
-          - bundle_es6_min
-          - bundle_replay_es6
-          - bundle_replay_es6_min
-          - bundle_tracing_es5
-          - bundle_tracing_es5_min
-          - bundle_tracing_es6
-          - bundle_tracing_es6_min
-          - bundle_tracing_replay_es6
-          - bundle_tracing_replay_es6_min
+          - bundle
+          - bundle_min
+          - bundle_replay
+          - bundle_replay_min
+          - bundle_tracing
+          - bundle_tracing_min
+          - bundle_tracing_replay
+          - bundle_tracing_replay_min
         project:
           - chromium
         include:
           # Only check all projects for esm & full bundle
           # We also shard the tests as they take the longest
-          - bundle: bundle_tracing_replay_es6_min
+          - bundle: bundle_tracing_replay_min
             project: ''
             shard: 1
             shards: 2
-          - bundle: bundle_tracing_replay_es6_min
+          - bundle: bundle_tracing_replay_min
             project: ''
             shard: 2
             shards: 2
@@ -665,7 +625,7 @@ jobs:
             shards: 3
         exclude:
           # Do not run the default chromium-only tests
-          - bundle: bundle_tracing_replay_es6_min
+          - bundle: bundle_tracing_replay_min
             project: 'chromium'
           - bundle: esm
             project: 'chromium'
@@ -911,7 +871,7 @@ jobs:
           yarn test
 
   job_remix_integration_tests:
-    name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) ${{ matrix.tracingIntegration && 'TracingIntegration'}} Tests
+    name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
     needs: [job_get_metadata, job_build]
     if: needs.job_get_metadata.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-20.04
@@ -919,16 +879,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [18, 20, 21]
+        # For whatever reason, these segfault on Node 18, so we are skipping these for now...
+        node: [20, 21]
         remix: [1, 2]
         # Remix v2 only supports Node 18+, so run Node 14, 16 tests separately
         include:
           - node: 14
             remix: 1
-          - node: 16
-            remix: 1
-          - tracingIntegration: true
-            remix: 2
+          # For whatever reason, these segfault on Node 16, so we are skipping these for now...
+          # - node: 16
+          #  remix: 1
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
         uses: actions/checkout@v4
@@ -946,7 +906,6 @@ jobs:
         env:
           NODE_VERSION: ${{ matrix.node }}
           REMIX_VERSION: ${{ matrix.remix }}
-          TRACING_INTEGRATION: ${{ matrix.tracingIntegration }}
         run: |
           cd packages/remix
           yarn test:integration:ci
@@ -1057,11 +1016,10 @@ jobs:
             'react-create-hash-router',
             'react-router-6-use-routes',
             'standard-frontend-react',
-            'standard-frontend-react-tracing-import',
             'sveltekit',
             'sveltekit-2',
             'generic-ts3.8',
-            'node-experimental-fastify-app',
+            'node-fastify-app',
             # TODO(v8): Re-enable hapi tests
             # 'node-hapi-app',
             'node-exports-test-app',
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf4561746bb4..7f36bdbedc05 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,3 +29,5 @@ jobs:
           version: ${{ github.event.inputs.version }}
           force: ${{ github.event.inputs.force }}
           merge_target: ${{ github.event.inputs.merge_target }}
+          craft_config_from_merge_target: true
+
diff --git a/.size-limit.js b/.size-limit.js
index 739c3f62aae1..c984f999e15a 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -3,28 +3,28 @@ module.exports = [
   {
     name: '@sentry/browser (incl. Tracing, Replay, Feedback) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, Replay, browserTracingIntegration, Feedback }',
+    import: '{ init, replayIntegration, browserTracingIntegration, feedbackIntegration }',
     gzip: true,
     limit: '90 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, Replay, browserTracingIntegration }',
+    import: '{ init, replayIntegration, browserTracingIntegration }',
     gzip: true,
     limit: '75 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay with Canvas) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, Replay, browserTracingIntegration, ReplayCanvas }',
+    import: '{ init, replayIntegration, browserTracingIntegration, replayCanvasIntegration }',
     gzip: true,
     limit: '90 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - Webpack with treeshaking flags (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, Replay, browserTracingIntegration }',
+    import: '{ init, replayIntegration, browserTracingIntegration }',
     gzip: true,
     limit: '75 KB',
     modifyWebpackConfig: function (config) {
@@ -55,9 +55,23 @@ module.exports = [
     limit: '35 KB',
   },
   {
-    name: '@sentry/browser (incl. Feedback) - Webpack (gzipped)',
+    name: '@sentry/browser (incl. feedbackIntegration) - Webpack (gzipped)',
     path: 'packages/browser/build/npm/esm/index.js',
-    import: '{ init, Feedback }',
+    import: '{ init, feedbackIntegration }',
+    gzip: true,
+    limit: '50 KB',
+  },
+  {
+    name: '@sentry/browser (incl. feedbackModalIntegration) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration }',
+    gzip: true,
+    limit: '50 KB',
+  },
+  {
+    name: '@sentry/browser (incl. feedbackScreenshotIntegration) - Webpack (gzipped)',
+    path: 'packages/browser/build/npm/esm/index.js',
+    import: '{ init, feedbackIntegration, feedbackModalIntegration, feedbackScreenshotIntegration }',
     gzip: true,
     limit: '50 KB',
   },
@@ -76,69 +90,60 @@ module.exports = [
     limit: '28 KB',
   },
 
-  // Browser CDN bundles (ES6)
+  // Browser CDN bundles
   {
-    name: '@sentry/browser (incl. Tracing, Replay, Feedback) - ES6 CDN Bundle (gzipped)',
+    name: '@sentry/browser (incl. Tracing, Replay, Feedback) - CDN Bundle (gzipped)',
     path: 'packages/browser/build/bundles/bundle.tracing.replay.feedback.min.js',
     gzip: true,
     limit: '90 KB',
   },
   {
-    name: '@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (gzipped)',
+    name: '@sentry/browser (incl. Tracing, Replay) - CDN Bundle (gzipped)',
     path: 'packages/browser/build/bundles/bundle.tracing.replay.min.js',
     gzip: true,
     limit: '75 KB',
   },
   {
-    name: '@sentry/browser (incl. Tracing) - ES6 CDN Bundle (gzipped)',
+    name: '@sentry/browser (incl. Tracing) - CDN Bundle (gzipped)',
     path: 'packages/browser/build/bundles/bundle.tracing.min.js',
     gzip: true,
     limit: '37 KB',
   },
   {
-    name: '@sentry/browser - ES6 CDN Bundle (gzipped)',
+    name: '@sentry/browser - CDN Bundle (gzipped)',
     path: 'packages/browser/build/bundles/bundle.min.js',
     gzip: true,
     limit: '28 KB',
   },
 
-  // browser CDN bundles (ES6 + non-gzipped)
+  // browser CDN bundles (non-gzipped)
   {
-    name: '@sentry/browser (incl. Tracing, Replay) - ES6 CDN Bundle (minified & uncompressed)',
+    name: '@sentry/browser (incl. Tracing, Replay) - CDN Bundle (minified & uncompressed)',
     path: 'packages/browser/build/bundles/bundle.tracing.replay.min.js',
     gzip: false,
     brotli: false,
     limit: '260 KB',
   },
   {
-    name: '@sentry/browser (incl. Tracing) - ES6 CDN Bundle (minified & uncompressed)',
+    name: '@sentry/browser (incl. Tracing) - CDN Bundle (minified & uncompressed)',
     path: 'packages/browser/build/bundles/bundle.tracing.min.js',
     gzip: false,
     brotli: false,
     limit: '105 KB',
   },
   {
-    name: '@sentry/browser - ES6 CDN Bundle (minified & uncompressed)',
+    name: '@sentry/browser - CDN Bundle (minified & uncompressed)',
     path: 'packages/browser/build/bundles/bundle.min.js',
     gzip: false,
     brotli: false,
     limit: '80 KB',
   },
 
-  // Browser CDN bundles (ES5)
-  // Replay is not supported in ES5 mode
-  {
-    name: '@sentry/browser (incl. Tracing) - ES5 CDN Bundle (gzipped)',
-    path: 'packages/browser/build/bundles/bundle.tracing.es5.min.js',
-    gzip: true,
-    limit: '40 KB',
-  },
-
   // React
   {
     name: '@sentry/react (incl. Tracing, Replay) - Webpack (gzipped)',
     path: 'packages/react/build/esm/index.js',
-    import: '{ init, browserTracingIntegration, Replay }',
+    import: '{ init, browserTracingIntegration, replayIntegration }',
     gzip: true,
     limit: '75 KB',
   },
@@ -154,7 +159,7 @@ module.exports = [
   {
     name: '@sentry/nextjs Client (incl. Tracing, Replay) - Webpack (gzipped)',
     path: 'packages/nextjs/build/esm/client/index.js',
-    import: '{ init, browserTracingIntegration, Replay }',
+    import: '{ init, browserTracingIntegration, replayIntegration }',
     gzip: true,
     limit: '110 KB',
   },
@@ -168,7 +173,7 @@ module.exports = [
   {
     name: '@sentry-internal/feedback - Webpack (gzipped)',
     path: 'packages/feedback/build/npm/esm/index.js',
-    import: '{ Feedback }',
+    import: '{ feedbackIntegration }',
     gzip: true,
     limit: '25 KB',
   },
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfb8eacad610..8cb6a635c716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,133 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 8.0.0-alpha.3
+
+This is the third Alpha release of the v8 cycle, which includes a variety of breaking changes.
+
+Read the [in-depth migration guide](./MIGRATION.md) to find out how to address any breaking changes in your code.
+
+### Important Changes
+
+- **feat: Set required node version to >=14.18.0 for all packages (#10968)**
+
+The minimum Node version required for the SDK is now `14.18.0`.
+
+- **Serverless SDK Changes**
+  - feat(google-cloud): Add @sentry/google-cloud package (#10993)
+  - feat(v8): Add @sentry/aws-serverless package (#11052)
+  - feat(v8): Rename gcp package to `@sentry/google-cloud-serverless` (#11065)
+
+`@sentry/serverless` is no longer published, and is replaced by two new packages: `@sentry/google-cloud-serverless` and
+`@sentry/aws-serverless`. These packages are now the recommended way to instrument serverless functions. See the
+[migration guide](./MIGRATION.md#sentryserverless) for more details.
+
+- **build(bundles): Use ES2017 for bundles (drop ES5 support) (#10911)**
+
+The Browser SDK and CDN bundles now emits ES2017 compatible code and drops support for IE11. This also means that the
+Browser SDKs (`@sentry/browser`, `@sentry/react`, `@sentry/vue`, etc.) requires the fetch API to be available in the
+environment. If you need to support older browsers, please transpile your code to ES5 using babel or similar and add
+required polyfills.
+
+New minimum supported browsers:
+
+- Chrome 58
+- Edge 15
+- Safari/iOS Safari 11
+- Firefox 54
+- Opera 45
+- Samsung Internet 7.2
+
+### Removal/Refactoring of deprecated functionality
+
+- feat(browser): Remove IE parser from the default stack parsers (#11035)
+- feat(bun/v8): Remove all deprecations from Bun SDK (#10971)
+- feat(core): Remove `startTransaction` export (#11015)
+- feat(v8/core): Move addTracingHeadersToFetchRequest and instrumentFetchRequest to core (#10918)
+- feat(v8/deno): Remove deprecations from deno SDK (#10972)
+- feat(v8/remix): Remove remixRouterInstrumentation (#10933)
+- feat(v8/replay): Opt-in options for `unmask` and `unblock` (#11049)
+- feat(v8/tracing): Delete BrowserTracing class (#10919)
+- feat(v8/vercel-edge): Remove vercel-edge sdk deprecations (#10974)
+- feat(replay/v8): Delete deprecated `replaySession` and `errorSampleRates` (#11045)
+- feat(v8): Remove deprecated Replay, Feedback, ReplayCanvas exports (#10814)
+- ref: Remove `spanRecorder` and all related code (#10977)
+- ref: Remove deprecated `origin` field on span start options (#11058)
+- ref: Remove deprecated properties from `startSpan` options (#11054)
+- ref(core): Remove `startTransaction` & `finishTransaction` hooks (#11008)
+- ref(nextjs): Remove `sentry` field in Next.js config as a means of configuration (#10839)
+- ref(nextjs): Remove last internal deprecations (#11019)
+- ref(react): Streamline browser tracing integrations & remove old code (#11012)
+- ref(svelte): Remove `startChild` deprecations (#10956)
+- ref(sveltekit): Update trace propagation & span options (#10838)
+- ref(v8/angular): Remove instrumentAngularRouting and fix tests (#11021)
+
+### Other Changes
+
+- feat: Ensure `getRootSpan()` does not rely on transaction (#10979)
+- feat: Export `getSpanDescendants()` everywhere (#10924)
+- feat: Make ESM output valid Node ESM (#10928)
+- feat: Remove tags from spans & transactions (#10809)
+- feat(angular): Update scope `transactionName` when route is resolved (#11043)
+- feat(angular/v8): Change decorator naming and add `name` parameter (#11057)
+- feat(astro): Update `@sentry/astro` to use OpenTelemetry (#10960)
+- feat(browser): Remove `HttpContext` integration class (#10987)
+- feat(browser): Use idle span for browser tracing (#10957)
+- feat(build): Allow passing Sucrase options for rollup (#10747)
+- feat(build): Core packages into single output files (#11030)
+- feat(core): Allow custom tracing implementations (#11003)
+- feat(core): Allow metrics aggregator per client (#10949)
+- feat(core): Decouple `scope.transactionName` from root spans (#10991)
+- feat(core): Ensure trace APIs always return a span (#10942)
+- feat(core): Implement `startIdleSpan` (#10934)
+- feat(core): Move globals to `__SENTRY__` singleton (#11034)
+- feat(core): Move more scope globals to `__SENTRY__` (#11074)
+- feat(core): Undeprecate setTransactionName (#10966)
+- feat(core): Update `continueTrace` to be callback-only (#11044)
+- feat(core): Update `spanToJSON` to handle OTEL spans (#10922)
+- feat(deps): bump @sentry/cli from 2.29.1 to 2.30.0 (#11024)
+- feat(feedback): New feedback integration with screenshots (#10590)
+- feat(nextjs): Bump Webpack Plugin to version 2 and rework config options (#10978)
+- feat(nextjs): Support Hybrid Cloud DSNs with `tunnelRoute` option (#10959)
+- feat(node): Add `setupFastifyErrorHandler` utility (#11061)
+- feat(node): Rephrase wording in http integration JSDoc (#10947)
+- feat(opentelemetry): Do not use SentrySpan & Transaction classes (#10982)
+- feat(opentelemetry): Remove hub from context (#10983)
+- feat(opentelemetry): Use core `getRootSpan` functionality (#11004)
+- feat(profiling-node): Refactor deprecated methods & non-hook variant (#10984)
+- feat(react): Update scope's `transactionName` in React Router instrumentations (#11048)
+- feat(remix): Refactor to use new performance APIs (#10980)
+- feat(remix): Update remix SDK to be OTEL-powered (#11031)
+- feat(sveltekit): Export `unstable_sentryVitePluginOptions` for full Vite plugin customization (#10930)
+- feat(v8/bun): Update @sentry/bun to use OTEL node (#10997)
+- fix(ember): Ensure browser tracing is correctly lazy loaded (#11026)
+- fix(nextjs): Use passthrough `createReduxEnhancer` on server (#11005)
+- fix(node): Add missing core re-exports (#10931)
+- fix(node): Correct SDK name (#10961)
+- fix(node): Do not assert in vendored proxy code (#11011)
+- fix(node): Export spotlightIntegration from OTEL node (#10973)
+- fix(node): support undici headers as strings or arrays (#10938)
+- fix(opentelemetry): Fix span & sampling propagation (#11092)
+- fix(react): Passes the fallback function through React's createElement function (#10623)
+- fix(react): Set `handled` value in ErrorBoundary depending on fallback (#10989)
+- fix(types): Add `addScopeListener` to `Scope` interface (#10952)
+- fix(types): Add `AttachmentType` and use for envelope `attachment_type` property (#10946)
+- fix(types): Remove usage of `allowSyntheticDefaultImports` (#11073)
+- fix(v8/utils): Stack parser skip frames (not lines of stack string) (#10560)
+- ref(angular): Refactor usage of `startChild` (#11056)
+- ref(browser): Store browser metrics as attributes instead of tags (#10823)
+- ref(browser): Update `scope.transactionName` on pageload and navigation span creation (#10992)
+- ref(browser): Update browser metrics to avoid deprecations (#10943)
+- ref(browser): Update browser profiling to avoid deprecated APIs (#11007)
+- ref(feedback): Move UserFeedback type into feedback.ts (#11032)
+- ref(nextjs): Clean up browser tracing integration (#11022)
+- ref(node-experimental): Refactor usage of `startChild()` (#11047)
+- ref(node): Use new performance APIs in legacy `http` & `undici` (#11055)
+- ref(opentelemetry): Remove parent span map (#11014)
+- ref(opentelemetry): Remove span metadata handling (#11020)
+
+Work in this release contributed by @MFoster and @jessezhang91. Thank you for your contributions!
+
 ## 8.0.0-alpha.2
 
 This alpha release fixes a build problem that prevented 8.0.0-alpha.1 from being properly released.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 812aaa870df5..d424a69e1967 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ With that, the repo is fully set up and you are ready to run all commands.
 Since we are using [`TypeScript`](https://www.typescriptlang.org/), you need to transpile the code to JavaScript to be
 able to use it. From the top level of the repo, there are three commands available:
 
-- `yarn build:dev`, which runs a one-time build of ES5 and ES6 versions of every package
+- `yarn build:dev`, which runs a one-time build of every package
 - `yarn build:dev:filter <name of npm package>`, which runs `yarn build:dev` only in projects relevant to the given
   package (so, for example, running `yarn build:dev:filter @sentry/react` will build the `react` package, all of its
   dependencies (`utils`, `core`, `browser`, etc), and all packages which depend on it (currently `gatsby` and `nextjs`))
diff --git a/MIGRATION.md b/MIGRATION.md
index 8b5d1bdf0c0e..fda328f7ba42 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -3,7 +3,7 @@
 These docs walk through how to migrate our JavaScript SDKs through different major versions.
 
 - Upgrading from [SDK 4.x to 5.x/6.x](./docs/migration/v4-to-v5_v6.md)
-- Uprading from [SDK 6.x to 7.x](./docs/migration/v6-to-v7.md)
+- Upgrading from [SDK 6.x to 7.x](./docs/migration/v6-to-v7.md)
 - Upgrading from [SDK 7.x to 8.x](./MIGRATION.md#upgrading-from-7x-to-8x)
 
 # Upgrading from 7.x to 8.x
@@ -20,22 +20,22 @@ stable release of `8.x` comes out).
 
 ## 1. Version Support changes:
 
-**Node.js**: We now official support Node 14.8+ for our CJS package, and Node 18.8+ for our ESM package. This applies to
-`@sentry/node` and all of our node-based server-side sdks (`@sentry/nextjs`, `@sentry/serverless`, etc.). We no longer
-test against Node 8, 10, or 12 and cannot guarantee that the SDK will work as expected on these versions.
+**Node.js**: We now official support Node 14.18+ for our CJS package, and Node 18.8+ for our ESM package. This applies
+to `@sentry/node` and all of our node-based server-side sdks (`@sentry/nextjs`, `@sentry/serverless`, etc.). We no
+longer test against Node 8, 10, or 12 and cannot guarantee that the SDK will work as expected on these versions.
 
-**Browser**: Our browser SDKs (`@sentry/browser`, `@sentry/react`, `@sentry/vue`, etc.) now require ES6+ compatible
+**Browser**: Our browser SDKs (`@sentry/browser`, `@sentry/react`, `@sentry/vue`, etc.) now require ES2017+ compatible
 browsers. This means that we no longer support IE11 (end of an era). This also means that the Browser SDK requires the
 fetch API to be available in the environment.
 
 New minimum supported browsers:
 
-- Chrome 51
+- Chrome 58
 - Edge 15
-- Safari/iOS Safari 10
+- Safari/iOS Safari 11
 - Firefox 54
-- Opera 38
-- Samnsung Internet 5
+- Opera 45
+- Samsung Internet 7.2
 
 For IE11 support please transpile your code to ES5 using babel or similar and add required polyfills.
 
@@ -48,6 +48,7 @@ We've removed the following packages:
 - [@sentry/hub](./MIGRATION.md#sentryhub)
 - [@sentry/tracing](./MIGRATION.md#sentrytracing)
 - [@sentry/integrations](./MIGRATION.md#sentryintegrations)
+- [@sentry/serverless](./MIGRATION.md#sentryserverless)
 
 #### @sentry/hub
 
@@ -62,7 +63,7 @@ We've removed the following packages:
 For Browser SDKs you can import `BrowserTracing` from the SDK directly:
 
 ```js
-// Before (v7)
+// v7
 import * as Sentry from '@sentry/browser';
 import { BrowserTracing } from '@sentry/tracing';
 
@@ -71,8 +72,10 @@ Sentry.init({
   tracesSampleRate: 1.0,
   integrations: [new BrowserTracing()],
 });
+```
 
-// After (v8)
+```js
+// v8
 import * as Sentry from '@sentry/browser';
 
 Sentry.init({
@@ -86,7 +89,7 @@ If you were importing `@sentry/tracing` for the side effect, you can now use `Se
 tracing extensions to the SDK. `addTracingExtensions` replaces the `addExtensionMethods` method from `@sentry/tracing`.
 
 ```js
-// Before (v7)
+// v7
 import * as Sentry from '@sentry/browser';
 import '@sentry/tracing';
 
@@ -94,8 +97,10 @@ Sentry.init({
   dsn: '__DSN__',
   tracesSampleRate: 1.0,
 });
+```
 
-// After (v8)
+```js
+// v8
 import * as Sentry from '@sentry/browser';
 
 Sentry.addTracingExtensions();
@@ -109,7 +114,7 @@ Sentry.init({
 For Node SDKs you no longer need the side effect import, you can remove all references to `@sentry/tracing`.
 
 ```js
-// Before (v7)
+// v7
 const Sentry = require('@sentry/node');
 require('@sentry/tracing');
 
@@ -117,8 +122,10 @@ Sentry.init({
   dsn: '__DSN__',
   tracesSampleRate: 1.0,
 });
+```
 
-// After (v8)
+```js
+// v8
 const Sentry = require('@sentry/node');
 
 Sentry.init({
@@ -134,10 +141,12 @@ package (`@sentry/integrations`) to `@sentry/browser` and `@sentry/node`. in add
 classes.
 
 ```js
-// Before (v7)
+// v7
 import { RewriteFrames } from '@sentry/integrations';
+```
 
-// After (v8)
+```js
+// v8
 import { rewriteFramesIntegration } from '@sentry/browser';
 ```
 
@@ -159,11 +168,91 @@ Integrations that are now exported from `@sentry/node` and `@sentry/browser` (or
 
 The `Transaction` integration has been removed from `@sentry/integrations`. There is no replacement API.
 
+#### @sentry/serverless
+
+`@sentry/serverless` has been removed and will no longer be published. The serverless package has been split into two
+different packages, `@sentry/aws-serverless` and `@sentry/google-cloud-serverless`. These new packages have smaller
+bundle size than `@sentry/serverless`, which should improve your serverless cold-start times.
+
+`@sentry/aws-serverless` and `@sentry/google-cloud-serverless` has also been changed to only emit CJS builds. The ESM
+build for the `@sentry/serverless` package was always broken and we decided to remove it entirely. ESM support will be
+re-added at a later date.
+
+In `@sentry/serverless` you had to use a namespace import to initialize the SDK. This has been removed so that you can
+directly import from the SDK instead.
+
+```js
+// v7
+const Sentry = require('@sentry/serverless');
+
+Sentry.AWSLambda.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+
+// v8
+const Sentry = require('@sentry/aws-serverless');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+```
+
+```js
+// v7
+const Sentry = require('@sentry/serverless');
+
+Sentry.GCPFunction.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+
+// v8
+const Sentry = require('@sentry/google-cloud-serverless');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+```
+
 ## 3. Performance Monitoring Changes
 
+- [Initializing the SDK in v8](./MIGRATION.md/#initializing-the-node-sdk)
 - [Performance Monitoring API](./MIGRATION.md#performance-monitoring-api)
 - [Performance Monitoring Integrations](./MIGRATION.md#performance-monitoring-integrations)
 
+### Initializing the Node SDK
+
+If you are using `@sentry/node` or `@sentry/bun`, or a package that depends on it (`@sentry/nextjs`, `@sentry/remix`,
+`@sentry/sveltekit`, `@sentry/`), you will need to initialize the SDK differently. The primary change is to ensure that
+the SDK is initialized as early as possible. See [Initializing the SDK in v8](./docs/v8-initializing.md) on what steps
+to follow.
+
+For example with the Remix SDK, you should initialize the SDK at the top of your `entry.server.tsx` server entrypoint
+before you do anything else.
+
+```js
+// first import Sentry and initialize Sentry
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  tracesSampleRate: 1,
+  tracePropagationTargets: ['example.org'],
+  // Disabling to test series of envelopes deterministically.
+  autoSessionTracking: false,
+});
+
+// then handle everything else
+import type { EntryContext } from '@remix-run/node';
+import { RemixServer } from '@remix-run/react';
+import { renderToString } from 'react-dom/server';
+
+export const handleError = Sentry.wrapRemixHandleError;
+```
+
 ### Performance Monitoring API
 
 The APIs for Performance Monitoring in the SDK have been revamped to align with OpenTelemetry, an open standard for
@@ -216,7 +305,7 @@ function middleware(res, req, next) {
 
 You can [read more about the new performance APIs here](./docs/v8-new-performance-apis.md).
 
-To accomodate these changes, we're removed the following APIs:
+To accommodate these changes, we're removed the following APIs:
 
 - [`startTransaction` and `span.startChild`](./MIGRATION.md#deprecate-starttransaction--spanstartchild)
 - [Certain arguments in `startSpan` and `startTransaction`](./MIGRATION.md#deprecate-arguments-for-startspan-apis)
@@ -232,7 +321,7 @@ As we added support for OpenTelemetry, we have expanded the automatic instrument
 support for frameworks like Fastify, Nest.js, and Hapi, and expanding support for databases like Prisma and MongoDB via
 Mongoose.
 
-We now support the following integrations out of the box:
+We now support the following integrations out of the box without extra configuration:
 
 - `httpIntegration`: Automatically instruments Node `http` and `https` standard libraries
 - `nativeNodeFetchIntegration`: Automatically instruments top level fetch and undici
@@ -248,12 +337,16 @@ We now support the following integrations out of the box:
 - `postgresIntegration`: Automatically instruments PostgreSQL
 - `prismaIntegration`: Automatically instruments Prisma
 
+To make sure these integrations work properly you'll have to change how you
+[initialize the SDK](./docs/v8-initializing.md)
+
 ## 4. Removal of deprecated APIs
 
 - [General](./MIGRATION.md#general)
 - [Browser SDK](./MIGRATION.md#browser-sdk-browser-react-vue-angular-ember-etc)
 - [Server-side SDKs (Node, Deno, Bun)](./MIGRATION.md#server-side-sdks-node-deno-bun-etc)
 - [Next.js SDK](./MIGRATION.md#nextjs-sdk)
+- [SvelteKit SDK](./MIGRATION.md#sveltekit-sdk)
 - [Astro SDK](./MIGRATION.md#astro-sdk)
 
 ### General
@@ -302,13 +395,20 @@ The `getIntegration()` and `getIntegrationById()` have been removed entirely, se
 [below](./MIGRATION.md#deprecate-getintegration-and-getintegrationbyid).
 
 ```js
-// Before (v7)
+// v7
 const replay = Sentry.getIntegration(Replay);
+```
 
-// After (v8)
+```js
+// v8
 const replay = getClient().getIntegrationByName('Replay');
 ```
 
+#### `framesToPop` applies to parsed frames
+
+Error with `framesToPop` property will have the specified number of frames removed from the top of the stack. This
+changes compared to the v7 where the property `framesToPop` was used to remove top n lines from the stack string.
+
 #### `tracingOrigins` has been replaced by `tracePropagationTargets`
 
 `tracingOrigins` is now removed in favor of the `tracePropagationTargets` option. The `tracePropagationTargets` option
@@ -320,13 +420,15 @@ details.
 For example for the Browser SDKs:
 
 ```ts
-// Before (v7)
+// v7
 Sentry.init({
   dsn: '__DSN__',
   integrations: [new Sentry.BrowserTracing({ tracingOrigins: ['localhost', 'example.com'] })],
 });
+```
 
-// After (v8)
+```ts
+// v8
 Sentry.init({
   dsn: '__DSN__',
   integrations: [Sentry.browserTracingIntegration()],
@@ -339,8 +441,7 @@ Sentry.init({
 The SDKs now support metrics features without any additional configuration.
 
 ```ts
-// Before (v7)
-// Server (Node/Deno/Bun)
+// v7 - Server (Node/Deno/Bun)
 Sentry.init({
   dsn: '__DSN__',
   _experiments: {
@@ -348,14 +449,15 @@ Sentry.init({
   },
 });
 
-// Before (v7)
-// Browser
+// v7 - Browser
 Sentry.init({
   dsn: '__DSN__',
   integrations: [Sentry.metricsAggregatorIntegration()],
 });
+```
 
-// After (v8)
+```ts
+// v8
 Sentry.init({
   dsn: '__DSN__',
 });
@@ -367,14 +469,16 @@ In v7 we deprecated the `Severity` enum in favor of using the `SeverityLevel` ty
 this has been removed in v8. You should now use the `SeverityLevel` type directly.
 
 ```js
-// Before (v7)
+// v7
 import { Severity, SeverityLevel } from '@sentry/types';
 
 const levelA = Severity.error;
 
 const levelB: SeverityLevel = "error"
+```
 
-// After (v8)
+```js
+// v8
 import { SeverityLevel } from '@sentry/types';
 
 const levelA = "error" as SeverityLevel;
@@ -388,12 +492,14 @@ The top level `Sentry.configureScope` function has been removed. Instead, you sh
 to access and mutate the current scope.
 
 ```js
-// Before (v7)
+// v7
 Sentry.configureScope(scope => {
   scope.setTag('key', 'value');
 });
+```
 
-// After (v8)
+```js
+// v8
 Sentry.getCurrentScope().setTag('key', 'value');
 ```
 
@@ -407,10 +513,12 @@ Internally, this class is now called `SentrySpan`, and it is no longer meant to
 In v8, we are removing the `spanStatusfromHttpCode` function in favor of `getSpanStatusFromHttpCode`.
 
 ```js
-// Before (v7)
+// v7
 const spanStatus = spanStatusfromHttpCode(200);
+```
 
-// After (v8)
+```js
+// v8
 const spanStatus = getSpanStatusFromHttpCode(200);
 ```
 
@@ -419,13 +527,15 @@ const spanStatus = getSpanStatusFromHttpCode(200);
 In v8, we are removing the `addGlobalEventProcessor` function in favor of `addEventProcessor`.
 
 ```js
-// Before (v7)
+// v7
 addGlobalEventProcessor(event => {
   delete event.extra;
   return event;
 });
+```
 
-// After (v8)
+```js
+// v8
 addEventProcessor(event => {
   delete event.extra;
   return event;
@@ -442,12 +552,14 @@ The `send` method on the `Transport` interface now always requires a `TransportM
 the promise. This means that the `void` return type is no longer allowed.
 
 ```ts
-// Before (v7)
+// v7
 interface Transport {
   send(event: Event): Promise<void | TransportMakeRequestResponse>;
 }
+```
 
-// After (v8)
+```ts
+// v8
 interface Transport {
   send(event: Event): Promise<TransportMakeRequestResponse>;
 }
@@ -518,6 +630,84 @@ The following previously deprecated API has been removed from the `@sentry/nextj
 - `IS_BUILD`
 - `isBuild`
 
+#### Merging of the Sentry Webpack Plugin options and SDK Build options
+
+With version 8 of the Sentry Next.js SDK, `withSentryConfig` will no longer accept 3 arguments. The second argument
+(holding options for the Sentry Webpack plugin) and the third argument (holding options for SDK build-time
+configuration) should now be passed as one:
+
+```ts
+// OLD
+const nextConfig = {
+  // Your Next.js options...
+};
+
+module.exports = withSentryConfig(
+  nextConfig,
+  {
+    // Your Sentry Webpack Plugin Options...
+  },
+  {
+    // Your Sentry SDK options...
+  },
+);
+
+// NEW
+const nextConfig = {
+  // Your Next.js options...
+};
+
+module.exports = withSentryConfig(nextConfig, {
+  // Your Sentry Webpack Plugin Options...
+  // AND your Sentry SDK options...
+});
+```
+
+#### Removal of the `sentry` property in your Next.js options (next.config.js)
+
+With version 8 of the Sentry Next.js SDK, the SDK will no longer support passing Next.js options with a `sentry`
+property to `withSentryConfig`. Please use the second argument of `withSentryConfig` to configure the SDK instead:
+
+```ts
+// v7
+const nextConfig = {
+  // Your Next.js options...
+
+  sentry: {
+    // Your Sentry SDK options...
+  },
+};
+
+module.exports = withSentryConfig(nextConfig, {
+  // Your Sentry Webpack Plugin Options...
+});
+```
+
+```ts
+// v8
+const nextConfig = {
+  // Your Next.js options...
+};
+
+module.exports = withSentryConfig(nextConfig, {
+  // Your Sentry Webpack Plugin Options...
+  // AND your Sentry SDK options...
+});
+```
+
+The reason for this change is to have one consistent way of defining the SDK options. We hope that this change will
+reduce confusion when setting up the SDK, with the upside that the explicit option is properly typed and will therefore
+have code completion.
+
+#### Updated the `@sentry/webpack-plugin` dependency to version 2
+
+We bumped the internal usage of `@sentry/webpack-plugin` to a new major version. This comes with multiple upsides like a
+simpler configuration interface and the use of new state of the art Debug ID technology. Debug IDs will simplify the
+setup for source maps in Sentry and will not require you to match stack frame paths to uploaded artifacts anymore.
+
+To see the new options, check out the docs at https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/,
+or look at the TypeScript type definitions of `withSentryConfig`.
+
 ### Astro SDK
 
 #### Removal of `trackHeaders` option for Astro middleware
@@ -537,6 +727,80 @@ Sentry.init({
 });
 ```
 
+### SvelteKit SDK
+
+#### Breaking `sentrySvelteKit()` changes
+
+We upgraded the `@sentry/vite-plugin` which is a dependency of the SvelteKit SDK from version 0.x to 2.x. With this
+change, resolving uploaded source maps should work out of the box much more often than before
+([more information](https://docs.sentry.io/platforms/javascript/sourcemaps/troubleshooting_js/artifact-bundles/)).
+
+To allow future upgrades of the Vite plugin without breaking stable and public APIs in `sentrySvelteKit`, we modified
+the `sourceMapsUploadOptions` to remove the hard dependency on the API of the plugin. While you previously could specify
+all [version 0.x Vite plugin options](https://www.npmjs.com/package/@sentry/vite-plugin/v/0.6.1), we now reduced them to
+a subset of [2.x options](https://www.npmjs.com/package/@sentry/vite-plugin/v/2.14.2#options). All of these options are
+optional just like before but here's an example of using the new options.
+
+```js
+// v7
+sentrySvelteKit({
+  sourceMapsUploadOptions: {
+    org: process.env.SENTRY_ORG,
+    project: process.env.SENTRY_PROJECT,
+    authToken: process.env.SENTRY_AUTH_TOKEN,
+    release: '1.0.1',
+    injectRelease: true,
+    include: ['./build/*/**/*'],
+    ignore: ['**/build/client/**/*']
+  },
+}),
+```
+
+```js
+// v8
+sentrySvelteKit({
+  sourceMapsUploadOptions: {
+    org: process.env.SENTRY_ORG,
+    project: process.env.SENTRY_PROJECT,
+    authToken: process.env.SENTRY_AUTH_TOKEN,
+    release: {
+	    name: '1.0.1',
+	    inject: true
+    },
+    sourcemaps: {
+	    assets: ['./build/*/**/*'],
+	    ignore: ['**/build/client/**/*'],
+	    filesToDeleteAfterUpload: ['./build/**/*.map']
+    },
+  },
+}),
+```
+
+In the future, we might add additional [options](https://www.npmjs.com/package/@sentry/vite-plugin/v/2.14.2#options)
+from the Vite plugin but if you would like to specify some of them directly, you can do this by passing in an
+`unstable_sentryVitePluginOptions` object:
+
+```js
+sentrySvelteKit({
+  sourceMapsUploadOptions: {
+    // ...
+    release: {
+	    name: '1.0.1',
+    },
+    unstable_sentryVitePluginOptions: {
+      release: {
+        setCommits: {
+          auto: true
+        }
+      }
+    }
+  },
+}),
+```
+
+Important: we DO NOT guarantee stability of `unstable_sentryVitePluginOptions`. They can be removed or updated at any
+time, including breaking changes within the same major version of the SDK.
+
 ## 5. Behaviour Changes
 
 - [Updated behaviour of `tracePropagationTargets` in the browser](./MIGRATION.md#updated-behaviour-of-tracepropagationtargets-in-the-browser-http-tracing-headers--cors)
@@ -597,6 +861,51 @@ The SDK no longer filters out health check transactions by default. Instead, the
 by the Sentry backend by default. You can disable dropping them in your Sentry project settings. If you still want to
 drop specific transactions within the SDK you can either use the `ignoreTransactions` SDK option.
 
+#### Change of Replay default options (`unblock` and `unmask`)
+
+The Replay options `unblock` and `unmask` now have `[]` as default value. This means that if you want to use these
+options, you have to explicitly set them like this:
+
+```js
+Sentry.init({
+  integrations: [
+    Sentry.replayIntegration({
+      unblock: ['.sentry-unblock, [data-sentry-unblock]'],
+      unmask: ['.sentry-unmask, [data-sentry-unmask]'],
+    }),
+  ],
+});
+```
+
+#### Angular Tracing Decorator renaming
+
+The usage of `TraceClassDecorator` and the `TraceMethodDecorator` already implies that those are decorators. The word
+`Decorator` is now removed from the names to avoid multiple mentioning.
+
+Additionally, the `TraceClass` and `TraceMethod` decorators accept an optional `name` parameter to set the transaction
+name. This was added because Angular minifies class and method names, and you might want to set a more descriptive name.
+If nothing provided, the name defaults to `'unnamed'`.
+
+```js
+// v7
+@Sentry.TraceClassDecorator()
+export class HeaderComponent {
+  @Sentry.TraceMethodDecorator()
+  ngOnChanges(changes: SimpleChanges) {}
+}
+```
+
+```js
+// v8
+@Sentry.TraceClass({ name: 'HeaderComponent' })
+export class HeaderComponent {
+  @Sentry.TraceMethod({ name: 'ngOnChanges' })
+  ngOnChanges(changes: SimpleChanges) {}
+}
+```
+
+---
+
 # Deprecations in 7.x
 
 You can use the **Experimental** [@sentry/migr8](https://www.npmjs.com/package/@sentry/migr8) to automatically update
@@ -925,10 +1234,6 @@ instead now.
 Instead, you can get the currently active span via `Sentry.getActiveSpan()`. Setting a span on the scope happens
 automatically when you use the new performance APIs `startSpan()` and `startSpanManual()`.
 
-## Deprecate `scope.setTransactionName()`
-
-Instead, either set this as attributes or tags, or use an event processor to set `event.transaction`.
-
 ## Deprecate `scope.getTransaction()` and `getActiveTransaction()`
 
 Instead, you should not rely on the active transaction, but just use `startSpan()` APIs, which handle this for you.
diff --git a/README.md b/README.md
index 807c4b6988e2..f19c4b01c593 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,10 @@ package. Please refer to the README and instructions of those SDKs for more deta
 - [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
 - [`@sentry/nextjs`](https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs): SDK for Next.js
 - [`@sentry/remix`](https://github.com/getsentry/sentry-javascript/tree/master/packages/remix): SDK for Remix
-- [`@sentry/serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless): SDK for
-  Serverless Platforms (AWS, GCP)
+- [`@sentry/aws-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless): SDK
+  for AWS Lambda Functions
+- [`@sentry/google-cloud-serverless`](https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud):
+  SDK for Google Cloud Functions
 - [`@sentry/electron`](https://github.com/getsentry/sentry-electron): SDK for Electron with support for native crashes
 - [`@sentry/react-native`](https://github.com/getsentry/sentry-react-native): SDK for React Native with support for
   native crashes
diff --git a/dev-packages/browser-integration-tests/README.md b/dev-packages/browser-integration-tests/README.md
index 6024b98a8085..b24bdfb86ee3 100644
--- a/dev-packages/browser-integration-tests/README.md
+++ b/dev-packages/browser-integration-tests/README.md
@@ -1,19 +1,29 @@
 # Integration Tests for Sentry Browser SDK
 
-Integration tests for Sentry's Browser SDK use [Playwright](https://playwright.dev/) internally. These tests are run on latest stable versions of Chromium, Firefox and Webkit.
+Integration tests for Sentry's Browser SDK use [Playwright](https://playwright.dev/) internally. These tests are run on
+latest stable versions of Chromium, Firefox and Webkit.
 
 ## Structure
 
-The tests are grouped by their scope such as `breadcrumbs` or `onunhandledrejection`. In every group of tests, there are multiple folders containing test cases with their optional supporting assets.
+The tests are grouped by their scope such as `breadcrumbs` or `onunhandledrejection`. In every group of tests, there are
+multiple folders containing test cases with their optional supporting assets.
 
-Each case group has a default HTML skeleton named `template.hbs`, and also a default initialization script named `init.js `, which contains the `Sentry.init()` call. These defaults are used as fallbacks when a specific `template.hbs` or `init.js` is not defined in a case folder.
+Each case group has a default HTML skeleton named `template.hbs`, and also a default initialization script named
+`init.js `, which contains the `Sentry.init()` call. These defaults are used as fallbacks when a specific `template.hbs`
+or `init.js` is not defined in a case folder.
 
-`subject.js` contains the logic that sets up the environment to be tested. It also can be defined locally and as a group fallback. Unlike `template.hbs` and `init.js`, it's not required to be defined for a group, as there may be cases that does not require a subject, instead the logic is injected using `injectScriptAndGetEvents` from `utils/helpers.ts`.
+`subject.js` contains the logic that sets up the environment to be tested. It also can be defined locally and as a group
+fallback. Unlike `template.hbs` and `init.js`, it's not required to be defined for a group, as there may be cases that
+does not require a subject, instead the logic is injected using `injectScriptAndGetEvents` from `utils/helpers.ts`.
 
-`test.ts` is required for each test case, which contains the assertions (and if required the script injection logic). For every case, any set of `init.js`, `template.hbs` and `subject.js` can be defined locally, and each one of them  will have precedence over the default definitions of the test group.
+`test.ts` is required for each test case, which contains the assertions (and if required the script injection logic).
+For every case, any set of `init.js`, `template.hbs` and `subject.js` can be defined locally, and each one of them will
+have precedence over the default definitions of the test group.
 
-To test page multi-page navigations, you can specify additional `page-*.html` (e.g. `page-0.html`, `page-1.html`) files. These will also be compiled and initialized with the same `init.js` and `subject.js` files that are applied to `template.hbs/html`. Note: `page-*.html` file lookup **doesn not** fall back to the
-parent directories, meaning that page files have to be directly in the `test.ts` directory.
+To test page multi-page navigations, you can specify additional `page-*.html` (e.g. `page-0.html`, `page-1.html`) files.
+These will also be compiled and initialized with the same `init.js` and `subject.js` files that are applied to
+`template.hbs/html`. Note: `page-*.html` file lookup **doesn not** fall back to the parent directories, meaning that
+page files have to be directly in the `test.ts` directory.
 
 ```
 suites/
@@ -33,11 +43,16 @@ suites/
 
 ### Helpers
 
-`utils/helpers.ts` contains helpers that could be used in assertions (`test.ts`). These helpers define a convenient and reliable API to interact with Playwright's native API. It's highly recommended to define all common patterns of Playwright usage in helpers.
+`utils/helpers.ts` contains helpers that could be used in assertions (`test.ts`). These helpers define a convenient and
+reliable API to interact with Playwright's native API. It's highly recommended to define all common patterns of
+Playwright usage in helpers.
 
 ### Fixtures
 
-[Fixtures](https://playwright.dev/docs/api/class-fixtures) allows us to define the globals and test-specific information in assertion groups (`test.ts` files). In it's current state, `fixtures.ts` contains an extension over the pure version of `test()` function of Playwright. All the tests should import `sentryTest` function from `utils/fixtures.ts` instead of `@playwright/test` to be able to access the extra fixtures.
+[Fixtures](https://playwright.dev/docs/api/class-fixtures) allows us to define the globals and test-specific information
+in assertion groups (`test.ts` files). In it's current state, `fixtures.ts` contains an extension over the pure version
+of `test()` function of Playwright. All the tests should import `sentryTest` function from `utils/fixtures.ts` instead
+of `@playwright/test` to be able to access the extra fixtures.
 
 ## Running Tests Locally
 
@@ -47,8 +62,7 @@ Tests can be run locally using the latest version of Chromium with:
 
 To run tests with a different browser such as `firefox` or `webkit`:
 
-`yarn test --project='firefox'`
-`yarn test --project='webkit'`
+`yarn test --project='firefox'` `yarn test --project='webkit'`
 
 Or to run on all three browsers:
 
@@ -60,18 +74,27 @@ To filter tests by their title:
 
 You can refer to [Playwright documentation](https://playwright.dev/docs/test-cli) for other CLI options.
 
-You can set env variable `PW_BUNDLE` to set specific build or bundle to test against.
-Available options: `esm`, `cjs`, `bundle_es5`, `bundle_es5_min`, `bundle_es6`, `bundle_es6_min`
+You can set env variable `PW_BUNDLE` to set specific build or bundle to test against. Available options: `esm`, `cjs`,
+`bundle`, `bundle_min`
 
 ### Troubleshooting
 
-Apart from [Playwright-specific issues](https://playwright.dev/docs/troubleshooting), below are common issues that might occur while writing tests for Sentry Browser SDK.
+Apart from [Playwright-specific issues](https://playwright.dev/docs/troubleshooting), below are common issues that might
+occur while writing tests for Sentry Browser SDK.
 
 - #### Flaky Tests
-  If a test fails randomly, giving a `Page Closed`, `Target Closed` or a similar error, most of the times, the reason is a race condition between the page action defined in the `subject` and the listeners of the Sentry event / request. It's recommended to firstly check `utils/helpers.ts` whether if that async logic can be replaced by one of the helpers. If not, whether the awaited (or non-awaited on purpose in some cases) Playwright methods can be orchestrated by [`Promise.all`](http://mdn.io/promise.all). Manually-defined waiting logic such as timeouts are not recommended, and should not be required in most of the cases.
+
+  If a test fails randomly, giving a `Page Closed`, `Target Closed` or a similar error, most of the times, the reason is
+  a race condition between the page action defined in the `subject` and the listeners of the Sentry event / request.
+  It's recommended to firstly check `utils/helpers.ts` whether if that async logic can be replaced by one of the
+  helpers. If not, whether the awaited (or non-awaited on purpose in some cases) Playwright methods can be orchestrated
+  by [`Promise.all`](http://mdn.io/promise.all). Manually-defined waiting logic such as timeouts are not recommended,
+  and should not be required in most of the cases.
 
 - #### Build Errors
-  Before running, a page for each test case is built under the case folder inside `dist`. If a page build is failed, it's recommended to check:
+
+  Before running, a page for each test case is built under the case folder inside `dist`. If a page build is failed,
+  it's recommended to check:
 
   - If both default `template.hbs` and `init.js` are defined for the test group.
   - If a `subject.js` is defined for the test case.
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
index 921209ce14dc..150a9f6a20ae 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/init.js
@@ -2,7 +2,7 @@ Sentry.onLoad(function () {
   Sentry.init({
     integrations: [
       // Without this syntax, this will be re-written by the test framework
-      new window['Sentry'].Replay({
+      window['Sentry'].replayIntegration({
         useCompression: false,
       }),
     ],
diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 55697825c3a1..1daa3be5e5e7 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "private": true,
   "scripts": {
@@ -17,18 +17,12 @@
     "pretest": "yarn clean && yarn type-check",
     "test": "yarn test:all --project='chromium'",
     "test:all": "npx playwright test -c playwright.browser.config.ts",
-    "test:bundle:es5": "PW_BUNDLE=bundle_es5 yarn test",
-    "test:bundle:es5:min": "PW_BUNDLE=bundle_es5_min yarn test",
-    "test:bundle:es6": "PW_BUNDLE=bundle_es6 yarn test",
-    "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:bundle": "PW_BUNDLE=bundle yarn test",
+    "test:bundle:min": "PW_BUNDLE=bundle_min yarn test",
+    "test:bundle:replay": "PW_BUNDLE=bundle_replay yarn test",
+    "test:bundle:replay:min": "PW_BUNDLE=bundle_replay_min yarn test",
+    "test:bundle:tracing": "PW_BUNDLE=bundle_tracing yarn test",
+    "test:bundle:tracing:min": "PW_BUNDLE=bundle_tracing_min yarn test",
     "test:cjs": "PW_BUNDLE=cjs yarn test",
     "test:esm": "PW_BUNDLE=esm yarn test",
     "test:loader": "npx playwright test  -c playwright.loader.config.ts --project='chromium'",
@@ -40,8 +34,7 @@
     "test:loader:debug": "PW_BUNDLE=loader_debug yarn test:loader",
     "test:ci": "yarn test:all --reporter='line'",
     "test:update-snapshots": "yarn test:all --update-snapshots",
-    "test:detect-flaky": "ts-node scripts/detectFlakyTests.ts",
-    "validate:es5": "es-check es5 'fixtures/loader.js'"
+    "test:detect-flaky": "ts-node scripts/detectFlakyTests.ts"
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.16.7",
diff --git a/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js b/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js
index e64314facd79..6455e8d8851a 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js
+++ b/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/init.js
@@ -1,9 +1,8 @@
-import { Feedback } from '@sentry-internal/feedback';
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [new Feedback()],
+  integrations: [Sentry.feedbackIntegration()],
 });
diff --git a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js
index 9428907f51e7..46441bdf2538 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js
+++ b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/init.js
@@ -1,4 +1,3 @@
-import { Feedback } from '@sentry-internal/feedback';
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
@@ -8,11 +7,11 @@ Sentry.init({
   replaysOnErrorSampleRate: 1.0,
   replaysSessionSampleRate: 0,
   integrations: [
-    new Sentry.Replay({
+    Sentry.replayIntegration({
       flushMinDelay: 200,
       flushMaxDelay: 200,
       minReplayDuration: 0,
     }),
-    new Feedback(),
+    Sentry.feedbackIntegration(),
   ],
 });
diff --git a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js
index 33777734fe84..4066402e4e15 100644
--- a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js
+++ b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/init.js
@@ -29,7 +29,6 @@ const client = new BrowserClient({
   transport: makeFetchTransport,
   stackParser: defaultStackParser,
   integrations,
-  debug: true,
 });
 
 const hub = new Hub(client);
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/init.js b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/init.js
index 573e4fdcb621..0223ee8568b4 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/init.js
@@ -4,5 +4,6 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  // We assert on the debug message, so we need to enable debug mode
   debug: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/subject.js b/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/subject.js
index aaf2de868f6f..35d41b55e69d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/subject.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/subject.js
@@ -3,6 +3,9 @@ async function run() {
     Sentry.startSpan({ name: 'child_span' }, () => {
       // whatever a user would do here
     });
+
+    // unfinished spans are filtered out
+    Sentry.startInactiveSpan({ name: 'span_4' });
   });
 }
 
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/test.ts
index 71637c9294f1..f1152bde21da 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/basic/test.ts
@@ -1,8 +1,11 @@
 import { expect } from '@playwright/test';
-import type { Event } from '@sentry/types';
 
 import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
 
 sentryTest('should send a transaction in an envelope', async ({ getLocalTestPath, page }) => {
   if (shouldSkipTracingTest()) {
@@ -10,7 +13,8 @@ sentryTest('should send a transaction in an envelope', async ({ getLocalTestPath
   }
 
   const url = await getLocalTestPath({ testDir: __dirname });
-  const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const transaction = envelopeRequestParser(req);
 
   expect(transaction.transaction).toBe('parent_span');
   expect(transaction.spans).toBeDefined();
@@ -22,7 +26,8 @@ sentryTest('should report finished spans as children of the root transaction', a
   }
 
   const url = await getLocalTestPath({ testDir: __dirname });
-  const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
+  const req = await waitForTransactionRequestOnUrl(page, url);
+  const transaction = envelopeRequestParser(req);
 
   expect(transaction.spans).toHaveLength(1);
 
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/subject.js b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/subject.js
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/subject.js
rename to dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/subject.js
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/public-api/startTransaction/circular_data/test.ts
rename to dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/init.js b/dev-packages/browser-integration-tests/suites/public-api/startSpan/init.js
index 5724df357e8b..3fb0df7a75d4 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/init.js
@@ -8,5 +8,4 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   tracesSampleRate: 1.0,
   normalizeDepth: 10,
-  debug: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/subject.js b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/subject.js
similarity index 68%
rename from dev-packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/subject.js
rename to dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/subject.js
index 5b14dd7b680b..9316ed946b2d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/subject.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/subject.js
@@ -1,4 +1,7 @@
-const transaction = Sentry.startTransaction({ name: 'some_transaction' });
+const transaction = Sentry.startInactiveSpan({
+  name: 'some_transaction',
+  forceTransaction: true,
+});
 
 transaction.setMeasurement('metric.foo', 42, 'ms');
 transaction.setMeasurement('metric.bar', 1337, 'nanoseconds');
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts
similarity index 100%
rename from dev-packages/browser-integration-tests/suites/public-api/startTransaction/setMeasurement/test.ts
rename to dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js b/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js
deleted file mode 100644
index 5942deca663b..000000000000
--- a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/subject.js
+++ /dev/null
@@ -1,23 +0,0 @@
-Sentry.startSpan({ name: 'root_span' }, () => {
-  Sentry.startSpan(
-    {
-      name: 'span_1',
-      data: {
-        foo: 'bar',
-        baz: [1, 2, 3],
-      },
-    },
-    () => undefined,
-  );
-
-  // span_2 doesn't finish
-  Sentry.startInactiveSpan({ name: 'span_2' });
-
-  Sentry.startSpan({ name: 'span_3' }, () => {
-    // span_4 is the child of span_3 but doesn't finish.
-    Sentry.startInactiveSpan({ name: 'span_4', data: { qux: 'quux' } });
-
-    // span_5 is another child of span_3 but finishes.
-    Sentry.startInactiveSpan({ name: 'span_5' }).end();
-  });
-});
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts
deleted file mode 100644
index 0624ff3f7dad..000000000000
--- a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/basic_usage/test.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { expect } from '@playwright/test';
-import type { Event } from '@sentry/types';
-
-import { sentryTest } from '../../../../utils/fixtures';
-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);
-
-  expect(transaction.transaction).toBe('root_span');
-  expect(transaction.spans).toBeDefined();
-});
-
-sentryTest('should report finished spans as children of the root span', async ({ getLocalTestPath, page }) => {
-  if (shouldSkipTracingTest()) {
-    sentryTest.skip();
-  }
-
-  const url = await getLocalTestPath({ testDir: __dirname });
-  const transaction = await getFirstSentryEnvelopeRequest<Event>(page, url);
-
-  const rootSpanId = transaction?.contexts?.trace?.span_id;
-
-  expect(transaction.spans).toHaveLength(3);
-
-  const span_1 = transaction.spans?.[0];
-
-  expect(span_1).toBeDefined();
-  expect(span_1!.description).toBe('span_1');
-  expect(span_1!.parent_span_id).toEqual(rootSpanId);
-  expect(span_1!.data).toMatchObject({ foo: 'bar', baz: [1, 2, 3] });
-
-  const span_3 = transaction.spans?.[1];
-  expect(span_3).toBeDefined();
-  expect(span_3!.description).toBe('span_3');
-  expect(span_3!.parent_span_id).toEqual(rootSpanId);
-
-  const span_5 = transaction.spans?.[2];
-  expect(span_5).toBeDefined();
-  expect(span_5!.description).toBe('span_5');
-  expect(span_5!.parent_span_id).toEqual(span_3!.span_id);
-});
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/init.js b/dev-packages/browser-integration-tests/suites/public-api/startTransaction/init.js
deleted file mode 100644
index 3fb0df7a75d4..000000000000
--- a/dev-packages/browser-integration-tests/suites/public-api/startTransaction/init.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import * as Sentry from '@sentry/browser';
-
-window.Sentry = Sentry;
-
-Sentry.addTracingExtensions();
-
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  tracesSampleRate: 1.0,
-  normalizeDepth: 10,
-});
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js b/dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js
index 2453efcfbe1d..dfc142feaa09 100644
--- a/dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferMode/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts b/dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts
index 1ed90b81b37a..9c10b6777d67 100644
--- a/dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferMode/test.ts
@@ -1,5 +1,5 @@
 import { expect } from '@playwright/test';
-import type { Replay } from '@sentry/replay';
+import type { replayIntegration as actualReplayIntegration } from '@sentry/replay';
 import type { ReplayContainer } from '@sentry/replay/build/npm/types/types';
 
 import { sentryTest } from '../../../utils/fixtures';
@@ -58,8 +58,9 @@ sentryTest(
 
     expect(
       await page.evaluate(() => {
-        const replayIntegration = (window as unknown as Window & { Replay: { _replay: ReplayContainer } }).Replay;
-        const replay = replayIntegration._replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
+        const replay = replayIntegration['_replay'];
         return replay.isEnabled();
       }),
     ).toBe(false);
@@ -67,10 +68,9 @@ sentryTest(
     // Start buffering and assert that it is enabled
     expect(
       await page.evaluate(() => {
-        // eslint-disable-next-line deprecation/deprecation
-        const replayIntegration = (window as unknown as Window & { Replay: InstanceType<typeof Replay> }).Replay;
-        // @ts-expect-error private
-        const replay = replayIntegration._replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
+        const replay = replayIntegration['_replay'];
         replayIntegration.startBuffering();
         return replay.isEnabled();
       }),
@@ -88,8 +88,8 @@ sentryTest(
     const [req0] = await Promise.all([
       reqPromise0,
       page.evaluate(async () => {
-        // eslint-disable-next-line deprecation/deprecation
-        const replayIntegration = (window as unknown as Window & { Replay: Replay }).Replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
         await replayIntegration.flush();
       }),
     ]);
@@ -212,10 +212,9 @@ sentryTest(
     // Start buffering and assert that it is enabled
     expect(
       await page.evaluate(() => {
-        // eslint-disable-next-line deprecation/deprecation
-        const replayIntegration = (window as unknown as Window & { Replay: InstanceType<typeof Replay> }).Replay;
-        // @ts-expect-error private
-        const replay = replayIntegration._replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
+        const replay = replayIntegration['_replay'];
         replayIntegration.startBuffering();
         return replay.isEnabled();
       }),
@@ -233,8 +232,8 @@ sentryTest(
     const [req0] = await Promise.all([
       reqPromise0,
       page.evaluate(async () => {
-        // eslint-disable-next-line deprecation/deprecation
-        const replayIntegration = (window as unknown as Window & { Replay: Replay }).Replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
         await replayIntegration.flush({ continueRecording: false });
       }),
     ]);
@@ -328,8 +327,8 @@ sentryTest(
     // Start buffering and assert that it is enabled
     expect(
       await page.evaluate(() => {
-        // eslint-disable-next-line deprecation/deprecation
-        const replayIntegration = (window as unknown as Window & { Replay: InstanceType<typeof Replay> }).Replay;
+        const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+          .Replay;
         const replay = replayIntegration['_replay'];
         replayIntegration.startBuffering();
         return replay.isEnabled();
@@ -347,8 +346,8 @@ sentryTest(
     expect(errorEvent0.tags?.replayId).toBeUndefined();
 
     await page.evaluate(async () => {
-      // eslint-disable-next-line deprecation/deprecation
-      const replayIntegration = (window as unknown as Window & { Replay: Replay }).Replay;
+      const replayIntegration = (window as unknown as Window & { Replay: ReturnType<typeof actualReplayIntegration> })
+        .Replay;
       replayIntegration['_replay'].getOptions().errorSampleRate = 1.0;
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/init.js b/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/init.js
index 89c185dacc7f..7024a6574324 100644
--- a/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/init.js b/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/init.js
index 244f951588c6..7704e9934cbf 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 50,
   flushMaxDelay: 50,
   minReplayDuration: 0,
@@ -12,7 +12,6 @@ Sentry.init({
   sampleRate: 0,
   replaysSessionSampleRate: 1.0,
   replaysOnErrorSampleRate: 0.0,
-  debug: true,
 
-  integrations: [window.Replay, new Sentry.ReplayCanvas({ enableManualSnapshot: true })],
+  integrations: [window.Replay, Sentry.replayCanvasIntegration({ enableManualSnapshot: true })],
 });
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/records/init.js b/dev-packages/browser-integration-tests/suites/replay/canvas/records/init.js
index 296245b01c26..7bea93df6756 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/records/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/records/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 50,
   flushMaxDelay: 50,
   minReplayDuration: 0,
@@ -12,7 +12,6 @@ Sentry.init({
   sampleRate: 0,
   replaysSessionSampleRate: 1.0,
   replaysOnErrorSampleRate: 0.0,
-  debug: true,
 
-  integrations: [window.Replay, new Sentry.ReplayCanvas()],
+  integrations: [window.Replay, Sentry.replayCanvasIntegration()],
 });
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/init.js b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/init.js
index fa3248066150..d933111eb57e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
@@ -12,7 +12,6 @@ Sentry.init({
   sampleRate: 0,
   replaysSessionSampleRate: 1.0,
   replaysOnErrorSampleRate: 0.0,
-  debug: true,
 
-  integrations: [new Sentry.ReplayCanvas(), window.Replay],
+  integrations: [Sentry.replayCanvasIntegration(), window.Replay],
 });
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/init.js b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/init.js
index 1a9d5d179c4a..f04edea57625 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
@@ -12,7 +12,6 @@ Sentry.init({
   sampleRate: 0,
   replaysSessionSampleRate: 1.0,
   replaysOnErrorSampleRate: 0.0,
-  debug: true,
 
-  integrations: [window.Replay, new Sentry.ReplayCanvas()],
+  integrations: [window.Replay, Sentry.replayCanvasIntegration()],
 });
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/init.js b/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/init.js
index 92a463a4bc84..e52033fd464e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
@@ -12,7 +12,6 @@ Sentry.init({
   sampleRate: 0,
   replaysSessionSampleRate: 1.0,
   replaysOnErrorSampleRate: 0.0,
-  debug: true,
 
   integrations: [window.Replay],
 });
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureComponentName/init.js b/dev-packages/browser-integration-tests/suites/replay/captureComponentName/init.js
index 040fb88ab2bd..f8ffa20ceb8f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureComponentName/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/captureComponentName/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js b/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js
index be0f9cab95d5..f71ddfdaaa9b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js
@@ -1,8 +1,8 @@
 import * as Sentry from '@sentry/browser';
-import { Replay } from '@sentry/replay';
+import { replayIntegration } from '@sentry/replay';
 
 window.Sentry = Sentry;
-window.Replay = new Replay({
+window.Replay = replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/init.js b/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/init.js
index db9828fe889e..30fdb3198b62 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/init.js b/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/init.js
index c2dd47ab0c25..ab1e26f4490a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/init.js b/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/init.js
index 0d0e7ac0e71e..973a0ae3efdc 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/customEvents/init.js b/dev-packages/browser-integration-tests/suites/replay/customEvents/init.js
index f76a1207243b..2cfec5213d3f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/customEvents/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/customEvents/init.js
@@ -1,12 +1,13 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
   useCompression: false,
   blockAllMedia: false,
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/replay/dsc/init.js b/dev-packages/browser-integration-tests/suites/replay/dsc/init.js
index a686fdc78205..6411031d12b5 100644
--- a/dev-packages/browser-integration-tests/suites/replay/dsc/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/dsc/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
index c6483e2cdea0..e46c958497f6 100644
--- a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
@@ -8,8 +8,7 @@ import { getReplaySnapshot, shouldSkipReplayTest, waitForReplayRunning } from '.
 
 type TestWindow = Window & {
   Sentry: typeof Sentry;
-  // eslint-disable-next-line deprecation/deprecation
-  Replay: Sentry.Replay;
+  Replay: ReturnType<typeof Sentry.replayIntegration>;
 };
 
 sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/init.js
index a4d39ad78e7e..83e514016c1b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/init.js
index 2c9cd8b23147..c24b8e1daca8 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorModeCustomTransport/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/errorModeCustomTransport/init.js
new file mode 100644
index 000000000000..5e71c58fc0aa
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorModeCustomTransport/init.js
@@ -0,0 +1,23 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = Sentry.replayIntegration({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  minReplayDuration: 0,
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+  integrations: [window.Replay],
+  transport: options => {
+    const transport = new Sentry.makeFetchTransport(options);
+
+    delete transport.send.__sentry__baseTransport__;
+
+    return transport;
+  },
+});
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/init.js
index 49d938b15060..7ab704b50d6a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/init.js
index 3bc87bdd0be4..a765fc48c67b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/init.js b/dev-packages/browser-integration-tests/suites/replay/errors/init.js
index 89c185dacc7f..7024a6574324 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/init.js
index 21c548a5e349..c43d5713f173 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/init.js
index 4c3f0a7969c6..8e8006759bee 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/init.js
index 3aa81d299ae2..f2eb62b8c051 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/init.js
index ff1e66e53411..a2a7a1680123 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/test.ts
index c587db401e4f..8f098627c120 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseHeaders/test.ts
@@ -38,12 +38,10 @@ sentryTest('handles empty headers', async ({ getLocalTestPath, page, browserName
   await page.goto(url);
 
   await page.evaluate(() => {
-    /* eslint-disable */
     fetch('http://localhost:7654/foo').then(() => {
       // @ts-expect-error Sentry is a global
       Sentry.captureException('test error');
     });
-    /* eslint-enable */
   });
 
   const request = await requestPromise;
@@ -114,12 +112,10 @@ sentryTest('captures response headers', async ({ getLocalTestPath, page }) => {
   await page.goto(url);
 
   await page.evaluate(() => {
-    /* eslint-disable */
     fetch('http://localhost:7654/foo').then(() => {
       // @ts-expect-error Sentry is a global
       Sentry.captureException('test error');
     });
-    /* eslint-enable */
   });
 
   const request = await requestPromise;
@@ -196,12 +192,10 @@ sentryTest('does not capture response headers if URL does not match', async ({ g
   await page.goto(url);
 
   await page.evaluate(() => {
-    /* eslint-disable */
     fetch('http://localhost:7654/bar').then(() => {
       // @ts-expect-error Sentry is a global
       Sentry.captureException('test error');
     });
-    /* eslint-enable */
   });
 
   const request = await requestPromise;
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/init.js
index 52c219e99dc9..caca8e2d317e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/init.js
index 52c219e99dc9..caca8e2d317e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/init.js
index 21c548a5e349..c43d5713f173 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/init.js
index 4c3f0a7969c6..8e8006759bee 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/init.js
index 3aa81d299ae2..f2eb62b8c051 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/init.js
index ff1e66e53411..a2a7a1680123 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/init.js
index 52c219e99dc9..caca8e2d317e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/init.js b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/init.js
index 52c219e99dc9..caca8e2d317e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/fileInput/init.js b/dev-packages/browser-integration-tests/suites/replay/fileInput/init.js
index 0e08fdfaa6d0..c973a578baae 100644
--- a/dev-packages/browser-integration-tests/suites/replay/fileInput/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/fileInput/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/flushing/init.js b/dev-packages/browser-integration-tests/suites/replay/flushing/init.js
index db9828fe889e..30fdb3198b62 100644
--- a/dev-packages/browser-integration-tests/suites/replay/flushing/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/flushing/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/init.js b/dev-packages/browser-integration-tests/suites/replay/init.js
index dac512988b9a..e52033fd464e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/init.js b/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/init.js
index dac512988b9a..e52033fd464e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js b/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
index dac512988b9a..e52033fd464e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js b/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
index ed46fe5974dc..d09fe6530e9c 100644
--- a/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/init.js b/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/init.js
index 140b486c5755..7bab07447b3a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/init.js b/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/init.js
index cff168651bea..2a3dae73541d 100644
--- a/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 2000,
diff --git a/dev-packages/browser-integration-tests/suites/replay/multiple-pages/init.js b/dev-packages/browser-integration-tests/suites/replay/multiple-pages/init.js
index a856a0d13c3e..f5a01ece0a37 100644
--- a/dev-packages/browser-integration-tests/suites/replay/multiple-pages/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/multiple-pages/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyBlock/init.js b/dev-packages/browser-integration-tests/suites/replay/privacyBlock/init.js
index f5360c53561b..16000b4c4412 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyBlock/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyBlock/init.js
@@ -1,13 +1,14 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
   useCompression: false,
   blockAllMedia: false,
   block: ['link[rel="icon"]', 'video', '.nested-hide'],
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/init.js b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/init.js
index db9828fe889e..30fdb3198b62 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/template.html b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/template.html
index c83b62bf2e24..efb00dc29581 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/template.html
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/template.html
@@ -7,9 +7,9 @@
   <body>
     <button aria-label="Click me" onclick="console.log('Test log')">Click me</button>
     <div>This should be masked by default</div>
-    <div data-sentry-unmask>This should be unmasked due to data attribute</div>
+    <div data-sentry-unmask>With default settings, this should also be masked (even with data attribute)</div>
     <input placeholder="Placeholder should be masked" />
-    <input data-sentry-unmask placeholder="Placeholder can be unmasked" />
+    <input data-sentry-unmask placeholder="Placeholder can be unmasked - but not with default settings" />
     <div title="Title should be masked">Title should be masked</div>
     <svg style="width:200px;height:200px" viewBox="0 0 80 80"><path d=""/><area /><rect /></svg>
     <svg style="width:200px;height:200px" viewBox="0 0 80 80" data-sentry-unblock><path d=""/><area /><rect /></svg>
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-chromium.json b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-chromium.json
index 69f74ba00da8..e04944384bbd 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-chromium.json
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-chromium.json
@@ -106,7 +106,7 @@
                   "childNodes": [
                     {
                       "type": 3,
-                      "textContent": "This should be unmasked due to data attribute",
+                      "textContent": "**** ******* ********* **** ****** **** ** ****** ***** **** **** **********",
                       "id": 17
                     }
                   ],
@@ -136,7 +136,7 @@
                   "tagName": "input",
                   "attributes": {
                     "data-sentry-unmask": "",
-                    "placeholder": "Placeholder can be unmasked"
+                    "placeholder": "*********** *** ** ******** * *** *** **** ******* ********"
                   },
                   "childNodes": [],
                   "id": 21
@@ -186,45 +186,17 @@
                   "type": 2,
                   "tagName": "svg",
                   "attributes": {
-                    "style": "width:200px;height:200px",
-                    "viewBox": "0 0 80 80",
-                    "data-sentry-unblock": ""
+                    "rr_width": "[200-250]px",
+                    "rr_height": "[200-250]px"
                   },
-                  "childNodes": [
-                    {
-                      "type": 2,
-                      "tagName": "path",
-                      "attributes": {
-                        "d": ""
-                      },
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 29
-                    },
-                    {
-                      "type": 2,
-                      "tagName": "area",
-                      "attributes": {},
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 30
-                    },
-                    {
-                      "type": 2,
-                      "tagName": "rect",
-                      "attributes": {},
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 31
-                    }
-                  ],
+                  "childNodes": [],
                   "isSVG": true,
                   "id": 28
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 32
+                  "id": 29
                 },
                 {
                   "type": 2,
@@ -234,28 +206,27 @@
                     "rr_height": "[100-150]px"
                   },
                   "childNodes": [],
-                  "id": 33
+                  "id": 30
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 34
+                  "id": 31
                 },
                 {
                   "type": 2,
                   "tagName": "img",
                   "attributes": {
-                    "data-sentry-unblock": "",
-                    "style": "width:100px;height:100px",
-                    "src": "file:///none.png"
+                    "rr_width": "[100-150]px",
+                    "rr_height": "[100-150]px"
                   },
                   "childNodes": [],
-                  "id": 35
+                  "id": 32
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 36
+                  "id": 33
                 },
                 {
                   "type": 2,
@@ -265,17 +236,17 @@
                     "rr_height": "[0-50]px"
                   },
                   "childNodes": [],
-                  "id": 37
+                  "id": 34
                 },
                 {
                   "type": 3,
                   "textContent": "\n  ",
-                  "id": 38
+                  "id": 35
                 },
                 {
                   "type": 3,
                   "textContent": "\n\n",
-                  "id": 39
+                  "id": 36
                 }
               ],
               "id": 8
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-firefox.json b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-firefox.json
index 4f20b93e13ab..a57a8507fda9 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-firefox.json
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-firefox.json
@@ -106,7 +106,7 @@
                   "childNodes": [
                     {
                       "type": 3,
-                      "textContent": "This should be unmasked due to data attribute",
+                      "textContent": "**** ******* ********* **** ****** **** ** ****** ***** **** **** **********",
                       "id": 17
                     }
                   ],
@@ -121,7 +121,7 @@
                   "type": 2,
                   "tagName": "input",
                   "attributes": {
-                    "placeholder": "*********** ****** ** ******"
+                    "placeholder": "*********** *** ** ******** * *** *** **** ******* ********"
                   },
                   "childNodes": [],
                   "id": 19
@@ -226,12 +226,12 @@
                 {
                   "type": 3,
                   "textContent": "\n  ",
-                  "id": 33
+                  "id": 34
                 },
                 {
                   "type": 3,
                   "textContent": "\n\n",
-                  "id": 34
+                  "id": 35
                 }
               ],
               "id": 8
@@ -248,4 +248,4 @@
     }
   },
   "timestamp": [timestamp]
-}
\ No newline at end of file
+}
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-webkit.json b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-webkit.json
index 69f74ba00da8..e04944384bbd 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-webkit.json
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy-webkit.json
@@ -106,7 +106,7 @@
                   "childNodes": [
                     {
                       "type": 3,
-                      "textContent": "This should be unmasked due to data attribute",
+                      "textContent": "**** ******* ********* **** ****** **** ** ****** ***** **** **** **********",
                       "id": 17
                     }
                   ],
@@ -136,7 +136,7 @@
                   "tagName": "input",
                   "attributes": {
                     "data-sentry-unmask": "",
-                    "placeholder": "Placeholder can be unmasked"
+                    "placeholder": "*********** *** ** ******** * *** *** **** ******* ********"
                   },
                   "childNodes": [],
                   "id": 21
@@ -186,45 +186,17 @@
                   "type": 2,
                   "tagName": "svg",
                   "attributes": {
-                    "style": "width:200px;height:200px",
-                    "viewBox": "0 0 80 80",
-                    "data-sentry-unblock": ""
+                    "rr_width": "[200-250]px",
+                    "rr_height": "[200-250]px"
                   },
-                  "childNodes": [
-                    {
-                      "type": 2,
-                      "tagName": "path",
-                      "attributes": {
-                        "d": ""
-                      },
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 29
-                    },
-                    {
-                      "type": 2,
-                      "tagName": "area",
-                      "attributes": {},
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 30
-                    },
-                    {
-                      "type": 2,
-                      "tagName": "rect",
-                      "attributes": {},
-                      "childNodes": [],
-                      "isSVG": true,
-                      "id": 31
-                    }
-                  ],
+                  "childNodes": [],
                   "isSVG": true,
                   "id": 28
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 32
+                  "id": 29
                 },
                 {
                   "type": 2,
@@ -234,28 +206,27 @@
                     "rr_height": "[100-150]px"
                   },
                   "childNodes": [],
-                  "id": 33
+                  "id": 30
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 34
+                  "id": 31
                 },
                 {
                   "type": 2,
                   "tagName": "img",
                   "attributes": {
-                    "data-sentry-unblock": "",
-                    "style": "width:100px;height:100px",
-                    "src": "file:///none.png"
+                    "rr_width": "[100-150]px",
+                    "rr_height": "[100-150]px"
                   },
                   "childNodes": [],
-                  "id": 35
+                  "id": 32
                 },
                 {
                   "type": 3,
                   "textContent": "\n    ",
-                  "id": 36
+                  "id": 33
                 },
                 {
                   "type": 2,
@@ -265,17 +236,17 @@
                     "rr_height": "[0-50]px"
                   },
                   "childNodes": [],
-                  "id": 37
+                  "id": 34
                 },
                 {
                   "type": 3,
                   "textContent": "\n  ",
-                  "id": 38
+                  "id": 35
                 },
                 {
                   "type": 3,
                   "textContent": "\n\n",
-                  "id": 39
+                  "id": 36
                 }
               ],
               "id": 8
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy.json b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy.json
index 69f74ba00da8..16c4caf2ed69 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy.json
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts-snapshots/privacy.json
@@ -106,7 +106,7 @@
                   "childNodes": [
                     {
                       "type": 3,
-                      "textContent": "This should be unmasked due to data attribute",
+                      "textContent": "**** ******* ********* **** ****** **** ** ****** ***** **** **** **********",
                       "id": 17
                     }
                   ],
@@ -136,7 +136,7 @@
                   "tagName": "input",
                   "attributes": {
                     "data-sentry-unmask": "",
-                    "placeholder": "Placeholder can be unmasked"
+                    "placeholder": "*********** *** ** ******** * *** *** **** ******* ********"
                   },
                   "childNodes": [],
                   "id": 21
@@ -292,4 +292,4 @@
     }
   },
   "timestamp": [timestamp]
-}
\ No newline at end of file
+}
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyInput/init.js b/dev-packages/browser-integration-tests/suites/replay/privacyInput/init.js
index 0e08fdfaa6d0..96f5c063e13d 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyInput/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyInput/init.js
@@ -1,12 +1,13 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
   useCompression: false,
   maskAllInputs: false,
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/init.js b/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/init.js
index 1657e879ef87..c20c8b36a4c2 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/init.js
@@ -1,12 +1,13 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
   useCompression: false,
   maskAllInputs: true,
+  unmask: ['.sentry-unmask, [data-sentry-unmask]'],
 });
 
 Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts b/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts
index 6817367ee68d..952c841b253e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts
@@ -30,6 +30,8 @@ sentryTest(
     await forceFlushReplay();
 
     expect(requestCount).toBe(0);
-    expect(consoleMessages).toEqual(['You are using new Replay() even though this bundle does not include replay.']);
+    expect(consoleMessages).toEqual([
+      'You are using replayIntegration() even though this bundle does not include replay.',
+    ]);
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/replay/replayShim/init.js b/dev-packages/browser-integration-tests/suites/replay/replayShim/init.js
index a89c744e7480..77fc89c70a25 100644
--- a/dev-packages/browser-integration-tests/suites/replay/replayShim/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/replayShim/init.js
@@ -3,7 +3,7 @@ import * as Sentry from '@sentry/browser';
 window.Sentry = Sentry;
 
 // Replay should not actually work, but still not error out
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts b/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts
index 5cb297551dfe..b906deefb71b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts
@@ -30,6 +30,8 @@ sentryTest(
     await forceFlushReplay();
 
     expect(requestCount).toBe(0);
-    expect(consoleMessages).toEqual(['You are using new Replay() even though this bundle does not include replay.']);
+    expect(consoleMessages).toEqual([
+      'You are using replayIntegration() even though this bundle does not include replay.',
+    ]);
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/replay/requests/init.js b/dev-packages/browser-integration-tests/suites/replay/requests/init.js
index db9828fe889e..30fdb3198b62 100644
--- a/dev-packages/browser-integration-tests/suites/replay/requests/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/requests/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/sampling/init.js b/dev-packages/browser-integration-tests/suites/replay/sampling/init.js
index 8a98bb9c45de..6405faaf741b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sampling/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/sampling/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/init.js b/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/init.js
index 6fa2c80cbe9c..ee55b5cca2c4 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionInactive/init.js b/dev-packages/browser-integration-tests/suites/replay/sessionInactive/init.js
index c37968bc654a..874580a83eff 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionInactive/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionInactive/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/init.js b/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/init.js
index 4b1e948f534e..214340ba12c5 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/init.js b/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/init.js
index aa5be4406824..b21921ae5726 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/error/init.js b/dev-packages/browser-integration-tests/suites/replay/slowClick/error/init.js
index b253a8bca6e9..77b6bf6b67e4 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/error/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/error/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/init.js b/dev-packages/browser-integration-tests/suites/replay/slowClick/init.js
index 575e490b2927..5083bd48c745 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/init.js b/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/init.js
index 3146e64131fd..6f2a54514433 100644
--- a/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 5000,
   flushMaxDelay: 5000,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/init.js b/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/init.js
index 2fe6781ee15e..4d4476012c0d 100644
--- a/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/init.js b/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/init.js
index 956586937a19..cc0094a0366b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/init.js
@@ -1,7 +1,7 @@
 import * as Sentry from '@sentry/browser';
 
 window.Sentry = Sentry;
-window.Replay = new Sentry.Replay({
+window.Replay = Sentry.replayIntegration({
   flushMinDelay: 200,
   flushMaxDelay: 200,
   minReplayDuration: 0,
diff --git a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/init.js b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/init.js
index c22f576ca681..fc0eb65be166 100644
--- a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/init.js
+++ b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/init.js
@@ -12,5 +12,4 @@ Sentry.init({
       username: 'user1337',
     },
   },
-  debug: true,
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/subject.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/subject.js
new file mode 100644
index 000000000000..2bb2bba64d9e
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/subject.js
@@ -0,0 +1,3 @@
+setTimeout(() => {
+  throw new Error('Error during pageload');
+}, 100);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts
new file mode 100644
index 000000000000..df684872e7c0
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/error/test.ts
@@ -0,0 +1,30 @@
+import { expect } from '@playwright/test';
+import type { Event } from '@sentry/types';
+import { sentryTest } from '../../../../utils/fixtures';
+import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
+
+sentryTest(
+  'should put the pageload transaction name onto an error event caught during pageload',
+  async ({ getLocalTestPath, page }) => {
+    if (shouldSkipTracingTest()) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestPath({ testDir: __dirname });
+
+    await page.goto(url);
+
+    const [e1, e2] = await getMultipleSentryEnvelopeRequests<Event>(page, 2);
+
+    const pageloadTxnEvent = e1.type === 'transaction' ? e1 : e2;
+    const errorEvent = e1.type === 'transaction' ? e2 : e1;
+
+    expect(pageloadTxnEvent.contexts?.trace?.op).toEqual('pageload');
+    expect(pageloadTxnEvent.spans?.length).toBeGreaterThan(0);
+    expect(errorEvent.exception?.values?.[0]).toBeDefined();
+
+    expect(pageloadTxnEvent.transaction?.endsWith('index.html')).toBe(true);
+
+    expect(errorEvent.transaction).toEqual(pageloadTxnEvent.transaction);
+  },
+);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/init.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/init.js
new file mode 100644
index 000000000000..98e297d13625
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/init.js
@@ -0,0 +1,24 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      // To avoid having this test run for 15s
+      childSpanTimeout: 4000,
+    }),
+  ],
+  defaultIntegrations: false,
+  tracesSampleRate: 1,
+});
+
+const activeSpan = Sentry.getActiveSpan();
+if (activeSpan) {
+  Sentry.startInactiveSpan({ name: 'pageload-child-span' });
+} else {
+  setTimeout(() => {
+    Sentry.startInactiveSpan({ name: 'pageload-child-span' });
+  }, 200);
+}
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts
new file mode 100644
index 000000000000..5987061c741f
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts
@@ -0,0 +1,28 @@
+import { expect } from '@playwright/test';
+
+import { sentryTest } from '../../../../utils/fixtures';
+import {
+  envelopeRequestParser,
+  shouldSkipTracingTest,
+  waitForTransactionRequestOnUrl,
+} from '../../../../utils/helpers';
+
+// This tests asserts that the pageload span will finish itself after the child span timeout if it
+// has a child span without adding any additional ones or finishing any of them finishing. All of the child spans that
+// are still running should have the status "cancelled".
+sentryTest('should send a pageload span terminated via child span timeout', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipTracingTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  const req = await waitForTransactionRequestOnUrl(page, url);
+
+  const eventData = envelopeRequestParser(req);
+
+  expect(eventData.contexts?.trace?.op).toBe('pageload');
+  expect(eventData.spans?.length).toBeGreaterThanOrEqual(1);
+  const testSpan = eventData.spans?.find(span => span.description === 'pageload-child-span');
+  expect(testSpan).toBeDefined();
+  expect(testSpan?.status).toBe('cancelled');
+});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/init.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/init.js
deleted file mode 100644
index 8b12fe807d7b..000000000000
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/init.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as Sentry from '@sentry/browser';
-import { startSpanManual } from '@sentry/browser';
-
-window.Sentry = Sentry;
-
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  integrations: [Sentry.browserTracingIntegration()],
-  tracesSampleRate: 1,
-});
-
-setTimeout(() => {
-  startSpanManual({ name: 'pageload-child-span' }, () => {});
-}, 200);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/test.ts
deleted file mode 100644
index f96495a69925..000000000000
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithHeartbeatTimeout/test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { expect } from '@playwright/test';
-import type { Event } from '@sentry/types';
-
-import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
-
-// This tests asserts that the pageload transaction will finish itself after about 15 seconds (3x5s of heartbeats) if it
-// has a child span without adding any additional ones or finishing any of them finishing. All of the child spans that
-// are still running should have the status "cancelled".
-sentryTest(
-  'should send a pageload transaction terminated via heartbeat timeout',
-  async ({ getLocalTestPath, page }) => {
-    if (shouldSkipTracingTest()) {
-      sentryTest.skip();
-    }
-
-    const url = await getLocalTestPath({ testDir: __dirname });
-
-    const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
-
-    expect(eventData.contexts?.trace?.op).toBe('pageload');
-    expect(
-      eventData.spans?.find(span => span.description === 'pageload-child-span' && span.status === 'cancelled'),
-    ).toBeDefined();
-  },
-);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
index 71510468a513..c52bf2a6b68c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
@@ -30,7 +30,7 @@ sentryTest(
 
     expect(requestCount).toBe(0);
     expect(consoleMessages).toEqual([
-      'You are using new BrowserTracing() even though this bundle does not include tracing.',
+      'You are using browserTracingIntegration() even though this bundle does not include tracing.',
     ]);
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js
index 8ac3d814b2bd..f2921f78c479 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/init.js
@@ -8,7 +8,6 @@ Sentry.init({
   integrations: [Sentry.browserTracingIntegration()],
   environment: 'production',
   tracesSampleRate: 1,
-  debug: true,
 });
 
 Sentry.setUser({ id: 'user123' });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js
index 51f27f9122df..79b4b0c89555 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/init.js
@@ -8,7 +8,6 @@ Sentry.init({
   tracePropagationTargets: [/.*/],
   environment: 'production',
   tracesSampleRate: 1,
-  debug: true,
 });
 
 const scope = Sentry.getCurrentScope();
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts
index 23cd29099a0f..a2801f4e4016 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/handlers-lcp/test.ts
@@ -29,9 +29,9 @@ sentryTest(
     expect(eventData.measurements).toBeDefined();
     expect(eventData.measurements?.lcp?.value).toBeDefined();
 
-    expect(eventData.tags?.['lcp.element']).toBe('body > img');
-    expect(eventData.tags?.['lcp.size']).toBe(107400);
-    expect(eventData.tags?.['lcp.url']).toBe('https://example.com/path/to/image.png');
+    expect(eventData.contexts?.trace?.data?.['lcp.element']).toBe('body > img');
+    expect(eventData.contexts?.trace?.data?.['lcp.size']).toBe(107400);
+    expect(eventData.contexts?.trace?.data?.['lcp.url']).toBe('https://example.com/path/to/image.png');
 
     const lcp = await (await page.waitForFunction('window._LCP')).jsonValue();
     const lcp2 = await (await page.waitForFunction('window._LCP2')).jsonValue();
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
index 0dee366c75f4..00fc906aa60e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls/test.ts
@@ -23,7 +23,7 @@ sentryTest('should capture a "GOOD" CLS vital with its source(s).', async ({ get
   expect(eventData.measurements?.cls?.value).toBeGreaterThan(0.03);
   expect(eventData.measurements?.cls?.value).toBeLessThan(0.07);
 
-  expect(eventData.tags?.['cls.source.1']).toBe('body > div#content > p#partial');
+  expect(eventData.contexts?.trace?.data?.['cls.source.1']).toBe('body > div#content > p#partial');
 });
 
 sentryTest('should capture a "MEH" CLS vital with its source(s).', async ({ getLocalTestPath, page }) => {
@@ -37,7 +37,7 @@ sentryTest('should capture a "MEH" CLS vital with its source(s).', async ({ getL
   expect(eventData.measurements?.cls?.value).toBeGreaterThan(0.18);
   expect(eventData.measurements?.cls?.value).toBeLessThan(0.23);
 
-  expect(eventData.tags?.['cls.source.1']).toBe('body > div#content > p');
+  expect(eventData.contexts?.trace?.data?.['cls.source.1']).toBe('body > div#content > p');
 });
 
 sentryTest('should capture a "POOR" CLS vital with its source(s).', async ({ getLocalTestPath, page }) => {
@@ -50,5 +50,5 @@ sentryTest('should capture a "POOR" CLS vital with its source(s).', async ({ get
   // Flakey value dependent on timings -> we check for a range
   expect(eventData.measurements?.cls?.value).toBeGreaterThan(0.34);
   expect(eventData.measurements?.cls?.value).toBeLessThan(0.36);
-  expect(eventData.tags?.['cls.source.1']).toBe('body > div#content > p');
+  expect(eventData.contexts?.trace?.data?.['cls.source.1']).toBe('body > div#content > p');
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
index cbe60ae1ea62..2cfcbe58806e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp/test.ts
@@ -10,9 +10,10 @@ sentryTest('should capture a LCP vital with element details.', async ({ browserN
     sentryTest.skip();
   }
 
-  await page.route('**/path/to/image.png', (route: Route) =>
-    route.fulfill({ path: `${__dirname}/assets/sentry-logo-600x179.png` }),
-  );
+  page.route('**', route => route.continue());
+  page.route('**/path/to/image.png', async (route: Route) => {
+    return route.fulfill({ path: `${__dirname}/assets/sentry-logo-600x179.png` });
+  });
 
   const url = await getLocalTestPath({ testDir: __dirname });
   const [eventData] = await Promise.all([
@@ -24,7 +25,7 @@ sentryTest('should capture a LCP vital with element details.', async ({ browserN
   expect(eventData.measurements).toBeDefined();
   expect(eventData.measurements?.lcp?.value).toBeDefined();
 
-  expect(eventData.tags?.['lcp.element']).toBe('body > img');
-  expect(eventData.tags?.['lcp.size']).toBe(107400);
-  expect(eventData.tags?.['lcp.url']).toBe('https://example.com/path/to/image.png');
+  expect(eventData.contexts?.trace?.data?.['lcp.element']).toBe('body > img');
+  expect(eventData.contexts?.trace?.data?.['lcp.size']).toBe(107400);
+  expect(eventData.contexts?.trace?.data?.['lcp.url']).toBe('https://example.com/path/to/image.png');
 });
diff --git a/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts b/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts
index 61020eceb79b..2ca225ee069a 100644
--- a/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts
+++ b/dev-packages/browser-integration-tests/suites/transport/offline/queued/test.ts
@@ -10,7 +10,7 @@ function delay(ms: number) {
 
 sentryTest('should queue and retry events when they fail to send', async ({ getLocalTestPath, page }) => {
   // makeBrowserOfflineTransport is not included in any CDN bundles
-  if (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle_')) {
+  if (process.env.PW_BUNDLE && process.env.PW_BUNDLE.startsWith('bundle')) {
     sentryTest.skip();
   }
 
diff --git a/dev-packages/browser-integration-tests/tsconfig.json b/dev-packages/browser-integration-tests/tsconfig.json
index 6c252887a736..2587befcce14 100644
--- a/dev-packages/browser-integration-tests/tsconfig.json
+++ b/dev-packages/browser-integration-tests/tsconfig.json
@@ -5,7 +5,8 @@
     "lib": ["dom", "es2019"],
     "moduleResolution": "node",
     "noEmit": true,
-    "strict": true
+    "strict": true,
+    "allowSyntheticDefaultImports": true
   },
   "include": ["**/*.ts"],
   "exclude": ["node_modules"]
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 738771aedced..f3875c561e74 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -47,38 +47,32 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
   browser: {
     cjs: 'build/npm/cjs/index.js',
     esm: 'build/npm/esm/index.js',
-    bundle_es5: 'build/bundles/bundle.es5.js',
-    bundle_es5_min: 'build/bundles/bundle.es5.min.js',
-    bundle_es6: 'build/bundles/bundle.js',
-    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',
-    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',
-    loader_base: 'build/bundles/bundle.es5.min.js',
-    loader_eager: 'build/bundles/bundle.es5.min.js',
-    loader_debug: 'build/bundles/bundle.es5.debug.min.js',
-    loader_tracing: 'build/bundles/bundle.tracing.es5.min.js',
+    bundle: 'build/bundles/bundle.js',
+    bundle_min: 'build/bundles/bundle.min.js',
+    bundle_replay: 'build/bundles/bundle.replay.js',
+    bundle_replay_min: 'build/bundles/bundle.replay.min.js',
+    bundle_tracing: 'build/bundles/bundle.tracing.js',
+    bundle_tracing_min: 'build/bundles/bundle.tracing.min.js',
+    bundle_tracing_replay: 'build/bundles/bundle.tracing.replay.js',
+    bundle_tracing_replay_min: 'build/bundles/bundle.tracing.replay.min.js',
+    loader_base: 'build/bundles/bundle.min.js',
+    loader_eager: 'build/bundles/bundle.min.js',
+    loader_debug: 'build/bundles/bundle.debug.min.js',
+    loader_tracing: 'build/bundles/bundle.tracing.min.js',
     loader_replay: 'build/bundles/bundle.replay.min.js',
     loader_tracing_replay: 'build/bundles/bundle.tracing.replay.debug.min.js',
   },
   integrations: {
     cjs: 'build/npm/cjs/index.js',
     esm: 'build/npm/esm/index.js',
-    bundle_es5: 'build/bundles/[INTEGRATION_NAME].es5.js',
-    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: 'build/bundles/[INTEGRATION_NAME].js',
+    bundle_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: 'build/bundles/wasm.js',
+    bundle_min: 'build/bundles/wasm.min.js',
   },
 };
 
@@ -229,7 +223,7 @@ class SentryScenarioGenerationPlugin {
             });
           }
 
-          // Convert e.g. bundle_tracing_es5_min to bundle_es5_min
+          // Convert e.g. bundle_tracing_min to bundle_min
           const integrationBundleKey = bundleKey
             .replace('loader_', 'bundle_')
             .replace('_replay', '')
diff --git a/dev-packages/browser-integration-tests/utils/wasmHelpers.ts b/dev-packages/browser-integration-tests/utils/wasmHelpers.ts
index ca93148e690c..cb8cf1bcb4b3 100644
--- a/dev-packages/browser-integration-tests/utils/wasmHelpers.ts
+++ b/dev-packages/browser-integration-tests/utils/wasmHelpers.ts
@@ -1,7 +1,7 @@
 /**
  * We can only test WASM tests in certain bundles/packages:
  * - NPM (ESM, CJS)
- * - ES6 CDN bundles
+ * - CDN bundles
  * - On browsers other than WebKit
  *
  * @returns `true` if we should skip the replay test
@@ -11,5 +11,5 @@ export function shouldSkipWASMTests(browser: string): boolean {
     return true;
   }
   const bundle = process.env.PW_BUNDLE as string | undefined;
-  return bundle != null && bundle.includes('es5');
+  return bundle != null;
 }
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/app.routes.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/app.routes.ts
index d4d9a04f6c99..24bf8b769051 100644
--- a/dev-packages/e2e-tests/test-applications/angular-17/src/app/app.routes.ts
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/app.routes.ts
@@ -1,4 +1,7 @@
 import { Routes } from '@angular/router';
+import { cancelGuard } from './cancel-guard.guard';
+import { CancelComponent } from './cancel/cancel.components';
+import { ComponentTrackingComponent } from './component-tracking/component-tracking.components';
 import { HomeComponent } from './home/home.component';
 import { UserComponent } from './user/user.component';
 
@@ -11,6 +14,15 @@ export const routes: Routes = [
     path: 'home',
     component: HomeComponent,
   },
+  {
+    path: 'cancel',
+    component: CancelComponent,
+    canActivate: [cancelGuard],
+  },
+  {
+    path: 'component-tracking',
+    component: ComponentTrackingComponent,
+  },
   {
     path: 'redirect1',
     redirectTo: '/redirect2',
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel-guard.guard.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel-guard.guard.ts
new file mode 100644
index 000000000000..16ec4a2ab164
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel-guard.guard.ts
@@ -0,0 +1,5 @@
+import { ActivatedRouteSnapshot, CanActivateFn, RouterStateSnapshot } from '@angular/router';
+
+export const cancelGuard: CanActivateFn = (_next: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => {
+  return false;
+};
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel/cancel.components.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel/cancel.components.ts
new file mode 100644
index 000000000000..b6ee1876e035
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/cancel/cancel.components.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-cancel',
+  standalone: true,
+  template: `<div></div>`,
+})
+export class CancelComponent {}
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/component-tracking/component-tracking.components.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/component-tracking/component-tracking.components.ts
new file mode 100644
index 000000000000..e9aea4ccd68a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/component-tracking/component-tracking.components.ts
@@ -0,0 +1,18 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { TraceClass, TraceMethod, TraceModule } from '@sentry/angular-ivy';
+import { SampleComponent } from '../sample-component/sample-component.components';
+
+@Component({
+  selector: 'app-cancel',
+  standalone: true,
+  imports: [TraceModule, SampleComponent],
+  template: `<app-sample-component [trace]="'sample-component'"></app-sample-component>`,
+})
+@TraceClass({ name: 'ComponentTrackingComponent' })
+export class ComponentTrackingComponent implements OnInit, AfterViewInit {
+  @TraceMethod({ name: 'ngOnInit' })
+  ngOnInit() {}
+
+  @TraceMethod()
+  ngAfterViewInit() {}
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/home/home.component.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/home/home.component.ts
index 9179f5d79638..298d7f7d54cd 100644
--- a/dev-packages/e2e-tests/test-applications/angular-17/src/app/home/home.component.ts
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/home/home.component.ts
@@ -11,6 +11,9 @@ import { RouterLink } from '@angular/router';
     <ul>
       <li> <a id="navLink" [routerLink]="['/users', '123']">Visit User 123</a> </li>
       <li> <a id="redirectLink" [routerLink]="['/redirect1']">Redirect</a> </li>
+      <li> <a id="cancelLink" [routerLink]="['/cancel']">Cancel</a> </li>
+      <li> <a id="nonExistentLink" [routerLink]="['/non-existent']">Error</a> </li>
+      <li> <a id="componentTracking" [routerLink]="['/component-tracking']">Error</a> </li>
     </ul>
     <button id="errorBtn" (click)="throwError()">Throw error</button>
   </main>
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/sample-component/sample-component.components.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/sample-component/sample-component.components.ts
new file mode 100644
index 000000000000..bd331a9dbff0
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/sample-component/sample-component.components.ts
@@ -0,0 +1,12 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-sample-component',
+  standalone: true,
+  template: `<div></div>`,
+})
+export class SampleComponent implements OnInit {
+  ngOnInit() {
+    console.log('SampleComponent');
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/src/app/user/user.component.ts b/dev-packages/e2e-tests/test-applications/angular-17/src/app/user/user.component.ts
index 087a33a4a2f1..db02568d395f 100644
--- a/dev-packages/e2e-tests/test-applications/angular-17/src/app/user/user.component.ts
+++ b/dev-packages/e2e-tests/test-applications/angular-17/src/app/user/user.component.ts
@@ -8,7 +8,8 @@ import { Observable, map } from 'rxjs';
   standalone: true,
   imports: [AsyncPipe],
   template: `
-  <h1>Hello User {{ userId$ | async }}</h1>
+    <h1>Hello User {{ userId$ | async }}</h1>
+    <button id="userErrorBtn" (click)="throwError()">Throw error</button>
   `,
 })
 export class UserComponent {
@@ -17,4 +18,8 @@ export class UserComponent {
   constructor(private route: ActivatedRoute) {
     this.userId$ = this.route.paramMap.pipe(map(params => params.get('id') || 'UNKNOWN USER'));
   }
+
+  throwError() {
+    throw new Error('Error thrown from user page');
+  }
 }
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/angular-17/tests/errors.test.ts
index e4d687ca3199..4666893b1882 100644
--- a/dev-packages/e2e-tests/test-applications/angular-17/tests/errors.test.ts
+++ b/dev-packages/e2e-tests/test-applications/angular-17/tests/errors.test.ts
@@ -1,5 +1,5 @@
 import { expect, test } from '@playwright/test';
-import { waitForError } from '../event-proxy-server';
+import { waitForError, waitForTransaction } from '../event-proxy-server';
 
 test('sends an error', async ({ page }) => {
   const errorPromise = waitForError('angular-17', async errorEvent => {
@@ -25,5 +25,41 @@ test('sends an error', async ({ page }) => {
         },
       ],
     },
+    transaction: '/home/',
+  });
+});
+
+test('assigns the correct transaction value after a navigation', async ({ page }) => {
+  const pageloadTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  const errorPromise = waitForError('angular-17', async errorEvent => {
+    return !errorEvent.type;
+  });
+
+  await page.goto(`/`);
+  await pageloadTxnPromise;
+
+  await page.waitForTimeout(5000);
+
+  await page.locator('#navLink').click();
+
+  const [_, error] = await Promise.all([page.locator('#userErrorBtn').click(), errorPromise]);
+
+  expect(error).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Error thrown from user page',
+          mechanism: {
+            type: 'angular',
+            handled: false,
+          },
+        },
+      ],
+    },
+    transaction: '/users/:id/',
   });
 });
diff --git a/dev-packages/e2e-tests/test-applications/angular-17/tests/performance.test.ts b/dev-packages/e2e-tests/test-applications/angular-17/tests/performance.test.ts
index 9b5f1b08e9d2..9fc4b74e779f 100644
--- a/dev-packages/e2e-tests/test-applications/angular-17/tests/performance.test.ts
+++ b/dev-packages/e2e-tests/test-applications/angular-17/tests/performance.test.ts
@@ -1,4 +1,5 @@
 import { expect, test } from '@playwright/test';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { waitForTransaction } from '../event-proxy-server';
 
 test('sends a pageload transaction with a parameterized URL', async ({ page }) => {
@@ -126,3 +127,187 @@ test('groups redirects within one navigation root span', async ({ page }) => {
   expect(routingSpan).toBeDefined();
   expect(routingSpan?.description).toBe('/redirect1');
 });
+
+test.describe('finish routing span', () => {
+  test('finishes routing span on navigation cancel', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#cancelLink').click(), navigationTxnPromise]);
+
+    expect(navigationTxn).toMatchObject({
+      contexts: {
+        trace: {
+          op: 'navigation',
+          origin: 'auto.navigation.angular',
+        },
+      },
+      transaction: '/cancel',
+      transaction_info: {
+        source: 'url',
+      },
+    });
+
+    const routingSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.routing');
+
+    expect(routingSpan).toBeDefined();
+    expect(routingSpan?.description).toBe('/cancel');
+  });
+
+  test('finishes routing span on navigation error', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#nonExistentLink').click(), navigationTxnPromise]);
+
+    const nonExistentRoute = '/non-existent';
+
+    expect(navigationTxn).toMatchObject({
+      contexts: {
+        trace: {
+          op: 'navigation',
+          origin: 'auto.navigation.angular',
+        },
+      },
+      transaction: nonExistentRoute,
+      transaction_info: {
+        source: 'url',
+      },
+    });
+
+    const routingSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.routing');
+
+    expect(routingSpan).toBeDefined();
+    expect(routingSpan?.description).toBe(nonExistentRoute);
+  });
+});
+
+test.describe('TraceDirective', () => {
+  test('creates a child tracingSpan with component name as span name on ngOnInit', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const traceDirectiveSpan = navigationTxn.spans?.find(
+      span => span?.data && span?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.ui.angular.trace_directive',
+    );
+
+    expect(traceDirectiveSpan).toBeDefined();
+    expect(traceDirectiveSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.init',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_directive',
+        },
+        description: '<sample-component>',
+        op: 'ui.angular.init',
+        origin: 'auto.ui.angular.trace_directive',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+});
+
+test.describe('TraceClass Decorator', () => {
+  test('adds init span for decorated class', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const classDecoratorSpan = navigationTxn.spans?.find(
+      span => span?.data && span?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.ui.angular.trace_class_decorator',
+    );
+
+    expect(classDecoratorSpan).toBeDefined();
+    expect(classDecoratorSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.init',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_class_decorator',
+        },
+        description: '<ComponentTrackingComponent>',
+        op: 'ui.angular.init',
+        origin: 'auto.ui.angular.trace_class_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+});
+
+test.describe('TraceMethod Decorator', () => {
+  test('adds name to span description of decorated method `ngOnInit`', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const ngInitSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.ngOnInit');
+
+    expect(ngInitSpan).toBeDefined();
+    expect(ngInitSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.ngOnInit',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
+        },
+        description: '<ngOnInit>',
+        op: 'ui.angular.ngOnInit',
+        origin: 'auto.ui.angular.trace_method_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+
+  test('adds fallback name to span description of decorated method `ngAfterViewInit`', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-17', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const ngAfterViewInitSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.ngAfterViewInit');
+
+    expect(ngAfterViewInitSpan).toBeDefined();
+    expect(ngAfterViewInitSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.ngAfterViewInit',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
+        },
+        description: '<unnamed>',
+        op: 'ui.angular.ngAfterViewInit',
+        origin: 'auto.ui.angular.trace_method_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-next-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/create-next-app/tsconfig.json
index 3ff0501fdb85..1fd2e9a8d510 100644
--- a/dev-packages/e2e-tests/test-applications/create-next-app/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/create-next-app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/create-react-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/create-react-app/tsconfig.json
index 4bd4dd6a0417..bd19e4f07fc7 100644
--- a/dev-packages/e2e-tests/test-applications/create-react-app/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/create-react-app/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/README.md b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/README.md
index ec619a8eb455..31400e85106f 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/README.md
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/README.md
@@ -1,6 +1,7 @@
 # Welcome to Remix + Vite!
 
-📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite) for details on supported features.
+📖 See the [Remix docs](https://remix.run/docs) and the [Remix Vite docs](https://remix.run/docs/en/main/future/vite)
+for details on supported features.
 
 ## Development
 
@@ -28,7 +29,8 @@ Now you'll need to pick a host to deploy it to.
 
 ### DIY
 
-If you're familiar with deploying Express applications you should be right at home. Just make sure to deploy the output of `npm run build`
+If you're familiar with deploying Express applications you should be right at home. Just make sure to deploy the output
+of `npm run build`
 
 - `build/server`
 - `build/client`
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.client.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.client.tsx
index d71aaa5cd286..4eb7e3d3553f 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.client.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.client.tsx
@@ -12,13 +12,14 @@ Sentry.init({
       useLocation,
       useMatches,
     }),
-    new Sentry.Replay(),
+    Sentry.replayIntegration(),
   ],
   // Performance Monitoring
   tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
   // Session Replay
   replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
   replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
+  tunnel: 'http://localhost:3031/', // proxy server
 });
 
 Sentry.addEventProcessor(event => {
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx
index c3deb6369af3..5e0608ff5749 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/entry.server.tsx
@@ -1,10 +1,18 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 import { PassThrough } from 'node:stream';
 
 import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { createReadableStreamFromReadable } from '@remix-run/node';
 import { installGlobals } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import * as isbotModule from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
@@ -12,13 +20,6 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/routes/_index.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/routes/_index.tsx
index 8907ef7816fd..b646c62ee4da 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/routes/_index.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/app/routes/_index.tsx
@@ -1,7 +1,13 @@
-import { Link } from '@remix-run/react';
+import { Link, useSearchParams } from '@remix-run/react';
 import * as Sentry from '@sentry/remix';
 
 export default function Index() {
+  const [searchParams] = useSearchParams();
+
+  if (searchParams.get('tag')) {
+    Sentry.setTag('sentry_test', searchParams.get('tag'));
+  }
+
   return (
     <div>
       <input
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/event-proxy-server.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/event-proxy-server.ts
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/event-proxy-server.ts
rename to dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/event-proxy-server.ts
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
index 17a21f6e0b5e..4310039b0638 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
@@ -27,6 +27,8 @@
   "devDependencies": {
     "@playwright/test": "^1.36.2",
     "@remix-run/dev": "^2.7.2",
+    "@sentry/types": "latest || *",
+    "@sentry/utils": "latest || *",
     "@types/compression": "^1.7.5",
     "@types/express": "^4.17.20",
     "@types/morgan": "^1.9.9",
@@ -43,7 +45,8 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "typescript": "^5.1.6",
     "vite": "^5.1.0",
-    "vite-tsconfig-paths": "^4.2.1"
+    "vite-tsconfig-paths": "^4.2.1",
+    "ts-node": "10.9.1"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.ts
index 9f04a7ee7896..dd495b0c9f98 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.ts
@@ -2,6 +2,7 @@ import type { PlaywrightTestConfig } from '@playwright/test';
 import { devices } from '@playwright/test';
 
 const port = 3030;
+const eventProxyPort = 3031;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -34,6 +35,9 @@ const config: PlaywrightTestConfig = {
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
+
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: `http://localhost:${port}`,
   },
 
   /* Configure projects for major browsers */
@@ -44,15 +48,19 @@ const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome'],
       },
     },
-    // For now we only test Chrome!
   ],
 
   /* Run your local dev server before starting the tests */
-  webServer: {
-    // This test app is testing the Vite dev server, so we need to run it before the tests.
-    command: `PORT=${port} pnpm dev`,
-    port,
-  },
+  webServer: [
+    {
+      command: 'pnpm ts-node --project="tsconfig.event-proxy-server.json" ./start-event-proxy.ts',
+      port: eventProxyPort,
+    },
+    {
+      command: `PORT=${port} pnpm dev`,
+      port: port,
+    },
+  ],
 };
 
 export default config;
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/start-event-proxy.ts
new file mode 100644
index 000000000000..e56a52190e63
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/start-event-proxy.ts
@@ -0,0 +1,5 @@
+import { startEventProxyServer } from './event-proxy-server';
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'create-remix-app-express-vite-dev',
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/behaviour-server.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/behaviour-server.test.ts
new file mode 100644
index 000000000000..09cee3ca79bc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/behaviour-server.test.ts
@@ -0,0 +1,50 @@
+import { expect, test } from '@playwright/test';
+import { uuid4 } from '@sentry/utils';
+
+import { waitForTransaction } from '../event-proxy-server';
+
+test('Sends two linked transactions (server & client) to Sentry', async ({ page }) => {
+  // We use this to identify the transactions
+  const testTag = uuid4();
+
+  const httpServerTransactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'http.server' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  const pageLoadTransactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  page.goto(`/?tag=${testTag}`);
+
+  const pageloadTransaction = await pageLoadTransactionPromise;
+  const httpServerTransaction = await httpServerTransactionPromise;
+
+  expect(pageloadTransaction).toBeDefined();
+  expect(httpServerTransaction).toBeDefined();
+
+  const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
+  const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
+
+  const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
+  const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
+  const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
+
+  expect(httpServerTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('routes/_index');
+
+  expect(httpServerTraceId).toBeDefined();
+  expect(httpServerSpanId).toBeDefined();
+
+  expect(pageLoadTraceId).toEqual(httpServerTraceId);
+  expect(pageLoadParentSpanId).toEqual(httpServerSpanId);
+  expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.event-proxy-server.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.event-proxy-server.json
new file mode 100644
index 000000000000..bd49b1f0c16f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.event-proxy-server.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "module": "CommonJS",
+    "allowJs": true,
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "strict": true,
+    "allowImportingTsExtensions": true
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.json b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.json
index 77291a910914..0a6c9071cb90 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "include": ["env.d.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["event-proxy-server.ts", "start-event-proxy.ts"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2022"],
     "isolatedModules": true,
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.client.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.client.tsx
index 1f1a48d28fbd..b3b5db3d9b3d 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.client.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.client.tsx
@@ -18,13 +18,14 @@ Sentry.init({
       useLocation,
       useMatches,
     }),
-    new Sentry.Replay(),
+    Sentry.replayIntegration(),
   ],
   // Performance Monitoring
   tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
   // Session Replay
   replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
   replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
+  tunnel: 'http://localhost:3031/', // proxy server
 });
 
 Sentry.addEventProcessor(event => {
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx
index d8e63095fa43..0f4ea48a99e9 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/entry.server.tsx
@@ -1,3 +1,12 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -10,7 +19,6 @@ import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { createReadableStreamFromReadable } from '@remix-run/node';
 import { installGlobals } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import isbot from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
@@ -18,13 +26,6 @@ installGlobals();
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/routes/_index.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/routes/_index.tsx
index 8907ef7816fd..b646c62ee4da 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/routes/_index.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/app/routes/_index.tsx
@@ -1,7 +1,13 @@
-import { Link } from '@remix-run/react';
+import { Link, useSearchParams } from '@remix-run/react';
 import * as Sentry from '@sentry/remix';
 
 export default function Index() {
+  const [searchParams] = useSearchParams();
+
+  if (searchParams.get('tag')) {
+    Sentry.setTag('sentry_test', searchParams.get('tag'));
+  }
+
   return (
     <div>
       <input
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/event-proxy-server.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/event-proxy-server.ts
new file mode 100644
index 000000000000..d14ca5cb5e72
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/event-proxy-server.ts
@@ -0,0 +1,253 @@
+import * as fs from 'fs';
+import * as http from 'http';
+import * as https from 'https';
+import type { AddressInfo } from 'net';
+import * as os from 'os';
+import * as path from 'path';
+import * as util from 'util';
+import * as zlib from 'zlib';
+import type { Envelope, EnvelopeItem, Event } from '@sentry/types';
+import { parseEnvelope } from '@sentry/utils';
+
+const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+
+interface EventProxyServerOptions {
+  /** Port to start the event proxy server at. */
+  port: number;
+  /** The name for the proxy server used for referencing it with listener functions */
+  proxyServerName: string;
+}
+
+interface SentryRequestCallbackData {
+  envelope: Envelope;
+  rawProxyRequestBody: string;
+  rawSentryResponseBody: string;
+  sentryResponseStatusCode?: number;
+}
+
+/**
+ * Starts an event proxy server that will proxy events to sentry when the `tunnel` option is used. Point the `tunnel`
+ * option to this server (like this `tunnel: http://localhost:${port option}/`).
+ */
+export async function startEventProxyServer(options: EventProxyServerOptions): Promise<void> {
+  const eventCallbackListeners: Set<(data: string) => void> = new Set();
+
+  const proxyServer = http.createServer((proxyRequest, proxyResponse) => {
+    const proxyRequestChunks: Uint8Array[] = [];
+
+    proxyRequest.addListener('data', (chunk: Buffer) => {
+      proxyRequestChunks.push(chunk);
+    });
+
+    proxyRequest.addListener('error', err => {
+      throw err;
+    });
+
+    proxyRequest.addListener('end', () => {
+      const proxyRequestBody =
+        proxyRequest.headers['content-encoding'] === 'gzip'
+          ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
+          : Buffer.concat(proxyRequestChunks).toString();
+
+      let envelopeHeader = JSON.parse(proxyRequestBody.split('\n')[0]);
+
+      if (!envelopeHeader.dsn) {
+        throw new Error('[event-proxy-server] No dsn on envelope header. Please set tunnel option.');
+      }
+
+      const { origin, pathname, host } = new URL(envelopeHeader.dsn);
+
+      const projectId = pathname.substring(1);
+      const sentryIngestUrl = `${origin}/api/${projectId}/envelope/`;
+
+      proxyRequest.headers.host = host;
+
+      const sentryResponseChunks: Uint8Array[] = [];
+
+      const sentryRequest = https.request(
+        sentryIngestUrl,
+        { headers: proxyRequest.headers, method: proxyRequest.method },
+        sentryResponse => {
+          sentryResponse.addListener('data', (chunk: Buffer) => {
+            proxyResponse.write(chunk, 'binary');
+            sentryResponseChunks.push(chunk);
+          });
+
+          sentryResponse.addListener('end', () => {
+            eventCallbackListeners.forEach(listener => {
+              const rawSentryResponseBody = Buffer.concat(sentryResponseChunks).toString();
+
+              const data: SentryRequestCallbackData = {
+                envelope: parseEnvelope(proxyRequestBody),
+                rawProxyRequestBody: proxyRequestBody,
+                rawSentryResponseBody,
+                sentryResponseStatusCode: sentryResponse.statusCode,
+              };
+
+              listener(Buffer.from(JSON.stringify(data)).toString('base64'));
+            });
+            proxyResponse.end();
+          });
+
+          sentryResponse.addListener('error', err => {
+            throw err;
+          });
+
+          proxyResponse.writeHead(sentryResponse.statusCode || 500, sentryResponse.headers);
+        },
+      );
+
+      sentryRequest.write(Buffer.concat(proxyRequestChunks), 'binary');
+      sentryRequest.end();
+    });
+  });
+
+  const proxyServerStartupPromise = new Promise<void>(resolve => {
+    proxyServer.listen(options.port, () => {
+      resolve();
+    });
+  });
+
+  const eventCallbackServer = http.createServer((eventCallbackRequest, eventCallbackResponse) => {
+    eventCallbackResponse.statusCode = 200;
+    eventCallbackResponse.setHeader('connection', 'keep-alive');
+
+    const callbackListener = (data: string): void => {
+      eventCallbackResponse.write(data.concat('\n'), 'utf8');
+    };
+
+    eventCallbackListeners.add(callbackListener);
+
+    eventCallbackRequest.on('close', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+
+    eventCallbackRequest.on('error', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+  });
+
+  const eventCallbackServerStartupPromise = new Promise<void>(resolve => {
+    eventCallbackServer.listen(0, () => {
+      const port = String((eventCallbackServer.address() as AddressInfo).port);
+      void registerCallbackServerPort(options.proxyServerName, port).then(resolve);
+    });
+  });
+
+  await eventCallbackServerStartupPromise;
+  await proxyServerStartupPromise;
+  return;
+}
+
+export async function waitForRequest(
+  proxyServerName: string,
+  callback: (eventData: SentryRequestCallbackData) => Promise<boolean> | boolean,
+): Promise<SentryRequestCallbackData> {
+  const eventCallbackServerPort = await retrieveCallbackServerPort(proxyServerName);
+
+  return new Promise<SentryRequestCallbackData>((resolve, reject) => {
+    const request = http.request(`http://localhost:${eventCallbackServerPort}/`, {}, response => {
+      let eventContents = '';
+
+      response.on('error', err => {
+        reject(err);
+      });
+
+      response.on('data', (chunk: Buffer) => {
+        const chunkString = chunk.toString('utf8');
+        chunkString.split('').forEach(char => {
+          if (char === '\n') {
+            const eventCallbackData: SentryRequestCallbackData = JSON.parse(
+              Buffer.from(eventContents, 'base64').toString('utf8'),
+            );
+            const callbackResult = callback(eventCallbackData);
+            if (typeof callbackResult !== 'boolean') {
+              callbackResult.then(
+                match => {
+                  if (match) {
+                    response.destroy();
+                    resolve(eventCallbackData);
+                  }
+                },
+                err => {
+                  throw err;
+                },
+              );
+            } else if (callbackResult) {
+              response.destroy();
+              resolve(eventCallbackData);
+            }
+            eventContents = '';
+          } else {
+            eventContents = eventContents.concat(char);
+          }
+        });
+      });
+    });
+
+    request.end();
+  });
+}
+
+export function waitForEnvelopeItem(
+  proxyServerName: string,
+  callback: (envelopeItem: EnvelopeItem) => Promise<boolean> | boolean,
+): Promise<EnvelopeItem> {
+  return new Promise((resolve, reject) => {
+    waitForRequest(proxyServerName, async eventData => {
+      const envelopeItems = eventData.envelope[1];
+      for (const envelopeItem of envelopeItems) {
+        if (await callback(envelopeItem)) {
+          resolve(envelopeItem);
+          return true;
+        }
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForError(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForTransaction(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+const TEMP_FILE_PREFIX = 'event-proxy-server-';
+
+async function registerCallbackServerPort(serverName: string, port: string): Promise<void> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  await writeFile(tmpFilePath, port, { encoding: 'utf8' });
+}
+
+function retrieveCallbackServerPort(serverName: string): Promise<string> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  return readFile(tmpFilePath, 'utf8');
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
index 71ff5ff39803..646bc5f21e25 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
@@ -24,10 +24,13 @@
     "@playwright/test": "^1.36.2",
     "@remix-run/dev": "2.7.2",
     "@remix-run/eslint-config": "2.7.2",
+    "@sentry/types": "latest || *",
+    "@sentry/utils": "latest || *",
     "@types/react": "^18.0.35",
     "@types/react-dom": "^18.0.11",
     "eslint": "^8.38.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "ts-node": "10.9.1"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/playwright.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/playwright.config.ts
index 79efcbc22c1a..429baa2db33f 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/playwright.config.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/playwright.config.ts
@@ -2,6 +2,7 @@ import type { PlaywrightTestConfig } from '@playwright/test';
 import { devices } from '@playwright/test';
 
 const port = 3030;
+const eventProxyPort = 3031;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -34,6 +35,9 @@ const config: PlaywrightTestConfig = {
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
+
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: `http://localhost:${port}`,
   },
 
   /* Configure projects for major browsers */
@@ -44,14 +48,19 @@ const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome'],
       },
     },
-    // For now we only test Chrome!
   ],
 
   /* Run your local dev server before starting the tests */
-  webServer: {
-    command: `PORT=${port} pnpm start`,
-    port,
-  },
+  webServer: [
+    {
+      command: 'pnpm ts-node-script start-event-proxy.ts',
+      port: eventProxyPort,
+    },
+    {
+      command: `PORT=${port} pnpm start`,
+      port: port,
+    },
+  ],
 };
 
 export default config;
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/start-event-proxy.ts
new file mode 100644
index 000000000000..cc810192de58
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/start-event-proxy.ts
@@ -0,0 +1,5 @@
+import { startEventProxyServer } from './event-proxy-server';
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'create-remix-app-v2',
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/behaviour-server.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/behaviour-server.test.ts
new file mode 100644
index 000000000000..992a315af3d3
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/behaviour-server.test.ts
@@ -0,0 +1,50 @@
+import { expect, test } from '@playwright/test';
+import { uuid4 } from '@sentry/utils';
+
+import { waitForTransaction } from '../event-proxy-server';
+
+test('Sends two linked transactions (server & client) to Sentry', async ({ page }) => {
+  // We use this to identify the transactions
+  const testTag = uuid4();
+
+  const httpServerTransactionPromise = waitForTransaction('create-remix-app-v2', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'http.server' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  const pageLoadTransactionPromise = waitForTransaction('create-remix-app-v2', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  page.goto(`/?tag=${testTag}`);
+
+  const pageloadTransaction = await pageLoadTransactionPromise;
+  const httpServerTransaction = await httpServerTransactionPromise;
+
+  expect(pageloadTransaction).toBeDefined();
+  expect(httpServerTransaction).toBeDefined();
+
+  const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
+  const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
+
+  const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
+  const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
+  const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
+
+  expect(httpServerTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('routes/_index');
+
+  expect(httpServerTraceId).toBeDefined();
+  expect(httpServerSpanId).toBeDefined();
+
+  expect(pageLoadTraceId).toEqual(httpServerTraceId);
+  expect(pageLoadParentSpanId).toEqual(httpServerSpanId);
+  expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.client.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.client.tsx
index d5a8978376a4..93eab0f819fb 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.client.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.client.tsx
@@ -12,12 +12,13 @@ import { hydrateRoot } from 'react-dom/client';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: window.ENV.SENTRY_DSN,
-  integrations: [Sentry.browserTracingIntegration({ useEffect, useMatches, useLocation }), new Sentry.Replay()],
+  integrations: [Sentry.browserTracingIntegration({ useEffect, useMatches, useLocation }), Sentry.replayIntegration()],
   // Performance Monitoring
   tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
   // Session Replay
   replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
   replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
+  tunnel: 'http://localhost:3031/', // proxy server
 });
 
 Sentry.addEventProcessor(event => {
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx
index c2de73cdba63..b0f1c5d19f09 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/app/entry.server.tsx
@@ -1,3 +1,12 @@
+import * as Sentry from '@sentry/remix';
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+});
+
 /**
  * By default, Remix will handle generating the HTTP Response for you.
  * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
@@ -9,19 +18,11 @@ import { PassThrough } from 'node:stream';
 import type { AppLoadContext, EntryContext } from '@remix-run/node';
 import { Response } from '@remix-run/node';
 import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
 import isbot from 'isbot';
 import { renderToPipeableStream } from 'react-dom/server';
 
 const ABORT_DELAY = 5_000;
 
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.E2E_TEST_DSN,
-  // Performance Monitoring
-  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
-});
-
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/app/routes/_index.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app/app/routes/_index.tsx
index 8907ef7816fd..b646c62ee4da 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app/app/routes/_index.tsx
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/app/routes/_index.tsx
@@ -1,7 +1,13 @@
-import { Link } from '@remix-run/react';
+import { Link, useSearchParams } from '@remix-run/react';
 import * as Sentry from '@sentry/remix';
 
 export default function Index() {
+  const [searchParams] = useSearchParams();
+
+  if (searchParams.get('tag')) {
+    Sentry.setTag('sentry_test', searchParams.get('tag'));
+  }
+
   return (
     <div>
       <input
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/event-proxy-server.ts b/dev-packages/e2e-tests/test-applications/create-remix-app/event-proxy-server.ts
new file mode 100644
index 000000000000..d14ca5cb5e72
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/event-proxy-server.ts
@@ -0,0 +1,253 @@
+import * as fs from 'fs';
+import * as http from 'http';
+import * as https from 'https';
+import type { AddressInfo } from 'net';
+import * as os from 'os';
+import * as path from 'path';
+import * as util from 'util';
+import * as zlib from 'zlib';
+import type { Envelope, EnvelopeItem, Event } from '@sentry/types';
+import { parseEnvelope } from '@sentry/utils';
+
+const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+
+interface EventProxyServerOptions {
+  /** Port to start the event proxy server at. */
+  port: number;
+  /** The name for the proxy server used for referencing it with listener functions */
+  proxyServerName: string;
+}
+
+interface SentryRequestCallbackData {
+  envelope: Envelope;
+  rawProxyRequestBody: string;
+  rawSentryResponseBody: string;
+  sentryResponseStatusCode?: number;
+}
+
+/**
+ * Starts an event proxy server that will proxy events to sentry when the `tunnel` option is used. Point the `tunnel`
+ * option to this server (like this `tunnel: http://localhost:${port option}/`).
+ */
+export async function startEventProxyServer(options: EventProxyServerOptions): Promise<void> {
+  const eventCallbackListeners: Set<(data: string) => void> = new Set();
+
+  const proxyServer = http.createServer((proxyRequest, proxyResponse) => {
+    const proxyRequestChunks: Uint8Array[] = [];
+
+    proxyRequest.addListener('data', (chunk: Buffer) => {
+      proxyRequestChunks.push(chunk);
+    });
+
+    proxyRequest.addListener('error', err => {
+      throw err;
+    });
+
+    proxyRequest.addListener('end', () => {
+      const proxyRequestBody =
+        proxyRequest.headers['content-encoding'] === 'gzip'
+          ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
+          : Buffer.concat(proxyRequestChunks).toString();
+
+      let envelopeHeader = JSON.parse(proxyRequestBody.split('\n')[0]);
+
+      if (!envelopeHeader.dsn) {
+        throw new Error('[event-proxy-server] No dsn on envelope header. Please set tunnel option.');
+      }
+
+      const { origin, pathname, host } = new URL(envelopeHeader.dsn);
+
+      const projectId = pathname.substring(1);
+      const sentryIngestUrl = `${origin}/api/${projectId}/envelope/`;
+
+      proxyRequest.headers.host = host;
+
+      const sentryResponseChunks: Uint8Array[] = [];
+
+      const sentryRequest = https.request(
+        sentryIngestUrl,
+        { headers: proxyRequest.headers, method: proxyRequest.method },
+        sentryResponse => {
+          sentryResponse.addListener('data', (chunk: Buffer) => {
+            proxyResponse.write(chunk, 'binary');
+            sentryResponseChunks.push(chunk);
+          });
+
+          sentryResponse.addListener('end', () => {
+            eventCallbackListeners.forEach(listener => {
+              const rawSentryResponseBody = Buffer.concat(sentryResponseChunks).toString();
+
+              const data: SentryRequestCallbackData = {
+                envelope: parseEnvelope(proxyRequestBody),
+                rawProxyRequestBody: proxyRequestBody,
+                rawSentryResponseBody,
+                sentryResponseStatusCode: sentryResponse.statusCode,
+              };
+
+              listener(Buffer.from(JSON.stringify(data)).toString('base64'));
+            });
+            proxyResponse.end();
+          });
+
+          sentryResponse.addListener('error', err => {
+            throw err;
+          });
+
+          proxyResponse.writeHead(sentryResponse.statusCode || 500, sentryResponse.headers);
+        },
+      );
+
+      sentryRequest.write(Buffer.concat(proxyRequestChunks), 'binary');
+      sentryRequest.end();
+    });
+  });
+
+  const proxyServerStartupPromise = new Promise<void>(resolve => {
+    proxyServer.listen(options.port, () => {
+      resolve();
+    });
+  });
+
+  const eventCallbackServer = http.createServer((eventCallbackRequest, eventCallbackResponse) => {
+    eventCallbackResponse.statusCode = 200;
+    eventCallbackResponse.setHeader('connection', 'keep-alive');
+
+    const callbackListener = (data: string): void => {
+      eventCallbackResponse.write(data.concat('\n'), 'utf8');
+    };
+
+    eventCallbackListeners.add(callbackListener);
+
+    eventCallbackRequest.on('close', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+
+    eventCallbackRequest.on('error', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+  });
+
+  const eventCallbackServerStartupPromise = new Promise<void>(resolve => {
+    eventCallbackServer.listen(0, () => {
+      const port = String((eventCallbackServer.address() as AddressInfo).port);
+      void registerCallbackServerPort(options.proxyServerName, port).then(resolve);
+    });
+  });
+
+  await eventCallbackServerStartupPromise;
+  await proxyServerStartupPromise;
+  return;
+}
+
+export async function waitForRequest(
+  proxyServerName: string,
+  callback: (eventData: SentryRequestCallbackData) => Promise<boolean> | boolean,
+): Promise<SentryRequestCallbackData> {
+  const eventCallbackServerPort = await retrieveCallbackServerPort(proxyServerName);
+
+  return new Promise<SentryRequestCallbackData>((resolve, reject) => {
+    const request = http.request(`http://localhost:${eventCallbackServerPort}/`, {}, response => {
+      let eventContents = '';
+
+      response.on('error', err => {
+        reject(err);
+      });
+
+      response.on('data', (chunk: Buffer) => {
+        const chunkString = chunk.toString('utf8');
+        chunkString.split('').forEach(char => {
+          if (char === '\n') {
+            const eventCallbackData: SentryRequestCallbackData = JSON.parse(
+              Buffer.from(eventContents, 'base64').toString('utf8'),
+            );
+            const callbackResult = callback(eventCallbackData);
+            if (typeof callbackResult !== 'boolean') {
+              callbackResult.then(
+                match => {
+                  if (match) {
+                    response.destroy();
+                    resolve(eventCallbackData);
+                  }
+                },
+                err => {
+                  throw err;
+                },
+              );
+            } else if (callbackResult) {
+              response.destroy();
+              resolve(eventCallbackData);
+            }
+            eventContents = '';
+          } else {
+            eventContents = eventContents.concat(char);
+          }
+        });
+      });
+    });
+
+    request.end();
+  });
+}
+
+export function waitForEnvelopeItem(
+  proxyServerName: string,
+  callback: (envelopeItem: EnvelopeItem) => Promise<boolean> | boolean,
+): Promise<EnvelopeItem> {
+  return new Promise((resolve, reject) => {
+    waitForRequest(proxyServerName, async eventData => {
+      const envelopeItems = eventData.envelope[1];
+      for (const envelopeItem of envelopeItems) {
+        if (await callback(envelopeItem)) {
+          resolve(envelopeItem);
+          return true;
+        }
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForError(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForTransaction(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+const TEMP_FILE_PREFIX = 'event-proxy-server-';
+
+async function registerCallbackServerPort(serverName: string, port: string): Promise<void> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  await writeFile(tmpFilePath, port, { encoding: 'utf8' });
+}
+
+function retrieveCallbackServerPort(serverName: string): Promise<string> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  return readFile(tmpFilePath, 'utf8');
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app/package.json
index 5ff93d15a484..365fd9fb0bac 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app/package.json
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/package.json
@@ -26,11 +26,14 @@
     "@remix-run/eslint-config": "^1.19.3",
     "@types/react": "^18.0.35",
     "@types/react-dom": "^18.0.11",
+    "@sentry/types": "latest || *",
+    "@sentry/utils": "latest || *",
     "eslint": "^8.38.0",
-    "typescript": "^5.0.4"
+    "typescript": "^5.0.4",
+    "ts-node": "10.9.1"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app/playwright.config.ts
index 785ca43321a4..429baa2db33f 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app/playwright.config.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/playwright.config.ts
@@ -2,6 +2,7 @@ import type { PlaywrightTestConfig } from '@playwright/test';
 import { devices } from '@playwright/test';
 
 const port = 3030;
+const eventProxyPort = 3031;
 
 /**
  * See https://playwright.dev/docs/test-configuration.
@@ -34,6 +35,9 @@ const config: PlaywrightTestConfig = {
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',
+
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: `http://localhost:${port}`,
   },
 
   /* Configure projects for major browsers */
@@ -44,26 +48,19 @@ const config: PlaywrightTestConfig = {
         ...devices['Desktop Chrome'],
       },
     },
-    // For now we only test Chrome!
-    // {
-    //   name: 'firefox',
-    //   use: {
-    //     ...devices['Desktop Firefox'],
-    //   },
-    // },
-    // {
-    //   name: 'webkit',
-    //   use: {
-    //     ...devices['Desktop Safari'],
-    //   },
-    // },
   ],
 
   /* Run your local dev server before starting the tests */
-  webServer: {
-    command: `PORT=${port} pnpm start`,
-    port,
-  },
+  webServer: [
+    {
+      command: 'pnpm ts-node-script start-event-proxy.ts',
+      port: eventProxyPort,
+    },
+    {
+      command: `PORT=${port} pnpm start`,
+      port: port,
+    },
+  ],
 };
 
 export default config;
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/create-remix-app/start-event-proxy.ts
new file mode 100644
index 000000000000..93755c9d232e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/start-event-proxy.ts
@@ -0,0 +1,5 @@
+import { startEventProxyServer } from './event-proxy-server';
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'create-remix-app',
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app/tests/behaviour-server.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app/tests/behaviour-server.test.ts
new file mode 100644
index 000000000000..d0d737e44a69
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app/tests/behaviour-server.test.ts
@@ -0,0 +1,50 @@
+import { expect, test } from '@playwright/test';
+import { uuid4 } from '@sentry/utils';
+
+import { waitForTransaction } from '../event-proxy-server';
+
+test('Sends two linked transactions (server & client) to Sentry', async ({ page }) => {
+  // We use this to identify the transactions
+  const testTag = uuid4();
+
+  const httpServerTransactionPromise = waitForTransaction('create-remix-app', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'http.server' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  const pageLoadTransactionPromise = waitForTransaction('create-remix-app', transactionEvent => {
+    return (
+      transactionEvent.type === 'transaction' &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.tags?.['sentry_test'] === testTag
+    );
+  });
+
+  page.goto(`/?tag=${testTag}`);
+
+  const pageloadTransaction = await pageLoadTransactionPromise;
+  const httpServerTransaction = await httpServerTransactionPromise;
+
+  expect(pageloadTransaction).toBeDefined();
+  expect(httpServerTransaction).toBeDefined();
+
+  const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
+  const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
+
+  const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
+  const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
+  const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
+
+  expect(httpServerTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('routes/_index');
+
+  expect(httpServerTraceId).toBeDefined();
+  expect(httpServerSpanId).toBeDefined();
+
+  expect(pageLoadTraceId).toEqual(httpServerTraceId);
+  expect(pageLoadParentSpanId).toEqual(httpServerSpanId);
+  expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
+});
diff --git a/dev-packages/e2e-tests/test-applications/generic-ts3.8/tsconfig.json b/dev-packages/e2e-tests/test-applications/generic-ts3.8/tsconfig.json
index 932aa58e0c9a..ef27756e97d9 100644
--- a/dev-packages/e2e-tests/test-applications/generic-ts3.8/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/generic-ts3.8/tsconfig.json
@@ -1,11 +1,11 @@
 {
   "include": ["index.ts"],
   "compilerOptions": {
-    "lib": ["es6", "DOM"],
+    "lib": ["es2017", "DOM"],
     "skipLibCheck": false,
     "noEmit": true,
     "types": [],
-    "target": "es6",
+    "target": "es2017",
     "moduleResolution": "node"
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json
index b822f4316566..f2a1fb3d8a68 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-14/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-14/package.json
@@ -13,17 +13,17 @@
     "test:assert": "pnpm test:prod && pnpm test:dev"
   },
   "dependencies": {
+    "@playwright/test": "^1.27.1",
     "@sentry/nextjs": "latest || *",
     "@types/node": "18.11.17",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "14.0.4",
+    "next": "14.1.3",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "typescript": "4.9.5",
-    "wait-port": "1.0.4",
     "ts-node": "10.9.1",
-    "@playwright/test": "^1.27.1"
+    "typescript": "4.9.5",
+    "wait-port": "1.0.4"
   },
   "devDependencies": {
     "@sentry/types": "latest || *",
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts
index b5fe7ee67393..e52dde8db258 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts
@@ -7,7 +7,7 @@ test('Should send a transaction event for a generateMetadata() function invokati
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['metadataTitle'] === testTitle
+      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
     );
   });
 
@@ -26,8 +26,8 @@ test('Should send a transaction and an error event for a faulty generateMetadata
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['metadataTitle'] === testTitle
+      transactionEvent.transaction === 'Page.generateMetadata (/generation-functions)' &&
+      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
     );
   });
 
@@ -47,7 +47,7 @@ test('Should send a transaction event for a generateViewport() function invokati
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page.generateViewport (/generation-functions)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['viewportThemeColor'] === testTitle
+      (transactionEvent.extra?.route_data as any)?.searchParams?.viewportThemeColor === testTitle
     );
   });
 
@@ -64,7 +64,7 @@ test('Should send a transaction and an error event for a faulty generateViewport
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page.generateViewport (/generation-functions)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['viewportThemeColor'] === testTitle
+      (transactionEvent.extra?.route_data as any)?.searchParams?.viewportThemeColor === testTitle
     );
   });
 
@@ -86,7 +86,7 @@ test('Should send a transaction event with correct status for a generateMetadata
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions/with-redirect)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['metadataTitle'] === testTitle
+      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
     );
   });
 
@@ -103,7 +103,7 @@ test('Should send a transaction event with correct status for a generateMetadata
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
       transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions/with-notfound)' &&
-      transactionEvent.contexts?.trace?.data?.['searchParams']?.['metadataTitle'] === testTitle
+      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
     );
   });
 
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-14/tsconfig.json b/dev-packages/e2e-tests/test-applications/nextjs-14/tsconfig.json
index 60825545944d..6b81123d463c 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-14/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-14/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
index 421914877ce2..41f8d897d97b 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
@@ -52,7 +52,8 @@ test('Should record exceptions and transactions for faulty route handlers', asyn
   expect(routehandlerTransaction.contexts?.trace?.op).toBe('http.server');
 
   expect(routehandlerError.exception?.values?.[0].value).toBe('route-handler-error');
-  expect(routehandlerError.transaction).toBe('PUT /route-handlers/[param]/error');
+  // TODO: Uncomment once we update the scope transaction name on the server side
+  // expect(routehandlerError.transaction).toBe('PUT /route-handlers/[param]/error');
 });
 
 test.describe('Edge runtime', () => {
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
index 60825545944d..6b81123d463c 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
index 6d187f14c245..f8576bb04812 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/package.json
@@ -13,11 +13,13 @@
   },
   "dependencies": {
     "@sentry/node-experimental": "latest || *",
+    "@sentry/node": "latest || *",
     "@sentry/sveltekit": "latest || *",
     "@sentry/remix": "latest || *",
     "@sentry/astro": "latest || *",
     "@sentry/nextjs": "latest || *",
-    "@sentry/serverless": "latest || *",
+    "@sentry/aws-serverless": "latest || *",
+    "@sentry/google-cloud-serverless": "latest || *",
     "@sentry/bun": "latest || *",
     "@sentry/types": "latest || *",
     "@types/node": "18.15.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
index 5e7344588d56..c238cf326d68 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -1,78 +1,115 @@
 import * as SentryAstro from '@sentry/astro';
 import * as SentryBun from '@sentry/bun';
 import * as SentryNextJs from '@sentry/nextjs';
-import * as SentryNode from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
+import * as SentryNodeExperimental from '@sentry/node-experimental';
 import * as SentryRemix from '@sentry/remix';
-import * as SentryServerless from '@sentry/serverless';
 import * as SentrySvelteKit from '@sentry/sveltekit';
 
+// Serverless SDKs are CJS only
+const SentryAWS = require('@sentry/aws-serverless');
+const SentryGoogleCloud = require('@sentry/google-cloud-serverless');
+
 /* List of exports that are safe to ignore / we don't require in any depending package */
-const NODE_EXPORTS_IGNORE = [
+const NODE_EXPERIMENTAL_EXPORTS_IGNORE = [
   'default',
   // Probably generated by transpilation, no need to require it
   '__esModule',
-  // These Node exports were only made for type definition fixes (see #10339)
-  'Undici',
+  // These are not re-exported where not needed
   'Http',
-  'DebugSession',
-  'AnrIntegrationOptions',
-  'LocalVariablesIntegrationOptions',
+  'Undici',
 ];
 
+/* List of exports that are safe to ignore / we don't require in any depending package */
+const NODE_EXPORTS_IGNORE = [
+  'default',
+  // Probably generated by transpilation, no need to require it
+  '__esModule',
+];
+
+/* Sanitized list of node exports */
+const nodeExperimentalExports = Object.keys(SentryNodeExperimental).filter(
+  e => !NODE_EXPERIMENTAL_EXPORTS_IGNORE.includes(e),
+);
+const nodeExports = Object.keys(SentryNode).filter(e => !NODE_EXPORTS_IGNORE.includes(e));
+
 type Dependent = {
   package: string;
   exports: string[];
   ignoreExports?: string[];
   skip?: boolean;
+  compareWith: string[];
 };
 
 const DEPENDENTS: Dependent[] = [
   {
     package: '@sentry/astro',
+    compareWith: nodeExports,
     exports: Object.keys(SentryAstro),
+    ignoreExports: [
+      // Not needed for Astro
+      'setupFastifyErrorHandler',
+    ],
   },
   {
     package: '@sentry/bun',
+    compareWith: nodeExports,
     exports: Object.keys(SentryBun),
     ignoreExports: [
       // not supported in bun:
-      'Handlers',
       'NodeClient',
-      'hapiErrorPlugin',
-      'makeNodeTransport',
+      // legacy, to be removed...
+      'makeMain',
     ],
   },
   {
     package: '@sentry/nextjs',
+    compareWith: nodeExperimentalExports,
     // Next.js doesn't require explicit exports, so we can just merge top level and `default` exports:
     // @ts-expect-error: `default` is not in the type definition but it's defined
     exports: Object.keys({ ...SentryNextJs, ...SentryNextJs.default }),
   },
   {
     package: '@sentry/remix',
+    compareWith: nodeExports,
     exports: Object.keys(SentryRemix),
   },
   {
-    package: '@sentry/serverless',
-    exports: Object.keys(SentryServerless),
-    ignoreExports: ['cron', 'hapiErrorPlugin'],
+    package: '@sentry/aws-serverless',
+    compareWith: nodeExports,
+    exports: Object.keys(SentryAWS),
+    ignoreExports: [
+      // legacy, to be removed...
+      'makeMain',
+      // Not needed for Serverless
+      'setupFastifyErrorHandler',
+    ],
+  },
+  {
+    package: '@sentry/google-cloud-serverless',
+    compareWith: nodeExports,
+    exports: Object.keys(SentryGoogleCloud),
+    ignoreExports: [
+      // legacy, to be removed...
+      'makeMain',
+      // Not needed for Serverless
+      'setupFastifyErrorHandler',
+    ],
   },
   {
     package: '@sentry/sveltekit',
+    compareWith: nodeExperimentalExports,
     exports: Object.keys(SentrySvelteKit),
   },
 ];
 
-/* Sanitized list of node exports */
-const nodeExports = Object.keys(SentryNode).filter(e => !NODE_EXPORTS_IGNORE.includes(e));
-
 console.log('🔎 Checking for consistent exports of @sentry/node exports in depending packages');
 
 const missingExports: Record<string, string[]> = {};
 const dependentsToCheck = DEPENDENTS.filter(d => !d.skip);
 
-for (const nodeExport of nodeExports) {
-  for (const dependent of dependentsToCheck) {
+for (const dependent of dependentsToCheck) {
+  for (const nodeExport of dependent.compareWith) {
     if (dependent.ignoreExports?.includes(nodeExport)) {
       continue;
     }
diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-exports-test-app/tsconfig.json
index fc22710d69dc..6f37f0817c4a 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "types": ["node"],
     "esModuleInterop": true,
-    "lib": ["ES6"],
+    "lib": ["es2017"],
     "strict": true,
     "outDir": "dist",
     "target": "ESNext",
diff --git a/dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json
index decfcf7a0879..d46ae8103211 100644
--- a/dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/node-express-app/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "types": ["node"],
     "esModuleInterop": true,
-    "lib": ["ES6"],
+    "lib": ["es2017"],
     "strict": true,
     "outDir": "dist"
   },
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/.gitignore b/dev-packages/e2e-tests/test-applications/node-fastify-app/.gitignore
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/.gitignore
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/.gitignore
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/.npmrc b/dev-packages/e2e-tests/test-applications/node-fastify-app/.npmrc
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/.npmrc
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/.npmrc
diff --git a/dev-packages/e2e-tests/test-applications/node-fastify-app/event-proxy-server.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/event-proxy-server.ts
new file mode 100644
index 000000000000..d14ca5cb5e72
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/event-proxy-server.ts
@@ -0,0 +1,253 @@
+import * as fs from 'fs';
+import * as http from 'http';
+import * as https from 'https';
+import type { AddressInfo } from 'net';
+import * as os from 'os';
+import * as path from 'path';
+import * as util from 'util';
+import * as zlib from 'zlib';
+import type { Envelope, EnvelopeItem, Event } from '@sentry/types';
+import { parseEnvelope } from '@sentry/utils';
+
+const readFile = util.promisify(fs.readFile);
+const writeFile = util.promisify(fs.writeFile);
+
+interface EventProxyServerOptions {
+  /** Port to start the event proxy server at. */
+  port: number;
+  /** The name for the proxy server used for referencing it with listener functions */
+  proxyServerName: string;
+}
+
+interface SentryRequestCallbackData {
+  envelope: Envelope;
+  rawProxyRequestBody: string;
+  rawSentryResponseBody: string;
+  sentryResponseStatusCode?: number;
+}
+
+/**
+ * Starts an event proxy server that will proxy events to sentry when the `tunnel` option is used. Point the `tunnel`
+ * option to this server (like this `tunnel: http://localhost:${port option}/`).
+ */
+export async function startEventProxyServer(options: EventProxyServerOptions): Promise<void> {
+  const eventCallbackListeners: Set<(data: string) => void> = new Set();
+
+  const proxyServer = http.createServer((proxyRequest, proxyResponse) => {
+    const proxyRequestChunks: Uint8Array[] = [];
+
+    proxyRequest.addListener('data', (chunk: Buffer) => {
+      proxyRequestChunks.push(chunk);
+    });
+
+    proxyRequest.addListener('error', err => {
+      throw err;
+    });
+
+    proxyRequest.addListener('end', () => {
+      const proxyRequestBody =
+        proxyRequest.headers['content-encoding'] === 'gzip'
+          ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
+          : Buffer.concat(proxyRequestChunks).toString();
+
+      let envelopeHeader = JSON.parse(proxyRequestBody.split('\n')[0]);
+
+      if (!envelopeHeader.dsn) {
+        throw new Error('[event-proxy-server] No dsn on envelope header. Please set tunnel option.');
+      }
+
+      const { origin, pathname, host } = new URL(envelopeHeader.dsn);
+
+      const projectId = pathname.substring(1);
+      const sentryIngestUrl = `${origin}/api/${projectId}/envelope/`;
+
+      proxyRequest.headers.host = host;
+
+      const sentryResponseChunks: Uint8Array[] = [];
+
+      const sentryRequest = https.request(
+        sentryIngestUrl,
+        { headers: proxyRequest.headers, method: proxyRequest.method },
+        sentryResponse => {
+          sentryResponse.addListener('data', (chunk: Buffer) => {
+            proxyResponse.write(chunk, 'binary');
+            sentryResponseChunks.push(chunk);
+          });
+
+          sentryResponse.addListener('end', () => {
+            eventCallbackListeners.forEach(listener => {
+              const rawSentryResponseBody = Buffer.concat(sentryResponseChunks).toString();
+
+              const data: SentryRequestCallbackData = {
+                envelope: parseEnvelope(proxyRequestBody),
+                rawProxyRequestBody: proxyRequestBody,
+                rawSentryResponseBody,
+                sentryResponseStatusCode: sentryResponse.statusCode,
+              };
+
+              listener(Buffer.from(JSON.stringify(data)).toString('base64'));
+            });
+            proxyResponse.end();
+          });
+
+          sentryResponse.addListener('error', err => {
+            throw err;
+          });
+
+          proxyResponse.writeHead(sentryResponse.statusCode || 500, sentryResponse.headers);
+        },
+      );
+
+      sentryRequest.write(Buffer.concat(proxyRequestChunks), 'binary');
+      sentryRequest.end();
+    });
+  });
+
+  const proxyServerStartupPromise = new Promise<void>(resolve => {
+    proxyServer.listen(options.port, () => {
+      resolve();
+    });
+  });
+
+  const eventCallbackServer = http.createServer((eventCallbackRequest, eventCallbackResponse) => {
+    eventCallbackResponse.statusCode = 200;
+    eventCallbackResponse.setHeader('connection', 'keep-alive');
+
+    const callbackListener = (data: string): void => {
+      eventCallbackResponse.write(data.concat('\n'), 'utf8');
+    };
+
+    eventCallbackListeners.add(callbackListener);
+
+    eventCallbackRequest.on('close', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+
+    eventCallbackRequest.on('error', () => {
+      eventCallbackListeners.delete(callbackListener);
+    });
+  });
+
+  const eventCallbackServerStartupPromise = new Promise<void>(resolve => {
+    eventCallbackServer.listen(0, () => {
+      const port = String((eventCallbackServer.address() as AddressInfo).port);
+      void registerCallbackServerPort(options.proxyServerName, port).then(resolve);
+    });
+  });
+
+  await eventCallbackServerStartupPromise;
+  await proxyServerStartupPromise;
+  return;
+}
+
+export async function waitForRequest(
+  proxyServerName: string,
+  callback: (eventData: SentryRequestCallbackData) => Promise<boolean> | boolean,
+): Promise<SentryRequestCallbackData> {
+  const eventCallbackServerPort = await retrieveCallbackServerPort(proxyServerName);
+
+  return new Promise<SentryRequestCallbackData>((resolve, reject) => {
+    const request = http.request(`http://localhost:${eventCallbackServerPort}/`, {}, response => {
+      let eventContents = '';
+
+      response.on('error', err => {
+        reject(err);
+      });
+
+      response.on('data', (chunk: Buffer) => {
+        const chunkString = chunk.toString('utf8');
+        chunkString.split('').forEach(char => {
+          if (char === '\n') {
+            const eventCallbackData: SentryRequestCallbackData = JSON.parse(
+              Buffer.from(eventContents, 'base64').toString('utf8'),
+            );
+            const callbackResult = callback(eventCallbackData);
+            if (typeof callbackResult !== 'boolean') {
+              callbackResult.then(
+                match => {
+                  if (match) {
+                    response.destroy();
+                    resolve(eventCallbackData);
+                  }
+                },
+                err => {
+                  throw err;
+                },
+              );
+            } else if (callbackResult) {
+              response.destroy();
+              resolve(eventCallbackData);
+            }
+            eventContents = '';
+          } else {
+            eventContents = eventContents.concat(char);
+          }
+        });
+      });
+    });
+
+    request.end();
+  });
+}
+
+export function waitForEnvelopeItem(
+  proxyServerName: string,
+  callback: (envelopeItem: EnvelopeItem) => Promise<boolean> | boolean,
+): Promise<EnvelopeItem> {
+  return new Promise((resolve, reject) => {
+    waitForRequest(proxyServerName, async eventData => {
+      const envelopeItems = eventData.envelope[1];
+      for (const envelopeItem of envelopeItems) {
+        if (await callback(envelopeItem)) {
+          resolve(envelopeItem);
+          return true;
+        }
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForError(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'event' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+export function waitForTransaction(
+  proxyServerName: string,
+  callback: (transactionEvent: Event) => Promise<boolean> | boolean,
+): Promise<Event> {
+  return new Promise((resolve, reject) => {
+    waitForEnvelopeItem(proxyServerName, async envelopeItem => {
+      const [envelopeItemHeader, envelopeItemBody] = envelopeItem;
+      if (envelopeItemHeader.type === 'transaction' && (await callback(envelopeItemBody as Event))) {
+        resolve(envelopeItemBody as Event);
+        return true;
+      }
+      return false;
+    }).catch(reject);
+  });
+}
+
+const TEMP_FILE_PREFIX = 'event-proxy-server-';
+
+async function registerCallbackServerPort(serverName: string, port: string): Promise<void> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  await writeFile(tmpFilePath, port, { encoding: 'utf8' });
+}
+
+function retrieveCallbackServerPort(serverName: string): Promise<string> {
+  const tmpFilePath = path.join(os.tmpdir(), `${TEMP_FILE_PREFIX}${serverName}`);
+  return readFile(tmpFilePath, 'utf8');
+}
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/package.json b/dev-packages/e2e-tests/test-applications/node-fastify-app/package.json
similarity index 90%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/package.json
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/package.json
index cfa2c8be0f61..c7ea9cac71ad 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "node-experimental-fastify-app",
+  "name": "node-fastify-app",
   "version": "1.0.0",
   "private": true,
   "scripts": {
@@ -17,7 +17,6 @@
     "@sentry/opentelemetry": "latest || *",
     "@types/node": "18.15.1",
     "fastify": "4.23.2",
-    "fastify-plugin": "4.5.1",
     "typescript": "4.9.5",
     "ts-node": "10.9.1"
   },
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/playwright.config.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/playwright.config.ts
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/playwright.config.ts
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/playwright.config.ts
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js b/dev-packages/e2e-tests/test-applications/node-fastify-app/src/app.js
similarity index 84%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/src/app.js
index 22f17ca4695c..7135fb33d91a 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/app.js
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/src/app.js
@@ -2,21 +2,12 @@ require('./tracing');
 
 const Sentry = require('@sentry/node');
 const { fastify } = require('fastify');
-const fastifyPlugin = require('fastify-plugin');
 const http = require('http');
 
-const FastifySentry = fastifyPlugin(async (fastify, options) => {
-  fastify.decorateRequest('_sentryContext', null);
-
-  fastify.addHook('onError', async (_request, _reply, error) => {
-    Sentry.captureException(error);
-  });
-});
-
 const app = fastify();
 const port = 3030;
 
-app.register(FastifySentry);
+Sentry.setupFastifyErrorHandler(app);
 
 app.get('/test-success', function (req, res) {
   res.send({ version: 'v1' });
@@ -61,6 +52,10 @@ app.get('/test-error', async function (req, res) {
   res.send({ exceptionId });
 });
 
+app.get('/test-exception', async function (req, res) {
+  throw new Error('This is an exception');
+});
+
 app.listen({ port: port });
 
 function makeHttpRequest(url) {
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/tracing.js b/dev-packages/e2e-tests/test-applications/node-fastify-app/src/tracing.js
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/src/tracing.js
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/src/tracing.js
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/start-event-proxy.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts
similarity index 66%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/start-event-proxy.ts
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts
index 7ae352993f3c..2ab9be450dcd 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/start-event-proxy.ts
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/start-event-proxy.ts
@@ -2,5 +2,5 @@ import { startEventProxyServer } from './event-proxy-server';
 
 startEventProxyServer({
   port: 3031,
-  proxyServerName: 'node-experimental-fastify-app',
+  proxyServerName: 'node-fastify-app',
 });
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts
similarity index 54%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts
index 60bef3fb0607..b2ef0649472f 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/errors.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/errors.test.ts
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test';
 import axios, { AxiosError } from 'axios';
+import { waitForError } from '../event-proxy-server';
 
 const authToken = process.env.E2E_TEST_AUTH_TOKEN;
 const sentryTestOrgSlug = process.env.E2E_TEST_SENTRY_ORG_SLUG;
@@ -37,3 +38,35 @@ test('Sends exception to Sentry', async ({ baseURL }) => {
     )
     .toBe(200);
 });
+
+test('Sends correct error event', async ({ baseURL }) => {
+  const errorEventPromise = waitForError('node-fastify-app', event => {
+    return !event.type && event.exception?.values?.[0]?.value === 'This is an exception';
+  });
+
+  try {
+    await axios.get(`${baseURL}/test-exception`);
+  } catch {
+    // this results in an error, but we don't care - we want to check the error event
+  }
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent.exception?.values).toHaveLength(1);
+  expect(errorEvent.exception?.values?.[0]?.value).toBe('This is an exception');
+
+  expect(errorEvent.request).toEqual({
+    method: 'GET',
+    cookies: {},
+    headers: expect.any(Object),
+    url: 'http://localhost:3030/test-exception',
+  });
+
+  expect(errorEvent.transaction).toEqual('GET /test-exception');
+
+  expect(errorEvent.contexts?.trace).toEqual({
+    trace_id: expect.any(String),
+    span_id: expect.any(String),
+    parent_span_id: expect.any(String),
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/propagation.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts
similarity index 94%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/propagation.test.ts
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts
index 0afc4ff09b06..89a6320f725a 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/propagation.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/propagation.test.ts
@@ -4,14 +4,14 @@ import axios from 'axios';
 import { waitForTransaction } from '../event-proxy-server';
 
 test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-experimental-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-inbound-headers'
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-experimental-fastify-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-outgoing-http'
@@ -118,14 +118,14 @@ test('Propagates trace for outgoing http requests', async ({ baseURL }) => {
 });
 
 test('Propagates trace for outgoing fetch requests', async ({ baseURL }) => {
-  const inboundTransactionPromise = waitForTransaction('node-experimental-fastify-app', transactionEvent => {
+  const inboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-inbound-headers'
     );
   });
 
-  const outboundTransactionPromise = waitForTransaction('node-experimental-fastify-app', transactionEvent => {
+  const outboundTransactionPromise = waitForTransaction('node-fastify-app', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-outgoing-fetch'
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts
similarity index 95%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/transactions.test.ts
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts
index 4ff9b5df632c..54f6916de36c 100644
--- a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-fastify-app/tests/transactions.test.ts
@@ -8,7 +8,7 @@ const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
 const EVENT_POLLING_TIMEOUT = 90_000;
 
 test('Sends an API route transaction', async ({ baseURL }) => {
-  const pageloadTransactionEventPromise = waitForTransaction('node-experimental-fastify-app', transactionEvent => {
+  const pageloadTransactionEventPromise = waitForTransaction('node-fastify-app', transactionEvent => {
     return (
       transactionEvent?.contexts?.trace?.op === 'http.server' &&
       transactionEvent?.transaction === 'GET /test-transaction'
@@ -58,13 +58,13 @@ test('Sends an API route transaction', async ({ baseURL }) => {
       spans: [
         {
           data: {
-            'plugin.name': 'fastify -> app-auto-0',
+            'plugin.name': 'fastify -> sentry-fastify-error-handler',
             'fastify.type': 'request_handler',
             'http.route': '/test-transaction',
             'otel.kind': 'INTERNAL',
             'sentry.origin': 'auto.http.otel.fastify',
           },
-          description: 'request handler - fastify -> app-auto-0',
+          description: 'request handler - fastify -> sentry-fastify-error-handler',
           parent_span_id: expect.any(String),
           span_id: expect.any(String),
           start_timestamp: expect.any(Number),
diff --git a/dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tsconfig.json b/dev-packages/e2e-tests/test-applications/node-fastify-app/tsconfig.json
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/node-experimental-fastify-app/tsconfig.json
rename to dev-packages/e2e-tests/test-applications/node-fastify-app/tsconfig.json
diff --git a/dev-packages/e2e-tests/test-applications/node-profiling/index.js b/dev-packages/e2e-tests/test-applications/node-profiling/index.js
index be569e12f921..7fbe23ac7652 100644
--- a/dev-packages/e2e-tests/test-applications/node-profiling/index.js
+++ b/dev-packages/e2e-tests/test-applications/node-profiling/index.js
@@ -1,11 +1,11 @@
 const Sentry = require('@sentry/node');
-const Profiling = require('@sentry/profiling-node');
+const { nodeProfilingIntegration } = require('@sentry/profiling-node');
 
 const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
 
 Sentry.init({
   dsn: 'https://7fa19397baaf433f919fbe02228d5470@o1137848.ingest.sentry.io/6625302',
-  integrations: [new Profiling.ProfilingIntegration()],
+  integrations: [nodeProfilingIntegration()],
   tracesSampleRate: 1.0,
   profilesSampleRate: 1.0,
 });
diff --git a/dev-packages/e2e-tests/test-applications/react-create-hash-router/src/index.tsx b/dev-packages/e2e-tests/test-applications/react-create-hash-router/src/index.tsx
index 73c5e024539f..579b6f8e1cfd 100644
--- a/dev-packages/e2e-tests/test-applications/react-create-hash-router/src/index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-create-hash-router/src/index.tsx
@@ -12,7 +12,7 @@ import {
 import Index from './pages/Index';
 import User from './pages/User';
 
-const replay = new Sentry.Replay();
+const replay = Sentry.replayIntegration();
 
 Sentry.init({
   // environment: 'qa', // dynamic sampling bias to keep transactions
diff --git a/dev-packages/e2e-tests/test-applications/react-create-hash-router/tsconfig.json b/dev-packages/e2e-tests/test-applications/react-create-hash-router/tsconfig.json
index c8df41dcf4b5..75ae036f46b0 100644
--- a/dev-packages/e2e-tests/test-applications/react-create-hash-router/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/react-create-hash-router/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx b/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx
index b8a036fc5340..bf68d694d0f7 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/src/index.tsx
@@ -12,7 +12,7 @@ import {
 import Index from './pages/Index';
 import User from './pages/User';
 
-const replay = new Sentry.Replay();
+const replay = Sentry.replayIntegration();
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
diff --git a/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tsconfig.json b/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tsconfig.json
index c8df41dcf4b5..75ae036f46b0 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/react-router-6-use-routes/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.gitignore b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.gitignore
deleted file mode 100644
index 84634c973eeb..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.gitignore
+++ /dev/null
@@ -1,29 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-/test-results/
-/playwright-report/
-/playwright/.cache/
-
-!*.d.ts
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.npmrc b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.npmrc
deleted file mode 100644
index 070f80f05092..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/.npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-@sentry:registry=http://127.0.0.1:4873
-@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json
deleted file mode 100644
index cde5ad8225ee..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/package.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "name": "standard-frontend-react-tracing-import-test",
-  "version": "0.1.0",
-  "private": true,
-  "dependencies": {
-    "@sentry/react": "latest || *",
-    "@testing-library/jest-dom": "5.14.1",
-    "@testing-library/react": "13.0.0",
-    "@testing-library/user-event": "13.2.1",
-    "@types/jest": "27.0.1",
-    "@types/node": "16.7.13",
-    "@types/react": "18.0.0",
-    "@types/react-dom": "18.0.0",
-    "react": "18.2.0",
-    "react-dom": "18.2.0",
-    "react-router-dom": "^6.4.1",
-    "react-scripts": "5.0.1",
-    "typescript": "4.9.5",
-    "web-vitals": "2.1.0"
-  },
-  "scripts": {
-    "build": "react-scripts build",
-    "start": "serve -s build",
-    "test": "playwright test",
-    "clean": "npx rimraf node_modules,pnpm-lock.yaml",
-    "test:build": "pnpm install && npx playwright install && pnpm build",
-    "test:assert": "pnpm test"
-  },
-  "eslintConfig": {
-    "extends": [
-      "react-app",
-      "react-app/jest"
-    ]
-  },
-  "browserslist": {
-    "production": [
-      ">0.2%",
-      "not dead",
-      "not op_mini all"
-    ],
-    "development": [
-      "last 1 chrome version",
-      "last 1 firefox version",
-      "last 1 safari version"
-    ]
-  },
-  "devDependencies": {
-    "@playwright/test": "1.26.1",
-    "axios": "1.6.0",
-    "serve": "14.0.1"
-  },
-  "volta": {
-    "extends": "../../package.json"
-  }
-}
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
deleted file mode 100644
index 5f93f826ebf0..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/playwright.config.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { PlaywrightTestConfig } from '@playwright/test';
-import { devices } from '@playwright/test';
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-const config: PlaywrightTestConfig = {
-  testDir: './tests',
-  /* Maximum time one test can run for. */
-  timeout: 150_000,
-  expect: {
-    /**
-     * Maximum time expect() should wait for the condition to be met.
-     * For example in `await expect(locator).toHaveText();`
-     */
-    timeout: 5000,
-  },
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: 0,
-  /* Opt out of parallel tests on CI. */
-  workers: 1,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'list',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Maximum time each action such as `click()` can take. Defaults to 0 (no limit). */
-    actionTimeout: 0,
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-      },
-    },
-    // For now we only test Chrome!
-    // {
-    //   name: 'firefox',
-    //   use: {
-    //     ...devices['Desktop Firefox'],
-    //   },
-    // },
-    // {
-    //   name: 'webkit',
-    //   use: {
-    //     ...devices['Desktop Safari'],
-    //   },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  webServer: {
-    command: 'pnpm start',
-    port: 3030,
-    env: {
-      PORT: '3030',
-    },
-  },
-};
-
-export default config;
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/public/index.html b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/public/index.html
deleted file mode 100644
index 39da76522bea..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/public/index.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
-    <title>React App</title>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/globals.d.ts b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/globals.d.ts
deleted file mode 100644
index 109dbcd55648..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/globals.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Window {
-  recordedTransactions?: string[];
-  capturedExceptionId?: string;
-}
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/index.tsx b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/index.tsx
deleted file mode 100644
index 319290d010ce..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/index.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import * as Sentry from '@sentry/react';
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import {
-  BrowserRouter,
-  Route,
-  Routes,
-  createRoutesFromChildren,
-  matchRoutes,
-  useLocation,
-  useNavigationType,
-} from 'react-router-dom';
-import Index from './pages/Index';
-import User from './pages/User';
-
-Sentry.init({
-  environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.REACT_APP_E2E_TEST_DSN,
-  integrations: [
-    Sentry.reactRouterV6BrowserTracingIntegration({
-      useEffect: React.useEffect,
-      useLocation,
-      useNavigationType,
-      createRoutesFromChildren,
-      matchRoutes,
-    }),
-  ],
-  // We recommend adjusting this value in production, or using tracesSampler
-  // for finer control
-  tracesSampleRate: 1.0,
-  release: 'e2e-test',
-});
-
-Sentry.addEventProcessor(event => {
-  if (
-    event.type === 'transaction' &&
-    (event.contexts?.trace?.op === 'pageload' || event.contexts?.trace?.op === 'navigation')
-  ) {
-    const eventId = event.event_id;
-    if (eventId) {
-      window.recordedTransactions = window.recordedTransactions || [];
-      window.recordedTransactions.push(eventId);
-    }
-  }
-
-  return event;
-});
-
-const SentryRoutes = Sentry.withSentryReactRouterV6Routing(Routes);
-
-const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement);
-root.render(
-  <BrowserRouter>
-    <SentryRoutes>
-      <Route path="/" element={<Index />} />
-      <Route path="/user/:id" element={<User />} />
-    </SentryRoutes>
-  </BrowserRouter>,
-);
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/Index.tsx b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/Index.tsx
deleted file mode 100644
index 7789a2773224..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/Index.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as Sentry from '@sentry/react';
-// biome-ignore lint/nursery/noUnusedImports: Need React import for JSX
-import * as React from 'react';
-import { Link } from 'react-router-dom';
-
-const Index = () => {
-  return (
-    <>
-      <input
-        type="button"
-        value="Capture Exception"
-        id="exception-button"
-        onClick={() => {
-          const eventId = Sentry.captureException(new Error('I am an error!'));
-          window.capturedExceptionId = eventId;
-        }}
-      />
-      <Link to="/user/5" id="navigation">
-        navigate
-      </Link>
-    </>
-  );
-};
-
-export default Index;
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/User.tsx b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/User.tsx
deleted file mode 100644
index 62f0c2d17533..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/pages/User.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-// biome-ignore lint/nursery/noUnusedImports: Need React import for JSX
-import * as React from 'react';
-
-const User = () => {
-  return <p>I am a blank page :)</p>;
-};
-
-export default User;
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/react-app-env.d.ts b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/react-app-env.d.ts
deleted file mode 100644
index 6431bc5fc6b2..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/src/react-app-env.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-/// <reference types="react-scripts" />
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tests/behaviour-test.spec.ts b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tests/behaviour-test.spec.ts
deleted file mode 100644
index 2e68363ab61a..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tests/behaviour-test.spec.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-import { expect, test } from '@playwright/test';
-import axios, { AxiosError } from 'axios';
-
-const EVENT_POLLING_TIMEOUT = 90_000;
-
-const authToken = process.env.E2E_TEST_AUTH_TOKEN;
-const sentryTestOrgSlug = process.env.E2E_TEST_SENTRY_ORG_SLUG;
-const sentryTestProject = process.env.E2E_TEST_SENTRY_TEST_PROJECT;
-
-test('Sends a pageload transaction to Sentry', async ({ page }) => {
-  await page.goto('/');
-
-  const recordedTransactionsHandle = await page.waitForFunction(() => {
-    if (window.recordedTransactions && window.recordedTransactions?.length >= 1) {
-      return window.recordedTransactions;
-    } else {
-      return undefined;
-    }
-  });
-  const recordedTransactionEventIds = await recordedTransactionsHandle.jsonValue();
-
-  if (recordedTransactionEventIds === undefined) {
-    throw new Error("Application didn't record any transaction event IDs.");
-  }
-
-  let hadPageLoadTransaction = false;
-
-  console.log(`Polling for transaction eventIds: ${JSON.stringify(recordedTransactionEventIds)}`);
-
-  await Promise.all(
-    recordedTransactionEventIds.map(async transactionEventId => {
-      await expect
-        .poll(
-          async () => {
-            try {
-              const response = await axios.get(
-                `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${transactionEventId}/`,
-                { headers: { Authorization: `Bearer ${authToken}` } },
-              );
-
-              if (response.data.contexts.trace.op === 'pageload') {
-                hadPageLoadTransaction = true;
-              }
-
-              return response.status;
-            } catch (e) {
-              if (e instanceof AxiosError && e.response) {
-                if (e.response.status !== 404) {
-                  throw e;
-                } else {
-                  return e.response.status;
-                }
-              } else {
-                throw e;
-              }
-            }
-          },
-          {
-            timeout: EVENT_POLLING_TIMEOUT,
-          },
-        )
-        .toBe(200);
-    }),
-  );
-
-  expect(hadPageLoadTransaction).toBe(true);
-});
-
-test('Sends a navigation transaction to Sentry', async ({ page }) => {
-  await page.goto('/');
-
-  // Give pageload transaction time to finish
-  page.waitForTimeout(4000);
-
-  const linkElement = page.locator('id=navigation');
-  await linkElement.click();
-
-  const recordedTransactionsHandle = await page.waitForFunction(() => {
-    if (window.recordedTransactions && window.recordedTransactions?.length >= 2) {
-      return window.recordedTransactions;
-    } else {
-      return undefined;
-    }
-  });
-  const recordedTransactionEventIds = await recordedTransactionsHandle.jsonValue();
-
-  if (recordedTransactionEventIds === undefined) {
-    throw new Error("Application didn't record any transaction event IDs.");
-  }
-
-  let hadPageNavigationTransaction = false;
-
-  console.log(`Polling for transaction eventIds: ${JSON.stringify(recordedTransactionEventIds)}`);
-
-  await Promise.all(
-    recordedTransactionEventIds.map(async transactionEventId => {
-      await expect
-        .poll(
-          async () => {
-            try {
-              const response = await axios.get(
-                `https://sentry.io/api/0/projects/${sentryTestOrgSlug}/${sentryTestProject}/events/${transactionEventId}/`,
-                { headers: { Authorization: `Bearer ${authToken}` } },
-              );
-
-              if (response.data.contexts.trace.op === 'navigation') {
-                hadPageNavigationTransaction = true;
-              }
-
-              return response.status;
-            } catch (e) {
-              if (e instanceof AxiosError && e.response) {
-                if (e.response.status !== 404) {
-                  throw e;
-                } else {
-                  return e.response.status;
-                }
-              } else {
-                throw e;
-              }
-            }
-          },
-          {
-            timeout: EVENT_POLLING_TIMEOUT,
-          },
-        )
-        .toBe(200);
-    }),
-  );
-
-  expect(hadPageNavigationTransaction).toBe(true);
-});
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tsconfig.json b/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tsconfig.json
deleted file mode 100644
index c8df41dcf4b5..000000000000
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react-tracing-import/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "noFallthroughCasesInSwitch": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react"
-  },
-  "include": ["src", "tests"]
-}
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx b/dev-packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx
index 8cf0e8462e16..3a87a53ffdfa 100644
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx
+++ b/dev-packages/e2e-tests/test-applications/standard-frontend-react/src/index.tsx
@@ -13,7 +13,7 @@ import {
 import Index from './pages/Index';
 import User from './pages/User';
 
-const replay = new Sentry.Replay();
+const replay = Sentry.replayIntegration();
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
diff --git a/dev-packages/e2e-tests/test-applications/standard-frontend-react/tsconfig.json b/dev-packages/e2e-tests/test-applications/standard-frontend-react/tsconfig.json
index c8df41dcf4b5..75ae036f46b0 100644
--- a/dev-packages/e2e-tests/test-applications/standard-frontend-react/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/standard-frontend-react/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2017",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts
index 972ee59955dd..5240489b0934 100644
--- a/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts
+++ b/dev-packages/e2e-tests/test-applications/sveltekit-2/test/errors.server.test.ts
@@ -60,6 +60,7 @@ test.describe('server-side errors', () => {
       }),
     );
 
-    expect(errorEvent.transaction).toEqual('GET /server-route-error');
+    // TODO: Uncomment once we update the scope transaction name on the server side
+    // expect(errorEvent.transaction).toEqual('GET /server-route-error');
   });
 });
diff --git a/dev-packages/e2e-tests/test-applications/sveltekit/test/errors.server.test.ts b/dev-packages/e2e-tests/test-applications/sveltekit/test/errors.server.test.ts
index f2b7d2d21531..c36d44c80068 100644
--- a/dev-packages/e2e-tests/test-applications/sveltekit/test/errors.server.test.ts
+++ b/dev-packages/e2e-tests/test-applications/sveltekit/test/errors.server.test.ts
@@ -63,6 +63,7 @@ test.describe('server-side errors', () => {
       }),
     );
 
-    expect(errorEvent.transaction).toEqual('GET /server-route-error');
+    // TODO: Uncomment once we update the scope transaction name on the server side
+    // expect(errorEvent.transaction).toEqual('GET /server-route-error');
   });
 });
diff --git a/dev-packages/e2e-tests/tracing-shim-esm/index.cjs b/dev-packages/e2e-tests/tracing-shim-esm/index.cjs
deleted file mode 100644
index e245f86e5c40..000000000000
--- a/dev-packages/e2e-tests/tracing-shim-esm/index.cjs
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO(v8): Remove this file once we get rid of tracing dependency from sveltekit vite plugin
-// This file is used as a shim for @sentry/tracing
-module.exports = {};
diff --git a/dev-packages/e2e-tests/tracing-shim-esm/index.mjs b/dev-packages/e2e-tests/tracing-shim-esm/index.mjs
deleted file mode 100644
index 5ba2afe713b3..000000000000
--- a/dev-packages/e2e-tests/tracing-shim-esm/index.mjs
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO(v8): Remove this file once we get rid of tracing dependency from sveltekit vite plugin
-// This file is used as a shim for @sentry/tracing
-export {};
diff --git a/dev-packages/e2e-tests/tracing-shim-esm/package.json b/dev-packages/e2e-tests/tracing-shim-esm/package.json
deleted file mode 100644
index 577f7e2cef51..000000000000
--- a/dev-packages/e2e-tests/tracing-shim-esm/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "tracing-shim-esm",
-  "version": "0.0.1",
-  "private": true,
-  "main": "index.cjs",
-  "module": "index.mjs",
-  "scripts": {},
-  "dependencies": {},
-  "devDependencies": {}
-}
diff --git a/dev-packages/e2e-tests/tracing-shim/index.js b/dev-packages/e2e-tests/tracing-shim/index.js
deleted file mode 100644
index e245f86e5c40..000000000000
--- a/dev-packages/e2e-tests/tracing-shim/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// TODO(v8): Remove this file once we get rid of tracing dependency from sveltekit vite plugin
-// This file is used as a shim for @sentry/tracing
-module.exports = {};
diff --git a/dev-packages/e2e-tests/tracing-shim/package.json b/dev-packages/e2e-tests/tracing-shim/package.json
deleted file mode 100644
index 0ee353b22b5b..000000000000
--- a/dev-packages/e2e-tests/tracing-shim/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "tracing-shim",
-  "version": "0.0.1",
-  "private": true,
-  "main": "index.js",
-  "scripts": {},
-  "dependencies": {},
-  "devDependencies": {}
-}
diff --git a/dev-packages/e2e-tests/verdaccio-config/config.yaml b/dev-packages/e2e-tests/verdaccio-config/config.yaml
index c99f9def69e4..851c99387b8c 100644
--- a/dev-packages/e2e-tests/verdaccio-config/config.yaml
+++ b/dev-packages/e2e-tests/verdaccio-config/config.yaml
@@ -134,7 +134,13 @@ packages:
     unpublish: $all
     # proxy: npmjs # Don't proxy for E2E tests!
 
-  '@sentry/serverless':
+  '@sentry/aws-serverless':
+    access: $all
+    publish: $all
+    unpublish: $all
+    # proxy: npmjs # Don't proxy for E2E tests!
+
+  '@sentry/google-cloud-serverless':
     access: $all
     publish: $all
     unpublish: $all
diff --git a/dev-packages/node-integration-tests/README.md b/dev-packages/node-integration-tests/README.md
index ec202b5a8252..35b3c10883b7 100644
--- a/dev-packages/node-integration-tests/README.md
+++ b/dev-packages/node-integration-tests/README.md
@@ -19,25 +19,37 @@ utils/
       |---- server.ts [default Express server configuration]
 ```
 
-The tests are grouped by their scopes, such as `public-api` or `tracing`. In every group of tests, there are multiple folders containing test scenarios and assertions.
+The tests are grouped by their scopes, such as `public-api` or `tracing`. In every group of tests, there are multiple
+folders containing test scenarios and assertions.
 
-Tests run on Express servers (a server instance per test). By default, a simple server template inside `utils/defaults/server.ts` is used. Every server instance runs on a different port.
+Tests run on Express servers (a server instance per test). By default, a simple server template inside
+`utils/defaults/server.ts` is used. Every server instance runs on a different port.
 
-A custom server configuration can be used, supplying a script that exports a valid express server instance as default. `runServer` utility function accepts an optional `serverPath` argument for this purpose.
+A custom server configuration can be used, supplying a script that exports a valid express server instance as default.
+`runServer` utility function accepts an optional `serverPath` argument for this purpose.
 
-`scenario.ts` contains the initialization logic and the test subject. By default, `{TEST_DIR}/scenario.ts` is used, but `runServer` also accepts an optional `scenarioPath` argument for non-standard usage.
+`scenario.ts` contains the initialization logic and the test subject. By default, `{TEST_DIR}/scenario.ts` is used, but
+`runServer` also accepts an optional `scenarioPath` argument for non-standard usage.
 
-`test.ts` is required for each test case, and contains the server runner logic, request interceptors for Sentry requests, and assertions. Test server, interceptors and assertions are all run on the same Jest thread.
+`test.ts` is required for each test case, and contains the server runner logic, request interceptors for Sentry
+requests, and assertions. Test server, interceptors and assertions are all run on the same Jest thread.
 
 ### Utilities
 
 `utils/` contains helpers and Sentry-specific assertions that can be used in (`test.ts`).
 
-`TestEnv` class contains methods to create and execute requests on a test server instance. `TestEnv.init()` which starts a test server and returns a `TestEnv` instance must be called by each test. The test server is automatically shut down after each test, if a data collection helper method such as `getEnvelopeRequest` and `getAPIResponse` is used. Tests that do not use those helper methods will need to end the server manually.
+`TestEnv` class contains methods to create and execute requests on a test server instance. `TestEnv.init()` which starts
+a test server and returns a `TestEnv` instance must be called by each test. The test server is automatically shut down
+after each test, if a data collection helper method such as `getEnvelopeRequest` and `getAPIResponse` is used. Tests
+that do not use those helper methods will need to end the server manually.
 
-`TestEnv` instance has two public properties: `url` and `server`. The `url` property is the base URL for the server. The `http.Server` instance is used to finish the server eventually.
+`TestEnv` instance has two public properties: `url` and `server`. The `url` property is the base URL for the server. The
+`http.Server` instance is used to finish the server eventually.
 
-Nock interceptors are internally used to capture envelope requests by `getEnvelopeRequest` and `getMultipleEnvelopeRequest` helpers. After capturing required requests, the interceptors are removed. Nock can manually be used inside the test cases to intercept requests but should be removed before the test ends, as not to cause flakiness.
+Nock interceptors are internally used to capture envelope requests by `getEnvelopeRequest` and
+`getMultipleEnvelopeRequest` helpers. After capturing required requests, the interceptors are removed. Nock can manually
+be used inside the test cases to intercept requests but should be removed before the test ends, as not to cause
+flakiness.
 
 ## Running Tests Locally
 
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index aaf7d46fba5f..1b16797f102d 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -3,7 +3,7 @@
   "version": "8.0.0-alpha.2",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "private": true,
   "main": "build/cjs/index.js",
diff --git a/dev-packages/overhead-metrics/.eslintrc.cjs b/dev-packages/overhead-metrics/.eslintrc.cjs
index a4f2d4fdd936..3eed32128e5c 100644
--- a/dev-packages/overhead-metrics/.eslintrc.cjs
+++ b/dev-packages/overhead-metrics/.eslintrc.cjs
@@ -9,7 +9,6 @@ module.exports = {
         '@typescript-eslint/no-non-null-assertion': 'off',
         '@sentry-internal/sdk/no-optional-chaining': 'off',
         '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
         '@sentry-internal/sdk/no-class-field-initializers': 'off',
         'jsdoc/require-jsdoc': 'off',
       },
diff --git a/dev-packages/overhead-metrics/README.md b/dev-packages/overhead-metrics/README.md
index d7aa5fab0534..51e7d2587ac0 100644
--- a/dev-packages/overhead-metrics/README.md
+++ b/dev-packages/overhead-metrics/README.md
@@ -1,11 +1,13 @@
 # Overhead performance metrics
 
-Evaluates Sentry & Replay impact on website performance by running a web app in Chromium via Playwright and collecting various metrics.
+Evaluates Sentry & Replay impact on website performance by running a web app in Chromium via Playwright and collecting
+various metrics.
 
-The general idea is to run a web app without Sentry, and then run the same app again with Sentry and another one with Sentry+Replay included.
-For the three scenarios, we collect some metrics (CPU, memory, vitals) and later compare them and post as a comment in a PR.
-Changes in the metrics, compared to previous runs from the main branch, should be evaluated on case-by-case basis when preparing and reviewing the PR.
+The general idea is to run a web app without Sentry, and then run the same app again with Sentry and another one with
+Sentry+Replay included. For the three scenarios, we collect some metrics (CPU, memory, vitals) and later compare them
+and post as a comment in a PR. Changes in the metrics, compared to previous runs from the main branch, should be
+evaluated on case-by-case basis when preparing and reviewing the PR.
 
 ## Resources
 
-* https://github.com/addyosmani/puppeteer-webperf
+- https://github.com/addyosmani/puppeteer-webperf
diff --git a/dev-packages/overhead-metrics/configs/README.md b/dev-packages/overhead-metrics/configs/README.md
index cb9724ba4619..ceb96835f975 100644
--- a/dev-packages/overhead-metrics/configs/README.md
+++ b/dev-packages/overhead-metrics/configs/README.md
@@ -1,4 +1,4 @@
 # Replay metrics configuration & entrypoints (scripts)
 
-* [dev](dev) contains scripts launched during local development
-* [ci](ci) contains scripts launched in CI
+- [dev](dev) contains scripts launched during local development
+- [ci](ci) contains scripts launched in CI
diff --git a/dev-packages/overhead-metrics/test-apps/booking-app/with-replay.html b/dev-packages/overhead-metrics/test-apps/booking-app/with-replay.html
index 21f19f6260be..ae99a6171f0c 100644
--- a/dev-packages/overhead-metrics/test-apps/booking-app/with-replay.html
+++ b/dev-packages/overhead-metrics/test-apps/booking-app/with-replay.html
@@ -224,7 +224,7 @@ <h1>This is a test app.</h1>
         enableTracing: true,
         integrations: [
           Sentry.browserTracingIntegration(),
-          new Sentry.Integrations.Replay({
+          Sentry.replayIntegration({
             useCompression: true,
             flushMinDelay: 2000,
             flushMaxDelay: 2000,
diff --git a/dev-packages/overhead-metrics/test-apps/jank/README.md b/dev-packages/overhead-metrics/test-apps/jank/README.md
index 3e0f46b66a1e..beb81a4eadd2 100644
--- a/dev-packages/overhead-metrics/test-apps/jank/README.md
+++ b/dev-packages/overhead-metrics/test-apps/jank/README.md
@@ -1,4 +1,6 @@
 # Chrome DevTools Jank article sample code
 
-* Originally coming from [devtools-samples](https://github.com/GoogleChrome/devtools-samples/tree/4818abc9dbcdb954d0eb9b70879f4ea18756451f/jank), licensed under Apache 2.0.
-* Linking article: <https://developer.chrome.com/docs/devtools/evaluate-performance/#get-started>
+- Originally coming from
+  [devtools-samples](https://github.com/GoogleChrome/devtools-samples/tree/4818abc9dbcdb954d0eb9b70879f4ea18756451f/jank),
+  licensed under Apache 2.0.
+- Linking article: <https://developer.chrome.com/docs/devtools/evaluate-performance/#get-started>
diff --git a/dev-packages/overhead-metrics/test-apps/jank/with-replay.html b/dev-packages/overhead-metrics/test-apps/jank/with-replay.html
index 16e1a6a6ea47..6c5f32cc7e8d 100644
--- a/dev-packages/overhead-metrics/test-apps/jank/with-replay.html
+++ b/dev-packages/overhead-metrics/test-apps/jank/with-replay.html
@@ -31,7 +31,7 @@
         dsn: 'https://d16ae2d36f9249849c7964e9a3a8a608@o447951.ingest.sentry.io/5429213',
         replaysSessionSampleRate: 1.0,
         replaysOnErrorSampleRate: 1.0,
-        integrations: [new Sentry.Integrations.Replay({})],
+        integrations: [Sentry.replayIntegration({})],
       });
     </script>
   </head>
diff --git a/dev-packages/rollup-utils/README.md b/dev-packages/rollup-utils/README.md
index 2d79f3eabeec..ff38b562ced2 100644
--- a/dev-packages/rollup-utils/README.md
+++ b/dev-packages/rollup-utils/README.md
@@ -1,5 +1,7 @@
 # The `rollup-utils` Package
 
-This is a small utility packages for all the Rollup configurations we have in this project. It contains helpers to create standardized configs, custom rollup plugins, and other things that might have to do with the build process like polyfill snippets.
+This is a small utility packages for all the Rollup configurations we have in this project. It contains helpers to
+create standardized configs, custom rollup plugins, and other things that might have to do with the build process like
+polyfill snippets.
 
 This package will not be published and is only intended to be used inside this repository.
diff --git a/dev-packages/rollup-utils/bundleHelpers.mjs b/dev-packages/rollup-utils/bundleHelpers.mjs
index 6043207ee97c..ae6574c0b0bc 100644
--- a/dev-packages/rollup-utils/bundleHelpers.mjs
+++ b/dev-packages/rollup-utils/bundleHelpers.mjs
@@ -7,17 +7,16 @@ import { builtinModules } from 'module';
 import deepMerge from 'deepmerge';
 
 import {
-  getEs5Polyfills,
   makeBrowserBuildPlugin,
   makeCleanupPlugin,
   makeCommonJSPlugin,
   makeIsDebugBuildPlugin,
+  makeJsonPlugin,
   makeLicensePlugin,
   makeNodeResolvePlugin,
   makeRrwebBuildPlugin,
   makeSetSDKSourcePlugin,
   makeSucrasePlugin,
-  makeTSPlugin,
   makeTerserPlugin,
 } from './plugins/index.mjs';
 import { mergePlugins } from './utils.mjs';
@@ -25,16 +24,13 @@ import { mergePlugins } from './utils.mjs';
 const BUNDLE_VARIANTS = ['.js', '.min.js', '.debug.min.js'];
 
 export function makeBaseBundleConfig(options) {
-  const { bundleType, entrypoints, jsVersion, licenseTitle, outputFileBase, packageSpecificConfig } = options;
-
-  const isEs5 = jsVersion.toLowerCase() === 'es5';
+  const { bundleType, entrypoints, licenseTitle, outputFileBase, packageSpecificConfig, sucrase } = options;
 
   const nodeResolvePlugin = makeNodeResolvePlugin();
-  const sucrasePlugin = makeSucrasePlugin();
+  const sucrasePlugin = makeSucrasePlugin(sucrase);
   const cleanupPlugin = makeCleanupPlugin();
   const markAsBrowserBuildPlugin = makeBrowserBuildPlugin(true);
   const licensePlugin = makeLicensePlugin(licenseTitle);
-  const tsPlugin = makeTSPlugin('es5');
   const rrwebBuildPlugin = makeRrwebBuildPlugin({
     excludeIframe: false,
     excludeShadowDom: false,
@@ -45,15 +41,13 @@ export function makeBaseBundleConfig(options) {
   // at all, and without `transformMixedEsModules`, they're only included if they're imported, not if they're required.)
   const commonJSPlugin = makeCommonJSPlugin({ transformMixedEsModules: true });
 
+  const jsonPlugin = makeJsonPlugin();
+
   // used by `@sentry/browser`
   const standAloneBundleConfig = {
     output: {
       format: 'iife',
       name: 'Sentry',
-      outro: () => {
-        // Add polyfills for ES6 array/string methods at the end of the bundle
-        return isEs5 ? getEs5Polyfills() : '';
-      },
     },
     context: 'window',
     plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin],
@@ -93,12 +87,12 @@ export function makeBaseBundleConfig(options) {
     plugins: [rrwebBuildPlugin, markAsBrowserBuildPlugin],
   };
 
-  // used by `@sentry/serverless`, when creating the lambda layer
+  // used by `@sentry/aws-serverless`, when creating the lambda layer
   const nodeBundleConfig = {
     output: {
       format: 'cjs',
     },
-    plugins: [commonJSPlugin],
+    plugins: [jsonPlugin, commonJSPlugin],
     // Don't bundle any of Node's core modules
     external: builtinModules,
   };
@@ -123,9 +117,7 @@ export function makeBaseBundleConfig(options) {
       strict: false,
       esModule: false,
     },
-    plugins: isEs5
-      ? [tsPlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin]
-      : [sucrasePlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
+    plugins: [sucrasePlugin, nodeResolvePlugin, cleanupPlugin, licensePlugin],
     treeshake: 'smallest',
   };
 
diff --git a/dev-packages/rollup-utils/npmHelpers.mjs b/dev-packages/rollup-utils/npmHelpers.mjs
index 6085a502200f..58bb4d75edf7 100644
--- a/dev-packages/rollup-utils/npmHelpers.mjs
+++ b/dev-packages/rollup-utils/npmHelpers.mjs
@@ -17,6 +17,7 @@ import {
   makeSetSDKSourcePlugin,
   makeSucrasePlugin,
 } from './plugins/index.mjs';
+import { makePackageNodeEsm } from './plugins/make-esm-plugin.mjs';
 import { mergePlugins } from './utils.mjs';
 
 const packageDotJSON = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), './package.json'), { encoding: 'utf8' }));
@@ -28,10 +29,11 @@ export function makeBaseNPMConfig(options = {}) {
     hasBundles = false,
     packageSpecificConfig = {},
     addPolyfills = true,
+    sucrase = {},
   } = options;
 
   const nodeResolvePlugin = makeNodeResolvePlugin();
-  const sucrasePlugin = makeSucrasePlugin({ disableESTransforms: !addPolyfills });
+  const sucrasePlugin = makeSucrasePlugin({ disableESTransforms: !addPolyfills, ...sucrase });
   const debugBuildStatementReplacePlugin = makeDebugBuildStatementReplacePlugin();
   const cleanupPlugin = makeCleanupPlugin();
   const extractPolyfillsPlugin = makeExtractPolyfillsPlugin();
@@ -50,6 +52,10 @@ export function makeBaseNPMConfig(options = {}) {
 
       sourcemap: true,
 
+      // Include __esModule property when generating exports
+      // Before the upgrade to Rollup 4 this was included by default and when it was gone it broke tests
+      esModule: true,
+
       // output individual files rather than one big bundle
       preserveModules: true,
 
@@ -104,6 +110,7 @@ export function makeBaseNPMConfig(options = {}) {
       ...builtinModules,
       ...Object.keys(packageDotJSON.dependencies || {}),
       ...Object.keys(packageDotJSON.peerDependencies || {}),
+      ...Object.keys(packageDotJSON.optionalDependencies || {}),
     ],
   };
 
@@ -117,11 +124,16 @@ export function makeBaseNPMConfig(options = {}) {
   });
 }
 
-export function makeNPMConfigVariants(baseConfig) {
-  const variantSpecificConfigs = [
-    { output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } },
-    { output: { format: 'esm', dir: path.join(baseConfig.output.dir, 'esm') } },
-  ];
+export function makeNPMConfigVariants(baseConfig, options = {}) {
+  const { emitEsm = true } = options;
+
+  const variantSpecificConfigs = [{ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } }];
+
+  if (emitEsm) {
+    variantSpecificConfigs.push({
+      output: { format: 'esm', dir: path.join(baseConfig.output.dir, 'esm'), plugins: [makePackageNodeEsm()] },
+    });
+  }
 
   return variantSpecificConfigs.map(variant => deepMerge(baseConfig, variant));
 }
diff --git a/dev-packages/rollup-utils/plugins/bundlePlugins.mjs b/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
index 1df1e2ac917d..80dbc4422ea4 100644
--- a/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
+++ b/dev-packages/rollup-utils/plugins/bundlePlugins.mjs
@@ -9,17 +9,12 @@
  */
 
 import * as childProcess from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
-import { fileURLToPath } from 'url';
 
 import commonjs from '@rollup/plugin-commonjs';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import replace from '@rollup/plugin-replace';
-import typescript from '@rollup/plugin-typescript';
-import deepMerge from 'deepmerge';
+import terser from '@rollup/plugin-terser';
 import license from 'rollup-plugin-license';
-import { terser } from 'rollup-plugin-terser';
 
 /**
  * Create a plugin to add an identification banner to the top of stand-alone bundles.
@@ -43,10 +38,6 @@ export function makeLicensePlugin(title) {
   return plugin;
 }
 
-export function getEs5Polyfills() {
-  return fs.readFileSync(path.join(path.dirname(fileURLToPath(import.meta.url)), '../polyfills/es5.js'), 'utf-8');
-}
-
 /**
  * Create a plugin to set the value of the `__SENTRY_DEBUG__` magic string.
  *
@@ -133,6 +124,9 @@ export function makeTerserPlugin() {
           // For v7 backwards-compatibility we need to access txn._frozenDynamicSamplingContext
           // TODO (v8): Remove this reserved word
           '_frozenDynamicSamplingContext',
+          // These are used to keep span relationships
+          '_sentryRootSpan',
+          '_sentryChildSpans',
         ],
       },
     },
@@ -142,45 +136,6 @@ export function makeTerserPlugin() {
   });
 }
 
-/**
- * Create a TypeScript plugin, which will down-compile if necessary, based on the given JS version.
- *
- * @param jsVersion Either `es5` or `es6`
- * @returns An instance of the `typescript` plugin
- */
-export function makeTSPlugin(jsVersion) {
-  const baseTSPluginOptions = {
-    tsconfig: 'tsconfig.json',
-    compilerOptions: {
-      declaration: false,
-      declarationMap: false,
-      paths: {
-        '@sentry/browser': ['../browser/src'],
-        '@sentry/core': ['../core/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)'],
-  };
-
-  const plugin = typescript(
-    deepMerge(baseTSPluginOptions, {
-      compilerOptions: {
-        target: jsVersion,
-      },
-    }),
-  );
-
-  // give it a nicer name for later, when we'll need to sort the plugins
-  plugin.name = 'typescript';
-
-  return plugin;
-}
-
 // We don't pass these plugins any options which need to be calculated or changed by us, so no need to wrap them in
 // another factory function, as they are themselves already factory functions.
 
diff --git a/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs b/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs
new file mode 100644
index 000000000000..aa3f272ba2e0
--- /dev/null
+++ b/dev-packages/rollup-utils/plugins/make-esm-plugin.mjs
@@ -0,0 +1,16 @@
+/**
+ * Outputs a package.json file with {type: module} in the root of the output directory so that Node
+ * treats .js files as ESM.
+ */
+export function makePackageNodeEsm() {
+  return {
+    name: 'make-package-node-esm',
+    generateBundle() {
+      this.emitFile({
+        type: 'asset',
+        fileName: 'package.json',
+        source: '{ "type": "module" }',
+      });
+    },
+  };
+}
diff --git a/dev-packages/rollup-utils/plugins/npmPlugins.mjs b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
index 507480c1dd43..7138964a919b 100644
--- a/dev-packages/rollup-utils/plugins/npmPlugins.mjs
+++ b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
@@ -7,6 +7,7 @@
  * Sucrase plugin docs: https://github.com/rollup/plugins/tree/master/packages/sucrase
  */
 
+import json from '@rollup/plugin-json';
 import replace from '@rollup/plugin-replace';
 import sucrase from '@rollup/plugin-sucrase';
 import cleanup from 'rollup-plugin-cleanup';
@@ -18,11 +19,17 @@ import cleanup from 'rollup-plugin-cleanup';
  */
 export function makeSucrasePlugin(options = {}) {
   return sucrase({
+    // Required for bundling OTEL code properly
+    exclude: ['**/*.json'],
     transforms: ['typescript', 'jsx'],
     ...options,
   });
 }
 
+export function makeJsonPlugin() {
+  return json();
+}
+
 /**
  * Create a plugin which can be used to pause the build process at the given hook.
  *
diff --git a/dev-packages/rollup-utils/polyfills/es5.js b/dev-packages/rollup-utils/polyfills/es5.js
deleted file mode 100644
index 54bd46e62cff..000000000000
--- a/dev-packages/rollup-utils/polyfills/es5.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Sentry ES5 polyfills
-if (!('includes' in Array.prototype)) {
-  Array.prototype.includes = function (searchElement) {
-    return this.indexOf(searchElement) > -1;
-  };
-}
-if (!('find' in Array.prototype)) {
-  Array.prototype.find = function (callback) {
-    for (var i = 0; i < this.length; i++) {
-      if (callback(this[i])) {
-        return this[i];
-      }
-    }
-  };
-}
-if (!('findIndex' in Array.prototype)) {
-  Array.prototype.findIndex = function (callback) {
-    for (var i = 0; i < this.length; i++) {
-      if (callback(this[i])) {
-        return i;
-      }
-    }
-    return -1;
-  };
-}
-if (!('includes' in String.prototype)) {
-  String.prototype.includes = function (searchElement) {
-    return this.indexOf(searchElement) > -1;
-  };
-}
-if (!('startsWith' in String.prototype)) {
-  String.prototype.startsWith = function (searchElement) {
-    return this.indexOf(searchElement) === 0;
-  };
-}
-if (!('endsWith' in String.prototype)) {
-  String.prototype.endsWith = function (searchElement) {
-    var i = this.indexOf(searchElement);
-    return i > -1 && i === this.length - searchElement.length;
-  };
-}
diff --git a/docs/migration/v4-to-v5_v6.md b/docs/migration/v4-to-v5_v6.md
index 6928022eef20..4fcf8c1410ea 100644
--- a/docs/migration/v4-to-v5_v6.md
+++ b/docs/migration/v4-to-v5_v6.md
@@ -1,6 +1,7 @@
 # Upgrading from 4.x to 5.x/6.x
 
-We recommend upgrading from `4.x` to `6.x` directly. Migrating from `5.x` to `6.x` has no breaking changes to the SDK's API.
+We recommend upgrading from `4.x` to `6.x` directly. Migrating from `5.x` to `6.x` has no breaking changes to the SDK's
+API.
 
 In this version upgrade, there are a few breaking changes. This guide should help you update your code accordingly.
 
diff --git a/docs/migration/v6-to-v7.md b/docs/migration/v6-to-v7.md
index ac6ce0519e8e..8bd0da2b7a8e 100644
--- a/docs/migration/v6-to-v7.md
+++ b/docs/migration/v6-to-v7.md
@@ -541,4 +541,3 @@ const levelA = Severity.error;
 
 const levelB: SeverityLevel = "error"
 ```
-
diff --git a/docs/new-sdk-release-checklist.md b/docs/new-sdk-release-checklist.md
index 99c952631f01..a6e0f60e8235 100644
--- a/docs/new-sdk-release-checklist.md
+++ b/docs/new-sdk-release-checklist.md
@@ -59,9 +59,6 @@ differ slightly for other SDKs depending on how they are structured and how they
   - **This is especially important, if you're adding new CDN bundles!**
   - Tarballs (\*.tgz archives) should work OOTB
 
-- [ ] Make sure it is added to `bundlePlugins.ts:makeTSPlugin` as `paths`, otherwise it will not be ES5 transpiled
-      correctly for CDN builds.
-
 - [ ] Make sure it is added to the
       [Verdaccio config](https://github.com/getsentry/sentry-javascript/blob/develop/dev-packages/e2e-tests/verdaccio-config/config.yaml)
       for the E2E tests
diff --git a/docs/v8-new-performance-apis.md b/docs/v8-new-performance-apis.md
index cdf7bc6f9d0c..713e99d5d1f1 100644
--- a/docs/v8-new-performance-apis.md
+++ b/docs/v8-new-performance-apis.md
@@ -55,12 +55,8 @@ interface SpanContext {
   name: string;
   attributes?: SpanAttributes;
   op?: string;
-  // TODO: Not yet implemented, but you should be able to pass a scope to base this off
   scope?: Scope;
-  // TODO: The list below may change a bit...
-  origin?: SpanOrigin;
-  source?: SpanSource;
-  metadata?: Partial<SpanMetadata>;
+  forceTransaction?: boolean;
 }
 ```
 
diff --git a/docs/v8-node.md b/docs/v8-node.md
new file mode 100644
index 000000000000..7b5e7ce48b95
--- /dev/null
+++ b/docs/v8-node.md
@@ -0,0 +1,197 @@
+# Using `@sentry/node` in v8
+
+With v8, `@sentry/node` has been completely overhauled. It is now powered by [OpenTelemetry](https://opentelemetry.io/)
+under the hood.
+
+## What is OpenTelemetry
+
+You do not need to know or understand what OpenTelemetry is in order to use Sentry. We set up OpenTelemetry under the
+hood, no knowledge of it is required in order to get started.
+
+If you want, you can use OpenTelemetry-native APIs to start spans, and Sentry will pick up everything automatically.
+
+## Supported Frameworks & Libraries
+
+We support the following Node Frameworks out of the box:
+
+- [Express](#express)
+- [Fastify](#fastify)
+- Koa
+- Nest.js
+- Hapi
+
+We also support auto instrumentation for the following libraries:
+
+- mysql
+- mysql2
+- pg
+- GraphQL (including Apollo Server)
+- mongo
+- mongoose
+- Prisma
+
+## General Changes to v7
+
+There are some general changes that have been made that apply to any usage of `@sentry/node`.
+
+### `Sentry.init()` has to be called before any other require/import
+
+Due to the way that OpenTelemetry auto instrumentation works, it is required that you initialize Sentry _before_ you
+require or import any other package. Any package that is required/imported before Sentry is initialized may not be
+correctly auto-instrumented.
+
+```js
+// In v7, this was fine:
+const Sentry = require('@sentry/node');
+const express = require('express');
+
+Sentry.init({
+  // ...
+});
+
+const app = express();
+```
+
+```js
+// In v8, in order to ensure express is instrumented,
+// you have to initialize before you import:
+const Sentry = require('@sentry/node');
+Sentry.init({
+  // ...
+});
+
+const express = require('express');
+const app = express();
+```
+
+### Performance Instrumentation is enabled by default
+
+All performance auto-instrumentation will be automatically enabled if the package is found. You do not need to add any
+integration yourself, and `autoDiscoverNodePerformanceMonitoringIntegrations()` has also been removed.
+
+### Old Performance APIs are removed
+
+See [New Performance APIs](./v8-new-performance-apis.md) for details.
+
+### ESM Support
+
+For now, ESM support is only experimental. For the time being we only fully support CJS-based Node application - we are
+working on this during the v8 alpha/beta cycle.
+
+### Using Custom OpenTelemetry Instrumentation
+
+While we include some vetted OpenTelemetry instrumentation out of the box, you can also add your own instrumentation on
+top of that. You can do that by installing an instrumentation package (as well as `@opentelemetry/instrumentation`) and
+setting it up like this:
+
+```js
+const Sentry = require('@sentry/node');
+const { GenericPoolInstrumentation } = require('@opentelemetry/instrumentation-generic-pool');
+const { registerInstrumentations } = require('@opentelemetry/instrumentation');
+
+Sentry.init({
+  dsn: '__DSN__',
+});
+
+// Afterwards, you can add additional instrumentation:
+registerInsturmentations({
+  instrumentations: [new GenericPoolInstrumentation()],
+});
+```
+
+### Using a Custom OpenTelemetry Setup
+
+If you already have OpenTelemetry set up yourself, you can also use your existing setup.
+
+In this case, you need to set `skipOpenTelemetrySetup: true` in your `init({})` config, and ensure you setup all the
+components that Sentry needs yourself. In this case, you need to install `@sentry/opentelemetry`, and add the following:
+
+```js
+const Sentry = require('@sentry/node');
+const { SentrySpanProcessor, SentryPropagator, SentryContextManager, SentrySampler } = require('@sentry/opentelemetry');
+
+// We need a custom span processor
+provider.addSpanProcessor(new SentrySpanProcessor());
+// We need a custom propagator and context manager
+provier.register({
+  propagator: new SentryPropagator(),
+  contextManager: new SentryContextManager(),
+});
+
+// And optionally, if you want to use the `tracesSamplingRate` or related options from Sentry,
+// you also need to use a custom sampler when you set up your provider
+const provider = new BasicTracerProvider({
+  sampler: new SentrySampler(Sentry.getClient()),
+});
+```
+
+## Plain Node / Unsupported Frameworks
+
+When using `@sentry/node` in an app without any supported framework, you will still get some auto instrumentation out of
+the box!
+
+Any framework that works on top of `http`, which means any framework that handles incoming HTTP requests, will
+automatically be instrumented - so you'll get request isolation & basic transactions without any further action.
+
+For any non-HTTP scenarios (e.g. websockets or a scheduled job), you'll have to manually ensure request isolation by
+wrapping the function with `Sentry.withIsolationScope()`:
+
+```js
+const Sentry = require('@sentry/node');
+
+function myScheduledJob() {
+  return Sentry.withIsolationScope(async () => {
+    await doSomething();
+    await doSomethingElse();
+    return { status: 'DONE' };
+  });
+}
+```
+
+This way, anything happening inside of this function will be isolated, even if they run concurrently.
+
+## Express
+
+The following shows how you can setup Express instrumentation in v8. This will capture performance data & errors for
+your Express app.
+
+```js
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1,
+});
+
+const express = require('express');
+const app = express();
+
+// add routes etc. here
+
+Sentry.setupExpressErrorHandler(app);
+// add other error middleware below this, if needed
+
+app.listen(3000);
+```
+
+## Fastify
+
+The following shows how you can setup Fastify instrumentation in v8. This will capture performance data & errors for
+your Fastify app.
+
+```js
+const Sentry = require('@sentry/node');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1,
+});
+
+const { fastify } = require('fastify');
+const app = fastify();
+Sentry.setupFastifyErrorHandler(app);
+
+// add routes etc. here
+
+app.listen();
+```
diff --git a/jest/jest.config.js b/jest/jest.config.js
index 37a2ee48658b..6bb8d30df35e 100644
--- a/jest/jest.config.js
+++ b/jest/jest.config.js
@@ -19,4 +19,11 @@ module.exports = {
     __DEBUG_BUILD__: true,
   },
   testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/'],
+
+  // On CI, we do not need the pretty CLI output, as it makes logs harder to parse
+  ...(process.env.CI
+    ? {
+        coverageReporters: ['json', 'lcov', 'clover'],
+      }
+    : {}),
 };
diff --git a/package.json b/package.json
index 0c39a0033abb..28d2fb4e74a3 100644
--- a/package.json
+++ b/package.json
@@ -22,19 +22,18 @@
     "fix": "run-s fix:biome fix:prettier fix:lerna",
     "fix:lerna": "lerna run fix",
     "fix:biome": "biome check --apply .",
-    "fix:prettier": "prettier **/*.md *.md **/*.css --write",
+    "fix:prettier": "prettier \"**/*.md\" \"**/*.css\" --write",
     "changelog": "ts-node ./scripts/get-commit-list.ts",
     "link:yarn": "lerna exec yarn link",
     "lint": "run-s lint:lerna lint:biome lint:prettier",
     "lint:clang": "lerna run lint:clang",
     "lint:lerna": "lerna run lint",
     "lint:biome": "biome check .",
-    "lint:prettier": "prettier **/*.md *.md **/*.css --check",
-    "validate:es5": "lerna run validate:es5",
+    "lint:prettier": "prettier \"**/*.md\" \"**/*.css\" --check",
     "postpublish": "lerna run --stream --concurrency 1 postpublish",
     "test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\" test",
     "test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\" test:unit",
-    "test-ci-browser": "lerna run test --ignore \"@sentry/{bun,deno,node,node-experimental,profiling-node,serverless,nextjs,remix,gatsby,sveltekit,vercel-edge}\" --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\"",
+    "test-ci-browser": "lerna run test --ignore \"@sentry/{bun,deno,node,node-experimental,profiling-node,serverless,google-cloud,nextjs,remix,gatsby,sveltekit,vercel-edge}\" --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests,overhead-metrics}\"",
     "test-ci-node": "ts-node ./scripts/node-unit-tests.ts",
     "test-ci-bun": "lerna run test --scope @sentry/bun",
     "test:update-snapshots": "lerna run test:update-snapshots",
@@ -48,6 +47,7 @@
     "packages/angular",
     "packages/angular-ivy",
     "packages/astro",
+    "packages/aws-serverless",
     "packages/browser",
     "packages/bun",
     "packages/core",
@@ -57,6 +57,7 @@
     "packages/eslint-plugin-sdk",
     "packages/feedback",
     "packages/gatsby",
+    "packages/google-cloud-serverless",
     "packages/integration-shims",
     "packages/nextjs",
     "packages/node",
@@ -68,7 +69,6 @@
     "packages/replay",
     "packages/replay-canvas",
     "packages/replay-worker",
-    "packages/serverless",
     "packages/svelte",
     "packages/sveltekit",
     "packages/tracing-internal",
@@ -86,11 +86,13 @@
   ],
   "devDependencies": {
     "@biomejs/biome": "^1.4.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "@rollup/plugin-replace": "^3.0.1",
-    "@rollup/plugin-sucrase": "^4.0.3",
-    "@rollup/plugin-typescript": "^8.3.1",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-sucrase": "^5.0.2",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-typescript": "^11.1.6",
     "@size-limit/file": "~11.0.1",
     "@size-limit/webpack": "~11.0.1",
     "@strictsoftware/typedoc-plugin-monorepo": "^0.3.1",
@@ -119,10 +121,9 @@
     "prettier": "^3.1.1",
     "replace-in-file": "^4.0.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.67.1",
-    "rollup-plugin-cleanup": "3.2.1",
-    "rollup-plugin-license": "^2.6.1",
-    "rollup-plugin-terser": "^7.0.2",
+    "rollup": "^4.13.0",
+    "rollup-plugin-cleanup": "^3.2.1",
+    "rollup-plugin-license": "^3.3.1",
     "sinon": "^7.3.2",
     "size-limit": "~11.0.1",
     "ts-jest": "^27.1.4",
@@ -133,7 +134,8 @@
     "yalc": "^1.0.0-pre.53"
   },
   "resolutions": {
-    "**/agent-base": "5",
+    "wrap-ansi": "7.0.0",
+    "string-width": "4.1.0",
     "**/terser/source-map": "0.7.4"
   },
   "version": "0.0.0",
diff --git a/packages/angular-ivy/README.md b/packages/angular-ivy/README.md
index 438bb0fb5ff5..6252cec45454 100644
--- a/packages/angular-ivy/README.md
+++ b/packages/angular-ivy/README.md
@@ -18,10 +18,11 @@
 
 This SDK officially supports Angular 12 to 17 with Angular's new rendering engine, Ivy.
 
-If you're using Angular 10, 11 or a newer Angular version with View Engine instead of Ivy, please use [`@sentry/angular`](https://github.com/getsentry/sentry-javascript/blob/develop/packages/angular/README.md).
+If you're using Angular 10, 11 or a newer Angular version with View Engine instead of Ivy, please use
+[`@sentry/angular`](https://github.com/getsentry/sentry-javascript/blob/develop/packages/angular/README.md).
 
-If you're using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the SDK to version 6.x.
-Please note that we don't provide any support for Angular versions below 10.
+If you're using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the
+SDK to version 6.x. Please note that we don't provide any support for Angular versions below 10.
 
 ## General
 
@@ -53,8 +54,8 @@ platformBrowserDynamic()
 
 ### ErrorHandler
 
-`@sentry/angular-ivy` exports a function to instantiate an ErrorHandler provider that will automatically send Javascript errors
-captured by the Angular's error handler.
+`@sentry/angular-ivy` exports a function to instantiate an ErrorHandler provider that will automatically send Javascript
+errors captured by the Angular's error handler.
 
 ```javascript
 import { NgModule, ErrorHandler } from '@angular/core';
@@ -89,17 +90,14 @@ initializations.
 
 Registering a Trace Service is a 3-step process.
 
-1. Register and configure the `BrowserTracing` integration, including custom Angular routing
-   instrumentation:
+1. Register and configure the `BrowserTracing` integration, including custom Angular routing instrumentation:
 
 ```javascript
 import { init, browserTracingIntegration } from '@sentry/angular-ivy';
 
 init({
   dsn: '__DSN__',
- integrations: [
-    browserTracingIntegration(),
-  ],
+  integrations: [browserTracingIntegration()],
   tracePropagationTargets: ['localhost', 'https://yourserver.io/api'],
   tracesSampleRate: 1,
 });
@@ -181,39 +179,40 @@ Then, inside your component's template (keep in mind that the directive's name a
 <app-footer trace="footer"></app-footer>
 ```
 
-_TraceClassDecorator:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in components:
+_TraceClass:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in components:
 
 ```javascript
 import { Component } from '@angular/core';
-import { TraceClassDecorator } from '@sentry/angular-ivy';
+import { TraceClass } from '@sentry/angular-ivy';
 
 @Component({
   selector: 'layout-header',
   templateUrl: './header.component.html',
 })
-@TraceClassDecorator()
+@TraceClass()
 export class HeaderComponent {
   // ...
 }
 ```
 
-_TraceMethodDecorator:_ used to track a specific lifecycle hooks as point-in-time spans in components:
+_TraceMethod:_ used to track a specific lifecycle hooks as point-in-time spans in components:
 
 ```javascript
 import { Component, OnInit } from '@angular/core';
-import { TraceMethodDecorator } from '@sentry/angular-ivy';
+import { TraceMethod } from '@sentry/angular-ivy';
 
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
 })
 export class FooterComponent implements OnInit {
-  @TraceMethodDecorator()
+  @TraceMethod()
   ngOnInit() {}
 }
 ```
 
-You can also add your own custom spans via `startSpan()`. For example, if you'd like to track the duration of Angular boostraping process, you can do it as follows:
+You can also add your own custom spans via `startSpan()`. For example, if you'd like to track the duration of Angular
+boostraping process, you can do it as follows:
 
 ```javascript
 import { enableProdMode } from '@angular/core';
@@ -223,12 +222,13 @@ import { init, startSpan } from '@sentry/angular';
 import { AppModule } from './app/app.module';
 
 // ...
-startSpan({
-  name: 'platform-browser-dynamic',
-  op: 'ui.angular.bootstrap'
+startSpan(
+  {
+    name: 'platform-browser-dynamic',
+    op: 'ui.angular.bootstrap',
   },
   async () => {
     await platformBrowserDynamic().bootstrapModule(AppModule);
-  }
+  },
 );
 ```
diff --git a/packages/angular-ivy/package.json b/packages/angular-ivy/package.json
index 77377f9b26c4..5f2cf0c9813d 100644
--- a/packages/angular-ivy/package.json
+++ b/packages/angular-ivy/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "main": "build/bundles/sentry-angular.umd.js",
   "module": "build/fesm2015/sentry-angular.js",
diff --git a/packages/angular-ivy/tsconfig.ngc.json b/packages/angular-ivy/tsconfig.ngc.json
index eb826fa42ff9..8a1d95d7a256 100644
--- a/packages/angular-ivy/tsconfig.ngc.json
+++ b/packages/angular-ivy/tsconfig.ngc.json
@@ -5,7 +5,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es2015",
+    "target": "es2017",
     "lib": ["dom", "es2018"],
     "baseUrl": "./"
   },
diff --git a/packages/angular/README.md b/packages/angular/README.md
index a3e15a426196..c451b39ea9ef 100644
--- a/packages/angular/README.md
+++ b/packages/angular/README.md
@@ -17,11 +17,14 @@
 
 ## Angular Version Compatibility
 
-**Important**: This package is not compatible with Angular 16 or newer. Please use [`@sentry/angular-ivy`](https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy) instead.
+**Important**: This package is not compatible with Angular 16 or newer. Please use
+[`@sentry/angular-ivy`](https://github.com/getsentry/sentry-javascript/tree/master/packages/angular-ivy) instead.
 
-If you're using Angular 12 or newer, we recommend using `@sentry/angular-ivy` for native support with Angular's rendering engine Ivy.
+If you're using Angular 12 or newer, we recommend using `@sentry/angular-ivy` for native support with Angular's
+rendering engine Ivy.
 
-This SDK still officially supports Angular 10-15. If you are using an older version of Angular and experience problems with the Angular SDK, we recommend downgrading the SDK to version 6.x.
+This SDK still officially supports Angular 10-15. If you are using an older version of Angular and experience problems
+with the Angular SDK, we recommend downgrading the SDK to version 6.x.
 
 ## General
 
@@ -80,26 +83,23 @@ see `ErrorHandlerOptions` interface in `src/errorhandler.ts`.
 
 ### Tracing
 
-`@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.
+`@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, including custom Angular routing
-   instrumentation:
+1. Register and configure the `BrowserTracing` integration, including custom Angular routing instrumentation:
 
 ```javascript
 import { init, browserTracingIntegration } from '@sentry/angular';
 
 init({
   dsn: '__DSN__',
-  integrations: [
-    browserTracingIntegration(),
-  ],
+  integrations: [browserTracingIntegration()],
   tracePropagationTargets: ['localhost', 'https://yourserver.io/api'],
   tracesSampleRate: 1,
 });
@@ -181,39 +181,40 @@ Then, inside your component's template (keep in mind that the directive's name a
 <app-footer trace="footer"></app-footer>
 ```
 
-_TraceClassDecorator:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in components:
+_TraceClass:_ used to track a duration between `OnInit` and `AfterViewInit` lifecycle hooks in components:
 
 ```javascript
 import { Component } from '@angular/core';
-import { TraceClassDecorator } from '@sentry/angular';
+import { TraceClass } from '@sentry/angular';
 
 @Component({
   selector: 'layout-header',
   templateUrl: './header.component.html',
 })
-@TraceClassDecorator()
+@TraceClass()
 export class HeaderComponent {
   // ...
 }
 ```
 
-_TraceMethodDecorator:_ used to track a specific lifecycle hooks as point-in-time spans in components:
+_TraceMethod:_ used to track a specific lifecycle hooks as point-in-time spans in components:
 
 ```javascript
 import { Component, OnInit } from '@angular/core';
-import { TraceMethodDecorator } from '@sentry/angular';
+import { TraceMethod } from '@sentry/angular';
 
 @Component({
   selector: 'app-footer',
   templateUrl: './footer.component.html',
 })
 export class FooterComponent implements OnInit {
-  @TraceMethodDecorator()
+  @TraceMethod()
   ngOnInit() {}
 }
 ```
 
-You can also add your own custom spans via `startSpan()`. For example, if you'd like to track the duration of Angular boostraping process, you can do it as follows:
+You can also add your own custom spans via `startSpan()`. For example, if you'd like to track the duration of Angular
+boostraping process, you can do it as follows:
 
 ```javascript
 import { enableProdMode } from '@angular/core';
@@ -223,12 +224,13 @@ import { init, startSpan } from '@sentry/angular';
 import { AppModule } from './app/app.module';
 
 // ...
-startSpan({
-  name: 'platform-browser-dynamic',
-  op: 'ui.angular.bootstrap'
+startSpan(
+  {
+    name: 'platform-browser-dynamic',
+    op: 'ui.angular.bootstrap',
   },
   async () => {
     await platformBrowserDynamic().bootstrapModule(AppModule);
-  }
+  },
 );
 ```
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 9c2de6ed8d18..e4c45d045923 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "main": "build/bundles/sentry-angular.umd.js",
   "module": "build/fesm2015/sentry-angular.js",
diff --git a/packages/angular/src/index.ts b/packages/angular/src/index.ts
index a2b1195c4e3c..fe4c1fd04c38 100644
--- a/packages/angular/src/index.ts
+++ b/packages/angular/src/index.ts
@@ -5,15 +5,9 @@ export * from '@sentry/browser';
 export { init } from './sdk';
 export { createErrorHandler, SentryErrorHandler } from './errorhandler';
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  instrumentAngularRouting, // new name
-  // eslint-disable-next-line deprecation/deprecation
-  routingInstrumentation, // legacy name
   browserTracingIntegration,
-  TraceClassDecorator,
-  TraceMethodDecorator,
+  TraceClass,
+  TraceMethod,
   TraceDirective,
   TraceModule,
   TraceService,
diff --git a/packages/angular/src/tracing.ts b/packages/angular/src/tracing.ts
index 6ad3ba46776d..59b9653e02ec 100644
--- a/packages/angular/src/tracing.ts
+++ b/packages/angular/src/tracing.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import type { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
 import { Directive, Injectable, Input, NgModule } from '@angular/core';
 import type { ActivatedRouteSnapshot, Event, RouterState } from '@angular/router';
@@ -10,13 +9,16 @@ import { NavigationEnd, NavigationStart, ResolveEnd } from '@angular/router';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  WINDOW,
   browserTracingIntegration as originalBrowserTracingIntegration,
+  getActiveSpan,
+  getClient,
   getCurrentScope,
+  getRootSpan,
+  spanToJSON,
   startBrowserTracingNavigationSpan,
+  startInactiveSpan,
 } from '@sentry/browser';
-import { getActiveSpan, getClient, getRootSpan, spanToJSON, startInactiveSpan } from '@sentry/core';
-import type { Integration, Span, Transaction, TransactionContext } from '@sentry/types';
+import type { Integration, Span } from '@sentry/types';
 import { logger, stripUrlQueryAndFragment, timestampInSeconds } from '@sentry/utils';
 import type { Observable } from 'rxjs';
 import { Subscription } from 'rxjs';
@@ -27,44 +29,6 @@ import { IS_DEBUG_BUILD } from './flags';
 import { runOutsideAngular } from './zone';
 
 let instrumentationInitialized: boolean;
-let stashedStartTransaction: (context: TransactionContext) => Transaction | undefined;
-let stashedStartTransactionOnLocationChange: boolean;
-
-let hooksBasedInstrumentation = false;
-
-/**
- * Creates routing instrumentation for Angular Router.
- *
- * @deprecated Use `browserTracingIntegration()` instead, which includes Angular-specific instrumentation out of the box.
- */
-export function routingInstrumentation(
-  customStartTransaction: (context: TransactionContext) => Transaction | undefined,
-  startTransactionOnPageLoad: boolean = true,
-  startTransactionOnLocationChange: boolean = true,
-): void {
-  instrumentationInitialized = true;
-  stashedStartTransaction = customStartTransaction;
-  stashedStartTransactionOnLocationChange = startTransactionOnLocationChange;
-
-  if (startTransactionOnPageLoad && WINDOW && WINDOW.location) {
-    customStartTransaction({
-      name: WINDOW.location.pathname,
-      op: 'pageload',
-      origin: 'auto.pageload.angular',
-      attributes: {
-        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-      },
-    });
-  }
-}
-
-/**
- * Creates routing instrumentation for Angular Router.
- *
- * @deprecated Use `browserTracingIntegration()` instead, which includes Angular-specific instrumentation out of the box.
- */
-// eslint-disable-next-line deprecation/deprecation
-export const instrumentAngularRouting = routingInstrumentation;
 
 /**
  * A custom browser tracing integration for Angular.
@@ -78,7 +42,6 @@ export function browserTracingIntegration(
   // That way, the TraceService will not actually do anything, functionally disabling this.
   if (options.instrumentNavigation !== false) {
     instrumentationInitialized = true;
-    hooksBasedInstrumentation = true;
   }
 
   return originalBrowserTracingIntegration({
@@ -88,13 +51,16 @@ export function browserTracingIntegration(
 }
 
 /**
- * Grabs active transaction off scope.
- *
- * @deprecated You should not rely on the transaction, but just use `startSpan()` APIs instead.
+ * This function is extracted to make unit testing easier.
  */
-export function getActiveTransaction(): Transaction | undefined {
-  // eslint-disable-next-line deprecation/deprecation
-  return getCurrentScope().getTransaction();
+export function _updateSpanAttributesForParametrizedUrl(route: string, span?: Span): void {
+  const attributes = (span && spanToJSON(span).data) || {};
+
+  if (span && attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] === 'url') {
+    span.updateName(route);
+    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, `auto.${spanToJSON(span).op}.angular`);
+  }
 }
 
 /**
@@ -120,7 +86,7 @@ export class TraceService implements OnDestroy {
       const client = getClient();
       const strippedUrl = stripUrlQueryAndFragment(navigationEvent.url);
 
-      if (client && hooksBasedInstrumentation) {
+      if (client) {
         // see comment in `_isPageloadOngoing` for rationale
         if (!this._isPageloadOngoing()) {
           startBrowserTracingNavigationSpan(client, {
@@ -153,35 +119,6 @@ export class TraceService implements OnDestroy {
 
         return;
       }
-
-      // eslint-disable-next-line deprecation/deprecation
-      let activeTransaction = getActiveTransaction();
-
-      if (!activeTransaction && stashedStartTransactionOnLocationChange) {
-        activeTransaction = stashedStartTransaction({
-          name: strippedUrl,
-          op: 'navigation',
-          origin: 'auto.navigation.angular',
-          attributes: {
-            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-          },
-        });
-      }
-
-      if (activeTransaction) {
-        // eslint-disable-next-line deprecation/deprecation
-        this._routingSpan = activeTransaction.startChild({
-          name: `${navigationEvent.url}`,
-          op: ANGULAR_ROUTING_OP,
-          origin: 'auto.ui.angular',
-          attributes: {
-            url: strippedUrl,
-            ...(navigationEvent.navigationTrigger && {
-              navigationTrigger: navigationEvent.navigationTrigger,
-            }),
-          },
-        });
-      }
     }),
   );
 
@@ -200,15 +137,14 @@ export class TraceService implements OnDestroy {
         (event.state as unknown as RouterState & { root: ActivatedRouteSnapshot }).root,
       );
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction();
-      // TODO (v8 / #5416): revisit the source condition. Do we want to make the parameterized route the default?
-      const attributes = (transaction && spanToJSON(transaction).data) || {};
-      if (transaction && attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] === 'url') {
-        transaction.updateName(route);
-        transaction.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
-        transaction.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, `auto.${spanToJSON(transaction).op}.angular`);
+      if (route) {
+        getCurrentScope().setTransactionName(route);
       }
+
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
+
+      _updateSpanAttributesForParametrizedUrl(route, rootSpan);
     }),
   );
 
@@ -274,7 +210,7 @@ export class TraceService implements OnDestroy {
    * - if `_pageloadOngoing` is already `false`, create a navigation root span
    * - if there's no active/pageload root span, create a navigation root span
    * - only if there's an ongoing pageload root span AND `_pageloadOngoing` is still `true,
-   *   con't create a navigation root span
+   *   don't create a navigation root span
    */
   private _isPageloadOngoing(): boolean {
     if (!this._pageloadOngoing) {
@@ -289,10 +225,6 @@ export class TraceService implements OnDestroy {
     }
 
     const rootSpan = getRootSpan(activeSpan);
-    if (!rootSpan) {
-      this._pageloadOngoing = false;
-      return false;
-    }
 
     this._pageloadOngoing = spanToJSON(rootSpan).op === 'pageload';
     return this._pageloadOngoing;
@@ -319,14 +251,11 @@ export class TraceDirective implements OnInit, AfterViewInit {
       this.componentName = UNKNOWN_COMPONENT;
     }
 
-    // eslint-disable-next-line deprecation/deprecation
-    const activeTransaction = getActiveTransaction();
-    if (activeTransaction) {
-      // eslint-disable-next-line deprecation/deprecation
-      this._tracingSpan = activeTransaction.startChild({
+    if (getActiveSpan()) {
+      this._tracingSpan = startInactiveSpan({
         name: `<${this.componentName}>`,
         op: ANGULAR_INIT_OP,
-        origin: 'auto.ui.angular.trace_directive',
+        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_directive' },
       });
     }
   }
@@ -351,28 +280,33 @@ export class TraceDirective implements OnInit, AfterViewInit {
 })
 export class TraceModule {}
 
+interface TraceClassOptions {
+  /**
+   * Name of the class
+   */
+  name?: string;
+}
+
 /**
  * Decorator function that can be used to capture initialization lifecycle of the whole component.
  */
-export function TraceClassDecorator(): ClassDecorator {
+export function TraceClass(options?: TraceClassOptions): ClassDecorator {
   let tracingSpan: Span;
 
   /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   return target => {
     const originalOnInit = target.prototype.ngOnInit;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     target.prototype.ngOnInit = function (...args: any[]): ReturnType<typeof originalOnInit> {
-      // eslint-disable-next-line deprecation/deprecation
-      const activeTransaction = getActiveTransaction();
-      if (activeTransaction) {
-        // eslint-disable-next-line deprecation/deprecation
-        tracingSpan = activeTransaction.startChild({
-          name: `<${target.name}>`,
-          op: ANGULAR_INIT_OP,
-          origin: 'auto.ui.angular.trace_class_decorator',
-        });
-      }
+      tracingSpan = startInactiveSpan({
+        onlyIfParent: true,
+        name: `<${options && options.name ? options.name : 'unnamed'}>`,
+        op: ANGULAR_INIT_OP,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_class_decorator',
+        },
+      });
+
       if (originalOnInit) {
         return originalOnInit.apply(this, args);
       }
@@ -392,28 +326,34 @@ export function TraceClassDecorator(): ClassDecorator {
   /* eslint-enable @typescript-eslint/no-unsafe-member-access */
 }
 
+interface TraceMethodOptions {
+  /**
+   * Name of the method (is added to the tracing span)
+   */
+  name?: string;
+}
+
 /**
  * Decorator function that can be used to capture a single lifecycle methods of the component.
  */
-export function TraceMethodDecorator(): MethodDecorator {
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/ban-types
+export function TraceMethod(options?: TraceMethodOptions): MethodDecorator {
+  // eslint-disable-next-line @typescript-eslint/ban-types
   return (target: Object, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
     const originalMethod = descriptor.value;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     descriptor.value = function (...args: any[]): ReturnType<typeof originalMethod> {
       const now = timestampInSeconds();
-      // eslint-disable-next-line deprecation/deprecation
-      const activeTransaction = getActiveTransaction();
-      if (activeTransaction) {
-        // eslint-disable-next-line deprecation/deprecation
-        activeTransaction.startChild({
-          name: `<${target.constructor.name}>`,
-          endTimestamp: now,
-          op: `${ANGULAR_OP}.${String(propertyKey)}`,
-          origin: 'auto.ui.angular.trace_method_decorator',
-          startTimestamp: now,
-        });
-      }
+
+      startInactiveSpan({
+        onlyIfParent: true,
+        name: `<${options && options.name ? options.name : 'unnamed'}>`,
+        op: `${ANGULAR_OP}.${String(propertyKey)}`,
+        startTime: now,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
+        },
+      }).end(now);
+
       if (originalMethod) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         return originalMethod.apply(this, args);
diff --git a/packages/angular/test/tracing.test.ts b/packages/angular/test/tracing.test.ts
index 5a935f178c71..f41b40750b81 100644
--- a/packages/angular/test/tracing.test.ts
+++ b/packages/angular/test/tracing.test.ts
@@ -1,30 +1,15 @@
-import { Component } from '@angular/core';
-import type { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-
-import { TraceClassDecorator, TraceDirective, TraceMethodDecorator, instrumentAngularRouting } from '../src';
-import { getParameterizedRouteFromSnapshot } from '../src/tracing';
-import { AppComponent, TestEnv } from './utils/index';
+import type { ActivatedRouteSnapshot } from '@angular/router';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  SentrySpan,
+  spanToJSON,
+} from '@sentry/core';
+import { TraceDirective, browserTracingIntegration, init } from '../src/index';
+import { _updateSpanAttributesForParametrizedUrl, getParameterizedRouteFromSnapshot } from '../src/tracing';
 
 let transaction: any;
 
-const defaultStartTransaction = (ctx: any) => {
-  transaction = {
-    ...ctx,
-    updateName: jest.fn(name => (transaction.name = name)),
-    setAttribute: jest.fn(),
-    toJSON: () => ({
-      data: {
-        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
-        ...ctx.data,
-        ...ctx.attributes,
-      },
-    }),
-  };
-
-  return transaction;
-};
-
 jest.mock('@sentry/browser', () => {
   const original = jest.requireActual('@sentry/browser');
   return {
@@ -39,27 +24,18 @@ jest.mock('@sentry/browser', () => {
   };
 });
 
+describe('browserTracingIntegration', () => {
+  it('implements required hooks', () => {
+    const integration = browserTracingIntegration();
+    expect(integration.name).toEqual('BrowserTracing');
+  });
+});
+
 describe('Angular Tracing', () => {
   beforeEach(() => {
     transaction = undefined;
   });
 
-  /* eslint-disable deprecation/deprecation */
-  describe('instrumentAngularRouting', () => {
-    it('should attach the transaction source on the pageload transaction', () => {
-      const startTransaction = jest.fn();
-      instrumentAngularRouting(startTransaction);
-
-      expect(startTransaction).toHaveBeenCalledWith({
-        name: '/',
-        op: 'pageload',
-        origin: 'auto.pageload.angular',
-        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url' },
-      });
-    });
-  });
-  /* eslint-enable deprecation/deprecation */
-
   describe('getParameterizedRouteFromSnapshot', () => {
     it.each([
       ['returns `/` if the route has no children', {}, '/'],
@@ -113,240 +89,44 @@ describe('Angular Tracing', () => {
   });
 
   describe('TraceService', () => {
-    it('does not change the transaction name if the source is something other than `url`', async () => {
-      const customStartTransaction = jest.fn((ctx: any) => {
-        transaction = {
-          ...ctx,
-          toJSON: () => ({
-            data: {
-              ...ctx.data,
-              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom',
-            },
-          }),
-          metadata: ctx.metadata,
-          updateName: jest.fn(name => (transaction.name = name)),
-          setAttribute: jest.fn(),
-        };
-
-        return transaction;
-      });
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-        routes: [
-          {
-            path: '',
-            component: AppComponent,
-          },
-        ],
-      });
-
-      const url = '/';
-
-      await env.navigateInAngular(url);
-
-      expect(customStartTransaction).toHaveBeenCalledWith({
-        name: url,
-        op: 'pageload',
-        origin: 'auto.pageload.angular',
-        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url' },
-      });
-
-      expect(transaction.updateName).toHaveBeenCalledTimes(0);
-      expect(transaction.name).toEqual(url);
-      expect(transaction.toJSON().data).toEqual({ [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom' });
-
-      env.destroy();
-    });
-
-    it('re-assigns routing span on navigation start with active transaction.', async () => {
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-      });
-
-      const finishMock = jest.fn();
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      await env.navigateInAngular('/');
-
-      expect(finishMock).toHaveBeenCalledTimes(1);
+    it('change the span name to route name if the the source is `url`', async () => {
+      init({ integrations: [browserTracingIntegration()] });
 
-      env.destroy();
-    });
-
-    it('finishes routing span on navigation end', async () => {
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-      });
-
-      const finishMock = jest.fn();
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      await env.navigateInAngular('/');
-
-      expect(finishMock).toHaveBeenCalledTimes(1);
-
-      env.destroy();
-    });
-
-    it('finishes routing span on navigation error', async () => {
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-        routes: [
-          {
-            path: '',
-            component: AppComponent,
-          },
-        ],
-        useTraceService: true,
-      });
-
-      const finishMock = jest.fn();
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      await env.navigateInAngular('/somewhere');
+      const route = 'sample-route';
+      const span = new SentrySpan({ name: 'initial-span-name' });
+      span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'url');
 
-      expect(finishMock).toHaveBeenCalledTimes(1);
+      _updateSpanAttributesForParametrizedUrl(route, span);
 
-      env.destroy();
-    });
-
-    it('finishes routing span on navigation cancel', async () => {
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      class CanActivateGuard implements CanActivate {
-        canActivate(_route: ActivatedRouteSnapshot, _state: RouterStateSnapshot): boolean {
-          return false;
-        }
-      }
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-        routes: [
-          {
-            path: 'cancel',
-            component: AppComponent,
-            canActivate: [CanActivateGuard],
+      expect(spanToJSON(span)).toEqual(
+        expect.objectContaining({
+          data: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.undefined.angular',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           },
-        ],
-        useTraceService: true,
-        additionalProviders: [{ provide: CanActivateGuard, useClass: CanActivateGuard }],
-      });
-
-      const finishMock = jest.fn();
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      await env.navigateInAngular('/cancel');
-
-      expect(finishMock).toHaveBeenCalledTimes(1);
-
-      env.destroy();
+          description: route,
+        }),
+      );
     });
 
-    describe('URL parameterization', () => {
-      it.each([
-        [
-          'handles the root URL correctly',
-          '/',
-          '/',
-          [
-            {
-              path: '',
-              component: AppComponent,
-            },
-          ],
-        ],
-        [
-          'does not alter static routes',
-          '/books',
-          '/books/',
-          [
-            {
-              path: 'books',
-              component: AppComponent,
-            },
-          ],
-        ],
-        [
-          'parameterizes IDs in the URL',
-          '/books/1/details',
-          '/books/:bookId/details/',
-          [
-            {
-              path: 'books/:bookId/details',
-              component: AppComponent,
-            },
-          ],
-        ],
-        [
-          'parameterizes multiple IDs in the URL',
-          '/org/sentry/projects/1234/events/04bc6846-4a1e-4af5-984a-003258f33e31',
-          '/org/:orgId/projects/:projId/events/:eventId/',
-          [
-            {
-              path: 'org/:orgId/projects/:projId/events/:eventId',
-              component: AppComponent,
-            },
-          ],
-        ],
-        [
-          'parameterizes URLs from route with child routes',
-          '/org/sentry/projects/1234/events/04bc6846-4a1e-4af5-984a-003258f33e31',
-          '/org/:orgId/projects/:projId/events/:eventId/',
-          [
-            {
-              path: 'org/:orgId',
-              component: AppComponent,
-              children: [
-                {
-                  path: 'projects/:projId',
-                  component: AppComponent,
-                  children: [
-                    {
-                      path: 'events/:eventId',
-                      component: AppComponent,
-                    },
-                  ],
-                },
-              ],
-            },
-          ],
-        ],
-      ])('%s and sets the source to `route`', async (_, url, result, routes) => {
-        const customStartTransaction = jest.fn(defaultStartTransaction);
-        const env = await TestEnv.setup({
-          customStartTransaction,
-          routes,
-          startTransactionOnPageLoad: false,
-        });
+    it('does not change the span name if the source is something other than `url`', async () => {
+      init({ integrations: [browserTracingIntegration()] });
 
-        await env.navigateInAngular(url);
+      const route = 'sample-route';
+      const span = new SentrySpan({ name: 'initial-span-name' });
+      span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'sample-source');
 
-        expect(customStartTransaction).toHaveBeenCalledWith({
-          name: url,
-          op: 'navigation',
-          origin: 'auto.navigation.angular',
-          attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url' },
-        });
-        expect(transaction.updateName).toHaveBeenCalledWith(result);
-        expect(transaction.setAttribute).toHaveBeenCalledWith(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+      _updateSpanAttributesForParametrizedUrl(route, span);
 
-        env.destroy();
-      });
+      expect(spanToJSON(span)).toEqual(
+        expect.objectContaining({
+          data: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'sample-source',
+          },
+          description: 'initial-span-name',
+        }),
+      );
     });
   });
 
@@ -355,196 +135,5 @@ describe('Angular Tracing', () => {
       const directive = new TraceDirective();
       expect(directive).toBeTruthy();
     });
-
-    it('should create a child tracingSpan on init', async () => {
-      const directive = new TraceDirective();
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        components: [TraceDirective],
-        customStartTransaction,
-        useTraceService: false,
-      });
-
-      transaction.startChild = jest.fn();
-
-      directive.ngOnInit();
-
-      expect(transaction.startChild).toHaveBeenCalledWith({
-        op: 'ui.angular.init',
-        origin: 'auto.ui.angular.trace_directive',
-        name: '<unknown>',
-      });
-
-      env.destroy();
-    });
-
-    it('should use component name as span name', async () => {
-      const directive = new TraceDirective();
-      const finishMock = jest.fn();
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        components: [TraceDirective],
-        customStartTransaction,
-        useTraceService: false,
-      });
-
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      directive.componentName = 'test-component';
-      directive.ngOnInit();
-
-      expect(transaction.startChild).toHaveBeenCalledWith({
-        op: 'ui.angular.init',
-        origin: 'auto.ui.angular.trace_directive',
-        name: '<test-component>',
-      });
-
-      env.destroy();
-    });
-
-    it('should finish tracingSpan after view init', async () => {
-      const directive = new TraceDirective();
-      const finishMock = jest.fn();
-      const customStartTransaction = jest.fn(defaultStartTransaction);
-
-      const env = await TestEnv.setup({
-        components: [TraceDirective],
-        customStartTransaction,
-        useTraceService: false,
-      });
-
-      transaction.startChild = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      directive.ngOnInit();
-      directive.ngAfterViewInit();
-
-      expect(finishMock).toHaveBeenCalledTimes(1);
-
-      env.destroy();
-    });
-  });
-
-  describe('TraceClassDecorator', () => {
-    const origNgOnInitMock = jest.fn();
-    const origNgAfterViewInitMock = jest.fn();
-
-    @Component({
-      selector: 'layout-header',
-      template: '<router-outlet></router-outlet>',
-    })
-    @TraceClassDecorator()
-    class DecoratedComponent {
-      public ngOnInit() {
-        origNgOnInitMock();
-      }
-
-      public ngAfterViewInit() {
-        origNgAfterViewInitMock();
-      }
-    }
-
-    it('Instruments `ngOnInit` and `ngAfterViewInit` methods of the decorated class', async () => {
-      const finishMock = jest.fn();
-      const startChildMock = jest.fn(() => ({
-        end: finishMock,
-      }));
-
-      const customStartTransaction = jest.fn((ctx: any) => {
-        transaction = {
-          ...ctx,
-          startChild: startChildMock,
-        };
-
-        return transaction;
-      });
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-        components: [DecoratedComponent],
-        defaultComponent: DecoratedComponent,
-        useTraceService: false,
-      });
-
-      expect(transaction.startChild).toHaveBeenCalledWith({
-        name: '<DecoratedComponent>',
-        op: 'ui.angular.init',
-        origin: 'auto.ui.angular.trace_class_decorator',
-      });
-
-      expect(origNgOnInitMock).toHaveBeenCalledTimes(1);
-      expect(origNgAfterViewInitMock).toHaveBeenCalledTimes(1);
-      expect(finishMock).toHaveBeenCalledTimes(1);
-
-      env.destroy();
-    });
-  });
-
-  describe('TraceMethodDecorator', () => {
-    const origNgOnInitMock = jest.fn();
-    const origNgAfterViewInitMock = jest.fn();
-
-    @Component({
-      selector: 'layout-header',
-      template: '<router-outlet></router-outlet>',
-    })
-    class DecoratedComponent {
-      @TraceMethodDecorator()
-      public ngOnInit() {
-        origNgOnInitMock();
-      }
-
-      @TraceMethodDecorator()
-      public ngAfterViewInit() {
-        origNgAfterViewInitMock();
-      }
-    }
-
-    it('Instruments `ngOnInit` and `ngAfterViewInit` methods of the decorated class', async () => {
-      const startChildMock = jest.fn();
-
-      const customStartTransaction = jest.fn((ctx: any) => {
-        transaction = {
-          ...ctx,
-          startChild: startChildMock,
-        };
-
-        return transaction;
-      });
-
-      const env = await TestEnv.setup({
-        customStartTransaction,
-        components: [DecoratedComponent],
-        defaultComponent: DecoratedComponent,
-        useTraceService: false,
-      });
-
-      expect(transaction.startChild).toHaveBeenCalledTimes(2);
-      expect(transaction.startChild.mock.calls[0][0]).toEqual({
-        name: '<DecoratedComponent>',
-        op: 'ui.angular.ngOnInit',
-        origin: 'auto.ui.angular.trace_method_decorator',
-        startTimestamp: expect.any(Number),
-        endTimestamp: expect.any(Number),
-      });
-
-      expect(transaction.startChild.mock.calls[1][0]).toEqual({
-        name: '<DecoratedComponent>',
-        op: 'ui.angular.ngAfterViewInit',
-        origin: 'auto.ui.angular.trace_method_decorator',
-        startTimestamp: expect.any(Number),
-        endTimestamp: expect.any(Number),
-      });
-
-      expect(origNgOnInitMock).toHaveBeenCalledTimes(1);
-      expect(origNgAfterViewInitMock).toHaveBeenCalledTimes(1);
-
-      env.destroy();
-    });
   });
 });
diff --git a/packages/angular/test/utils/index.ts b/packages/angular/test/utils/index.ts
deleted file mode 100644
index 390d7fbe14ac..000000000000
--- a/packages/angular/test/utils/index.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { Provider } from '@angular/core';
-import { Component, NgModule } from '@angular/core';
-import type { ComponentFixture } from '@angular/core/testing';
-import { TestBed } from '@angular/core/testing';
-import type { Routes } from '@angular/router';
-import { Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import type { Transaction } from '@sentry/types';
-
-import { TraceService, instrumentAngularRouting } from '../../src';
-
-@Component({
-  template: '<router-outlet></router-outlet>',
-})
-export class AppComponent {}
-
-@NgModule({
-  providers: [
-    {
-      provide: TraceService,
-      deps: [Router],
-    },
-  ],
-})
-export class AppModule {}
-
-const defaultRoutes = [
-  {
-    path: '',
-    component: AppComponent,
-  },
-];
-
-export class TestEnv {
-  constructor(
-    public router: Router,
-    public fixture: ComponentFixture<unknown>,
-    public traceService: TraceService | null,
-  ) {
-    fixture.detectChanges();
-  }
-
-  public static async setup(conf: {
-    routes?: Routes;
-    components?: any[];
-    defaultComponent?: any;
-    customStartTransaction?: (context: any) => Transaction | undefined;
-    startTransactionOnPageLoad?: boolean;
-    startTransactionOnNavigation?: boolean;
-    useTraceService?: boolean;
-    additionalProviders?: Provider[];
-  }): Promise<TestEnv> {
-    // eslint-disable-next-line deprecation/deprecation
-    instrumentAngularRouting(
-      conf.customStartTransaction || jest.fn(),
-      conf.startTransactionOnPageLoad !== undefined ? conf.startTransactionOnPageLoad : true,
-      conf.startTransactionOnNavigation !== undefined ? conf.startTransactionOnNavigation : true,
-    );
-
-    const useTraceService = conf.useTraceService !== undefined ? conf.useTraceService : true;
-    const routes = conf.routes === undefined ? defaultRoutes : conf.routes;
-
-    TestBed.configureTestingModule({
-      imports: [AppModule, RouterTestingModule.withRoutes(routes)],
-      declarations: [...(conf.components || []), AppComponent],
-      providers: (useTraceService
-        ? [
-            {
-              provide: TraceService,
-              deps: [Router],
-            },
-            ...(conf.additionalProviders || []),
-          ]
-        : []
-      ).concat(...(conf.additionalProviders || [])),
-    });
-
-    const router: Router = TestBed.inject(Router);
-    const traceService = useTraceService ? new TraceService(router) : null;
-    const fixture = TestBed.createComponent(conf.defaultComponent || AppComponent);
-
-    return new TestEnv(router, fixture, traceService);
-  }
-
-  public async navigateInAngular(url: string): Promise<void> {
-    return new Promise(resolve => {
-      return this.fixture.ngZone?.run(() => {
-        void this.router
-          .navigateByUrl(url)
-          .then(() => {
-            this.fixture.detectChanges();
-            resolve();
-          })
-          .catch(() => {
-            this.fixture.detectChanges();
-            resolve();
-          });
-      });
-    });
-  }
-
-  public destroy(): void {
-    if (this.traceService) {
-      this.traceService.ngOnDestroy();
-    }
-
-    jest.clearAllMocks();
-  }
-}
diff --git a/packages/angular/tsconfig.ngc.json b/packages/angular/tsconfig.ngc.json
index 9dd04ce14239..a7449189e22b 100644
--- a/packages/angular/tsconfig.ngc.json
+++ b/packages/angular/tsconfig.ngc.json
@@ -5,8 +5,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "target": "es2015",
-    "lib": ["dom", "es2015"],
+    "target": "es2017",
+    "lib": ["dom", "es2017"],
     "baseUrl": "./"
   },
   "angularCompilerOptions": {
diff --git a/packages/astro/README.md b/packages/astro/README.md
index 696b5f948ab0..bbcf09f03720 100644
--- a/packages/astro/README.md
+++ b/packages/astro/README.md
@@ -12,12 +12,12 @@
 
 ## Links
 
- - [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/astro/)
+- [Official SDK Docs](https://docs.sentry.io/platforms/javascript/guides/astro/)
 
 ## SDK Status
 
-This SDK is in Beta and not yet fully stable.
-If you have feedback or encounter any bugs, feel free to [open an issue](https://github.com/getsentry/sentry-javascript/issues/new/choose).
+This SDK is in Beta and not yet fully stable. If you have feedback or encounter any bugs, feel free to
+[open an issue](https://github.com/getsentry/sentry-javascript/issues/new/choose).
 
 ## General
 
@@ -34,15 +34,15 @@ npx astro add @sentry/astro
 Add your DSN and source maps upload configuration:
 
 ```javascript
-import { defineConfig } from "astro/config";
-import sentry from "@sentry/astro";
+import { defineConfig } from 'astro/config';
+import sentry from '@sentry/astro';
 
 export default defineConfig({
   integrations: [
     sentry({
-      dsn: "__DSN__",
+      dsn: '__DSN__',
       sourceMapsUploadOptions: {
-        project: "your-sentry-project-slug",
+        project: 'your-sentry-project-slug',
         authToken: process.env.SENTRY_AUTH_TOKEN,
       },
     }),
@@ -50,7 +50,8 @@ export default defineConfig({
 });
 ```
 
-Follow [this guide](https://docs.sentry.io/product/accounts/auth-tokens/#organization-auth-tokens) to create an auth token and add it to your environment variables:
+Follow [this guide](https://docs.sentry.io/product/accounts/auth-tokens/#organization-auth-tokens) to create an auth
+token and add it to your environment variables:
 
 ```bash
 SENTRY_AUTH_TOKEN="your-token"
@@ -58,14 +59,15 @@ SENTRY_AUTH_TOKEN="your-token"
 
 ### Server Instrumentation
 
-For Astro apps configured for (hybrid) Server Side Rendering (SSR), the Sentry integration will automatically add middleware to your server to instrument incoming requests **if you're using Astro 3.5.2 or newer**.
+For Astro apps configured for (hybrid) Server Side Rendering (SSR), the Sentry integration will automatically add
+middleware to your server to instrument incoming requests **if you're using Astro 3.5.2 or newer**.
 
 If you're using Astro <3.5.2, complete the setup by adding the Sentry middleware to your `src/middleware.js` file:
 
 ```javascript
 // src/middleware.js
-import { sequence } from "astro:middleware";
-import * as Sentry from "@sentry/astro";
+import { sequence } from 'astro:middleware';
+import * as Sentry from '@sentry/astro';
 
 export const onRequest = sequence(
   Sentry.handleRequest(),
@@ -74,6 +76,7 @@ export const onRequest = sequence(
 ```
 
 The Sentry middleware enhances the data collected by Sentry on the server side by:
+
 - Enabeling distributed tracing between client and server
 - Collecting performance spans for incoming requests
 - Enhancing captured errors with additional information
@@ -83,26 +86,25 @@ The Sentry middleware enhances the data collected by Sentry on the server side b
 You can opt out of using the automatic sentry server instrumentation in your `astro.config.mjs` file:
 
 ```javascript
-import { defineConfig } from "astro/config";
-import sentry from "@sentry/astro";
+import { defineConfig } from 'astro/config';
+import sentry from '@sentry/astro';
 
 export default defineConfig({
   integrations: [
     sentry({
-      dsn: "__DSN__",
+      dsn: '__DSN__',
       autoInstrumentation: {
         requestHandler: false,
-      }
+      },
     }),
   ],
 });
 ```
 
-
 ## Configuration
 
 Check out our docs for configuring your SDK setup:
 
-* [Getting Started](https://docs.sentry.io/platforms/javascript/guides/astro/)
-* [Manual Setup and Configuration](https://docs.sentry.io/platforms/javascript/guides/astro/manual-setup/)
-* [Source Maps Upload](https://docs.sentry.io/platforms/javascript/guides/astro/sourcemaps/)
+- [Getting Started](https://docs.sentry.io/platforms/javascript/guides/astro/)
+- [Manual Setup and Configuration](https://docs.sentry.io/platforms/javascript/guides/astro/manual-setup/)
+- [Source Maps Upload](https://docs.sentry.io/platforms/javascript/guides/astro/sourcemaps/)
diff --git a/packages/astro/package.json b/packages/astro/package.json
index cea8347b19f6..f0a16b8fec1a 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -51,14 +51,13 @@
   "dependencies": {
     "@sentry/browser": "8.0.0-alpha.2",
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
     "@sentry/vite-plugin": "^2.14.2"
   },
   "devDependencies": {
     "astro": "^3.5.0",
-    "rollup": "^3.20.2",
     "vite": "4.0.5"
   },
   "scripts": {
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
index 39012cc546b3..1cc715c8345a 100644
--- a/packages/astro/src/index.server.ts
+++ b/packages/astro/src/index.server.ts
@@ -1,5 +1,5 @@
 // Node SDK exports
-// Unfortunately, we cannot `export * from '@sentry/node-experimental'` because in prod builds,
+// Unfortunately, we cannot `export * from '@sentry/node'` because in prod builds,
 // Vite puts these exports into a `default` property (Sentry.default) rather than
 // on the top - level namespace.
 
@@ -37,7 +37,6 @@ export {
   setHttpStatus,
   withScope,
   withIsolationScope,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
   makeNodeTransport,
   getDefaultIntegrations,
   defaultStackParser,
@@ -47,7 +46,6 @@ export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
   extractRequestData,
-  Integrations,
   consoleIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
@@ -59,13 +57,14 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
-  Handlers,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
   continueTrace,
   cron,
   parameterize,
@@ -73,10 +72,25 @@ export {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/node-experimental';
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+} from '@sentry/node';
 
 // We can still leave this for the carrier init and type exports
-export * from '@sentry/node-experimental';
+export * from '@sentry/node';
 
 export { init } from './server/sdk';
 
diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
index 11ea06bae7c1..dad62a288d53 100644
--- a/packages/astro/src/index.types.ts
+++ b/packages/astro/src/index.types.ts
@@ -13,10 +13,6 @@ import sentryAstro from './index.server';
 /** Initializes Sentry Astro SDK */
 export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): void;
 
-// We only export server Integrations for now, until the exports are removed from Svelte and Node SDKs.
-// Necessary to avoid type collision.
-export declare const Integrations: typeof serverSdk.Integrations;
-
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
 
@@ -26,5 +22,14 @@ export declare const defaultStackParser: StackParser;
 export declare function close(timeout?: number | undefined): PromiseLike<boolean>;
 export declare function flush(timeout?: number | undefined): PromiseLike<boolean>;
 
+// eslint-disable-next-line deprecation/deprecation
+export declare const makeMain: typeof clientSdk.makeMain;
+// eslint-disable-next-line deprecation/deprecation
+export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
+export declare const getClient: typeof clientSdk.getClient;
+export declare const continueTrace: typeof clientSdk.continueTrace;
+
+export declare const Span: clientSdk.Span;
+
 export declare const metrics: typeof clientSdk.metrics & typeof serverSdk.metrics;
 export default sentryAstro;
diff --git a/packages/astro/src/integration/index.ts b/packages/astro/src/integration/index.ts
index eedbd9407adf..15e48cb49f12 100644
--- a/packages/astro/src/integration/index.ts
+++ b/packages/astro/src/integration/index.ts
@@ -91,7 +91,7 @@ export const sentryAstro = (options: SentryOptions = {}): AstroIntegration => {
                   // @sentry/node is required in case we have 2 different @sentry/node
                   // packages installed in the same project.
                   // Ref: https://github.com/getsentry/sentry-javascript/issues/10121
-                  noExternal: ['@sentry/astro', '@sentry/node-experimental', '@sentry/node'],
+                  noExternal: ['@sentry/astro', '@sentry/node'],
                 },
               },
             });
diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts
index b5c0e599754a..ec0dbb11d09a 100644
--- a/packages/astro/src/server/middleware.ts
+++ b/packages/astro/src/server/middleware.ts
@@ -1,13 +1,15 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, setHttpStatus } from '@sentry/core';
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   captureException,
   continueTrace,
   getActiveSpan,
   getClient,
   getCurrentScope,
+  setHttpStatus,
   startSpan,
   withIsolationScope,
-} from '@sentry/node-experimental';
+} from '@sentry/node';
 import type { Client, Scope, Span, SpanAttributes } from '@sentry/types';
 import { addNonEnumerableProperty, objectify, stripUrlQueryAndFragment } from '@sentry/utils';
 import type { APIContext, MiddlewareResponseHandler } from 'astro';
diff --git a/packages/astro/src/server/sdk.ts b/packages/astro/src/server/sdk.ts
index d7b4983a7bc3..a34a33cad31d 100644
--- a/packages/astro/src/server/sdk.ts
+++ b/packages/astro/src/server/sdk.ts
@@ -1,15 +1,22 @@
 import { applySdkMetadata } from '@sentry/core';
-import type { NodeOptions } from '@sentry/node-experimental';
-import { init as initNodeSdk, setTag } from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
+import { getDefaultIntegrations } from '@sentry/node';
+import { init as initNodeSdk, setTag } from '@sentry/node';
 
 /**
  *
  * @param options
  */
 export function init(options: NodeOptions): void {
-  applySdkMetadata(options, 'astro', ['astro', 'node']);
+  const opts = {
+    ...options,
+    // TODO v8: For now, we disable the Prisma integration, because that has weird esm-cjs interop issues
+    // We should figure these out and fix these before v8 goes stable.
+    defaultIntegrations: getDefaultIntegrations(options).filter(integration => integration.name !== 'Prisma'),
+  };
+  applySdkMetadata(opts, 'astro', ['astro', 'node']);
 
-  initNodeSdk(options);
+  initNodeSdk(opts);
 
   setTag('runtime', 'node');
 }
diff --git a/packages/astro/test/client/sdk.test.ts b/packages/astro/test/client/sdk.test.ts
index a344cd326bb6..23078dec65f5 100644
--- a/packages/astro/test/client/sdk.test.ts
+++ b/packages/astro/test/client/sdk.test.ts
@@ -1,11 +1,15 @@
 import type { BrowserClient } from '@sentry/browser';
-import { getActiveSpan } from '@sentry/browser';
-import { browserTracingIntegration } from '@sentry/browser';
+import {
+  browserTracingIntegration,
+  getActiveSpan,
+  getCurrentScope,
+  getGlobalScope,
+  getIsolationScope,
+} from '@sentry/browser';
 import * as SentryBrowser from '@sentry/browser';
 import { SDK_VERSION, getClient } from '@sentry/browser';
 import { vi } from 'vitest';
 
-import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
 import { init } from '../../../astro/src/client/sdk';
 
 const browserInit = vi.spyOn(SentryBrowser, 'init');
diff --git a/packages/astro/test/server/meta.test.ts b/packages/astro/test/server/meta.test.ts
index 37506cb118b7..8b65beaa4eaf 100644
--- a/packages/astro/test/server/meta.test.ts
+++ b/packages/astro/test/server/meta.test.ts
@@ -5,7 +5,7 @@ import { vi } from 'vitest';
 
 import { getTracingMetaTags, isValidBaggageString } from '../../src/server/meta';
 
-const TRACE_FLAG_SAMPLED = 0x1;
+const TRACE_FLAG_SAMPLED = 1;
 
 const mockedSpan = new SentrySpan({
   traceId: '12345678901234567890123456789012',
diff --git a/packages/astro/test/server/middleware.test.ts b/packages/astro/test/server/middleware.test.ts
index cd5caec43c48..a678fcceaee6 100644
--- a/packages/astro/test/server/middleware.test.ts
+++ b/packages/astro/test/server/middleware.test.ts
@@ -1,5 +1,5 @@
 import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import * as SentryNode from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
 import type { Client, Span } from '@sentry/types';
 import { vi } from 'vitest';
 
diff --git a/packages/astro/test/server/sdk.test.ts b/packages/astro/test/server/sdk.test.ts
index b1dc3821c88f..1b042ee5331a 100644
--- a/packages/astro/test/server/sdk.test.ts
+++ b/packages/astro/test/server/sdk.test.ts
@@ -1,5 +1,5 @@
-import * as SentryNode from '@sentry/node-experimental';
-import { SDK_VERSION } from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
+import { SDK_VERSION } from '@sentry/node';
 import { vi } from 'vitest';
 
 import { init } from '../../src/server/sdk';
diff --git a/packages/serverless/.eslintrc.js b/packages/aws-serverless/.eslintrc.js
similarity index 100%
rename from packages/serverless/.eslintrc.js
rename to packages/aws-serverless/.eslintrc.js
diff --git a/packages/serverless/LICENSE b/packages/aws-serverless/LICENSE
similarity index 100%
rename from packages/serverless/LICENSE
rename to packages/aws-serverless/LICENSE
diff --git a/packages/aws-serverless/README.md b/packages/aws-serverless/README.md
new file mode 100644
index 000000000000..5a1ea8a1cc00
--- /dev/null
+++ b/packages/aws-serverless/README.md
@@ -0,0 +1,67 @@
+<p align="center">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
+  </a>
+</p>
+
+# Official Sentry SDK for Serverless environments
+
+## Links
+
+- [Official SDK Docs](https://docs.sentry.io/)
+- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
+
+## General
+
+This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
+methods available in `@sentry/node` can be imported from `@sentry/aws-serverless`.
+
+Currently supported environment:
+
+### AWS Lambda
+
+To use this SDK, call `Sentry.init(options)` at the very beginning of your JavaScript file.
+
+```javascript
+import * as Sentry from '@sentry/aws-serverless';
+
+Sentry.init({
+  dsn: '__DSN__',
+  // ...
+});
+
+// async (recommended)
+exports.handler = Sentry.wrapHandler(async (event, context) => {
+  throw new Error('oh, hello there!');
+});
+
+// sync
+exports.handler = Sentry.wrapHandler((event, context, callback) => {
+  throw new Error('oh, hello there!');
+});
+```
+
+If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the
+`tracesSampleRate` option.
+
+```javascript
+import * as Sentry from '@sentry/aws-serverless';
+
+Sentry.AWSLambda.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+});
+```
+
+#### Integrate Sentry using internal extension
+
+Another and much simpler way to integrate Sentry to your AWS Lambda function is to add an official layer.
+
+1. Choose Layers -> Add Layer.
+2. Specify an ARN: `arn:aws:lambda:us-west-1:TODO:layer:TODO:VERSION`.
+3. Go to Environment variables and add:
+   - `NODE_OPTIONS`: `-r @sentry/aws-serverless/build/npm/cjs/awslambda-auto`.
+   - `SENTRY_DSN`: `your dsn`.
+   - `SENTRY_TRACES_SAMPLE_RATE`: a number between 0 and 1 representing the chance a transaction is sent to Sentry. For
+     more information, see
+     [docs](https://docs.sentry.io/platforms/node/guides/aws-lambda/configuration/options/#tracesSampleRate).
diff --git a/packages/serverless/jest.config.js b/packages/aws-serverless/jest.config.js
similarity index 100%
rename from packages/serverless/jest.config.js
rename to packages/aws-serverless/jest.config.js
diff --git a/packages/serverless/package.json b/packages/aws-serverless/package.json
similarity index 85%
rename from packages/serverless/package.json
rename to packages/aws-serverless/package.json
index f5324520cf73..431609842da1 100644
--- a/packages/serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,23 +1,30 @@
 {
-  "name": "@sentry/serverless",
+  "name": "@sentry/aws-serverless",
   "version": "8.0.0-alpha.2",
-  "description": "Official Sentry SDK for various serverless solutions",
+  "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
-    "esm",
     "types",
     "types-ts3.8"
   ],
   "main": "build/npm/cjs/index.js",
-  "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -30,21 +37,16 @@
   },
   "dependencies": {
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
     "@types/aws-lambda": "^8.10.62",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
-    "@google-cloud/bigquery": "^5.3.0",
-    "@google-cloud/common": "^3.4.1",
-    "@google-cloud/functions-framework": "^1.7.1",
-    "@google-cloud/pubsub": "^2.5.0",
     "@types/node": "^14.6.4",
     "aws-sdk": "^2.765.0",
     "find-up": "^5.0.0",
-    "google-gax": "^2.9.0",
     "nock": "^13.0.4",
     "npm-packlist": "^2.1.4"
   },
diff --git a/packages/serverless/rollup.aws.config.mjs b/packages/aws-serverless/rollup.aws.config.mjs
similarity index 74%
rename from packages/serverless/rollup.aws.config.mjs
rename to packages/aws-serverless/rollup.aws.config.mjs
index 5d9883a3f9f7..22656f397140 100644
--- a/packages/serverless/rollup.aws.config.mjs
+++ b/packages/aws-serverless/rollup.aws.config.mjs
@@ -6,13 +6,12 @@ export default [
     makeBaseBundleConfig({
       // this automatically sets it to be CJS
       bundleType: 'node',
-      entrypoints: ['src/index.awslambda.ts'],
-      jsVersion: 'es6',
-      licenseTitle: '@sentry/serverless',
+      entrypoints: ['src/index.ts'],
+      licenseTitle: '@sentry/aws-serverless',
       outputFileBase: () => 'index',
       packageSpecificConfig: {
         output: {
-          dir: 'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/build/npm/cjs',
+          dir: 'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/build/npm/cjs',
           sourcemap: false,
         },
       },
@@ -22,10 +21,6 @@ export default [
     // it to be `index.js` in the build script, since it's standing in for the index file of the npm package.
     { variants: ['.min.js'] },
   ),
-
-  // This builds a wrapper file, which our lambda layer integration automatically sets up to run as soon as node
-  // launches (via the `NODE_OPTIONS="-r @sentry/serverless/dist/awslambda-auto"` variable). Note the inclusion in this
-  // path of the legacy `dist` folder; for backwards compatibility, in the build script we'll copy the file there.
   makeBaseNPMConfig({
     entrypoints: ['src/awslambda-auto.ts'],
     packageSpecificConfig: {
@@ -33,7 +28,7 @@ export default [
       // and the directory structure is different than normal, so we have to do it ourselves.
       output: {
         format: 'cjs',
-        dir: 'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/build/npm/cjs',
+        dir: 'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/build/npm/cjs',
         sourcemap: false,
       },
       // We only want `awslambda-auto.js`, not the modules that it imports, because they're all included in the bundle
diff --git a/packages/serverless/rollup.npm.config.mjs b/packages/aws-serverless/rollup.npm.config.mjs
similarity index 96%
rename from packages/serverless/rollup.npm.config.mjs
rename to packages/aws-serverless/rollup.npm.config.mjs
index b51a3bdafdb5..ff28359cfeed 100644
--- a/packages/serverless/rollup.npm.config.mjs
+++ b/packages/aws-serverless/rollup.npm.config.mjs
@@ -9,4 +9,5 @@ export default makeNPMConfigVariants(
     // packages with bundles have a different build directory structure
     hasBundles: true,
   }),
+  { emitEsm: false },
 );
diff --git a/packages/serverless/scripts/buildLambdaLayer.ts b/packages/aws-serverless/scripts/buildLambdaLayer.ts
similarity index 84%
rename from packages/serverless/scripts/buildLambdaLayer.ts
rename to packages/aws-serverless/scripts/buildLambdaLayer.ts
index 3522ff021a33..310cfe606ca0 100644
--- a/packages/serverless/scripts/buildLambdaLayer.ts
+++ b/packages/aws-serverless/scripts/buildLambdaLayer.ts
@@ -20,27 +20,27 @@ async function buildLambdaLayer(): Promise<void> {
   // We build a minified bundle, but it's standing in for the regular `index.js` file listed in `package.json`'s `main`
   // property, so we have to rename it so it's findable.
   fs.renameSync(
-    'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/build/npm/cjs/index.min.js',
-    'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/build/npm/cjs/index.js',
+    'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/build/npm/cjs/index.min.js',
+    'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/build/npm/cjs/index.js',
   );
 
   // We're creating a bundle for the SDK, but still using it in a Node context, so we need to copy in `package.json`,
   // purely for its `main` property.
   console.log('Copying `package.json` into lambda layer.');
-  fs.copyFileSync('package.json', 'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/package.json');
+  fs.copyFileSync('package.json', 'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/package.json');
 
   // The layer also includes `awslambda-auto.js`, a helper file which calls `Sentry.init()` and wraps the lambda
   // handler. It gets run when Node is launched inside the lambda, using the environment variable
   //
-  //   `NODE_OPTIONS="-r @sentry/serverless/dist/awslambda-auto"`.
+  //   `NODE_OPTIONS="-r @sentry/aws-serverless/dist/awslambda-auto"`.
   //
   // (The`-r` is what runs the script on startup.) The `dist` directory is no longer where we emit our built code, so
   // for backwards compatibility, we create a symlink.
   console.log('Creating symlink for `awslambda-auto.js` in legacy `dist` directory.');
-  fsForceMkdirSync('build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/dist');
+  fsForceMkdirSync('build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/dist');
   fs.symlinkSync(
     '../build/npm/cjs/awslambda-auto.js',
-    'build/aws/dist-serverless/nodejs/node_modules/@sentry/serverless/dist/awslambda-auto.js',
+    'build/aws/dist-serverless/nodejs/node_modules/@sentry/aws-serverless/dist/awslambda-auto.js',
   );
 
   const zipFilename = `sentry-node-serverless-${version}.zip`;
diff --git a/packages/serverless/src/awslambda-auto.ts b/packages/aws-serverless/src/awslambda-auto.ts
similarity index 65%
rename from packages/serverless/src/awslambda-auto.ts
rename to packages/aws-serverless/src/awslambda-auto.ts
index ac048cde5aed..6287b35e8651 100644
--- a/packages/serverless/src/awslambda-auto.ts
+++ b/packages/aws-serverless/src/awslambda-auto.ts
@@ -1,4 +1,4 @@
-import * as Sentry from './index';
+import { init, tryPatchHandler } from './awslambda';
 
 const lambdaTaskRoot = process.env.LAMBDA_TASK_ROOT;
 if (lambdaTaskRoot) {
@@ -7,11 +7,9 @@ if (lambdaTaskRoot) {
     throw Error(`LAMBDA_TASK_ROOT is non-empty(${lambdaTaskRoot}) but _HANDLER is not set`);
   }
 
-  Sentry.AWSLambda.init({
-    _invokedByLambdaLayer: true,
-  });
+  init();
 
-  Sentry.AWSLambda.tryPatchHandler(lambdaTaskRoot, handlerString);
+  tryPatchHandler(lambdaTaskRoot, handlerString);
 } else {
   throw Error('LAMBDA_TASK_ROOT environment variable is not set');
 }
diff --git a/packages/serverless/src/awslambda.ts b/packages/aws-serverless/src/awslambda.ts
similarity index 95%
rename from packages/serverless/src/awslambda.ts
rename to packages/aws-serverless/src/awslambda.ts
index 5a6fcea389fa..b918494fdb90 100644
--- a/packages/serverless/src/awslambda.ts
+++ b/packages/aws-serverless/src/awslambda.ts
@@ -2,9 +2,9 @@ import { existsSync } from 'fs';
 import { hostname } from 'os';
 import { basename, resolve } from 'path';
 import { types } from 'util';
-import type { NodeOptions } from '@sentry/node-experimental';
-import { SDK_VERSION } from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
 import {
+  SDK_VERSION,
   captureException,
   captureMessage,
   continueTrace,
@@ -14,7 +14,7 @@ import {
   init as initNode,
   startSpanManual,
   withScope,
-} from '@sentry/node-experimental';
+} from '@sentry/node';
 import type { Integration, Options, Scope, SdkMetadata, Span } from '@sentry/types';
 import { isString, logger } from '@sentry/utils';
 import type { Context, Handler } from 'aws-lambda';
@@ -26,8 +26,6 @@ import { awsServicesIntegration } from './awsservices';
 import { DEBUG_BUILD } from './debug-build';
 import { markEventUnhandled } from './utils';
 
-export * from '@sentry/node-experimental';
-
 const { isPromise } = types;
 
 // https://www.npmjs.com/package/aws-lambda-consumer
@@ -70,20 +68,12 @@ export function getDefaultIntegrations(options: Options): Integration[] {
   return [...getNodeDefaultIntegrations(options), awsServicesIntegration({ optional: true })];
 }
 
-interface AWSLambdaOptions extends NodeOptions {
-  /**
-   * Internal field that is set to `true` when init() is called by the Sentry AWS Lambda layer.
-   *
-   */
-  _invokedByLambdaLayer?: boolean;
-}
-
 /**
  * Initializes the Sentry AWS Lambda SDK.
  *
  * @param options Configuration options for the SDK, @see {@link AWSLambdaOptions}.
  */
-export function init(options: AWSLambdaOptions = {}): void {
+export function init(options: NodeOptions = {}): void {
   const opts = {
     _metadata: {} as SdkMetadata,
     defaultIntegrations: getDefaultIntegrations(options),
@@ -91,11 +81,11 @@ export function init(options: AWSLambdaOptions = {}): void {
   };
 
   opts._metadata.sdk = opts._metadata.sdk || {
-    name: 'sentry.javascript.serverless',
+    name: 'sentry.javascript.aws-serverless',
     integrations: ['AWSLambda'],
     packages: [
       {
-        name: 'npm:@sentry/serverless',
+        name: 'npm:@sentry/aws-serverless',
         version: SDK_VERSION,
       },
     ],
diff --git a/packages/serverless/src/awsservices.ts b/packages/aws-serverless/src/awsservices.ts
similarity index 83%
rename from packages/serverless/src/awsservices.ts
rename to packages/aws-serverless/src/awsservices.ts
index 33e4816ac836..e8a46c6fda00 100644
--- a/packages/serverless/src/awsservices.ts
+++ b/packages/aws-serverless/src/awsservices.ts
@@ -1,6 +1,6 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
-import { getClient, startInactiveSpan } from '@sentry/node-experimental';
-import type { Client, Integration, IntegrationClass, IntegrationFn, Span } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import { getClient, startInactiveSpan } from '@sentry/node';
+import type { Client, IntegrationFn, Span } from '@sentry/types';
 import { fill } from '@sentry/utils';
 // 'aws-sdk/global' import is expected to be type-only so it's erased in the final .js file.
 // When TypeScript compiler is upgraded, use `import type` syntax to explicitly assert that we don't want to load a module here.
@@ -41,21 +41,10 @@ const _awsServicesIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const awsServicesIntegration = defineIntegration(_awsServicesIntegration);
-
 /**
  * AWS Service Request Tracking.
- *
- * @deprecated Use `awsServicesIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const AWSServices = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  awsServicesIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type AWSServices = typeof AWSServices;
+export const awsServicesIntegration = defineIntegration(_awsServicesIntegration);
 
 /**
  * Patches AWS SDK request to create `http.client` spans.
@@ -64,10 +53,10 @@ function wrapMakeRequest<TService extends AWSService, TResult>(
   orig: MakeRequestFunction<GenericParams, TResult>,
 ): MakeRequestFunction<GenericParams, TResult> {
   return function (this: TService, operation: string, params?: GenericParams, callback?: MakeRequestCallback<TResult>) {
-    let span: Span | undefined;
     const req = orig.call(this, operation, params);
 
     if (SETUP_CLIENTS.has(getClient() as Client)) {
+      let span: Span | undefined;
       req.on('afterBuild', () => {
         span = startInactiveSpan({
           name: describe(this, operation, params),
@@ -79,9 +68,7 @@ function wrapMakeRequest<TService extends AWSService, TResult>(
         });
       });
       req.on('complete', () => {
-        if (span) {
-          span.end();
-        }
+        span?.end();
       });
     }
 
diff --git a/packages/feedback/src/debug-build.ts b/packages/aws-serverless/src/debug-build.ts
similarity index 100%
rename from packages/feedback/src/debug-build.ts
rename to packages/aws-serverless/src/debug-build.ts
diff --git a/packages/serverless/src/index.ts b/packages/aws-serverless/src/index.ts
similarity index 58%
rename from packages/serverless/src/index.ts
rename to packages/aws-serverless/src/index.ts
index 5e153ae7f4c5..d439c016faa7 100644
--- a/packages/serverless/src/index.ts
+++ b/packages/aws-serverless/src/index.ts
@@ -1,103 +1,94 @@
-// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
-import * as AWSLambda from './awslambda';
-import * as GCPFunction from './gcpfunction';
-export { AWSLambda, GCPFunction };
-
-// eslint-disable-next-line deprecation/deprecation
-export { AWSServices, awsServicesIntegration } from './awsservices';
-
-// TODO(v8): We have to explicitly export these because of the namespace exports
-// above. This is because just doing `export * from '@sentry/node-experimental'` will not
-// work with Node native esm while we also have namespace exports in a package.
-// What we should do is get rid of the namespace exports.
 export {
-  Hub,
-  SDK_VERSION,
-  Scope,
-  addBreadcrumb,
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
+  addBreadcrumb,
   addIntegration,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
-  captureEvent,
   captureException,
+  captureEvent,
   captureMessage,
   captureCheckIn,
+  startSession,
+  captureSession,
+  endSession,
   withMonitor,
   createTransport,
   // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
   getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
-  getSpanStatusFromHttpCode,
-  setHttpStatus,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
+  Hub,
   setCurrentClient,
+  Scope,
+  SDK_VERSION,
   setContext,
   setExtra,
   setExtras,
   setTag,
   setTags,
   setUser,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
+  getSpanStatusFromHttpCode,
+  setHttpStatus,
   withScope,
   withIsolationScope,
-  NodeClient,
   makeNodeTransport,
-  close,
-  getDefaultIntegrations,
+  NodeClient,
   defaultStackParser,
   flush,
+  close,
   getSentryRelease,
-  init,
-  DEFAULT_USER_INCLUDES,
   addRequestDataToEvent,
+  DEFAULT_USER_INCLUDES,
   extractRequestData,
-  Handlers,
-  // eslint-disable-next-line deprecation/deprecation
-  Integrations,
-  setMeasurement,
-  getActiveSpan,
-  startSpan,
-  startInactiveSpan,
-  startSpanManual,
-  withActiveSpan,
-  continueTrace,
-  parameterize,
-  requestDataIntegration,
-  linkedErrorsIntegration,
-  inboundFiltersIntegration,
-  functionToStringIntegration,
   createGetModuleFromFilename,
-  metrics,
+  anrIntegration,
   consoleIntegration,
+  httpIntegration,
+  nativeNodeFetchIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
   modulesIntegration,
   contextLinesIntegration,
   nodeContextIntegration,
   localVariablesIntegration,
-  anrIntegration,
-  hapiIntegration,
-  httpIntegration,
-  nativeNodeFetchintegration,
-  spotlightIntegration,
+  requestDataIntegration,
+  functionToStringIntegration,
+  inboundFiltersIntegration,
+  linkedErrorsIntegration,
+  setMeasurement,
+  getActiveSpan,
+  startSpan,
+  startInactiveSpan,
+  startSpanManual,
+  withActiveSpan,
+  getRootSpan,
+  getSpanDescendants,
+  continueTrace,
+  getAutoPerformanceIntegrations,
+  cron,
+  metrics,
+  parameterize,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-  startSession,
-  captureSession,
-  endSession,
-} from '@sentry/node-experimental';
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+} from '@sentry/node';
 
 export {
   captureConsoleIntegration,
@@ -107,3 +98,8 @@ export {
   rewriteFramesIntegration,
   sessionTimingIntegration,
 } from '@sentry/core';
+
+export { getDefaultIntegrations, init, tryPatchHandler, wrapHandler } from './awslambda';
+export type { WrapperOptions } from './awslambda';
+
+export { awsServicesIntegration } from './awsservices';
diff --git a/packages/aws-serverless/src/utils.ts b/packages/aws-serverless/src/utils.ts
new file mode 100644
index 000000000000..259388bb193c
--- /dev/null
+++ b/packages/aws-serverless/src/utils.ts
@@ -0,0 +1,14 @@
+import type { Scope } from '@sentry/types';
+import { addExceptionMechanism } from '@sentry/utils';
+
+/**
+ * Marks an event as unhandled by adding a span processor to the passed scope.
+ */
+export function markEventUnhandled(scope: Scope): Scope {
+  scope.addEventProcessor(event => {
+    addExceptionMechanism(event, { handled: false });
+    return event;
+  });
+
+  return scope;
+}
diff --git a/packages/serverless/test/__mocks__/dns.ts b/packages/aws-serverless/test/__mocks__/dns.ts
similarity index 100%
rename from packages/serverless/test/__mocks__/dns.ts
rename to packages/aws-serverless/test/__mocks__/dns.ts
diff --git a/packages/serverless/test/awslambda.test.ts b/packages/aws-serverless/test/awslambda.test.ts
similarity index 98%
rename from packages/serverless/test/awslambda.test.ts
rename to packages/aws-serverless/test/awslambda.test.ts
index 964c760f0ca3..bc37f8dfc0a8 100644
--- a/packages/serverless/test/awslambda.test.ts
+++ b/packages/aws-serverless/test/awslambda.test.ts
@@ -20,8 +20,8 @@ const mockScope = {
   addEventProcessor: jest.fn(),
 };
 
-jest.mock('@sentry/node-experimental', () => {
-  const original = jest.requireActual('@sentry/node-experimental');
+jest.mock('@sentry/node', () => {
+  const original = jest.requireActual('@sentry/node');
   return {
     ...original,
     init: (options: unknown) => {
@@ -517,11 +517,11 @@ describe('AWSLambda', () => {
         expect.objectContaining({
           _metadata: {
             sdk: {
-              name: 'sentry.javascript.serverless',
+              name: 'sentry.javascript.aws-serverless',
               integrations: ['AWSLambda'],
               packages: [
                 {
-                  name: 'npm:@sentry/serverless',
+                  name: 'npm:@sentry/aws-serverless',
                   version: expect.any(String),
                 },
               ],
diff --git a/packages/serverless/test/awsservices.test.ts b/packages/aws-serverless/test/awsservices.test.ts
similarity index 97%
rename from packages/serverless/test/awsservices.test.ts
rename to packages/aws-serverless/test/awsservices.test.ts
index c48abb173e16..3170f9056ec0 100644
--- a/packages/serverless/test/awsservices.test.ts
+++ b/packages/aws-serverless/test/awsservices.test.ts
@@ -1,4 +1,4 @@
-import { NodeClient, createTransport, setCurrentClient } from '@sentry/node-experimental';
+import { NodeClient, createTransport, setCurrentClient } from '@sentry/node';
 import * as AWS from 'aws-sdk';
 import * as nock from 'nock';
 
@@ -8,9 +8,9 @@ import { awsServicesIntegration } from '../src/awsservices';
 const mockSpanEnd = jest.fn();
 const mockStartInactiveSpan = jest.fn(spanArgs => ({ ...spanArgs }));
 
-jest.mock('@sentry/node-experimental', () => {
+jest.mock('@sentry/node', () => {
   return {
-    ...jest.requireActual('@sentry/node-experimental'),
+    ...jest.requireActual('@sentry/node'),
     startInactiveSpan: (ctx: unknown) => {
       mockStartInactiveSpan(ctx);
       return { end: mockSpanEnd };
diff --git a/packages/serverless/tsconfig.json b/packages/aws-serverless/tsconfig.json
similarity index 100%
rename from packages/serverless/tsconfig.json
rename to packages/aws-serverless/tsconfig.json
diff --git a/packages/serverless/tsconfig.test.json b/packages/aws-serverless/tsconfig.test.json
similarity index 100%
rename from packages/serverless/tsconfig.test.json
rename to packages/aws-serverless/tsconfig.test.json
diff --git a/packages/serverless/tsconfig.types.json b/packages/aws-serverless/tsconfig.types.json
similarity index 100%
rename from packages/serverless/tsconfig.types.json
rename to packages/aws-serverless/tsconfig.types.json
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 876e3c45889d..1a6a79c0cc41 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
+      "require": {
+        "types": "./build/npm.types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -64,9 +77,7 @@
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",
     "build:dev": "yarn build",
-    "build:bundle": "run-p build:bundle:es5 build:bundle:es6",
-    "build:bundle:es5": "JS_VERSION=es5 rollup -c rollup.bundle.config.mjs",
-    "build:bundle:es6": "JS_VERSION=es6 rollup -c rollup.bundle.config.mjs",
+    "build:bundle": "rollup -c rollup.bundle.config.mjs",
     "build:transpile": "rollup -c rollup.npm.config.mjs",
     "build:types": "run-s build:types:core build:types:downlevel",
     "build:types:core": "tsc -p tsconfig.types.json",
@@ -81,10 +92,7 @@
     "clean": "rimraf build coverage .rpt2_cache sentry-browser-*.tgz",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
-    "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\";}'",
+    "size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
     "test": "yarn test:unit",
     "test:unit": "jest",
     "test:integration": "test/integration/run.js",
diff --git a/packages/browser/rollup.bundle.config.mjs b/packages/browser/rollup.bundle.config.mjs
index d262f1a1bc51..7ebddd4e2f04 100644
--- a/packages/browser/rollup.bundle.config.mjs
+++ b/packages/browser/rollup.bundle.config.mjs
@@ -2,12 +2,6 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal
 
 const builds = [];
 
-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"');
-}
-
 const browserPluggableIntegrationFiles = ['contextlines', 'httpclient', 'reportingobserver'];
 
 const corePluggableIntegrationFiles = [
@@ -19,90 +13,77 @@ const corePluggableIntegrationFiles = [
   'sessiontiming',
 ];
 
-targets.forEach(jsVersion => {
-  const baseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.ts'],
-    jsVersion,
-    licenseTitle: '@sentry/browser',
-    outputFileBase: () => `bundles/bundle${jsVersion === 'es5' ? '.es5' : ''}`,
-  });
-
-  const tracingBaseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.tracing.ts'],
-    jsVersion,
-    licenseTitle: '@sentry/browser (Performance Monitoring)',
-    outputFileBase: () => `bundles/bundle.tracing${jsVersion === 'es5' ? '.es5' : ''}`,
+browserPluggableIntegrationFiles.forEach(integrationName => {
+  const integrationsBundleConfig = makeBaseBundleConfig({
+    bundleType: 'addon',
+    entrypoints: [`src/integrations/${integrationName}.ts`],
+    licenseTitle: `@sentry/browser - ${integrationName}`,
+    outputFileBase: () => `bundles/${integrationName}`,
   });
 
-  browserPluggableIntegrationFiles.forEach(integrationName => {
-    const integrationsBundleConfig = makeBaseBundleConfig({
-      bundleType: 'addon',
-      entrypoints: [`src/integrations/${integrationName}.ts`],
-      jsVersion,
-      licenseTitle: `@sentry/browser - ${integrationName}`,
-      outputFileBase: () => `bundles/${integrationName}${jsVersion === 'es5' ? '.es5' : ''}`,
-    });
+  builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
+});
 
-    builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
+corePluggableIntegrationFiles.forEach(integrationName => {
+  const integrationsBundleConfig = makeBaseBundleConfig({
+    bundleType: 'addon',
+    entrypoints: [`src/integrations-bundle/index.${integrationName}.ts`],
+    licenseTitle: `@sentry/browser - ${integrationName}`,
+    outputFileBase: () => `bundles/${integrationName}`,
   });
 
-  corePluggableIntegrationFiles.forEach(integrationName => {
-    const integrationsBundleConfig = makeBaseBundleConfig({
-      bundleType: 'addon',
-      entrypoints: [`src/integrations-bundle/index.${integrationName}.ts`],
-      jsVersion,
-      licenseTitle: `@sentry/browser - ${integrationName}`,
-      outputFileBase: () => `bundles/${integrationName}${jsVersion === 'es5' ? '.es5' : ''}`,
-    });
+  builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
+});
 
-    builds.push(...makeBundleConfigVariants(integrationsBundleConfig));
-  });
+const baseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.ts'],
+  licenseTitle: '@sentry/browser',
+  outputFileBase: () => 'bundles/bundle',
+});
 
-  builds.push(...makeBundleConfigVariants(baseBundleConfig), ...makeBundleConfigVariants(tracingBaseBundleConfig));
+const tracingBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.tracing.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring)',
+  outputFileBase: () => 'bundles/bundle.tracing',
 });
 
-if (targets.includes('es6')) {
-  // Replay/Feedback 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 replayBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.replay.ts'],
+  licenseTitle: '@sentry/browser & @sentry/replay',
+  outputFileBase: () => 'bundles/bundle.replay',
+});
 
-  const feedbackBaseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.feedback.ts'],
-    jsVersion: 'es6',
-    licenseTitle: '@sentry/browser & @sentry/feedback',
-    outputFileBase: () => 'bundles/bundle.feedback',
-  });
+const feedbackBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.feedback.ts'],
+  licenseTitle: '@sentry/browser & @sentry/feedback',
+  outputFileBase: () => 'bundles/bundle.feedback',
+});
 
-  const tracingReplayBaseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.tracing.replay.ts'],
-    jsVersion: 'es6',
-    licenseTitle: '@sentry/browser (Performance Monitoring and Replay)',
-    outputFileBase: () => 'bundles/bundle.tracing.replay',
-  });
+const tracingReplayBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.tracing.replay.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring and Replay)',
+  outputFileBase: () => 'bundles/bundle.tracing.replay',
+});
 
-  const tracingReplayFeedbackBaseBundleConfig = makeBaseBundleConfig({
-    bundleType: 'standalone',
-    entrypoints: ['src/index.bundle.tracing.replay.feedback.ts'],
-    jsVersion: 'es6',
-    licenseTitle: '@sentry/browser (Performance Monitoring, Replay, and Feedback)',
-    outputFileBase: () => 'bundles/bundle.tracing.replay.feedback',
-  });
+const tracingReplayFeedbackBaseBundleConfig = makeBaseBundleConfig({
+  bundleType: 'standalone',
+  entrypoints: ['src/index.bundle.tracing.replay.feedback.ts'],
+  licenseTitle: '@sentry/browser (Performance Monitoring, Replay, and Feedback)',
+  outputFileBase: () => 'bundles/bundle.tracing.replay.feedback',
+});
 
-  builds.push(
-    ...makeBundleConfigVariants(replayBaseBundleConfig),
-    ...makeBundleConfigVariants(feedbackBaseBundleConfig),
-    ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
-    ...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
-  );
-}
+builds.push(
+  ...makeBundleConfigVariants(baseBundleConfig),
+  ...makeBundleConfigVariants(tracingBaseBundleConfig),
+  ...makeBundleConfigVariants(replayBaseBundleConfig),
+  ...makeBundleConfigVariants(feedbackBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingReplayBaseBundleConfig),
+  ...makeBundleConfigVariants(tracingReplayFeedbackBaseBundleConfig),
+);
 
 export default builds;
diff --git a/packages/browser/rollup.npm.config.mjs b/packages/browser/rollup.npm.config.mjs
index 6d09adefc859..2edfdefdc4da 100644
--- a/packages/browser/rollup.npm.config.mjs
+++ b/packages/browser/rollup.npm.config.mjs
@@ -4,5 +4,13 @@ export default makeNPMConfigVariants(
   makeBaseNPMConfig({
     // packages with bundles have a different build directory structure
     hasBundles: true,
+    packageSpecificConfig: {
+      output: {
+        // set exports to 'named' or 'auto' so that rollup doesn't warn
+        exports: 'named',
+        // set preserveModules to false because we want to bundle everything into one file.
+        preserveModules: false,
+      },
+    },
   }),
 );
diff --git a/packages/browser/src/eventbuilder.ts b/packages/browser/src/eventbuilder.ts
index 2956006b0ac7..b39baee2a3fe 100644
--- a/packages/browser/src/eventbuilder.ts
+++ b/packages/browser/src/eventbuilder.ts
@@ -106,10 +106,11 @@ export function parseStackFrames(
   // reliably in other circumstances.
   const stacktrace = ex.stacktrace || ex.stack || '';
 
-  const popSize = getPopSize(ex);
+  const skipLines = getSkipFirstStackStringLines(ex);
+  const framesToPop = getPopFirstTopFrames(ex);
 
   try {
-    return stackParser(stacktrace, popSize);
+    return stackParser(stacktrace, skipLines, framesToPop);
   } catch (e) {
     // no-empty
   }
@@ -120,15 +121,30 @@ export function parseStackFrames(
 // Based on our own mapping pattern - https://github.com/getsentry/sentry/blob/9f08305e09866c8bd6d0c24f5b0aabdd7dd6c59c/src/sentry/lang/javascript/errormapping.py#L83-L108
 const reactMinifiedRegexp = /Minified React error #\d+;/i;
 
-function getPopSize(ex: Error & { framesToPop?: number }): number {
-  if (ex) {
-    if (typeof ex.framesToPop === 'number') {
-      return ex.framesToPop;
-    }
+/**
+ * Certain known React errors contain links that would be falsely
+ * parsed as frames. This function check for these errors and
+ * returns number of the stack string lines to skip.
+ */
+function getSkipFirstStackStringLines(ex: Error): number {
+  if (ex && reactMinifiedRegexp.test(ex.message)) {
+    return 1;
+  }
 
-    if (reactMinifiedRegexp.test(ex.message)) {
-      return 1;
-    }
+  return 0;
+}
+
+/**
+ * If error has `framesToPop` property, it means that the
+ * creator tells us the first x frames will be useless
+ * and should be discarded. Typically error from wrapper function
+ * which don't point to the actual location in the developer's code.
+ *
+ * Example: https://github.com/zertosh/invariant/blob/master/invariant.js#L46
+ */
+function getPopFirstTopFrames(ex: Error & { framesToPop?: unknown }): number {
+  if (typeof ex.framesToPop === 'number') {
+    return ex.framesToPop;
   }
 
   return 0;
diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
index 643235a2ec36..a1599f4d7f77 100644
--- a/packages/browser/src/exports.ts
+++ b/packages/browser/src/exports.ts
@@ -43,8 +43,6 @@ export {
   makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   continueTrace,
   SDK_VERSION,
   setContext,
diff --git a/packages/browser/src/index.bundle.feedback.ts b/packages/browser/src/index.bundle.feedback.ts
index 7cb0501e1a92..887cc2e864ac 100644
--- a/packages/browser/src/index.bundle.feedback.ts
+++ b/packages/browser/src/index.bundle.feedback.ts
@@ -1,27 +1,16 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
-import { Feedback, feedbackIntegration } from '@sentry-internal/feedback';
+import { feedbackIntegration } from '@sentry-internal/feedback';
 import {
-  ReplayShim,
   addTracingExtensionsShim,
   browserTracingIntegrationShim,
   replayIntegrationShim,
 } from '@sentry-internal/integration-shims';
 
-import * as Sentry from './index.bundle.base';
-
-// TODO (v8): Remove this as it was only needed for backwards compatibility
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = ReplayShim;
-
 export * from './index.bundle.base';
 export {
   browserTracingIntegrationShim as browserTracingIntegration,
   addTracingExtensionsShim as addTracingExtensions,
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayShim as Replay,
   replayIntegrationShim as replayIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  Feedback,
   feedbackIntegration,
 };
 // 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.replay.ts b/packages/browser/src/index.bundle.replay.ts
index 71baed234eba..29bf0b320dea 100644
--- a/packages/browser/src/index.bundle.replay.ts
+++ b/packages/browser/src/index.bundle.replay.ts
@@ -1,27 +1,16 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
 import {
-  FeedbackShim,
   addTracingExtensionsShim,
   browserTracingIntegrationShim,
   feedbackIntegrationShim,
 } from '@sentry-internal/integration-shims';
-import { Replay, replayIntegration } from '@sentry/replay';
-
-import * as Sentry from './index.bundle.base';
-
-// TODO (v8): Remove this as it was only needed for backwards compatibility
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = Replay;
+import { replayIntegration } from '@sentry/replay';
 
 export * from './index.bundle.base';
 export {
   browserTracingIntegrationShim as browserTracingIntegration,
   addTracingExtensionsShim as addTracingExtensions,
-  // eslint-disable-next-line deprecation/deprecation
-  Replay,
   replayIntegration,
-  // eslint-disable-next-line deprecation/deprecation
-  FeedbackShim as Feedback,
   feedbackIntegrationShim as feedbackIntegration,
 };
 // 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.feedback.ts b/packages/browser/src/index.bundle.tracing.replay.feedback.ts
index 2ccc69a8456f..1fe669f2393f 100644
--- a/packages/browser/src/index.bundle.tracing.replay.feedback.ts
+++ b/packages/browser/src/index.bundle.tracing.replay.feedback.ts
@@ -1,35 +1,21 @@
-import { Feedback, feedbackIntegration } from '@sentry-internal/feedback';
+import { feedbackIntegration } from '@sentry-internal/feedback';
 import { browserTracingIntegration } from '@sentry-internal/tracing';
 import { addTracingExtensions } from '@sentry/core';
-import { Replay, replayIntegration } 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.
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = Replay;
+import { replayIntegration } from '@sentry/replay';
 
 // We are patching the global object with our hub extension methods
 addTracingExtensions();
 
 export {
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
 } from '@sentry/core';
 
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  Feedback,
-  // eslint-disable-next-line deprecation/deprecation
-  Replay,
-  feedbackIntegration,
-  replayIntegration,
-  browserTracingIntegration,
-  addTracingExtensions,
-};
+export { feedbackIntegration, replayIntegration, browserTracingIntegration, addTracingExtensions };
+
 export * from './index.bundle.base';
diff --git a/packages/browser/src/index.bundle.tracing.replay.ts b/packages/browser/src/index.bundle.tracing.replay.ts
index 8c7ac5bb917f..7b09054540b8 100644
--- a/packages/browser/src/index.bundle.tracing.replay.ts
+++ b/packages/browser/src/index.bundle.tracing.replay.ts
@@ -1,35 +1,26 @@
-import { FeedbackShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
 import { browserTracingIntegration } from '@sentry-internal/tracing';
 import { addTracingExtensions } from '@sentry/core';
-import { Replay, replayIntegration } 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.
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = Replay;
+import { replayIntegration } from '@sentry/replay';
 
 // We are patching the global object with our hub extension methods
 addTracingExtensions();
 
 export {
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
 } from '@sentry/core';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  FeedbackShim as Feedback,
-  // eslint-disable-next-line deprecation/deprecation
-  Replay,
   replayIntegration,
   feedbackIntegrationShim as feedbackIntegration,
   browserTracingIntegration,
   addTracingExtensions,
 };
+
 export * from './index.bundle.base';
diff --git a/packages/browser/src/index.bundle.tracing.ts b/packages/browser/src/index.bundle.tracing.ts
index c457db356d67..23c424fd7337 100644
--- a/packages/browser/src/index.bundle.tracing.ts
+++ b/packages/browser/src/index.bundle.tracing.ts
@@ -1,40 +1,26 @@
 // This is exported so the loader does not fail when switching off Replay
-import {
-  FeedbackShim,
-  ReplayShim,
-  feedbackIntegrationShim,
-  replayIntegrationShim,
-} from '@sentry-internal/integration-shims';
+import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
 import { browserTracingIntegration } from '@sentry-internal/tracing';
 import { addTracingExtensions } from '@sentry/core';
 
-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.
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = ReplayShim;
-
 // We are patching the global object with our hub extension methods
 addTracingExtensions();
 
 export {
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
 } from '@sentry/core';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  FeedbackShim as Feedback,
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayShim as Replay,
   feedbackIntegrationShim as feedbackIntegration,
   replayIntegrationShim as replayIntegration,
   browserTracingIntegration,
   addTracingExtensions,
 };
+
 export * from './index.bundle.base';
diff --git a/packages/browser/src/index.bundle.ts b/packages/browser/src/index.bundle.ts
index b113bd56d142..b27672414b20 100644
--- a/packages/browser/src/index.bundle.ts
+++ b/packages/browser/src/index.bundle.ts
@@ -1,26 +1,14 @@
 // This is exported so the loader does not fail when switching off Replay/Tracing
 import {
-  FeedbackShim,
-  ReplayShim,
   addTracingExtensionsShim,
   browserTracingIntegrationShim,
   feedbackIntegrationShim,
   replayIntegrationShim,
 } from '@sentry-internal/integration-shims';
 
-import * as Sentry from './index.bundle.base';
-
-// TODO (v8): Remove this as it was only needed for backwards compatibility
-// eslint-disable-next-line deprecation/deprecation
-Sentry.Integrations.Replay = ReplayShim;
-
 export * from './index.bundle.base';
 export {
   addTracingExtensionsShim as addTracingExtensions,
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayShim as Replay,
-  // eslint-disable-next-line deprecation/deprecation
-  FeedbackShim as Feedback,
   browserTracingIntegrationShim as browserTracingIntegration,
   feedbackIntegrationShim as feedbackIntegration,
   replayIntegrationShim as replayIntegration,
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index c6270e521188..f75b1e90e0b8 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -30,8 +30,6 @@ export {
 } from '@sentry/core';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  Replay,
   replayIntegration,
   getReplay,
 } from '@sentry/replay';
@@ -47,15 +45,9 @@ export type {
   ReplaySpanFrameEvent,
 } from '@sentry/replay';
 
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayCanvas,
-  replayCanvasIntegration,
-} from '@sentry-internal/replay-canvas';
+export { replayCanvasIntegration } from '@sentry-internal/replay-canvas';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  Feedback,
   feedbackIntegration,
   sendFeedback,
 } from '@sentry-internal/feedback';
@@ -71,10 +63,12 @@ export type { RequestInstrumentationOptions } from '@sentry-internal/tracing';
 export {
   addTracingExtensions,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
   setMeasurement,
   // eslint-disable-next-line deprecation/deprecation
   getActiveTransaction,
diff --git a/packages/browser/src/integrations/httpcontext.ts b/packages/browser/src/integrations/httpcontext.ts
index 5fa59dd3585d..0db88cfe355c 100644
--- a/packages/browser/src/integrations/httpcontext.ts
+++ b/packages/browser/src/integrations/httpcontext.ts
@@ -1,13 +1,13 @@
-import { convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
-import type { Event, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
-
+import { defineIntegration } from '@sentry/core';
 import { WINDOW } from '../helpers';
 
-const INTEGRATION_NAME = 'HttpContext';
-
-const _httpContextIntegration = (() => {
+/**
+ * Collects information about HTTP request headers and
+ * attaches them to the event.
+ */
+export const httpContextIntegration = defineIntegration(() => {
   return {
-    name: INTEGRATION_NAME,
+    name: 'HttpContext',
     preprocessEvent(event) {
       // if none of the information we want exists, don't bother
       if (!WINDOW.navigator && !WINDOW.location && !WINDOW.document) {
@@ -29,15 +29,4 @@ const _httpContextIntegration = (() => {
       event.request = request;
     },
   };
-}) satisfies IntegrationFn;
-
-export const httpContextIntegration = defineIntegration(_httpContextIntegration);
-
-/**
- * HttpContext integration collects information about HTTP request headers.
- * @deprecated Use `httpContextIntegration()` instead.
- */
-// eslint-disable-next-line deprecation/deprecation
-export const HttpContext = convertIntegrationFnToClass(INTEGRATION_NAME, httpContextIntegration) as IntegrationClass<
-  Integration & { preprocessEvent: (event: Event) => void }
->;
+});
diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts
index 5b6137e10027..af88bd8d91e6 100644
--- a/packages/browser/src/profiling/integration.ts
+++ b/packages/browser/src/profiling/integration.ts
@@ -1,18 +1,17 @@
-import { defineIntegration, getCurrentScope } from '@sentry/core';
-import type { EventEnvelope, IntegrationFn, Transaction } from '@sentry/types';
+import { defineIntegration, getActiveSpan, getRootSpan } from '@sentry/core';
+import type { EventEnvelope, IntegrationFn, Span } from '@sentry/types';
 import type { Profile } from '@sentry/types/src/profiling';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { startProfileForTransaction } from './startProfileForTransaction';
+import { startProfileForSpan } from './startProfileForSpan';
 import type { ProfiledEvent } from './utils';
+import { isAutomatedPageLoadSpan, shouldProfileSpan } from './utils';
 import {
   addProfilesToEnvelope,
   createProfilingEvent,
   findProfiledTransactionsFromEnvelope,
   getActiveProfilesCount,
-  isAutomatedPageLoadTransaction,
-  shouldProfileTransaction,
   takeProfileFromGlobalCache,
 } from './utils';
 
@@ -21,22 +20,19 @@ const INTEGRATION_NAME = 'BrowserProfiling';
 const _browserProfilingIntegration = (() => {
   return {
     name: INTEGRATION_NAME,
-    // TODO v8: Remove this
     setup(client) {
-      const scope = getCurrentScope();
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = scope.getTransaction();
-
-      if (transaction && isAutomatedPageLoadTransaction(transaction)) {
-        if (shouldProfileTransaction(transaction)) {
-          startProfileForTransaction(transaction);
+      if (rootSpan && isAutomatedPageLoadSpan(rootSpan)) {
+        if (shouldProfileSpan(rootSpan)) {
+          startProfileForSpan(rootSpan);
         }
       }
 
-      client.on('startTransaction', (transaction: Transaction) => {
-        if (shouldProfileTransaction(transaction)) {
-          startProfileForTransaction(transaction);
+      client.on('spanStart', (span: Span) => {
+        if (span === getRootSpan(span) && shouldProfileSpan(span)) {
+          startProfileForSpan(span);
         }
       });
 
@@ -59,23 +55,23 @@ const _browserProfilingIntegration = (() => {
           const start_timestamp = context && context['profile'] && context['profile']['start_timestamp'];
 
           if (typeof profile_id !== 'string') {
-            DEBUG_BUILD && logger.log('[Profiling] cannot find profile for a transaction without a profile context');
+            DEBUG_BUILD && logger.log('[Profiling] cannot find profile for a span without a profile context');
             continue;
           }
 
           if (!profile_id) {
-            DEBUG_BUILD && logger.log('[Profiling] cannot find profile for a transaction without a profile context');
+            DEBUG_BUILD && logger.log('[Profiling] cannot find profile for a span without a profile context');
             continue;
           }
 
-          // Remove the profile from the transaction context before sending, relay will take care of the rest.
+          // Remove the profile from the span context before sending, relay will take care of the rest.
           if (context && context['profile']) {
             delete context.profile;
           }
 
           const profile = takeProfileFromGlobalCache(profile_id);
           if (!profile) {
-            DEBUG_BUILD && logger.log(`[Profiling] Could not retrieve profile for transaction: ${profile_id}`);
+            DEBUG_BUILD && logger.log(`[Profiling] Could not retrieve profile for span: ${profile_id}`);
             continue;
           }
 
diff --git a/packages/browser/src/profiling/startProfileForTransaction.ts b/packages/browser/src/profiling/startProfileForSpan.ts
similarity index 54%
rename from packages/browser/src/profiling/startProfileForTransaction.ts
rename to packages/browser/src/profiling/startProfileForSpan.ts
index 7d62cd8b1c46..9dcdb81a9e8e 100644
--- a/packages/browser/src/profiling/startProfileForTransaction.ts
+++ b/packages/browser/src/profiling/startProfileForSpan.ts
@@ -1,140 +1,132 @@
-import { spanToJSON } from '@sentry/core';
-import type { Transaction } from '@sentry/types';
+import { getCurrentScope, spanToJSON } from '@sentry/core';
+import type { Span } from '@sentry/types';
 import { logger, timestampInSeconds, uuid4 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
 import { WINDOW } from '../helpers';
 import type { JSSelfProfile } from './jsSelfProfiling';
-import {
-  MAX_PROFILE_DURATION_MS,
-  addProfileToGlobalCache,
-  isAutomatedPageLoadTransaction,
-  startJSSelfProfile,
-} from './utils';
+import { MAX_PROFILE_DURATION_MS, addProfileToGlobalCache, isAutomatedPageLoadSpan, startJSSelfProfile } from './utils';
 
 /**
  * Wraps startTransaction and stopTransaction with profiling related logic.
  * startProfileForTransaction is called after the call to startTransaction in order to avoid our own code from
  * being profiled. Because of that same reason, stopProfiling is called before the call to stopTransaction.
  */
-export function startProfileForTransaction(transaction: Transaction): Transaction {
+export function startProfileForSpan(span: Span): void {
   // Start the profiler and get the profiler instance.
   let startTimestamp: number | undefined;
-  if (isAutomatedPageLoadTransaction(transaction)) {
+  if (isAutomatedPageLoadSpan(span)) {
     startTimestamp = timestampInSeconds() * 1000;
   }
 
   const profiler = startJSSelfProfile();
 
-  // We failed to construct the profiler, fallback to original transaction.
+  // We failed to construct the profiler, so we skip.
   // No need to log anything as this has already been logged in startProfile.
   if (!profiler) {
-    return transaction;
+    return;
   }
 
   if (DEBUG_BUILD) {
-    logger.log(`[Profiling] started profiling transaction: ${spanToJSON(transaction).description}`);
+    logger.log(`[Profiling] started profiling span: ${spanToJSON(span).description}`);
   }
 
-  // We create "unique" transaction names to avoid concurrent transactions with same names
-  // from being ignored by the profiler. From here on, only this transaction name should be used when
+  // We create "unique" span names to avoid concurrent spans with same names
+  // from being ignored by the profiler. From here on, only this span name should be used when
   // calling the profiler methods. Note: we log the original name to the user to avoid confusion.
   const profileId = uuid4();
 
   // A couple of important things to note here:
   // `CpuProfilerBindings.stopProfiling` will be scheduled to run in 30seconds in order to exceed max profile duration.
-  // Whichever of the two (transaction.finish/timeout) is first to run, the profiling will be stopped and the gathered profile
-  // will be processed when the original transaction is finished. Since onProfileHandler can be invoked multiple times in the
-  // event of an error or user mistake (calling transaction.finish multiple times), it is important that the behavior of onProfileHandler
+  // Whichever of the two (span.finish/timeout) is first to run, the profiling will be stopped and the gathered profile
+  // will be processed when the original span is finished. Since onProfileHandler can be invoked multiple times in the
+  // event of an error or user mistake (calling span.finish multiple times), it is important that the behavior of onProfileHandler
   // is idempotent as we do not want any timings or profiles to be overriden by the last call to onProfileHandler.
   // After the original finish method is called, the event will be reported through the integration and delegated to transport.
   const processedProfile: JSSelfProfile | null = null;
 
+  getCurrentScope().setContext('profile', {
+    profile_id: profileId,
+    start_timestamp: startTimestamp,
+  });
+
   /**
    * Idempotent handler for profile stop
    */
-  async function onProfileHandler(): Promise<null> {
-    // Check if the profile exists and return it the behavior has to be idempotent as users may call transaction.finish multiple times.
-    if (!transaction) {
-      return null;
+  async function onProfileHandler(): Promise<void> {
+    // Check if the profile exists and return it the behavior has to be idempotent as users may call span.finish multiple times.
+    if (!span) {
+      return;
     }
     // Satisfy the type checker, but profiler will always be defined here.
     if (!profiler) {
-      return null;
+      return;
     }
     if (processedProfile) {
       if (DEBUG_BUILD) {
-        logger.log('[Profiling] profile for:', spanToJSON(transaction).description, 'already exists, returning early');
+        logger.log('[Profiling] profile for:', spanToJSON(span).description, 'already exists, returning early');
       }
-      return null;
+      return;
     }
 
     return profiler
       .stop()
-      .then((profile: JSSelfProfile): null => {
+      .then((profile: JSSelfProfile): void => {
         if (maxDurationTimeoutID) {
           WINDOW.clearTimeout(maxDurationTimeoutID);
           maxDurationTimeoutID = undefined;
         }
 
         if (DEBUG_BUILD) {
-          logger.log(`[Profiling] stopped profiling of transaction: ${spanToJSON(transaction).description}`);
+          logger.log(`[Profiling] stopped profiling of span: ${spanToJSON(span).description}`);
         }
 
-        // In case of an overlapping transaction, stopProfiling may return null and silently ignore the overlapping profile.
+        // In case of an overlapping span, stopProfiling may return null and silently ignore the overlapping profile.
         if (!profile) {
           if (DEBUG_BUILD) {
             logger.log(
-              `[Profiling] profiler returned null profile for: ${spanToJSON(transaction).description}`,
-              'this may indicate an overlapping transaction or a call to stopProfiling with a profile title that was never started',
+              `[Profiling] profiler returned null profile for: ${spanToJSON(span).description}`,
+              'this may indicate an overlapping span or a call to stopProfiling with a profile title that was never started',
             );
           }
-          return null;
+          return;
         }
 
         addProfileToGlobalCache(profileId, profile);
-        return null;
       })
       .catch(error => {
         if (DEBUG_BUILD) {
           logger.log('[Profiling] error while stopping profiler:', error);
         }
-        return null;
       });
   }
 
   // Enqueue a timeout to prevent profiles from running over max duration.
   let maxDurationTimeoutID: number | undefined = WINDOW.setTimeout(() => {
     if (DEBUG_BUILD) {
-      logger.log(
-        '[Profiling] max profile duration elapsed, stopping profiling for:',
-        spanToJSON(transaction).description,
-      );
+      logger.log('[Profiling] max profile duration elapsed, stopping profiling for:', spanToJSON(span).description);
     }
-    // If the timeout exceeds, we want to stop profiling, but not finish the transaction
+    // If the timeout exceeds, we want to stop profiling, but not finish the span
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     onProfileHandler();
   }, MAX_PROFILE_DURATION_MS);
 
   // We need to reference the original end call to avoid creating an infinite loop
-  const originalEnd = transaction.end.bind(transaction);
+  const originalEnd = span.end.bind(span);
 
   /**
-   * Wraps startTransaction and stopTransaction with profiling related logic.
-   * startProfiling is called after the call to startTransaction in order to avoid our own code from
-   * being profiled. Because of that same reason, stopProfiling is called before the call to stopTransaction.
+   * Wraps span `end()` with profiling related logic.
+   * startProfiling is called after the call to spanStart in order to avoid our own code from
+   * being profiled. Because of that same reason, stopProfiling is called before the call to spanEnd.
    */
-  function profilingWrappedTransactionEnd(): Transaction {
-    if (!transaction) {
+  function profilingWrappedSpanEnd(): Span {
+    if (!span) {
       return originalEnd();
     }
     // onProfileHandler should always return the same profile even if this is called multiple times.
     // Always call onProfileHandler to ensure stopProfiling is called and the timeout is cleared.
     void onProfileHandler().then(
       () => {
-        // TODO: Can we rewrite this to use attributes?
-        // eslint-disable-next-line deprecation/deprecation
-        transaction.setContext('profile', { profile_id: profileId, start_timestamp: startTimestamp });
         originalEnd();
       },
       () => {
@@ -143,9 +135,8 @@ export function startProfileForTransaction(transaction: Transaction): Transactio
       },
     );
 
-    return transaction;
+    return span;
   }
 
-  transaction.end = profilingWrappedTransactionEnd;
-  return transaction;
+  span.end = profilingWrappedSpanEnd;
 }
diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts
index f4f700a2ab6f..46ae0c07442a 100644
--- a/packages/browser/src/profiling/utils.ts
+++ b/packages/browser/src/profiling/utils.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-lines */
 
 import { DEFAULT_ENVIRONMENT, getClient, spanToJSON } from '@sentry/core';
-import type { DebugImage, Envelope, Event, EventEnvelope, StackFrame, StackParser, Transaction } from '@sentry/types';
+import type { DebugImage, Envelope, Event, EventEnvelope, Span, StackFrame, StackParser } from '@sentry/types';
 import type { Profile, ThreadCpuProfile } from '@sentry/types/src/profiling';
 import { GLOBAL_OBJ, browserPerformanceTimeOrigin, forEachEnvelopeItem, logger, uuid4 } from '@sentry/utils';
 
@@ -201,8 +201,8 @@ export function isProfiledTransactionEvent(event: Event): event is ProfiledEvent
 /**
  *
  */
-export function isAutomatedPageLoadTransaction(transaction: Transaction): boolean {
-  return spanToJSON(transaction).op === 'pageload';
+export function isAutomatedPageLoadSpan(span: Span): boolean {
+  return spanToJSON(span).op === 'pageload';
 }
 
 /**
@@ -506,7 +506,7 @@ export function startJSSelfProfile(): JSSelfProfiler | undefined {
 /**
  * Determine if a profile should be profiled.
  */
-export function shouldProfileTransaction(transaction: Transaction): boolean {
+export function shouldProfileSpan(span: Span): boolean {
   // If constructor failed once, it will always fail, so we can early return.
   if (PROFILING_CONSTRUCTOR_FAILED) {
     if (DEBUG_BUILD) {
@@ -515,7 +515,7 @@ export function shouldProfileTransaction(transaction: Transaction): boolean {
     return false;
   }
 
-  if (!transaction.isRecording()) {
+  if (!span.isRecording()) {
     if (DEBUG_BUILD) {
       logger.log('[Profiling] Discarding profile because transaction was not sampled.');
     }
diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts
index 5d09cde3cbbe..a5a303cd1375 100644
--- a/packages/browser/src/stack-parsers.ts
+++ b/packages/browser/src/stack-parsers.ts
@@ -153,7 +153,7 @@ const opera11: StackLineParserFn = line => {
 
 export const opera11StackLineParser: StackLineParser = [OPERA11_PRIORITY, opera11];
 
-export const defaultStackLineParsers = [chromeStackLineParser, geckoStackLineParser, winjsStackLineParser];
+export const defaultStackLineParsers = [chromeStackLineParser, geckoStackLineParser];
 
 export const defaultStackParser = createStackParser(...defaultStackLineParsers);
 
diff --git a/packages/browser/test/integration/debugging.md b/packages/browser/test/integration/debugging.md
index f25d70d788ae..9f0cd250566a 100644
--- a/packages/browser/test/integration/debugging.md
+++ b/packages/browser/test/integration/debugging.md
@@ -1,26 +1,37 @@
 ### Debugging Hints
 
-These tests are hard to debug, because the testing system is somewhat complex, straightforward debugging doesn't work (see below), and the output of most `console.log` calls gets swallowed. Here, future debugger, are some tips to make it easier, to hopefully save you the hour(s) of trial and error it took to figure them out.
+These tests are hard to debug, because the testing system is somewhat complex, straightforward debugging doesn't work
+(see below), and the output of most `console.log` calls gets swallowed. Here, future debugger, are some tips to make it
+easier, to hopefully save you the hour(s) of trial and error it took to figure them out.
 
 - `suites/shell.js`:
+
   - Remove the loader options from the `variants` array.
-  - Delete all of the placeholders of the form `{{ suites/something.js }}` except for the one you're interested in. It's not enough to comment them out, because they'll still exist in the file and get replaced by the test runner. Don't forget the one at the bottom of the file.
+  - Delete all of the placeholders of the form `{{ suites/something.js }}` except for the one you're interested in. It's
+    not enough to comment them out, because they'll still exist in the file and get replaced by the test runner. Don't
+    forget the one at the bottom of the file.
 
 - `suites/helpers.js`:
-  - Add `sandbox.contentWindow.console.log = (...args) => console.log(...args);` just before the return in `createSandbox()`. This will make it so that `console.log` statements come through to the terminal. (Yes, Karma theoretically has settings for that, but they don't seem to work. See https://github.com/karma-runner/karma-mocha/issues/47.)
+
+  - Add `sandbox.contentWindow.console.log = (...args) => console.log(...args);` just before the return in
+    `createSandbox()`. This will make it so that `console.log` statements come through to the terminal. (Yes, Karma
+    theoretically has settings for that, but they don't seem to work. See
+    https://github.com/karma-runner/karma-mocha/issues/47.)
 
 - `suites.yourTestFile.js`:
+
   - Use `it.only` to only run the single test you're interested in.
 
 - Repo-level `rollup/bundleHelpers.js`:
-  - Comment out all bundle variants except whichever one `run.js` is turning into `artifacts/sdk.js`.
 
-- Browser-package-level `rollup.bundle.config.mjs`:
-  - Build only one of `es5` and `es6`.
+  - Comment out all bundle variants except whichever one `run.js` is turning into `artifacts/sdk.js`.
 
-- Run `build:bundle:watch` in a separate terminal tab, so that when you add `console.log`s to the SDK, they get picked up.
+- Run `build:bundle:watch` in a separate terminal tab, so that when you add `console.log`s to the SDK, they get picked
+  up.
 
-- Don't bother trying to copy one of our standard VSCode debug profiles, because it won't work, except to debug the testing system itself. (It will pause the node process running the tests, not the headless browser in which the tests themselves run.)
+- Don't bother trying to copy one of our standard VSCode debug profiles, because it won't work, except to debug the
+  testing system itself. (It will pause the node process running the tests, not the headless browser in which the tests
+  themselves run.)
 
 - To make karma do verbose logging, run `export DEBUG=1`. To turn it off, run `unset DEBUG`.
 
diff --git a/packages/browser/test/unit/index.bundle.feedback.test.ts b/packages/browser/test/unit/index.bundle.feedback.test.ts
index 91475a34bb02..4ccb6a9dc458 100644
--- a/packages/browser/test/unit/index.bundle.feedback.test.ts
+++ b/packages/browser/test/unit/index.bundle.feedback.test.ts
@@ -1,6 +1,5 @@
-/* eslint-disable deprecation/deprecation */
-import { ReplayShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
-import { Feedback, feedbackIntegration } from '@sentry/browser';
+import { replayIntegrationShim } from '@sentry-internal/integration-shims';
+import { feedbackIntegration } from '@sentry/browser';
 
 import * as TracingReplayBundle from '../../src/index.bundle.feedback';
 
@@ -10,11 +9,7 @@ describe('index.bundle.feedback', () => {
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingReplayBundle.Integrations.Replay).toBe(ReplayShim);
-    expect(TracingReplayBundle.Replay).toBe(ReplayShim);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegrationShim);
-
-    expect(TracingReplayBundle.Feedback).toBe(Feedback);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegration);
   });
 });
diff --git a/packages/browser/test/unit/index.bundle.replay.test.ts b/packages/browser/test/unit/index.bundle.replay.test.ts
index a40daa2ea0d6..56356e262eea 100644
--- a/packages/browser/test/unit/index.bundle.replay.test.ts
+++ b/packages/browser/test/unit/index.bundle.replay.test.ts
@@ -1,6 +1,5 @@
-/* eslint-disable deprecation/deprecation */
-import { FeedbackShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
-import { Replay, replayIntegration } from '@sentry/browser';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { replayIntegration } from '@sentry/browser';
 
 import * as TracingReplayBundle from '../../src/index.bundle.replay';
 
@@ -10,11 +9,7 @@ describe('index.bundle.replay', () => {
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingReplayBundle.Integrations.Replay).toBe(Replay);
-    expect(TracingReplayBundle.Replay).toBe(Replay);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration);
-
-    expect(TracingReplayBundle.Feedback).toBe(FeedbackShim);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim);
   });
 });
diff --git a/packages/browser/test/unit/index.bundle.test.ts b/packages/browser/test/unit/index.bundle.test.ts
index a081c21a1e59..91cc4dea5229 100644
--- a/packages/browser/test/unit/index.bundle.test.ts
+++ b/packages/browser/test/unit/index.bundle.test.ts
@@ -1,10 +1,4 @@
-/* eslint-disable deprecation/deprecation */
-import {
-  FeedbackShim,
-  ReplayShim,
-  feedbackIntegrationShim,
-  replayIntegrationShim,
-} from '@sentry-internal/integration-shims';
+import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
 
 import * as TracingBundle from '../../src/index.bundle';
 
@@ -14,11 +8,7 @@ describe('index.bundle', () => {
       expect((TracingBundle.Integrations[key] as any).name).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingBundle.Integrations.Replay).toBe(ReplayShim);
-    expect(TracingBundle.Replay).toBe(ReplayShim);
     expect(TracingBundle.replayIntegration).toBe(replayIntegrationShim);
-
-    expect(TracingBundle.Feedback).toBe(FeedbackShim);
     expect(TracingBundle.feedbackIntegration).toBe(feedbackIntegrationShim);
   });
 });
diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts
index 962934f064f8..49c23d9685bb 100644
--- a/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts
+++ b/packages/browser/test/unit/index.bundle.tracing.replay.feedback.test.ts
@@ -1,6 +1,5 @@
-/* eslint-disable deprecation/deprecation */
 import { browserTracingIntegration } from '@sentry-internal/tracing';
-import { Feedback, Replay, feedbackIntegration, replayIntegration } from '@sentry/browser';
+import { feedbackIntegration, replayIntegration } from '@sentry/browser';
 
 import * as TracingReplayFeedbackBundle from '../../src/index.bundle.tracing.replay.feedback';
 
@@ -10,13 +9,8 @@ describe('index.bundle.tracing.replay.feedback', () => {
       expect((TracingReplayFeedbackBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingReplayFeedbackBundle.Integrations.Replay).toBe(Replay);
-    expect(TracingReplayFeedbackBundle.Replay).toBe(Replay);
     expect(TracingReplayFeedbackBundle.replayIntegration).toBe(replayIntegration);
-
     expect(TracingReplayFeedbackBundle.browserTracingIntegration).toBe(browserTracingIntegration);
-
-    expect(TracingReplayFeedbackBundle.Feedback).toBe(Feedback);
     expect(TracingReplayFeedbackBundle.feedbackIntegration).toBe(feedbackIntegration);
   });
 });
diff --git a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts
index a90eac6cbe60..bdbb744f7873 100644
--- a/packages/browser/test/unit/index.bundle.tracing.replay.test.ts
+++ b/packages/browser/test/unit/index.bundle.tracing.replay.test.ts
@@ -1,7 +1,6 @@
-/* eslint-disable deprecation/deprecation */
-import { FeedbackShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
 import { browserTracingIntegration } from '@sentry-internal/tracing';
-import { Replay, replayIntegration } from '@sentry/browser';
+import { replayIntegration } from '@sentry/browser';
 
 import * as TracingReplayBundle from '../../src/index.bundle.tracing.replay';
 
@@ -11,13 +10,10 @@ describe('index.bundle.tracing.replay', () => {
       expect((TracingReplayBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingReplayBundle.Integrations.Replay).toBe(Replay);
-    expect(TracingReplayBundle.Replay).toBe(Replay);
     expect(TracingReplayBundle.replayIntegration).toBe(replayIntegration);
 
     expect(TracingReplayBundle.browserTracingIntegration).toBe(browserTracingIntegration);
 
-    expect(TracingReplayBundle.Feedback).toBe(FeedbackShim);
     expect(TracingReplayBundle.feedbackIntegration).toBe(feedbackIntegrationShim);
   });
 });
diff --git a/packages/browser/test/unit/index.bundle.tracing.test.ts b/packages/browser/test/unit/index.bundle.tracing.test.ts
index 0f8257ee4ad0..4c8c37008fc4 100644
--- a/packages/browser/test/unit/index.bundle.tracing.test.ts
+++ b/packages/browser/test/unit/index.bundle.tracing.test.ts
@@ -1,10 +1,4 @@
-/* eslint-disable deprecation/deprecation */
-import {
-  FeedbackShim,
-  ReplayShim,
-  feedbackIntegrationShim,
-  replayIntegrationShim,
-} from '@sentry-internal/integration-shims';
+import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
 import { browserTracingIntegration } from '@sentry-internal/tracing';
 
 import * as TracingBundle from '../../src/index.bundle.tracing';
@@ -15,13 +9,8 @@ describe('index.bundle.tracing', () => {
       expect((TracingBundle.Integrations[key] as any).id).toStrictEqual(expect.any(String));
     });
 
-    expect(TracingBundle.Integrations.Replay).toBe(ReplayShim);
-    expect(TracingBundle.Replay).toBe(ReplayShim);
     expect(TracingBundle.replayIntegration).toBe(replayIntegrationShim);
-
     expect(TracingBundle.browserTracingIntegration).toBe(browserTracingIntegration);
-
-    expect(TracingBundle.Feedback).toBe(FeedbackShim);
     expect(TracingBundle.feedbackIntegration).toBe(feedbackIntegrationShim);
   });
 });
diff --git a/packages/browser/test/unit/tracekit/ie.test.ts b/packages/browser/test/unit/tracekit/ie.test.ts
index 544542b0dcaf..53e96b96371f 100644
--- a/packages/browser/test/unit/tracekit/ie.test.ts
+++ b/packages/browser/test/unit/tracekit/ie.test.ts
@@ -1,5 +1,8 @@
+import { createStackParser } from '@sentry/utils';
 import { exceptionFromError } from '../../../src/eventbuilder';
-import { defaultStackParser as parser } from '../../../src/stack-parsers';
+import { chromeStackLineParser, geckoStackLineParser, winjsStackLineParser } from '../../../src/stack-parsers';
+
+const parser = createStackParser(chromeStackLineParser, geckoStackLineParser, winjsStackLineParser);
 
 describe('Tracekit - IE Tests', () => {
   it('should parse IE 10 error', () => {
diff --git a/packages/browser/test/unit/tracekit/react.test.ts b/packages/browser/test/unit/tracekit/react.test.ts
index d949a4dee0eb..55ffdc34c537 100644
--- a/packages/browser/test/unit/tracekit/react.test.ts
+++ b/packages/browser/test/unit/tracekit/react.test.ts
@@ -2,7 +2,7 @@ import { exceptionFromError } from '../../../src/eventbuilder';
 import { defaultStackParser as parser } from '../../../src/stack-parsers';
 
 describe('Tracekit - React Tests', () => {
-  it('should correctly parse Invariant Violation errors and use framesToPop to drop info message', () => {
+  it('should correctly parse Invariant Violation errors and use framesToPop to drop the invariant frame', () => {
     const REACT_INVARIANT_VIOLATION_EXCEPTION = {
       framesToPop: 1,
       message:
@@ -38,13 +38,6 @@ describe('Tracekit - React Tests', () => {
             colno: 21841,
             in_app: true,
           },
-          {
-            filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            function: '?',
-            lineno: 1,
-            colno: 21738,
-            in_app: true,
-          },
         ],
       },
     });
@@ -97,7 +90,7 @@ describe('Tracekit - React Tests', () => {
     });
   });
 
-  it('should not drop additional frame for production errors if framesToPop is still there', () => {
+  it('should drop invariant frame for production errors if framesToPop is present', () => {
     const REACT_PRODUCTION_ERROR = {
       framesToPop: 1,
       message:
@@ -133,13 +126,6 @@ describe('Tracekit - React Tests', () => {
             colno: 21841,
             in_app: true,
           },
-          {
-            filename: 'http://localhost:5000/static/js/foo.chunk.js',
-            function: '?',
-            lineno: 1,
-            colno: 21738,
-            in_app: true,
-          },
         ],
       },
     });
diff --git a/packages/bun/.eslintrc.js b/packages/bun/.eslintrc.js
index bec6469d0e28..9d915d4f4c3b 100644
--- a/packages/bun/.eslintrc.js
+++ b/packages/bun/.eslintrc.js
@@ -6,7 +6,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/bun/README.md b/packages/bun/README.md
index d9c99350a613..43a80713e45b 100644
--- a/packages/bun/README.md
+++ b/packages/bun/README.md
@@ -15,7 +15,8 @@
 - [Official SDK Docs](https://docs.sentry.io/quickstart/)
 - [TypeDoc](http://getsentry.github.io/sentry-javascript/)
 
-The Sentry Bun SDK is in beta. Please help us improve the SDK by [reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
+The Sentry Bun SDK is in beta. Please help us improve the SDK by
+[reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
 
 ## Usage
 
@@ -34,8 +35,8 @@ Sentry.init({
 });
 ```
 
-To set context information or send manual events, use the exported functions of `@sentry/bun`. Note that these
-functions will not perform any action before you have called `init()`:
+To set context information or send manual events, use the exported functions of `@sentry/bun`. Note that these functions
+will not perform any action before you have called `init()`:
 
 ```javascript
 // Set user information, as well as tags and further extras
@@ -60,8 +61,9 @@ Sentry.captureEvent({
 });
 ```
 
-It's not possible to capture unhandled exceptions, unhandled promise rejections now - Bun is working on adding support for it.
-[Github Issue](https://github.com/oven-sh/bun/issues/5091) follow this issue. To report errors to Sentry, you have to manually try-catch and call `Sentry.captureException` in the catch block.
+It's not possible to capture unhandled exceptions, unhandled promise rejections now - Bun is working on adding support
+for it. [Github Issue](https://github.com/oven-sh/bun/issues/5091) follow this issue. To report errors to Sentry, you
+have to manually try-catch and call `Sentry.captureException` in the catch block.
 
 ```ts
 import * as Sentry from '@sentry/bun';
@@ -72,4 +74,3 @@ try {
   Sentry.captureException(e);
 }
 ```
-
diff --git a/packages/bun/package.json b/packages/bun/package.json
index aa2aa15d1949..034c0cd0b948 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -15,13 +15,26 @@
     "types",
     "types-ts3.8"
   ],
-  "main": "build/esm/index.js",
+  "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
-      "build/npm/types/index.d.ts": [
-        "build/npm/types-ts3.8/index.d.ts"
+      "build/types/index.d.ts": [
+        "build/types-ts3.8/index.d.ts"
       ]
     }
   },
@@ -30,7 +43,7 @@
   },
   "dependencies": {
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2"
   },
diff --git a/packages/bun/rollup.npm.config.mjs b/packages/bun/rollup.npm.config.mjs
index 19f01d8cb3f8..84a06f2fb64a 100644
--- a/packages/bun/rollup.npm.config.mjs
+++ b/packages/bun/rollup.npm.config.mjs
@@ -1,6 +1,3 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-const config = makeNPMConfigVariants(makeBaseNPMConfig());
-
-// remove cjs from config array config[0].output.format == cjs
-export default [config[1]];
+export default makeNPMConfigVariants(makeBaseNPMConfig());
diff --git a/packages/bun/src/client.ts b/packages/bun/src/client.ts
index 7b3a350f2821..40e430dc2545 100644
--- a/packages/bun/src/client.ts
+++ b/packages/bun/src/client.ts
@@ -1,7 +1,6 @@
 import * as os from 'os';
 import type { ServerRuntimeClientOptions } from '@sentry/core';
-import { applySdkMetadata } from '@sentry/core';
-import { ServerRuntimeClient } from '@sentry/core';
+import { ServerRuntimeClient, applySdkMetadata } from '@sentry/core';
 
 import type { BunClientOptions } from './types';
 
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index 80ad94b8e460..da25f6cb08bd 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -18,23 +18,19 @@ export type {
 } from '@sentry/types';
 export type { AddRequestDataToEventOptions } from '@sentry/utils';
 
-export type { TransactionNamingScheme } from '@sentry/node-experimental';
-export type { BunOptions } from './types';
-
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
   captureException,
   captureEvent,
   captureMessage,
-  close,
+  captureCheckIn,
+  startSession,
+  captureSession,
+  endSession,
+  withMonitor,
   createTransport,
-  flush,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
   // eslint-disable-next-line deprecation/deprecation
   getCurrentHub,
   getClient,
@@ -43,12 +39,8 @@ export {
   getGlobalScope,
   getIsolationScope,
   Hub,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -60,71 +52,80 @@ export {
   setHttpStatus,
   withScope,
   withIsolationScope,
-  captureCheckIn,
-  withMonitor,
+  makeNodeTransport,
+  NodeClient,
+  defaultStackParser,
+  flush,
+  close,
+  getSentryRelease,
+  addRequestDataToEvent,
+  DEFAULT_USER_INCLUDES,
+  extractRequestData,
+  createGetModuleFromFilename,
+  anrIntegration,
+  consoleIntegration,
+  httpIntegration,
+  nativeNodeFetchIntegration,
+  onUncaughtExceptionIntegration,
+  onUnhandledRejectionIntegration,
+  modulesIntegration,
+  contextLinesIntegration,
+  nodeContextIntegration,
+  localVariablesIntegration,
+  requestDataIntegration,
+  functionToStringIntegration,
+  inboundFiltersIntegration,
+  linkedErrorsIntegration,
   setMeasurement,
   getActiveSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getRootSpan,
+  getSpanDescendants,
   continueTrace,
-  metricsDefault as metrics,
-  functionToStringIntegration,
-  inboundFiltersIntegration,
-  linkedErrorsIntegration,
-  requestDataIntegration,
+  getAutoPerformanceIntegrations,
+  cron,
+  metrics,
+  parameterize,
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  setupFastifyErrorHandler,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+} from '@sentry/node';
+
+export {
   captureConsoleIntegration,
   debugIntegration,
   dedupeIntegration,
   extraErrorDataIntegration,
   rewriteFramesIntegration,
   sessionTimingIntegration,
-  parameterize,
-  startSession,
-  captureSession,
-  endSession,
 } from '@sentry/core';
-export {
-  DEFAULT_USER_INCLUDES,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
-  cron,
-  createGetModuleFromFilename,
-  defaultStackParser,
-  extractRequestData,
-  getSentryRelease,
-  addRequestDataToEvent,
-  anrIntegration,
-  consoleIntegration,
-  contextLinesIntegration,
-  hapiIntegration,
-  httpIntegration,
-  localVariablesIntegration,
-  modulesIntegration,
-  nativeNodeFetchintegration,
-  nodeContextIntegration,
-  onUncaughtExceptionIntegration,
-  onUnhandledRejectionIntegration,
-  spotlightIntegration,
-  SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/node-experimental';
+
+export type { BunOptions } from './types';
 
 export { BunClient } from './client';
 export {
   getDefaultIntegrations,
   init,
 } from './sdk';
-
-import { Integrations as NodeIntegrations } from '@sentry/node-experimental';
-import { BunServer } from './integrations/bunserver';
 export { bunServerIntegration } from './integrations/bunserver';
-
-const INTEGRATIONS = {
-  ...NodeIntegrations,
-  BunServer,
-};
-
-export { INTEGRATIONS as Integrations };
+export { makeFetchTransport } from './transports';
diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts
index f5b6a52d3dd0..a530fc0517c2 100644
--- a/packages/bun/src/integrations/bunserver.ts
+++ b/packages/bun/src/integrations/bunserver.ts
@@ -4,7 +4,6 @@ import {
   Transaction,
   captureException,
   continueTrace,
-  convertIntegrationFnToClass,
   defineIntegration,
   getCurrentScope,
   setHttpStatus,
@@ -25,15 +24,20 @@ const _bunServerIntegration = (() => {
   };
 }) satisfies IntegrationFn;
 
-export const bunServerIntegration = defineIntegration(_bunServerIntegration);
-
 /**
  * Instruments `Bun.serve` to automatically create transactions and capture errors.
  *
- * @deprecated Use `bunServerIntegration()` instead.
+ * Enabled by default in the Bun SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.bunServerIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const BunServer = convertIntegrationFnToClass(INTEGRATION_NAME, bunServerIntegration);
+export const bunServerIntegration = defineIntegration(_bunServerIntegration);
 
 /**
  * Instruments Bun.serve by patching it's options.
@@ -82,13 +86,12 @@ function instrumentBunServeOptions(serveOptions: Parameters<typeof Bun.serve>[0]
 
         return continueTrace(
           { sentryTrace: request.headers.get('sentry-trace') || '', baggage: request.headers.get('baggage') },
-          ctx => {
+          () => {
             return startSpan(
               {
                 attributes,
                 op: 'http.server',
                 name: `${request.method} ${parsedUrl.path || '/'}`,
-                ...ctx,
               },
               async span => {
                 try {
@@ -96,9 +99,7 @@ function instrumentBunServeOptions(serveOptions: Parameters<typeof Bun.serve>[0]
                     typeof serveOptions.fetch
                   >);
                   if (response && response.status) {
-                    if (span) {
-                      setHttpStatus(span, response.status);
-                    }
+                    setHttpStatus(span, response.status);
                     if (span instanceof Transaction) {
                       const scope = getCurrentScope();
                       scope.setContext('response', {
diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
index b7eddfed9c73..51099eb814b2 100644
--- a/packages/bun/src/sdk.ts
+++ b/packages/bun/src/sdk.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import {
   functionToStringIntegration,
   inboundFiltersIntegration,
@@ -11,9 +10,9 @@ import {
   httpIntegration,
   init as initNode,
   modulesIntegration,
-  nativeNodeFetchintegration,
+  nativeNodeFetchIntegration,
   nodeContextIntegration,
-} from '@sentry/node-experimental';
+} from '@sentry/node';
 import type { Integration, Options } from '@sentry/types';
 
 import { BunClient } from './client';
@@ -33,7 +32,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
     // Native Wrappers
     consoleIntegration(),
     httpIntegration(),
-    nativeNodeFetchintegration(),
+    nativeNodeFetchIntegration(),
     // Global Handlers # TODO (waiting for https://github.com/oven-sh/bun/issues/5091)
     // new NodeIntegrations.OnUncaughtException(),
     // new NodeIntegrations.OnUnhandledRejection(),
diff --git a/packages/bun/test/integrations/bunserver.test.ts b/packages/bun/test/integrations/bunserver.test.ts
index 14080fa02315..b1dc17381ccb 100644
--- a/packages/bun/test/integrations/bunserver.test.ts
+++ b/packages/bun/test/integrations/bunserver.test.ts
@@ -23,11 +23,11 @@ describe('Bun Serve Integration', () => {
   });
 
   test('generates a transaction around a request', async () => {
-    client.on('finishTransaction', transaction => {
-      expect(spanToJSON(transaction).status).toBe('ok');
-      expect(spanToJSON(transaction).data?.['http.response.status_code']).toEqual(200);
-      expect(spanToJSON(transaction).op).toEqual('http.server');
-      expect(spanToJSON(transaction).description).toEqual('GET /');
+    client.on('spanEnd', span => {
+      expect(spanToJSON(span).status).toBe('ok');
+      expect(spanToJSON(span).data?.['http.response.status_code']).toEqual(200);
+      expect(spanToJSON(span).op).toEqual('http.server');
+      expect(spanToJSON(span).description).toEqual('GET /');
     });
 
     const server = Bun.serve({
@@ -43,11 +43,11 @@ describe('Bun Serve Integration', () => {
   });
 
   test('generates a post transaction', async () => {
-    client.on('finishTransaction', transaction => {
-      expect(spanToJSON(transaction).status).toBe('ok');
-      expect(spanToJSON(transaction).data?.['http.response.status_code']).toEqual(200);
-      expect(spanToJSON(transaction).op).toEqual('http.server');
-      expect(spanToJSON(transaction).description).toEqual('POST /');
+    client.on('spanEnd', span => {
+      expect(spanToJSON(span).status).toBe('ok');
+      expect(spanToJSON(span).data?.['http.response.status_code']).toEqual(200);
+      expect(spanToJSON(span).op).toEqual('http.server');
+      expect(spanToJSON(span).description).toEqual('POST /');
     });
 
     const server = Bun.serve({
@@ -72,16 +72,13 @@ describe('Bun Serve Integration', () => {
     const SENTRY_TRACE_HEADER = `${TRACE_ID}-${PARENT_SPAN_ID}-${PARENT_SAMPLED}`;
     const SENTRY_BAGGAGE_HEADER = 'sentry-version=1.0,sentry-environment=production';
 
-    client.on('finishTransaction', transaction => {
-      expect(transaction.spanContext().traceId).toBe(TRACE_ID);
-      expect(transaction.parentSpanId).toBe(PARENT_SPAN_ID);
-      expect(spanIsSampled(transaction)).toBe(true);
-      // span.endTimestamp is already set in `finishTransaction` hook
-      expect(transaction.isRecording()).toBe(false);
+    client.on('spanEnd', span => {
+      expect(span.spanContext().traceId).toBe(TRACE_ID);
+      expect(spanToJSON(span).parent_span_id).toBe(PARENT_SPAN_ID);
+      expect(spanIsSampled(span)).toBe(true);
+      expect(span.isRecording()).toBe(false);
 
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.metadata?.dynamicSamplingContext).toStrictEqual({ version: '1.0', environment: 'production' });
-      expect(getDynamicSamplingContextFromSpan(transaction)).toStrictEqual({
+      expect(getDynamicSamplingContextFromSpan(span)).toStrictEqual({
         version: '1.0',
         environment: 'production',
       });
@@ -102,7 +99,7 @@ describe('Bun Serve Integration', () => {
   });
 
   test('does not create transactions for OPTIONS or HEAD requests', async () => {
-    client.on('finishTransaction', () => {
+    client.on('spanEnd', () => {
       // This will never run, but we want to make sure it doesn't run.
       expect(false).toEqual(true);
     });
diff --git a/packages/bun/tsconfig.json b/packages/bun/tsconfig.json
index 70c4bde02040..dcbef254b942 100644
--- a/packages/bun/tsconfig.json
+++ b/packages/bun/tsconfig.json
@@ -4,21 +4,7 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "types": ["bun-types"],
-    "lib": ["esnext"],
-    "module": "esnext",
-    "target": "esnext",
-
-    // if TS 4.x or earlier
-    "moduleResolution": "nodenext",
-
-    "jsx": "react-jsx", // support JSX
-    "allowJs": true, // allow importing `.js` from `.ts`
-    "esModuleInterop": true, // allow default imports for CommonJS modules
-
-    // best practices
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true
+    // package-specific options
+    "types": ["bun-types"]
   }
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 6c58cbf762ee..24f7e29a036a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/core/rollup.npm.config.mjs b/packages/core/rollup.npm.config.mjs
index 84a06f2fb64a..fd61fbf7c62c 100644
--- a/packages/core/rollup.npm.config.mjs
+++ b/packages/core/rollup.npm.config.mjs
@@ -1,3 +1,14 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-export default makeNPMConfigVariants(makeBaseNPMConfig());
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    packageSpecificConfig: {
+      output: {
+        // set exports to 'named' or 'auto' so that rollup doesn't warn
+        exports: 'named',
+        // set preserveModules to false because we want to bundle everything into one file.
+        preserveModules: false,
+      },
+    },
+  }),
+);
diff --git a/packages/core/src/asyncContext.ts b/packages/core/src/asyncContext.ts
index fa47ce8aa020..854b03ea9600 100644
--- a/packages/core/src/asyncContext.ts
+++ b/packages/core/src/asyncContext.ts
@@ -1,6 +1,8 @@
 import type { Hub, Integration } from '@sentry/types';
 import type { Scope } from '@sentry/types';
 import { GLOBAL_OBJ } from '@sentry/utils';
+import type { startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from './tracing/trace';
+import type { getActiveSpan } from './utils/spanUtils';
 
 /**
  * @private Private API with no semver guarantees!
@@ -42,6 +44,24 @@ export interface AsyncContextStrategy {
    * Get the currently active isolation scope.
    */
   getIsolationScope: () => Scope;
+
+  // OPTIONAL: Custom tracing methods
+  // These are used so that we can provide OTEL-based implementations
+
+  /** Start an active span. */
+  startSpan?: typeof startSpan;
+
+  /** Start an inactive span. */
+  startInactiveSpan?: typeof startInactiveSpan;
+
+  /** Start an active manual span. */
+  startSpanManual?: typeof startSpanManual;
+
+  /** Get the currently active span. */
+  getActiveSpan?: typeof getActiveSpan;
+
+  /** Make a span the active span in the context of the callback. */
+  withActiveSpan?: typeof withActiveSpan;
 }
 
 /**
diff --git a/packages/core/src/baseclient.ts b/packages/core/src/baseclient.ts
index 8d36844a96bf..178a37aff5c0 100644
--- a/packages/core/src/baseclient.ts
+++ b/packages/core/src/baseclient.ts
@@ -22,8 +22,8 @@ import type {
   Session,
   SessionAggregates,
   SeverityLevel,
+  Span,
   StartSpanOptions,
-  Transaction,
   TransactionEvent,
   Transport,
   TransportMakeRequestResponse,
@@ -417,10 +417,13 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   /* eslint-disable @typescript-eslint/unified-signatures */
 
   /** @inheritdoc */
-  public on(hook: 'startTransaction', callback: (transaction: Transaction) => void): void;
+  public on(hook: 'spanStart', callback: (span: Span) => void): void;
 
   /** @inheritdoc */
-  public on(hook: 'finishTransaction', callback: (transaction: Transaction) => void): void;
+  public on(hook: 'spanEnd', callback: (span: Span) => void): void;
+
+  /** @inheritdoc */
+  public on(hook: 'idleSpanEnableAutoFinish', callback: (span: Span) => void): void;
 
   /** @inheritdoc */
   public on(hook: 'beforeEnvelope', callback: (envelope: Envelope) => void): void;
@@ -447,7 +450,13 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   ): void;
 
   /** @inheritdoc */
-  public on(hook: 'startPageLoadSpan', callback: (options: StartSpanOptions) => void): void;
+  public on(
+    hook: 'startPageLoadSpan',
+    callback: (
+      options: StartSpanOptions,
+      traceOptions?: { sentryTrace?: string | undefined; baggage?: string | undefined },
+    ) => void,
+  ): void;
 
   /** @inheritdoc */
   public on(hook: 'startNavigationSpan', callback: (options: StartSpanOptions) => void): void;
@@ -467,10 +476,13 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   }
 
   /** @inheritdoc */
-  public emit(hook: 'startTransaction', transaction: Transaction): void;
+  public emit(hook: 'spanStart', span: Span): void;
 
   /** @inheritdoc */
-  public emit(hook: 'finishTransaction', transaction: Transaction): void;
+  public emit(hook: 'spanEnd', span: Span): void;
+
+  /** @inheritdoc */
+  public emit(hook: 'idleSpanEnableAutoFinish', span: Span): void;
 
   /** @inheritdoc */
   public emit(hook: 'beforeEnvelope', envelope: Envelope): void;
@@ -494,7 +506,11 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   public emit(hook: 'beforeSendFeedback', feedback: FeedbackEvent, options?: { includeReplay: boolean }): void;
 
   /** @inheritdoc */
-  public emit(hook: 'startPageLoadSpan', options: StartSpanOptions): void;
+  public emit(
+    hook: 'startPageLoadSpan',
+    options: StartSpanOptions,
+    traceOptions?: { sentryTrace?: string | undefined; baggage?: string | undefined },
+  ): void;
 
   /** @inheritdoc */
   public emit(hook: 'startNavigationSpan', options: StartSpanOptions): void;
@@ -515,7 +531,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
   /**
    * @inheritdoc
    */
-  public sendEnvelope(envelope: Envelope): PromiseLike<TransportMakeRequestResponse> | void {
+  public sendEnvelope(envelope: Envelope): PromiseLike<TransportMakeRequestResponse> {
     this.emit('beforeEnvelope', envelope);
 
     if (this._isEnabled() && this._transport) {
@@ -526,6 +542,8 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
     }
 
     DEBUG_BUILD && logger.error('Transport disabled');
+
+    return resolvedSyncPromise({});
   }
 
   /* eslint-enable @typescript-eslint/unified-signatures */
diff --git a/packages/core/src/currentScopes.ts b/packages/core/src/currentScopes.ts
index 07e26d9a96b6..1e68c9583372 100644
--- a/packages/core/src/currentScopes.ts
+++ b/packages/core/src/currentScopes.ts
@@ -1,15 +1,10 @@
 import type { Scope } from '@sentry/types';
 import type { Client } from '@sentry/types';
+import { getGlobalSingleton } from '@sentry/utils';
 import { getMainCarrier } from './asyncContext';
 import { getAsyncContextStrategy } from './hub';
 import { Scope as ScopeClass } from './scope';
 
-/**
- * The global scope is kept in this module.
- * When accessing it, we'll make sure to set one if none is currently present.
- */
-let globalScope: Scope | undefined;
-
 /**
  * Get the currently active scope.
  */
@@ -34,20 +29,7 @@ export function getIsolationScope(): Scope {
  * This scope is applied to _all_ events.
  */
 export function getGlobalScope(): Scope {
-  if (!globalScope) {
-    globalScope = new ScopeClass();
-  }
-
-  return globalScope;
-}
-
-/**
- * This is mainly needed for tests.
- * DO NOT USE this, as this is an internal API and subject to change.
- * @hidden
- */
-export function setGlobalScope(scope: Scope | undefined): void {
-  globalScope = scope;
+  return getGlobalSingleton('globalScope', () => new ScopeClass());
 }
 
 /**
diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts
index 9ec29c9d2a7e..3189cdc5278a 100644
--- a/packages/core/src/envelope.ts
+++ b/packages/core/src/envelope.ts
@@ -1,4 +1,6 @@
 import type {
+  Attachment,
+  AttachmentItem,
   DsnComponents,
   Event,
   EventEnvelope,
@@ -11,6 +13,7 @@ import type {
   SessionItem,
 } from '@sentry/types';
 import {
+  createAttachmentEnvelopeItem,
   createEnvelope,
   createEventEnvelopeHeaders,
   dsnToString,
@@ -86,3 +89,31 @@ export function createEventEnvelope(
   const eventItem: EventItem = [{ type: eventType }, event];
   return createEnvelope<EventEnvelope>(envelopeHeaders, [eventItem]);
 }
+
+/**
+ * Create an Envelope from an event.
+ */
+export function createAttachmentEnvelope(
+  event: Event,
+  attachments: Attachment[],
+  dsn?: DsnComponents,
+  metadata?: SdkMetadata,
+  tunnel?: string,
+): EventEnvelope {
+  const sdkInfo = getSdkMetadataForEnvelopeHeader(metadata);
+  enhanceEventWithSdkInfo(event, metadata && metadata.sdk);
+
+  const envelopeHeaders = createEventEnvelopeHeaders(event, sdkInfo, tunnel, dsn);
+
+  // Prevent this data (which, if it exists, was used in earlier steps in the processing pipeline) from being sent to
+  // sentry. (Note: Our use of this property comes and goes with whatever we might be debugging, whatever hacks we may
+  // have temporarily added, etc. Even if we don't happen to be using it at some point in the future, let's not get rid
+  // of this `delete`, lest we miss putting it back in the next time the property is in use.)
+  delete event.sdkProcessingMetadata;
+
+  const attachmentItems: AttachmentItem[] = [];
+  for (const attachment of attachments || []) {
+    attachmentItems.push(createAttachmentEnvelopeItem(attachment));
+  }
+  return createEnvelope<EventEnvelope>(envelopeHeaders, attachmentItems);
+}
diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts
index eb9a95652792..2ccb6ef530e8 100644
--- a/packages/core/src/exports.ts
+++ b/packages/core/src/exports.ts
@@ -1,7 +1,6 @@
 import type {
   CaptureContext,
   CheckIn,
-  CustomSamplingContext,
   Event,
   EventHint,
   EventProcessor,
@@ -10,21 +9,17 @@ import type {
   FinishedCheckIn,
   MonitorConfig,
   Primitive,
-  Scope as ScopeInterface,
   Session,
   SessionContext,
   SeverityLevel,
-  Span,
-  TransactionContext,
   User,
 } from '@sentry/types';
 import { GLOBAL_OBJ, isThenable, logger, timestampInSeconds, uuid4 } from '@sentry/utils';
 
 import { DEFAULT_ENVIRONMENT } from './constants';
-import { getClient, getCurrentScope, getIsolationScope, withScope } from './currentScopes';
+import { getClient, getCurrentScope, getIsolationScope } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
 import type { Hub } from './hub';
-import { getCurrentHub } from './hub';
 import { closeSession, makeSession, updateSession } from './session';
 import type { ExclusiveEventHintOrCaptureContext } from './utils/prepareEvent';
 import { parseEventHintOrCaptureContext } from './utils/prepareEvent';
@@ -126,53 +121,6 @@ export function setUser(user: User | null): ReturnType<Hub['setUser']> {
   getIsolationScope().setUser(user);
 }
 
-/**
- * Forks the current scope and sets the provided span as active span in the context of the provided callback. Can be
- * passed `null` to start an entirely new span tree.
- *
- * @param span Spans started in the context of the provided callback will be children of this span. If `null` is passed,
- * spans started within the callback will not be attached to a parent span.
- * @param callback Execution context in which the provided span will be active. Is passed the newly forked scope.
- * @returns the value returned from the provided callback function.
- */
-export function withActiveSpan<T>(span: Span | null, callback: (scope: ScopeInterface) => T): T {
-  return withScope(scope => {
-    // eslint-disable-next-line deprecation/deprecation
-    scope.setSpan(span || undefined);
-    return callback(scope);
-  });
-}
-
-/**
- * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.
- *
- * A tree structure can be built by adding child spans to the transaction, and child spans to other spans. To start a
- * new child span within the transaction or any span, call the respective `.startChild()` method.
- *
- * Every child span must be finished before the transaction is finished, otherwise the unfinished spans are discarded.
- *
- * The transaction must be finished with a call to its `.end()` method, at which point the transaction with all its
- * finished child spans will be sent to Sentry.
- *
- * NOTE: This function should only be used for *manual* instrumentation. Auto-instrumentation should call
- * `startTransaction` directly on the hub.
- *
- * @param context Properties of the new `Transaction`.
- * @param customSamplingContext Information given to the transaction sampling function (along with context-dependent
- * default values). See {@link Options.tracesSampler}.
- *
- * @returns The transaction which was just started
- *
- * @deprecated Use `startSpan()`, `startSpanManual()` or `startInactiveSpan()` instead.
- */
-export function startTransaction(
-  context: TransactionContext,
-  customSamplingContext?: CustomSamplingContext,
-): ReturnType<Hub['startTransaction']> {
-  // eslint-disable-next-line deprecation/deprecation
-  return getCurrentHub().startTransaction({ ...context }, customSamplingContext);
-}
-
 /**
  * Create a cron monitor check in and send it to Sentry.
  *
diff --git a/packages/tracing-internal/src/common/fetch.ts b/packages/core/src/fetch.ts
similarity index 92%
rename from packages/tracing-internal/src/common/fetch.ts
rename to packages/core/src/fetch.ts
index aa50154abc5a..5255e7fa206d 100644
--- a/packages/tracing-internal/src/common/fetch.ts
+++ b/packages/core/src/fetch.ts
@@ -1,16 +1,3 @@
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SPAN_STATUS_ERROR,
-  getClient,
-  getCurrentScope,
-  getDynamicSamplingContextFromClient,
-  getDynamicSamplingContextFromSpan,
-  getIsolationScope,
-  hasTracingEnabled,
-  setHttpStatus,
-  spanToTraceHeader,
-  startInactiveSpan,
-} from '@sentry/core';
 import type { Client, HandlerDataFetch, Scope, Span, SpanOrigin } from '@sentry/types';
 import {
   BAGGAGE_HEADER_NAME,
@@ -18,6 +5,18 @@ import {
   generateSentryTraceHeader,
   isInstanceOf,
 } from '@sentry/utils';
+import { getClient, getCurrentScope, getIsolationScope } from './currentScopes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
+import {
+  SPAN_STATUS_ERROR,
+  getDynamicSamplingContextFromClient,
+  getDynamicSamplingContextFromSpan,
+  setHttpStatus,
+  startInactiveSpan,
+} from './tracing';
+import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
+import { hasTracingEnabled } from './utils/hasTracingEnabled';
+import { spanToTraceHeader } from './utils/spanUtils';
 
 type PolymorphicRequestHeaders =
   | Record<string, string | undefined>
@@ -94,12 +93,10 @@ export function instrumentFetchRequest(
         },
         op: 'http.client',
       })
-    : undefined;
+    : new SentryNonRecordingSpan();
 
-  if (span) {
-    handlerData.fetchData.__span = span.spanContext().spanId;
-    spans[span.spanContext().spanId] = span;
-  }
+  handlerData.fetchData.__span = span.spanContext().spanId;
+  spans[span.spanContext().spanId] = span;
 
   if (shouldAttachHeaders(handlerData.fetchData.url) && client) {
     const request: string | Request = handlerData.args[0];
@@ -110,7 +107,6 @@ export function instrumentFetchRequest(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options: { [key: string]: any } = handlerData.args[1];
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
     options.headers = addTracingHeadersToFetchRequest(request, client, scope, options, span);
   }
 
diff --git a/packages/core/src/hub.ts b/packages/core/src/hub.ts
index abfb22b612b3..a60b3af506fc 100644
--- a/packages/core/src/hub.ts
+++ b/packages/core/src/hub.ts
@@ -3,7 +3,6 @@ import type {
   Breadcrumb,
   BreadcrumbHint,
   Client,
-  CustomSamplingContext,
   Event,
   EventHint,
   Extra,
@@ -16,10 +15,9 @@ import type {
   Session,
   SessionContext,
   SeverityLevel,
-  Transaction,
-  TransactionContext,
   User,
 } from '@sentry/types';
+import { getGlobalSingleton } from '@sentry/utils';
 import { GLOBAL_OBJ, consoleSandbox, dateTimestampInSeconds, isThenable, logger, uuid4 } from '@sentry/utils';
 
 import type { AsyncContextStrategy, Carrier } from './asyncContext';
@@ -438,46 +436,6 @@ export class Hub implements HubInterface {
     }
   }
 
-  /**
-   * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.
-   *
-   * A tree structure can be built by adding child spans to the transaction, and child spans to other spans. To start a
-   * new child span within the transaction or any span, call the respective `.startChild()` method.
-   *
-   * Every child span must be finished before the transaction is finished, otherwise the unfinished spans are discarded.
-   *
-   * The transaction must be finished with a call to its `.end()` method, at which point the transaction with all its
-   * finished child spans will be sent to Sentry.
-   *
-   * @param context Properties of the new `Transaction`.
-   * @param customSamplingContext Information given to the transaction sampling function (along with context-dependent
-   * default values). See {@link Options.tracesSampler}.
-   *
-   * @returns The transaction which was just started
-   *
-   * @deprecated Use `startSpan()`, `startSpanManual()` or `startInactiveSpan()` instead.
-   */
-  public startTransaction(context: TransactionContext, customSamplingContext?: CustomSamplingContext): Transaction {
-    const result = this._callExtensionMethod<Transaction>('startTransaction', context, customSamplingContext);
-
-    if (DEBUG_BUILD && !result) {
-      // eslint-disable-next-line deprecation/deprecation
-      const client = this.getClient();
-      if (!client) {
-        logger.warn(
-          "Tracing extension 'startTransaction' is missing. You should 'init' the SDK before calling 'startTransaction'",
-        );
-      } else {
-        logger.warn(`Tracing extension 'startTransaction' has not been added. Call 'addTracingExtensions' before calling 'init':
-Sentry.addTracingExtensions();
-Sentry.init({...});
-`);
-      }
-    }
-
-    return result;
-  }
-
   /**
    * @inheritDoc
    *
@@ -617,25 +575,14 @@ export function getCurrentHub(): HubInterface {
   return acs.getCurrentHub() || getGlobalHub();
 }
 
-let defaultCurrentScope: Scope | undefined;
-let defaultIsolationScope: Scope | undefined;
-
 /** Get the default current scope. */
 export function getDefaultCurrentScope(): Scope {
-  if (!defaultCurrentScope) {
-    defaultCurrentScope = new Scope();
-  }
-
-  return defaultCurrentScope;
+  return getGlobalSingleton('defaultCurrentScope', () => new Scope());
 }
 
 /** Get the default isolation scope. */
 export function getDefaultIsolationScope(): Scope {
-  if (!defaultIsolationScope) {
-    defaultIsolationScope = new Scope();
-  }
-
-  return defaultIsolationScope;
+  return getGlobalSingleton('defaultIsolationScope', () => new Scope());
 }
 
 /**
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index b8c451b432cd..fbf233ad8dd8 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -8,7 +8,7 @@ export type { IntegrationIndex } from './integration';
 
 export * from './tracing';
 export * from './semanticAttributes';
-export { createEventEnvelope, createSessionEnvelope } from './envelope';
+export { createEventEnvelope, createSessionEnvelope, createAttachmentEnvelope } from './envelope';
 export {
   captureCheckIn,
   withMonitor,
@@ -17,8 +17,6 @@ export {
   captureMessage,
   close,
   flush,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   setContext,
   setExtra,
   setExtras,
@@ -29,7 +27,6 @@ export {
   startSession,
   endSession,
   captureSession,
-  withActiveSpan,
   addEventProcessor,
 } from './exports';
 export {
@@ -46,7 +43,6 @@ export {
   getCurrentScope,
   getIsolationScope,
   getGlobalScope,
-  setGlobalScope,
   withScope,
   withIsolationScope,
   getClient,
@@ -90,8 +86,12 @@ export {
   spanToJSON,
   spanIsSampled,
   spanToTraceContext,
+  getSpanDescendants,
+  getStatusMessage,
+  getRootSpan,
+  getActiveSpan,
+  addChildSpanToSpan,
 } from './utils/spanUtils';
-export { getRootSpan } from './utils/getRootSpan';
 export { applySdkMetadata } from './utils/sdkMetadata';
 export { DEFAULT_ENVIRONMENT } from './constants';
 /* eslint-disable deprecation/deprecation */
@@ -113,3 +113,5 @@ export { metrics } from './metrics/exports';
 export type { MetricData } from './metrics/exports';
 export { metricsDefault } from './metrics/exports-default';
 export { BrowserMetricsAggregator } from './metrics/browser-aggregator';
+export { getMetricSummaryJsonForSpan } from './metrics/metric-summary';
+export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './fetch';
diff --git a/packages/core/src/metrics/aggregator.ts b/packages/core/src/metrics/aggregator.ts
index 5f0337e804f3..169e40b42905 100644
--- a/packages/core/src/metrics/aggregator.ts
+++ b/packages/core/src/metrics/aggregator.ts
@@ -1,15 +1,9 @@
-import type {
-  ClientOptions,
-  MeasurementUnit,
-  MetricsAggregator as MetricsAggregatorBase,
-  Primitive,
-} from '@sentry/types';
+import type { Client, MeasurementUnit, MetricsAggregator as MetricsAggregatorBase, Primitive } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
-import type { BaseClient } from '../baseclient';
+import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils';
 import { DEFAULT_FLUSH_INTERVAL, MAX_WEIGHT, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
 import { captureAggregateMetrics } from './envelope';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 
@@ -40,7 +34,7 @@ export class MetricsAggregator implements MetricsAggregatorBase {
   // Force flush is used on either shutdown, flush() or when we exceed the max weight.
   private _forceFlush: boolean;
 
-  public constructor(private readonly _client: BaseClient<ClientOptions>) {
+  public constructor(private readonly _client: Client) {
     this._buckets = new Map();
     this._bucketsTotalWeight = 0;
     this._interval = setInterval(() => this._flush(), DEFAULT_FLUSH_INTERVAL);
diff --git a/packages/core/src/metrics/browser-aggregator.ts b/packages/core/src/metrics/browser-aggregator.ts
index d19aa441aef3..7d599f5aeba8 100644
--- a/packages/core/src/metrics/browser-aggregator.ts
+++ b/packages/core/src/metrics/browser-aggregator.ts
@@ -1,10 +1,9 @@
-import type { ClientOptions, MeasurementUnit, MetricsAggregator, Primitive } from '@sentry/types';
+import type { Client, MeasurementUnit, MetricsAggregator, Primitive } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
-import type { BaseClient } from '../baseclient';
+import { updateMetricSummaryOnActiveSpan } from '../utils/spanUtils';
 import { DEFAULT_BROWSER_FLUSH_INTERVAL, NAME_AND_TAG_KEY_NORMALIZATION_REGEX, SET_METRIC_TYPE } from './constants';
 import { captureAggregateMetrics } from './envelope';
 import { METRIC_MAP } from './instance';
-import { updateMetricSummaryOnActiveSpan } from './metric-summary';
 import type { MetricBucket, MetricType } from './types';
 import { getBucketKey, sanitizeTags } from './utils';
 
@@ -21,7 +20,7 @@ export class BrowserMetricsAggregator implements MetricsAggregator {
   private _buckets: MetricBucket;
   private readonly _interval: ReturnType<typeof setInterval>;
 
-  public constructor(private readonly _client: BaseClient<ClientOptions>) {
+  public constructor(private readonly _client: Client) {
     this._buckets = new Map();
     this._interval = setInterval(() => this.flush(), DEFAULT_BROWSER_FLUSH_INTERVAL);
   }
diff --git a/packages/core/src/metrics/envelope.ts b/packages/core/src/metrics/envelope.ts
index 47ccc2740834..f3bd67b27ec6 100644
--- a/packages/core/src/metrics/envelope.ts
+++ b/packages/core/src/metrics/envelope.ts
@@ -1,22 +1,11 @@
-import type {
-  ClientOptions,
-  DsnComponents,
-  MetricBucketItem,
-  SdkMetadata,
-  StatsdEnvelope,
-  StatsdItem,
-} from '@sentry/types';
+import type { Client, DsnComponents, MetricBucketItem, SdkMetadata, StatsdEnvelope, StatsdItem } from '@sentry/types';
 import { createEnvelope, dsnToString, logger } from '@sentry/utils';
-import type { BaseClient } from '../baseclient';
 import { serializeMetricBuckets } from './utils';
 
 /**
  * Captures aggregated metrics to the supplied client.
  */
-export function captureAggregateMetrics(
-  client: BaseClient<ClientOptions>,
-  metricBucketItems: Array<MetricBucketItem>,
-): void {
+export function captureAggregateMetrics(client: Client, metricBucketItems: Array<MetricBucketItem>): void {
   logger.log(`Flushing aggregated metrics, number of metrics: ${metricBucketItems.length}`);
   const dsn = client.getDsn();
   const metadata = client.getSdkMetadata();
diff --git a/packages/core/src/metrics/exports-default.ts b/packages/core/src/metrics/exports-default.ts
index f331bd3de3f1..280d1d619bea 100644
--- a/packages/core/src/metrics/exports-default.ts
+++ b/packages/core/src/metrics/exports-default.ts
@@ -1,3 +1,4 @@
+import type { Client, MetricsAggregator as MetricsAggregatorInterface } from '@sentry/types';
 import { MetricsAggregator } from './aggregator';
 import type { MetricData } from './exports';
 import { metrics as metricsCore } from './exports';
@@ -38,9 +39,20 @@ function gauge(name: string, value: number, data?: MetricData): void {
   metricsCore.gauge(MetricsAggregator, name, value, data);
 }
 
+/**
+ * Returns the metrics aggregator for a given client.
+ */
+function getMetricsAggregatorForClient(client: Client): MetricsAggregatorInterface {
+  return metricsCore.getMetricsAggregatorForClient(client, MetricsAggregator);
+}
+
 export const metricsDefault = {
   increment,
   distribution,
   set,
   gauge,
+  /**
+   * @ignore This is for internal use only.
+   */
+  getMetricsAggregatorForClient,
 };
diff --git a/packages/core/src/metrics/exports.ts b/packages/core/src/metrics/exports.ts
index 4587c26a8510..2ed0d9cb9d51 100644
--- a/packages/core/src/metrics/exports.ts
+++ b/packages/core/src/metrics/exports.ts
@@ -1,11 +1,10 @@
 import type {
-  ClientOptions,
+  Client,
   MeasurementUnit,
   MetricsAggregator as MetricsAggregatorInterface,
   Primitive,
 } from '@sentry/types';
-import { logger } from '@sentry/utils';
-import type { BaseClient } from '../baseclient';
+import { getGlobalSingleton, logger } from '@sentry/utils';
 import { getCurrentScope } from '../currentScopes';
 import { getClient } from '../currentScopes';
 import { DEBUG_BUILD } from '../debug-build';
@@ -17,18 +16,39 @@ export interface MetricData {
   unit?: MeasurementUnit;
   tags?: Record<string, Primitive>;
   timestamp?: number;
+  client?: Client;
 }
 
 type MetricsAggregatorConstructor = {
-  new (client: BaseClient<ClientOptions>): MetricsAggregatorInterface;
+  new (client: Client): MetricsAggregatorInterface;
 };
 
 /**
- * Global metrics aggregator instance.
- *
- * This is initialized on the first call to any `Sentry.metric.*` method.
+ * Gets the metrics aggregator for a given client.
+ * @param client The client for which to get the metrics aggregator.
+ * @param Aggregator Optional metrics aggregator class to use to create an aggregator if one does not exist.
  */
-let globalMetricsAggregator: MetricsAggregatorInterface | undefined;
+function getMetricsAggregatorForClient(
+  client: Client,
+  Aggregator: MetricsAggregatorConstructor,
+): MetricsAggregatorInterface {
+  const globalMetricsAggregators = getGlobalSingleton<WeakMap<Client, MetricsAggregatorInterface>>(
+    'globalMetricsAggregators',
+    () => new WeakMap(),
+  );
+
+  const aggregator = globalMetricsAggregators.get(client);
+  if (aggregator) {
+    return aggregator;
+  }
+
+  const newAggregator = new Aggregator(client);
+  client.on('flush', () => newAggregator.flush());
+  client.on('close', () => newAggregator.close());
+  globalMetricsAggregators.set(client, newAggregator);
+
+  return newAggregator;
+}
 
 function addToMetricsAggregator(
   Aggregator: MetricsAggregatorConstructor,
@@ -37,38 +57,32 @@ function addToMetricsAggregator(
   value: number | string,
   data: MetricData | undefined = {},
 ): void {
-  const client = getClient<BaseClient<ClientOptions>>();
+  const client = data.client || getClient<Client>();
+
   if (!client) {
     return;
   }
 
-  if (!globalMetricsAggregator) {
-    const aggregator = (globalMetricsAggregator = new Aggregator(client));
-
-    client.on('flush', () => aggregator.flush());
-    client.on('close', () => aggregator.close());
+  const scope = getCurrentScope();
+  const { unit, tags, timestamp } = data;
+  const { release, environment } = client.getOptions();
+  // eslint-disable-next-line deprecation/deprecation
+  const transaction = scope.getTransaction();
+  const metricTags: Record<string, string> = {};
+  if (release) {
+    metricTags.release = release;
   }
-
-  if (client) {
-    const scope = getCurrentScope();
-    const { unit, tags, timestamp } = data;
-    const { release, environment } = client.getOptions();
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = scope.getTransaction();
-    const metricTags: Record<string, string> = {};
-    if (release) {
-      metricTags.release = release;
-    }
-    if (environment) {
-      metricTags.environment = environment;
-    }
-    if (transaction) {
-      metricTags.transaction = spanToJSON(transaction).description || '';
-    }
-
-    DEBUG_BUILD && logger.log(`Adding value of ${value} to ${metricType} metric ${name}`);
-    globalMetricsAggregator.add(metricType, name, value, unit, { ...metricTags, ...tags }, timestamp);
+  if (environment) {
+    metricTags.environment = environment;
   }
+  if (transaction) {
+    metricTags.transaction = spanToJSON(transaction).description || '';
+  }
+
+  DEBUG_BUILD && logger.log(`Adding value of ${value} to ${metricType} metric ${name}`);
+
+  const aggregator = getMetricsAggregatorForClient(client, Aggregator);
+  aggregator.add(metricType, name, value, unit, { ...metricTags, ...tags }, timestamp);
 }
 
 /**
@@ -112,4 +126,8 @@ export const metrics = {
   distribution,
   set,
   gauge,
+  /**
+   * @ignore This is for internal use only.
+   */
+  getMetricsAggregatorForClient,
 };
diff --git a/packages/core/src/metrics/metric-summary.ts b/packages/core/src/metrics/metric-summary.ts
index 2be991297296..f1324def357d 100644
--- a/packages/core/src/metrics/metric-summary.ts
+++ b/packages/core/src/metrics/metric-summary.ts
@@ -2,7 +2,6 @@ import type { MeasurementUnit, Span } from '@sentry/types';
 import type { MetricSummary } from '@sentry/types';
 import type { Primitive } from '@sentry/types';
 import { dropUndefinedKeys } from '@sentry/utils';
-import { getActiveSpan } from '../tracing/utils';
 import type { MetricType } from './types';
 
 /**
@@ -40,9 +39,10 @@ export function getMetricSummaryJsonForSpan(span: Span): Record<string, Array<Me
 }
 
 /**
- * Updates the metric summary on the currently active span
+ * Updates the metric summary on a span.
  */
-export function updateMetricSummaryOnActiveSpan(
+export function updateMetricSummaryOnSpan(
+  span: Span,
   metricType: MetricType,
   sanitizedName: string,
   value: number,
@@ -50,42 +50,39 @@ export function updateMetricSummaryOnActiveSpan(
   tags: Record<string, Primitive>,
   bucketKey: string,
 ): void {
-  const span = getActiveSpan();
-  if (span) {
-    const storage = getMetricStorageForSpan(span) || new Map<string, [string, MetricSummary]>();
+  const storage = getMetricStorageForSpan(span) || new Map<string, [string, MetricSummary]>();
 
-    const exportKey = `${metricType}:${sanitizedName}@${unit}`;
-    const bucketItem = storage.get(bucketKey);
+  const exportKey = `${metricType}:${sanitizedName}@${unit}`;
+  const bucketItem = storage.get(bucketKey);
 
-    if (bucketItem) {
-      const [, summary] = bucketItem;
-      storage.set(bucketKey, [
-        exportKey,
-        {
-          min: Math.min(summary.min, value),
-          max: Math.max(summary.max, value),
-          count: (summary.count += 1),
-          sum: (summary.sum += value),
-          tags: summary.tags,
-        },
-      ]);
-    } else {
-      storage.set(bucketKey, [
-        exportKey,
-        {
-          min: value,
-          max: value,
-          count: 1,
-          sum: value,
-          tags,
-        },
-      ]);
-    }
-
-    if (!SPAN_METRIC_SUMMARY) {
-      SPAN_METRIC_SUMMARY = new WeakMap();
-    }
+  if (bucketItem) {
+    const [, summary] = bucketItem;
+    storage.set(bucketKey, [
+      exportKey,
+      {
+        min: Math.min(summary.min, value),
+        max: Math.max(summary.max, value),
+        count: (summary.count += 1),
+        sum: (summary.sum += value),
+        tags: summary.tags,
+      },
+    ]);
+  } else {
+    storage.set(bucketKey, [
+      exportKey,
+      {
+        min: value,
+        max: value,
+        count: 1,
+        sum: value,
+        tags,
+      },
+    ]);
+  }
 
-    SPAN_METRIC_SUMMARY.set(span, storage);
+  if (!SPAN_METRIC_SUMMARY) {
+    SPAN_METRIC_SUMMARY = new WeakMap();
   }
+
+  SPAN_METRIC_SUMMARY.set(span, storage);
 }
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
index 820e41858135..90961cc48bd0 100644
--- a/packages/core/src/scope.ts
+++ b/packages/core/src/scope.ts
@@ -81,6 +81,9 @@ export class Scope implements ScopeInterface {
 
   /**
    * Transaction Name
+   *
+   * IMPORTANT: The transaction name on the scope has nothing to do with root spans/transaction objects.
+   * It's purpose is to assign a transaction to the scope that's added to non-transaction events.
    */
   protected _transactionName?: string;
 
@@ -121,7 +124,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Clone this scope instance.
+   * @inheritDoc
    */
   public clone(): Scope {
     const newScope = new Scope();
@@ -145,23 +148,22 @@ export class Scope implements ScopeInterface {
     return newScope;
   }
 
-  /** Update the client on the scope. */
+  /**
+   * @inheritDoc
+   */
   public setClient(client: Client | undefined): void {
     this._client = client;
   }
 
   /**
-   * Get the client assigned to this scope.
-   *
-   * It is generally recommended to use the global function `Sentry.getClient()` instead, unless you know what you are doing.
+   * @inheritDoc
    */
   public getClient<C extends Client>(): C | undefined {
     return this._client as C | undefined;
   }
 
   /**
-   * Add internal on change listener. Used for sub SDKs that need to store the scope.
-   * @hidden
+   * @inheritDoc
    */
   public addScopeListener(callback: (scope: Scope) => void): void {
     this._scopeListeners.push(callback);
@@ -279,8 +281,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Sets the transaction name on the scope for future events.
-   * @deprecated Use extra or tags instead.
+   * @inheritDoc
    */
   public setTransactionName(name?: string): this {
     this._transactionName = name;
@@ -542,7 +543,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Add data which will be accessible during event processing but won't get sent to Sentry
+   * @inheritDoc
    */
   public setSDKProcessingMetadata(newData: { [key: string]: unknown }): this {
     this._sdkProcessingMetadata = { ...this._sdkProcessingMetadata, ...newData };
@@ -566,11 +567,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Capture an exception for this scope.
-   *
-   * @param exception The exception to capture.
-   * @param hint Optinal additional data to attach to the Sentry event.
-   * @returns the id of the captured Sentry event.
+   * @inheritDoc
    */
   public captureException(exception: unknown, hint?: EventHint): string {
     const eventId = hint && hint.event_id ? hint.event_id : uuid4();
@@ -597,12 +594,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Capture a message for this scope.
-   *
-   * @param message The message to capture.
-   * @param level An optional severity level to report the message with.
-   * @param hint Optional additional data to attach to the Sentry event.
-   * @returns the id of the captured message.
+   * @inheritDoc
    */
   public captureMessage(message: string, level?: SeverityLevel, hint?: EventHint): string {
     const eventId = hint && hint.event_id ? hint.event_id : uuid4();
@@ -630,11 +622,7 @@ export class Scope implements ScopeInterface {
   }
 
   /**
-   * Captures a manually created event for this scope and sends it to Sentry.
-   *
-   * @param exception The event to capture.
-   * @param hint Optional additional data to attach to the Sentry event.
-   * @returns the id of the captured event.
+   * @inheritDoc
    */
   public captureEvent(event: Event, hint?: EventHint): string {
     const eventId = hint && hint.event_id ? hint.event_id : uuid4();
diff --git a/packages/core/src/semanticAttributes.ts b/packages/core/src/semanticAttributes.ts
index afd0d123090f..67ad231e7c10 100644
--- a/packages/core/src/semanticAttributes.ts
+++ b/packages/core/src/semanticAttributes.ts
@@ -19,3 +19,6 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_OP = 'sentry.op';
  * Use this attribute to represent the origin of a span.
  */
 export const SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN = 'sentry.origin';
+
+/** The reason why an idle span finished. */
+export const SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON = 'sentry.idle_span_finish_reason';
diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts
index 682e58e80355..de88e6f3706e 100644
--- a/packages/core/src/server-runtime-client.ts
+++ b/packages/core/src/server-runtime-client.ts
@@ -24,8 +24,7 @@ import {
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
 } from './tracing';
-import { getRootSpan } from './utils/getRootSpan';
-import { spanToTraceContext } from './utils/spanUtils';
+import { getRootSpan, spanToTraceContext } from './utils/spanUtils';
 
 export interface ServerRuntimeClientOptions extends ClientOptions<BaseTransportOptions> {
   platform?: string;
@@ -256,8 +255,9 @@ export class ServerRuntimeClient<
     // eslint-disable-next-line deprecation/deprecation
     const span = scope.getSpan();
     if (span) {
-      const samplingContext = getRootSpan(span) ? getDynamicSamplingContextFromSpan(span) : undefined;
-      return [samplingContext, spanToTraceContext(span)];
+      const rootSpan = getRootSpan(span);
+      const samplingContext = getDynamicSamplingContextFromSpan(rootSpan);
+      return [samplingContext, spanToTraceContext(rootSpan)];
     }
 
     const { traceId, spanId, parentSpanId, dsc } = scope.getPropagationContext();
diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index e2dd9af12b0b..04510683a1b9 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -4,8 +4,7 @@ import { dropUndefinedKeys } from '@sentry/utils';
 import { DEFAULT_ENVIRONMENT } from '../constants';
 import { getClient } from '../currentScopes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
-import { getRootSpan } from '../utils/getRootSpan';
-import { spanIsSampled, spanToJSON } from '../utils/spanUtils';
+import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
 
 /**
  * Creates a dynamic sampling context from a client.
@@ -50,15 +49,15 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
   const dsc = getDynamicSamplingContextFromClient(spanToJSON(span).trace_id || '', client);
 
   // TODO (v8): Remove v7FrozenDsc as a Transaction will no longer have _frozenDynamicSamplingContext
-  const txn = getRootSpan(span) as TransactionWithV7FrozenDsc | undefined;
-  if (!txn) {
+  const rootSpan = getRootSpan(span);
+  if (!rootSpan) {
     return dsc;
   }
 
   // TODO (v8): Remove v7FrozenDsc as a Transaction will no longer have _frozenDynamicSamplingContext
   // For now we need to avoid breaking users who directly created a txn with a DSC, where this field is still set.
   // @see Transaction class constructor
-  const v7FrozenDsc = txn && txn._frozenDynamicSamplingContext;
+  const v7FrozenDsc = rootSpan && (rootSpan as TransactionWithV7FrozenDsc)._frozenDynamicSamplingContext;
   if (v7FrozenDsc) {
     return v7FrozenDsc;
   }
@@ -66,13 +65,13 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
   // TODO (v8): Replace txn.metadata with txn.attributes[]
   // We can't do this yet because attributes aren't always set yet.
   // eslint-disable-next-line deprecation/deprecation
-  const { sampleRate: maybeSampleRate } = txn.metadata;
+  const { sampleRate: maybeSampleRate } = (rootSpan as TransactionWithV7FrozenDsc).metadata || {};
   if (maybeSampleRate != null) {
     dsc.sample_rate = `${maybeSampleRate}`;
   }
 
   // We don't want to have a transaction name in the DSC if the source is "url" because URLs might contain PII
-  const jsonSpan = spanToJSON(txn);
+  const jsonSpan = spanToJSON(rootSpan);
 
   const source = (jsonSpan.data || {})[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
 
@@ -81,7 +80,7 @@ export function getDynamicSamplingContextFromSpan(span: Span): Readonly<Partial<
     dsc.transaction = jsonSpan.description;
   }
 
-  dsc.sampled = String(spanIsSampled(txn));
+  dsc.sampled = String(spanIsSampled(rootSpan));
 
   client.emit('createDsc', dsc);
 
diff --git a/packages/core/src/tracing/errors.ts b/packages/core/src/tracing/errors.ts
index 2645c10e42b8..de184c01391f 100644
--- a/packages/core/src/tracing/errors.ts
+++ b/packages/core/src/tracing/errors.ts
@@ -5,8 +5,8 @@ import {
 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
+import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { getActiveTransaction } from './utils';
 
 let errorsInstrumented = false;
 
@@ -29,15 +29,15 @@ export function registerErrorInstrumentation(): void {
 }
 
 /**
- * If an error or unhandled promise occurs, we mark the active transaction as failed
+ * If an error or unhandled promise occurs, we mark the active root span as failed
  */
 function errorCallback(): void {
-  // eslint-disable-next-line deprecation/deprecation
-  const activeTransaction = getActiveTransaction();
-  if (activeTransaction) {
+  const activeSpan = getActiveSpan();
+  const rootSpan = activeSpan && getRootSpan(activeSpan);
+  if (rootSpan) {
     const message = 'internal_error';
-    DEBUG_BUILD && logger.log(`[Tracing] Transaction: ${message} -> Global error occured`);
-    activeTransaction.setStatus({ code: SPAN_STATUS_ERROR, message });
+    DEBUG_BUILD && logger.log(`[Tracing] Root span: ${message} -> Global error occured`);
+    rootSpan.setStatus({ code: SPAN_STATUS_ERROR, message });
   }
 }
 
diff --git a/packages/core/src/tracing/hubextensions.ts b/packages/core/src/tracing/hubextensions.ts
index 5f30a94498b9..394a2be026fe 100644
--- a/packages/core/src/tracing/hubextensions.ts
+++ b/packages/core/src/tracing/hubextensions.ts
@@ -1,116 +1,9 @@
-import type { ClientOptions, CustomSamplingContext, Hub, TransactionContext } from '@sentry/types';
-import { getMainCarrier } from '../asyncContext';
-
 import { registerErrorInstrumentation } from './errors';
-import { IdleTransaction } from './idletransaction';
-import { sampleTransaction } from './sampling';
-import { Transaction } from './transaction';
-
-/**
- * Creates a new transaction and adds a sampling decision if it doesn't yet have one.
- *
- * The Hub.startTransaction method delegates to this method to do its work, passing the Hub instance in as `this`, as if
- * it had been called on the hub directly. Exists as a separate function so that it can be injected into the class as an
- * "extension method."
- *
- * @param this: The Hub starting the transaction
- * @param transactionContext: Data used to configure the transaction
- * @param CustomSamplingContext: Optional data to be provided to the `tracesSampler` function (if any)
- *
- * @returns The new transaction
- *
- * @see {@link Hub.startTransaction}
- */
-function _startTransaction(
-  this: Hub,
-  transactionContext: TransactionContext,
-  customSamplingContext?: CustomSamplingContext,
-): Transaction {
-  // eslint-disable-next-line deprecation/deprecation
-  const client = this.getClient();
-  const options: Partial<ClientOptions> = (client && client.getOptions()) || {};
-
-  // eslint-disable-next-line deprecation/deprecation
-  let transaction = new Transaction(transactionContext, this);
-  transaction = sampleTransaction(transaction, options, {
-    name: transactionContext.name,
-    parentSampled: transactionContext.parentSampled,
-    transactionContext,
-    attributes: {
-      // eslint-disable-next-line deprecation/deprecation
-      ...transactionContext.data,
-      ...transactionContext.attributes,
-    },
-    ...customSamplingContext,
-  });
-  if (transaction.isRecording()) {
-    transaction.initSpanRecorder();
-  }
-  if (client) {
-    client.emit('startTransaction', transaction);
-  }
-  return transaction;
-}
 
 /**
- * Create new idle transaction.
- */
-export function startIdleTransaction(
-  hub: Hub,
-  transactionContext: TransactionContext,
-  idleTimeout: number,
-  finalTimeout: number,
-  onScope?: boolean,
-  customSamplingContext?: CustomSamplingContext,
-  heartbeatInterval?: number,
-  delayAutoFinishUntilSignal: boolean = false,
-): IdleTransaction {
-  // eslint-disable-next-line deprecation/deprecation
-  const client = hub.getClient();
-  const options: Partial<ClientOptions> = (client && client.getOptions()) || {};
-
-  // eslint-disable-next-line deprecation/deprecation
-  let transaction = new IdleTransaction(
-    transactionContext,
-    hub,
-    idleTimeout,
-    finalTimeout,
-    heartbeatInterval,
-    onScope,
-    delayAutoFinishUntilSignal,
-  );
-  transaction = sampleTransaction(transaction, options, {
-    name: transactionContext.name,
-    parentSampled: transactionContext.parentSampled,
-    transactionContext,
-    attributes: {
-      // eslint-disable-next-line deprecation/deprecation
-      ...transactionContext.data,
-      ...transactionContext.attributes,
-    },
-    ...customSamplingContext,
-  });
-  if (transaction.isRecording()) {
-    transaction.initSpanRecorder();
-  }
-  if (client) {
-    client.emit('startTransaction', transaction);
-  }
-  return transaction;
-}
-
-/**
- * Adds tracing extensions to the global hub.
+ * Adds tracing extensions.
+ * TODO (v8): Do we still need this?? Can we solve this differently?
  */
 export function addTracingExtensions(): void {
-  const carrier = getMainCarrier();
-  if (!carrier.__SENTRY__) {
-    return;
-  }
-  carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};
-  if (!carrier.__SENTRY__.extensions.startTransaction) {
-    carrier.__SENTRY__.extensions.startTransaction = _startTransaction;
-  }
-
   registerErrorInstrumentation();
 }
diff --git a/packages/core/src/tracing/idleSpan.ts b/packages/core/src/tracing/idleSpan.ts
new file mode 100644
index 000000000000..36d1474b39f2
--- /dev/null
+++ b/packages/core/src/tracing/idleSpan.ts
@@ -0,0 +1,356 @@
+import type { Span, SpanAttributes, StartSpanOptions } from '@sentry/types';
+import { logger, timestampInSeconds } from '@sentry/utils';
+import { getClient, getCurrentScope } from '../currentScopes';
+
+import { DEBUG_BUILD } from '../debug-build';
+import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes';
+import { hasTracingEnabled } from '../utils/hasTracingEnabled';
+import {
+  getActiveSpan,
+  getSpanDescendants,
+  removeChildSpanFromSpan,
+  spanTimeInputToSeconds,
+  spanToJSON,
+} from '../utils/spanUtils';
+import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
+import { SPAN_STATUS_ERROR } from './spanstatus';
+import { startInactiveSpan } from './trace';
+
+export const TRACING_DEFAULTS = {
+  idleTimeout: 1_000,
+  finalTimeout: 30_000,
+  childSpanTimeout: 15_000,
+};
+
+const FINISH_REASON_HEARTBEAT_FAILED = 'heartbeatFailed';
+const FINISH_REASON_IDLE_TIMEOUT = 'idleTimeout';
+const FINISH_REASON_FINAL_TIMEOUT = 'finalTimeout';
+const FINISH_REASON_EXTERNAL_FINISH = 'externalFinish';
+const FINISH_REASON_CANCELLED = 'cancelled';
+
+// unused
+const FINISH_REASON_DOCUMENT_HIDDEN = 'documentHidden';
+
+// unusued in this file, but used in BrowserTracing
+const FINISH_REASON_INTERRUPTED = 'interactionInterrupted';
+
+type IdleSpanFinishReason =
+  | typeof FINISH_REASON_CANCELLED
+  | typeof FINISH_REASON_DOCUMENT_HIDDEN
+  | typeof FINISH_REASON_EXTERNAL_FINISH
+  | typeof FINISH_REASON_FINAL_TIMEOUT
+  | typeof FINISH_REASON_HEARTBEAT_FAILED
+  | typeof FINISH_REASON_IDLE_TIMEOUT
+  | typeof FINISH_REASON_INTERRUPTED;
+
+interface IdleSpanOptions {
+  /**
+   * The time that has to pass without any span being created.
+   * If this time is exceeded, the idle span will finish.
+   */
+  idleTimeout: number;
+  /**
+   * The max. time an idle span may run.
+   * If this time is exceeded, the idle span will finish no matter what.
+   */
+  finalTimeout: number;
+  /**
+   * The max. time a child span may run.
+   * If the time since the last span was started exceeds this time, the idle span will finish.
+   */
+  childSpanTimeout?: number;
+  /**
+   * When set to `true`, will disable the idle timeout and child timeout
+   * until the `idleSpanEnableAutoFinish` hook is emitted for the idle span.
+   * The final timeout mechanism will not be affected by this option,
+   * meaning the idle span will definitely be finished when the final timeout is
+   * reached, no matter what this option is configured to.
+   *
+   * Defaults to `false`.
+   */
+  disableAutoFinish?: boolean;
+  /** Allows to configure a hook that is called when the idle span is ended, before it is processed. */
+  beforeSpanEnd?: (span: Span) => void;
+}
+
+/**
+ * An idle span is a span that automatically finishes. It does this by tracking child spans as activities.
+ * An idle span is always the active span.
+ */
+export function startIdleSpan(startSpanOptions: StartSpanOptions, options: Partial<IdleSpanOptions> = {}): Span {
+  // Activities store a list of active spans
+  const activities = new Map<string, boolean>();
+
+  // We should not use heartbeat if we finished a span
+  let _finished = false;
+
+  // Timer that tracks idleTimeout
+  let _idleTimeoutID: ReturnType<typeof setTimeout> | undefined;
+
+  // Timer that tracks maxSpanTime for child spans
+  let _childSpanTimeoutID: ReturnType<typeof setTimeout> | undefined;
+
+  // The reason why the span was finished
+  let _finishReason: IdleSpanFinishReason = FINISH_REASON_EXTERNAL_FINISH;
+
+  let _autoFinishAllowed: boolean = !options.disableAutoFinish;
+
+  const {
+    idleTimeout = TRACING_DEFAULTS.idleTimeout,
+    finalTimeout = TRACING_DEFAULTS.finalTimeout,
+    childSpanTimeout = TRACING_DEFAULTS.childSpanTimeout,
+    beforeSpanEnd,
+  } = options;
+
+  const client = getClient();
+
+  if (!client || !hasTracingEnabled()) {
+    return new SentryNonRecordingSpan();
+  }
+
+  const scope = getCurrentScope();
+  const previousActiveSpan = getActiveSpan();
+  const span = _startIdleSpan(startSpanOptions);
+
+  function _endSpan(timestamp: number = timestampInSeconds()): void {
+    // Ensure we end with the last span timestamp, if possible
+    const spans = getSpanDescendants(span).filter(child => child !== span);
+
+    // If we have no spans, we just end, nothing else to do here
+    if (!spans.length) {
+      span.end(timestamp);
+      return;
+    }
+
+    const childEndTimestamps = spans
+      .map(span => spanToJSON(span).timestamp)
+      .filter(timestamp => !!timestamp) as number[];
+    const latestSpanEndTimestamp = childEndTimestamps.length ? Math.max(...childEndTimestamps) : undefined;
+
+    const spanEndTimestamp = spanTimeInputToSeconds(timestamp);
+    const spanStartTimestamp = spanToJSON(span).start_timestamp;
+
+    // The final endTimestamp should:
+    // * Never be before the span start timestamp
+    // * Be the latestSpanEndTimestamp, if there is one, and it is smaller than the passed span end timestamp
+    // * Otherwise be the passed end timestamp
+    const endTimestamp = Math.max(
+      spanStartTimestamp || -Infinity,
+      Math.min(spanEndTimestamp, latestSpanEndTimestamp || Infinity),
+    );
+
+    span.end(endTimestamp);
+  }
+
+  /**
+   * Cancels the existing idle timeout, if there is one.
+   */
+  function _cancelIdleTimeout(): void {
+    if (_idleTimeoutID) {
+      clearTimeout(_idleTimeoutID);
+      _idleTimeoutID = undefined;
+    }
+  }
+
+  /**
+   * Cancels the existing child span timeout, if there is one.
+   */
+  function _cancelChildSpanTimeout(): void {
+    if (_childSpanTimeoutID) {
+      clearTimeout(_childSpanTimeoutID);
+      _childSpanTimeoutID = undefined;
+    }
+  }
+
+  /**
+   * Restarts idle timeout, if there is no running idle timeout it will start one.
+   */
+  function _restartIdleTimeout(endTimestamp?: number): void {
+    _cancelIdleTimeout();
+    _idleTimeoutID = setTimeout(() => {
+      if (!_finished && activities.size === 0 && _autoFinishAllowed) {
+        _finishReason = FINISH_REASON_IDLE_TIMEOUT;
+        _endSpan(endTimestamp);
+      }
+    }, idleTimeout);
+  }
+
+  /**
+   * Restarts child span timeout, if there is none running it will start one.
+   */
+  function _restartChildSpanTimeout(endTimestamp?: number): void {
+    _cancelChildSpanTimeout();
+    _idleTimeoutID = setTimeout(() => {
+      if (!_finished && _autoFinishAllowed) {
+        _finishReason = FINISH_REASON_HEARTBEAT_FAILED;
+        _endSpan(endTimestamp);
+      }
+    }, childSpanTimeout);
+  }
+
+  /**
+   * Start tracking a specific activity.
+   * @param spanId The span id that represents the activity
+   */
+  function _pushActivity(spanId: string): void {
+    _cancelIdleTimeout();
+    activities.set(spanId, true);
+    DEBUG_BUILD && logger.log(`[Tracing] pushActivity: ${spanId}`);
+    DEBUG_BUILD && logger.log('[Tracing] new activities count', activities.size);
+
+    const endTimestamp = timestampInSeconds();
+    // We need to add the timeout here to have the real endtimestamp of the idle span
+    // Remember timestampInSeconds is in seconds, timeout is in ms
+    _restartChildSpanTimeout(endTimestamp + childSpanTimeout / 1000);
+  }
+
+  /**
+   * Remove an activity from usage
+   * @param spanId The span id that represents the activity
+   */
+  function _popActivity(spanId: string): void {
+    if (activities.has(spanId)) {
+      DEBUG_BUILD && logger.log(`[Tracing] popActivity ${spanId}`);
+      activities.delete(spanId);
+      DEBUG_BUILD && logger.log('[Tracing] new activities count', activities.size);
+    }
+
+    if (activities.size === 0) {
+      const endTimestamp = timestampInSeconds();
+      // We need to add the timeout here to have the real endtimestamp of the idle span
+      // Remember timestampInSeconds is in seconds, timeout is in ms
+      _restartIdleTimeout(endTimestamp + idleTimeout / 1000);
+      _cancelChildSpanTimeout();
+    }
+  }
+
+  function onIdleSpanEnded(): void {
+    _finished = true;
+    activities.clear();
+
+    if (beforeSpanEnd) {
+      beforeSpanEnd(span);
+    }
+
+    // eslint-disable-next-line deprecation/deprecation
+    scope.setSpan(previousActiveSpan);
+
+    const spanJSON = spanToJSON(span);
+
+    const { timestamp: endTimestamp, start_timestamp: startTimestamp } = spanJSON;
+    // This should never happen, but to make TS happy...
+    if (!endTimestamp || !startTimestamp) {
+      return;
+    }
+
+    const attributes: SpanAttributes = spanJSON.data || {};
+    if (spanJSON.op === 'ui.action.click' && !attributes[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]) {
+      span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON, _finishReason);
+    }
+
+    DEBUG_BUILD &&
+      logger.log('[Tracing] finishing idle span', new Date(endTimestamp * 1000).toISOString(), spanJSON.op);
+
+    const childSpans = getSpanDescendants(span).filter(child => child !== span);
+
+    childSpans.forEach(childSpan => {
+      // We cancel all pending spans with status "cancelled" to indicate the idle span was finished early
+      if (childSpan.isRecording()) {
+        childSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'cancelled' });
+        childSpan.end(endTimestamp);
+        DEBUG_BUILD &&
+          logger.log('[Tracing] cancelling span since span ended early', JSON.stringify(childSpan, undefined, 2));
+      }
+
+      const childSpanJSON = spanToJSON(childSpan);
+      const { timestamp: childEndTimestamp = 0, start_timestamp: childStartTimestamp = 0 } = childSpanJSON;
+
+      const spanStartedBeforeIdleSpanEnd = childStartTimestamp <= endTimestamp;
+
+      // Add a delta with idle timeout so that we prevent false positives
+      const timeoutWithMarginOfError = (finalTimeout + idleTimeout) / 1000;
+      const spanEndedBeforeFinalTimeout = childEndTimestamp - childStartTimestamp < timeoutWithMarginOfError;
+
+      if (DEBUG_BUILD) {
+        const stringifiedSpan = JSON.stringify(childSpan, undefined, 2);
+        if (!spanStartedBeforeIdleSpanEnd) {
+          logger.log('[Tracing] discarding Span since it happened after idle span was finished', stringifiedSpan);
+        } else if (!spanEndedBeforeFinalTimeout) {
+          logger.log('[Tracing] discarding Span since it finished after idle span final timeout', stringifiedSpan);
+        }
+      }
+
+      if (!spanEndedBeforeFinalTimeout || !spanStartedBeforeIdleSpanEnd) {
+        removeChildSpanFromSpan(span, childSpan);
+      }
+    });
+
+    DEBUG_BUILD && logger.log('[Tracing] flushing idle span');
+  }
+
+  client.on('spanStart', startedSpan => {
+    // If we already finished the idle span,
+    // or if this is the idle span itself being started,
+    // or if the started span has already been closed,
+    // we don't care about it for activity
+    if (_finished || startedSpan === span || !!spanToJSON(startedSpan).timestamp) {
+      return;
+    }
+
+    const allSpans = getSpanDescendants(span);
+
+    // If the span that was just started is a child of the idle span, we should track it
+    if (allSpans.includes(startedSpan)) {
+      _pushActivity(startedSpan.spanContext().spanId);
+    }
+  });
+
+  client.on('spanEnd', endedSpan => {
+    if (_finished) {
+      return;
+    }
+
+    _popActivity(endedSpan.spanContext().spanId);
+
+    if (endedSpan === span) {
+      onIdleSpanEnded();
+    }
+  });
+
+  client.on('idleSpanEnableAutoFinish', spanToAllowAutoFinish => {
+    if (spanToAllowAutoFinish === span) {
+      _autoFinishAllowed = true;
+      _restartIdleTimeout();
+
+      if (activities.size) {
+        _restartChildSpanTimeout();
+      }
+    }
+  });
+
+  // We only start the initial idle timeout if we are not delaying the auto finish
+  if (!options.disableAutoFinish) {
+    _restartIdleTimeout();
+  }
+
+  setTimeout(() => {
+    if (!_finished) {
+      span.setStatus({ code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' });
+      _finishReason = FINISH_REASON_FINAL_TIMEOUT;
+      _endSpan();
+    }
+  }, finalTimeout);
+
+  return span;
+}
+
+function _startIdleSpan(options: StartSpanOptions): Span {
+  const span = startInactiveSpan(options);
+
+  // eslint-disable-next-line deprecation/deprecation
+  getCurrentScope().setSpan(span);
+
+  DEBUG_BUILD && logger.log(`Setting idle span on scope. Span ID: ${span.spanContext().spanId}`);
+
+  return span;
+}
diff --git a/packages/core/src/tracing/idletransaction.ts b/packages/core/src/tracing/idletransaction.ts
deleted file mode 100644
index 0aad33ca6836..000000000000
--- a/packages/core/src/tracing/idletransaction.ts
+++ /dev/null
@@ -1,418 +0,0 @@
-import type { Hub, SpanTimeInput, TransactionContext } from '@sentry/types';
-import { logger, timestampInSeconds } from '@sentry/utils';
-
-import { DEBUG_BUILD } from '../debug-build';
-import { spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
-import type { SentrySpan } from './sentrySpan';
-import { SpanRecorder } from './sentrySpan';
-import { SPAN_STATUS_ERROR } from './spanstatus';
-import { Transaction } from './transaction';
-
-export const TRACING_DEFAULTS = {
-  idleTimeout: 1000,
-  finalTimeout: 30000,
-  heartbeatInterval: 5000,
-};
-
-const FINISH_REASON_TAG = 'finishReason';
-
-const IDLE_TRANSACTION_FINISH_REASONS = [
-  'heartbeatFailed',
-  'idleTimeout',
-  'documentHidden',
-  'finalTimeout',
-  'externalFinish',
-  'cancelled',
-];
-
-/**
- * @inheritDoc
- */
-export class IdleTransactionSpanRecorder extends SpanRecorder {
-  public constructor(
-    private readonly _pushActivity: (id: string) => void,
-    private readonly _popActivity: (id: string) => void,
-    public transactionSpanId: string,
-    maxlen?: number,
-  ) {
-    super(maxlen);
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public add(span: SentrySpan): void {
-    // We should make sure we do not push and pop activities for
-    // the transaction that this span recorder belongs to.
-    if (span.spanContext().spanId !== this.transactionSpanId) {
-      // We patch span.end() to pop an activity after setting an endTimestamp.
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      const originalEnd = span.end;
-      span.end = (...rest: unknown[]) => {
-        this._popActivity(span.spanContext().spanId);
-        return originalEnd.apply(span, rest);
-      };
-
-      // We should only push new activities if the span does not have an end timestamp.
-      if (spanToJSON(span).timestamp === undefined) {
-        this._pushActivity(span.spanContext().spanId);
-      }
-    }
-
-    super.add(span);
-  }
-}
-
-export type BeforeFinishCallback = (transactionSpan: IdleTransaction, endTimestamp: number) => void;
-
-/**
- * An IdleTransaction is a transaction that automatically finishes. It does this by tracking child spans as activities.
- * You can have multiple IdleTransactions active, but if the `onScope` option is specified, the idle transaction will
- * put itself on the scope on creation.
- */
-export class IdleTransaction extends Transaction {
-  // Activities store a list of active spans
-  public activities: Record<string, boolean>;
-  // Track state of activities in previous heartbeat
-  private _prevHeartbeatString: string | undefined;
-
-  // Amount of times heartbeat has counted. Will cause transaction to finish after 3 beats.
-  private _heartbeatCounter: number;
-
-  // We should not use heartbeat if we finished a transaction
-  private _finished: boolean;
-
-  // Idle timeout was canceled and we should finish the transaction with the last span end.
-  private _idleTimeoutCanceledPermanently: boolean;
-
-  private readonly _beforeFinishCallbacks: BeforeFinishCallback[];
-
-  /**
-   * Timer that tracks Transaction idleTimeout
-   */
-  private _idleTimeoutID: ReturnType<typeof setTimeout> | undefined;
-
-  private _finishReason: (typeof IDLE_TRANSACTION_FINISH_REASONS)[number];
-
-  private _autoFinishAllowed: boolean;
-
-  /**
-   * @deprecated Transactions will be removed in v8. Use spans instead.
-   */
-  public constructor(
-    transactionContext: TransactionContext,
-    private readonly _idleHub: Hub,
-    /**
-     * The time to wait in ms until the idle transaction will be finished. This timer is started each time
-     * there are no active spans on this transaction.
-     */
-    private readonly _idleTimeout: number = TRACING_DEFAULTS.idleTimeout,
-    /**
-     * The final value in ms that a transaction cannot exceed
-     */
-    private readonly _finalTimeout: number = TRACING_DEFAULTS.finalTimeout,
-    private readonly _heartbeatInterval: number = TRACING_DEFAULTS.heartbeatInterval,
-    // Whether or not the transaction should put itself on the scope when it starts and pop itself off when it ends
-    private readonly _onScope: boolean = false,
-    /**
-     * When set to `true`, will disable the idle timeout (`_idleTimeout` option) and heartbeat mechanisms (`_heartbeatInterval`
-     * option) until the `sendAutoFinishSignal()` method is called. The final timeout mechanism (`_finalTimeout` option)
-     * will not be affected by this option, meaning the transaction will definitely be finished when the final timeout is
-     * reached, no matter what this option is configured to.
-     *
-     * Defaults to `false`.
-     */
-    delayAutoFinishUntilSignal: boolean = false,
-  ) {
-    super(transactionContext, _idleHub);
-
-    this.activities = {};
-    this._heartbeatCounter = 0;
-    this._finished = false;
-    this._idleTimeoutCanceledPermanently = false;
-    this._beforeFinishCallbacks = [];
-    this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[4];
-    this._autoFinishAllowed = !delayAutoFinishUntilSignal;
-
-    if (_onScope) {
-      // We set the transaction here on the scope so error events pick up the trace
-      // context and attach it to the error.
-      DEBUG_BUILD && logger.log(`Setting idle transaction on scope. Span ID: ${this.spanContext().spanId}`);
-      // eslint-disable-next-line deprecation/deprecation
-      _idleHub.getScope().setSpan(this);
-    }
-
-    if (!delayAutoFinishUntilSignal) {
-      this._restartIdleTimeout();
-    }
-
-    setTimeout(() => {
-      if (!this._finished) {
-        this.setStatus({ code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' });
-        this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[3];
-        this.end();
-      }
-    }, this._finalTimeout);
-  }
-
-  /** {@inheritDoc} */
-  public end(endTimestamp?: SpanTimeInput): string | undefined {
-    const endTimestampInS = spanTimeInputToSeconds(endTimestamp);
-
-    this._finished = true;
-    this.activities = {};
-
-    const op = spanToJSON(this).op;
-
-    if (op === 'ui.action.click') {
-      this.setAttribute(FINISH_REASON_TAG, this._finishReason);
-    }
-
-    // eslint-disable-next-line deprecation/deprecation
-    if (this.spanRecorder) {
-      DEBUG_BUILD &&
-        logger.log('[Tracing] finishing IdleTransaction', new Date(endTimestampInS * 1000).toISOString(), op);
-
-      for (const callback of this._beforeFinishCallbacks) {
-        callback(this, endTimestampInS);
-      }
-
-      // eslint-disable-next-line deprecation/deprecation
-      this.spanRecorder.spans = this.spanRecorder.spans.filter((span: SentrySpan) => {
-        // If we are dealing with the transaction itself, we just return it
-        if (span.spanContext().spanId === this.spanContext().spanId) {
-          return true;
-        }
-
-        // We cancel all pending spans with status "cancelled" to indicate the idle transaction was finished early
-        if (!spanToJSON(span).timestamp) {
-          span.setStatus({ code: SPAN_STATUS_ERROR, message: 'cancelled' });
-          span.end(endTimestampInS);
-          DEBUG_BUILD &&
-            logger.log('[Tracing] cancelling span since transaction ended early', JSON.stringify(span, undefined, 2));
-        }
-
-        const { start_timestamp: startTime, timestamp: endTime } = spanToJSON(span);
-        const spanStartedBeforeTransactionFinish = startTime && startTime < endTimestampInS;
-
-        // Add a delta with idle timeout so that we prevent false positives
-        const timeoutWithMarginOfError = (this._finalTimeout + this._idleTimeout) / 1000;
-        const spanEndedBeforeFinalTimeout = endTime && startTime && endTime - startTime < timeoutWithMarginOfError;
-
-        if (DEBUG_BUILD) {
-          const stringifiedSpan = JSON.stringify(span, undefined, 2);
-          if (!spanStartedBeforeTransactionFinish) {
-            logger.log('[Tracing] discarding Span since it happened after Transaction was finished', stringifiedSpan);
-          } else if (!spanEndedBeforeFinalTimeout) {
-            logger.log('[Tracing] discarding Span since it finished after Transaction final timeout', stringifiedSpan);
-          }
-        }
-
-        return spanStartedBeforeTransactionFinish && spanEndedBeforeFinalTimeout;
-      });
-
-      DEBUG_BUILD && logger.log('[Tracing] flushing IdleTransaction');
-    } else {
-      DEBUG_BUILD && logger.log('[Tracing] No active IdleTransaction');
-    }
-
-    // if `this._onScope` is `true`, the transaction put itself on the scope when it started
-    if (this._onScope) {
-      // eslint-disable-next-line deprecation/deprecation
-      const scope = this._idleHub.getScope();
-      // eslint-disable-next-line deprecation/deprecation
-      if (scope.getTransaction() === this) {
-        // eslint-disable-next-line deprecation/deprecation
-        scope.setSpan(undefined);
-      }
-    }
-
-    return super.end(endTimestamp);
-  }
-
-  /**
-   * Register a callback function that gets executed before the transaction finishes.
-   * Useful for cleanup or if you want to add any additional spans based on current context.
-   *
-   * This is exposed because users have no other way of running something before an idle transaction
-   * finishes.
-   */
-  public registerBeforeFinishCallback(callback: BeforeFinishCallback): void {
-    this._beforeFinishCallbacks.push(callback);
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public initSpanRecorder(maxlen?: number): void {
-    // eslint-disable-next-line deprecation/deprecation
-    if (!this.spanRecorder) {
-      const pushActivity = (id: string): void => {
-        if (this._finished) {
-          return;
-        }
-        this._pushActivity(id);
-      };
-      const popActivity = (id: string): void => {
-        if (this._finished) {
-          return;
-        }
-        this._popActivity(id);
-      };
-
-      // eslint-disable-next-line deprecation/deprecation
-      this.spanRecorder = new IdleTransactionSpanRecorder(pushActivity, popActivity, this.spanContext().spanId, maxlen);
-
-      // Start heartbeat so that transactions do not run forever.
-      DEBUG_BUILD && logger.log('Starting heartbeat');
-      this._pingHeartbeat();
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    this.spanRecorder.add(this);
-  }
-
-  /**
-   * Cancels the existing idle timeout, if there is one.
-   * @param restartOnChildSpanChange Default is `true`.
-   *                                 If set to false the transaction will end
-   *                                 with the last child span.
-   */
-  public cancelIdleTimeout(
-    endTimestamp?: Parameters<IdleTransaction['end']>[0],
-    {
-      restartOnChildSpanChange,
-    }: {
-      restartOnChildSpanChange?: boolean;
-    } = {
-      restartOnChildSpanChange: true,
-    },
-  ): void {
-    this._idleTimeoutCanceledPermanently = restartOnChildSpanChange === false;
-    if (this._idleTimeoutID) {
-      clearTimeout(this._idleTimeoutID);
-      this._idleTimeoutID = undefined;
-
-      if (Object.keys(this.activities).length === 0 && this._idleTimeoutCanceledPermanently) {
-        this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[5];
-        this.end(endTimestamp);
-      }
-    }
-  }
-
-  /**
-   * 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;
-  }
-
-  /**
-   * Permits the IdleTransaction to automatically end itself via the idle timeout and heartbeat mechanisms when the `delayAutoFinishUntilSignal` option was set to `true`.
-   */
-  public sendAutoFinishSignal(): void {
-    if (!this._autoFinishAllowed) {
-      DEBUG_BUILD && logger.log('[Tracing] Received finish signal for idle transaction.');
-      this._restartIdleTimeout();
-      this._autoFinishAllowed = true;
-    }
-  }
-
-  /**
-   * Restarts idle timeout, if there is no running idle timeout it will start one.
-   */
-  private _restartIdleTimeout(endTimestamp?: Parameters<IdleTransaction['end']>[0]): void {
-    this.cancelIdleTimeout();
-    this._idleTimeoutID = setTimeout(() => {
-      if (!this._finished && Object.keys(this.activities).length === 0) {
-        this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[1];
-        this.end(endTimestamp);
-      }
-    }, this._idleTimeout);
-  }
-
-  /**
-   * Start tracking a specific activity.
-   * @param spanId The span id that represents the activity
-   */
-  private _pushActivity(spanId: string): void {
-    this.cancelIdleTimeout(undefined, { restartOnChildSpanChange: !this._idleTimeoutCanceledPermanently });
-    DEBUG_BUILD && logger.log(`[Tracing] pushActivity: ${spanId}`);
-    this.activities[spanId] = true;
-    DEBUG_BUILD && logger.log('[Tracing] new activities count', Object.keys(this.activities).length);
-  }
-
-  /**
-   * Remove an activity from usage
-   * @param spanId The span id that represents the activity
-   */
-  private _popActivity(spanId: string): void {
-    if (this.activities[spanId]) {
-      DEBUG_BUILD && logger.log(`[Tracing] popActivity ${spanId}`);
-      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-      delete this.activities[spanId];
-      DEBUG_BUILD && logger.log('[Tracing] new activities count', Object.keys(this.activities).length);
-    }
-
-    if (Object.keys(this.activities).length === 0) {
-      const endTimestamp = timestampInSeconds();
-      if (this._idleTimeoutCanceledPermanently) {
-        if (this._autoFinishAllowed) {
-          this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[5];
-          this.end(endTimestamp);
-        }
-      } else {
-        // We need to add the timeout here to have the real endtimestamp of the transaction
-        // Remember timestampInSeconds is in seconds, timeout is in ms
-        this._restartIdleTimeout(endTimestamp + this._idleTimeout / 1000);
-      }
-    }
-  }
-
-  /**
-   * Checks when entries of this.activities are not changing for 3 beats.
-   * If this occurs we finish the transaction.
-   */
-  private _beat(): void {
-    // We should not be running heartbeat if the idle transaction is finished.
-    if (this._finished) {
-      return;
-    }
-
-    const heartbeatString = Object.keys(this.activities).join('');
-
-    if (heartbeatString === this._prevHeartbeatString) {
-      this._heartbeatCounter++;
-    } else {
-      this._heartbeatCounter = 1;
-    }
-
-    this._prevHeartbeatString = heartbeatString;
-
-    if (this._heartbeatCounter >= 3) {
-      if (this._autoFinishAllowed) {
-        DEBUG_BUILD && logger.log('[Tracing] Transaction finished because of no change for 3 heart beats');
-        this.setStatus({ code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' });
-        this._finishReason = IDLE_TRANSACTION_FINISH_REASONS[0];
-        this.end();
-      }
-    } else {
-      this._pingHeartbeat();
-    }
-  }
-
-  /**
-   * Pings the heartbeat
-   */
-  private _pingHeartbeat(): void {
-    DEBUG_BUILD && logger.log(`pinging Heartbeat -> current counter: ${this._heartbeatCounter}`);
-    setTimeout(() => {
-      this._beat();
-    }, this._heartbeatInterval);
-  }
-}
diff --git a/packages/core/src/tracing/index.ts b/packages/core/src/tracing/index.ts
index 9ca8f26eac3f..e6f17a9f8911 100644
--- a/packages/core/src/tracing/index.ts
+++ b/packages/core/src/tracing/index.ts
@@ -1,10 +1,10 @@
-export { startIdleTransaction, addTracingExtensions } from './hubextensions';
-export { IdleTransaction, TRACING_DEFAULTS } from './idletransaction';
-export type { BeforeFinishCallback } from './idletransaction';
+export { addTracingExtensions } from './hubextensions';
+export { startIdleSpan, TRACING_DEFAULTS } from './idleSpan';
 export { SentrySpan } from './sentrySpan';
+export { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 export { Transaction } from './transaction';
 // eslint-disable-next-line deprecation/deprecation
-export { getActiveTransaction, getActiveSpan } from './utils';
+export { getActiveTransaction } from './utils';
 export {
   setHttpStatus,
   getSpanStatusFromHttpCode,
@@ -15,6 +15,7 @@ export {
   startInactiveSpan,
   startSpanManual,
   continueTrace,
+  withActiveSpan,
 } from './trace';
 export { getDynamicSamplingContextFromClient, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 export { setMeasurement } from './measurement';
diff --git a/packages/core/src/tracing/measurement.ts b/packages/core/src/tracing/measurement.ts
index d050a48d6029..6945bba8aec8 100644
--- a/packages/core/src/tracing/measurement.ts
+++ b/packages/core/src/tracing/measurement.ts
@@ -1,15 +1,20 @@
-import type { MeasurementUnit } from '@sentry/types';
-
-import { getActiveTransaction } from './utils';
+import type { MeasurementUnit, Span, Transaction } from '@sentry/types';
+import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
 
 /**
  * Adds a measurement to the current active transaction.
  */
 export function setMeasurement(name: string, value: number, unit: MeasurementUnit): void {
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = getActiveTransaction();
-  if (transaction) {
+  const activeSpan = getActiveSpan();
+  const rootSpan = activeSpan && getRootSpan(activeSpan);
+
+  if (rootSpan && rootSpanIsTransaction(rootSpan)) {
     // eslint-disable-next-line deprecation/deprecation
-    transaction.setMeasurement(name, value, unit);
+    rootSpan.setMeasurement(name, value, unit);
   }
 }
+
+function rootSpanIsTransaction(rootSpan: Span): rootSpan is Transaction {
+  // eslint-disable-next-line deprecation/deprecation
+  return typeof (rootSpan as Transaction).setMeasurement === 'function';
+}
diff --git a/packages/core/src/tracing/sentryNonRecordingSpan.ts b/packages/core/src/tracing/sentryNonRecordingSpan.ts
new file mode 100644
index 000000000000..6b86fe4a0fec
--- /dev/null
+++ b/packages/core/src/tracing/sentryNonRecordingSpan.ts
@@ -0,0 +1,62 @@
+import type {
+  Span,
+  SpanAttributeValue,
+  SpanAttributes,
+  SpanContext,
+  SpanContextData,
+  SpanStatus,
+  SpanTimeInput,
+} from '@sentry/types';
+import { uuid4 } from '@sentry/utils';
+import { TRACE_FLAG_NONE } from '../utils/spanUtils';
+
+/**
+ * A Sentry Span that is non-recording, meaning it will not be sent to Sentry.
+ */
+export class SentryNonRecordingSpan implements Span {
+  private _traceId: string;
+  private _spanId: string;
+
+  public constructor(spanContext: SpanContext = {}) {
+    this._traceId = spanContext.traceId || uuid4();
+    this._spanId = spanContext.spanId || uuid4().substring(16);
+  }
+
+  /** @inheritdoc */
+  public spanContext(): SpanContextData {
+    return {
+      spanId: this._spanId,
+      traceId: this._traceId,
+      traceFlags: TRACE_FLAG_NONE,
+    };
+  }
+
+  /** @inheritdoc */
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  public end(_timestamp?: SpanTimeInput): void {}
+
+  /** @inheritdoc */
+  public setAttribute(_key: string, _value: SpanAttributeValue | undefined): this {
+    return this;
+  }
+
+  /** @inheritdoc */
+  public setAttributes(_values: SpanAttributes): this {
+    return this;
+  }
+
+  /** @inheritdoc */
+  public setStatus(_status: SpanStatus): this {
+    return this;
+  }
+
+  /** @inheritdoc */
+  public updateName(_name: string): this {
+    return this;
+  }
+
+  /** @inheritdoc */
+  public isRecording(): boolean {
+    return false;
+  }
+}
diff --git a/packages/core/src/tracing/sentrySpan.ts b/packages/core/src/tracing/sentrySpan.ts
index b0e82321e33e..87b57d729960 100644
--- a/packages/core/src/tracing/sentrySpan.ts
+++ b/packages/core/src/tracing/sentrySpan.ts
@@ -1,5 +1,4 @@
 import type {
-  Primitive,
   Span,
   SpanAttributeValue,
   SpanAttributes,
@@ -13,63 +12,26 @@ import type {
   Transaction,
 } from '@sentry/types';
 import { dropUndefinedKeys, logger, timestampInSeconds, uuid4 } from '@sentry/utils';
+import { getClient } from '../currentScopes';
 
 import { DEBUG_BUILD } from '../debug-build';
 import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
-import { getRootSpan } from '../utils/getRootSpan';
 import {
   TRACE_FLAG_NONE,
   TRACE_FLAG_SAMPLED,
+  addChildSpanToSpan,
+  getRootSpan,
+  getStatusMessage,
   spanTimeInputToSeconds,
   spanToJSON,
   spanToTraceContext,
 } from '../utils/spanUtils';
-import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from './spanstatus';
-import { addChildSpanToSpan } from './utils';
-
-/**
- * Keeps track of finished spans for a given transaction
- * @internal
- * @hideconstructor
- * @hidden
- */
-export class SpanRecorder {
-  public spans: SentrySpan[];
-
-  private readonly _maxlen: number;
-
-  public constructor(maxlen: number = 1000) {
-    this._maxlen = maxlen;
-    this.spans = [];
-  }
-
-  /**
-   * This is just so that we don't run out of memory while recording a lot
-   * of spans. At some point we just stop and flush out the start of the
-   * trace tree (i.e.the first n spans with the smallest
-   * start_timestamp).
-   */
-  public add(span: SentrySpan): void {
-    if (this.spans.length > this._maxlen) {
-      // eslint-disable-next-line deprecation/deprecation
-      span.spanRecorder = undefined;
-    } else {
-      this.spans.push(span);
-    }
-  }
-}
 
 /**
  * Span contains all data about a span
  */
 export class SentrySpan implements Span {
-  /**
-   * Tags for the span.
-   * @deprecated Use `spanToJSON(span).atttributes` instead.
-   */
-  public tags: { [key: string]: Primitive };
-
   /**
    * Data for the span.
    * @deprecated Use `spanToJSON(span).atttributes` instead.
@@ -77,13 +39,6 @@ export class SentrySpan implements Span {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   public data: { [key: string]: any };
 
-  /**
-   * List of spans that were finalized
-   *
-   * @deprecated This property will no longer be public. Span recording will be handled internally.
-   */
-  public spanRecorder?: SpanRecorder;
-
   /**
    * @inheritDoc
    * @deprecated Use top level `Sentry.getRootSpan()` instead
@@ -105,8 +60,8 @@ export class SentrySpan implements Span {
   private _logMessage?: string;
 
   /**
-   * You should never call the constructor manually, always use `Sentry.startTransaction()`
-   * or call `startChild()` on an existing span.
+   * You should never call the constructor manually, always use `Sentry.startSpan()`
+   * or other span methods.
    * @internal
    * @hideconstructor
    * @hidden
@@ -116,13 +71,11 @@ export class SentrySpan implements Span {
     this._spanId = spanContext.spanId || uuid4().substring(16);
     this._startTime = spanContext.startTimestamp || timestampInSeconds();
     // eslint-disable-next-line deprecation/deprecation
-    this.tags = spanContext.tags ? { ...spanContext.tags } : {};
-    // eslint-disable-next-line deprecation/deprecation
     this.data = spanContext.data ? { ...spanContext.data } : {};
 
     this._attributes = {};
     this.setAttributes({
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: spanContext.origin || 'manual',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual',
       [SEMANTIC_ATTRIBUTE_SENTRY_OP]: spanContext.op,
       ...spanContext.attributes,
     });
@@ -277,7 +230,7 @@ export class SentrySpan implements Span {
    * @deprecated Use `startSpan()`, `startSpanManual()` or `startInactiveSpan()` instead.
    */
   public startChild(
-    spanContext?: Pick<SpanContext, Exclude<keyof SpanContext, 'sampled' | 'traceId' | 'parentSpanId'>>,
+    spanContext: Pick<SpanContext, Exclude<keyof SpanContext, 'sampled' | 'traceId' | 'parentSpanId'>> = {},
   ): Span {
     const childSpan = new SentrySpan({
       ...spanContext,
@@ -286,14 +239,6 @@ export class SentrySpan implements Span {
       traceId: this._traceId,
     });
 
-    // eslint-disable-next-line deprecation/deprecation
-    childSpan.spanRecorder = this.spanRecorder;
-    // eslint-disable-next-line deprecation/deprecation
-    if (childSpan.spanRecorder) {
-      // eslint-disable-next-line deprecation/deprecation
-      childSpan.spanRecorder.add(childSpan);
-    }
-
     // To allow for interoperability we track the children of a span twice: Once with the span recorder (old) once with
     // the `addChildSpanToSpan`. Eventually we will only use `addChildSpanToSpan` and drop the span recorder.
     // To ensure interoperability with the `startSpan` API, `addChildSpanToSpan` is also called here.
@@ -315,22 +260,16 @@ export class SentrySpan implements Span {
       this._logMessage = logMessage;
     }
 
-    return childSpan;
-  }
+    const client = getClient();
+    if (client) {
+      client.emit('spanStart', childSpan);
+      // If it has an endTimestamp, it's already ended
+      if (spanContext.endTimestamp) {
+        client.emit('spanEnd', childSpan);
+      }
+    }
 
-  /**
-   * Sets the tag attribute on the current span.
-   *
-   * Can also be used to unset a tag, by passing `undefined`.
-   *
-   * @param key Tag key
-   * @param value Tag value
-   * @deprecated Use `setAttribute()` instead.
-   */
-  public setTag(key: string, value: Primitive): this {
-    // eslint-disable-next-line deprecation/deprecation
-    this.tags = { ...this.tags, [key]: value };
-    return this;
+    return childSpan;
   }
 
   /**
@@ -361,6 +300,18 @@ export class SentrySpan implements Span {
     Object.keys(attributes).forEach(key => this.setAttribute(key, attributes[key]));
   }
 
+  /**
+   * This should generally not be used,
+   * but we need it for browser tracing where we want to adjust the start time afterwards.
+   * USE THIS WITH CAUTION!
+   *
+   * @hidden
+   * @internal
+   */
+  public updateStartTime(timeInput: SpanTimeInput): void {
+    this._startTime = spanTimeInputToSeconds(timeInput);
+  }
+
   /**
    * @inheritDoc
    */
@@ -397,6 +348,8 @@ export class SentrySpan implements Span {
     }
 
     this._endTime = spanTimeInputToSeconds(endTimestamp);
+
+    this._onSpanEnded();
   }
 
   /**
@@ -415,8 +368,6 @@ export class SentrySpan implements Span {
       spanId: this._spanId,
       startTimestamp: this._startTime,
       status: this._status,
-      // eslint-disable-next-line deprecation/deprecation
-      tags: this.tags,
       traceId: this._traceId,
     });
   }
@@ -447,8 +398,6 @@ export class SentrySpan implements Span {
       span_id: this._spanId,
       start_timestamp: this._startTime,
       status: getStatusMessage(this._status),
-      // eslint-disable-next-line deprecation/deprecation
-      tags: Object.keys(this.tags).length > 0 ? this.tags : undefined,
       timestamp: this._endTime,
       trace_id: this._traceId,
       origin: this._attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined,
@@ -499,16 +448,12 @@ export class SentrySpan implements Span {
 
     return hasData ? data : attributes;
   }
-}
-
-function getStatusMessage(status: SpanStatus | undefined): string | undefined {
-  if (!status || status.code === SPAN_STATUS_UNSET) {
-    return undefined;
-  }
 
-  if (status.code === SPAN_STATUS_OK) {
-    return 'ok';
+  /** Emit `spanEnd` when the span is ended. */
+  private _onSpanEnded(): void {
+    const client = getClient();
+    if (client) {
+      client.emit('spanEnd', this);
+    }
   }
-
-  return status.message || 'unknown_error';
 }
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 98cd511493c6..2548d94fd60e 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -1,17 +1,35 @@
-import type { Hub, Scope, Span, SpanTimeInput, StartSpanOptions, TransactionContext } from '@sentry/types';
-
-import { dropUndefinedKeys, logger, tracingContextFromHeaders } from '@sentry/utils';
-import { getCurrentScope, getIsolationScope, withScope } from '../currentScopes';
-
-import { DEBUG_BUILD } from '../debug-build';
-import { getCurrentHub } from '../hub';
+import type {
+  ClientOptions,
+  Hub,
+  Scope,
+  Span,
+  SpanTimeInput,
+  StartSpanOptions,
+  TransactionContext,
+} from '@sentry/types';
+
+import { propagationContextFromHeaders } from '@sentry/utils';
+import type { AsyncContextStrategy } from '../asyncContext';
+import { getMainCarrier } from '../asyncContext';
+import { getClient, getCurrentScope, getIsolationScope, withScope } from '../currentScopes';
+
+import { getAsyncContextStrategy, getCurrentHub } from '../hub';
 import { handleCallbackErrors } from '../utils/handleCallbackErrors';
 import { hasTracingEnabled } from '../utils/hasTracingEnabled';
-import { spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
+import {
+  addChildSpanToSpan,
+  getActiveSpan,
+  spanIsSampled,
+  spanTimeInputToSeconds,
+  spanToJSON,
+} from '../utils/spanUtils';
 import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
+import { sampleTransaction } from './sampling';
+import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import type { SentrySpan } from './sentrySpan';
 import { SPAN_STATUS_ERROR } from './spanstatus';
-import { addChildSpanToSpan, getActiveSpan, setCapturedScopesOnSpan } from './utils';
+import { Transaction } from './transaction';
+import { setCapturedScopesOnSpan } from './utils';
 
 /**
  * Wraps a function with a transaction/span and finishes the span after the function is done.
@@ -24,7 +42,12 @@ import { addChildSpanToSpan, getActiveSpan, setCapturedScopesOnSpan } from './ut
  * or you didn't set `tracesSampleRate`, this function will not generate spans
  * and the `span` returned from the callback will be undefined.
  */
-export function startSpan<T>(context: StartSpanOptions, callback: (span: Span | undefined) => T): T {
+export function startSpan<T>(context: StartSpanOptions, callback: (span: Span) => T): T {
+  const acs = getAcs();
+  if (acs.startSpan) {
+    return acs.startSpan(context, callback);
+  }
+
   const spanContext = normalizeContext(context);
 
   return withScope(context.scope, scope => {
@@ -35,7 +58,7 @@ export function startSpan<T>(context: StartSpanOptions, callback: (span: Span |
 
     const shouldSkipSpan = context.onlyIfParent && !parentSpan;
     const activeSpan = shouldSkipSpan
-      ? undefined
+      ? new SentryNonRecordingSpan()
       : createChildSpanOrTransaction(hub, {
           parentSpan,
           spanContext,
@@ -43,23 +66,19 @@ export function startSpan<T>(context: StartSpanOptions, callback: (span: Span |
           scope,
         });
 
-    if (activeSpan) {
-      // eslint-disable-next-line deprecation/deprecation
-      scope.setSpan(activeSpan);
-    }
+    // eslint-disable-next-line deprecation/deprecation
+    scope.setSpan(activeSpan);
 
     return handleCallbackErrors(
       () => callback(activeSpan),
       () => {
-        // Only update the span status if it hasn't been changed yet
-        if (activeSpan) {
-          const { status } = spanToJSON(activeSpan);
-          if (!status || status === 'ok') {
-            activeSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
-          }
+        // Only update the span status if it hasn't been changed yet, and the span is not yet finished
+        const { status } = spanToJSON(activeSpan);
+        if (activeSpan.isRecording() && (!status || status === 'ok')) {
+          activeSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
         }
       },
-      () => activeSpan && activeSpan.end(),
+      () => activeSpan.end(),
     );
   });
 }
@@ -75,10 +94,12 @@ export function startSpan<T>(context: StartSpanOptions, callback: (span: Span |
  * or you didn't set `tracesSampleRate`, this function will not generate spans
  * and the `span` returned from the callback will be undefined.
  */
-export function startSpanManual<T>(
-  context: StartSpanOptions,
-  callback: (span: Span | undefined, finish: () => void) => T,
-): T {
+export function startSpanManual<T>(context: StartSpanOptions, callback: (span: Span, finish: () => void) => T): T {
+  const acs = getAcs();
+  if (acs.startSpanManual) {
+    return acs.startSpanManual(context, callback);
+  }
+
   const spanContext = normalizeContext(context);
 
   return withScope(context.scope, scope => {
@@ -89,7 +110,7 @@ export function startSpanManual<T>(
 
     const shouldSkipSpan = context.onlyIfParent && !parentSpan;
     const activeSpan = shouldSkipSpan
-      ? undefined
+      ? new SentryNonRecordingSpan()
       : createChildSpanOrTransaction(hub, {
           parentSpan,
           spanContext,
@@ -97,24 +118,20 @@ export function startSpanManual<T>(
           scope,
         });
 
-    if (activeSpan) {
-      // eslint-disable-next-line deprecation/deprecation
-      scope.setSpan(activeSpan);
-    }
+    // eslint-disable-next-line deprecation/deprecation
+    scope.setSpan(activeSpan);
 
     function finishAndSetSpan(): void {
-      activeSpan && activeSpan.end();
+      activeSpan.end();
     }
 
     return handleCallbackErrors(
       () => callback(activeSpan, finishAndSetSpan),
       () => {
         // Only update the span status if it hasn't been changed yet, and the span is not yet finished
-        if (activeSpan && activeSpan.isRecording()) {
-          const { status } = spanToJSON(activeSpan);
-          if (!status || status === 'ok') {
-            activeSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
-          }
+        const { status } = spanToJSON(activeSpan);
+        if (activeSpan.isRecording() && (!status || status === 'ok')) {
+          activeSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
         }
       },
     );
@@ -131,9 +148,10 @@ export function startSpanManual<T>(
  * or you didn't set `tracesSampleRate` or `tracesSampler`, this function will not generate spans
  * and the `span` returned from the callback will be undefined.
  */
-export function startInactiveSpan(context: StartSpanOptions): Span | undefined {
-  if (!hasTracingEnabled()) {
-    return undefined;
+export function startInactiveSpan(context: StartSpanOptions): Span {
+  const acs = getAcs();
+  if (acs.startInactiveSpan) {
+    return acs.startInactiveSpan(context);
   }
 
   const spanContext = normalizeContext(context);
@@ -147,7 +165,7 @@ export function startInactiveSpan(context: StartSpanOptions): Span | undefined {
   const shouldSkipSpan = context.onlyIfParent && !parentSpan;
 
   if (shouldSkipSpan) {
-    return undefined;
+    return new SentryNonRecordingSpan();
   }
 
   const scope = context.scope || getCurrentScope();
@@ -160,107 +178,52 @@ export function startInactiveSpan(context: StartSpanOptions): Span | undefined {
   });
 }
 
-interface ContinueTrace {
-  /**
-   * Continue a trace from `sentry-trace` and `baggage` values.
-   * These values can be obtained from incoming request headers,
-   * or in the browser from `<meta name="sentry-trace">` and `<meta name="baggage">` HTML tags.
-   *
-   * @deprecated Use the version of this function taking a callback as second parameter instead:
-   *
-   * ```
-   * Sentry.continueTrace(sentryTrace: '...', baggage: '...' }, () => {
-   *    // ...
-   * })
-   * ```
-   *
-   */
-  ({
-    sentryTrace,
-    baggage,
-  }: {
-    // eslint-disable-next-line deprecation/deprecation
-    sentryTrace: Parameters<typeof tracingContextFromHeaders>[0];
-    // eslint-disable-next-line deprecation/deprecation
-    baggage: Parameters<typeof tracingContextFromHeaders>[1];
-  }): Partial<TransactionContext>;
-
-  /**
-   * Continue a trace from `sentry-trace` and `baggage` values.
-   * These values can be obtained from incoming request headers, or in the browser from `<meta name="sentry-trace">`
-   * and `<meta name="baggage">` HTML tags.
-   *
-   * Spans started with `startSpan`, `startSpanManual` and `startInactiveSpan`, within the callback will automatically
-   * be attached to the incoming trace.
-   *
-   * Deprecation notice: In the next major version of the SDK the provided callback will not receive a transaction
-   * context argument.
-   */
-  <V>(
-    {
-      sentryTrace,
-      baggage,
-    }: {
-      // eslint-disable-next-line deprecation/deprecation
-      sentryTrace: Parameters<typeof tracingContextFromHeaders>[0];
-      // eslint-disable-next-line deprecation/deprecation
-      baggage: Parameters<typeof tracingContextFromHeaders>[1];
-    },
-    // TODO(v8): Remove parameter from this callback.
-    callback: (transactionContext: Partial<TransactionContext>) => V,
-  ): V;
-}
-
-export const continueTrace: ContinueTrace = <V>(
+/**
+ * Continue a trace from `sentry-trace` and `baggage` values.
+ * These values can be obtained from incoming request headers, or in the browser from `<meta name="sentry-trace">`
+ * and `<meta name="baggage">` HTML tags.
+ *
+ * Spans started with `startSpan`, `startSpanManual` and `startInactiveSpan`, within the callback will automatically
+ * be attached to the incoming trace.
+ */
+export const continueTrace = <V>(
   {
     sentryTrace,
     baggage,
   }: {
-    // eslint-disable-next-line deprecation/deprecation
-    sentryTrace: Parameters<typeof tracingContextFromHeaders>[0];
-    // eslint-disable-next-line deprecation/deprecation
-    baggage: Parameters<typeof tracingContextFromHeaders>[1];
+    sentryTrace: Parameters<typeof propagationContextFromHeaders>[0];
+    baggage: Parameters<typeof propagationContextFromHeaders>[1];
   },
-  callback?: (transactionContext: Partial<TransactionContext>) => V,
-): V | Partial<TransactionContext> => {
-  // TODO(v8): Change this function so it doesn't do anything besides setting the propagation context on the current scope:
-  /*
-    return withScope((scope) => {
-      const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
-      scope.setPropagationContext(propagationContext);
-      return callback();
-    })
-  */
-
-  const currentScope = getCurrentScope();
-
-  // eslint-disable-next-line deprecation/deprecation
-  const { traceparentData, dynamicSamplingContext, propagationContext } = tracingContextFromHeaders(
-    sentryTrace,
-    baggage,
-  );
-
-  currentScope.setPropagationContext(propagationContext);
-
-  if (DEBUG_BUILD && traceparentData) {
-    logger.log(`[Tracing] Continuing trace ${traceparentData.traceId}.`);
-  }
-
-  const transactionContext: Partial<TransactionContext> = {
-    ...traceparentData,
-    metadata: dropUndefinedKeys({
-      dynamicSamplingContext,
-    }),
-  };
+  callback: () => V,
+): V => {
+  return withScope(scope => {
+    const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
+    scope.setPropagationContext(propagationContext);
+    return callback();
+  });
+};
 
-  if (!callback) {
-    return transactionContext;
+/**
+ * Forks the current scope and sets the provided span as active span in the context of the provided callback. Can be
+ * passed `null` to start an entirely new span tree.
+ *
+ * @param span Spans started in the context of the provided callback will be children of this span. If `null` is passed,
+ * spans started within the callback will not be attached to a parent span.
+ * @param callback Execution context in which the provided span will be active. Is passed the newly forked scope.
+ * @returns the value returned from the provided callback function.
+ */
+export function withActiveSpan<T>(span: Span | null, callback: (scope: Scope) => T): T {
+  const acs = getAcs();
+  if (acs.withActiveSpan) {
+    return acs.withActiveSpan(span, callback);
   }
 
-  return withScope(() => {
-    return callback(transactionContext);
+  return withScope(scope => {
+    // eslint-disable-next-line deprecation/deprecation
+    scope.setSpan(span || undefined);
+    return callback(scope);
   });
-};
+}
 
 function createChildSpanOrTransaction(
   hub: Hub,
@@ -275,14 +238,14 @@ function createChildSpanOrTransaction(
     forceTransaction?: boolean;
     scope: Scope;
   },
-): Span | undefined {
+): Span {
   if (!hasTracingEnabled()) {
-    return undefined;
+    return new SentryNonRecordingSpan();
   }
 
   const isolationScope = getIsolationScope();
 
-  let span: Span | undefined;
+  let span: Span;
   if (parentSpan && !forceTransaction) {
     // eslint-disable-next-line deprecation/deprecation
     span = parentSpan.startChild(spanContext);
@@ -293,8 +256,7 @@ function createChildSpanOrTransaction(
     const { traceId, spanId: parentSpanId } = parentSpan.spanContext();
     const sampled = spanIsSampled(parentSpan);
 
-    // eslint-disable-next-line deprecation/deprecation
-    span = hub.startTransaction({
+    span = _startTransaction({
       traceId,
       parentSpanId,
       parentSampled: sampled,
@@ -311,8 +273,7 @@ function createChildSpanOrTransaction(
       ...scope.getPropagationContext(),
     };
 
-    // eslint-disable-next-line deprecation/deprecation
-    span = hub.startTransaction({
+    span = _startTransaction({
       traceId,
       parentSpanId,
       parentSampled: sampled,
@@ -325,6 +286,13 @@ function createChildSpanOrTransaction(
     });
   }
 
+  // TODO v8: Technically `startTransaction` can return undefined, which is not reflected by the types
+  // This happens if tracing extensions have not been added
+  // In this case, we just want to return a non-recording span
+  if (!span) {
+    return new SentryNonRecordingSpan();
+  }
+
   setCapturedScopesOnSpan(span, scope, isolationScope);
 
   return span;
@@ -347,3 +315,30 @@ function normalizeContext(context: StartSpanOptions): TransactionContext {
 
   return context;
 }
+
+function getAcs(): AsyncContextStrategy {
+  const carrier = getMainCarrier();
+  return getAsyncContextStrategy(carrier);
+}
+
+function _startTransaction(transactionContext: TransactionContext): Transaction {
+  const client = getClient();
+  const options: Partial<ClientOptions> = (client && client.getOptions()) || {};
+
+  // eslint-disable-next-line deprecation/deprecation
+  let transaction = new Transaction(transactionContext, getCurrentHub());
+  transaction = sampleTransaction(transaction, options, {
+    name: transactionContext.name,
+    parentSampled: transactionContext.parentSampled,
+    transactionContext,
+    attributes: {
+      // eslint-disable-next-line deprecation/deprecation
+      ...transactionContext.data,
+      ...transactionContext.attributes,
+    },
+  });
+  if (client) {
+    client.emit('spanStart', transaction);
+  }
+  return transaction;
+}
diff --git a/packages/core/src/tracing/transaction.ts b/packages/core/src/tracing/transaction.ts
index 9f4194681338..a95fe7c394f9 100644
--- a/packages/core/src/tracing/transaction.ts
+++ b/packages/core/src/tracing/transaction.ts
@@ -5,6 +5,7 @@ import type {
   Hub,
   MeasurementUnit,
   Measurements,
+  SpanJSON,
   SpanTimeInput,
   Transaction as TransactionInterface,
   TransactionContext,
@@ -18,10 +19,10 @@ import { DEBUG_BUILD } from '../debug-build';
 import { getCurrentHub } from '../hub';
 import { getMetricSummaryJsonForSpan } from '../metrics/metric-summary';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
-import { spanTimeInputToSeconds, spanToJSON, spanToTraceContext } from '../utils/spanUtils';
+import { getSpanDescendants, spanTimeInputToSeconds, spanToJSON, spanToTraceContext } from '../utils/spanUtils';
 import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
-import { SentrySpan, SpanRecorder } from './sentrySpan';
-import { getCapturedScopesOnSpan, getSpanTree } from './utils';
+import { SentrySpan } from './sentrySpan';
+import { getCapturedScopesOnSpan } from './utils';
 
 /** JSDoc */
 export class Transaction extends SentrySpan implements TransactionInterface {
@@ -44,8 +45,7 @@ export class Transaction extends SentrySpan implements TransactionInterface {
   private _metadata: Partial<TransactionMetadata>;
 
   /**
-   * This constructor should never be called manually. Those instrumenting tracing should use
-   * `Sentry.startTransaction()`, and internal methods should use `hub.startTransaction()`.
+   * This constructor should never be called manually.
    * @internal
    * @hideconstructor
    * @hidden
@@ -127,20 +127,6 @@ export class Transaction extends SentrySpan implements TransactionInterface {
     return this;
   }
 
-  /**
-   * Attaches SpanRecorder to the span itself
-   * @param maxlen maximum number of spans that can be recorded
-   */
-  public initSpanRecorder(maxlen: number = 1000): void {
-    // eslint-disable-next-line deprecation/deprecation
-    if (!this.spanRecorder) {
-      // eslint-disable-next-line deprecation/deprecation
-      this.spanRecorder = new SpanRecorder(maxlen);
-    }
-    // eslint-disable-next-line deprecation/deprecation
-    this.spanRecorder.add(this);
-  }
-
   /**
    * Set the context of a transaction event.
    * @deprecated Use either `.setAttribute()`, or set the context on the scope before creating the transaction.
@@ -238,9 +224,6 @@ export class Transaction extends SentrySpan implements TransactionInterface {
 
     // eslint-disable-next-line deprecation/deprecation
     const client = this._hub.getClient();
-    if (client) {
-      client.emit('finishTransaction', this);
-    }
 
     if (this._sampled !== true) {
       // At this point if `sampled !== true` we want to discard the transaction.
@@ -253,8 +236,8 @@ export class Transaction extends SentrySpan implements TransactionInterface {
       return undefined;
     }
 
-    // We only want to include finished spans in the event
-    const finishedSpans = getSpanTree(this).filter(span => span !== this && spanToJSON(span).timestamp);
+    // The transaction span itself should be filtered out
+    const finishedSpans = getSpanDescendants(this).filter(span => span !== this);
 
     if (this._trimEnd && finishedSpans.length > 0) {
       const endTimes = finishedSpans.map(span => spanToJSON(span).timestamp).filter(Boolean) as number[];
@@ -263,6 +246,13 @@ export class Transaction extends SentrySpan implements TransactionInterface {
       });
     }
 
+    // We want to filter out any incomplete SpanJSON objects
+    function isFullFinishedSpan(input: Partial<SpanJSON>): input is SpanJSON {
+      return !!input.start_timestamp && !!input.timestamp && !!input.span_id && !!input.trace_id;
+    }
+
+    const spans = finishedSpans.map(span => spanToJSON(span)).filter(isFullFinishedSpan);
+
     const { scope: capturedSpanScope, isolationScope: capturedSpanIsolationScope } = getCapturedScopesOnSpan(this);
 
     // eslint-disable-next-line deprecation/deprecation
@@ -276,10 +266,8 @@ export class Transaction extends SentrySpan implements TransactionInterface {
         // We don't want to override trace context
         trace: spanToTraceContext(this),
       },
-      spans: finishedSpans.map(span => spanToJSON(span)),
+      spans,
       start_timestamp: this._startTime,
-      // eslint-disable-next-line deprecation/deprecation
-      tags: this.tags,
       timestamp: this._endTime,
       transaction: this._name,
       type: 'transaction',
diff --git a/packages/core/src/tracing/utils.ts b/packages/core/src/tracing/utils.ts
index e01f92a028ba..c22940508138 100644
--- a/packages/core/src/tracing/utils.ts
+++ b/packages/core/src/tracing/utils.ts
@@ -1,7 +1,6 @@
 import type { Span, Transaction } from '@sentry/types';
 import type { Scope } from '@sentry/types';
 import { addNonEnumerableProperty } from '@sentry/utils';
-import { getCurrentScope } from '../currentScopes';
 
 import type { Hub } from '../hub';
 import { getCurrentHub } from '../hub';
@@ -23,55 +22,6 @@ export function getActiveTransaction<T extends Transaction>(maybeHub?: Hub): T |
 // so it can be used in manual instrumentation without necessitating a hard dependency on @sentry/utils
 export { stripUrlQueryAndFragment } from '@sentry/utils';
 
-/**
- * Returns the currently active span.
- */
-export function getActiveSpan(): Span | undefined {
-  // eslint-disable-next-line deprecation/deprecation
-  return getCurrentScope().getSpan();
-}
-
-const CHILD_SPANS_FIELD = '_sentryChildSpans';
-
-type SpanWithPotentialChildren = Span & {
-  [CHILD_SPANS_FIELD]?: Set<Span>;
-};
-
-/**
- * Adds an opaque child span reference to a span.
- */
-export function addChildSpanToSpan(span: SpanWithPotentialChildren, childSpan: Span): void {
-  if (span[CHILD_SPANS_FIELD] && span[CHILD_SPANS_FIELD].size < 1000) {
-    span[CHILD_SPANS_FIELD].add(childSpan);
-  } else {
-    span[CHILD_SPANS_FIELD] = new Set([childSpan]);
-  }
-}
-
-/**
- * Obtains the entire span tree, meaning a span + all of its descendants for a particular span.
- */
-export function getSpanTree(span: SpanWithPotentialChildren): Span[] {
-  const resultSet = new Set<Span>();
-
-  function addSpanChildren(span: SpanWithPotentialChildren): void {
-    // This exit condition is required to not infinitely loop in case of a circular dependency.
-    if (resultSet.has(span)) {
-      return;
-    } else {
-      resultSet.add(span);
-      const childSpans = span[CHILD_SPANS_FIELD] ? Array.from(span[CHILD_SPANS_FIELD]) : [];
-      for (const childSpan of childSpans) {
-        addSpanChildren(childSpan);
-      }
-    }
-  }
-
-  addSpanChildren(span);
-
-  return Array.from(resultSet);
-}
-
 const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
 const ISOLATION_SCOPE_ON_START_SPAN_FIELD = '_sentryIsolationScope';
 
diff --git a/packages/core/src/utils/applyScopeDataToEvent.ts b/packages/core/src/utils/applyScopeDataToEvent.ts
index 2d0d20661fe2..b41aa2bb4818 100644
--- a/packages/core/src/utils/applyScopeDataToEvent.ts
+++ b/packages/core/src/utils/applyScopeDataToEvent.ts
@@ -1,8 +1,7 @@
 import type { Breadcrumb, Event, ScopeData, Span } from '@sentry/types';
 import { arrayify, dropUndefinedKeys } from '@sentry/utils';
 import { getDynamicSamplingContextFromSpan } from '../tracing/dynamicSamplingContext';
-import { getRootSpan } from './getRootSpan';
-import { spanToJSON, spanToTraceContext } from './spanUtils';
+import { getRootSpan, spanToJSON, spanToTraceContext } from './spanUtils';
 
 /**
  * Applies data from the scope to the event and runs all event processors on it.
@@ -39,7 +38,6 @@ export function mergeScopeData(data: ScopeData, mergeData: ScopeData): void {
     eventProcessors,
     attachments,
     propagationContext,
-    // eslint-disable-next-line deprecation/deprecation
     transactionName,
     span,
   } = mergeData;
@@ -55,7 +53,6 @@ export function mergeScopeData(data: ScopeData, mergeData: ScopeData): void {
   }
 
   if (transactionName) {
-    // eslint-disable-next-line deprecation/deprecation
     data.transactionName = transactionName;
   }
 
@@ -119,15 +116,7 @@ export function mergeArray<Prop extends 'breadcrumbs' | 'fingerprint'>(
 }
 
 function applyDataToEvent(event: Event, data: ScopeData): void {
-  const {
-    extra,
-    tags,
-    user,
-    contexts,
-    level,
-    // eslint-disable-next-line deprecation/deprecation
-    transactionName,
-  } = data;
+  const { extra, tags, user, contexts, level, transactionName } = data;
 
   const cleanedExtra = dropUndefinedKeys(extra);
   if (cleanedExtra && Object.keys(cleanedExtra).length) {
@@ -153,7 +142,8 @@ function applyDataToEvent(event: Event, data: ScopeData): void {
     event.level = level;
   }
 
-  if (transactionName) {
+  // transaction events get their `transaction` from the root span name
+  if (transactionName && event.type !== 'transaction') {
     event.transaction = transactionName;
   }
 }
@@ -172,17 +162,16 @@ function applySdkMetadataToEvent(event: Event, sdkProcessingMetadata: ScopeData[
 
 function applySpanToEvent(event: Event, span: Span): void {
   event.contexts = { trace: spanToTraceContext(span), ...event.contexts };
+
+  event.sdkProcessingMetadata = {
+    dynamicSamplingContext: getDynamicSamplingContextFromSpan(span),
+    ...event.sdkProcessingMetadata,
+  };
+
   const rootSpan = getRootSpan(span);
-  if (rootSpan) {
-    event.sdkProcessingMetadata = {
-      dynamicSamplingContext: getDynamicSamplingContextFromSpan(span),
-      ...event.sdkProcessingMetadata,
-    };
-
-    const transactionName = spanToJSON(rootSpan).description;
-    if (transactionName && !event.transaction) {
-      event.transaction = transactionName;
-    }
+  const transactionName = spanToJSON(rootSpan).description;
+  if (transactionName && !event.transaction && event.type === 'transaction') {
+    event.transaction = transactionName;
   }
 }
 
diff --git a/packages/core/src/utils/getRootSpan.ts b/packages/core/src/utils/getRootSpan.ts
deleted file mode 100644
index fe6274c60670..000000000000
--- a/packages/core/src/utils/getRootSpan.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type { Span } from '@sentry/types';
-import type { SentrySpan } from './../tracing/sentrySpan';
-
-/**
- * Returns the root span of a given span.
- *
- * As long as we use `Transaction`s internally, the returned root span
- * will be a `Transaction` but be aware that this might change in the future.
- *
- * If the given span has no root span or transaction, `undefined` is returned.
- */
-export function getRootSpan(span: Span): Span | undefined {
-  // TODO (v8): Remove this check and just return span
-  // eslint-disable-next-line deprecation/deprecation
-  return (span as SentrySpan).transaction ? (span as SentrySpan).transaction : undefined;
-}
diff --git a/packages/core/src/utils/spanUtils.ts b/packages/core/src/utils/spanUtils.ts
index 436d383b8a7c..094f6674121c 100644
--- a/packages/core/src/utils/spanUtils.ts
+++ b/packages/core/src/utils/spanUtils.ts
@@ -1,6 +1,28 @@
-import type { Span, SpanJSON, SpanTimeInput, TraceContext } from '@sentry/types';
-import { dropUndefinedKeys, generateSentryTraceHeader, timestampInSeconds } from '@sentry/utils';
+import type {
+  MeasurementUnit,
+  Primitive,
+  Span,
+  SpanAttributes,
+  SpanJSON,
+  SpanOrigin,
+  SpanStatus,
+  SpanTimeInput,
+  TraceContext,
+} from '@sentry/types';
+import {
+  addNonEnumerableProperty,
+  dropUndefinedKeys,
+  generateSentryTraceHeader,
+  timestampInSeconds,
+} from '@sentry/utils';
+import { getMainCarrier } from '../asyncContext';
+import { getCurrentScope } from '../currentScopes';
+import { getAsyncContextStrategy } from '../hub';
+import { getMetricSummaryJsonForSpan, updateMetricSummaryOnSpan } from '../metrics/metric-summary';
+import type { MetricType } from '../metrics/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
 import type { SentrySpan } from '../tracing/sentrySpan';
+import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus';
 
 // These are aligned with OpenTelemetry trace flags
 export const TRACE_FLAG_NONE = 0x0;
@@ -11,7 +33,7 @@ export const TRACE_FLAG_SAMPLED = 0x1;
  */
 export function spanToTraceContext(span: Span): TraceContext {
   const { spanId: span_id, traceId: trace_id } = span.spanContext();
-  const { data, op, parent_span_id, status, tags, origin } = spanToJSON(span);
+  const { data, op, parent_span_id, status, origin } = spanToJSON(span);
 
   return dropUndefinedKeys({
     data,
@@ -19,7 +41,6 @@ export function spanToTraceContext(span: Span): TraceContext {
     parent_span_id,
     span_id,
     status,
-    tags,
     trace_id,
     origin,
   });
@@ -62,8 +83,6 @@ function ensureTimestampInSeconds(timestamp: number): number {
   return isMs ? timestamp / 1000 : timestamp;
 }
 
-type SpanWithToJSON = Span & { toJSON: () => SpanJSON };
-
 /**
  * Convert a span to a JSON representation.
  * Note that all fields returned here are optional and need to be guarded against.
@@ -77,14 +96,52 @@ export function spanToJSON(span: Span): Partial<SpanJSON> {
     return span.getSpanJSON();
   }
 
-  // Fallback: We also check for `.toJSON()` here...
-  if (typeof (span as SpanWithToJSON).toJSON === 'function') {
-    return (span as SpanWithToJSON).toJSON();
+  try {
+    const { spanId: span_id, traceId: trace_id } = span.spanContext();
+
+    // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
+    if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
+      const { attributes, startTime, name, endTime, parentSpanId, status } = span;
+
+      return dropUndefinedKeys({
+        span_id,
+        trace_id,
+        data: attributes,
+        description: name,
+        parent_span_id: parentSpanId,
+        start_timestamp: spanTimeInputToSeconds(startTime),
+        // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
+        timestamp: spanTimeInputToSeconds(endTime) || undefined,
+        status: getStatusMessage(status),
+        op: attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP],
+        origin: attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] as SpanOrigin | undefined,
+        _metrics_summary: getMetricSummaryJsonForSpan(span),
+      });
+    }
+
+    // Finally, at least we have `spanContext()`....
+    return {
+      span_id,
+      trace_id,
+    };
+  } catch {
+    return {};
   }
+}
 
-  // TODO: Also handle OTEL spans here!
+function spanIsOpenTelemetrySdkTraceBaseSpan(span: Span): span is OpenTelemetrySdkTraceBaseSpan {
+  const castSpan = span as OpenTelemetrySdkTraceBaseSpan;
+  return !!castSpan.attributes && !!castSpan.startTime && !!castSpan.name && !!castSpan.endTime && !!castSpan.status;
+}
 
-  return {};
+/** Exported only for tests. */
+export interface OpenTelemetrySdkTraceBaseSpan extends Span {
+  attributes: SpanAttributes;
+  startTime: SpanTimeInput;
+  name: string;
+  status: SpanStatus;
+  endTime: SpanTimeInput;
+  parentSpanId?: string;
 }
 
 /**
@@ -105,6 +162,114 @@ export function spanIsSampled(span: Span): boolean {
   // We align our trace flags with the ones OpenTelemetry use
   // So we also check for sampled the same way they do.
   const { traceFlags } = span.spanContext();
-  // eslint-disable-next-line no-bitwise
-  return Boolean(traceFlags & TRACE_FLAG_SAMPLED);
+  return traceFlags === TRACE_FLAG_SAMPLED;
+}
+
+/** Get the status message to use for a JSON representation of a span. */
+export function getStatusMessage(status: SpanStatus | undefined): string | undefined {
+  if (!status || status.code === SPAN_STATUS_UNSET) {
+    return undefined;
+  }
+
+  if (status.code === SPAN_STATUS_OK) {
+    return 'ok';
+  }
+
+  return status.message || 'unknown_error';
+}
+
+const CHILD_SPANS_FIELD = '_sentryChildSpans';
+const ROOT_SPAN_FIELD = '_sentryRootSpan';
+
+type SpanWithPotentialChildren = Span & {
+  [CHILD_SPANS_FIELD]?: Set<Span>;
+  [ROOT_SPAN_FIELD]?: Span;
+};
+
+/**
+ * Adds an opaque child span reference to a span.
+ */
+export function addChildSpanToSpan(span: SpanWithPotentialChildren, childSpan: Span): void {
+  // We store the root span reference on the child span
+  // We need this for `getRootSpan()` to work
+  const rootSpan = span[ROOT_SPAN_FIELD] || span;
+  addNonEnumerableProperty(childSpan as SpanWithPotentialChildren, ROOT_SPAN_FIELD, rootSpan);
+
+  // We store a list of child spans on the parent span
+  // We need this for `getSpanDescendants()` to work
+  if (span[CHILD_SPANS_FIELD] && span[CHILD_SPANS_FIELD].size < 1000) {
+    span[CHILD_SPANS_FIELD].add(childSpan);
+  } else {
+    addNonEnumerableProperty(span, CHILD_SPANS_FIELD, new Set([childSpan]));
+  }
+}
+
+/** This is only used internally by Idle Spans. */
+export function removeChildSpanFromSpan(span: SpanWithPotentialChildren, childSpan: Span): void {
+  if (span[CHILD_SPANS_FIELD]) {
+    span[CHILD_SPANS_FIELD].delete(childSpan);
+  }
+}
+
+/**
+ * Returns an array of the given span and all of its descendants.
+ */
+export function getSpanDescendants(span: SpanWithPotentialChildren): Span[] {
+  const resultSet = new Set<Span>();
+
+  function addSpanChildren(span: SpanWithPotentialChildren): void {
+    // This exit condition is required to not infinitely loop in case of a circular dependency.
+    if (resultSet.has(span)) {
+      return;
+      // We want to ignore unsampled spans (e.g. non recording spans)
+    } else if (spanIsSampled(span)) {
+      resultSet.add(span);
+      const childSpans = span[CHILD_SPANS_FIELD] ? Array.from(span[CHILD_SPANS_FIELD]) : [];
+      for (const childSpan of childSpans) {
+        addSpanChildren(childSpan);
+      }
+    }
+  }
+
+  addSpanChildren(span);
+
+  return Array.from(resultSet);
+}
+
+/**
+ * Returns the root span of a given span.
+ */
+export function getRootSpan(span: SpanWithPotentialChildren): Span {
+  return span[ROOT_SPAN_FIELD] || span;
+}
+
+/**
+ * Returns the currently active span.
+ */
+export function getActiveSpan(): Span | undefined {
+  const carrier = getMainCarrier();
+  const acs = getAsyncContextStrategy(carrier);
+  if (acs.getActiveSpan) {
+    return acs.getActiveSpan();
+  }
+
+  // eslint-disable-next-line deprecation/deprecation
+  return getCurrentScope().getSpan();
+}
+
+/**
+ * Updates the metric summary on the currently active span
+ */
+export function updateMetricSummaryOnActiveSpan(
+  metricType: MetricType,
+  sanitizedName: string,
+  value: number,
+  unit: MeasurementUnit,
+  tags: Record<string, Primitive>,
+  bucketKey: string,
+): void {
+  const span = getActiveSpan();
+  if (span) {
+    updateMetricSummaryOnSpan(span, metricType, sanitizedName, value, unit, tags, bucketKey);
+  }
 }
diff --git a/packages/core/test/lib/base.test.ts b/packages/core/test/lib/base.test.ts
index b85df791af9b..6c7c8aa0d63d 100644
--- a/packages/core/test/lib/base.test.ts
+++ b/packages/core/test/lib/base.test.ts
@@ -1,19 +1,12 @@
-import type { Client, Envelope, Event, Transaction } from '@sentry/types';
+import type { Client, Envelope, Event } from '@sentry/types';
 import { SentryError, SyncPromise, dsnToString, logger } from '@sentry/utils';
 
-import {
-  Scope,
-  addBreadcrumb,
-  getCurrentScope,
-  getIsolationScope,
-  makeSession,
-  setCurrentClient,
-  setGlobalScope,
-} from '../../src';
+import { Scope, addBreadcrumb, getCurrentScope, getIsolationScope, makeSession, setCurrentClient } from '../../src';
 import * as integrationModule from '../../src/integration';
 import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
 import { AdHocIntegration, TestIntegration } from '../mocks/integration';
 import { makeFakeTransport } from '../mocks/transport';
+import { clearGlobalScope } from './clear-global-scope';
 
 const PUBLIC_DSN = 'https://username@domain/123';
 // eslint-disable-next-line no-var
@@ -62,7 +55,7 @@ describe('BaseClient', () => {
   beforeEach(() => {
     TestClient.sendEventCalled = undefined;
     TestClient.instance = undefined;
-    setGlobalScope(undefined);
+    clearGlobalScope();
     getCurrentScope().clear();
     getCurrentScope().setClient(undefined);
     getIsolationScope().clear();
@@ -1935,20 +1928,6 @@ describe('BaseClient', () => {
     ] as const;
 
     describe.each(scenarios)('with client %s', (_, client) => {
-      it('should call a startTransaction hook', () => {
-        expect.assertions(1);
-
-        const mockTransaction = {
-          traceId: '86f39e84263a4de99c326acab3bfe3bd',
-        } as Transaction;
-
-        client.on('startTransaction', transaction => {
-          expect(transaction).toEqual(mockTransaction);
-        });
-
-        client.emit('startTransaction', mockTransaction);
-      });
-
       it('should call a beforeEnvelope hook', () => {
         expect.assertions(1);
 
diff --git a/packages/core/test/lib/clear-global-scope.ts b/packages/core/test/lib/clear-global-scope.ts
new file mode 100644
index 000000000000..5290a610e961
--- /dev/null
+++ b/packages/core/test/lib/clear-global-scope.ts
@@ -0,0 +1,6 @@
+import { GLOBAL_OBJ } from '@sentry/utils';
+
+export function clearGlobalScope() {
+  const __SENTRY__ = (GLOBAL_OBJ.__SENTRY__ = GLOBAL_OBJ.__SENTRY__ || {});
+  __SENTRY__.globalScope = undefined;
+}
diff --git a/packages/core/test/lib/prepareEvent.test.ts b/packages/core/test/lib/prepareEvent.test.ts
index 1ad80fb5ce68..49dcc349f2ed 100644
--- a/packages/core/test/lib/prepareEvent.test.ts
+++ b/packages/core/test/lib/prepareEvent.test.ts
@@ -9,7 +9,7 @@ import type {
   ScopeContext,
 } from '@sentry/types';
 import { GLOBAL_OBJ, createStackParser } from '@sentry/utils';
-import { getGlobalScope, getIsolationScope, setGlobalScope } from '../../src';
+import { getGlobalScope, getIsolationScope } from '../../src';
 
 import { Scope } from '../../src/scope';
 import {
@@ -18,6 +18,7 @@ import {
   parseEventHintOrCaptureContext,
   prepareEvent,
 } from '../../src/utils/prepareEvent';
+import { clearGlobalScope } from './clear-global-scope';
 
 describe('applyDebugIds', () => {
   afterEach(() => {
@@ -191,7 +192,7 @@ describe('parseEventHintOrCaptureContext', () => {
 
 describe('prepareEvent', () => {
   beforeEach(() => {
-    setGlobalScope(undefined);
+    clearGlobalScope();
     getIsolationScope().clear();
   });
 
diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts
index 48a39d7f09b0..978ebde52c9f 100644
--- a/packages/core/test/lib/scope.test.ts
+++ b/packages/core/test/lib/scope.test.ts
@@ -1,26 +1,19 @@
 import type { Attachment, Breadcrumb, Client, Event, RequestSessionStatus } from '@sentry/types';
 import {
-  addTracingExtensions,
   applyScopeDataToEvent,
-  getActiveSpan,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
-  setCurrentClient,
-  setGlobalScope,
-  spanToJSON,
-  startInactiveSpan,
-  startSpan,
   withIsolationScope,
 } from '../../src';
 
-import { withActiveSpan } from '../../src/exports';
 import { Scope } from '../../src/scope';
 import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { clearGlobalScope } from './clear-global-scope';
 
 describe('Scope', () => {
   beforeEach(() => {
-    setGlobalScope(undefined);
+    clearGlobalScope();
   });
 
   it('allows to create & update a scope', () => {
@@ -498,7 +491,7 @@ describe('Scope', () => {
 
   describe('global scope', () => {
     beforeEach(() => {
-      setGlobalScope(undefined);
+      clearGlobalScope();
     });
 
     it('works', () => {
@@ -937,48 +930,3 @@ describe('isolation scope', () => {
     });
   });
 });
-
-describe('withActiveSpan()', () => {
-  beforeAll(() => {
-    addTracingExtensions();
-  });
-
-  beforeEach(() => {
-    const options = getDefaultTestClientOptions({ enableTracing: true });
-    const client = new TestClient(options);
-    setCurrentClient(client);
-    client.init();
-  });
-
-  it('should set the active span within the callback', () => {
-    expect.assertions(2);
-    const inactiveSpan = startInactiveSpan({ name: 'inactive-span' });
-
-    expect(getActiveSpan()).not.toBe(inactiveSpan);
-
-    withActiveSpan(inactiveSpan!, () => {
-      expect(getActiveSpan()).toBe(inactiveSpan);
-    });
-  });
-
-  it('should create child spans when calling startSpan within the callback', () => {
-    const inactiveSpan = startInactiveSpan({ name: 'inactive-span' });
-
-    const parentSpanId = withActiveSpan(inactiveSpan!, () => {
-      return startSpan({ name: 'child-span' }, childSpan => {
-        return spanToJSON(childSpan!).parent_span_id;
-      });
-    });
-
-    expect(parentSpanId).toBe(inactiveSpan?.spanContext().spanId);
-  });
-
-  it('when `null` is passed, no span should be active within the callback', () => {
-    expect.assertions(1);
-    startSpan({ name: 'parent-span' }, () => {
-      withActiveSpan(null, () => {
-        expect(getActiveSpan()).toBeUndefined();
-      });
-    });
-  });
-});
diff --git a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
index 9c531907eac3..f38d3f3e26de 100644
--- a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
+++ b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
@@ -4,8 +4,12 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCurrentClient,
 } from '../../../src';
-import { Transaction, getDynamicSamplingContextFromSpan, startInactiveSpan } from '../../../src/tracing';
-import { addTracingExtensions } from '../../../src/tracing';
+import {
+  Transaction,
+  addTracingExtensions,
+  getDynamicSamplingContextFromSpan,
+  startInactiveSpan,
+} from '../../../src/tracing';
 import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
 
 describe('getDynamicSamplingContextFromSpan', () => {
diff --git a/packages/core/test/lib/tracing/errors.test.ts b/packages/core/test/lib/tracing/errors.test.ts
index 24c19a24121d..76c4aa9609f2 100644
--- a/packages/core/test/lib/tracing/errors.test.ts
+++ b/packages/core/test/lib/tracing/errors.test.ts
@@ -68,7 +68,7 @@ describe('registerErrorHandlers()', () => {
 
     startSpan({ name: 'test' }, span => {
       mockErrorCallback({} as HandlerDataError);
-      expect(spanToJSON(span!).status).toBe('internal_error');
+      expect(spanToJSON(span).status).toBe('internal_error');
     });
   });
 
@@ -77,7 +77,7 @@ describe('registerErrorHandlers()', () => {
 
     startSpan({ name: 'test' }, span => {
       mockUnhandledRejectionCallback({});
-      expect(spanToJSON(span!).status).toBe('internal_error');
+      expect(spanToJSON(span).status).toBe('internal_error');
     });
   });
 });
diff --git a/packages/core/test/lib/tracing/idleSpan.test.ts b/packages/core/test/lib/tracing/idleSpan.test.ts
new file mode 100644
index 000000000000..a0d5b5bf3123
--- /dev/null
+++ b/packages/core/test/lib/tracing/idleSpan.test.ts
@@ -0,0 +1,541 @@
+import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+
+import type { Event, Span } from '@sentry/types';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
+  SentryNonRecordingSpan,
+  SentrySpan,
+  addTracingExtensions,
+  getActiveSpan,
+  getClient,
+  getCurrentScope,
+  getGlobalScope,
+  getIsolationScope,
+  setCurrentClient,
+  spanToJSON,
+  startInactiveSpan,
+  startSpan,
+  startSpanManual,
+} from '../../../src';
+import { TRACING_DEFAULTS, startIdleSpan } from '../../../src/tracing/idleSpan';
+
+const dsn = 'https://123@sentry.io/42';
+
+describe('startIdleSpan', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    const options = getDefaultTestClientOptions({ dsn, tracesSampleRate: 1 });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('sets & unsets the idle span on the scope', () => {
+    const idleSpan = startIdleSpan({ name: 'foo' });
+    expect(idleSpan).toBeDefined();
+    expect(idleSpan).toBeInstanceOf(SentrySpan);
+
+    expect(getActiveSpan()).toBe(idleSpan);
+
+    idleSpan!.end();
+    jest.runAllTimers();
+
+    expect(getActiveSpan()).toBe(undefined);
+  });
+
+  it('returns non recording span if tracing is disabled', () => {
+    const options = getDefaultTestClientOptions({ dsn });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    const idleSpan = startIdleSpan({ name: 'foo' });
+    expect(idleSpan).toBeDefined();
+    expect(idleSpan).toBeInstanceOf(SentryNonRecordingSpan);
+
+    // not set as active span, though
+    expect(getActiveSpan()).toBe(undefined);
+  });
+
+  it('does not finish idle span if there are still active activities', () => {
+    const idleSpan = startIdleSpan({ name: 'foo' });
+    expect(idleSpan).toBeDefined();
+
+    startSpanManual({ name: 'inner1' }, span => {
+      const childSpan = startInactiveSpan({ name: 'inner2' });
+
+      span?.end();
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);
+
+      // Idle span is still recording
+      expect(idleSpan.isRecording()).toBe(true);
+
+      childSpan?.end();
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);
+
+      // Now it is finished!
+      expect(idleSpan.isRecording()).toBe(false);
+    });
+  });
+
+  it('calls beforeSpanEnd callback before finishing', () => {
+    const beforeSpanEnd = jest.fn();
+    const idleSpan = startIdleSpan({ name: 'foo' }, { beforeSpanEnd });
+    expect(idleSpan).toBeDefined();
+
+    expect(beforeSpanEnd).not.toHaveBeenCalled();
+
+    startSpan({ name: 'inner' }, () => {});
+
+    jest.runOnlyPendingTimers();
+    expect(beforeSpanEnd).toHaveBeenCalledTimes(1);
+    expect(beforeSpanEnd).toHaveBeenLastCalledWith(idleSpan);
+  });
+
+  it('allows to mutate idle span in beforeSpanEnd before it is sent', () => {
+    const transactions: Event[] = [];
+    const beforeSendTransaction = jest.fn(event => {
+      transactions.push(event);
+      return null;
+    });
+    const options = getDefaultTestClientOptions({
+      dsn,
+      tracesSampleRate: 1,
+      beforeSendTransaction,
+    });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    // We want to accomodate a bit of drift there, so we ensure this starts earlier...
+    const baseTimeInSeconds = Math.floor(Date.now() / 1000) - 9999;
+
+    const beforeSpanEnd = jest.fn((span: Span) => {
+      span.setAttribute('foo', 'bar');
+      // Try adding a child here - we do this in browser tracing...
+      const inner = startInactiveSpan({ name: 'from beforeSpanEnd', startTime: baseTimeInSeconds });
+      inner?.end(baseTimeInSeconds);
+    });
+    const idleSpan = startIdleSpan({ name: 'idle span 2', startTime: baseTimeInSeconds }, { beforeSpanEnd });
+    expect(idleSpan).toBeDefined();
+
+    expect(beforeSpanEnd).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);
+    jest.runOnlyPendingTimers();
+
+    expect(spanToJSON(idleSpan!).data).toEqual(
+      expect.objectContaining({
+        foo: 'bar',
+      }),
+    );
+
+    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
+    const transaction = transactions[0];
+
+    expect(transaction.contexts?.trace?.data).toEqual(
+      expect.objectContaining({
+        foo: 'bar',
+      }),
+    );
+    expect(transaction.spans).toHaveLength(1);
+    expect(transaction.spans).toEqual([expect.objectContaining({ description: 'from beforeSpanEnd' })]);
+  });
+
+  it('filters spans on end', () => {
+    const transactions: Event[] = [];
+    const beforeSendTransaction = jest.fn(event => {
+      transactions.push(event);
+      return null;
+    });
+    const options = getDefaultTestClientOptions({
+      dsn,
+      tracesSampleRate: 1,
+      beforeSendTransaction,
+    });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    // We want to accomodate a bit of drift there, so we ensure this starts earlier...
+    const baseTimeInSeconds = Math.floor(Date.now() / 1000) - 9999;
+
+    const idleSpan = startIdleSpan({ name: 'idle span', startTime: baseTimeInSeconds });
+    expect(idleSpan).toBeDefined();
+
+    // regular child - should be kept
+    const regularSpan = startInactiveSpan({
+      name: 'regular span',
+      startTime: baseTimeInSeconds + 2,
+    });
+
+    // discardedSpan - startTimestamp is too large
+    const discardedSpan = startInactiveSpan({ name: 'discarded span', startTime: baseTimeInSeconds + 99 });
+    // discardedSpan2 - endTime is too large
+    const discardedSpan2 = startInactiveSpan({ name: 'discarded span', startTime: baseTimeInSeconds + 3 });
+    discardedSpan2.end(baseTimeInSeconds + 99)!;
+
+    // Should be cancelled - will not finish
+    const cancelledSpan = startInactiveSpan({
+      name: 'cancelled span',
+      startTime: baseTimeInSeconds + 4,
+    });
+
+    regularSpan.end(baseTimeInSeconds + 4);
+    idleSpan.end(baseTimeInSeconds + 10);
+
+    jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);
+    jest.runOnlyPendingTimers();
+
+    expect(regularSpan.isRecording()).toBe(false);
+    expect(idleSpan.isRecording()).toBe(false);
+    expect(discardedSpan.isRecording()).toBe(false);
+    expect(discardedSpan2.isRecording()).toBe(false);
+    expect(cancelledSpan.isRecording()).toBe(false);
+
+    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
+    const transaction = transactions[0];
+
+    // End time is based on idle time etc.
+    const idleSpanEndTime = transaction.timestamp!;
+    expect(idleSpanEndTime).toEqual(expect.any(Number));
+
+    expect(transaction.spans).toHaveLength(2);
+    expect(transaction.spans).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          description: 'regular span',
+          timestamp: baseTimeInSeconds + 4,
+          start_timestamp: baseTimeInSeconds + 2,
+        }),
+      ]),
+    );
+    expect(transaction.spans).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          description: 'cancelled span',
+          timestamp: idleSpanEndTime,
+          start_timestamp: baseTimeInSeconds + 4,
+          status: 'cancelled',
+        }),
+      ]),
+    );
+  });
+
+  it('emits span hooks', () => {
+    const client = getClient()!;
+
+    const hookSpans: { span: Span; hook: string }[] = [];
+    client.on('spanStart', span => {
+      hookSpans.push({ span, hook: 'spanStart' });
+    });
+    client.on('spanEnd', span => {
+      hookSpans.push({ span, hook: 'spanEnd' });
+    });
+
+    const idleSpan = startIdleSpan({ name: 'idle span' });
+    expect(idleSpan).toBeDefined();
+
+    expect(hookSpans).toEqual([{ span: idleSpan, hook: 'spanStart' }]);
+
+    jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+    expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+
+    expect(hookSpans).toEqual([
+      { span: idleSpan, hook: 'spanStart' },
+      { span: idleSpan, hook: 'spanEnd' },
+    ]);
+  });
+
+  it('should record dropped idle span', () => {
+    const options = getDefaultTestClientOptions({
+      dsn,
+      tracesSampleRate: 0,
+    });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    const recordDroppedEventSpy = jest.spyOn(client, 'recordDroppedEvent');
+
+    const idleSpan = startIdleSpan({ name: 'idle span' });
+    expect(idleSpan).toBeDefined();
+
+    idleSpan?.end();
+
+    expect(recordDroppedEventSpy).toHaveBeenCalledWith('sample_rate', 'transaction');
+  });
+
+  it('sets finish reason when span ends', () => {
+    let transaction: Event | undefined;
+    const beforeSendTransaction = jest.fn(event => {
+      transaction = event;
+      return null;
+    });
+    const options = getDefaultTestClientOptions({ dsn, tracesSampleRate: 1, beforeSendTransaction });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    // This is only set when op === 'ui.action.click'
+    startIdleSpan({ name: 'foo', op: 'ui.action.click' });
+    startSpan({ name: 'inner' }, () => {});
+    jest.runOnlyPendingTimers();
+
+    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
+    expect(transaction?.contexts?.trace?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]).toEqual(
+      'idleTimeout',
+    );
+  });
+
+  it('uses finish reason set outside when span ends', () => {
+    let transaction: Event | undefined;
+    const beforeSendTransaction = jest.fn(event => {
+      transaction = event;
+      return null;
+    });
+    const options = getDefaultTestClientOptions({ dsn, tracesSampleRate: 1, beforeSendTransaction });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    // This is only set when op === 'ui.action.click'
+    const span = startIdleSpan({ name: 'foo', op: 'ui.action.click' });
+    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON, 'custom reason');
+    startSpan({ name: 'inner' }, () => {});
+    jest.runOnlyPendingTimers();
+
+    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
+    expect(transaction?.contexts?.trace?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON]).toEqual(
+      'custom reason',
+    );
+  });
+
+  describe('idleTimeout', () => {
+    it('finishes if no activities are added to the idle span', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' });
+      expect(idleSpan).toBeDefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+
+    it('does not finish if a activity is started', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' });
+      expect(idleSpan).toBeDefined();
+
+      startInactiveSpan({ name: 'span' });
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+    });
+
+    it('does not finish when idleTimeout is not exceed after last activity finished', () => {
+      const idleTimeout = 10;
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { idleTimeout });
+      expect(idleSpan).toBeDefined();
+
+      startSpan({ name: 'span1' }, () => {});
+
+      jest.advanceTimersByTime(2);
+
+      startSpan({ name: 'span2' }, () => {});
+
+      jest.advanceTimersByTime(8);
+
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+    });
+
+    it('finish when idleTimeout is exceeded after last activity finished', () => {
+      const idleTimeout = 10;
+      const idleSpan = startIdleSpan({ name: 'idle span', startTime: 1234 }, { idleTimeout });
+      expect(idleSpan).toBeDefined();
+
+      startSpan({ name: 'span1' }, () => {});
+
+      jest.advanceTimersByTime(2);
+
+      startSpan({ name: 'span2' }, () => {});
+
+      jest.advanceTimersByTime(10);
+
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+  });
+
+  describe('child span timeout', () => {
+    it('finishes when a child span exceed timeout', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' });
+      expect(idleSpan).toBeDefined();
+
+      // Start any span to cancel idle timeout
+      startInactiveSpan({ name: 'span' });
+
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Wait some time
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout - 1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Wait for timeout to exceed
+      jest.advanceTimersByTime(1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+
+    it('resets after new activities are added', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { finalTimeout: 99_999 });
+      expect(idleSpan).toBeDefined();
+
+      // Start any span to cancel idle timeout
+      startInactiveSpan({ name: 'span' });
+
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Wait some time
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout - 1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // New span resets the timeout
+      startInactiveSpan({ name: 'span' });
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout - 1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // New span resets the timeout
+      startInactiveSpan({ name: 'span' });
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout - 1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Wait for timeout to exceed
+      jest.advanceTimersByTime(1000);
+      expect(spanToJSON(idleSpan).status).not.toEqual('deadline_exceeded');
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+  });
+
+  describe('disableAutoFinish', () => {
+    it('skips idle timeout if disableAutoFinish=true', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { disableAutoFinish: true });
+      expect(idleSpan).toBeDefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Now emit a signal
+      getClient()!.emit('idleSpanEnableAutoFinish', idleSpan);
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+
+    it('skips span timeout if disableAutoFinish=true', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { disableAutoFinish: true, finalTimeout: 99_999 });
+      expect(idleSpan).toBeDefined();
+
+      startInactiveSpan({ name: 'inner' });
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Now emit a signal
+      getClient()!.emit('idleSpanEnableAutoFinish', idleSpan);
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.childSpanTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+
+    it('times out at final timeout if disableAutoFinish=true', () => {
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { disableAutoFinish: true });
+      expect(idleSpan).toBeDefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.finalTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeDefined();
+    });
+
+    it('ignores it if hook is emitted with other span', () => {
+      const span = startInactiveSpan({ name: 'other span' });
+      const idleSpan = startIdleSpan({ name: 'idle span' }, { disableAutoFinish: true });
+      expect(idleSpan).toBeDefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+
+      // Now emit a signal, but with a different span
+      getClient()!.emit('idleSpanEnableAutoFinish', span);
+
+      // This doesn't affect us!
+      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
+      expect(spanToJSON(idleSpan).timestamp).toBeUndefined();
+    });
+  });
+
+  describe('trim end timestamp', () => {
+    it('trims end to highest child span end', () => {
+      const idleSpan = startIdleSpan({ name: 'foo', startTime: 1000 });
+      expect(idleSpan).toBeDefined();
+
+      const span1 = startInactiveSpan({ name: 'span1', startTime: 1001 });
+      span1?.end(1005);
+
+      const span2 = startInactiveSpan({ name: 'span2', startTime: 1002 });
+      span2?.end(1100);
+
+      const span3 = startInactiveSpan({ name: 'span1', startTime: 1050 });
+      span3?.end(1060);
+
+      expect(getActiveSpan()).toBe(idleSpan);
+
+      jest.runAllTimers();
+
+      expect(spanToJSON(idleSpan!).timestamp).toBe(1100);
+    });
+
+    it('keeps lower span endTime than highest child span end', () => {
+      const idleSpan = startIdleSpan({ name: 'foo', startTime: 1000 });
+      expect(idleSpan).toBeDefined();
+
+      const span1 = startInactiveSpan({ name: 'span1', startTime: 999_999_999 });
+      span1?.end(1005);
+
+      const span2 = startInactiveSpan({ name: 'span2', startTime: 1002 });
+      span2?.end(1100);
+
+      const span3 = startInactiveSpan({ name: 'span1', startTime: 1050 });
+      span3?.end(1060);
+
+      expect(getActiveSpan()).toBe(idleSpan);
+
+      jest.runAllTimers();
+
+      expect(spanToJSON(idleSpan!).timestamp).toBeLessThan(999_999_999);
+      expect(spanToJSON(idleSpan!).timestamp).toBeGreaterThan(1060);
+    });
+  });
+});
diff --git a/packages/core/test/lib/tracing/idletransaction.test.ts b/packages/core/test/lib/tracing/idletransaction.test.ts
deleted file mode 100644
index 56ed93abe5d9..000000000000
--- a/packages/core/test/lib/tracing/idletransaction.test.ts
+++ /dev/null
@@ -1,570 +0,0 @@
-/* eslint-disable deprecation/deprecation */
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
-
-import {
-  IdleTransaction,
-  SentrySpan,
-  TRACING_DEFAULTS,
-  Transaction,
-  getClient,
-  getCurrentHub,
-  getCurrentScope,
-  getGlobalScope,
-  getIsolationScope,
-  setCurrentClient,
-  spanToJSON,
-  startInactiveSpan,
-  startSpan,
-  startSpanManual,
-} from '../../../src';
-import { IdleTransactionSpanRecorder } from '../../../src/tracing/idletransaction';
-
-const dsn = 'https://123@sentry.io/42';
-beforeEach(() => {
-  getCurrentScope().clear();
-  getIsolationScope().clear();
-  getGlobalScope().clear();
-
-  const options = getDefaultTestClientOptions({ dsn, tracesSampleRate: 1 });
-  const client = new TestClient(options);
-  setCurrentClient(client);
-  client.init();
-});
-
-afterEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('IdleTransaction', () => {
-  describe('onScope', () => {
-    it('sets the transaction on the scope on creation if onScope is true', () => {
-      const transaction = new IdleTransaction(
-        { name: 'foo' },
-        getCurrentHub(),
-        TRACING_DEFAULTS.idleTimeout,
-        TRACING_DEFAULTS.finalTimeout,
-        TRACING_DEFAULTS.heartbeatInterval,
-        true,
-      );
-      transaction.initSpanRecorder(10);
-
-      const scope = getCurrentScope();
-
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getTransaction()).toBe(transaction);
-    });
-
-    it('does not set the transaction on the scope on creation if onScope is falsey', () => {
-      const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-      transaction.initSpanRecorder(10);
-
-      const scope = getCurrentScope();
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getTransaction()).toBe(undefined);
-    });
-
-    it('removes sampled transaction from scope on finish if onScope is true', () => {
-      const transaction = new IdleTransaction(
-        { name: 'foo' },
-        getCurrentHub(),
-        TRACING_DEFAULTS.idleTimeout,
-        TRACING_DEFAULTS.finalTimeout,
-        TRACING_DEFAULTS.heartbeatInterval,
-        true,
-      );
-      transaction.initSpanRecorder(10);
-
-      transaction.end();
-      jest.runAllTimers();
-
-      const scope = getCurrentScope();
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getTransaction()).toBe(undefined);
-    });
-
-    it('removes unsampled transaction from scope on finish if onScope is true', () => {
-      const transaction = new IdleTransaction(
-        { name: 'foo', sampled: false },
-        getCurrentHub(),
-        TRACING_DEFAULTS.idleTimeout,
-        TRACING_DEFAULTS.finalTimeout,
-        TRACING_DEFAULTS.heartbeatInterval,
-        true,
-      );
-
-      transaction.end();
-      jest.runAllTimers();
-
-      const scope = getCurrentScope();
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getTransaction()).toBe(undefined);
-    });
-
-    it('does not remove transaction from scope on finish if another transaction was set there', () => {
-      const transaction = new IdleTransaction(
-        { name: 'foo' },
-        getCurrentHub(),
-        TRACING_DEFAULTS.idleTimeout,
-        TRACING_DEFAULTS.finalTimeout,
-        TRACING_DEFAULTS.heartbeatInterval,
-        true,
-      );
-      transaction.initSpanRecorder(10);
-
-      const otherTransaction = new Transaction({ name: 'bar' }, getCurrentHub());
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(otherTransaction);
-
-      transaction.end();
-      jest.runAllTimers();
-
-      const scope = getCurrentScope();
-      // eslint-disable-next-line deprecation/deprecation
-      expect(scope.getTransaction()).toBe(otherTransaction);
-    });
-  });
-
-  beforeEach(() => {
-    jest.useFakeTimers();
-  });
-
-  it('push and pops activities', () => {
-    const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-    const mockFinish = jest.spyOn(transaction, 'end');
-    transaction.initSpanRecorder(10);
-    expect(transaction.activities).toMatchObject({});
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    const span = startInactiveSpan({ name: 'inner' })!;
-    expect(transaction.activities).toMatchObject({ [span.spanContext().spanId]: true });
-
-    expect(mockFinish).toHaveBeenCalledTimes(0);
-
-    span.end();
-    expect(transaction.activities).toMatchObject({});
-
-    jest.runOnlyPendingTimers();
-    expect(mockFinish).toHaveBeenCalledTimes(1);
-  });
-
-  it('does not push activities if a span already has an end timestamp', () => {
-    const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-    transaction.initSpanRecorder(10);
-    expect(transaction.activities).toMatchObject({});
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    startInactiveSpan({ name: 'inner', startTimestamp: 1234, endTimestamp: 5678 });
-    expect(transaction.activities).toMatchObject({});
-  });
-
-  it('does not finish if there are still active activities', () => {
-    const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-    const mockFinish = jest.spyOn(transaction, 'end');
-    transaction.initSpanRecorder(10);
-    expect(transaction.activities).toMatchObject({});
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    startSpanManual({ name: 'inner1' }, span => {
-      const childSpan = startInactiveSpan({ name: 'inner2' })!;
-      expect(transaction.activities).toMatchObject({
-        [span!.spanContext().spanId]: true,
-        [childSpan.spanContext().spanId]: true,
-      });
-      span?.end();
-      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout + 1);
-
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-      expect(transaction.activities).toMatchObject({ [childSpan.spanContext().spanId]: true });
-    });
-  });
-
-  it('calls beforeFinish callback before finishing', () => {
-    const mockCallback1 = jest.fn();
-    const mockCallback2 = jest.fn();
-    const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-    transaction.initSpanRecorder(10);
-    transaction.registerBeforeFinishCallback(mockCallback1);
-    transaction.registerBeforeFinishCallback(mockCallback2);
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    expect(mockCallback1).toHaveBeenCalledTimes(0);
-    expect(mockCallback2).toHaveBeenCalledTimes(0);
-
-    startSpan({ name: 'inner' }, () => {});
-
-    jest.runOnlyPendingTimers();
-    expect(mockCallback1).toHaveBeenCalledTimes(1);
-    expect(mockCallback1).toHaveBeenLastCalledWith(transaction, expect.any(Number));
-    expect(mockCallback2).toHaveBeenCalledTimes(1);
-    expect(mockCallback2).toHaveBeenLastCalledWith(transaction, expect.any(Number));
-  });
-
-  it('filters spans on finish', () => {
-    const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub());
-    transaction.initSpanRecorder(10);
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    // regular child - should be kept
-    const regularSpan = startInactiveSpan({
-      name: 'span1',
-      startTimestamp: spanToJSON(transaction).start_timestamp! + 2,
-    })!;
-
-    // discardedSpan - startTimestamp is too large
-    startInactiveSpan({ name: 'span2', startTimestamp: 645345234 });
-
-    // Should be cancelled - will not finish
-    const cancelledSpan = startInactiveSpan({
-      name: 'span3',
-      startTimestamp: spanToJSON(transaction).start_timestamp! + 4,
-    })!;
-
-    regularSpan.end(spanToJSON(regularSpan).start_timestamp! + 4);
-    transaction.end(spanToJSON(transaction).start_timestamp! + 10);
-
-    expect(transaction.spanRecorder).toBeDefined();
-    if (transaction.spanRecorder) {
-      const spans = transaction.spanRecorder.spans;
-      expect(spans).toHaveLength(3);
-      expect(spans[0].spanContext().spanId).toBe(transaction.spanContext().spanId);
-
-      // Regular SentrySpan - should not modified
-      expect(spans[1].spanContext().spanId).toBe(regularSpan.spanContext().spanId);
-      expect(spanToJSON(spans[1]).timestamp).not.toBe(spanToJSON(transaction).timestamp);
-
-      // Cancelled SentrySpan - has endtimestamp of transaction
-      expect(spans[2].spanContext().spanId).toBe(cancelledSpan.spanContext().spanId);
-      expect(spanToJSON(spans[2]).status).toBe('cancelled');
-      expect(spanToJSON(spans[2]).timestamp).toBe(spanToJSON(transaction).timestamp);
-    }
-  });
-
-  it('filters out spans that exceed final timeout', () => {
-    const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), 1000, 3000);
-    transaction.initSpanRecorder(10);
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
-
-    const span = startInactiveSpan({ name: 'span', startTimestamp: spanToJSON(transaction).start_timestamp! + 2 })!;
-    span.end(spanToJSON(span).start_timestamp! + 10 + 30 + 1);
-
-    transaction.end(spanToJSON(transaction).start_timestamp! + 50);
-
-    expect(transaction.spanRecorder).toBeDefined();
-    expect(transaction.spanRecorder!.spans).toHaveLength(1);
-  });
-
-  it('should record dropped transactions', async () => {
-    const transaction = new IdleTransaction(
-      { name: 'foo', startTimestamp: 1234, sampled: false },
-      getCurrentHub(),
-      1000,
-    );
-
-    const client = getClient()!;
-
-    const recordDroppedEventSpy = jest.spyOn(client, 'recordDroppedEvent');
-
-    transaction.initSpanRecorder(10);
-    transaction.end(spanToJSON(transaction).start_timestamp! + 10);
-
-    expect(recordDroppedEventSpy).toHaveBeenCalledWith('sample_rate', 'transaction');
-  });
-
-  describe('_idleTimeout', () => {
-    it('finishes if no activities are added to the transaction', () => {
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub());
-      transaction.initSpanRecorder(10);
-
-      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-
-    it('does not finish if a activity is started', () => {
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub());
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      startInactiveSpan({ name: 'span' });
-
-      jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
-      expect(spanToJSON(transaction).timestamp).toBeUndefined();
-    });
-
-    it('does not finish when idleTimeout is not exceed after last activity finished', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      startSpan({ name: 'span1' }, () => {});
-
-      jest.advanceTimersByTime(2);
-
-      startSpan({ name: 'span2' }, () => {});
-
-      jest.advanceTimersByTime(8);
-
-      expect(spanToJSON(transaction).timestamp).toBeUndefined();
-    });
-
-    it('finish when idleTimeout is exceeded after last activity finished', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      startSpan({ name: 'span1' }, () => {});
-
-      jest.advanceTimersByTime(2);
-
-      startSpan({ name: 'span2' }, () => {});
-
-      jest.advanceTimersByTime(10);
-
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-  });
-
-  describe('cancelIdleTimeout', () => {
-    it('permanent idle timeout cancel is not restarted by child span start', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      const firstSpan = startInactiveSpan({ name: 'span1' })!;
-      transaction.cancelIdleTimeout(undefined, { restartOnChildSpanChange: false });
-      const secondSpan = startInactiveSpan({ name: 'span2' })!;
-      firstSpan.end();
-      secondSpan.end();
-
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-
-    it('permanent idle timeout cancel finished the transaction with the last child', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      const firstSpan = startInactiveSpan({ name: 'span1' })!;
-      transaction.cancelIdleTimeout(undefined, { restartOnChildSpanChange: false });
-      const secondSpan = startInactiveSpan({ name: 'span2' })!;
-      const thirdSpan = startInactiveSpan({ name: 'span3' })!;
-
-      firstSpan.end();
-      expect(spanToJSON(transaction).timestamp).toBeUndefined();
-
-      secondSpan.end();
-      expect(spanToJSON(transaction).timestamp).toBeUndefined();
-
-      thirdSpan.end();
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-
-    it('permanent idle timeout cancel finishes transaction if there are no activities', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      startSpan({ name: 'span' }, () => {});
-
-      jest.advanceTimersByTime(2);
-
-      transaction.cancelIdleTimeout(undefined, { restartOnChildSpanChange: false });
-
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-
-    it('default idle cancel timeout is restarted by child span change', () => {
-      const idleTimeout = 10;
-      const transaction = new IdleTransaction({ name: 'foo', startTimestamp: 1234 }, getCurrentHub(), idleTimeout);
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      startSpan({ name: 'span' }, () => {});
-
-      jest.advanceTimersByTime(2);
-
-      transaction.cancelIdleTimeout();
-
-      startSpan({ name: 'span' }, () => {});
-
-      jest.advanceTimersByTime(8);
-      expect(spanToJSON(transaction).timestamp).toBeUndefined();
-
-      jest.advanceTimersByTime(2);
-      expect(spanToJSON(transaction).timestamp).toBeDefined();
-    });
-  });
-
-  describe('heartbeat', () => {
-    it('does not mark transaction as `DeadlineExceeded` if idle timeout has not been reached', () => {
-      // 20s to exceed 3 heartbeats
-      const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub(), 20000);
-      const mockFinish = jest.spyOn(transaction, 'end');
-
-      expect(spanToJSON(transaction).status).not.toEqual('deadline_exceeded');
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(spanToJSON(transaction).status).not.toEqual('deadline_exceeded');
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 2
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(spanToJSON(transaction).status).not.toEqual('deadline_exceeded');
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 3
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(spanToJSON(transaction).status).not.toEqual('deadline_exceeded');
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-    });
-
-    it('finishes a transaction after 3 beats', () => {
-      const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub(), TRACING_DEFAULTS.idleTimeout);
-      const mockFinish = jest.spyOn(transaction, 'end');
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-      startInactiveSpan({ name: 'span' });
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 2
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 3
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(1);
-    });
-
-    it('resets after new activities are added', () => {
-      const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub(), TRACING_DEFAULTS.idleTimeout, 50000);
-      const mockFinish = jest.spyOn(transaction, 'end');
-      transaction.initSpanRecorder(10);
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentScope().setSpan(transaction);
-
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-      startInactiveSpan({ name: 'span' });
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      const span = startInactiveSpan({ name: 'span' })!; // push activity
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 2
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      startInactiveSpan({ name: 'span' }); // push activity
-      startInactiveSpan({ name: 'span' }); // push activity
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 2
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      span.end(); // pop activity
-
-      // Beat 1
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 2
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(0);
-
-      // Beat 3
-      jest.advanceTimersByTime(TRACING_DEFAULTS.heartbeatInterval);
-      expect(mockFinish).toHaveBeenCalledTimes(1);
-
-      // Heartbeat does not keep going after finish has been called
-      jest.runAllTimers();
-      expect(mockFinish).toHaveBeenCalledTimes(1);
-    });
-  });
-});
-
-describe('IdleTransactionSpanRecorder', () => {
-  it('pushes and pops activities', () => {
-    const mockPushActivity = jest.fn();
-    const mockPopActivity = jest.fn();
-    const spanRecorder = new IdleTransactionSpanRecorder(mockPushActivity, mockPopActivity, '', 10);
-    expect(mockPushActivity).toHaveBeenCalledTimes(0);
-    expect(mockPopActivity).toHaveBeenCalledTimes(0);
-
-    const span = new SentrySpan({ sampled: true });
-
-    expect(spanRecorder.spans).toHaveLength(0);
-    spanRecorder.add(span);
-    expect(spanRecorder.spans).toHaveLength(1);
-
-    expect(mockPushActivity).toHaveBeenCalledTimes(1);
-    expect(mockPushActivity).toHaveBeenLastCalledWith(span.spanContext().spanId);
-    expect(mockPopActivity).toHaveBeenCalledTimes(0);
-
-    span.end();
-    expect(mockPushActivity).toHaveBeenCalledTimes(1);
-    expect(mockPopActivity).toHaveBeenCalledTimes(1);
-    expect(mockPushActivity).toHaveBeenLastCalledWith(span.spanContext().spanId);
-  });
-
-  it('does not push activities if a span has a timestamp', () => {
-    const mockPushActivity = jest.fn();
-    const mockPopActivity = jest.fn();
-    const spanRecorder = new IdleTransactionSpanRecorder(mockPushActivity, mockPopActivity, '', 10);
-
-    const span = new SentrySpan({ sampled: true, startTimestamp: 765, endTimestamp: 345 });
-    spanRecorder.add(span);
-
-    expect(mockPushActivity).toHaveBeenCalledTimes(0);
-  });
-
-  it('does not push or pop transaction spans', () => {
-    const mockPushActivity = jest.fn();
-    const mockPopActivity = jest.fn();
-
-    const transaction = new IdleTransaction({ name: 'foo' }, getCurrentHub());
-    const spanRecorder = new IdleTransactionSpanRecorder(
-      mockPushActivity,
-      mockPopActivity,
-      transaction.spanContext().spanId,
-      10,
-    );
-
-    spanRecorder.add(transaction);
-    expect(mockPushActivity).toHaveBeenCalledTimes(0);
-    expect(mockPopActivity).toHaveBeenCalledTimes(0);
-  });
-});
diff --git a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts
new file mode 100644
index 000000000000..d5643c3d3651
--- /dev/null
+++ b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts
@@ -0,0 +1,37 @@
+import type { Span } from '@sentry/types';
+import { SPAN_STATUS_ERROR } from '../../../src/tracing';
+import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan';
+import { TRACE_FLAG_NONE, spanIsSampled, spanToJSON } from '../../../src/utils/spanUtils';
+
+describe('SentryNonRecordingSpan', () => {
+  it('satisfies the Span interface', () => {
+    const span: Span = new SentryNonRecordingSpan();
+
+    expect(span.spanContext()).toEqual({
+      spanId: expect.any(String),
+      traceId: expect.any(String),
+      traceFlags: TRACE_FLAG_NONE,
+    });
+
+    expect(spanIsSampled(span)).toBe(false);
+    expect(span.isRecording()).toBe(false);
+    expect(spanToJSON(span)).toEqual({
+      span_id: expect.any(String),
+      trace_id: expect.any(String),
+    });
+
+    // Ensure all methods work
+    span.end();
+    span.end(123);
+    span.updateName('name');
+    span.setAttribute('key', 'value');
+    span.setAttributes({ key: 'value' });
+    span.setStatus({ code: SPAN_STATUS_ERROR });
+
+    // but nothing is actually set/readable
+    expect(spanToJSON(span)).toEqual({
+      span_id: expect.any(String),
+      trace_id: expect.any(String),
+    });
+  });
+});
diff --git a/packages/core/test/lib/tracing/span.test.ts b/packages/core/test/lib/tracing/sentrySpan.test.ts
similarity index 99%
rename from packages/core/test/lib/tracing/span.test.ts
rename to packages/core/test/lib/tracing/sentrySpan.test.ts
index 9edceb86c33d..e065aeff33aa 100644
--- a/packages/core/test/lib/tracing/span.test.ts
+++ b/packages/core/test/lib/tracing/sentrySpan.test.ts
@@ -1,9 +1,9 @@
 import { timestampInSeconds } from '@sentry/utils';
-import { SentrySpan } from '../../../src';
+import { SentrySpan } from '../../../src/tracing/sentrySpan';
 import { SPAN_STATUS_ERROR } from '../../../src/tracing/spanstatus';
 import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED, spanToJSON, spanToTraceContext } from '../../../src/utils/spanUtils';
 
-describe('span', () => {
+describe('SentrySpan', () => {
   describe('name', () => {
     it('works with name', () => {
       const span = new SentrySpan({ name: 'span name' });
diff --git a/packages/core/test/lib/tracing/spanstatus.test.ts b/packages/core/test/lib/tracing/spanstatus.test.ts
index 3c72406209ca..2ed356b1d73e 100644
--- a/packages/core/test/lib/tracing/spanstatus.test.ts
+++ b/packages/core/test/lib/tracing/spanstatus.test.ts
@@ -18,9 +18,9 @@ describe('setHttpStatus', () => {
   ])('applies the correct span status and http status code to the span (%s - $%s)', (code, status) => {
     const span = new SentrySpan({ name: 'test' });
 
-    setHttpStatus(span!, code);
+    setHttpStatus(span, code);
 
-    const { status: spanStatus, data } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span);
 
     expect(spanStatus).toBe(status);
     expect(data).toMatchObject({ 'http.response.status_code': code });
@@ -29,9 +29,9 @@ describe('setHttpStatus', () => {
   it("doesn't set the status for an unknown http status code", () => {
     const span = new SentrySpan({ name: 'test' });
 
-    setHttpStatus(span!, 600);
+    setHttpStatus(span, 600);
 
-    const { status: spanStatus, data } = spanToJSON(span!);
+    const { status: spanStatus, data } = spanToJSON(span);
 
     expect(spanStatus).toBeUndefined();
     expect(data).toMatchObject({ 'http.response.status_code': 600 });
diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
index 37b72193d2be..b937b20338d1 100644
--- a/packages/core/test/lib/tracing/trace.test.ts
+++ b/packages/core/test/lib/tracing/trace.test.ts
@@ -1,25 +1,29 @@
-import type { Event, Span } from '@sentry/types';
+import type { Event, Span, StartSpanOptions } from '@sentry/types';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  Scope,
   addTracingExtensions,
-  getCurrentHub,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
+  getMainCarrier,
+  setAsyncContextStrategy,
   setCurrentClient,
-  spanIsSampled,
   spanToJSON,
   withScope,
 } from '../../../src';
+import { getAsyncContextStrategy } from '../../../src/hub';
 import {
   SentrySpan,
   continueTrace,
-  getActiveSpan,
   startInactiveSpan,
   startSpan,
   startSpanManual,
+  withActiveSpan,
 } from '../../../src/tracing';
-import { getSpanTree } from '../../../src/tracing/utils';
+import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan';
+import { getActiveSpan, getRootSpan, getSpanDescendants } from '../../../src/utils/spanUtils';
 import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
 
 beforeAll(() => {
@@ -41,7 +45,9 @@ describe('startSpan', () => {
     getIsolationScope().clear();
     getGlobalScope().clear();
 
-    const options = getDefaultTestClientOptions({ tracesSampleRate: 0.0 });
+    setAsyncContextStrategy(undefined);
+
+    const options = getDefaultTestClientOptions({ tracesSampleRate: 1 });
     client = new TestClient(options);
     setCurrentClient(client);
     client.init();
@@ -76,27 +82,10 @@ describe('startSpan', () => {
       }
     });
 
-    it('should return the same value as the callback if transactions are undefined', async () => {
-      // @ts-expect-error we are force overriding the transaction return to be undefined
-      // The `startTransaction` types are actually wrong - it can return undefined
-      // if tracingExtensions are not enabled
-      // eslint-disable-next-line deprecation/deprecation
-      jest.spyOn(getCurrentHub(), 'startTransaction').mockImplementationOnce(() => undefined);
-
-      try {
-        const result = await startSpan({ name: 'GET users/[id]' }, () => {
-          return callback();
-        });
-        expect(result).toEqual(expected);
-      } catch (e) {
-        expect(e).toEqual(expected);
-      }
-    });
-
     it('creates a transaction', async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        _span = span;
       });
       try {
         await startSpan({ name: 'GET users/[id]' }, () => {
@@ -111,43 +100,14 @@ describe('startSpan', () => {
       expect(spanToJSON(_span!).status).toEqual(isError ? 'internal_error' : undefined);
     });
 
-    it('allows traceparent information to be overriden', async () => {
-      let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
-      });
-      try {
-        await startSpan(
-          {
-            name: 'GET users/[id]',
-            parentSampled: true,
-            traceId: '12345678901234567890123456789012',
-            parentSpanId: '1234567890123456',
-          },
-          () => {
-            return callback();
-          },
-        );
-      } catch (e) {
-        //
-      }
-      expect(_span).toBeDefined();
-
-      expect(spanIsSampled(_span!)).toEqual(true);
-      expect(spanToJSON(_span!).trace_id).toEqual('12345678901234567890123456789012');
-      expect(spanToJSON(_span!).parent_span_id).toEqual('1234567890123456');
-    });
-
     it('allows for transaction to be mutated', async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        _span = span;
       });
       try {
         await startSpan({ name: 'GET users/[id]' }, span => {
-          if (span) {
-            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server');
-          }
+          span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server');
           return callback();
         });
       } catch (e) {
@@ -159,11 +119,13 @@ describe('startSpan', () => {
 
     it('creates a span with correct description', async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
       try {
-        await startSpan({ name: 'GET users/[id]', parentSampled: true }, () => {
+        await startSpan({ name: 'GET users/[id]' }, () => {
           return startSpan({ name: 'SELECT * from users' }, () => {
             return callback();
           });
@@ -173,7 +135,7 @@ describe('startSpan', () => {
       }
 
       expect(_span).toBeDefined();
-      const spans = getSpanTree(_span!);
+      const spans = getSpanDescendants(_span!);
 
       expect(spans).toHaveLength(2);
       expect(spanToJSON(spans[1]).description).toEqual('SELECT * from users');
@@ -183,11 +145,13 @@ describe('startSpan', () => {
 
     it('allows for span to be mutated', async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
       try {
-        await startSpan({ name: 'GET users/[id]', parentSampled: true }, () => {
+        await startSpan({ name: 'GET users/[id]' }, () => {
           return startSpan({ name: 'SELECT * from users' }, childSpan => {
             if (childSpan) {
               childSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'db.query');
@@ -200,26 +164,27 @@ describe('startSpan', () => {
       }
 
       expect(_span).toBeDefined();
-      const spans = getSpanTree(_span!);
+      const spans = getSpanDescendants(_span!);
 
       expect(spans).toHaveLength(2);
       expect(spanToJSON(spans[1]).op).toEqual('db.query');
     });
 
-    it.each([
-      { origin: 'auto.http.browser' },
-      { attributes: { 'sentry.origin': 'auto.http.browser' } },
-      // attribute should take precedence over top level origin
-      { origin: 'manual', attributes: { 'sentry.origin': 'auto.http.browser' } },
-    ])('correctly sets the span origin', async () => {
+    it('correctly sets the span origin', async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', transaction => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        _span = span;
       });
       try {
-        await startSpan({ name: 'GET users/[id]', origin: 'auto.http.browser' }, () => {
-          return callback();
-        });
+        await startSpan(
+          {
+            name: 'GET users/[id]',
+            attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser' },
+          },
+          () => {
+            return callback();
+          },
+        );
       } catch (e) {
         //
       }
@@ -229,7 +194,7 @@ describe('startSpan', () => {
       expect(jsonSpan).toEqual({
         data: {
           'sentry.origin': 'auto.http.browser',
-          'sentry.sample_rate': 0,
+          'sentry.sample_rate': 1,
           'sentry.source': 'custom',
         },
         origin: 'auto.http.browser',
@@ -243,21 +208,35 @@ describe('startSpan', () => {
     });
   });
 
+  it('returns a non recording span if tracing is disabled', () => {
+    const options = getDefaultTestClientOptions({});
+    client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    const span = startSpan({ name: 'GET users/[id]' }, span => {
+      return span;
+    });
+
+    expect(span).toBeDefined();
+    expect(span).toBeInstanceOf(SentryNonRecordingSpan);
+  });
+
   it('creates & finishes span', async () => {
-    let _span: SentrySpan | undefined;
-    startSpan({ name: 'GET users/[id]' }, span => {
+    const span = startSpan({ name: 'GET users/[id]' }, span => {
       expect(span).toBeDefined();
-      expect(spanToJSON(span!).timestamp).toBeUndefined();
-      _span = span as SentrySpan;
+      expect(span).toBeInstanceOf(SentrySpan);
+      expect(spanToJSON(span).timestamp).toBeUndefined();
+      return span;
     });
 
-    expect(_span).toBeDefined();
-    expect(spanToJSON(_span!).timestamp).toBeDefined();
+    expect(span).toBeDefined();
+    expect(spanToJSON(span).timestamp).toBeDefined();
   });
 
   it('allows to pass a `startTime`', () => {
     const start = startSpan({ name: 'outer', startTime: [1234, 0] }, span => {
-      return spanToJSON(span!).start_timestamp;
+      return spanToJSON(span).start_timestamp;
     });
 
     expect(start).toEqual(1234);
@@ -287,7 +266,7 @@ describe('startSpan', () => {
       expect(getCurrentScope()).not.toBe(initialScope);
       expect(getCurrentScope()).toBe(manualScope);
       expect(getActiveSpan()).toBe(span);
-      expect(spanToJSON(span!).parent_span_id).toBe('parent-span-id');
+      expect(spanToJSON(span).parent_span_id).toBe('parent-span-id');
     });
 
     expect(getCurrentScope()).toBe(initialScope);
@@ -407,18 +386,19 @@ describe('startSpan', () => {
       });
 
       startSpan({ name: 'span' }, span => {
-        expect(span?.spanContext().traceId).toBe('99999999999999999999999999999999');
+        expect(span.spanContext().traceId).toBe('99999999999999999999999999999999');
       });
     });
   });
 
   describe('onlyIfParent', () => {
-    it('does not create a span if there is no parent', () => {
+    it('starts a non recording span if there is no parent', () => {
       const span = startSpan({ name: 'test span', onlyIfParent: true }, span => {
         return span;
       });
 
-      expect(span).toBeUndefined();
+      expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentryNonRecordingSpan);
     });
 
     it('creates a span if there is a parent', () => {
@@ -431,6 +411,7 @@ describe('startSpan', () => {
       });
 
       expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentrySpan);
     });
   });
 
@@ -444,12 +425,9 @@ describe('startSpan', () => {
     setCurrentClient(client);
     client.init();
 
-    startSpan(
-      { name: 'outer', attributes: { test1: 'aa', test2: 'aa' }, data: { test1: 'bb', test3: 'bb' } },
-      outerSpan => {
-        expect(outerSpan).toBeDefined();
-      },
-    );
+    startSpan({ name: 'outer', attributes: { test1: 'aa', test2: 'aa', test3: 'bb' } }, outerSpan => {
+      expect(outerSpan).toBeDefined();
+    });
 
     expect(tracesSampler).toBeCalledTimes(1);
     expect(tracesSampler).toHaveBeenLastCalledWith({
@@ -482,7 +460,7 @@ describe('startSpan', () => {
       startSpanManual({ name: 'my-span' }, span => {
         withScope(scope2 => {
           scope2.setTag('scope', 2);
-          span?.end();
+          span.end();
         });
       });
     });
@@ -509,22 +487,69 @@ describe('startSpan', () => {
       });
     });
   });
+
+  it('uses implementation from ACS, if it exists', () => {
+    const staticSpan = new SentrySpan({ spanId: 'aha' });
+
+    const carrier = getMainCarrier();
+
+    const customFn = jest.fn((_options: StartSpanOptions, callback: (span: Span) => string) => {
+      callback(staticSpan);
+      return 'aha';
+    }) as typeof startSpan;
+
+    const acs = {
+      ...getAsyncContextStrategy(carrier),
+      startSpan: customFn,
+    };
+    setAsyncContextStrategy(acs);
+
+    const result = startSpan({ name: 'GET users/[id]' }, span => {
+      expect(span).toEqual(staticSpan);
+      return 'oho?';
+    });
+
+    expect(result).toBe('aha');
+  });
 });
 
 describe('startSpanManual', () => {
   beforeEach(() => {
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    setAsyncContextStrategy(undefined);
+
     const options = getDefaultTestClientOptions({ tracesSampleRate: 1 });
     client = new TestClient(options);
     setCurrentClient(client);
     client.init();
   });
 
+  it('returns a non recording span if tracing is disabled', () => {
+    const options = getDefaultTestClientOptions({});
+    client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    const span = startSpanManual({ name: 'GET users/[id]' }, span => {
+      return span;
+    });
+
+    expect(span).toBeDefined();
+    expect(span).toBeInstanceOf(SentryNonRecordingSpan);
+  });
+
   it('creates & finishes span', async () => {
     startSpanManual({ name: 'GET users/[id]' }, (span, finish) => {
       expect(span).toBeDefined();
-      expect(spanToJSON(span!).timestamp).toBeUndefined();
+      expect(span).toBeInstanceOf(SentrySpan);
+      expect(spanToJSON(span).timestamp).toBeUndefined();
       finish();
-      expect(spanToJSON(span!).timestamp).toBeDefined();
+      expect(spanToJSON(span).timestamp).toBeDefined();
     });
   });
 
@@ -557,7 +582,7 @@ describe('startSpanManual', () => {
       expect(getCurrentScope()).not.toBe(initialScope);
       expect(getCurrentScope()).toBe(manualScope);
       expect(getActiveSpan()).toBe(span);
-      expect(spanToJSON(span!).parent_span_id).toBe('parent-span-id');
+      expect(spanToJSON(span).parent_span_id).toBe('parent-span-id');
 
       finish();
 
@@ -589,13 +614,13 @@ describe('startSpanManual', () => {
         startSpanManual({ name: 'inner transaction', forceTransaction: true }, span => {
           startSpanManual({ name: 'inner span 2' }, span => {
             // all good
-            span?.end();
+            span.end();
           });
-          span?.end();
+          span.end();
         });
-        span?.end();
+        span.end();
       });
-      span?.end();
+      span.end();
     });
 
     await client.flush();
@@ -677,8 +702,8 @@ describe('startSpanManual', () => {
 
   it('allows to pass a `startTime`', () => {
     const start = startSpanManual({ name: 'outer', startTime: [1234, 0] }, span => {
-      span?.end();
-      return spanToJSON(span!).start_timestamp;
+      span.end();
+      return spanToJSON(span).start_timestamp;
     });
 
     expect(start).toEqual(1234);
@@ -695,8 +720,8 @@ describe('startSpanManual', () => {
       });
 
       startSpanManual({ name: 'span' }, span => {
-        expect(span?.spanContext().traceId).toBe('99999999999999999999999999999991');
-        span?.end();
+        expect(span.spanContext().traceId).toBe('99999999999999999999999999999991');
+        span.end();
       });
     });
   });
@@ -706,8 +731,8 @@ describe('startSpanManual', () => {
       const span = startSpanManual({ name: 'test span', onlyIfParent: true }, span => {
         return span;
       });
-
-      expect(span).toBeUndefined();
+      expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentryNonRecordingSpan);
     });
 
     it('creates a span if there is a parent', () => {
@@ -720,6 +745,7 @@ describe('startSpanManual', () => {
       });
 
       expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentrySpan);
     });
   });
 
@@ -732,25 +758,70 @@ describe('startSpanManual', () => {
       });
     });
   });
+
+  it('uses implementation from ACS, if it exists', () => {
+    const staticSpan = new SentrySpan({ spanId: 'aha' });
+
+    const carrier = getMainCarrier();
+
+    const customFn = jest.fn((_options: StartSpanOptions, callback: (span: Span) => string) => {
+      callback(staticSpan);
+      return 'aha';
+    }) as unknown as typeof startSpanManual;
+
+    const acs = {
+      ...getAsyncContextStrategy(carrier),
+      startSpanManual: customFn,
+    };
+    setAsyncContextStrategy(acs);
+
+    const result = startSpanManual({ name: 'GET users/[id]' }, span => {
+      expect(span).toEqual(staticSpan);
+      return 'oho?';
+    });
+
+    expect(result).toBe('aha');
+  });
 });
 
 describe('startInactiveSpan', () => {
   beforeEach(() => {
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    setAsyncContextStrategy(undefined);
+
     const options = getDefaultTestClientOptions({ tracesSampleRate: 1 });
     client = new TestClient(options);
     setCurrentClient(client);
     client.init();
   });
 
+  it('returns a non recording span if tracing is disabled', () => {
+    const options = getDefaultTestClientOptions({});
+    client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+
+    const span = startInactiveSpan({ name: 'GET users/[id]' });
+
+    expect(span).toBeDefined();
+    expect(span).toBeInstanceOf(SentryNonRecordingSpan);
+  });
+
   it('creates & finishes span', async () => {
     const span = startInactiveSpan({ name: 'GET users/[id]' });
 
     expect(span).toBeDefined();
-    expect(spanToJSON(span!).timestamp).toBeUndefined();
+    expect(span).toBeInstanceOf(SentrySpan);
+    expect(spanToJSON(span).timestamp).toBeUndefined();
 
-    span?.end();
+    span.end();
 
-    expect(spanToJSON(span!).timestamp).toBeDefined();
+    expect(spanToJSON(span).timestamp).toBeDefined();
   });
 
   it('does not set span on scope', () => {
@@ -759,7 +830,7 @@ describe('startInactiveSpan', () => {
     expect(span).toBeDefined();
     expect(getActiveSpan()).toBeUndefined();
 
-    span?.end();
+    span.end();
 
     expect(getActiveSpan()).toBeUndefined();
   });
@@ -775,10 +846,10 @@ describe('startInactiveSpan', () => {
     const span = startInactiveSpan({ name: 'GET users/[id]', scope: manualScope });
 
     expect(span).toBeDefined();
-    expect(spanToJSON(span!).parent_span_id).toBe('parent-span-id');
+    expect(spanToJSON(span).parent_span_id).toBe('parent-span-id');
     expect(getActiveSpan()).toBeUndefined();
 
-    span?.end();
+    span.end();
 
     expect(getActiveSpan()).toBeUndefined();
   });
@@ -884,7 +955,7 @@ describe('startInactiveSpan', () => {
 
   it('allows to pass a `startTime`', () => {
     const span = startInactiveSpan({ name: 'outer', startTime: [1234, 0] });
-    expect(spanToJSON(span!).start_timestamp).toEqual(1234);
+    expect(spanToJSON(span).start_timestamp).toEqual(1234);
   });
 
   it("picks up the trace id off the parent scope's propagation context", () => {
@@ -898,8 +969,8 @@ describe('startInactiveSpan', () => {
       });
 
       const span = startInactiveSpan({ name: 'span' });
-      expect(span?.spanContext().traceId).toBe('99999999999999999999999999999991');
-      span?.end();
+      expect(span.spanContext().traceId).toBe('99999999999999999999999999999991');
+      span.end();
     });
   });
 
@@ -907,17 +978,18 @@ describe('startInactiveSpan', () => {
     it('does not create a span if there is no parent', () => {
       const span = startInactiveSpan({ name: 'test span', onlyIfParent: true });
 
-      expect(span).toBeUndefined();
+      expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentryNonRecordingSpan);
     });
 
     it('creates a span if there is a parent', () => {
       const span = startSpan({ name: 'parent span' }, () => {
         const span = startInactiveSpan({ name: 'test span', onlyIfParent: true });
-
         return span;
       });
 
       expect(span).toBeDefined();
+      expect(span).toBeInstanceOf(SentrySpan);
     });
   });
 
@@ -934,7 +1006,7 @@ describe('startInactiveSpan', () => {
     setCurrentClient(client);
     client.init();
 
-    let span: Span | undefined;
+    let span: Span;
 
     const scope = getCurrentScope();
     scope.setTag('outer', 'foo');
@@ -947,7 +1019,7 @@ describe('startInactiveSpan', () => {
 
     withScope(scope => {
       scope.setTag('scope', 2);
-      span?.end();
+      span.end();
     });
 
     await client.flush();
@@ -973,30 +1045,48 @@ describe('startInactiveSpan', () => {
       expect(childSpans).toContain(innerSpan);
     });
   });
+
+  it('uses implementation from ACS, if it exists', () => {
+    const staticSpan = new SentrySpan({ spanId: 'aha' });
+
+    const carrier = getMainCarrier();
+
+    const customFn = jest.fn((_options: StartSpanOptions) => {
+      return staticSpan;
+    }) as unknown as typeof startInactiveSpan;
+
+    const acs = {
+      ...getAsyncContextStrategy(carrier),
+      startInactiveSpan: customFn,
+    };
+    setAsyncContextStrategy(acs);
+
+    const result = startInactiveSpan({ name: 'GET users/[id]' });
+    expect(result).toBe(staticSpan);
+  });
 });
 
 describe('continueTrace', () => {
   beforeEach(() => {
-    const options = getDefaultTestClientOptions({ tracesSampleRate: 0.0 });
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    setAsyncContextStrategy(undefined);
+
+    const options = getDefaultTestClientOptions({ tracesSampleRate: 1.0 });
     client = new TestClient(options);
     setCurrentClient(client);
     client.init();
   });
 
   it('works without trace & baggage data', () => {
-    const expectedContext = {
-      metadata: {},
-    };
-
-    const result = continueTrace({ sentryTrace: undefined, baggage: undefined }, ctx => {
-      expect(ctx).toEqual(expectedContext);
-      return ctx;
+    const scope = continueTrace({ sentryTrace: undefined, baggage: undefined }, () => {
+      return getCurrentScope();
     });
 
-    expect(result).toEqual(expectedContext);
-
-    const scope = getCurrentScope();
-
     expect(scope.getPropagationContext()).toEqual({
       sampled: undefined,
       spanId: expect.any(String),
@@ -1007,30 +1097,16 @@ describe('continueTrace', () => {
   });
 
   it('works with trace data', () => {
-    const expectedContext = {
-      metadata: {
-        dynamicSamplingContext: {},
-      },
-      parentSampled: false,
-      parentSpanId: '1121201211212012',
-      traceId: '12312012123120121231201212312012',
-    };
-
-    const result = continueTrace(
+    const scope = continueTrace(
       {
         sentryTrace: '12312012123120121231201212312012-1121201211212012-0',
         baggage: undefined,
       },
-      ctx => {
-        expect(ctx).toEqual(expectedContext);
-        return ctx;
+      () => {
+        return getCurrentScope();
       },
     );
 
-    expect(result).toEqual(expectedContext);
-
-    const scope = getCurrentScope();
-
     expect(scope.getPropagationContext()).toEqual({
       dsc: {}, // DSC should be an empty object (frozen), because there was an incoming trace
       sampled: false,
@@ -1043,33 +1119,16 @@ describe('continueTrace', () => {
   });
 
   it('works with trace & baggage data', () => {
-    const expectedContext = {
-      metadata: {
-        dynamicSamplingContext: {
-          environment: 'production',
-          version: '1.0',
-        },
-      },
-      parentSampled: true,
-      parentSpanId: '1121201211212012',
-      traceId: '12312012123120121231201212312012',
-    };
-
-    const result = continueTrace(
+    const scope = continueTrace(
       {
         sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
         baggage: 'sentry-version=1.0,sentry-environment=production',
       },
-      ctx => {
-        expect(ctx).toEqual(expectedContext);
-        return ctx;
+      () => {
+        return getCurrentScope();
       },
     );
 
-    expect(result).toEqual(expectedContext);
-
-    const scope = getCurrentScope();
-
     expect(scope.getPropagationContext()).toEqual({
       dsc: {
         environment: 'production',
@@ -1085,33 +1144,16 @@ describe('continueTrace', () => {
   });
 
   it('works with trace & 3rd party baggage data', () => {
-    const expectedContext = {
-      metadata: {
-        dynamicSamplingContext: {
-          environment: 'production',
-          version: '1.0',
-        },
-      },
-      parentSampled: true,
-      parentSpanId: '1121201211212012',
-      traceId: '12312012123120121231201212312012',
-    };
-
-    const result = continueTrace(
+    const scope = continueTrace(
       {
         sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
         baggage: 'sentry-version=1.0,sentry-environment=production,dogs=great,cats=boring',
       },
-      ctx => {
-        expect(ctx).toEqual(expectedContext);
-        return ctx;
+      () => {
+        return getCurrentScope();
       },
     );
 
-    expect(result).toEqual(expectedContext);
-
-    const scope = getCurrentScope();
-
     expect(scope.getPropagationContext()).toEqual({
       dsc: {
         environment: 'production',
@@ -1127,44 +1169,192 @@ describe('continueTrace', () => {
   });
 
   it('returns response of callback', () => {
-    const expectedContext = {
-      metadata: {
-        dynamicSamplingContext: {},
-      },
-      parentSampled: false,
-      parentSpanId: '1121201211212012',
-      traceId: '12312012123120121231201212312012',
-    };
-
     const result = continueTrace(
       {
         sentryTrace: '12312012123120121231201212312012-1121201211212012-0',
         baggage: undefined,
       },
-      ctx => {
-        return { ctx };
+      () => {
+        return 'aha';
       },
     );
 
-    expect(result).toEqual({ ctx: expectedContext });
+    expect(result).toEqual('aha');
   });
+});
 
-  it('works without a callback', () => {
-    const expectedContext = {
-      metadata: {
-        dynamicSamplingContext: {},
-      },
-      parentSampled: false,
-      parentSpanId: '1121201211212012',
-      traceId: '12312012123120121231201212312012',
-    };
+describe('getActiveSpan', () => {
+  beforeEach(() => {
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    setAsyncContextStrategy(undefined);
 
+    const options = getDefaultTestClientOptions({ tracesSampleRate: 0.0 });
+    client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+  });
+
+  it('works without an active span on the scope', () => {
+    const span = getActiveSpan();
+    expect(span).toBeUndefined();
+  });
+
+  it('works with an active span on the scope', () => {
+    const activeSpan = new SentrySpan({ spanId: 'aha' });
     // eslint-disable-next-line deprecation/deprecation
-    const ctx = continueTrace({
-      sentryTrace: '12312012123120121231201212312012-1121201211212012-0',
-      baggage: undefined,
+    getCurrentScope().setSpan(activeSpan);
+
+    const span = getActiveSpan();
+    expect(span).toBe(activeSpan);
+  });
+
+  it('uses implementation from ACS, if it exists', () => {
+    const staticSpan = new SentrySpan({ spanId: 'aha' });
+
+    const carrier = getMainCarrier();
+
+    const customFn = jest.fn(() => {
+      return staticSpan;
+    }) as typeof getActiveSpan;
+
+    const acs = {
+      ...getAsyncContextStrategy(carrier),
+      getActiveSpan: customFn,
+    };
+    setAsyncContextStrategy(acs);
+
+    const result = getActiveSpan();
+    expect(result).toBe(staticSpan);
+  });
+});
+
+describe('withActiveSpan()', () => {
+  beforeAll(() => {
+    addTracingExtensions();
+  });
+
+  beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    setAsyncContextStrategy(undefined);
+
+    const options = getDefaultTestClientOptions({ enableTracing: true });
+    const client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+  });
+
+  it('should set the active span within the callback', () => {
+    expect.assertions(2);
+    const inactiveSpan = startInactiveSpan({ name: 'inactive-span' });
+
+    expect(getActiveSpan()).not.toBe(inactiveSpan);
+
+    withActiveSpan(inactiveSpan, () => {
+      expect(getActiveSpan()).toBe(inactiveSpan);
     });
+  });
+
+  it('should create child spans when calling startSpan within the callback', () => {
+    const inactiveSpan = startInactiveSpan({ name: 'inactive-span' });
+
+    const parentSpanId = withActiveSpan(inactiveSpan, () => {
+      return startSpan({ name: 'child-span' }, childSpan => {
+        return spanToJSON(childSpan).parent_span_id;
+      });
+    });
+
+    expect(parentSpanId).toBe(inactiveSpan.spanContext().spanId);
+  });
+
+  it('when `null` is passed, no span should be active within the callback', () => {
+    expect.assertions(1);
+    startSpan({ name: 'parent-span' }, () => {
+      withActiveSpan(null, () => {
+        expect(getActiveSpan()).toBeUndefined();
+      });
+    });
+  });
+
+  it('uses implementation from ACS, if it exists', () => {
+    const staticSpan = new SentrySpan({ spanId: 'aha' });
+    const staticScope = new Scope();
+
+    const carrier = getMainCarrier();
+
+    const customFn = jest.fn((_span: Span | null, callback: (scope: Scope) => string) => {
+      callback(staticScope);
+      return 'aha';
+    }) as typeof withActiveSpan;
+
+    const acs = {
+      ...getAsyncContextStrategy(carrier),
+      withActiveSpan: customFn,
+    };
+    setAsyncContextStrategy(acs);
+
+    const result = withActiveSpan(staticSpan, scope => {
+      expect(scope).toBe(staticScope);
+      return 'oho';
+    });
+    expect(result).toBe('aha');
+  });
+});
+
+describe('span hooks', () => {
+  beforeEach(() => {
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+    getGlobalScope().clear();
+
+    const options = getDefaultTestClientOptions({ tracesSampleRate: 1.0 });
+    client = new TestClient(options);
+    setCurrentClient(client);
+    client.init();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('correctly emits span hooks', () => {
+    const startedSpans: string[] = [];
+    const endedSpans: string[] = [];
+
+    client.on('spanStart', span => {
+      startedSpans.push(spanToJSON(span).description || '');
+    });
+
+    client.on('spanEnd', span => {
+      endedSpans.push(spanToJSON(span).description || '');
+    });
+
+    startSpan({ name: 'span1' }, () => {
+      startSpan({ name: 'span2' }, () => {
+        const span = startInactiveSpan({ name: 'span3' });
+
+        startSpanManual({ name: 'span5' }, span => {
+          startInactiveSpan({ name: 'span4' });
+          span?.end();
+        });
+
+        span?.end();
+      });
+    });
+
+    expect(startedSpans).toHaveLength(5);
+    expect(endedSpans).toHaveLength(4);
 
-    expect(ctx).toEqual(expectedContext);
+    expect(startedSpans).toEqual(['span1', 'span2', 'span3', 'span5', 'span4']);
+    expect(endedSpans).toEqual(['span5', 'span3', 'span2', 'span1']);
   });
 });
diff --git a/packages/core/test/lib/transports/base.test.ts b/packages/core/test/lib/transports/base.test.ts
index 1425c55c45a7..a8198ce38b3d 100644
--- a/packages/core/test/lib/transports/base.test.ts
+++ b/packages/core/test/lib/transports/base.test.ts
@@ -22,7 +22,7 @@ const ATTACHMENT_ENVELOPE = createEnvelope<EventEnvelope>(
         length: 20,
         filename: 'test-file.txt',
         content_type: 'text/plain',
-        attachment_type: 'text',
+        attachment_type: 'event.attachment',
       },
       'attachment content',
     ] as AttachmentItem,
diff --git a/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts b/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts
index 7543d9ed39e3..e6370931f4cf 100644
--- a/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts
+++ b/packages/core/test/lib/utils/applyScopeDataToEvent.test.ts
@@ -1,5 +1,11 @@
-import type { Attachment, Breadcrumb, EventProcessor, ScopeData } from '@sentry/types';
-import { mergeAndOverwriteScopeData, mergeArray, mergeScopeData } from '../../../src/utils/applyScopeDataToEvent';
+import type { Attachment, Breadcrumb, Event, EventProcessor, EventType, ScopeData } from '@sentry/types';
+import { startInactiveSpan } from '../../../src';
+import {
+  applyScopeDataToEvent,
+  mergeAndOverwriteScopeData,
+  mergeArray,
+  mergeScopeData,
+} from '../../../src/utils/applyScopeDataToEvent';
 
 describe('mergeArray', () => {
   it.each([
@@ -158,3 +164,103 @@ describe('mergeScopeData', () => {
     });
   });
 });
+
+describe('applyScopeDataToEvent', () => {
+  it("doesn't apply scope.transactionName to transaction events", () => {
+    const data: ScopeData = {
+      eventProcessors: [],
+      breadcrumbs: [],
+      user: {},
+      tags: {},
+      extra: {},
+      contexts: {},
+      attachments: [],
+      propagationContext: { spanId: '1', traceId: '1' },
+      sdkProcessingMetadata: {},
+      fingerprint: [],
+      transactionName: 'foo',
+    };
+    const event: Event = { type: 'transaction', transaction: '/users/:id' };
+
+    applyScopeDataToEvent(event, data);
+
+    expect(event.transaction).toBe('/users/:id');
+  });
+
+  it('applies the root span name to transaction events', () => {
+    const data: ScopeData = {
+      eventProcessors: [],
+      breadcrumbs: [],
+      user: {},
+      tags: {},
+      extra: {},
+      contexts: {},
+      attachments: [],
+      propagationContext: { spanId: '1', traceId: '1' },
+      sdkProcessingMetadata: {},
+      fingerprint: [],
+      transactionName: 'foo',
+      span: {
+        attributes: {},
+        startTime: 1,
+        endTime: 2,
+        status: 'ok',
+        name: 'bar',
+        // @ts-expect-error - we don't need to provide all span context fields
+        spanContext: () => ({}),
+      },
+    };
+
+    const event: Event = { type: 'transaction' };
+
+    applyScopeDataToEvent(event, data);
+
+    expect(event.transaction).toBe('bar');
+  });
+
+  it("doesn't apply the root span name to non-transaction events", () => {
+    const data: ScopeData = {
+      eventProcessors: [],
+      breadcrumbs: [],
+      user: {},
+      tags: {},
+      extra: {},
+      contexts: {},
+      attachments: [],
+      propagationContext: { spanId: '1', traceId: '1' },
+      sdkProcessingMetadata: {},
+      fingerprint: [],
+      transactionName: '/users/:id',
+      span: startInactiveSpan({ name: 'foo' }),
+    };
+    const event: Event = { type: undefined };
+
+    applyScopeDataToEvent(event, data);
+
+    expect(event.transaction).toBe('/users/:id');
+  });
+
+  it.each([undefined, 'profile', 'replay_event', 'feedback'])(
+    'applies scope.transactionName to event with type %s',
+    type => {
+      const data: ScopeData = {
+        eventProcessors: [],
+        breadcrumbs: [],
+        user: {},
+        tags: {},
+        extra: {},
+        contexts: {},
+        attachments: [],
+        propagationContext: { spanId: '1', traceId: '1' },
+        sdkProcessingMetadata: {},
+        fingerprint: [],
+        transactionName: 'foo',
+      };
+      const event: Event = { type: type as EventType, transaction: '/users/:id' };
+
+      applyScopeDataToEvent(event, data);
+
+      expect(event.transaction).toBe('foo');
+    },
+  );
+});
diff --git a/packages/core/test/lib/utils/getRootSpan.ts b/packages/core/test/lib/utils/getRootSpan.ts
deleted file mode 100644
index dcb33ac83e8c..000000000000
--- a/packages/core/test/lib/utils/getRootSpan.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { SentrySpan, Transaction, getRootSpan } from '../../../src';
-
-describe('getRootSpan', () => {
-  it('returns the root span of a span (SentrySpan)', () => {
-    const root = new SentrySpan({ name: 'test' });
-    // @ts-expect-error this is highly illegal and shouldn't happen IRL
-    // eslint-disable-next-line deprecation/deprecation
-    root.transaction = root;
-
-    // eslint-disable-next-line deprecation/deprecation
-    const childSpan = root.startChild({ name: 'child' });
-    expect(getRootSpan(childSpan)).toBe(root);
-  });
-
-  it('returns the root span of a span (Transaction)', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const root = new Transaction({ name: 'test' });
-
-    // eslint-disable-next-line deprecation/deprecation
-    const childSpan = root.startChild({ name: 'child' });
-    expect(getRootSpan(childSpan)).toBe(root);
-  });
-
-  it('returns the span itself if it is a root span', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const span = new Transaction({ name: 'test' });
-
-    expect(getRootSpan(span)).toBe(span);
-  });
-
-  it('returns undefined if span has no root span', () => {
-    const span = new SentrySpan({ name: 'test' });
-
-    expect(getRootSpan(span)).toBe(undefined);
-  });
-});
diff --git a/packages/core/test/lib/utils/spanUtils.test.ts b/packages/core/test/lib/utils/spanUtils.test.ts
index 56b07405b02c..b802c7bfb69f 100644
--- a/packages/core/test/lib/utils/spanUtils.test.ts
+++ b/packages/core/test/lib/utils/spanUtils.test.ts
@@ -1,6 +1,22 @@
+import type { Span, SpanAttributes, SpanStatus, SpanTimeInput } from '@sentry/types';
 import { TRACEPARENT_REGEXP, timestampInSeconds } from '@sentry/utils';
-import { SPAN_STATUS_OK, SentrySpan, spanToTraceHeader } from '../../../src';
-import { spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../../../src/utils/spanUtils';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SPAN_STATUS_ERROR,
+  SPAN_STATUS_OK,
+  SPAN_STATUS_UNSET,
+  SentrySpan,
+  Transaction,
+  addTracingExtensions,
+  setCurrentClient,
+  spanToTraceHeader,
+  startInactiveSpan,
+  startSpan,
+} from '../../../src';
+import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
+import { getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../../../src/utils/spanUtils';
+import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
 
 describe('spanToTraceHeader', () => {
   test('simple', () => {
@@ -48,74 +64,148 @@ describe('spanTimeInputToSeconds', () => {
 });
 
 describe('spanToJSON', () => {
-  it('works with a simple span', () => {
-    const span = new SentrySpan();
-    expect(spanToJSON(span)).toEqual({
-      span_id: span.spanContext().spanId,
-      trace_id: span.spanContext().traceId,
-      origin: 'manual',
-      start_timestamp: span['_startTime'],
-      data: {
-        'sentry.origin': 'manual',
-      },
+  describe('SentrySpan', () => {
+    it('works with a simple span', () => {
+      const span = new SentrySpan();
+      expect(spanToJSON(span)).toEqual({
+        span_id: span.spanContext().spanId,
+        trace_id: span.spanContext().traceId,
+        origin: 'manual',
+        start_timestamp: span['_startTime'],
+        data: {
+          'sentry.origin': 'manual',
+        },
+      });
     });
-  });
 
-  it('works with a full span', () => {
-    const span = new SentrySpan({
-      name: 'test name',
-      op: 'test op',
-      parentSpanId: '1234',
-      spanId: '5678',
-      traceId: 'abcd',
-      origin: 'auto',
-      startTimestamp: 123,
-      endTimestamp: 456,
-    });
-    span.setStatus({ code: SPAN_STATUS_OK });
-
-    expect(spanToJSON(span)).toEqual({
-      description: 'test name',
-      op: 'test op',
-      parent_span_id: '1234',
-      span_id: '5678',
-      status: 'ok',
-      trace_id: 'abcd',
-      origin: 'auto',
-      start_timestamp: 123,
-      timestamp: 456,
-      data: {
-        'sentry.op': 'test op',
-        'sentry.origin': 'auto',
-      },
+    it('works with a full span', () => {
+      const span = new SentrySpan({
+        name: 'test name',
+        op: 'test op',
+        parentSpanId: '1234',
+        spanId: '5678',
+        traceId: 'abcd',
+        startTimestamp: 123,
+        endTimestamp: 456,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto',
+        },
+      });
+      span.setStatus({ code: SPAN_STATUS_OK });
+
+      expect(spanToJSON(span)).toEqual({
+        description: 'test name',
+        op: 'test op',
+        parent_span_id: '1234',
+        span_id: '5678',
+        status: 'ok',
+        trace_id: 'abcd',
+        origin: 'auto',
+        start_timestamp: 123,
+        timestamp: 456,
+        data: {
+          'sentry.op': 'test op',
+          'sentry.origin': 'auto',
+        },
+      });
     });
   });
 
-  it('works with a custom class without spanToJSON', () => {
-    const span = {
-      toJSON: () => {
-        return {
-          span_id: 'span_id',
-          trace_id: 'trace_id',
-          origin: 'manual',
-          start_timestamp: 123,
-        };
-      },
-    } as unknown as SentrySpan;
-
-    expect(spanToJSON(span)).toEqual({
-      span_id: 'span_id',
-      trace_id: 'trace_id',
-      origin: 'manual',
-      start_timestamp: 123,
+  describe('OpenTelemetry Span', () => {
+    function createMockedOtelSpan({
+      spanId,
+      traceId,
+      attributes,
+      startTime,
+      name,
+      status,
+      endTime,
+      parentSpanId,
+    }: {
+      spanId: string;
+      traceId: string;
+      attributes: SpanAttributes;
+      startTime: SpanTimeInput;
+      name: string;
+      status: SpanStatus;
+      endTime: SpanTimeInput;
+      parentSpanId?: string;
+    }): Span {
+      return {
+        spanContext: () => {
+          return {
+            spanId,
+            traceId,
+          };
+        },
+        attributes,
+        startTime,
+        name,
+        status,
+        endTime,
+        parentSpanId,
+      } as OpenTelemetrySdkTraceBaseSpan;
+    }
+
+    it('works with a simple span', () => {
+      const span = createMockedOtelSpan({
+        spanId: 'SPAN-1',
+        traceId: 'TRACE-1',
+        name: 'test span',
+        startTime: 123,
+        endTime: [0, 0],
+        attributes: {},
+        status: { code: SPAN_STATUS_UNSET },
+      });
+
+      expect(spanToJSON(span)).toEqual({
+        span_id: 'SPAN-1',
+        trace_id: 'TRACE-1',
+        start_timestamp: 123,
+        description: 'test span',
+        data: {},
+      });
+    });
+
+    it('works with a full span', () => {
+      const span = createMockedOtelSpan({
+        spanId: 'SPAN-1',
+        traceId: 'TRACE-1',
+        name: 'test span',
+        startTime: 123,
+        endTime: 456,
+        attributes: {
+          attr1: 'value1',
+          attr2: 2,
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'test op',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto',
+        },
+        status: { code: SPAN_STATUS_ERROR, message: 'unknown_error' },
+      });
+
+      expect(spanToJSON(span)).toEqual({
+        span_id: 'SPAN-1',
+        trace_id: 'TRACE-1',
+        start_timestamp: 123,
+        timestamp: 456,
+        description: 'test span',
+        op: 'test op',
+        origin: 'auto',
+        data: {
+          attr1: 'value1',
+          attr2: 2,
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'test op',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto',
+        },
+        status: 'unknown_error',
+      });
     });
   });
 
-  it('returns empty object if span does not have getter methods', () => {
-    // eslint-disable-next-line
-    const span = new SentrySpan().toJSON();
+  it('returns empty object for unknown span implementation', () => {
+    const span = { other: 'other' };
 
-    expect(spanToJSON(span as unknown as SentrySpan)).toEqual({});
+    expect(spanToJSON(span as unknown as Span)).toEqual({});
   });
 });
 
@@ -130,3 +220,42 @@ describe('spanIsSampled', () => {
     expect(spanIsSampled(span)).toBe(false);
   });
 });
+
+describe('getRootSpan', () => {
+  beforeEach(() => {
+    const client = new TestClient(getDefaultTestClientOptions({ tracesSampleRate: 1 }));
+    setCurrentClient(client);
+    addTracingExtensions();
+  });
+
+  it('returns the root span of a span that is a root span', () => {
+    const root = new SentrySpan({ name: 'test' });
+
+    expect(getRootSpan(root)).toBe(root);
+  });
+
+  it('returns the root span of a child span xxx', () => {
+    startSpan({ name: 'outer' }, root => {
+      startSpan({ name: 'inner' }, inner => {
+        expect(getRootSpan(inner)).toBe(root);
+        startSpan({ name: 'inner2' }, inner2 => {
+          expect(getRootSpan(inner2)).toBe(root);
+
+          const inactiveSpan = startInactiveSpan({ name: 'inactived' });
+          expect(getRootSpan(inactiveSpan)).toBe(root);
+        });
+      });
+    });
+  });
+
+  it('returns the root span of a legacy transaction & its children', () => {
+    // eslint-disable-next-line deprecation/deprecation
+    const root = new Transaction({ name: 'test' });
+
+    expect(getRootSpan(root)).toBe(root);
+
+    // eslint-disable-next-line deprecation/deprecation
+    const childSpan = root.startChild({ name: 'child' });
+    expect(getRootSpan(childSpan)).toBe(root);
+  });
+});
diff --git a/packages/deno/.eslintrc.js b/packages/deno/.eslintrc.js
index 0dabc2227a0d..0c539a61b1b2 100644
--- a/packages/deno/.eslintrc.js
+++ b/packages/deno/.eslintrc.js
@@ -4,7 +4,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/deno/README.md b/packages/deno/README.md
index 67ac88fedc6e..502778cf8abb 100644
--- a/packages/deno/README.md
+++ b/packages/deno/README.md
@@ -16,16 +16,17 @@
 - [Official SDK Docs](https://docs.sentry.io/quickstart/)
 - [TypeDoc](http://getsentry.github.io/sentry-javascript/)
 
-The Sentry Deno SDK is in beta. Please help us improve the SDK by [reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
+The Sentry Deno SDK is in beta. Please help us improve the SDK by
+[reporting any issues or giving us feedback](https://github.com/getsentry/sentry-javascript/issues).
 
 ## Usage
 
-To use this SDK, call `Sentry.init(options)` as early as possible in the main entry module. This will initialize the SDK and
-hook into the environment. Note that you can turn off almost all side effects using the respective options.
+To use this SDK, call `Sentry.init(options)` as early as possible in the main entry module. This will initialize the SDK
+and hook into the environment. Note that you can turn off almost all side effects using the respective options.
 
 ```javascript
 // Import from the Deno registry
-import * as Sentry from "https://deno.land/x/sentry/index.mjs";
+import * as Sentry from 'https://deno.land/x/sentry/index.mjs';
 
 // or import from npm registry
 import * as Sentry from 'npm:@sentry/deno';
@@ -36,8 +37,8 @@ Sentry.init({
 });
 ```
 
-To set context information or send manual events, use the exported functions of the Deno SDK. Note that these
-functions will not perform any action before you have called `init()`:
+To set context information or send manual events, use the exported functions of the Deno SDK. Note that these functions
+will not perform any action before you have called `init()`:
 
 ```javascript
 // Set user information, as well as tags and further extras
@@ -61,6 +62,3 @@ Sentry.captureEvent({
   ],
 });
 ```
-
-
-
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 6eebb79744ef..2fe693cc15cf 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -8,6 +8,15 @@
   "license": "MIT",
   "module": "build/index.mjs",
   "types": "build/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/index.d.ts",
+        "default": "./build/index.mjs"
+      }
+    }
+  },
   "publishConfig": {
     "access": "public"
   },
@@ -30,7 +39,7 @@
     "deno-types": "node ./scripts/download-deno-types.mjs",
     "build": "run-s build:transpile build:types",
     "build:dev": "yarn build",
-    "build:transpile": "yarn deno-types && rollup -c rollup.config.js",
+    "build:transpile": "yarn deno-types && rollup -c rollup.config.mjs",
     "build:types": "run-s deno-types build:types:tsc build:types:bundle",
     "build:types:tsc": "tsc -p tsconfig.types.json",
     "build:types:bundle": "rollup -c rollup.types.config.mjs",
diff --git a/packages/deno/rollup.config.js b/packages/deno/rollup.config.mjs
similarity index 100%
rename from packages/deno/rollup.config.js
rename to packages/deno/rollup.config.mjs
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
index cc5f1afb4d8d..7f64e0e72132 100644
--- a/packages/deno/src/index.ts
+++ b/packages/deno/src/index.ts
@@ -21,8 +21,6 @@ export type { AddRequestDataToEventOptions } from '@sentry/utils';
 export type { DenoOptions } from './types';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   captureException,
@@ -32,22 +30,14 @@ export {
   createTransport,
   continueTrace,
   flush,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
   Hub,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -63,6 +53,7 @@ export {
   withMonitor,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
@@ -99,10 +90,3 @@ export { normalizePathsIntegration } from './integrations/normalizepaths';
 export { contextLinesIntegration } from './integrations/contextlines';
 export { denoCronIntegration } from './integrations/deno-cron';
 export { breadcrumbsIntegration } from './integrations/breadcrumbs';
-
-import * as DenoIntegrations from './integrations';
-
-/** @deprecated Import the integration function directly, e.g. `inboundFiltersIntegration()` instead of `new Integrations.InboundFilter(). */
-export const Integrations = {
-  ...DenoIntegrations,
-};
diff --git a/packages/deno/src/integrations/breadcrumbs.ts b/packages/deno/src/integrations/breadcrumbs.ts
index 886d941d843f..58c75624b90d 100644
--- a/packages/deno/src/integrations/breadcrumbs.ts
+++ b/packages/deno/src/integrations/breadcrumbs.ts
@@ -17,6 +17,10 @@ interface BreadcrumbsOptions {
 
 const INTEGRATION_NAME = 'Breadcrumbs';
 
+/**
+ * Note: This `breadcrumbsIntegration` is almost the same as the one from @sentry/browser.
+ * The Deno-version does not support browser-specific APIs like dom, xhr and history.
+ */
 const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) => {
   const _options = {
     console: true,
@@ -42,8 +46,17 @@ const _breadcrumbsIntegration = ((options: Partial<BreadcrumbsOptions> = {}) =>
 }) satisfies IntegrationFn;
 
 /**
- * This breadcrumbsIntegration is almost the same as the one from @sentry/browser.
- * The Deno-version does not support browser-specific APIs like dom, xhr and history.
+ * Adds a breadcrumbs for console, fetch, and sentry events.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.breadcrumbsIntegration(),
+ *   ],
+ * })
+ * ```
  */
 export const breadcrumbsIntegration = defineIntegration(_breadcrumbsIntegration);
 
diff --git a/packages/deno/src/integrations/context.ts b/packages/deno/src/integrations/context.ts
index ca0735c4e0ab..69ef164bb32d 100644
--- a/packages/deno/src/integrations/context.ts
+++ b/packages/deno/src/integrations/context.ts
@@ -1,5 +1,5 @@
-import { convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
-import type { Event, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import { defineIntegration } from '@sentry/core';
+import type { Event, IntegrationFn } from '@sentry/types';
 
 const INTEGRATION_NAME = 'DenoContext';
 
@@ -61,16 +61,17 @@ const _denoContextIntegration = (() => {
   };
 }) satisfies IntegrationFn;
 
-export const denoContextIntegration = defineIntegration(_denoContextIntegration);
-
 /**
- * Adds Deno context to events.
- * @deprecated Use `denoContextintegration()` instead.
+ * Adds Deno related context to events. This includes contexts about app, device, os, v8, and TypeScript.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.denoContextIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const DenoContext = convertIntegrationFnToClass(INTEGRATION_NAME, denoContextIntegration) as IntegrationClass<
-  Integration & { processEvent: (event: Event) => Promise<Event> }
->;
-
-// eslint-disable-next-line deprecation/deprecation
-export type DenoContext = typeof DenoContext;
+export const denoContextIntegration = defineIntegration(_denoContextIntegration);
diff --git a/packages/deno/src/integrations/contextlines.ts b/packages/deno/src/integrations/contextlines.ts
index 4b43c6bc34c2..3f3db47fb70a 100644
--- a/packages/deno/src/integrations/contextlines.ts
+++ b/packages/deno/src/integrations/contextlines.ts
@@ -1,5 +1,5 @@
-import { convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
-import type { Event, Integration, IntegrationClass, IntegrationFn, StackFrame } from '@sentry/types';
+import { defineIntegration } from '@sentry/core';
+import type { Event, IntegrationFn, StackFrame } from '@sentry/types';
 import { LRUMap, addContextToFrame } from '@sentry/utils';
 
 const INTEGRATION_NAME = 'ContextLines';
@@ -58,19 +58,20 @@ const _contextLinesIntegration = ((options: ContextLinesOptions = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const contextLinesIntegration = defineIntegration(_contextLinesIntegration);
-
 /**
- * Add node modules / packages to the event.
- * @deprecated Use `contextLinesIntegration()` instead.
+ * Adds source context to event stacktraces.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.contextLinesIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const ContextLines = convertIntegrationFnToClass(INTEGRATION_NAME, contextLinesIntegration) as IntegrationClass<
-  Integration & { processEvent: (event: Event) => Promise<Event> }
->;
-
-// eslint-disable-next-line deprecation/deprecation
-export type ContextLines = typeof ContextLines;
+export const contextLinesIntegration = defineIntegration(_contextLinesIntegration);
 
 /** Processes an event and adds context lines */
 async function addSourceContext(event: Event, contextLines: number): Promise<Event> {
diff --git a/packages/deno/src/integrations/deno-cron.ts b/packages/deno/src/integrations/deno-cron.ts
index 89030629864c..bdf330319c4c 100644
--- a/packages/deno/src/integrations/deno-cron.ts
+++ b/packages/deno/src/integrations/deno-cron.ts
@@ -1,5 +1,5 @@
-import { convertIntegrationFnToClass, defineIntegration, getClient, withMonitor } from '@sentry/core';
-import type { Client, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import { defineIntegration, getClient, withMonitor } from '@sentry/core';
+import type { Client, IntegrationFn } from '@sentry/types';
 import { parseScheduleToString } from './deno-cron-format';
 
 type CronOptions = { backoffSchedule?: number[]; signal?: AbortSignal };
@@ -60,16 +60,17 @@ const _denoCronIntegration = (() => {
   };
 }) satisfies IntegrationFn;
 
-export const denoCronIntegration = defineIntegration(_denoCronIntegration);
-
 /**
  * Instruments Deno.cron to automatically capture cron check-ins.
- * @deprecated Use `denoCronIntegration()` instead.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.denoCronIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const DenoCron = convertIntegrationFnToClass(INTEGRATION_NAME, denoCronIntegration) as IntegrationClass<
-  Integration & { setup: (client: Client) => void }
->;
-
-// eslint-disable-next-line deprecation/deprecation
-export type DenoCron = typeof DenoCron;
+export const denoCronIntegration = defineIntegration(_denoCronIntegration);
diff --git a/packages/deno/src/integrations/globalhandlers.ts b/packages/deno/src/integrations/globalhandlers.ts
index a653d7196246..8d9a2c1ac051 100644
--- a/packages/deno/src/integrations/globalhandlers.ts
+++ b/packages/deno/src/integrations/globalhandlers.ts
@@ -1,18 +1,9 @@
 import type { ServerRuntimeClient } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
-import { convertIntegrationFnToClass } from '@sentry/core';
 import { captureEvent } from '@sentry/core';
 import { getClient } from '@sentry/core';
 import { flush } from '@sentry/core';
-import type {
-  Client,
-  Event,
-  Integration,
-  IntegrationClass,
-  IntegrationFn,
-  Primitive,
-  StackParser,
-} from '@sentry/types';
+import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/types';
 import { eventFromUnknownInput, isPrimitive } from '@sentry/utils';
 
 type GlobalHandlersIntegrationsOptionKeys = 'error' | 'unhandledrejection';
@@ -42,20 +33,20 @@ const _globalHandlersIntegration = ((options?: GlobalHandlersIntegrations) => {
   };
 }) satisfies IntegrationFn;
 
-export const globalHandlersIntegration = defineIntegration(_globalHandlersIntegration);
-
 /**
- * Global handlers.
- * @deprecated Use `globalHandlersIntegration()` instead.
+ * Instruments global `error` and `unhandledrejection` listeners in Deno.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.globalHandlersIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const GlobalHandlers = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  globalHandlersIntegration,
-) as IntegrationClass<Integration & { setup: (client: Client) => void }>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type GlobalHandlers = typeof GlobalHandlers;
+export const globalHandlersIntegration = defineIntegration(_globalHandlersIntegration);
 
 function installGlobalErrorHandler(client: Client): void {
   globalThis.addEventListener('error', data => {
diff --git a/packages/deno/src/integrations/index.ts b/packages/deno/src/integrations/index.ts
deleted file mode 100644
index 6870606066eb..000000000000
--- a/packages/deno/src/integrations/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* eslint-disable deprecation/deprecation */
-export { DenoContext } from './context';
-export { GlobalHandlers } from './globalhandlers';
-export { NormalizePaths } from './normalizepaths';
-export { ContextLines } from './contextlines';
-export { DenoCron } from './deno-cron';
diff --git a/packages/deno/src/integrations/normalizepaths.ts b/packages/deno/src/integrations/normalizepaths.ts
index d5304e9e62dd..1ea564a562ec 100644
--- a/packages/deno/src/integrations/normalizepaths.ts
+++ b/packages/deno/src/integrations/normalizepaths.ts
@@ -1,5 +1,5 @@
-import { convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
-import type { Event, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import { defineIntegration } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/types';
 import { createStackParser, dirname, nodeStackLineParser } from '@sentry/utils';
 
 const INTEGRATION_NAME = 'NormalizePaths';
@@ -96,17 +96,17 @@ const _normalizePathsIntegration = (() => {
   };
 }) satisfies IntegrationFn;
 
-export const normalizePathsIntegration = defineIntegration(_normalizePathsIntegration);
-
 /**
  * Normalises paths to the app root directory.
- * @deprecated Use `normalizePathsIntegration()` instead.
+ *
+ * Enabled by default in the Deno SDK.
+ *
+ * ```js
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.normalizePathsIntegration(),
+ *   ],
+ * })
+ * ```
  */
-// eslint-disable-next-line deprecation/deprecation
-export const NormalizePaths = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  normalizePathsIntegration,
-) as IntegrationClass<Integration & { processEvent: (event: Event) => Event }>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type NormalizePaths = typeof NormalizePaths;
+export const normalizePathsIntegration = defineIntegration(_normalizePathsIntegration);
diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap
index 6cbbe0182902..937eae2893f8 100644
--- a/packages/deno/test/__snapshots__/mod.test.ts.snap
+++ b/packages/deno/test/__snapshots__/mod.test.ts.snap
@@ -12,6 +12,7 @@ snapshot[`captureException 1`] = `
     },
     os: {
       name: "{{platform}}",
+      version: "{{version}}",
     },
     runtime: {
       name: "deno",
@@ -47,7 +48,7 @@ snapshot[`captureException 1`] = `
               filename: "app:///test/mod.test.ts",
               function: "?",
               in_app: true,
-              lineno: 47,
+              lineno: 46,
               post_context: [
                 "",
                 "  await delay(200);",
@@ -73,7 +74,7 @@ snapshot[`captureException 1`] = `
               filename: "app:///test/mod.test.ts",
               function: "something",
               in_app: true,
-              lineno: 44,
+              lineno: 43,
               post_context: [
                 "  }",
                 "",
@@ -86,7 +87,7 @@ snapshot[`captureException 1`] = `
               pre_context: [
                 "Deno.test('captureException', async t => {",
                 "  let ev: sentryTypes.Event | undefined;",
-                "  const [, client] = getTestClient(event => {",
+                "  const client = getTestClient(event => {",
                 "    ev = event;",
                 "  });",
                 "",
@@ -122,12 +123,21 @@ snapshot[`captureException 1`] = `
     ],
     version: "{{version}}",
   },
+  server_name: "{{server}}",
   timestamp: 0,
 }
 `;
 
 snapshot[`captureMessage 1`] = `
 {
+  breadcrumbs: [
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      message: "Error: Some unhandled error",
+      timestamp: 0,
+    },
+  ],
   contexts: {
     app: {
       app_start_time: "{{time}}",
@@ -138,6 +148,7 @@ snapshot[`captureMessage 1`] = `
     },
     os: {
       name: "{{platform}}",
+      version: "{{version}}",
     },
     runtime: {
       name: "deno",
@@ -182,6 +193,168 @@ snapshot[`captureMessage 1`] = `
     ],
     version: "{{version}}",
   },
+  server_name: "{{server}}",
+  timestamp: 0,
+}
+`;
+
+snapshot[`captureMessage twice 1`] = `
+{
+  breadcrumbs: [
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      message: "Error: Some unhandled error",
+      timestamp: 0,
+    },
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      level: "info",
+      message: "Some error message",
+      timestamp: 0,
+    },
+  ],
+  contexts: {
+    app: {
+      app_start_time: "{{time}}",
+    },
+    device: {
+      arch: "{{arch}}",
+      processor_count: 0,
+    },
+    os: {
+      name: "{{platform}}",
+      version: "{{version}}",
+    },
+    runtime: {
+      name: "deno",
+      version: "{{version}}",
+    },
+    trace: {
+      span_id: "{{id}}",
+      trace_id: "{{id}}",
+    },
+    typescript: {
+      name: "TypeScript",
+      version: "{{version}}",
+    },
+    v8: {
+      name: "v8",
+      version: "{{version}}",
+    },
+  },
+  environment: "production",
+  event_id: "{{id}}",
+  level: "info",
+  message: "Some error message",
+  platform: "javascript",
+  sdk: {
+    integrations: [
+      "InboundFilters",
+      "FunctionToString",
+      "LinkedErrors",
+      "Dedupe",
+      "Breadcrumbs",
+      "DenoContext",
+      "ContextLines",
+      "NormalizePaths",
+      "GlobalHandlers",
+    ],
+    name: "sentry.javascript.deno",
+    packages: [
+      {
+        name: "denoland:sentry",
+        version: "{{version}}",
+      },
+    ],
+    version: "{{version}}",
+  },
+  server_name: "{{server}}",
+  timestamp: 0,
+}
+`;
+
+snapshot[`captureMessage twice 2`] = `
+{
+  breadcrumbs: [
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      message: "Error: Some unhandled error",
+      timestamp: 0,
+    },
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      level: "info",
+      message: "Some error message",
+      timestamp: 0,
+    },
+    {
+      category: "sentry.event",
+      event_id: "{{id}}",
+      level: "info",
+      message: "Some error message",
+      timestamp: 0,
+    },
+  ],
+  contexts: {
+    app: {
+      app_start_time: "{{time}}",
+    },
+    device: {
+      arch: "{{arch}}",
+      processor_count: 0,
+    },
+    os: {
+      name: "{{platform}}",
+      version: "{{version}}",
+    },
+    runtime: {
+      name: "deno",
+      version: "{{version}}",
+    },
+    trace: {
+      span_id: "{{id}}",
+      trace_id: "{{id}}",
+    },
+    typescript: {
+      name: "TypeScript",
+      version: "{{version}}",
+    },
+    v8: {
+      name: "v8",
+      version: "{{version}}",
+    },
+  },
+  environment: "production",
+  event_id: "{{id}}",
+  level: "info",
+  message: "Another error message",
+  platform: "javascript",
+  sdk: {
+    integrations: [
+      "InboundFilters",
+      "FunctionToString",
+      "LinkedErrors",
+      "Dedupe",
+      "Breadcrumbs",
+      "DenoContext",
+      "ContextLines",
+      "NormalizePaths",
+      "GlobalHandlers",
+    ],
+    name: "sentry.javascript.deno",
+    packages: [
+      {
+        name: "denoland:sentry",
+        version: "{{version}}",
+      },
+    ],
+    version: "{{version}}",
+  },
+  server_name: "{{server}}",
   timestamp: 0,
 }
 `;
diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts
index aae0963b8da5..656d9301b7ca 100644
--- a/packages/deno/test/mod.test.ts
+++ b/packages/deno/test/mod.test.ts
@@ -3,14 +3,14 @@ import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.t
 
 import type { sentryTypes } from '../build-test/index.js';
 import { sentryUtils } from '../build-test/index.js';
-import { DenoClient, Hub, Scope, getDefaultIntegrations } from '../build/index.mjs';
+import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/index.mjs';
 import { getNormalizedEvent } from './normalize.ts';
 import { makeTestTransport } from './transport.ts';
 
 function getTestClient(
   callback: (event?: sentryTypes.Event) => void,
   integrations: sentryTypes.Integration[] = [],
-): [Hub, DenoClient] {
+): DenoClient {
   const client = new DenoClient({
     dsn: 'https://233a45e5efe34c47a3536797ce15dafa@nothing.here/5650507',
     debug: true,
@@ -21,11 +21,10 @@ function getTestClient(
     }),
   });
 
-  const scope = new Scope();
-  // eslint-disable-next-line deprecation/deprecation
-  const hub = new Hub(client, scope);
+  client.init();
+  getCurrentScope().setClient(client);
 
-  return [hub, client];
+  return client;
 }
 
 function delay(time: number): Promise<void> {
@@ -36,7 +35,7 @@ function delay(time: number): Promise<void> {
 
 Deno.test('captureException', async t => {
   let ev: sentryTypes.Event | undefined;
-  const [, client] = getTestClient(event => {
+  const client = getTestClient(event => {
     ev = event;
   });
 
@@ -52,7 +51,7 @@ Deno.test('captureException', async t => {
 
 Deno.test('captureMessage', async t => {
   let ev: sentryTypes.Event | undefined;
-  const [, client] = getTestClient(event => {
+  const client = getTestClient(event => {
     ev = event;
   });
 
@@ -62,6 +61,23 @@ Deno.test('captureMessage', async t => {
   await assertSnapshot(t, ev);
 });
 
+Deno.test('captureMessage twice', async t => {
+  let ev: sentryTypes.Event | undefined;
+  const client = getTestClient(event => {
+    ev = event;
+  });
+
+  client.captureMessage('Some error message');
+
+  await delay(200);
+  await assertSnapshot(t, ev);
+
+  client.captureMessage('Another error message');
+
+  await delay(200);
+  await assertSnapshot(t, ev);
+});
+
 Deno.test('App runs without errors', async _ => {
   const cmd = new Deno.Command('deno', {
     args: ['run', '--allow-net=some-domain.com', './test/example.ts'],
diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts
index 4dbbc8f3f6ec..9f4481e5fe4a 100644
--- a/packages/deno/test/normalize.ts
+++ b/packages/deno/test/normalize.ts
@@ -137,7 +137,7 @@ function normalizeEvent(event: sentryTypes.Event): sentryTypes.Event {
     event.contexts.os.name = '{{platform}}';
   }
 
-  if (event.contexts?.os?.version) {
+  if (event.contexts?.os) {
     event.contexts.os.version = '{{version}}';
   }
 
@@ -197,8 +197,11 @@ function normalizeEvent(event: sentryTypes.Event): sentryTypes.Event {
   if (event.breadcrumbs) {
     for (const breadcrumb of event.breadcrumbs) {
       breadcrumb.timestamp = 0;
+      breadcrumb.event_id = '{{id}}';
     }
   }
 
+  event.server_name = '{{server}}';
+
   return event;
 }
diff --git a/packages/ember/README.md b/packages/ember/README.md
index 0e56f6e30d47..2376869d107f 100644
--- a/packages/ember/README.md
+++ b/packages/ember/README.md
@@ -13,13 +13,12 @@
 
 ## General
 
-This package is an Ember addon that wraps `@sentry/browser`, with added functionality related to Ember. All methods available in
-`@sentry/browser` can be imported from `@sentry/ember`.
+This package is an Ember addon that wraps `@sentry/browser`, with added functionality related to Ember. All methods
+available in `@sentry/browser` can be imported from `@sentry/ember`.
 
 ### Installation
 
-As with other Ember addons, run:
-`ember install @sentry/ember`
+As with other Ember addons, run: `ember install @sentry/ember`
 
 Then add the following to your `<your-app>/app.js`
 
@@ -38,8 +37,9 @@ Then add the following to your `<your-app>/app.js`
 
 ### Usage
 
-To use this SDK, call `Sentry.init` before the application is initialized, in `app.js`. This will allow Sentry to capture information while your app is starting.
-Any additional SDK settings can be modified via the usual config in `environment.js` for you, see the Additional Configuration section for more details.
+To use this SDK, call `Sentry.init` before the application is initialized, in `app.js`. This will allow Sentry to
+capture information while your app is starting. Any additional SDK settings can be modified via the usual config in
+`environment.js` for you, see the Additional Configuration section for more details.
 
 ```javascript
 import Application from '@ember/application';
@@ -66,7 +66,8 @@ export default class App extends Application {
 
 ### Additional Configuration
 
-Aside from configuration passed from this addon into `@sentry/browser` via the `sentry` property, there is also the following Ember specific configuration:
+Aside from configuration passed from this addon into `@sentry/browser` via the `sentry` property, there is also the
+following Ember specific configuration:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -93,8 +94,8 @@ ENV['@sentry/ember'] = {
 
 #### Disabling Performance
 
-
-`@sentry/ember` captures performance by default, if you would like to disable the automatic performance instrumentation, you can add the following to your `config/environment.js`:
+`@sentry/ember` captures performance by default, if you would like to disable the automatic performance instrumentation,
+you can add the following to your `config/environment.js`:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -102,7 +103,6 @@ ENV['@sentry/ember'] = {
 };
 ```
 
-
 ### Performance
 
 #### Routes
@@ -149,8 +149,8 @@ ENV['@sentry/ember'] = {
 };
 ```
 
-Additionally, components whose render time is below a threshold (by default 2ms) will not be included as spans.
-If you would like to change this threshold, add the following to your config:
+Additionally, components whose render time is below a threshold (by default 2ms) will not be included as spans. If you
+would like to change this threshold, add the following to your config:
 
 ```javascript
 ENV['@sentry/ember'] = {
@@ -172,8 +172,8 @@ ENV['@sentry/ember'] = {
 
 ### Supported Versions
 
-* **Ember.js**: v4.0 or above
-* **Node**: v14.8 or above
+- **Ember.js**: v4.0 or above
+- **Node**: v14.18 or above
 
 ### Previous Integration
 
@@ -182,8 +182,8 @@ this Ember addon to offer more Ember-specific error and performancing monitoring
 
 ## Testing
 
-For this package itself, you can find example instrumentation in the `dummy` application, which is also used for testing.
-To test with the dummy application, you must pass the dsn as an environment variable.
+For this package itself, you can find example instrumentation in the `dummy` application, which is also used for
+testing. To test with the dummy application, you must pass the dsn as an environment variable.
 
 ```javascript
 SENTRY_DSN=__DSN__ ember serve
diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts
index 552fa1df7e78..b7b6d09ebeca 100644
--- a/packages/ember/addon/instance-initializers/sentry-performance.ts
+++ b/packages/ember/addon/instance-initializers/sentry-performance.ts
@@ -6,20 +6,21 @@ import type RouterService from '@ember/routing/router-service';
 import { _backburner, run, scheduleOnce } from '@ember/runloop';
 import type { EmberRunQueues } from '@ember/runloop/-private/types';
 import { getOwnConfig, isTesting, macroCondition } from '@embroider/macros';
-import type { ExtendedBackburner } from '@sentry/ember/runloop';
-import type { Span } from '@sentry/types';
-import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/utils';
-
-import type { BrowserClient } from '@sentry/browser';
+import type {
+  BrowserClient,
+  startBrowserTracingNavigationSpan as startBrowserTracingNavigationSpanType,
+  startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
+} from '@sentry/browser';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getActiveSpan,
   getClient,
-  startBrowserTracingNavigationSpan,
-  startBrowserTracingPageLoadSpan,
   startInactiveSpan,
 } from '@sentry/browser';
+import type { ExtendedBackburner } from '@sentry/ember/runloop';
+import type { Span } from '@sentry/types';
+import { GLOBAL_OBJ, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/utils';
 import type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
 
 function getSentryConfig(): EmberSentryConfig {
@@ -99,6 +100,8 @@ export function _instrumentEmberRouter(
   routerService: RouterService,
   routerMain: EmberRouterMain,
   config: EmberSentryConfig,
+  startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
+  startBrowserTracingNavigationSpan: typeof startBrowserTracingNavigationSpanType,
 ): void {
   const { disableRunloopPerformance } = config;
   const location = routerMain.location;
@@ -119,9 +122,9 @@ export function _instrumentEmberRouter(
     const routeInfo = routerService.recognize(url);
     activeRootSpan = startBrowserTracingPageLoadSpan(client, {
       name: `route:${routeInfo.name}`,
-      origin: 'auto.pageload.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.ember',
         url,
         toRoute: routeInfo.name,
       },
@@ -146,9 +149,9 @@ export function _instrumentEmberRouter(
 
     activeRootSpan = startBrowserTracingNavigationSpan(client, {
       name: `route:${toRoute}`,
-      origin: 'auto.navigation.ember',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.ember',
         fromRoute,
         toRoute,
       },
@@ -220,7 +223,7 @@ function _instrumentEmberRunloop(config: EmberSentryConfig): void {
             },
             name: 'runloop',
             op: `ui.ember.runloop.${queue}`,
-            startTimestamp: currentQueueStart,
+            startTime: currentQueueStart,
           })?.end(now);
         }
         currentQueueStart = undefined;
@@ -292,8 +295,10 @@ function processComponentRenderAfter(
     startInactiveSpan({
       name: payload.containerKey || payload.object,
       op,
-      origin: 'auto.ui.ember',
-      startTimestamp: begin.now,
+      startTime: begin.now,
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
+      },
     })?.end(now);
   }
 }
@@ -369,8 +374,8 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
   // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const measure = measures[0]!;
 
-  const startTimestamp = (measure.startTime + browserPerformanceTimeOrigin) / 1000;
-  const endTimestamp = startTimestamp + measure.duration / 1000;
+  const startTime = (measure.startTime + browserPerformanceTimeOrigin) / 1000;
+  const endTime = startTime + measure.duration / 1000;
 
   startInactiveSpan({
     op: 'ui.ember.init',
@@ -378,8 +383,8 @@ function _instrumentInitialLoad(config: EmberSentryConfig): void {
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.ember',
     },
-    startTimestamp,
-  })?.end(endTimestamp);
+    startTime,
+  })?.end(endTime);
   performance.clearMarks(startName);
   performance.clearMarks(endName);
 
@@ -411,7 +416,8 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   // Maintaining backwards compatibility with config.browserTracingOptions, but passing it with Sentry options is preferred.
   const browserTracingOptions = config.browserTracingOptions || config.sentry.browserTracingOptions || {};
 
-  const { browserTracingIntegration } = await import('@sentry/browser');
+  const { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } =
+    await import('@sentry/browser');
 
   const idleTimeout = config.transitionTimeout || 5000;
 
@@ -431,7 +437,7 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   }
 
   // We _always_ call this, as it triggers the page load & navigation spans
-  _instrumentNavigation(appInstance, config);
+  _instrumentNavigation(appInstance, config, startBrowserTracingPageLoadSpan, startBrowserTracingNavigationSpan);
 
   // Skip instrumenting the stuff below again in tests, as these are not reset between tests
   if (isAlreadyInitialized) {
@@ -443,7 +449,12 @@ export async function instrumentForPerformance(appInstance: ApplicationInstance)
   _instrumentInitialLoad(config);
 }
 
-function _instrumentNavigation(appInstance: ApplicationInstance, config: EmberSentryConfig): void {
+function _instrumentNavigation(
+  appInstance: ApplicationInstance,
+  config: EmberSentryConfig,
+  startBrowserTracingPageLoadSpan: typeof startBrowserTracingPageLoadSpanType,
+  startBrowserTracingNavigationSpan: typeof startBrowserTracingNavigationSpanType,
+): void {
   // eslint-disable-next-line ember/no-private-routing-service
   const routerMain = appInstance.lookup('router:main') as EmberRouterMain;
   let routerService = appInstance.lookup('service:router') as RouterService & {
@@ -465,7 +476,13 @@ function _instrumentNavigation(appInstance: ApplicationInstance, config: EmberSe
   }
 
   routerService._hasMountedSentryPerformanceRouting = true;
-  _instrumentEmberRouter(routerService, routerMain, config);
+  _instrumentEmberRouter(
+    routerService,
+    routerMain,
+    config,
+    startBrowserTracingPageLoadSpan,
+    startBrowserTracingNavigationSpan,
+  );
 }
 
 export default {
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 4ebbdec64741..303888314735 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -83,7 +83,7 @@
     "webpack": "~5.74.0"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "ember": {
     "edition": "octane"
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index cf8a5bba796d..ca3c2f2235b9 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -12,7 +12,7 @@
     "sentry"
   ],
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "src"
diff --git a/packages/eslint-config-sdk/src/base.js b/packages/eslint-config-sdk/src/base.js
index 2b98cb6038dd..aa179260dc2c 100644
--- a/packages/eslint-config-sdk/src/base.js
+++ b/packages/eslint-config-sdk/src/base.js
@@ -151,9 +151,6 @@ module.exports = {
           },
         ],
 
-        // Do not allow usage of functions we do not polyfill for ES5
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'error',
-
         // Do not allow usage of class field initializers
         '@sentry-internal/sdk/no-class-field-initializers': 'error',
       },
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 5ddb37996613..f47cd6d4c44d 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -12,7 +12,7 @@
     "sentry"
   ],
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "src"
diff --git a/packages/eslint-plugin-sdk/src/index.js b/packages/eslint-plugin-sdk/src/index.js
index c03a042ca836..4390af285609 100644
--- a/packages/eslint-plugin-sdk/src/index.js
+++ b/packages/eslint-plugin-sdk/src/index.js
@@ -13,7 +13,6 @@ module.exports = {
     'no-optional-chaining': require('./rules/no-optional-chaining'),
     'no-nullish-coalescing': require('./rules/no-nullish-coalescing'),
     'no-eq-empty': require('./rules/no-eq-empty'),
-    'no-unsupported-es6-methods': require('./rules/no-unsupported-es6-methods'),
     'no-class-field-initializers': require('./rules/no-class-field-initializers'),
     'no-regexp-constructor': require('./rules/no-regexp-constructor'),
   },
diff --git a/packages/eslint-plugin-sdk/src/rules/no-unsupported-es6-methods.js b/packages/eslint-plugin-sdk/src/rules/no-unsupported-es6-methods.js
deleted file mode 100644
index 85d32fb20e66..000000000000
--- a/packages/eslint-plugin-sdk/src/rules/no-unsupported-es6-methods.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-/**
- * Taken and adapted from https://github.com/nkt/eslint-plugin-es5/blob/master/src/rules/no-es6-methods.js
- */
-
-module.exports = {
-  meta: {
-    docs: {
-      description: 'Forbid methods added in ES6 which are not polyfilled by Sentry.',
-    },
-    schema: [],
-  },
-  create(context) {
-    return {
-      CallExpression(node) {
-        if (!node.callee || !node.callee.property) {
-          return;
-        }
-        const functionName = node.callee.property.name;
-
-        const es6ArrayFunctions = ['copyWithin', 'values', 'fill'];
-        const es6StringFunctions = ['repeat'];
-
-        const es6Functions = [].concat(es6ArrayFunctions, es6StringFunctions);
-        if (es6Functions.indexOf(functionName) > -1) {
-          context.report({
-            node: node.callee.property,
-            message: `ES6 methods not allowed: ${functionName}`,
-          });
-        }
-      },
-    };
-  },
-};
diff --git a/packages/feedback/.eslintrc.js b/packages/feedback/.eslintrc.js
index cf9985e769c0..0b547ffc828c 100644
--- a/packages/feedback/.eslintrc.js
+++ b/packages/feedback/.eslintrc.js
@@ -11,26 +11,6 @@ module.exports = {
       parserOptions: {
         project: ['tsconfig.test.json'],
       },
-      rules: {
-        'no-console': 'off',
-      },
-    },
-    {
-      files: ['test/**/*.ts'],
-
-      rules: {
-        // most of these errors come from `new Promise(process.nextTick)`
-        '@typescript-eslint/unbound-method': 'off',
-        // TODO: decide if we want to enable this again after the migration
-        // We can take the freedom to be a bit more lenient with tests
-        '@typescript-eslint/no-floating-promises': 'off',
-      },
-    },
-    {
-      files: ['src/types/deprecated.ts'],
-      rules: {
-        '@typescript-eslint/naming-convention': 'off',
-      },
     },
   ],
 };
diff --git a/packages/feedback/README.md b/packages/feedback/README.md
index fb5b20400a71..336e74da6593 100644
--- a/packages/feedback/README.md
+++ b/packages/feedback/README.md
@@ -6,15 +6,20 @@
 
 # Sentry Integration for Feedback
 
-This SDK is **considered experimental and in a beta state**. It may experience breaking changes, and may be discontinued at any time. Please reach out on
-[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback/concerns.
+This SDK is **considered experimental and in a beta state**. It may experience breaking changes, and may be discontinued
+at any time. Please reach out on [GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have
+any feedback/concerns.
 
-To view Feedback in Sentry, your [Sentry organization must be an early adopter](https://docs.sentry.io/product/accounts/early-adopter-features/).
+To view Feedback in Sentry, your
+[Sentry organization must be an early adopter](https://docs.sentry.io/product/accounts/early-adopter-features/).
 
 ## Installation
 
-Please read the [offical integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/) for installation instructions.
+Please read the [offical integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/) for
+installation instructions.
 
 ## Configuration
 
-The Feedback integration is highly customizable, please read the [official integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/configuration/) for the most up-to-date configuration options.
+The Feedback integration is highly customizable, please read the
+[official integration documentation](https://docs.sentry.io/platforms/javascript/user-feedback/configuration/) for the
+most up-to-date configuration options.
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index d9364a8c8c7a..48d41f588447 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
+      "require": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -31,7 +44,8 @@
   "dependencies": {
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
-    "@sentry/utils": "8.0.0-alpha.2"
+    "@sentry/utils": "8.0.0-alpha.2",
+    "preact": "^10.19.4"
   },
   "scripts": {
     "build": "run-p build:transpile build:types build:bundle",
@@ -40,7 +54,7 @@
     "build:dev": "run-p build:transpile build:types",
     "build:types": "run-s build:types:core build:types:downlevel",
     "build:types:core": "tsc -p tsconfig.types.json",
-    "build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8",
+    "build:types:downlevel": "yarn downlevel-dts build/npm/types build/npm/types-ts3.8 --to ts3.8 && yarn node ./scripts/shim-preact-export.js",
     "build:watch": "run-p build:transpile:watch build:bundle:watch build:types:watch",
     "build:dev:watch": "run-p build:transpile:watch build:types:watch",
     "build:transpile:watch": "yarn build:transpile --watch",
diff --git a/packages/feedback/rollup.bundle.config.mjs b/packages/feedback/rollup.bundle.config.mjs
index 3a9404947667..f5794d328409 100644
--- a/packages/feedback/rollup.bundle.config.mjs
+++ b/packages/feedback/rollup.bundle.config.mjs
@@ -1,13 +1,15 @@
 import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal/rollup-utils';
 
-const baseBundleConfig = makeBaseBundleConfig({
-  bundleType: 'addon',
-  entrypoints: ['src/index.ts'],
-  jsVersion: 'es6',
-  licenseTitle: '@sentry-internal/feedback',
-  outputFileBase: () => 'bundles/feedback',
-});
-
-const builds = makeBundleConfigVariants(baseBundleConfig);
-
-export default builds;
+export default makeBundleConfigVariants(
+  makeBaseBundleConfig({
+    bundleType: 'addon',
+    entrypoints: ['src/index.ts'],
+    jsVersion: 'es6',
+    licenseTitle: '@sentry-internal/feedback',
+    outputFileBase: () => 'bundles/feedback',
+    sucrase: {
+      jsxPragma: 'h',
+      jsxFragmentPragma: 'Fragment',
+    },
+  }),
+);
diff --git a/packages/feedback/rollup.npm.config.mjs b/packages/feedback/rollup.npm.config.mjs
index 5a1800f23b08..3dc031c5ff82 100644
--- a/packages/feedback/rollup.npm.config.mjs
+++ b/packages/feedback/rollup.npm.config.mjs
@@ -12,5 +12,9 @@ export default makeNPMConfigVariants(
         preserveModules: false,
       },
     },
+    sucrase: {
+      jsxPragma: 'h',
+      jsxFragmentPragma: 'Fragment',
+    },
   }),
 );
diff --git a/packages/feedback/scripts/shim-preact-export.js b/packages/feedback/scripts/shim-preact-export.js
new file mode 100644
index 000000000000..bd74e4da0a05
--- /dev/null
+++ b/packages/feedback/scripts/shim-preact-export.js
@@ -0,0 +1,75 @@
+// preact does not support more modern TypeScript versions, which breaks our users that depend on older
+// TypeScript versions. To fix this, we shim the types from preact to be any and remove the dependency on preact
+// for types directly. This script is meant to be run after the build/npm/types-ts3.8 directory is created.
+
+// Path: build/npm/types-ts3.8/global.d.ts
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * This regex looks for preact imports we can replace and shim out.
+ *
+ * Example:
+ * import { ComponentChildren, VNode } from 'preact';
+ */
+const preactImportRegex = /import\s*{\s*([\w\s,]+)\s*}\s*from\s*'preact'\s*;?/;
+
+function walk(dir) {
+  const files = fs.readdirSync(dir);
+  files.forEach(file => {
+    const filePath = path.join(dir, file);
+    const stat = fs.lstatSync(filePath);
+    if (stat.isDirectory()) {
+      walk(filePath);
+    } else {
+      if (filePath.endsWith('.d.ts')) {
+        const content = fs.readFileSync(filePath, 'utf8');
+        const capture = preactImportRegex.exec(content);
+        if (capture) {
+          const groups = capture[1].split(',').map(s => s.trim());
+
+          // This generates a shim snippet to replace the type imports from preact
+          // It generates a snippet based on the capture groups of preactImportRegex.
+          //
+          // Example:
+          //
+          // import type { ComponentChildren, VNode } from 'preact';
+          // becomes
+          // type ComponentChildren: any;
+          // type VNode: any;
+          const snippet = groups.reduce((acc, curr) => {
+            const searchableValue = curr.includes(' as ') ? curr.split(' as ')[1] : curr;
+
+            // look to see if imported as value, then we have to use declare const
+            if (content.includes(`typeof ${searchableValue}`)) {
+              return `${acc}declare const ${searchableValue}: any;\n`;
+            }
+
+            // look to see if generic type like Foo<T>
+            if (content.includes(`${searchableValue}<`)) {
+              return `${acc}type ${searchableValue}<T> = any;\n`;
+            }
+
+            // otherwise we can just leave as type
+            return `${acc}type ${searchableValue} = any;\n`;
+          }, '');
+
+          // we then can remove the import from preact
+          const newContent = content.replace(preactImportRegex, '// replaced import from preact');
+
+          // and write the new content to the file
+          fs.writeFileSync(filePath, snippet + newContent, 'utf8');
+        }
+      }
+    }
+  });
+}
+
+function run() {
+  // recurse through build/npm/types-ts3.8 directory
+  const dir = path.join('build', 'npm', 'types-ts3.8');
+  walk(dir);
+}
+
+run();
diff --git a/packages/feedback/src/constants/index.ts b/packages/feedback/src/constants/index.ts
new file mode 100644
index 000000000000..9804fdedf431
--- /dev/null
+++ b/packages/feedback/src/constants/index.ts
@@ -0,0 +1,27 @@
+import { GLOBAL_OBJ } from '@sentry/utils';
+
+export { DEFAULT_THEME } from './theme';
+
+// exporting a separate copy of `WINDOW` rather than exporting the one from `@sentry/browser`
+// prevents the browser package from being bundled in the CDN bundle, and avoids a
+// circular dependency between the browser and feedback packages
+export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
+export const DOCUMENT = WINDOW.document;
+export const NAVIGATOR = WINDOW.navigator;
+
+export const ACTOR_LABEL = 'Report a Bug';
+export const CANCEL_BUTTON_LABEL = 'Cancel';
+export const SUBMIT_BUTTON_LABEL = 'Send Bug Report';
+export const FORM_TITLE = 'Report a Bug';
+export const EMAIL_PLACEHOLDER = 'your.email@example.org';
+export const EMAIL_LABEL = 'Email';
+export const MESSAGE_PLACEHOLDER = "What's the bug? What did you expect?";
+export const MESSAGE_LABEL = 'Description';
+export const NAME_PLACEHOLDER = 'Your Name';
+export const NAME_LABEL = 'Name';
+export const SUCCESS_MESSAGE_TEXT = 'Thank you for your report!';
+
+export const FEEDBACK_WIDGET_SOURCE = 'widget';
+export const FEEDBACK_API_SOURCE = 'api';
+
+export const SUCCESS_MESSAGE_TIMEOUT = 5000;
diff --git a/packages/feedback/src/constants.ts b/packages/feedback/src/constants/theme.ts
similarity index 58%
rename from packages/feedback/src/constants.ts
rename to packages/feedback/src/constants/theme.ts
index 07782968375f..7fff31f48964 100644
--- a/packages/feedback/src/constants.ts
+++ b/packages/feedback/src/constants/theme.ts
@@ -1,14 +1,8 @@
-import { GLOBAL_OBJ } from '@sentry/utils';
-
-// exporting a separate copy of `WINDOW` rather than exporting the one from `@sentry/browser`
-// prevents the browser package from being bundled in the CDN bundle, and avoids a
-// circular dependency between the browser and feedback packages
-export const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
-
 const LIGHT_BACKGROUND = '#ffffff';
 const INHERIT = 'inherit';
 const SUBMIT_COLOR = 'rgba(108, 95, 199, 1)';
-const LIGHT_THEME = {
+
+export const LIGHT_THEME = {
   fontFamily: "system-ui, 'Helvetica Neue', Arial, sans-serif",
   fontSize: '14px',
 
@@ -59,18 +53,3 @@ export const DEFAULT_THEME = {
     error: '#f55459',
   },
 };
-
-export const ACTOR_LABEL = 'Report a Bug';
-export const CANCEL_BUTTON_LABEL = 'Cancel';
-export const SUBMIT_BUTTON_LABEL = 'Send Bug Report';
-export const FORM_TITLE = 'Report a Bug';
-export const EMAIL_PLACEHOLDER = 'your.email@example.org';
-export const EMAIL_LABEL = 'Email';
-export const MESSAGE_PLACEHOLDER = "What's the bug? What did you expect?";
-export const MESSAGE_LABEL = 'Description';
-export const NAME_PLACEHOLDER = 'Your Name';
-export const NAME_LABEL = 'Name';
-export const SUCCESS_MESSAGE_TEXT = 'Thank you for your report!';
-
-export const FEEDBACK_WIDGET_SOURCE = 'widget';
-export const FEEDBACK_API_SOURCE = 'api';
diff --git a/packages/feedback/test/utils/TestClient.ts b/packages/feedback/src/core/TestClient.ts
similarity index 84%
rename from packages/feedback/test/utils/TestClient.ts
rename to packages/feedback/src/core/TestClient.ts
index 61156a3be8b0..39ed51fcff67 100644
--- a/packages/feedback/test/utils/TestClient.ts
+++ b/packages/feedback/src/core/TestClient.ts
@@ -4,34 +4,50 @@ 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-next-line @typescript-eslint/no-unsafe-member-access
             type: exception.name,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             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: [],
diff --git a/packages/feedback/src/widget/Actor.css.ts b/packages/feedback/src/core/components/Actor.css.ts
similarity index 74%
rename from packages/feedback/src/widget/Actor.css.ts
rename to packages/feedback/src/core/components/Actor.css.ts
index 44bd60a3418e..4e7a9466cd1e 100644
--- a/packages/feedback/src/widget/Actor.css.ts
+++ b/packages/feedback/src/core/components/Actor.css.ts
@@ -1,16 +1,26 @@
+import { DOCUMENT } from '../../constants';
+
 /**
  * Creates <style> element for widget actor (button that opens the dialog)
  */
-export function createActorStyles(d: Document): HTMLStyleElement {
-  const style = d.createElement('style');
+export function createActorStyles(): HTMLStyleElement {
+  const style = DOCUMENT.createElement('style');
   style.textContent = `
 .widget__actor {
+  position: fixed;
+  left: var(--left);
+  right: var(--right);
+  bottom: var(--bottom);
+  top: var(--top);
+  z-index: var(--z-index);
+
   line-height: 25px;
 
   display: flex;
   align-items: center;
   gap: 8px;
 
+
   border-radius: var(--border-radius);
   cursor: pointer;
   font-size: 14px;
diff --git a/packages/feedback/src/core/components/Actor.ts b/packages/feedback/src/core/components/Actor.ts
new file mode 100644
index 000000000000..fb49d5d1b7ee
--- /dev/null
+++ b/packages/feedback/src/core/components/Actor.ts
@@ -0,0 +1,48 @@
+import { DOCUMENT } from '../../constants';
+import { createActorStyles } from './Actor.css';
+import { FeedbackIcon } from './FeedbackIcon';
+
+export interface ActorProps {
+  buttonLabel: string;
+  shadow: ShadowRoot;
+}
+
+export interface ActorComponent {
+  el: HTMLElement;
+
+  appendToDom: () => void;
+
+  removeFromDom: () => void;
+}
+
+/**
+ * The sentry-provided button to open the feedback modal
+ */
+export function Actor({ buttonLabel, shadow }: ActorProps): ActorComponent {
+  const el = DOCUMENT.createElement('button');
+  el.type = 'button';
+  el.className = 'widget__actor';
+  el.ariaHidden = 'false';
+  el.ariaLabel = buttonLabel;
+  el.appendChild(FeedbackIcon());
+  if (buttonLabel) {
+    const label = DOCUMENT.createElement('span');
+    label.className = 'widget__actor__text';
+    label.appendChild(DOCUMENT.createTextNode(buttonLabel));
+    el.appendChild(label);
+  }
+
+  const style = createActorStyles();
+
+  return {
+    el,
+    appendToDom(): void {
+      shadow.appendChild(style);
+      shadow.appendChild(el);
+    },
+    removeFromDom(): void {
+      shadow.removeChild(el);
+      shadow.removeChild(style);
+    },
+  };
+}
diff --git a/packages/feedback/src/core/components/FeedbackIcon.ts b/packages/feedback/src/core/components/FeedbackIcon.ts
new file mode 100644
index 000000000000..a6145ebf8900
--- /dev/null
+++ b/packages/feedback/src/core/components/FeedbackIcon.ts
@@ -0,0 +1,49 @@
+import { WINDOW } from '../../constants';
+import { setAttributesNS } from '../../util/setAttributesNS';
+
+const SIZE = 20;
+const XMLNS = 'http://www.w3.org/2000/svg';
+
+/**
+ * Feedback Icon
+ */
+export function FeedbackIcon(): SVGElement {
+  const createElementNS = <K extends keyof SVGElementTagNameMap>(tagName: K): SVGElementTagNameMap[K] =>
+    WINDOW.document.createElementNS(XMLNS, tagName);
+  const svg = setAttributesNS(createElementNS('svg'), {
+    class: 'feedback-icon',
+    width: `${SIZE}`,
+    height: `${SIZE}`,
+    viewBox: `0 0 ${SIZE} ${SIZE}`,
+    fill: 'none',
+  });
+
+  const g = setAttributesNS(createElementNS('g'), {
+    clipPath: 'url(#clip0_57_80)',
+  });
+
+  const path = setAttributesNS(createElementNS('path'), {
+    ['fill-rule']: 'evenodd',
+    ['clip-rule']: 'evenodd',
+    d: 'M15.6622 15H12.3997C12.2129 14.9959 12.031 14.9396 11.8747 14.8375L8.04965 12.2H7.49956V19.1C7.4875 19.3348 7.3888 19.5568 7.22256 19.723C7.05632 19.8892 6.83435 19.9879 6.59956 20H2.04956C1.80193 19.9968 1.56535 19.8969 1.39023 19.7218C1.21511 19.5467 1.1153 19.3101 1.11206 19.0625V12.2H0.949652C0.824431 12.2017 0.700142 12.1783 0.584123 12.1311C0.468104 12.084 0.362708 12.014 0.274155 11.9255C0.185602 11.8369 0.115689 11.7315 0.0685419 11.6155C0.0213952 11.4995 -0.00202913 11.3752 -0.00034808 11.25V3.75C-0.00900498 3.62067 0.0092504 3.49095 0.0532651 3.36904C0.0972798 3.24712 0.166097 3.13566 0.255372 3.04168C0.344646 2.94771 0.452437 2.87327 0.571937 2.82307C0.691437 2.77286 0.82005 2.74798 0.949652 2.75H8.04965L11.8747 0.1625C12.031 0.0603649 12.2129 0.00407221 12.3997 0H15.6622C15.9098 0.00323746 16.1464 0.103049 16.3215 0.278167C16.4966 0.453286 16.5964 0.689866 16.5997 0.9375V3.25269C17.3969 3.42959 18.1345 3.83026 18.7211 4.41679C19.5322 5.22788 19.9878 6.32796 19.9878 7.47502C19.9878 8.62209 19.5322 9.72217 18.7211 10.5333C18.1345 11.1198 17.3969 11.5205 16.5997 11.6974V14.0125C16.6047 14.1393 16.5842 14.2659 16.5395 14.3847C16.4948 14.5035 16.4268 14.6121 16.3394 14.7042C16.252 14.7962 16.147 14.8698 16.0307 14.9206C15.9144 14.9714 15.7891 14.9984 15.6622 15ZM1.89695 10.325H1.88715V4.625H8.33715C8.52423 4.62301 8.70666 4.56654 8.86215 4.4625L12.6872 1.875H14.7247V13.125H12.6872L8.86215 10.4875C8.70666 10.3835 8.52423 10.327 8.33715 10.325H2.20217C2.15205 10.3167 2.10102 10.3125 2.04956 10.3125C1.9981 10.3125 1.94708 10.3167 1.89695 10.325ZM2.98706 12.2V18.1625H5.66206V12.2H2.98706ZM16.5997 9.93612V5.01393C16.6536 5.02355 16.7072 5.03495 16.7605 5.04814C17.1202 5.13709 17.4556 5.30487 17.7425 5.53934C18.0293 5.77381 18.2605 6.06912 18.4192 6.40389C18.578 6.73866 18.6603 7.10452 18.6603 7.47502C18.6603 7.84552 18.578 8.21139 18.4192 8.54616C18.2605 8.88093 18.0293 9.17624 17.7425 9.41071C17.4556 9.64518 17.1202 9.81296 16.7605 9.90191C16.7072 9.91509 16.6536 9.9265 16.5997 9.93612Z',
+  });
+  svg.appendChild(g).appendChild(path);
+
+  const speakerDefs = createElementNS('defs');
+  const speakerClipPathDef = setAttributesNS(createElementNS('clipPath'), {
+    id: 'clip0_57_80',
+  });
+
+  const speakerRect = setAttributesNS(createElementNS('rect'), {
+    width: `${SIZE}`,
+    height: `${SIZE}`,
+    fill: 'white',
+  });
+
+  speakerClipPathDef.appendChild(speakerRect);
+  speakerDefs.appendChild(speakerClipPathDef);
+
+  svg.appendChild(speakerDefs).appendChild(speakerClipPathDef).appendChild(speakerRect);
+
+  return svg;
+}
diff --git a/packages/feedback/src/widget/Main.css.ts b/packages/feedback/src/core/createMainStyles.ts
similarity index 77%
rename from packages/feedback/src/widget/Main.css.ts
rename to packages/feedback/src/core/createMainStyles.ts
index 32bb8048e678..9eb5bd4dc2ab 100644
--- a/packages/feedback/src/widget/Main.css.ts
+++ b/packages/feedback/src/core/createMainStyles.ts
@@ -1,3 +1,4 @@
+import { DOCUMENT } from '../constants';
 import type { FeedbackTheme, FeedbackThemes } from '../types';
 
 function getThemedCssVariables(theme: FeedbackTheme): string {
@@ -38,12 +39,8 @@ function getThemedCssVariables(theme: FeedbackTheme): string {
 /**
  * Creates <style> element for widget actor (button that opens the dialog)
  */
-export function createMainStyles(
-  d: Document,
-  colorScheme: 'system' | 'dark' | 'light',
-  themes: FeedbackThemes,
-): HTMLStyleElement {
-  const style = d.createElement('style');
+export function createMainStyles(colorScheme: 'system' | 'dark' | 'light', themes: FeedbackThemes): HTMLStyleElement {
+  const style = DOCUMENT.createElement('style');
   style.textContent = `
 :host {
   --bottom: 1rem;
@@ -51,20 +48,13 @@ export function createMainStyles(
   --top: auto;
   --left: auto;
   --z-index: 100000;
-  --font-family: ${themes.light.fontFamily};
-  --font-size: ${themes.light.fontSize};
-
-  position: fixed;
-  left: var(--left);
-  right: var(--right);
-  bottom: var(--bottom);
-  top: var(--top);
-  z-index: var(--z-index);
+  --font-family: ${themes.themeLight.fontFamily};
+  --font-size: ${themes.themeLight.fontSize};
 
   font-family: var(--font-family);
   font-size: var(--font-size);
 
-  ${getThemedCssVariables(colorScheme === 'dark' ? themes.dark : themes.light)}
+  ${getThemedCssVariables(colorScheme === 'dark' ? themes.themeDark : themes.themeLight)}
 }
 
 ${
@@ -72,7 +62,7 @@ ${
     ? `
 @media (prefers-color-scheme: dark) {
   :host {
-    ${getThemedCssVariables(themes.dark)}
+    ${getThemedCssVariables(themes.themeDark)}
   }
 }`
     : ''
diff --git a/packages/feedback/src/core/integration.ts b/packages/feedback/src/core/integration.ts
new file mode 100644
index 000000000000..489bfd32728d
--- /dev/null
+++ b/packages/feedback/src/core/integration.ts
@@ -0,0 +1,280 @@
+import { defineIntegration, getClient } from '@sentry/core';
+import type { IntegrationFn, IntegrationFnResult } from '@sentry/types';
+import { isBrowser, logger } from '@sentry/utils';
+import {
+  ACTOR_LABEL,
+  CANCEL_BUTTON_LABEL,
+  DEFAULT_THEME,
+  DOCUMENT,
+  EMAIL_LABEL,
+  EMAIL_PLACEHOLDER,
+  FORM_TITLE,
+  MESSAGE_LABEL,
+  MESSAGE_PLACEHOLDER,
+  NAME_LABEL,
+  NAME_PLACEHOLDER,
+  SUBMIT_BUTTON_LABEL,
+  SUCCESS_MESSAGE_TEXT,
+} from '../constants';
+import type { IFeedbackModalIntegration } from '../modal/integration';
+import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
+import type {
+  Dialog,
+  FeedbackInternalOptions,
+  OptionalFeedbackConfiguration,
+  OverrideFeedbackConfiguration,
+} from '../types';
+import { DEBUG_BUILD } from '../util/debug-build';
+import { isScreenshotSupported } from '../util/isScreenshotSupported';
+import { mergeOptions } from '../util/mergeOptions';
+import { Actor } from './components/Actor';
+import { createMainStyles } from './createMainStyles';
+import { sendFeedback } from './sendFeedback';
+
+type Unsubscribe = () => void;
+
+interface PublicFeedbackIntegration {
+  attachTo: (el: Element | string, optionOverrides: OverrideFeedbackConfiguration) => () => void;
+  createWidget: (optionOverrides: OverrideFeedbackConfiguration & { shouldCreateActor?: boolean }) => Promise<Dialog>;
+  getWidget: () => Dialog | null;
+  remove: () => void;
+  openDialog: () => void;
+  closeDialog: () => void;
+  removeWidget: () => void;
+}
+export type IFeedbackIntegration = IntegrationFnResult & PublicFeedbackIntegration;
+
+export const _feedbackIntegration = (({
+  // FeedbackGeneralConfiguration
+  id = 'sentry-feedback',
+  showBranding = true,
+  autoInject = true,
+  showEmail = true,
+  showName = true,
+  showScreenshot = true,
+  useSentryUser = {
+    email: 'email',
+    name: 'username',
+  },
+  isNameRequired = false,
+  isEmailRequired = false,
+
+  // FeedbackThemeConfiguration
+  colorScheme = 'system',
+  themeLight,
+  themeDark,
+
+  // FeedbackTextConfiguration
+  buttonLabel = ACTOR_LABEL,
+  cancelButtonLabel = CANCEL_BUTTON_LABEL,
+  submitButtonLabel = SUBMIT_BUTTON_LABEL,
+  formTitle = FORM_TITLE,
+  emailLabel = EMAIL_LABEL,
+  emailPlaceholder = EMAIL_PLACEHOLDER,
+  messageLabel = MESSAGE_LABEL,
+  messagePlaceholder = MESSAGE_PLACEHOLDER,
+  nameLabel = NAME_LABEL,
+  namePlaceholder = NAME_PLACEHOLDER,
+  successMessageText = SUCCESS_MESSAGE_TEXT,
+
+  // FeedbackCallbacks
+  onFormOpen,
+  onFormClose,
+  onSubmitSuccess,
+  onSubmitError,
+  onFormSubmitted,
+}: OptionalFeedbackConfiguration = {}) => {
+  const _options = {
+    id,
+    autoInject,
+    showBranding,
+    isEmailRequired,
+    isNameRequired,
+    showEmail,
+    showName,
+    showScreenshot,
+    useSentryUser,
+
+    colorScheme,
+    themeDark: {
+      ...DEFAULT_THEME.dark,
+      ...themeDark,
+    },
+    themeLight: {
+      ...DEFAULT_THEME.light,
+      ...themeLight,
+    },
+
+    buttonLabel,
+    cancelButtonLabel,
+    submitButtonLabel,
+    formTitle,
+    emailLabel,
+    emailPlaceholder,
+    messageLabel,
+    messagePlaceholder,
+    nameLabel,
+    namePlaceholder,
+    successMessageText,
+
+    onFormClose,
+    onFormOpen,
+    onSubmitError,
+    onSubmitSuccess,
+    onFormSubmitted,
+  };
+
+  let _shadow: ShadowRoot | null = null;
+  let _subscriptions: Unsubscribe[] = [];
+
+  /**
+   * Get the shadow root where we will append css
+   */
+  const _createShadow = (options: FeedbackInternalOptions): ShadowRoot => {
+    if (!_shadow) {
+      const host = DOCUMENT.createElement('div');
+      host.id = String(options.id);
+      DOCUMENT.body.appendChild(host);
+
+      _shadow = host.attachShadow({ mode: 'open' });
+      _shadow.appendChild(createMainStyles(options.colorScheme, options));
+    }
+    return _shadow as ShadowRoot;
+  };
+
+  const _loadAndRenderDialog = async (options: FeedbackInternalOptions): Promise<Dialog> => {
+    const client = getClient(); // TODO: getClient<BrowserClient>()
+    if (!client) {
+      throw new Error('Sentry Client is not initialized correctly');
+    }
+    const modalIntegration = client.getIntegrationByName<IFeedbackModalIntegration>('FeedbackModal');
+    const screenshotIntegration = client.getIntegrationByName<IFeedbackScreenshotIntegration>('FeedbackScreenshot');
+    const screenshotIsSupported = isScreenshotSupported();
+
+    // START TEMP: Error messages
+    if (!modalIntegration && showScreenshot && !screenshotIntegration) {
+      throw new Error('Async loading of Feedback Modal & Screenshot integrations is not yet implemented');
+    } else if (!modalIntegration) {
+      throw new Error('Async loading of Feedback Modal is not yet implemented');
+    } else if (showScreenshot && !screenshotIntegration) {
+      throw new Error('Async loading of Feedback Screenshot integration is not yet implemented');
+    }
+    // END TEMP
+
+    if (!modalIntegration) {
+      // TODO: load modalIntegration
+      throw new Error('Not implemented yet');
+    }
+
+    if (showScreenshot && !screenshotIntegration && screenshotIsSupported) {
+      // TODO: load screenshotIntegration
+      throw new Error('Not implemented yet');
+    }
+
+    return modalIntegration.createDialog({
+      options,
+      screenshotIntegration: screenshotIsSupported ? screenshotIntegration : undefined,
+      sendFeedback,
+      shadow: _createShadow(options),
+    });
+  };
+
+  const attachTo = (el: Element | string, optionOverrides: OverrideFeedbackConfiguration = {}): Unsubscribe => {
+    const mergedOptions = mergeOptions(_options, optionOverrides);
+
+    const targetEl =
+      typeof el === 'string' ? DOCUMENT.querySelector(el) : typeof el.addEventListener === 'function' ? el : null;
+
+    if (!targetEl) {
+      DEBUG_BUILD && logger.error('[Feedback] Unable to attach to target element');
+      throw new Error('Unable to attach to target element');
+    }
+
+    let dialog: Dialog | null = null;
+    const handleClick = async (): Promise<void> => {
+      if (!dialog) {
+        dialog = await _loadAndRenderDialog({
+          ...mergedOptions,
+          onFormClose: () => {
+            dialog && dialog.close();
+            mergedOptions.onFormClose && mergedOptions.onFormClose();
+          },
+          onFormSubmitted: () => {
+            dialog && dialog.removeFromDom();
+            mergedOptions.onFormSubmitted && mergedOptions.onFormSubmitted();
+          },
+        });
+      }
+      dialog.appendToDom();
+      dialog.open();
+    };
+    targetEl.addEventListener('click', handleClick);
+    const unsubscribe = (): void => {
+      _subscriptions = _subscriptions.filter(sub => sub !== unsubscribe);
+      dialog && dialog.removeFromDom();
+      dialog = null;
+      targetEl.removeEventListener('click', handleClick);
+    };
+    _subscriptions.push(unsubscribe);
+    return unsubscribe;
+  };
+
+  const autoInjectActor = (): void => {
+    const shadow = _createShadow(_options);
+    const actor = Actor({ buttonLabel: _options.buttonLabel, shadow });
+    const mergedOptions = mergeOptions(_options, {
+      onFormOpen() {
+        actor.removeFromDom();
+      },
+      onFormClose() {
+        actor.appendToDom();
+      },
+      onFormSubmitted() {
+        actor.appendToDom();
+      },
+    });
+    attachTo(actor.el, mergedOptions);
+
+    actor.appendToDom();
+  };
+
+  return {
+    name: 'Feedback',
+    setupOnce() {
+      if (!isBrowser() || !_options.autoInject) {
+        return;
+      }
+
+      autoInjectActor();
+    },
+
+    /**
+     * Adds click listener to the element to open a feedback dialog
+     *
+     * The returned function can be used to remove the click listener
+     */
+    attachTo,
+
+    /**
+     * Creates a new widget. Accepts partial options to override any options passed to constructor.
+     */
+    async createWidget(optionOverrides: OverrideFeedbackConfiguration = {}): Promise<Dialog> {
+      return _loadAndRenderDialog(mergeOptions(_options, optionOverrides));
+    },
+
+    /**
+     * Removes the Feedback integration (including host, shadow DOM, and all widgets)
+     */
+    remove(): void {
+      if (_shadow) {
+        _shadow.parentElement && _shadow.parentElement.remove();
+        _shadow = null;
+      }
+      // Remove any lingering subscriptions
+      _subscriptions.forEach(sub => sub());
+      _subscriptions = [];
+    },
+  };
+}) satisfies IntegrationFn;
+
+export const feedbackIntegration = defineIntegration(_feedbackIntegration);
diff --git a/packages/feedback/test/utils/mockSdk.ts b/packages/feedback/src/core/mockSdk.ts
similarity index 64%
rename from packages/feedback/test/utils/mockSdk.ts
rename to packages/feedback/src/core/mockSdk.ts
index c6afbc018317..cb9b2a982397 100644
--- a/packages/feedback/test/utils/mockSdk.ts
+++ b/packages/feedback/src/core/mockSdk.ts
@@ -1,16 +1,16 @@
 import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types';
 
-import type { TestClientOptions } from '../utils/TestClient';
-import { getDefaultClientOptions, init } from '../utils/TestClient';
+import type { TestClientOptions } from './TestClient';
+import { getDefaultClientOptions, init } from './TestClient';
 
 export interface MockSdkParams {
   sentryOptions?: Partial<TestClientOptions>;
 }
 
 class MockTransport implements Transport {
-  send: (request: Envelope) => PromiseLike<TransportMakeRequestResponse>;
+  public send: (request: Envelope) => PromiseLike<TransportMakeRequestResponse>;
 
-  constructor() {
+  public constructor() {
     this.send = jest.fn(async () => {
       return {
         statusCode: 200,
@@ -18,27 +18,30 @@ class MockTransport implements Transport {
     });
   }
 
-  async flush() {
+  public async flush(): Promise<boolean> {
     return true;
   }
-  async sendEvent(_e: Event) {
+  public async sendEvent(_e: Event): Promise<unknown> {
     return {
       status: 'skipped',
       event: 'ok',
       type: 'transaction',
     };
   }
-  async sendSession() {
+  public async sendSession(): Promise<void> {
     return;
   }
-  async recordLostEvent() {
+  public async recordLostEvent(): Promise<void> {
     return;
   }
-  async close() {
+  public async close(): Promise<void> {
     return;
   }
 }
 
+/**
+ *
+ */
 export async function mockSdk({ sentryOptions }: MockSdkParams = {}): Promise<void> {
   init({
     ...getDefaultClientOptions(),
diff --git a/packages/feedback/test/sendFeedback.test.ts b/packages/feedback/src/core/sendFeedback.test.ts
similarity index 92%
rename from packages/feedback/test/sendFeedback.test.ts
rename to packages/feedback/src/core/sendFeedback.test.ts
index e7c836527089..1b0ad480ca4e 100644
--- a/packages/feedback/test/sendFeedback.test.ts
+++ b/packages/feedback/src/core/sendFeedback.test.ts
@@ -1,7 +1,7 @@
 import { getClient } from '@sentry/core';
 
-import { sendFeedback } from '../src/sendFeedback';
-import { mockSdk } from './utils/mockSdk';
+import { mockSdk } from './mockSdk';
+import { sendFeedback } from './sendFeedback';
 
 describe('sendFeedback', () => {
   it('sends feedback', async () => {
diff --git a/packages/feedback/src/util/sendFeedbackRequest.ts b/packages/feedback/src/core/sendFeedback.ts
similarity index 59%
rename from packages/feedback/src/util/sendFeedbackRequest.ts
rename to packages/feedback/src/core/sendFeedback.ts
index 341611d94085..f3310303082a 100644
--- a/packages/feedback/src/util/sendFeedbackRequest.ts
+++ b/packages/feedback/src/core/sendFeedback.ts
@@ -1,24 +1,27 @@
-import { createEventEnvelope, getClient, withScope } from '@sentry/core';
+import { createAttachmentEnvelope, createEventEnvelope, getClient, withScope } from '@sentry/core';
 import type { FeedbackEvent, TransportMakeRequestResponse } from '@sentry/types';
-import { resolvedSyncPromise } from '@sentry/utils';
-
+import { getLocationHref } from '@sentry/utils';
 import { FEEDBACK_API_SOURCE, FEEDBACK_WIDGET_SOURCE } from '../constants';
-import type { SendFeedbackData, SendFeedbackOptions } from '../types';
-import { prepareFeedbackEvent } from './prepareFeedbackEvent';
+import type { SendFeedbackOptions, SendFeedbackParams } from '../types';
+import { prepareFeedbackEvent } from '../util/prepareFeedbackEvent';
 
 /**
- * Send feedback using transport
+ * Public API to send a Feedback item to Sentry
  */
-export async function sendFeedbackRequest(
-  { feedback: { message, email, name, source, url } }: SendFeedbackData,
+export async function sendFeedback(
+  { name, email, message, attachments, source = FEEDBACK_API_SOURCE, url = getLocationHref() }: SendFeedbackParams,
   { includeReplay = true }: SendFeedbackOptions = {},
 ): Promise<TransportMakeRequestResponse> {
+  if (!message) {
+    throw new Error('Unable to submit feedback with empty message');
+  }
+
   const client = getClient();
   const transport = client && client.getTransport();
   const dsn = client && client.getDsn();
 
   if (!client || !transport || !dsn) {
-    return resolvedSyncPromise({});
+    throw new Error('Invalid Sentry client');
   }
 
   const baseEvent: FeedbackEvent = {
@@ -48,18 +51,39 @@ export async function sendFeedbackRequest(
       event: baseEvent,
     });
 
-    if (!feedbackEvent) {
-      return resolvedSyncPromise({});
+    if (client.emit) {
+      client.emit('beforeSendFeedback', feedbackEvent, { includeReplay: Boolean(includeReplay) });
     }
 
-    client.emit('beforeSendFeedback', feedbackEvent, { includeReplay: Boolean(includeReplay) });
-
-    const envelope = createEventEnvelope(feedbackEvent, dsn, client.getOptions()._metadata, client.getOptions().tunnel);
+    try {
+      const response = await transport.send(
+        createEventEnvelope(feedbackEvent, dsn, client.getOptions()._metadata, client.getOptions().tunnel),
+      );
+
+      if (attachments && attachments.length) {
+        // TODO: https://docs.sentry.io/platforms/javascript/enriching-events/attachments/
+        await transport.send(
+          createAttachmentEnvelope(
+            feedbackEvent,
+            attachments,
+            dsn,
+            client.getOptions()._metadata,
+            client.getOptions().tunnel,
+          ),
+        );
+      }
 
-    let response: TransportMakeRequestResponse;
+      // Require valid status codes, otherwise can assume feedback was not sent successfully
+      if (typeof response.statusCode === 'number' && (response.statusCode < 200 || response.statusCode >= 300)) {
+        if (response.statusCode === 0) {
+          throw new Error(
+            'Unable to send Feedback. This is because of network issues, or because you are using an ad-blocker.',
+          );
+        }
+        throw new Error('Unable to send Feedback. Invalid response from server.');
+      }
 
-    try {
-      response = await transport.send(envelope);
+      return response;
     } catch (err) {
       const error = new Error('Unable to send Feedback');
 
@@ -72,13 +96,6 @@ export async function sendFeedbackRequest(
       }
       throw error;
     }
-
-    // Require valid status codes, otherwise can assume feedback was not sent successfully
-    if (typeof response.statusCode === 'number' && (response.statusCode < 200 || response.statusCode >= 300)) {
-      throw new Error('Unable to send Feedback');
-    }
-
-    return response;
   });
 }
 
diff --git a/packages/feedback/src/index.ts b/packages/feedback/src/index.ts
index 8fcba29c5d0f..e8233ec2455e 100644
--- a/packages/feedback/src/index.ts
+++ b/packages/feedback/src/index.ts
@@ -1,6 +1,7 @@
-export { sendFeedback } from './sendFeedback';
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  Feedback,
-  feedbackIntegration,
-} from './integration';
+export { sendFeedback } from './core/sendFeedback';
+export { feedbackIntegration } from './core/integration';
+export { feedbackModalIntegration } from './modal/integration';
+export { feedbackScreenshotIntegration } from './screenshot/integration';
+
+export type { OptionalFeedbackConfiguration } from './types';
+export type { IFeedbackIntegration } from './core/integration';
diff --git a/packages/feedback/src/integration.ts b/packages/feedback/src/integration.ts
deleted file mode 100644
index b70bf008d24d..000000000000
--- a/packages/feedback/src/integration.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-import type { Integration, IntegrationFn } from '@sentry/types';
-import { isBrowser, logger } from '@sentry/utils';
-
-import {
-  ACTOR_LABEL,
-  CANCEL_BUTTON_LABEL,
-  DEFAULT_THEME,
-  EMAIL_LABEL,
-  EMAIL_PLACEHOLDER,
-  FORM_TITLE,
-  MESSAGE_LABEL,
-  MESSAGE_PLACEHOLDER,
-  NAME_LABEL,
-  NAME_PLACEHOLDER,
-  SUBMIT_BUTTON_LABEL,
-  SUCCESS_MESSAGE_TEXT,
-  WINDOW,
-} from './constants';
-import { DEBUG_BUILD } from './debug-build';
-import type { FeedbackInternalOptions, FeedbackWidget, OptionalFeedbackConfiguration } from './types';
-import { mergeOptions } from './util/mergeOptions';
-import { createActorStyles } from './widget/Actor.css';
-import { createShadowHost } from './widget/createShadowHost';
-import { createWidget } from './widget/createWidget';
-
-const doc = WINDOW.document;
-
-export const feedbackIntegration = ((options?: OptionalFeedbackConfiguration) => {
-  // eslint-disable-next-line deprecation/deprecation
-  return new Feedback(options);
-}) satisfies IntegrationFn;
-
-/**
- * Feedback integration. When added as an integration to the SDK, it will
- * inject a button in the bottom-right corner of the window that opens a
- * feedback modal when clicked.
- *
- * @deprecated Use `feedbackIntegration()` instead.
- */
-export class Feedback implements Integration {
-  /**
-   * @inheritDoc
-   */
-  public static id: string = 'Feedback';
-
-  /**
-   * @inheritDoc
-   */
-  public name: string;
-
-  /**
-   * Feedback configuration options
-   */
-  public options: FeedbackInternalOptions;
-
-  /**
-   * Reference to widget element that is created when autoInject is true
-   */
-  private _widget: FeedbackWidget | null;
-
-  /**
-   * List of all widgets that are created from the integration
-   */
-  private _widgets: Set<FeedbackWidget>;
-
-  /**
-   * Reference to the host element where widget is inserted
-   */
-  private _host: HTMLDivElement | null;
-
-  /**
-   * Refernce to Shadow DOM root
-   */
-  private _shadow: ShadowRoot | null;
-
-  /**
-   * Tracks if actor styles have ever been inserted into shadow DOM
-   */
-  private _hasInsertedActorStyles: boolean;
-
-  public constructor({
-    autoInject = true,
-    id = 'sentry-feedback',
-    isEmailRequired = false,
-    isNameRequired = false,
-    showBranding = true,
-    showEmail = true,
-    showName = true,
-    useSentryUser = {
-      email: 'email',
-      name: 'username',
-    },
-
-    themeDark,
-    themeLight,
-    colorScheme = 'system',
-
-    buttonLabel = ACTOR_LABEL,
-    cancelButtonLabel = CANCEL_BUTTON_LABEL,
-    submitButtonLabel = SUBMIT_BUTTON_LABEL,
-    formTitle = FORM_TITLE,
-    emailPlaceholder = EMAIL_PLACEHOLDER,
-    emailLabel = EMAIL_LABEL,
-    messagePlaceholder = MESSAGE_PLACEHOLDER,
-    messageLabel = MESSAGE_LABEL,
-    namePlaceholder = NAME_PLACEHOLDER,
-    nameLabel = NAME_LABEL,
-    successMessageText = SUCCESS_MESSAGE_TEXT,
-
-    onFormClose,
-    onFormOpen,
-    onSubmitError,
-    onSubmitSuccess,
-  }: OptionalFeedbackConfiguration = {}) {
-    // eslint-disable-next-line deprecation/deprecation
-    this.name = Feedback.id;
-
-    // tsc fails if these are not initialized explicitly constructor, e.g. can't call `_initialize()`
-    this._host = null;
-    this._shadow = null;
-    this._widget = null;
-    this._widgets = new Set();
-    this._hasInsertedActorStyles = false;
-
-    this.options = {
-      autoInject,
-      showBranding,
-      id,
-      isEmailRequired,
-      isNameRequired,
-      showEmail,
-      showName,
-      useSentryUser,
-
-      colorScheme,
-      themeDark: {
-        ...DEFAULT_THEME.dark,
-        ...themeDark,
-      },
-      themeLight: {
-        ...DEFAULT_THEME.light,
-        ...themeLight,
-      },
-
-      buttonLabel,
-      cancelButtonLabel,
-      submitButtonLabel,
-      formTitle,
-      emailLabel,
-      emailPlaceholder,
-      messageLabel,
-      messagePlaceholder,
-      nameLabel,
-      namePlaceholder,
-      successMessageText,
-
-      onFormClose,
-      onFormOpen,
-      onSubmitError,
-      onSubmitSuccess,
-    };
-  }
-
-  /**
-   * Setup and initialize feedback container
-   */
-  public setupOnce(): void {
-    if (!isBrowser()) {
-      return;
-    }
-
-    try {
-      this._cleanupWidgetIfExists();
-
-      const { autoInject } = this.options;
-
-      if (!autoInject) {
-        // Nothing to do here
-        return;
-      }
-
-      this._createWidget(this.options);
-    } catch (err) {
-      DEBUG_BUILD && logger.error(err);
-    }
-  }
-
-  /**
-   * Allows user to open the dialog box. Creates a new widget if
-   * `autoInject` was false, otherwise re-uses the default widget that was
-   * created during initialization of the integration.
-   */
-  public openDialog(): void {
-    if (!this._widget) {
-      this._createWidget({ ...this.options, shouldCreateActor: false });
-    }
-
-    if (!this._widget) {
-      return;
-    }
-
-    this._widget.openDialog();
-  }
-
-  /**
-   * Closes the dialog for the default widget, if it exists
-   */
-  public closeDialog(): void {
-    if (!this._widget) {
-      // Nothing to do if widget does not exist
-      return;
-    }
-
-    this._widget.closeDialog();
-  }
-
-  /**
-   * Adds click listener to attached element to open a feedback dialog
-   */
-  public attachTo(el: Element | string, optionOverrides?: OptionalFeedbackConfiguration): FeedbackWidget | null {
-    try {
-      const options = mergeOptions(this.options, optionOverrides || {});
-
-      return this._ensureShadowHost<FeedbackWidget | null>(options, ({ shadow }) => {
-        const targetEl =
-          typeof el === 'string' ? doc.querySelector(el) : typeof el.addEventListener === 'function' ? el : null;
-
-        if (!targetEl) {
-          DEBUG_BUILD && logger.error('[Feedback] Unable to attach to target element');
-          return null;
-        }
-
-        const widget = createWidget({ shadow, options, attachTo: targetEl });
-        this._widgets.add(widget);
-
-        if (!this._widget) {
-          this._widget = widget;
-        }
-
-        return widget;
-      });
-    } catch (err) {
-      DEBUG_BUILD && logger.error(err);
-      return null;
-    }
-  }
-
-  /**
-   * Creates a new widget. Accepts partial options to override any options passed to constructor.
-   */
-  public createWidget(
-    optionOverrides?: OptionalFeedbackConfiguration & { shouldCreateActor?: boolean },
-  ): FeedbackWidget | null {
-    try {
-      return this._createWidget(mergeOptions(this.options, optionOverrides || {}));
-    } catch (err) {
-      DEBUG_BUILD && logger.error(err);
-      return null;
-    }
-  }
-
-  /**
-   * Removes a single widget
-   */
-  public removeWidget(widget: FeedbackWidget | null | undefined): boolean {
-    if (!widget) {
-      return false;
-    }
-
-    try {
-      if (this._widgets.has(widget)) {
-        widget.removeActor();
-        widget.removeDialog();
-        this._widgets.delete(widget);
-
-        if (this._widget === widget) {
-          // TODO: is more clean-up needed? e.g. call remove()
-          this._widget = null;
-        }
-
-        return true;
-      }
-    } catch (err) {
-      DEBUG_BUILD && logger.error(err);
-    }
-
-    return false;
-  }
-
-  /**
-   * Returns the default (first-created) widget
-   */
-  public getWidget(): FeedbackWidget | null {
-    return this._widget;
-  }
-
-  /**
-   * Removes the Feedback integration (including host, shadow DOM, and all widgets)
-   */
-  public remove(): void {
-    if (this._host) {
-      this._host.remove();
-    }
-    this._initialize();
-  }
-
-  /**
-   * Initializes values of protected properties
-   */
-  protected _initialize(): void {
-    this._host = null;
-    this._shadow = null;
-    this._widget = null;
-    this._widgets = new Set();
-    this._hasInsertedActorStyles = false;
-  }
-
-  /**
-   * Clean-up the widget if it already exists in the DOM. This shouldn't happen
-   * in prod, but can happen in development with hot module reloading.
-   */
-  protected _cleanupWidgetIfExists(): void {
-    if (this._host) {
-      this.remove();
-    }
-    const existingFeedback = doc.querySelector(`#${this.options.id}`);
-    if (existingFeedback) {
-      existingFeedback.remove();
-    }
-  }
-
-  /**
-   * Creates a new widget, after ensuring shadow DOM exists
-   */
-  protected _createWidget(options: FeedbackInternalOptions & { shouldCreateActor?: boolean }): FeedbackWidget | null {
-    return this._ensureShadowHost<FeedbackWidget>(options, ({ shadow }) => {
-      const widget = createWidget({ shadow, options });
-
-      if (!this._hasInsertedActorStyles && widget.actor) {
-        shadow.appendChild(createActorStyles(doc));
-        this._hasInsertedActorStyles = true;
-      }
-
-      this._widgets.add(widget);
-
-      if (!this._widget) {
-        this._widget = widget;
-      }
-
-      return widget;
-    });
-  }
-
-  /**
-   * Ensures that shadow DOM exists and is added to the DOM
-   */
-  protected _ensureShadowHost<T>(
-    options: FeedbackInternalOptions,
-    cb: (createShadowHostResult: ReturnType<typeof createShadowHost>) => T,
-  ): T | null {
-    let needsAppendHost = false;
-
-    // Don't create if it already exists
-    if (!this._shadow || !this._host) {
-      const { id, colorScheme, themeLight, themeDark } = options;
-      const { shadow, host } = createShadowHost({
-        id,
-        colorScheme,
-        themeLight,
-        themeDark,
-      });
-      this._shadow = shadow;
-      this._host = host;
-      needsAppendHost = true;
-    }
-
-    // set data attribute on host for different themes
-    this._host.dataset.sentryFeedbackColorscheme = options.colorScheme;
-
-    const result = cb({ shadow: this._shadow, host: this._host });
-
-    if (needsAppendHost) {
-      doc.body.appendChild(this._host);
-    }
-
-    return result;
-  }
-}
diff --git a/packages/feedback/src/widget/Dialog.css.ts b/packages/feedback/src/modal/components/Dialog.css.ts
similarity index 85%
rename from packages/feedback/src/widget/Dialog.css.ts
rename to packages/feedback/src/modal/components/Dialog.css.ts
index b3924f00524a..4d5fe338871b 100644
--- a/packages/feedback/src/widget/Dialog.css.ts
+++ b/packages/feedback/src/modal/components/Dialog.css.ts
@@ -1,8 +1,10 @@
+import { DOCUMENT } from '../../constants';
+
 /**
  * Creates <style> element for widget dialog
  */
-export function createDialogStyles(d: Document): HTMLStyleElement {
-  const style = d.createElement('style');
+export function createDialogStyles(): HTMLStyleElement {
+  const style = DOCUMENT.createElement('style');
 
   style.textContent = `
 .dialog {
@@ -42,14 +44,20 @@ export function createDialogStyles(d: Document): HTMLStyleElement {
   background-color: var(--background);
   color: var(--foreground);
 
-  width: 320px;
   max-width: 100%;
   max-height: calc(100% - 2rem);
   display: flex;
   flex-direction: column;
+  gap: 16px;
   box-shadow: var(--box-shadow);
   transition: transform 0.2s ease-in-out;
   transform: translate(0, 0) scale(1);
+
+  padding: 24px;
+}
+.dialog__content-fullscreen {
+  top: 16px;
+  left: 16px;
 }
 
 .dialog__header {
@@ -58,9 +66,8 @@ export function createDialogStyles(d: Document): HTMLStyleElement {
   justify-content: space-between;
   font-size: 20px;
   font-weight: 600;
-  padding: 24px 24px 0 24px;
   margin: 0;
-  margin-bottom: 16px;
+
 }
 
 .brand-link {
@@ -69,25 +76,31 @@ export function createDialogStyles(d: Document): HTMLStyleElement {
 
 .error {
   color: var(--error);
-  margin-bottom: 16px;
 }
 
 .form {
-  display: grid;
+  display: flex;
+  overflow: auto;
+  flex-direction: row;
+  gap: 16px;
+  flex: 1 0;
+}
+
+.form__right {
+  width: 272px;
+  display: flex;
   overflow: auto;
   flex-direction: column;
+  justify-content: space-between;
   gap: 16px;
-  padding: 0 24px 24px;
+  flex-shrink: 0;
 }
 
+
 .form__error-container {
   color: var(--error);
 }
 
-.form__error-container--hidden {
-  display: none;
-}
-
 .form__label {
   display: flex;
   flex-direction: column;
@@ -176,6 +189,13 @@ export function createDialogStyles(d: Document): HTMLStyleElement {
 }
 
 .success-message {
+  position: fixed;
+  left: var(--left);
+  right: var(--right);
+  bottom: var(--bottom);
+  top: var(--top);
+  z-index: var(--z-index);
+
   background-color: var(--background);
   border: var(--border);
   border-radius: var(--border-radius);
@@ -191,6 +211,10 @@ export function createDialogStyles(d: Document): HTMLStyleElement {
   cursor: default;
 }
 
+.success-icon {
+  display: flex;
+}
+
 .success-icon path {
   fill: var(--success);
 }
diff --git a/packages/feedback/src/modal/components/DialogContainer.tsx b/packages/feedback/src/modal/components/DialogContainer.tsx
new file mode 100644
index 000000000000..9c178ea9de2d
--- /dev/null
+++ b/packages/feedback/src/modal/components/DialogContainer.tsx
@@ -0,0 +1,58 @@
+// biome-ignore lint/nursery/noUnusedImports: reason
+import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import type { VNode } from 'preact';
+import { useCallback, useMemo, useState } from 'preact/hooks';
+import { SUCCESS_MESSAGE_TIMEOUT } from '../../constants';
+import type { FeedbackFormData } from '../../types';
+import { DialogContent } from './DialogContent';
+import { DialogHeader } from './DialogHeader';
+import type { Props as HeaderProps } from './DialogHeader';
+import type { Props as FormProps } from './Form';
+import { Form } from './Form';
+import { SuccessIcon } from './SuccessIcon';
+
+interface Props extends HeaderProps, FormProps {
+  successMessageText: string;
+  onFormSubmitted: () => void;
+  open: boolean;
+}
+
+export function DialogComponent({ open, onFormSubmitted, successMessageText, ...props }: Props): VNode {
+  const successIconHtml = useMemo(() => ({ __html: SuccessIcon().outerHTML }), []);
+
+  const [timeoutId, setTimeoutId] = useState<NodeJS.Timeout | null>(null);
+
+  const handleOnSuccessClick = useCallback(() => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+      setTimeoutId(null);
+    }
+    onFormSubmitted();
+  }, [timeoutId]);
+
+  const onSubmitSuccess = useCallback(
+    (data: FeedbackFormData) => {
+      props.onSubmitSuccess(data);
+      setTimeoutId(() => setTimeout(onFormSubmitted, SUCCESS_MESSAGE_TIMEOUT));
+    },
+    [onFormSubmitted],
+  );
+
+  return (
+    <Fragment>
+      {timeoutId ? (
+        <div class="success-message" onClick={handleOnSuccessClick}>
+          {successMessageText}
+          <span class="success-icon" dangerouslySetInnerHTML={successIconHtml} />
+        </div>
+      ) : (
+        <dialog class="dialog" onClick={props.onFormClose} open={open}>
+          <DialogContent>
+            <DialogHeader {...props} />
+            <Form {...props} onSubmitSuccess={onSubmitSuccess} />
+          </DialogContent>
+        </dialog>
+      )}
+    </Fragment>
+  );
+}
diff --git a/packages/feedback/src/modal/components/DialogContent.tsx b/packages/feedback/src/modal/components/DialogContent.tsx
new file mode 100644
index 000000000000..0a8ebb54a990
--- /dev/null
+++ b/packages/feedback/src/modal/components/DialogContent.tsx
@@ -0,0 +1,21 @@
+// biome-ignore lint/nursery/noUnusedImports: reason
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import type { ComponentChildren, VNode } from 'preact';
+
+export interface Props {
+  children: ComponentChildren;
+}
+
+export function DialogContent({ children }: Props): VNode {
+  return (
+    <div
+      class="dialog__content"
+      onClick={e => {
+        // Stop event propagation so clicks on content modal do not propagate to dialog (which will close dialog)
+        e.stopPropagation();
+      }}
+    >
+      {children}
+    </div>
+  );
+}
diff --git a/packages/feedback/src/modal/components/DialogHeader.tsx b/packages/feedback/src/modal/components/DialogHeader.tsx
new file mode 100644
index 000000000000..2af30b580b56
--- /dev/null
+++ b/packages/feedback/src/modal/components/DialogHeader.tsx
@@ -0,0 +1,32 @@
+// biome-ignore lint/nursery/noUnusedImports: reason
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import type { VNode } from 'preact';
+import { useMemo } from 'preact/hooks';
+import type { FeedbackInternalOptions } from '../../types';
+import type { Props as LogoProps } from './SentryLogo';
+import { SentryLogo } from './SentryLogo';
+
+export interface Props extends LogoProps {
+  formTitle: FeedbackInternalOptions['formTitle'];
+  showBranding: FeedbackInternalOptions['showBranding'];
+}
+
+export function DialogHeader({ colorScheme, formTitle, showBranding }: Props): VNode {
+  const logoHtml = useMemo(() => ({ __html: SentryLogo({ colorScheme }).outerHTML }), [colorScheme]);
+
+  return (
+    <h2 class="dialog__header">
+      {formTitle}
+      {showBranding ? (
+        <a
+          class="brand-link"
+          target="_blank"
+          href="https://sentry.io/welcome/"
+          title="Powered by Sentry"
+          rel="noopener noreferrer"
+          dangerouslySetInnerHTML={logoHtml}
+        />
+      ) : null}
+    </h2>
+  );
+}
diff --git a/packages/feedback/src/modal/components/Form.tsx b/packages/feedback/src/modal/components/Form.tsx
new file mode 100644
index 000000000000..0b2b1bb98fb1
--- /dev/null
+++ b/packages/feedback/src/modal/components/Form.tsx
@@ -0,0 +1,233 @@
+import { logger } from '@sentry/utils';
+// biome-ignore lint/nursery/noUnusedImports: reason
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import type { JSX, VNode } from 'preact';
+import { useCallback, useState } from 'preact/hooks';
+import { FEEDBACK_WIDGET_SOURCE } from '../../constants';
+import type {
+  FeedbackFormData,
+  FeedbackInternalOptions,
+  ScreenshotInput,
+  SendFeedbackOptions,
+  SendFeedbackParams,
+} from '../../types';
+import { DEBUG_BUILD } from '../../util/debug-build';
+import { getMissingFields } from '../../util/validate';
+
+export interface Props
+  extends Pick<
+    FeedbackInternalOptions,
+    | 'cancelButtonLabel'
+    | 'emailLabel'
+    | 'emailPlaceholder'
+    | 'isEmailRequired'
+    | 'isNameRequired'
+    | 'messageLabel'
+    | 'messagePlaceholder'
+    | 'nameLabel'
+    | 'namePlaceholder'
+    | 'showEmail'
+    | 'showName'
+    | 'submitButtonLabel'
+  > {
+  defaultEmail: string;
+  defaultName: string;
+  onFormClose: () => void;
+  onSubmit: (data: SendFeedbackParams, options?: SendFeedbackOptions) => void;
+  onSubmitSuccess: (data: FeedbackFormData) => void;
+  onSubmitError: (error: Error) => void;
+  screenshotInput: ScreenshotInput | undefined;
+}
+
+function retrieveStringValue(formData: FormData, key: string): string {
+  const value = formData.get(key);
+  if (typeof value === 'string') {
+    return value.trim();
+  }
+  return '';
+}
+
+export function Form({
+  cancelButtonLabel,
+  defaultEmail,
+  defaultName,
+  emailLabel,
+  emailPlaceholder,
+  isEmailRequired,
+  isNameRequired,
+  messageLabel,
+  messagePlaceholder,
+  nameLabel,
+  namePlaceholder,
+  onFormClose,
+  onSubmit,
+  onSubmitSuccess,
+  onSubmitError,
+  showEmail,
+  showName,
+  submitButtonLabel,
+  screenshotInput,
+}: Props): VNode {
+  // TODO: set a ref on the form, and whenever an input changes call proceessForm() and setError()
+  const [error, setError] = useState<null | string>(null);
+
+  const [showScreenshotInput, setShowScreenshotInput] = useState(false);
+  const ScreenshotInput = screenshotInput && screenshotInput.input;
+  const includeScreenshotValue = ScreenshotInput && showScreenshotInput;
+
+  const [screenshotError, setScreenshotError] = useState<null | Error>(null);
+  const onScreenshotError = useCallback((error: Error) => {
+    setScreenshotError(error);
+    setShowScreenshotInput(false);
+  }, []);
+
+  const hasAllRequiredFields = useCallback(
+    (data: FeedbackFormData) => {
+      const missingFields = getMissingFields(data, {
+        emailLabel,
+        isEmailRequired,
+        isNameRequired,
+        messageLabel,
+        nameLabel,
+      });
+
+      if (missingFields.length > 0) {
+        setError(`Please enter in the following required fields: ${missingFields.join(', ')}`);
+      } else {
+        setError(null);
+      }
+
+      return missingFields.length === 0;
+    },
+    [emailLabel, isEmailRequired, isNameRequired, messageLabel, nameLabel],
+  );
+
+  const handleSubmit = useCallback(
+    async (e: JSX.TargetedSubmitEvent<HTMLFormElement>) => {
+      try {
+        e.preventDefault();
+        if (!(e.target instanceof HTMLFormElement)) {
+          return;
+        }
+        const formData = new FormData(e.target);
+        const attachment = await (includeScreenshotValue ? screenshotInput.value() : undefined);
+        const data: FeedbackFormData = {
+          name: retrieveStringValue(formData, 'name'),
+          email: retrieveStringValue(formData, 'email'),
+          message: retrieveStringValue(formData, 'message'),
+          attachments: attachment ? [attachment] : undefined,
+        };
+        if (!hasAllRequiredFields(data)) {
+          return;
+        }
+        try {
+          await onSubmit({ ...data, source: FEEDBACK_WIDGET_SOURCE });
+          onSubmitSuccess(data);
+        } catch (error) {
+          DEBUG_BUILD && logger.error(error);
+          setError('There was a problem submitting feedback, please wait and try again.');
+          onSubmitError(error as Error);
+        }
+      } catch {
+        // pass
+      }
+    },
+    [includeScreenshotValue, onSubmitSuccess, onSubmitError],
+  );
+
+  return (
+    <form class="form" onSubmit={handleSubmit}>
+      {includeScreenshotValue ? <ScreenshotInput onError={onScreenshotError} /> : null}
+
+      <div class="form__right">
+        <div class="form__top">
+          {error ? <div class="form__error-container">{error}</div> : null}
+
+          {showName ? (
+            <label for="name" class="form__label">
+              <LabelText label={nameLabel} isRequired={isNameRequired} />
+              <input
+                class="form__input"
+                defaultValue={defaultName}
+                id="name"
+                name="name"
+                placeholder={namePlaceholder}
+                required={isNameRequired}
+                type="text"
+              />
+            </label>
+          ) : (
+            <input aria-hidden value={defaultName} name="name" type="hidden" />
+          )}
+
+          {showEmail ? (
+            <label for="email" class="form__label">
+              <LabelText label={emailLabel} isRequired={isEmailRequired} />
+              <input
+                class="form__input"
+                defaultValue={defaultEmail}
+                id="email"
+                name="email"
+                placeholder={emailPlaceholder}
+                required={isEmailRequired}
+                type="text"
+              ></input>
+            </label>
+          ) : (
+            <input aria-hidden value={defaultEmail} name="email" type="hidden" />
+          )}
+
+          <label for="message" class="form__label">
+            <LabelText label={messageLabel} isRequired />
+            <textarea
+              autoFocus
+              class="form__input form__input--textarea"
+              id="message"
+              name="message"
+              placeholder={messagePlaceholder}
+              required={true}
+              rows={5}
+            />
+          </label>
+
+          {ScreenshotInput ? (
+            <label for="screenshot" class="form__label">
+              <span class="form__label__text">Screenshot</span>
+
+              <button
+                class="btn btn--default"
+                type="button"
+                onClick={() => {
+                  setScreenshotError(null);
+                  setShowScreenshotInput(prev => !prev);
+                }}
+              >
+                {showScreenshotInput ? 'Remove' : 'Add'}
+              </button>
+              {screenshotError ? <div class="form__error-container">{screenshotError.message}</div> : null}
+            </label>
+          ) : null}
+        </div>
+        <div class="form__bottom">
+          <div class="btn-group">
+            <button class="btn btn--primary" type="submit">
+              {submitButtonLabel}
+            </button>
+            <button class="btn btn--default" type="button" onClick={onFormClose}>
+              {cancelButtonLabel}
+            </button>
+          </div>
+        </div>
+      </div>
+    </form>
+  );
+}
+
+function LabelText({ label, isRequired }: { label: string; isRequired: boolean }): VNode {
+  return (
+    <span class="form__label__text">
+      {label}
+      {isRequired && <span class="form__label__text--required">(required)</span>}
+    </span>
+  );
+}
diff --git a/packages/feedback/src/widget/Icon.ts b/packages/feedback/src/modal/components/Icon.ts
similarity index 91%
rename from packages/feedback/src/widget/Icon.ts
rename to packages/feedback/src/modal/components/Icon.ts
index 29b2d25bee8d..93c1d3884c52 100644
--- a/packages/feedback/src/widget/Icon.ts
+++ b/packages/feedback/src/modal/components/Icon.ts
@@ -1,19 +1,15 @@
-import { WINDOW } from '../constants';
-import { setAttributesNS } from '../util/setAttributesNS';
+import { DOCUMENT } from '../../constants';
+import { setAttributesNS } from '../../util/setAttributesNS';
 
 const SIZE = 20;
 const XMLNS = 'http://www.w3.org/2000/svg';
 
-interface IconReturn {
-  el: SVGElement;
-}
-
 /**
  * Feedback Icon
  */
-export function Icon(): IconReturn {
+export function Icon(): SVGElement {
   const createElementNS = <K extends keyof SVGElementTagNameMap>(tagName: K): SVGElementTagNameMap[K] =>
-    WINDOW.document.createElementNS(XMLNS, tagName);
+    DOCUMENT.createElementNS(XMLNS, tagName);
   const svg = setAttributesNS(createElementNS('svg'), {
     class: 'feedback-icon',
     width: `${SIZE}`,
@@ -49,9 +45,5 @@ export function Icon(): IconReturn {
 
   svg.appendChild(speakerDefs).appendChild(speakerClipPathDef).appendChild(speakerRect);
 
-  return {
-    get el() {
-      return svg;
-    },
-  };
+  return svg;
 }
diff --git a/packages/feedback/src/widget/Logo.ts b/packages/feedback/src/modal/components/SentryLogo.ts
similarity index 76%
rename from packages/feedback/src/widget/Logo.ts
rename to packages/feedback/src/modal/components/SentryLogo.ts
index 9e286a970961..1e32ad8efdcd 100644
--- a/packages/feedback/src/widget/Logo.ts
+++ b/packages/feedback/src/modal/components/SentryLogo.ts
@@ -1,21 +1,19 @@
-import { WINDOW } from '../constants';
-import type { FeedbackInternalOptions } from '../types';
-import { setAttributesNS } from '../util/setAttributesNS';
+import { DOCUMENT } from '../../constants';
+import type { FeedbackInternalOptions } from '../../types';
+import { setAttributesNS } from '../../util/setAttributesNS';
 
 const XMLNS = 'http://www.w3.org/2000/svg';
 
-interface IconReturn {
-  el: SVGElement;
-}
-
-type Props = Pick<FeedbackInternalOptions, 'colorScheme'>;
+export type Props = {
+  colorScheme: FeedbackInternalOptions['colorScheme'];
+};
 
 /**
  * Sentry Logo
  */
-export function Logo({ colorScheme }: Props): IconReturn {
+export function SentryLogo({ colorScheme }: Props): SVGElement {
   const createElementNS = <K extends keyof SVGElementTagNameMap>(tagName: K): SVGElementTagNameMap[K] =>
-    WINDOW.document.createElementNS(XMLNS, tagName);
+    DOCUMENT.createElementNS(XMLNS, tagName);
   const svg = setAttributesNS(createElementNS('svg'), {
     class: 'sentry-logo',
     width: '32',
@@ -51,9 +49,5 @@ export function Logo({ colorScheme }: Props): IconReturn {
   defs.append(style);
   svg.append(defs);
 
-  return {
-    get el() {
-      return svg;
-    },
-  };
+  return svg;
 }
diff --git a/packages/feedback/src/widget/SuccessIcon.ts b/packages/feedback/src/modal/components/SuccessIcon.ts
similarity index 91%
rename from packages/feedback/src/widget/SuccessIcon.ts
rename to packages/feedback/src/modal/components/SuccessIcon.ts
index 6092481672b9..fddd8c6fb941 100644
--- a/packages/feedback/src/widget/SuccessIcon.ts
+++ b/packages/feedback/src/modal/components/SuccessIcon.ts
@@ -1,22 +1,17 @@
-import { WINDOW } from '../constants';
-import { setAttributesNS } from '../util/setAttributesNS';
+import { WINDOW } from '../../constants';
+import { setAttributesNS } from '../../util/setAttributesNS';
 
 const WIDTH = 16;
 const HEIGHT = 17;
 const XMLNS = 'http://www.w3.org/2000/svg';
 
-interface IconReturn {
-  el: SVGElement;
-}
-
 /**
  * Success Icon (checkmark)
  */
-export function SuccessIcon(): IconReturn {
+export function SuccessIcon(): SVGElement {
   const createElementNS = <K extends keyof SVGElementTagNameMap>(tagName: K): SVGElementTagNameMap[K] =>
     WINDOW.document.createElementNS(XMLNS, tagName);
   const svg = setAttributesNS(createElementNS('svg'), {
-    class: 'success-icon',
     width: `${WIDTH}`,
     height: `${HEIGHT}`,
     viewBox: `0 0 ${WIDTH} ${HEIGHT}`,
@@ -55,9 +50,5 @@ export function SuccessIcon(): IconReturn {
 
   svg.appendChild(speakerDefs).appendChild(speakerClipPathDef).appendChild(speakerRect);
 
-  return {
-    get el() {
-      return svg;
-    },
-  };
+  return svg;
 }
diff --git a/packages/feedback/src/modal/createDialog.tsx b/packages/feedback/src/modal/createDialog.tsx
new file mode 100644
index 000000000000..d0c65389e006
--- /dev/null
+++ b/packages/feedback/src/modal/createDialog.tsx
@@ -0,0 +1,94 @@
+import { getCurrentScope } from '@sentry/core';
+import { h, render } from 'preact';
+import { DOCUMENT } from '../constants';
+import type { sendFeedback as sendFeedbackFn } from '../core/sendFeedback';
+import type { IFeedbackScreenshotIntegration } from '../screenshot/integration';
+import type { Dialog, FeedbackFormData, FeedbackInternalOptions } from '../types';
+import { createDialogStyles } from './components/Dialog.css';
+import { DialogComponent } from './components/DialogContainer';
+
+interface Props {
+  options: FeedbackInternalOptions;
+  screenshotIntegration: IFeedbackScreenshotIntegration | undefined;
+  sendFeedback: typeof sendFeedbackFn;
+  shadow: ShadowRoot;
+}
+
+export function createDialog({ options, screenshotIntegration, sendFeedback, shadow }: Props): Dialog {
+  const userKey = options.useSentryUser;
+  const scope = getCurrentScope();
+  const user = scope && scope.getUser();
+
+  const el = DOCUMENT.createElement('div');
+  const style = createDialogStyles();
+
+  const dialog = {
+    get el() {
+      return el;
+    },
+    appendToDom(): void {
+      if (!shadow.contains(style) && !shadow.contains(el)) {
+        shadow.appendChild(style);
+        shadow.appendChild(el);
+      }
+    },
+    removeFromDom(): void {
+      shadow.removeChild(el);
+      shadow.removeChild(style);
+    },
+    open() {
+      renderContent(true);
+      options.onFormOpen && options.onFormOpen();
+    },
+    close() {
+      renderContent(false);
+    },
+  };
+
+  const screenshotInput = screenshotIntegration && screenshotIntegration.createInput(h, dialog);
+
+  const renderContent = (open: boolean): void => {
+    render(
+      <DialogComponent
+        screenshotInput={screenshotInput}
+        colorScheme={options.colorScheme}
+        showBranding={options.showBranding}
+        showName={options.showName || options.isNameRequired}
+        showEmail={options.showEmail || options.isEmailRequired}
+        isNameRequired={options.isNameRequired}
+        isEmailRequired={options.isEmailRequired}
+        formTitle={options.formTitle}
+        cancelButtonLabel={options.cancelButtonLabel}
+        submitButtonLabel={options.submitButtonLabel}
+        emailLabel={options.emailLabel}
+        emailPlaceholder={options.emailPlaceholder}
+        messageLabel={options.messageLabel}
+        messagePlaceholder={options.messagePlaceholder}
+        nameLabel={options.nameLabel}
+        namePlaceholder={options.namePlaceholder}
+        defaultName={(userKey && user && user[userKey.name]) || ''}
+        defaultEmail={(userKey && user && user[userKey.email]) || ''}
+        successMessageText={options.successMessageText}
+        onFormClose={() => {
+          renderContent(false);
+          options.onFormClose && options.onFormClose();
+        }}
+        onSubmit={sendFeedback}
+        onSubmitSuccess={(data: FeedbackFormData) => {
+          renderContent(false);
+          options.onSubmitSuccess && options.onSubmitSuccess(data);
+        }}
+        onSubmitError={(error: Error) => {
+          options.onSubmitError && options.onSubmitError(error);
+        }}
+        onFormSubmitted={() => {
+          options.onFormSubmitted && options.onFormSubmitted();
+        }}
+        open={open}
+      />,
+      el,
+    );
+  };
+
+  return dialog;
+}
diff --git a/packages/feedback/src/modal/integration.ts b/packages/feedback/src/modal/integration.ts
new file mode 100644
index 000000000000..67f2c327db5b
--- /dev/null
+++ b/packages/feedback/src/modal/integration.ts
@@ -0,0 +1,22 @@
+import { defineIntegration } from '@sentry/core';
+import type { IntegrationFn, IntegrationFnResult } from '@sentry/types';
+import { createDialog } from './createDialog';
+
+interface PublicFeedbackModalIntegration {
+  createDialog: typeof createDialog;
+}
+
+const INTEGRATION_NAME = 'FeedbackModal';
+
+export type IFeedbackModalIntegration = IntegrationFnResult & PublicFeedbackModalIntegration;
+
+export const _feedbackModalIntegration = (() => {
+  return {
+    name: INTEGRATION_NAME,
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setupOnce() {},
+    createDialog,
+  };
+}) satisfies IntegrationFn;
+
+export const feedbackModalIntegration = defineIntegration(_feedbackModalIntegration);
diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
new file mode 100644
index 000000000000..d3753631ec1c
--- /dev/null
+++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
@@ -0,0 +1,330 @@
+// eslint-disable max-lines
+import type { ComponentType, VNode, h as hType } from 'preact';
+// biome-ignore lint: needed for preact
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { useCallback, useEffect, useMemo, useRef, useState } from 'preact/hooks';
+import { DOCUMENT, WINDOW } from '../../constants';
+import type { Dialog } from '../../types';
+import { createScreenshotInputStyles } from './ScreenshotInput.css';
+import { useTakeScreenshot } from './useTakeScreenshot';
+
+interface FactoryParams {
+  h: typeof hType;
+  imageBuffer: HTMLCanvasElement;
+  dialog: Dialog;
+}
+
+interface Props {
+  onError: (error: Error) => void;
+}
+
+interface Box {
+  startx: number;
+  starty: number;
+  endx: number;
+  endy: number;
+}
+
+interface Rect {
+  x: number;
+  y: number;
+  height: number;
+  width: number;
+}
+
+const constructRect = (box: Box): Rect => {
+  return {
+    x: Math.min(box.startx, box.endx),
+    y: Math.min(box.starty, box.endy),
+    width: Math.abs(box.startx - box.endx),
+    height: Math.abs(box.starty - box.endy),
+  };
+};
+
+const getContainedSize = (img: HTMLCanvasElement): Box => {
+  const ratio = img.width / img.height;
+  let width = img.clientHeight * ratio;
+  let height = img.clientHeight;
+  if (width > img.clientWidth) {
+    width = img.clientWidth;
+    height = img.clientWidth / ratio;
+  }
+  const x = (img.clientWidth - width) / 2;
+  const y = (img.clientHeight - height) / 2;
+  return { startx: x, starty: y, endx: width + x, endy: height + y };
+};
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+export function makeScreenshotEditorComponent({ h, imageBuffer, dialog }: FactoryParams): ComponentType<Props> {
+  return function ScreenshotEditor({ onError }: Props): VNode {
+    const styles = useMemo(() => ({ __html: createScreenshotInputStyles().innerText }), []);
+
+    const canvasContainerRef = useRef<HTMLDivElement>(null);
+    const cropContainerRef = useRef<HTMLDivElement>(null);
+    const croppingRef = useRef<HTMLCanvasElement>(null);
+    const [croppingRect, setCroppingRect] = useState<Box>({ startx: 0, starty: 0, endx: 0, endy: 0 });
+    const [confirmCrop, setConfirmCrop] = useState(false);
+
+    useEffect(() => {
+      WINDOW.addEventListener('resize', resizeCropper, false);
+    }, []);
+
+    function resizeCropper(): void {
+      const cropper = croppingRef.current;
+      const imageDimensions = constructRect(getContainedSize(imageBuffer));
+      if (cropper) {
+        cropper.width = imageDimensions.width;
+        cropper.height = imageDimensions.height;
+      }
+
+      const cropButton = cropContainerRef.current;
+      if (cropButton) {
+        cropButton.style.width = `${imageDimensions.width}px`;
+        cropButton.style.height = `${imageDimensions.height}px`;
+        cropButton.style.left = `${imageDimensions.x}px`;
+        cropButton.style.top = `${imageDimensions.y}px`;
+      }
+
+      setCroppingRect({ startx: 0, starty: 0, endx: imageDimensions.width, endy: imageDimensions.height });
+    }
+
+    useEffect(() => {
+      const cropper = croppingRef.current;
+      if (!cropper) {
+        return;
+      }
+
+      const ctx = cropper.getContext('2d');
+      if (!ctx) {
+        return;
+      }
+      const imageDimensions = constructRect(getContainedSize(imageBuffer));
+      const croppingBox = constructRect(croppingRect);
+
+      ctx.clearRect(0, 0, imageDimensions.width, imageDimensions.height);
+
+      // draw gray overlay around the selection
+      ctx.fillStyle = 'rgba(0, 0, 0, 0.5)';
+      ctx.fillRect(0, 0, imageDimensions.width, imageDimensions.height);
+      ctx.clearRect(croppingBox.x, croppingBox.y, croppingBox.width, croppingBox.height);
+
+      // draw selection border
+      ctx.strokeStyle = 'purple';
+      ctx.lineWidth = 3;
+      ctx.strokeRect(croppingBox.x, croppingBox.y, croppingBox.width, croppingBox.height);
+    }, [croppingRect]);
+
+    function onGrabButton(e: Event, corner: string): void {
+      setConfirmCrop(false);
+      const handleMouseMove = makeHandleMouseMove(corner);
+      const handleMouseUp = (): void => {
+        croppingRef.current && croppingRef.current.removeEventListener('mousemove', handleMouseMove);
+        DOCUMENT.removeEventListener('mouseup', handleMouseUp);
+        setConfirmCrop(true);
+      };
+
+      DOCUMENT.addEventListener('mouseup', handleMouseUp);
+      croppingRef.current && croppingRef.current.addEventListener('mousemove', handleMouseMove);
+    }
+
+    const makeHandleMouseMove = useCallback((corner: string) => {
+      return function (e: MouseEvent) {
+        switch (corner) {
+          case 'topleft':
+            setCroppingRect(prev => ({
+              ...prev,
+              startx: Math.min(e.offsetX, prev.endx - 30),
+              starty: Math.min(e.offsetY, prev.endy - 30),
+            }));
+            break;
+          case 'topright':
+            setCroppingRect(prev => ({
+              ...prev,
+              endx: Math.max(e.offsetX, prev.startx + 30),
+              starty: Math.min(e.offsetY, prev.endy - 30),
+            }));
+            break;
+          case 'bottomleft':
+            setCroppingRect(prev => ({
+              ...prev,
+              startx: Math.min(e.offsetX, prev.endx - 30),
+              endy: Math.max(e.offsetY, prev.starty + 30),
+            }));
+            break;
+          case 'bottomright':
+            setCroppingRect(prev => ({
+              ...prev,
+              endx: Math.max(e.offsetX, prev.startx + 30),
+              endy: Math.max(e.offsetY, prev.starty + 30),
+            }));
+            break;
+        }
+      };
+    }, []);
+
+    function submit(): void {
+      const cutoutCanvas = DOCUMENT.createElement('canvas');
+      const imageBox = constructRect(getContainedSize(imageBuffer));
+      const croppingBox = constructRect(croppingRect);
+      cutoutCanvas.width = croppingBox.width;
+      cutoutCanvas.height = croppingBox.height;
+
+      const cutoutCtx = cutoutCanvas.getContext('2d');
+      if (cutoutCtx && imageBuffer) {
+        cutoutCtx.drawImage(
+          imageBuffer,
+          (croppingBox.x / imageBox.width) * imageBuffer.width,
+          (croppingBox.y / imageBox.height) * imageBuffer.height,
+          (croppingBox.width / imageBox.width) * imageBuffer.width,
+          (croppingBox.height / imageBox.height) * imageBuffer.height,
+          0,
+          0,
+          croppingBox.width,
+          croppingBox.height,
+        );
+      }
+
+      const ctx = imageBuffer.getContext('2d');
+      if (ctx) {
+        ctx.clearRect(0, 0, imageBuffer.width, imageBuffer.height);
+        imageBuffer.width = cutoutCanvas.width;
+        imageBuffer.height = cutoutCanvas.height;
+        ctx.drawImage(cutoutCanvas, 0, 0);
+        resizeCropper();
+      }
+    }
+
+    useTakeScreenshot({
+      onBeforeScreenshot: useCallback(() => {
+        dialog.el.style.display = 'none';
+      }, []),
+      onScreenshot: useCallback(
+        (imageSource: HTMLVideoElement) => {
+          const context = imageBuffer.getContext('2d');
+          if (!context) {
+            throw new Error('Could not get canvas context');
+          }
+          imageBuffer.width = imageSource.videoWidth;
+          imageBuffer.height = imageSource.videoHeight;
+          context.drawImage(imageSource, 0, 0, imageSource.videoWidth, imageSource.videoHeight);
+        },
+        [imageBuffer],
+      ),
+      onAfterScreenshot: useCallback(() => {
+        dialog.el.style.display = 'block';
+        const container = canvasContainerRef.current;
+        container && container.appendChild(imageBuffer);
+        resizeCropper();
+      }, []),
+      onError: useCallback(error => {
+        dialog.el.style.display = 'block';
+        onError(error);
+      }, []),
+    });
+
+    return (
+      <div class="editor">
+        <style dangerouslySetInnerHTML={styles} />
+        <div class="canvasContainer" ref={canvasContainerRef}>
+          <div class="cropButtonContainer" style={{ position: 'absolute' }} ref={cropContainerRef}>
+            <canvas style={{ position: 'absolute' }} ref={croppingRef}></canvas>
+            <CropCorner
+              left={croppingRect.startx}
+              top={croppingRect.starty}
+              onGrabButton={onGrabButton}
+              corner="topleft"
+            ></CropCorner>
+            <CropCorner
+              left={croppingRect.endx - 30}
+              top={croppingRect.starty}
+              onGrabButton={onGrabButton}
+              corner="topright"
+            ></CropCorner>
+            <CropCorner
+              left={croppingRect.startx}
+              top={croppingRect.endy - 30}
+              onGrabButton={onGrabButton}
+              corner="bottomleft"
+            ></CropCorner>
+            <CropCorner
+              left={croppingRect.endx - 30}
+              top={croppingRect.endy - 30}
+              onGrabButton={onGrabButton}
+              corner="bottomright"
+            ></CropCorner>
+            <div
+              style={{
+                left: Math.max(0, croppingRect.endx - 191),
+                top: Math.max(0, croppingRect.endy + 8),
+                display: confirmCrop ? 'flex' : 'none',
+              }}
+              class="crop-btn-group"
+            >
+              <button
+                onClick={e => {
+                  e.preventDefault();
+                  if (croppingRef.current) {
+                    setCroppingRect({
+                      startx: 0,
+                      starty: 0,
+                      endx: croppingRef.current.width,
+                      endy: croppingRef.current.height,
+                    });
+                  }
+                  setConfirmCrop(false);
+                }}
+                class="btn btn--default"
+              >
+                Cancel
+              </button>
+              <button
+                onClick={e => {
+                  e.preventDefault();
+                  submit();
+                  setConfirmCrop(false);
+                }}
+                class="btn btn--primary"
+              >
+                Confirm
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    );
+  };
+}
+
+function CropCorner({
+  top,
+  left,
+  corner,
+  onGrabButton,
+}: {
+  top: number;
+  left: number;
+  corner: string;
+  onGrabButton: (e: Event, corner: string) => void;
+}): VNode {
+  return (
+    <button
+      class="crop-btn"
+      style={{
+        top: top,
+        left: left,
+        borderTop: corner === 'topleft' || corner === 'topright' ? 'solid purple' : 'none',
+        borderLeft: corner === 'topleft' || corner === 'bottomleft' ? 'solid purple' : 'none',
+        borderRight: corner === 'topright' || corner === 'bottomright' ? 'solid purple' : 'none',
+        borderBottom: corner === 'bottomleft' || corner === 'bottomright' ? 'solid purple' : 'none',
+        borderWidth: '3px',
+      }}
+      onMouseDown={e => {
+        e.preventDefault();
+        onGrabButton(e, corner);
+      }}
+      onClick={e => {
+        e.preventDefault();
+      }}
+    ></button>
+  );
+}
diff --git a/packages/feedback/src/screenshot/components/ScreenshotInput.css.ts b/packages/feedback/src/screenshot/components/ScreenshotInput.css.ts
new file mode 100644
index 000000000000..6ac3d6750010
--- /dev/null
+++ b/packages/feedback/src/screenshot/components/ScreenshotInput.css.ts
@@ -0,0 +1,73 @@
+import { DOCUMENT } from '../../constants';
+
+/**
+ * Creates <style> element for widget dialog
+ */
+export function createScreenshotInputStyles(): HTMLStyleElement {
+  const style = DOCUMENT.createElement('style');
+
+  const surface200 = '#FAF9FB';
+  const gray100 = '#F0ECF3';
+
+  style.textContent = `
+.dialog__content:has(.editor) {
+  top: var(--bottom);
+  left: var(--right);
+}
+
+.editor {
+  flex-grow: 1;
+
+  background-color: ${surface200};
+  background-image: repeating-linear-gradient(
+      -145deg,
+      transparent,
+      transparent 8px,
+      ${surface200} 8px,
+      ${surface200} 11px
+    ),
+    repeating-linear-gradient(
+      -45deg,
+      transparent,
+      transparent 15px,
+      ${gray100} 15px,
+      ${gray100} 16px
+    );
+}
+
+.canvasContainer {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+
+.canvasContainer canvas {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+
+.cropper {
+  width: 100%;
+  height: 100%;
+}
+
+.crop-btn-group {
+  padding: 8px;
+  gap: 8px;
+  border-radius: var(--form-content-border-radius);
+  background-color: var(--background);
+  width: 175px;
+  position: absolute;
+}
+
+.crop-btn {
+  width: 30px;
+  height: 30px;
+  position: absolute;
+  background: none;
+}
+`;
+
+  return style;
+}
diff --git a/packages/feedback/src/screenshot/components/useTakeScreenshot.tsx b/packages/feedback/src/screenshot/components/useTakeScreenshot.tsx
new file mode 100644
index 000000000000..af59edfc9d42
--- /dev/null
+++ b/packages/feedback/src/screenshot/components/useTakeScreenshot.tsx
@@ -0,0 +1,45 @@
+// biome-ignore lint/nursery/noUnusedImports: reason
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { useEffect } from 'preact/hooks';
+import { DOCUMENT, NAVIGATOR, WINDOW } from '../../constants';
+
+interface Props {
+  onBeforeScreenshot: () => void;
+  onScreenshot: (imageSource: HTMLVideoElement) => void;
+  onAfterScreenshot: () => void;
+  onError: (error: Error) => void;
+}
+
+export const useTakeScreenshot = ({ onBeforeScreenshot, onScreenshot, onAfterScreenshot, onError }: Props): void => {
+  useEffect(() => {
+    const takeScreenshot = async (): Promise<void> => {
+      onBeforeScreenshot();
+      const stream = await NAVIGATOR.mediaDevices.getDisplayMedia({
+        video: {
+          width: WINDOW.innerWidth,
+          height: WINDOW.innerHeight,
+        },
+        audio: false,
+        // @ts-expect-error experimental flags: https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia#prefercurrenttab
+        monitorTypeSurfaces: 'exclude',
+        preferCurrentTab: true,
+        selfBrowserSurface: 'include',
+        surfaceSwitching: 'exclude',
+      });
+
+      const video = DOCUMENT.createElement('video');
+      await new Promise<void>((resolve, reject) => {
+        video.srcObject = stream;
+        video.onloadedmetadata = () => {
+          onScreenshot(video);
+          stream.getTracks().forEach(track => track.stop());
+          resolve();
+        };
+        video.play().catch(reject);
+      });
+      onAfterScreenshot();
+    };
+
+    takeScreenshot().catch(onError);
+  }, []);
+};
diff --git a/packages/feedback/src/screenshot/createInput.ts b/packages/feedback/src/screenshot/createInput.ts
new file mode 100644
index 000000000000..679a82f5dfba
--- /dev/null
+++ b/packages/feedback/src/screenshot/createInput.ts
@@ -0,0 +1,33 @@
+import type { Attachment } from '@sentry/types';
+import type { h as hType } from 'preact';
+import { DOCUMENT } from '../constants';
+import type { Dialog, ScreenshotInput } from '../types';
+import { makeScreenshotEditorComponent } from './components/ScreenshotEditor';
+
+/**
+ *
+ */
+export function createInput(h: typeof hType, dialog: Dialog): ScreenshotInput {
+  const imageBuffer = DOCUMENT.createElement('canvas');
+
+  return {
+    input: makeScreenshotEditorComponent({ h, imageBuffer, dialog }),
+
+    value: async () => {
+      const blob = await new Promise<Parameters<BlobCallback>[0]>(resolve => {
+        imageBuffer.toBlob(resolve, 'image/png');
+      });
+      if (blob) {
+        const data = new Uint8Array(await blob.arrayBuffer());
+        const attachment: Attachment = {
+          data,
+          filename: 'screenshot.png',
+          contentType: 'application/png',
+          // attachmentType?: string;
+        };
+        return attachment;
+      }
+      return;
+    },
+  };
+}
diff --git a/packages/feedback/src/screenshot/integration.ts b/packages/feedback/src/screenshot/integration.ts
new file mode 100644
index 000000000000..93fb5b605e04
--- /dev/null
+++ b/packages/feedback/src/screenshot/integration.ts
@@ -0,0 +1,22 @@
+import { defineIntegration } from '@sentry/core';
+import type { IntegrationFn, IntegrationFnResult } from '@sentry/types';
+import { createInput } from './createInput';
+
+interface PublicFeedbackScreenshotIntegration {
+  createInput: typeof createInput;
+}
+
+const INTEGRATION_NAME = 'FeedbackScreenshot';
+
+export type IFeedbackScreenshotIntegration = IntegrationFnResult & PublicFeedbackScreenshotIntegration;
+
+export const _feedbackScreenshotIntegration = (() => {
+  return {
+    name: INTEGRATION_NAME,
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    setupOnce() {},
+    createInput,
+  };
+}) satisfies IntegrationFn;
+
+export const feedbackScreenshotIntegration = defineIntegration(_feedbackScreenshotIntegration);
diff --git a/packages/feedback/src/sendFeedback.ts b/packages/feedback/src/sendFeedback.ts
deleted file mode 100644
index ac60415d0462..000000000000
--- a/packages/feedback/src/sendFeedback.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { getLocationHref } from '@sentry/utils';
-
-import { FEEDBACK_API_SOURCE } from './constants';
-import type { SendFeedbackOptions } from './types';
-import { sendFeedbackRequest } from './util/sendFeedbackRequest';
-
-interface SendFeedbackParams {
-  message: string;
-  name?: string;
-  email?: string;
-  url?: string;
-  source?: string;
-}
-
-/**
- * Public API to send a Feedback item to Sentry
- */
-export function sendFeedback(
-  { name, email, message, source = FEEDBACK_API_SOURCE, url = getLocationHref() }: SendFeedbackParams,
-  options: SendFeedbackOptions = {},
-): ReturnType<typeof sendFeedbackRequest> {
-  if (!message) {
-    throw new Error('Unable to submit feedback with empty message');
-  }
-
-  return sendFeedbackRequest(
-    {
-      feedback: {
-        name,
-        email,
-        message,
-        url,
-        source,
-      },
-    },
-    options,
-  );
-}
diff --git a/packages/feedback/src/types/config.ts b/packages/feedback/src/types/config.ts
new file mode 100644
index 000000000000..0bcdcb0443cf
--- /dev/null
+++ b/packages/feedback/src/types/config.ts
@@ -0,0 +1,170 @@
+import type { FeedbackFormData } from './form';
+import type { FeedbackTheme } from './theme';
+
+/**
+ * General feedback configuration
+ */
+export interface FeedbackGeneralConfiguration {
+  /**
+   * id to use for the main widget container (this will host the shadow DOM)
+   */
+  id: string;
+
+  /**
+   * Show the Sentry branding
+   */
+  showBranding: boolean;
+
+  /**
+   * Auto-inject default Feedback actor button to the DOM when integration is
+   * added.
+   */
+  autoInject: boolean;
+
+  /**
+   * Should the email field be required?
+   */
+  isEmailRequired: boolean;
+
+  /**
+   * Should the name field be required?
+   */
+  isNameRequired: boolean;
+
+  /**
+   * Should the email input field be visible? Note: email will still be collected if set via `Sentry.setUser()`
+   */
+  showEmail: boolean;
+
+  /**
+   * Should the name input field be visible? Note: name will still be collected if set via `Sentry.setUser()`
+   */
+  showName: boolean;
+
+  /**
+   * Should the screen shots field be included?
+   * Screen shots cannot be marked as required
+   */
+  showScreenshot: boolean;
+
+  /**
+   * Fill in email/name input fields with Sentry user context if it exists.
+   * The value of the email/name keys represent the properties of your user context.
+   */
+  useSentryUser: {
+    email: string;
+    name: string;
+  };
+}
+
+/**
+ * Theme-related configuration
+ */
+export interface FeedbackThemeConfiguration {
+  /**
+   * The colorscheme to use. "system" will choose the scheme based on the user's system settings
+   */
+  colorScheme: 'system' | 'light' | 'dark';
+
+  /**
+   * Light theme customization, will be merged with default theme values.
+   */
+  themeLight: FeedbackTheme;
+
+  /**
+   * Dark theme customization, will be merged with default theme values.
+   */
+  themeDark: FeedbackTheme;
+}
+
+/**
+ * All of the different text labels that can be customized
+ */
+export interface FeedbackTextConfiguration {
+  /**
+   * The label for the Feedback widget button that opens the dialog
+   */
+  buttonLabel: string;
+
+  /**
+   * The label for the Feedback form cancel button that closes dialog
+   */
+  cancelButtonLabel: string;
+
+  /**
+   * The label for the Feedback form submit button that sends feedback
+   */
+  submitButtonLabel: string;
+
+  /**
+   * The title of the Feedback form
+   */
+  formTitle: string;
+
+  /**
+   * Label for the email input
+   */
+  emailLabel: string;
+
+  /**
+   * Placeholder text for Feedback email input
+   */
+  emailPlaceholder: string;
+
+  /**
+   * Label for the message input
+   */
+  messageLabel: string;
+
+  /**
+   * Placeholder text for Feedback message input
+   */
+  messagePlaceholder: string;
+
+  /**
+   * Label for the name input
+   */
+  nameLabel: string;
+
+  /**
+   * Placeholder text for Feedback name input
+   */
+  namePlaceholder: string;
+
+  /**
+   * Message after feedback was sent successfully
+   */
+  successMessageText: string;
+}
+
+/**
+ * The public callbacks available for the feedback integration
+ */
+export interface FeedbackCallbacks {
+  /**
+   * Callback when form is opened
+   */
+  onFormOpen?: () => void;
+
+  /**
+   * Callback when form is closed and not submitted
+   */
+  onFormClose?: () => void;
+
+  /**
+   * Callback when feedback is successfully submitted
+   *
+   * After this you'll see a SuccessMessage on the screen for a moment.
+   */
+  onSubmitSuccess?: (data: FeedbackFormData) => void;
+
+  /**
+   * Callback when feedback is unsuccessfully submitted
+   */
+  onSubmitError?: (error: Error) => void;
+
+  /**
+   * Callback when the feedback form is submitted successfully, and the SuccessMessage is complete, or dismissed
+   */
+  onFormSubmitted?: () => void;
+}
diff --git a/packages/feedback/src/types/form.ts b/packages/feedback/src/types/form.ts
new file mode 100644
index 000000000000..d669ad7ea22e
--- /dev/null
+++ b/packages/feedback/src/types/form.ts
@@ -0,0 +1,8 @@
+import type { Attachment } from '@sentry/types';
+
+export type FeedbackFormData = {
+  name: string;
+  email: string;
+  message: string;
+  attachments: Attachment[] | undefined;
+};
diff --git a/packages/feedback/src/types/index.ts b/packages/feedback/src/types/index.ts
index c2642b54d09c..cee1bae6ab87 100644
--- a/packages/feedback/src/types/index.ts
+++ b/packages/feedback/src/types/index.ts
@@ -1,179 +1,19 @@
-import type { Primitive } from '@sentry/types';
-
-import type { ActorComponent } from '../widget/Actor';
-import type { DialogComponent } from '../widget/Dialog';
-
-export type SentryTags = { [key: string]: Primitive } | undefined;
-
-export interface SendFeedbackData {
-  feedback: {
-    message: string;
-    url: string;
-    email?: string;
-    replay_id?: string;
-    name?: string;
-    source?: string;
-  };
-}
-
-export interface SendFeedbackOptions {
-  /**
-   * Should include replay with the feedback?
-   */
-  includeReplay?: boolean;
-}
-
-/**
- * Feedback data expected from UI/form
- */
-export interface FeedbackFormData {
-  message: string;
-  email?: string;
-  name?: string;
-}
-
-/**
- * General feedback configuration
- */
-export interface FeedbackGeneralConfiguration {
-  /**
-   * id to use for the main widget container (this will host the shadow DOM)
-   */
-  id: string;
-
-  /**
-   * Show the Sentry branding
-   */
-  showBranding: boolean;
-
-  /**
-   * Auto-inject default Feedback actor button to the DOM when integration is
-   * added.
-   */
-  autoInject: boolean;
-
-  /**
-   * Should the email field be required?
-   */
-  isEmailRequired: boolean;
-
-  /**
-   * Should the name field be required?
-   */
-  isNameRequired: boolean;
-
-  /**
-   * Should the email input field be visible? Note: email will still be collected if set via `Sentry.setUser()`
-   */
-  showEmail: boolean;
-
-  /**
-   * Should the name input field be visible? Note: name will still be collected if set via `Sentry.setUser()`
-   */
-  showName: boolean;
-
-  /**
-   * Fill in email/name input fields with Sentry user context if it exists.
-   * The value of the email/name keys represent the properties of your user context.
-   */
-  useSentryUser: {
-    email: string;
-    name: string;
-  };
-}
-
-/**
- * Theme-related configuration
- */
-export interface FeedbackThemeConfiguration {
-  /**
-   * The colorscheme to use. "system" will choose the scheme based on the user's system settings
-   */
-  colorScheme: 'system' | 'light' | 'dark';
-
-  /**
-   * Light theme customization, will be merged with default theme values.
-   */
-  themeLight: FeedbackTheme;
-  /**
-   * Dark theme customization, will be merged with default theme values.
-   */
+import type { Attachment } from '@sentry/types';
+import type { ComponentType } from 'preact';
+import type {
+  FeedbackCallbacks,
+  FeedbackGeneralConfiguration,
+  FeedbackTextConfiguration,
+  FeedbackThemeConfiguration,
+} from './config';
+import type { FeedbackTheme } from './theme';
+
+export type { FeedbackFormData } from './form';
+
+export { FeedbackTheme };
+export interface FeedbackThemes {
   themeDark: FeedbackTheme;
-}
-
-/**
- * All of the different text labels that can be customized
- */
-export interface FeedbackTextConfiguration {
-  /**
-   * The label for the Feedback widget button that opens the dialog
-   */
-  buttonLabel: string;
-  /**
-   * The label for the Feedback form cancel button that closes dialog
-   */
-  cancelButtonLabel: string;
-  /**
-   * The label for the Feedback form submit button that sends feedback
-   */
-  submitButtonLabel: string;
-  /**
-   * The title of the Feedback form
-   */
-  formTitle: string;
-  /**
-   * Label for the email input
-   */
-  emailLabel: string;
-  /**
-   * Placeholder text for Feedback email input
-   */
-  emailPlaceholder: string;
-  /**
-   * Label for the message input
-   */
-  messageLabel: string;
-  /**
-   * Placeholder text for Feedback message input
-   */
-  messagePlaceholder: string;
-  /**
-   * Label for the name input
-   */
-  nameLabel: string;
-  /**
-   * Placeholder text for Feedback name input
-   */
-  namePlaceholder: string;
-  /**
-   * Message after feedback was sent successfully
-   */
-  successMessageText: string;
-}
-
-/**
- * The public callbacks available for the feedback integration
- */
-export interface FeedbackCallbacks {
-  /**
-   * Callback when form is closed
-   */
-  onFormClose?: () => void;
-
-  /**
-   * Callback when form is opened
-   */
-  onFormOpen?: () => void;
-
-  /**
-   * Callback when feedback is successfully submitted
-   */
-  onSubmitSuccess?: () => void;
-
-  /**
-   * Callback when feedback is unsuccessfully submitted
-   */
-  onSubmitError?: () => void;
+  themeLight: FeedbackTheme;
 }
 
 /**
@@ -187,6 +27,8 @@ export interface FeedbackInternalOptions
 
 /**
  * Partial configuration that overrides default configuration values
+ *
+ * This is the config that gets passed into the integration constructor
  */
 export interface OptionalFeedbackConfiguration
   extends Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'> {
@@ -194,149 +36,66 @@ export interface OptionalFeedbackConfiguration
   themeDark?: Partial<FeedbackTheme>;
 }
 
-export interface FeedbackTheme {
-  /**
-   * Font family for widget
-   */
-  fontFamily: string;
-  /**
-   * Font size for widget
-   */
-  fontSize: string;
-  /**
-   * Background color for actor and dialog
-   */
-  background: string;
-  /**
-   * Background color on hover
-   */
-  backgroundHover: string;
-  /**
-   * Border styling for actor and dialog
-   */
-  border: string;
-  /**
-   * Border radius styling for actor
-   */
-  borderRadius: string;
-  /**
-   * Box shadow for actor and dialog
-   */
-  boxShadow: string;
-  /**
-   * Foreground color (i.e. text color)
-   */
-  foreground: string;
-  /**
-   * Success color
-   */
-  success: string;
-  /**
-   * Error color
-   */
-  error: string;
+/**
+ * Partial configuration that overrides default configuration values
+ *
+ * This is the config that gets passed into the integration constructor
+ */
+export type OverrideFeedbackConfiguration = Omit<Partial<FeedbackInternalOptions>, 'themeLight' | 'themeDark'>;
 
-  /**
-   * Background color for the submit button
-   */
-  submitBackground: string;
-  /**
-   * Background color when hovering over the submit button
-   */
-  submitBackgroundHover: string;
-  /**
-   * Border style for the submit button
-   */
-  submitBorder: string;
-  /**
-   * Border style for the submit button, in the focued state
-   */
-  submitOutlineFocus: string;
-  /**
-   * Foreground color for the submit button
-   */
-  submitForeground: string;
+export interface SendFeedbackParams {
+  message: string;
+  name?: string;
+  email?: string;
+  attachments?: Attachment[];
+  url?: string;
+  source?: string;
+}
 
+export interface SendFeedbackOptions {
   /**
-   * Foreground color for the submit button, in the hover state
+   * Should include replay with the feedback?
    */
-  submitForegroundHover: string;
+  includeReplay?: boolean;
+}
 
+export interface Dialog {
   /**
-   * Background color for the cancel button
-   */
-  cancelBackground: string;
-  /**
-   * Background color when hovering over the cancel button
+   * The HTMLElement that is containing all the form content
    */
-  cancelBackgroundHover: string;
-  /**
-   * Border style for the cancel button
-   */
-  cancelBorder: string;
-  /**
-   * Border style for the cancel button, in the focued state
-   */
-  cancelOutlineFocus: string;
-  /**
-   * Foreground color for the cancel button
-   */
-  cancelForeground: string;
-  /**
-   * Foreground color for the cancel button, in the hover state
-   */
-  cancelForegroundHover: string;
+  el: HTMLElement;
 
   /**
-   * Background color for form inputs
+   * Insert the Dialog into the Shadow DOM.
+   *
+   * The Dialog starts in the `closed` state where no inner HTML is rendered.
    */
-  inputBackground: string;
+  appendToDom: () => void;
+
   /**
-   * Foreground color for form inputs
+   * Remove the dialog from the Shadow DOM
    */
-  inputForeground: string;
+  removeFromDom: () => void;
+
   /**
-   * Border styles for form inputs
+   * Open/Show the dialog & form inside it
    */
-  inputBorder: string;
+  open: () => void;
+
   /**
-   * Border styles for form inputs when focused
+   * Close/Hide the dialog & form inside it
    */
-  inputOutlineFocus: string;
+  close: () => void;
+}
+
+export interface ScreenshotInput {
   /**
-   * Border radius for dialog
+   * The preact component
    */
-  formBorderRadius: string;
+  input: ComponentType<{ onError: (error: Error) => void }>;
+
   /**
-   * Border radius for form inputs
+   * The image/screenshot bytes
    */
-  formContentBorderRadius: string;
-}
-
-export interface FeedbackThemes {
-  dark: FeedbackTheme;
-  light: FeedbackTheme;
-}
-
-export interface FeedbackComponent<T extends HTMLElement> {
-  el: T | null;
-}
-
-/**
- * A widget consists of:
- *   - actor button [that opens dialog]
- *   - dialog + feedback form
- *   - shadow root?
- */
-export interface FeedbackWidget {
-  actor: ActorComponent | undefined;
-  dialog: DialogComponent | undefined;
-
-  showActor: () => void;
-  hideActor: () => void;
-  removeActor: () => void;
-
-  openDialog: () => void;
-  closeDialog: () => void;
-  removeDialog: () => void;
+  value: () => Promise<Attachment | undefined>;
 }
diff --git a/packages/feedback/src/types/theme.ts b/packages/feedback/src/types/theme.ts
new file mode 100644
index 000000000000..1bfb2e580a99
--- /dev/null
+++ b/packages/feedback/src/types/theme.ts
@@ -0,0 +1,118 @@
+export interface FeedbackTheme {
+  /**
+   * Font family for widget
+   */
+  fontFamily: string;
+  /**
+   * Font size for widget
+   */
+  fontSize: string;
+  /**
+   * Background color for actor and dialog
+   */
+  background: string;
+  /**
+   * Background color on hover
+   */
+  backgroundHover: string;
+  /**
+   * Border styling for actor and dialog
+   */
+  border: string;
+  /**
+   * Border radius styling for actor
+   */
+  borderRadius: string;
+  /**
+   * Box shadow for actor and dialog
+   */
+  boxShadow: string;
+  /**
+   * Foreground color (i.e. text color)
+   */
+  foreground: string;
+  /**
+   * Success color
+   */
+  success: string;
+  /**
+   * Error color
+   */
+  error: string;
+
+  /**
+   * Background color for the submit button
+   */
+  submitBackground: string;
+  /**
+   * Background color when hovering over the submit button
+   */
+  submitBackgroundHover: string;
+  /**
+   * Border style for the submit button
+   */
+  submitBorder: string;
+  /**
+   * Border style for the submit button, in the focued state
+   */
+  submitOutlineFocus: string;
+  /**
+   * Foreground color for the submit button
+   */
+  submitForeground: string;
+
+  /**
+   * Foreground color for the submit button, in the hover state
+   */
+  submitForegroundHover: string;
+
+  /**
+   * Background color for the cancel button
+   */
+  cancelBackground: string;
+  /**
+   * Background color when hovering over the cancel button
+   */
+  cancelBackgroundHover: string;
+  /**
+   * Border style for the cancel button
+   */
+  cancelBorder: string;
+  /**
+   * Border style for the cancel button, in the focued state
+   */
+  cancelOutlineFocus: string;
+  /**
+   * Foreground color for the cancel button
+   */
+  cancelForeground: string;
+  /**
+   * Foreground color for the cancel button, in the hover state
+   */
+  cancelForegroundHover: string;
+
+  /**
+   * Background color for form inputs
+   */
+  inputBackground: string;
+  /**
+   * Foreground color for form inputs
+   */
+  inputForeground: string;
+  /**
+   * Border styles for form inputs
+   */
+  inputBorder: string;
+  /**
+   * Border styles for form inputs when focused
+   */
+  inputOutlineFocus: string;
+  /**
+   * Border radius for dialog
+   */
+  formBorderRadius: string;
+  /**
+   * Border radius for form inputs
+   */
+  formContentBorderRadius: string;
+}
diff --git a/packages/serverless/src/debug-build.ts b/packages/feedback/src/util/debug-build.ts
similarity index 100%
rename from packages/serverless/src/debug-build.ts
rename to packages/feedback/src/util/debug-build.ts
diff --git a/packages/feedback/src/util/handleFeedbackSubmit.ts b/packages/feedback/src/util/handleFeedbackSubmit.ts
deleted file mode 100644
index a3bf57fcbfa0..000000000000
--- a/packages/feedback/src/util/handleFeedbackSubmit.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { TransportMakeRequestResponse } from '@sentry/types';
-import { logger, resolvedSyncPromise } from '@sentry/utils';
-
-import { FEEDBACK_WIDGET_SOURCE } from '../constants';
-import { DEBUG_BUILD } from '../debug-build';
-import { sendFeedback } from '../sendFeedback';
-import type { FeedbackFormData, SendFeedbackOptions } from '../types';
-import type { DialogComponent } from '../widget/Dialog';
-
-/**
- * Handles UI behavior of dialog when feedback is submitted, calls
- * `sendFeedback` to send feedback.
- */
-export async function handleFeedbackSubmit(
-  dialog: DialogComponent | null,
-  feedback: FeedbackFormData,
-  options?: SendFeedbackOptions,
-): Promise<TransportMakeRequestResponse> {
-  if (!dialog) {
-    // Not sure when this would happen
-    return resolvedSyncPromise({});
-  }
-
-  const showFetchError = (): void => {
-    if (!dialog) {
-      return;
-    }
-    dialog.showError('There was a problem submitting feedback, please wait and try again.');
-  };
-
-  dialog.hideError();
-
-  try {
-    const resp = await sendFeedback({ ...feedback, source: FEEDBACK_WIDGET_SOURCE }, options);
-
-    // Success!
-    return resp;
-  } catch (err) {
-    DEBUG_BUILD && logger.error(err);
-    showFetchError();
-  }
-
-  return resolvedSyncPromise({});
-}
diff --git a/packages/feedback/src/util/isScreenshotSupported.ts b/packages/feedback/src/util/isScreenshotSupported.ts
new file mode 100644
index 000000000000..d4e27468fcb0
--- /dev/null
+++ b/packages/feedback/src/util/isScreenshotSupported.ts
@@ -0,0 +1,17 @@
+import { NAVIGATOR } from '../constants';
+
+/**
+ * Mobile browsers do not support `mediaDevices.getDisplayMedia` even though they have the api implemented
+ * Instead they return things like `NotAllowedError` when called.
+ *
+ * It's simpler for us to browser sniff first, and avoid loading the integration if we can.
+ *
+ * https://stackoverflow.com/a/58879212
+ * https://stackoverflow.com/a/3540295
+ */
+export function isScreenshotSupported(): boolean {
+  if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(NAVIGATOR.userAgent)) {
+    return false;
+  }
+  return true;
+}
diff --git a/packages/feedback/src/util/mergeOptions.ts b/packages/feedback/src/util/mergeOptions.ts
index bfaae524c7f6..da7f4c271f14 100644
--- a/packages/feedback/src/util/mergeOptions.ts
+++ b/packages/feedback/src/util/mergeOptions.ts
@@ -1,4 +1,4 @@
-import type { FeedbackInternalOptions, OptionalFeedbackConfiguration } from '../types';
+import type { FeedbackFormData, FeedbackInternalOptions, OptionalFeedbackConfiguration } from '../types';
 
 /**
  * Quick and dirty deep merge for the Feedback integration options
@@ -10,6 +10,26 @@ export function mergeOptions(
   return {
     ...defaultOptions,
     ...optionOverrides,
+    onFormOpen: () => {
+      optionOverrides.onFormOpen && optionOverrides.onFormOpen();
+      defaultOptions.onFormOpen && defaultOptions.onFormOpen();
+    },
+    onFormClose: () => {
+      optionOverrides.onFormClose && optionOverrides.onFormClose();
+      defaultOptions.onFormClose && defaultOptions.onFormClose();
+    },
+    onSubmitSuccess: (data: FeedbackFormData) => {
+      optionOverrides.onSubmitSuccess && optionOverrides.onSubmitSuccess(data);
+      defaultOptions.onSubmitSuccess && defaultOptions.onSubmitSuccess(data);
+    },
+    onSubmitError: (error: Error) => {
+      optionOverrides.onSubmitError && optionOverrides.onSubmitError(error);
+      defaultOptions.onSubmitError && defaultOptions.onSubmitError(error);
+    },
+    onFormSubmitted: () => {
+      optionOverrides.onFormSubmitted && optionOverrides.onFormSubmitted();
+      defaultOptions.onFormSubmitted && defaultOptions.onFormSubmitted();
+    },
     themeDark: {
       ...defaultOptions.themeDark,
       ...optionOverrides.themeDark,
diff --git a/packages/feedback/src/util/prepareFeedbackEvent.ts b/packages/feedback/src/util/prepareFeedbackEvent.ts
index 65a61085bda3..0d66d251c6ff 100644
--- a/packages/feedback/src/util/prepareFeedbackEvent.ts
+++ b/packages/feedback/src/util/prepareFeedbackEvent.ts
@@ -1,5 +1,4 @@
-import { getIsolationScope } from '@sentry/core';
-import { prepareEvent } from '@sentry/core';
+import { getIsolationScope, prepareEvent } from '@sentry/core';
 import type { Client, FeedbackEvent, Scope } from '@sentry/types';
 
 interface PrepareFeedbackEventParams {
@@ -14,9 +13,11 @@ export async function prepareFeedbackEvent({
   client,
   scope,
   event,
-}: PrepareFeedbackEventParams): Promise<FeedbackEvent | null> {
+}: PrepareFeedbackEventParams): Promise<FeedbackEvent> {
   const eventHint = {};
-  client.emit('preprocessEvent', event, eventHint);
+  if (client.emit) {
+    client.emit('preprocessEvent', event, eventHint);
+  }
 
   const preparedEvent = (await prepareEvent(
     client.getOptions(),
@@ -30,7 +31,7 @@ export async function prepareFeedbackEvent({
   if (preparedEvent === null) {
     // Taken from baseclient's `_processEvent` method, where this is handled for errors/transactions
     client.recordDroppedEvent('event_processor', 'feedback', event);
-    return null;
+    throw new Error('Unable to prepare event');
   }
 
   // This normally happens in browser client "_prepareEvent"
diff --git a/packages/feedback/src/util/validate.ts b/packages/feedback/src/util/validate.ts
new file mode 100644
index 000000000000..5ab14743bf03
--- /dev/null
+++ b/packages/feedback/src/util/validate.ts
@@ -0,0 +1,24 @@
+import type { FeedbackFormData, FeedbackInternalOptions } from '../types';
+
+export type Props = Pick<
+  FeedbackInternalOptions,
+  'emailLabel' | 'isEmailRequired' | 'isNameRequired' | 'messageLabel' | 'nameLabel'
+>;
+
+/**
+ * Validate that a given feedback submission has the required fields
+ */
+export function getMissingFields(feedback: FeedbackFormData, props: Props): string[] {
+  const emptyFields = [];
+  if (props.isNameRequired && !feedback.name) {
+    emptyFields.push(props.nameLabel);
+  }
+  if (props.isEmailRequired && !feedback.email) {
+    emptyFields.push(props.emailLabel);
+  }
+  if (!feedback.message) {
+    emptyFields.push(props.messageLabel);
+  }
+
+  return emptyFields;
+}
diff --git a/packages/feedback/src/widget/Actor.ts b/packages/feedback/src/widget/Actor.ts
deleted file mode 100644
index 2b3239006e0b..000000000000
--- a/packages/feedback/src/widget/Actor.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import type { FeedbackComponent, FeedbackInternalOptions } from '../types';
-import { Icon } from './Icon';
-import { createElement } from './util/createElement';
-
-export interface ActorProps extends Pick<FeedbackInternalOptions, 'buttonLabel'> {
-  onClick?: (e: MouseEvent) => void;
-}
-
-export interface ActorComponent extends FeedbackComponent<HTMLButtonElement> {
-  /**
-   * Shows the actor element
-   */
-  show: () => void;
-  /**
-   * Hides the actor element
-   */
-  hide: () => void;
-}
-
-/**
- *
- */
-export function Actor({ buttonLabel, onClick }: ActorProps): ActorComponent {
-  function _handleClick(e: MouseEvent): void {
-    onClick && onClick(e);
-  }
-
-  const el = createElement(
-    'button',
-    {
-      type: 'button',
-      className: 'widget__actor',
-      ['aria-label']: buttonLabel,
-      ['aria-hidden']: 'false',
-    },
-    Icon().el,
-    buttonLabel
-      ? createElement(
-          'span',
-          {
-            className: 'widget__actor__text',
-          },
-          buttonLabel,
-        )
-      : null,
-  );
-
-  el.addEventListener('click', _handleClick);
-
-  return {
-    get el() {
-      return el;
-    },
-    show: (): void => {
-      el.classList.remove('widget__actor--hidden');
-      el.setAttribute('aria-hidden', 'false');
-    },
-    hide: (): void => {
-      el.classList.add('widget__actor--hidden');
-      el.setAttribute('aria-hidden', 'true');
-    },
-  };
-}
diff --git a/packages/feedback/src/widget/Dialog.ts b/packages/feedback/src/widget/Dialog.ts
deleted file mode 100644
index 84b4318b34d1..000000000000
--- a/packages/feedback/src/widget/Dialog.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import type { FeedbackComponent, FeedbackInternalOptions } from '../types';
-import type { FormComponentProps } from './Form';
-import { Form } from './Form';
-import { Logo } from './Logo';
-import { createElement } from './util/createElement';
-
-export interface DialogProps
-  extends FormComponentProps,
-    Pick<FeedbackInternalOptions, 'formTitle' | 'showBranding' | 'colorScheme'> {
-  onClosed?: () => void;
-}
-
-export interface DialogComponent extends FeedbackComponent<HTMLDialogElement> {
-  /**
-   * Shows the error message
-   */
-  showError: (message: string) => void;
-
-  /**
-   * Hides the error message
-   */
-  hideError: () => void;
-
-  /**
-   * Opens and shows the dialog and form
-   */
-  open: () => void;
-
-  /**
-   * Closes the dialog and form
-   */
-  close: () => void;
-
-  /**
-   * Check if dialog is currently opened
-   */
-  checkIsOpen: () => boolean;
-}
-
-/**
- * Feedback dialog component that has the form
- */
-export function Dialog({
-  formTitle,
-  showBranding,
-  showName,
-  showEmail,
-  isNameRequired,
-  isEmailRequired,
-  colorScheme,
-  defaultName,
-  defaultEmail,
-  onClosed,
-  onCancel,
-  onSubmit,
-  ...textLabels
-}: DialogProps): DialogComponent {
-  let el: HTMLDialogElement | null = null;
-
-  /**
-   * Handles when the dialog is clicked. In our case, the dialog is the
-   * semi-transparent bg behind the form. We want clicks outside of the form to
-   * hide the form.
-   */
-  function handleDialogClick(): void {
-    close();
-
-    // Only this should trigger `onClose`, we don't want the `close()` method to
-    // trigger it, otherwise it can cause cycles.
-    onClosed && onClosed();
-  }
-
-  /**
-   * Close the dialog
-   */
-  function close(): void {
-    if (el) {
-      el.open = false;
-    }
-  }
-
-  /**
-   * Opens the dialog
-   */
-  function open(): void {
-    if (el) {
-      el.open = true;
-    }
-  }
-
-  /**
-   * Check if dialog is currently opened
-   */
-  function checkIsOpen(): boolean {
-    return (el && el.open === true) || false;
-  }
-
-  const {
-    el: formEl,
-    showError,
-    hideError,
-  } = Form({
-    showEmail,
-    showName,
-    isEmailRequired,
-    isNameRequired,
-
-    defaultName,
-    defaultEmail,
-    onSubmit,
-    onCancel,
-    ...textLabels,
-  });
-
-  el = createElement(
-    'dialog',
-    {
-      className: 'dialog',
-      open: true,
-      onClick: handleDialogClick,
-    },
-    createElement(
-      'div',
-      {
-        className: 'dialog__content',
-        onClick: e => {
-          // Stop event propagation so clicks on content modal do not propagate to dialog (which will close dialog)
-          e.stopPropagation();
-        },
-      },
-      createElement(
-        'h2',
-        { className: 'dialog__header' },
-        formTitle,
-        showBranding &&
-          createElement(
-            'a',
-            {
-              className: 'brand-link',
-              target: '_blank',
-              href: 'https://sentry.io/welcome/',
-              title: 'Powered by Sentry',
-              rel: 'noopener noreferrer',
-            },
-            Logo({ colorScheme }).el,
-          ),
-      ),
-      formEl,
-    ),
-  );
-
-  return {
-    get el() {
-      return el;
-    },
-    showError,
-    hideError,
-    open,
-    close,
-    checkIsOpen,
-  };
-}
diff --git a/packages/feedback/src/widget/Form.ts b/packages/feedback/src/widget/Form.ts
deleted file mode 100644
index 9b90cf547477..000000000000
--- a/packages/feedback/src/widget/Form.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import type { FeedbackComponent, FeedbackFormData, FeedbackInternalOptions, FeedbackTextConfiguration } from '../types';
-import { SubmitButton } from './SubmitButton';
-import { createElement } from './util/createElement';
-
-export interface FormComponentProps
-  extends Pick<
-    FeedbackInternalOptions,
-    | 'showName'
-    | 'showEmail'
-    | 'isNameRequired'
-    | 'isEmailRequired'
-    | Exclude<keyof FeedbackTextConfiguration, 'buttonLabel' | 'formTitle' | 'successMessageText'>
-  > {
-  /**
-   * A default name value to render the input with. Empty strings are ok.
-   */
-  defaultName: string;
-  /**
-   * A default email value to render the input with. Empty strings are ok.
-   */
-  defaultEmail: string;
-  onCancel?: (e: Event) => void;
-  onSubmit?: (feedback: FeedbackFormData) => void;
-}
-
-interface FormComponent extends FeedbackComponent<HTMLFormElement> {
-  /**
-   * Shows the error message
-   */
-  showError: (message: string) => void;
-
-  /**
-   * Hides the error message
-   */
-  hideError: () => void;
-}
-
-function retrieveStringValue(formData: FormData, key: string): string {
-  const value = formData.get(key);
-  if (typeof value === 'string') {
-    return value.trim();
-  }
-  return '';
-}
-
-/**
- * Creates the form element
- */
-export function Form({
-  nameLabel,
-  namePlaceholder,
-  emailLabel,
-  emailPlaceholder,
-  messageLabel,
-  messagePlaceholder,
-  cancelButtonLabel,
-  submitButtonLabel,
-
-  showName,
-  showEmail,
-  isNameRequired,
-  isEmailRequired,
-
-  defaultName,
-  defaultEmail,
-  onCancel,
-  onSubmit,
-}: FormComponentProps): FormComponent {
-  const { el: submitEl } = SubmitButton({
-    label: submitButtonLabel,
-  });
-
-  function handleSubmit(e: Event): void {
-    e.preventDefault();
-
-    if (!(e.target instanceof HTMLFormElement)) {
-      return;
-    }
-
-    try {
-      if (onSubmit) {
-        const formData = new FormData(e.target as HTMLFormElement);
-        const feedback = {
-          name: retrieveStringValue(formData, 'name'),
-          email: retrieveStringValue(formData, 'email'),
-          message: retrieveStringValue(formData, 'message'),
-        };
-
-        onSubmit(feedback);
-      }
-    } catch {
-      // pass
-    }
-  }
-
-  const errorEl = createElement('div', {
-    className: 'form__error-container form__error-container--hidden',
-    ['aria-hidden']: 'true',
-  });
-
-  function showError(message: string): void {
-    errorEl.textContent = message;
-    errorEl.classList.remove('form__error-container--hidden');
-    errorEl.setAttribute('aria-hidden', 'false');
-  }
-
-  function hideError(): void {
-    errorEl.textContent = '';
-    errorEl.classList.add('form__error-container--hidden');
-    errorEl.setAttribute('aria-hidden', 'true');
-  }
-
-  const nameEl = createElement('input', {
-    id: 'name',
-    type: showName ? 'text' : 'hidden',
-    ['aria-hidden']: showName ? 'false' : 'true',
-    name: 'name',
-    required: isNameRequired,
-    className: 'form__input',
-    placeholder: namePlaceholder,
-    value: defaultName,
-  });
-
-  const emailEl = createElement('input', {
-    id: 'email',
-    type: showEmail ? 'text' : 'hidden',
-    ['aria-hidden']: showEmail ? 'false' : 'true',
-    name: 'email',
-    required: isEmailRequired,
-    className: 'form__input',
-    placeholder: emailPlaceholder,
-    value: defaultEmail,
-  });
-
-  const messageEl = createElement('textarea', {
-    id: 'message',
-    autoFocus: 'true',
-    rows: '5',
-    name: 'message',
-    required: true,
-    className: 'form__input form__input--textarea',
-    placeholder: messagePlaceholder,
-  });
-
-  const cancelEl = createElement(
-    'button',
-    {
-      type: 'button',
-      className: 'btn btn--default',
-      ['aria-label']: cancelButtonLabel,
-      onClick: (e: Event) => {
-        onCancel && onCancel(e);
-      },
-    },
-    cancelButtonLabel,
-  );
-
-  const formEl = createElement(
-    'form',
-    {
-      className: 'form',
-      onSubmit: handleSubmit,
-    },
-    [
-      errorEl,
-
-      showName &&
-        createElement(
-          'label',
-          {
-            htmlFor: 'name',
-            className: 'form__label',
-          },
-          [
-            createElement(
-              'span',
-              { className: 'form__label__text' },
-              nameLabel,
-              isNameRequired && createElement('span', { className: 'form__label__text--required' }, ' (required)'),
-            ),
-            nameEl,
-          ],
-        ),
-      !showName && nameEl,
-
-      showEmail &&
-        createElement(
-          'label',
-          {
-            htmlFor: 'email',
-            className: 'form__label',
-          },
-          [
-            createElement(
-              'span',
-              { className: 'form__label__text' },
-              emailLabel,
-              isEmailRequired && createElement('span', { className: 'form__label__text--required' }, ' (required)'),
-            ),
-            emailEl,
-          ],
-        ),
-      !showEmail && emailEl,
-
-      createElement(
-        'label',
-        {
-          htmlFor: 'message',
-          className: 'form__label',
-        },
-        [
-          createElement(
-            'span',
-            { className: 'form__label__text' },
-            messageLabel,
-            createElement('span', { className: 'form__label__text--required' }, ' (required)'),
-          ),
-          messageEl,
-        ],
-      ),
-
-      createElement(
-        'div',
-        {
-          className: 'btn-group',
-        },
-        [submitEl, cancelEl],
-      ),
-    ],
-  );
-
-  return {
-    get el() {
-      return formEl;
-    },
-    showError,
-    hideError,
-  };
-}
diff --git a/packages/feedback/src/widget/SubmitButton.ts b/packages/feedback/src/widget/SubmitButton.ts
deleted file mode 100644
index aa654f61f903..000000000000
--- a/packages/feedback/src/widget/SubmitButton.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { FeedbackComponent } from '../types';
-import { createElement } from './util/createElement';
-
-export interface SubmitButtonProps {
-  label: string;
-}
-
-type SubmitButtonComponent = FeedbackComponent<HTMLButtonElement>;
-
-/**
- *
- */
-export function SubmitButton({ label }: SubmitButtonProps): SubmitButtonComponent {
-  const el = createElement(
-    'button',
-    {
-      type: 'submit',
-      className: 'btn btn--primary',
-      ['aria-label']: label,
-    },
-    label,
-  );
-
-  return {
-    el,
-  };
-}
diff --git a/packages/feedback/src/widget/SuccessMessage.ts b/packages/feedback/src/widget/SuccessMessage.ts
deleted file mode 100644
index fddf46bcce71..000000000000
--- a/packages/feedback/src/widget/SuccessMessage.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { FeedbackComponent } from '../types';
-import { SuccessIcon } from './SuccessIcon';
-import { createElement } from './util/createElement';
-
-export interface SuccessMessageProps {
-  message: string;
-  onRemove?: () => void;
-}
-
-interface SuccessMessageComponent extends FeedbackComponent<HTMLDivElement> {
-  /**
-   * Removes the component
-   */
-  remove: () => void;
-}
-
-/**
- * Feedback dialog component that has the form
- */
-export function SuccessMessage({ message, onRemove }: SuccessMessageProps): SuccessMessageComponent {
-  function remove(): void {
-    if (!el) {
-      return;
-    }
-
-    el.remove();
-    onRemove && onRemove();
-  }
-
-  const el = createElement(
-    'div',
-    {
-      className: 'success-message',
-      onClick: remove,
-    },
-    SuccessIcon().el,
-    message,
-  );
-
-  return {
-    el,
-    remove,
-  };
-}
diff --git a/packages/feedback/src/widget/createShadowHost.ts b/packages/feedback/src/widget/createShadowHost.ts
deleted file mode 100644
index a418906d4b5a..000000000000
--- a/packages/feedback/src/widget/createShadowHost.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { logger } from '@sentry/utils';
-
-import { WINDOW } from '../constants';
-import type { FeedbackInternalOptions } from '../types';
-import { createDialogStyles } from './Dialog.css';
-import { createMainStyles } from './Main.css';
-
-type CreateShadowHostParams = Pick<FeedbackInternalOptions, 'id' | 'colorScheme' | 'themeDark' | 'themeLight'>;
-
-/**
- * Creates shadow host
- */
-export function createShadowHost({ id, colorScheme, themeDark, themeLight }: CreateShadowHostParams): {
-  shadow: ShadowRoot;
-  host: HTMLDivElement;
-} {
-  try {
-    const doc = WINDOW.document;
-
-    // Create the host
-    const host = doc.createElement('div');
-    host.id = id;
-
-    // Create the shadow root
-    const shadow = host.attachShadow({ mode: 'open' });
-
-    shadow.appendChild(createMainStyles(doc, colorScheme, { dark: themeDark, light: themeLight }));
-    shadow.appendChild(createDialogStyles(doc));
-
-    return { shadow, host };
-  } catch {
-    // Shadow DOM probably not supported
-    logger.warn('[Feedback] Browser does not support shadow DOM API');
-    throw new Error('Browser does not support shadow DOM API.');
-  }
-}
diff --git a/packages/feedback/src/widget/createWidget.ts b/packages/feedback/src/widget/createWidget.ts
deleted file mode 100644
index 1f6ed91bf04e..000000000000
--- a/packages/feedback/src/widget/createWidget.ts
+++ /dev/null
@@ -1,298 +0,0 @@
-import { getClient, getCurrentScope } from '@sentry/core';
-import { logger } from '@sentry/utils';
-
-import type { FeedbackFormData, FeedbackInternalOptions, FeedbackWidget } from '../types';
-import { handleFeedbackSubmit } from '../util/handleFeedbackSubmit';
-import type { ActorComponent } from './Actor';
-import { Actor } from './Actor';
-import type { DialogComponent } from './Dialog';
-import { Dialog } from './Dialog';
-import { SuccessMessage } from './SuccessMessage';
-
-import { DEBUG_BUILD } from '../debug-build';
-
-interface CreateWidgetParams {
-  /**
-   * Shadow DOM to append to
-   */
-  shadow: ShadowRoot;
-
-  /**
-   * Feedback integration options
-   */
-  options: FeedbackInternalOptions & { shouldCreateActor?: boolean };
-
-  /**
-   * An element to attach to, that when clicked, will open a dialog
-   */
-  attachTo?: Element;
-
-  /**
-   * If false, will not create an actor
-   */
-  shouldCreateActor?: boolean;
-}
-
-/**
- * Creates a new widget. Returns public methods that control widget behavior.
- */
-export function createWidget({
-  shadow,
-  options: { shouldCreateActor = true, ...options },
-  attachTo,
-}: CreateWidgetParams): FeedbackWidget {
-  let actor: ActorComponent | undefined;
-  let dialog: DialogComponent | undefined;
-  let isDialogOpen: boolean = false;
-
-  /**
-   * Show the success message for 5 seconds
-   */
-  function showSuccessMessage(): void {
-    if (!shadow) {
-      return;
-    }
-
-    try {
-      const success = SuccessMessage({
-        message: options.successMessageText,
-        onRemove: () => {
-          if (timeoutId) {
-            clearTimeout(timeoutId);
-          }
-          showActor();
-        },
-      });
-
-      if (!success.el) {
-        throw new Error('Unable to show success message');
-      }
-
-      shadow.appendChild(success.el);
-
-      const timeoutId = setTimeout(() => {
-        if (success) {
-          success.remove();
-        }
-      }, 5000);
-    } catch (err) {
-      // TODO: error handling
-      logger.error(err);
-    }
-  }
-
-  /**
-   * Handler for when the feedback form is completed by the user. This will
-   * create and send the feedback message as an event.
-   */
-  async function _handleFeedbackSubmit(feedback: FeedbackFormData): Promise<void> {
-    if (!dialog) {
-      return;
-    }
-
-    // Simple validation for now, just check for non-empty required fields
-    const emptyField = [];
-    if (options.isNameRequired && !feedback.name) {
-      emptyField.push(options.nameLabel);
-    }
-    if (options.isEmailRequired && !feedback.email) {
-      emptyField.push(options.emailLabel);
-    }
-    if (!feedback.message) {
-      emptyField.push(options.messageLabel);
-    }
-    if (emptyField.length > 0) {
-      dialog.showError(`Please enter in the following required fields: ${emptyField.join(', ')}`);
-      return;
-    }
-
-    const result = await handleFeedbackSubmit(dialog, feedback);
-
-    // Error submitting feedback
-    if (!result || Object.keys(result).length === 0) {
-      if (options.onSubmitError) {
-        options.onSubmitError();
-      }
-
-      return;
-    }
-
-    // Success
-    removeDialog();
-    showSuccessMessage();
-
-    if (options.onSubmitSuccess) {
-      options.onSubmitSuccess();
-    }
-  }
-
-  /**
-   * Internal handler when dialog is opened
-   */
-  function handleOpenDialog(): void {
-    // Flush replay if integration exists
-    const client = getClient();
-    const replay = client && client.getIntegrationByName<{ name: string; flush: () => Promise<void> }>('Replay');
-    if (!replay) {
-      return;
-    }
-    replay.flush().catch(err => {
-      DEBUG_BUILD && logger.error(err);
-    });
-  }
-
-  /**
-   * Displays the default actor
-   */
-  function showActor(): void {
-    actor && actor.show();
-  }
-
-  /**
-   * Hides the default actor
-   */
-  function hideActor(): void {
-    actor && actor.hide();
-  }
-
-  /**
-   * Removes the default actor element
-   */
-  function removeActor(): void {
-    actor && actor.el && actor.el.remove();
-  }
-
-  /**
-   *
-   */
-  function openDialog(): void {
-    try {
-      if (dialog) {
-        dialog.open();
-        isDialogOpen = true;
-        if (options.onFormOpen) {
-          options.onFormOpen();
-        }
-        handleOpenDialog();
-        return;
-      }
-
-      const userKey = options.useSentryUser;
-      const scope = getCurrentScope();
-      const user = scope && scope.getUser();
-
-      dialog = Dialog({
-        colorScheme: options.colorScheme,
-        showBranding: options.showBranding,
-        showName: options.showName || options.isNameRequired,
-        showEmail: options.showEmail || options.isEmailRequired,
-        isNameRequired: options.isNameRequired,
-        isEmailRequired: options.isEmailRequired,
-        formTitle: options.formTitle,
-        cancelButtonLabel: options.cancelButtonLabel,
-        submitButtonLabel: options.submitButtonLabel,
-        emailLabel: options.emailLabel,
-        emailPlaceholder: options.emailPlaceholder,
-        messageLabel: options.messageLabel,
-        messagePlaceholder: options.messagePlaceholder,
-        nameLabel: options.nameLabel,
-        namePlaceholder: options.namePlaceholder,
-        defaultName: (userKey && user && user[userKey.name]) || '',
-        defaultEmail: (userKey && user && user[userKey.email]) || '',
-        onClosed: () => {
-          showActor();
-          isDialogOpen = false;
-
-          if (options.onFormClose) {
-            options.onFormClose();
-          }
-        },
-        onCancel: () => {
-          closeDialog();
-          showActor();
-        },
-        onSubmit: _handleFeedbackSubmit,
-      });
-
-      if (!dialog.el) {
-        throw new Error('Unable to open Feedback dialog');
-      }
-
-      shadow.appendChild(dialog.el);
-
-      // Hides the default actor whenever dialog is opened
-      hideActor();
-
-      if (options.onFormOpen) {
-        options.onFormOpen();
-      }
-      handleOpenDialog();
-    } catch (err) {
-      // TODO: Error handling?
-      logger.error(err);
-    }
-  }
-
-  /**
-   * Closes the dialog
-   */
-  function closeDialog(): void {
-    if (dialog) {
-      dialog.close();
-      isDialogOpen = false;
-
-      if (options.onFormClose) {
-        options.onFormClose();
-      }
-    }
-  }
-
-  /**
-   * Removes the dialog element from DOM
-   */
-  function removeDialog(): void {
-    if (dialog) {
-      closeDialog();
-      const dialogEl = dialog.el;
-      dialogEl && dialogEl.remove();
-      dialog = undefined;
-    }
-  }
-
-  /**
-   *
-   */
-  function handleActorClick(): void {
-    // Open dialog
-    if (!isDialogOpen) {
-      openDialog();
-    }
-
-    // Hide actor button
-    hideActor();
-  }
-
-  if (attachTo) {
-    attachTo.addEventListener('click', handleActorClick);
-  } else if (shouldCreateActor) {
-    actor = Actor({ buttonLabel: options.buttonLabel, onClick: handleActorClick });
-    actor.el && shadow.appendChild(actor.el);
-  }
-
-  return {
-    get actor() {
-      return actor;
-    },
-    get dialog() {
-      return dialog;
-    },
-
-    showActor,
-    hideActor,
-    removeActor,
-
-    openDialog,
-    closeDialog,
-    removeDialog,
-  };
-}
diff --git a/packages/feedback/src/widget/util/createElement.ts b/packages/feedback/src/widget/util/createElement.ts
deleted file mode 100644
index e070e9a9553f..000000000000
--- a/packages/feedback/src/widget/util/createElement.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { WINDOW } from '../../constants';
-
-/**
- * Helper function to create an element. Could be used as a JSX factory
- * (i.e. React-like syntax).
- */
-export function createElement<K extends keyof HTMLElementTagNameMap>(
-  tagName: K,
-  attributes: { [key: string]: string | boolean | EventListenerOrEventListenerObject } | null,
-  ...children: any
-): HTMLElementTagNameMap[K] {
-  const doc = WINDOW.document;
-  const element = doc.createElement(tagName);
-
-  if (attributes) {
-    Object.entries(attributes).forEach(([attribute, attributeValue]) => {
-      if (attribute === 'className' && typeof attributeValue === 'string') {
-        // JSX does not allow class as a valid name
-        element.setAttribute('class', attributeValue);
-      } else if (typeof attributeValue === 'boolean' && attributeValue) {
-        element.setAttribute(attribute, '');
-      } else if (typeof attributeValue === 'string') {
-        element.setAttribute(attribute, attributeValue);
-      } else if (attribute.startsWith('on') && typeof attributeValue === 'function') {
-        element.addEventListener(attribute.substring(2).toLowerCase(), attributeValue);
-      }
-    });
-  }
-  for (const child of children) {
-    appendChild(element, child);
-  }
-
-  return element;
-}
-
-function appendChild(parent: Node, child: any): void {
-  const doc = WINDOW.document;
-  if (typeof child === 'undefined' || child === null) {
-    return;
-  }
-
-  if (Array.isArray(child)) {
-    for (const value of child) {
-      appendChild(parent, value);
-    }
-  } else if (child === false) {
-    // do nothing if child evaluated to false
-  } else if (typeof child === 'string') {
-    parent.appendChild(doc.createTextNode(child));
-  } else if (child instanceof Node) {
-    parent.appendChild(child);
-  } else {
-    parent.appendChild(doc.createTextNode(String(child)));
-  }
-}
diff --git a/packages/feedback/test/index.ts b/packages/feedback/test/index.ts
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/feedback/test/integration.test.ts b/packages/feedback/test/integration.test.ts
deleted file mode 100644
index 4a651a8ef7be..000000000000
--- a/packages/feedback/test/integration.test.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import * as SentryUtils from '@sentry/utils';
-
-import { ACTOR_LABEL } from '../src/constants';
-import { feedbackIntegration } from '../src/integration';
-
-jest.spyOn(SentryUtils, 'isBrowser').mockImplementation(() => true);
-
-jest.mock('../src/util/sendFeedbackRequest', () => {
-  const original = jest.requireActual('../src/util/sendFeedbackRequest');
-  return {
-    ...original,
-    sendFeedbackRequest: jest.fn(),
-  };
-});
-
-describe('Feedback integration', () => {
-  let feedback: ReturnType<typeof feedbackIntegration>;
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  afterEach(() => {
-    if (feedback) {
-      feedback.remove();
-    }
-  });
-
-  it('autoinjects widget with actor', () => {
-    feedback = feedbackIntegration();
-    feedback.setupOnce();
-    const widget = feedback.getWidget();
-    expect(widget?.actor?.el).toBeInstanceOf(HTMLButtonElement);
-    const actorEl = widget?.actor?.el as HTMLButtonElement;
-    expect(actorEl.textContent).toBe(ACTOR_LABEL);
-    // No dialog until actor is clicked
-    expect(widget?.dialog).toBeUndefined();
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(actorEl)).toBe(true);
-  });
-
-  it('does not create a widget with `autoInject: false`', () => {
-    feedback = feedbackIntegration({ autoInject: false });
-    feedback.setupOnce();
-    const widget = feedback.getWidget();
-    expect(widget?.actor?.el).toBeUndefined();
-    // No dialog until actor is clicked
-    expect(widget?.dialog).toBeUndefined();
-  });
-
-  it('opens (and closes) dialog when calling `openDialog` without injecting an actor', () => {
-    feedback = feedbackIntegration({ autoInject: false });
-    feedback.setupOnce();
-
-    let widget = feedback.getWidget();
-    expect(widget?.actor?.el).toBeUndefined();
-    // No dialog until actor is clicked
-    expect(widget?.dialog).toBeUndefined();
-
-    feedback.openDialog();
-    widget = feedback.getWidget();
-    expect(widget?.actor?.el).toBeUndefined();
-    expect(widget?.dialog).not.toBeUndefined();
-    expect(widget?.dialog?.checkIsOpen()).toBe(true);
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(widget.dialog.el)).toBe(true);
-
-    feedback.closeDialog();
-    expect(widget?.dialog?.checkIsOpen()).toBe(false);
-  });
-
-  it('attaches to a custom actor element', () => {
-    const onFormOpen = jest.fn();
-    // This element is in the normal DOM
-    const myActor = document.createElement('div');
-    myActor.textContent = 'my button';
-
-    feedback = feedbackIntegration({ autoInject: false });
-    let widget = feedback.getWidget();
-    expect(widget).toBe(null);
-
-    feedback.attachTo(myActor, { onFormOpen });
-
-    myActor.dispatchEvent(new Event('click'));
-
-    widget = feedback.getWidget();
-
-    expect(widget?.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget?.dialog?.el?.open).toBe(true);
-    expect(onFormOpen).toHaveBeenCalledTimes(1);
-    // This is all we do with `attachTo` (open dialog)
-  });
-
-  it('creates multiple widgets and removes them', () => {
-    feedback = feedbackIntegration({ autoInject: false });
-
-    feedback.createWidget();
-    expect(feedback.getWidget()?.actor?.el).toBeInstanceOf(HTMLButtonElement);
-    // @ts-expect-error  _widgets is private
-    expect(feedback._widgets.size).toBe(1);
-
-    feedback.createWidget();
-    // @ts-expect-error  _widgets is private
-    expect(feedback._widgets.size).toBe(2);
-
-    // @ts-expect-error  _widgets is private
-    const widgets = Array.from(feedback._widgets.values());
-    expect(widgets[0]).not.toEqual(widgets[1]);
-
-    // Both actors will be in the DOM
-
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(widgets[0].actor.el)).toBe(true);
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(widgets[1].actor.el)).toBe(true);
-
-    feedback.removeWidget(widgets[0]);
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(widgets[0].actor.el)).toBe(false);
-
-    feedback.removeWidget(widgets[1]);
-    // @ts-expect-error _shadow is private
-    expect(feedback._shadow.contains(widgets[1].actor.el)).toBe(false);
-
-    // @ts-expect-error  _widgets is private
-    expect(feedback._widgets.size).toBe(0);
-  });
-});
diff --git a/packages/feedback/test/unit/util/prepareFeedbackEvent.test.ts b/packages/feedback/test/unit/util/prepareFeedbackEvent.test.ts
deleted file mode 100644
index 165e3af0588d..000000000000
--- a/packages/feedback/test/unit/util/prepareFeedbackEvent.test.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { setCurrentClient } from '@sentry/core';
-import { getCurrentScope } from '@sentry/core';
-import type { FeedbackEvent, Scope } from '@sentry/types';
-
-import { prepareFeedbackEvent } from '../../../src/util/prepareFeedbackEvent';
-import { TestClient, getDefaultClientOptions } from '../../utils/TestClient';
-
-describe('Unit | util | prepareFeedbackEvent', () => {
-  let client: TestClient;
-  let scope: Scope;
-
-  beforeEach(() => {
-    client = new TestClient(getDefaultClientOptions());
-    setCurrentClient(client);
-    client.init();
-    scope = getCurrentScope();
-  });
-
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('works', async () => {
-    expect(client).toBeDefined();
-    expect(scope).toBeDefined();
-
-    const replayId = 'replay-ID';
-    const event: FeedbackEvent = {
-      timestamp: 1670837008.634,
-      event_id: 'feedback-ID',
-      type: 'feedback',
-      contexts: {
-        feedback: {
-          contact_email: 'test@test.com',
-          message: 'looks great!',
-          replay_id: replayId,
-          url: 'https://sentry.io/',
-        },
-        replay: {
-          error_sample_rate: 1.0,
-          session_sample_rate: 0.1,
-        },
-      },
-    };
-
-    const feedbackEvent = await prepareFeedbackEvent({ scope, client, event });
-
-    expect(feedbackEvent).toEqual({
-      timestamp: 1670837008.634,
-      event_id: 'feedback-ID',
-      platform: 'javascript',
-      environment: 'production',
-      contexts: {
-        feedback: {
-          contact_email: 'test@test.com',
-          message: 'looks great!',
-          replay_id: replayId,
-          url: 'https://sentry.io/',
-        },
-        replay: {
-          error_sample_rate: 1.0,
-          session_sample_rate: 0.1,
-        },
-      },
-      sdkProcessingMetadata: expect.any(Object),
-      breadcrumbs: undefined,
-      type: 'feedback',
-    });
-  });
-});
diff --git a/packages/feedback/test/widget/Actor.test.ts b/packages/feedback/test/widget/Actor.test.ts
deleted file mode 100644
index a1209a561654..000000000000
--- a/packages/feedback/test/widget/Actor.test.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ACTOR_LABEL } from '../../src/constants';
-import type { ActorProps } from '../../src/widget/Actor';
-import { Actor } from '../../src/widget/Actor';
-
-function renderActor(props?: Partial<ActorProps>) {
-  return Actor({
-    buttonLabel: ACTOR_LABEL,
-    ...props,
-  });
-}
-
-describe('Actor', () => {
-  it('renders the actor button', () => {
-    const actorComponent = renderActor();
-
-    expect(actorComponent.el).toBeInstanceOf(HTMLButtonElement);
-    expect(actorComponent.el?.textContent).toBe(ACTOR_LABEL);
-  });
-
-  it('calls `onClick` callback when clicked on', () => {
-    const onClick = jest.fn();
-    const actorComponent = renderActor({
-      onClick,
-    });
-
-    const event = new Event('click');
-    actorComponent.el?.dispatchEvent(event);
-    expect(onClick).toHaveBeenCalledWith(event);
-  });
-
-  it('can manually show and hide the actor', () => {
-    const actorComponent = renderActor();
-
-    expect(actorComponent.el?.getAttribute('aria-hidden')).toBe('false');
-
-    actorComponent.hide();
-    expect(actorComponent.el?.getAttribute('aria-hidden')).toBe('true');
-
-    actorComponent.show();
-    expect(actorComponent.el?.getAttribute('aria-hidden')).toBe('false');
-  });
-});
diff --git a/packages/feedback/test/widget/Dialog.test.ts b/packages/feedback/test/widget/Dialog.test.ts
deleted file mode 100644
index 69a333f69813..000000000000
--- a/packages/feedback/test/widget/Dialog.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import type { DialogProps } from '../../src/widget/Dialog';
-import { Dialog } from '../../src/widget/Dialog';
-
-type NonNullableFields<T> = {
-  [P in keyof T]: NonNullable<T[P]>;
-};
-
-function renderDialog({
-  showName = true,
-  showEmail = true,
-  showBranding = false,
-  isNameRequired = false,
-  isEmailRequired = false,
-  formTitle = 'Feedback',
-  defaultName = 'Foo Bar',
-  defaultEmail = 'foo@example.com',
-  colorScheme = 'light',
-  nameLabel = 'Name',
-  namePlaceholder = 'Your full name',
-  emailLabel = 'Email',
-  emailPlaceholder = 'foo@example.org',
-  messageLabel = 'Description',
-  messagePlaceholder = 'What is the issue?',
-  cancelButtonLabel = 'Cancel!',
-  submitButtonLabel = 'Submit!',
-  ...rest
-}: Partial<DialogProps> = {}) {
-  return Dialog({
-    formTitle,
-
-    showName,
-    showEmail,
-    isNameRequired,
-    isEmailRequired,
-    showBranding,
-    defaultName,
-    defaultEmail,
-    colorScheme,
-    nameLabel,
-    namePlaceholder,
-    emailLabel,
-    emailPlaceholder,
-    messageLabel,
-    messagePlaceholder,
-    cancelButtonLabel,
-    submitButtonLabel,
-    ...rest,
-  }) as NonNullableFields<ReturnType<typeof Dialog>>;
-}
-
-describe('Dialog', () => {
-  it('renders the dialog w/ form', () => {
-    const dialogComponent = renderDialog({
-      formTitle: 'Feedback!',
-    });
-
-    expect(dialogComponent.el).toBeInstanceOf(HTMLDialogElement);
-    expect(dialogComponent.el.querySelector('form')).toBeInstanceOf(HTMLFormElement);
-    expect(dialogComponent.el.querySelector('h2')?.textContent).toBe('Feedback!');
-  });
-
-  it('can open and close dialog', () => {
-    const dialogComponent = renderDialog();
-
-    expect(dialogComponent.checkIsOpen()).toBe(true);
-
-    dialogComponent.close();
-    expect(dialogComponent.checkIsOpen()).toBe(false);
-
-    dialogComponent.open();
-    expect(dialogComponent.checkIsOpen()).toBe(true);
-  });
-
-  it('calls `onClosed` callback when clicked', () => {
-    const onClosed = jest.fn();
-    const dialogComponent = renderDialog({
-      onClosed,
-    });
-
-    dialogComponent.el.dispatchEvent(new Event('click'));
-    expect(onClosed).toHaveBeenCalledWith();
-  });
-
-  it('stops event propagation when dialog contents is clicked', () => {
-    const onClosed = jest.fn();
-    const dialogComponent = renderDialog({
-      onClosed,
-    });
-
-    const event = new Event('click');
-    jest.spyOn(event, 'stopPropagation');
-    dialogComponent.el.querySelector('.dialog__content')?.dispatchEvent(event);
-
-    expect(event.stopPropagation).toHaveBeenCalled();
-    expect(onClosed).not.toHaveBeenCalled();
-  });
-});
diff --git a/packages/feedback/test/widget/Form.test.ts b/packages/feedback/test/widget/Form.test.ts
deleted file mode 100644
index 7b45cabd8503..000000000000
--- a/packages/feedback/test/widget/Form.test.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import type { FormComponentProps } from '../../src/widget/Form';
-import { Form } from '../../src/widget/Form';
-
-type NonNullableFields<T> = {
-  [P in keyof T]: NonNullable<T[P]>;
-};
-
-function renderForm({
-  showName = true,
-  showEmail = true,
-  isNameRequired = false,
-  isEmailRequired = false,
-  defaultName = 'Foo Bar',
-  defaultEmail = 'foo@example.com',
-  nameLabel = 'Name',
-  namePlaceholder = 'Your full name',
-  emailLabel = 'Email',
-  emailPlaceholder = 'foo@example.org',
-  messageLabel = 'Description',
-  messagePlaceholder = 'What is the issue?',
-  cancelButtonLabel = 'Cancel!',
-  submitButtonLabel = 'Submit!',
-  ...rest
-}: Partial<FormComponentProps> = {}) {
-  return Form({
-    showName,
-    showEmail,
-    isNameRequired,
-    isEmailRequired,
-    defaultName,
-    defaultEmail,
-    nameLabel,
-    namePlaceholder,
-    emailLabel,
-    emailPlaceholder,
-    messageLabel,
-    messagePlaceholder,
-    cancelButtonLabel,
-    submitButtonLabel,
-    ...rest,
-  }) as NonNullableFields<ReturnType<typeof Form>>;
-}
-
-describe('Form', () => {
-  it('renders a form', () => {
-    const formComponent = renderForm();
-
-    expect(formComponent.el).toBeInstanceOf(HTMLFormElement);
-    const nameInput = formComponent.el.querySelector('[name="name"][type="text"]') as HTMLInputElement;
-    const emailInput = formComponent.el.querySelector('[name="email"][type="text"]') as HTMLInputElement;
-    expect(nameInput).not.toBeNull();
-    expect(emailInput).not.toBeNull();
-    expect(nameInput.value).toBe('Foo Bar');
-    expect(emailInput.value).toBe('foo@example.com');
-    expect(formComponent.el.querySelector('[name="message"]')).not.toBeNull();
-
-    const button = formComponent.el.querySelector('button[type="submit"]') as HTMLButtonElement | null;
-    expect(button?.textContent).toBe('Submit!');
-    expect(formComponent.el.querySelector('button[type="button"]')?.textContent).toBe('Cancel!');
-  });
-
-  it('can hide name and email inputs', () => {
-    const formComponent = renderForm({
-      showName: false,
-      showEmail: false,
-    });
-
-    const nameInput = formComponent.el.querySelector('[name="name"][type="hidden"]') as HTMLInputElement;
-    const emailInput = formComponent.el.querySelector('[name="email"][type="hidden"]') as HTMLInputElement;
-    expect(nameInput).not.toBeNull();
-    expect(emailInput).not.toBeNull();
-    expect(nameInput.value).toBe('Foo Bar');
-    expect(emailInput.value).toBe('foo@example.com');
-    expect(formComponent.el.querySelector('[name="message"]')).not.toBeNull();
-  });
-
-  it('can change text labels', () => {
-    const formComponent = renderForm({
-      nameLabel: 'Name!',
-      namePlaceholder: 'Your full name!',
-      emailLabel: 'Email!',
-      emailPlaceholder: 'foo@example.org!',
-      messageLabel: 'Description!',
-      messagePlaceholder: 'What is the issue?!',
-      isNameRequired: true,
-      isEmailRequired: true,
-    });
-
-    const nameLabel = formComponent.el.querySelector('label[htmlFor="name"]') as HTMLLabelElement;
-    const emailLabel = formComponent.el.querySelector('label[htmlFor="email"]') as HTMLLabelElement;
-    const messageLabel = formComponent.el.querySelector('label[htmlFor="message"]') as HTMLLabelElement;
-    expect(nameLabel.textContent).toBe('Name! (required)');
-    expect(emailLabel.textContent).toBe('Email! (required)');
-    expect(messageLabel.textContent).toBe('Description! (required)');
-
-    const nameInput = formComponent.el.querySelector('[name="name"]') as HTMLInputElement;
-    const emailInput = formComponent.el.querySelector('[name="email"]') as HTMLInputElement;
-    const messageInput = formComponent.el.querySelector('[name="message"]') as HTMLTextAreaElement;
-
-    expect(nameInput.placeholder).toBe('Your full name!');
-    expect(emailInput.placeholder).toBe('foo@example.org!');
-    expect(messageInput.placeholder).toBe('What is the issue?!');
-  });
-
-  it('can show error', () => {
-    const formComponent = renderForm();
-    const errorEl = formComponent.el.querySelector('.form__error-container') as HTMLDivElement;
-    expect(errorEl.getAttribute('aria-hidden')).toBe('true');
-
-    formComponent.showError('My Error');
-    expect(errorEl.getAttribute('aria-hidden')).toBe('false');
-    expect(errorEl.textContent).toBe('My Error');
-
-    formComponent.hideError();
-    expect(errorEl.getAttribute('aria-hidden')).toBe('true');
-    expect(errorEl.textContent).toBe('');
-  });
-
-  it('calls `onCancel` callback', () => {
-    const onCancel = jest.fn(() => {});
-    const formComponent = renderForm({ onCancel });
-    (formComponent.el.querySelector('button[type="button"]') as HTMLButtonElement)?.click();
-    expect(onCancel).toHaveBeenCalled();
-  });
-
-  it('calls `onSubmit` callback when submitting', () => {
-    const onSubmit = jest.fn();
-    const formComponent = renderForm({ onSubmit });
-    const submitEvent = new Event('submit');
-
-    formComponent.el.dispatchEvent(submitEvent);
-
-    expect(onSubmit).toHaveBeenCalledWith({
-      email: 'foo@example.com',
-      message: '',
-      name: 'Foo Bar',
-    });
-  });
-});
diff --git a/packages/feedback/test/widget/SubmitButton.test.ts b/packages/feedback/test/widget/SubmitButton.test.ts
deleted file mode 100644
index d01b6006ae4a..000000000000
--- a/packages/feedback/test/widget/SubmitButton.test.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { SUBMIT_BUTTON_LABEL } from '../../src/constants';
-import type { SubmitButtonProps } from '../../src/widget/SubmitButton';
-import { SubmitButton } from '../../src/widget/SubmitButton';
-
-function renderSubmitButton(props?: Partial<SubmitButtonProps>) {
-  return SubmitButton({
-    label: SUBMIT_BUTTON_LABEL,
-    ...props,
-  });
-}
-
-describe('SubmitButton', () => {
-  it('renders the submit button, disabled by default', () => {
-    const submitButtonComponent = renderSubmitButton();
-
-    expect(submitButtonComponent.el).toBeInstanceOf(HTMLButtonElement);
-    if (!submitButtonComponent.el) {
-      throw new Error('Element does not exist');
-    }
-    expect(submitButtonComponent.el.textContent).toBe(SUBMIT_BUTTON_LABEL);
-  });
-});
diff --git a/packages/feedback/test/widget/SuccessMessage.test.ts b/packages/feedback/test/widget/SuccessMessage.test.ts
deleted file mode 100644
index 48c51dc992b9..000000000000
--- a/packages/feedback/test/widget/SuccessMessage.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { SUCCESS_MESSAGE_TEXT } from '../../src/constants';
-import type { SuccessMessageProps } from '../../src/widget/SuccessMessage';
-import { SuccessMessage } from '../../src/widget/SuccessMessage';
-
-function renderSuccessMessage(props?: Partial<SuccessMessageProps>) {
-  return SuccessMessage({
-    message: SUCCESS_MESSAGE_TEXT,
-    ...props,
-  });
-}
-
-describe('SuccessMessage', () => {
-  it('renders the submit button, disabled by default', () => {
-    const successMessageComponent = renderSuccessMessage();
-
-    expect(successMessageComponent.el).toBeInstanceOf(HTMLDivElement);
-    expect(successMessageComponent.el?.textContent).toBe(SUCCESS_MESSAGE_TEXT);
-  });
-
-  it('removes element and calls `onRemove` callback when clicked', () => {
-    const onRemove = jest.fn();
-    const successMessageComponent = renderSuccessMessage({
-      onRemove,
-    });
-
-    successMessageComponent.el && document.body.appendChild(successMessageComponent.el);
-    expect(document.querySelector('.success-message')).not.toBeNull();
-    successMessageComponent.el?.dispatchEvent(new Event('click'));
-    expect(document.querySelector('.success-message')).toBeNull();
-    expect(onRemove).toHaveBeenCalledWith();
-  });
-});
diff --git a/packages/feedback/test/widget/createWidget.test.ts b/packages/feedback/test/widget/createWidget.test.ts
deleted file mode 100644
index 0fba6f452084..000000000000
--- a/packages/feedback/test/widget/createWidget.test.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-import {
-  ACTOR_LABEL,
-  CANCEL_BUTTON_LABEL,
-  DEFAULT_THEME,
-  EMAIL_LABEL,
-  EMAIL_PLACEHOLDER,
-  FORM_TITLE,
-  MESSAGE_LABEL,
-  MESSAGE_PLACEHOLDER,
-  NAME_LABEL,
-  NAME_PLACEHOLDER,
-  SUBMIT_BUTTON_LABEL,
-  SUCCESS_MESSAGE_TEXT,
-} from '../../src/constants';
-import type { FeedbackInternalOptions } from '../../src/types';
-import { sendFeedbackRequest } from '../../src/util/sendFeedbackRequest';
-import { createShadowHost } from '../../src/widget/createShadowHost';
-import { createWidget } from '../../src/widget/createWidget';
-
-const flushPromises = () => new Promise(jest.requireActual('timers').setImmediate);
-jest.useFakeTimers();
-
-const DEFAULT_OPTIONS = {
-  id: 'sentry-feedback',
-  autoInject: true,
-  showEmail: true,
-  showName: true,
-  showBranding: false,
-  useSentryUser: {
-    email: 'email',
-    name: 'username',
-  },
-  isEmailRequired: false,
-  isNameRequired: false,
-
-  themeDark: DEFAULT_THEME.dark,
-  themeLight: DEFAULT_THEME.light,
-  colorScheme: 'system' as const,
-
-  buttonLabel: ACTOR_LABEL,
-  cancelButtonLabel: CANCEL_BUTTON_LABEL,
-  submitButtonLabel: SUBMIT_BUTTON_LABEL,
-  formTitle: FORM_TITLE,
-  emailPlaceholder: EMAIL_PLACEHOLDER,
-  emailLabel: EMAIL_LABEL,
-  messagePlaceholder: MESSAGE_PLACEHOLDER,
-  messageLabel: MESSAGE_LABEL,
-  namePlaceholder: NAME_PLACEHOLDER,
-  nameLabel: NAME_LABEL,
-  successMessageText: SUCCESS_MESSAGE_TEXT,
-
-  onFormClose: jest.fn(),
-  onFormOpen: jest.fn(),
-  onSubmitError: jest.fn(),
-  onSubmitSuccess: jest.fn(),
-};
-
-jest.mock('../../src/util/sendFeedbackRequest', () => {
-  const original = jest.requireActual('../../src/util/sendFeedbackRequest');
-  return {
-    ...original,
-    sendFeedbackRequest: jest.fn(),
-  };
-});
-
-function createShadowAndWidget(
-  feedbackOptions?: Partial<FeedbackInternalOptions> & { shouldCreateActor?: boolean },
-  createWidgetOptions?: Partial<Parameters<typeof createWidget>[0]>,
-) {
-  const { shadow } = createShadowHost({
-    id: 'feedback',
-    colorScheme: 'system',
-    themeLight: DEFAULT_THEME.light,
-    themeDark: DEFAULT_THEME.dark,
-  });
-  const widget = createWidget({
-    shadow,
-    options: {
-      ...DEFAULT_OPTIONS,
-      ...feedbackOptions,
-    },
-    ...createWidgetOptions,
-  });
-
-  return { shadow, widget };
-}
-
-describe('createWidget', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('creates widget with actor', () => {
-    const { shadow, widget } = createShadowAndWidget();
-    expect(widget.actor?.el).toBeInstanceOf(HTMLButtonElement);
-    const actorEl = widget.actor?.el as HTMLButtonElement;
-    expect(actorEl.textContent).toBe(DEFAULT_OPTIONS.buttonLabel);
-    // No dialog until actor is clicked
-    expect(widget.dialog).toBeUndefined();
-    expect(shadow.contains(actorEl)).toBe(true);
-  });
-
-  it('creates widget without actor', () => {
-    const { widget } = createShadowAndWidget({
-      shouldCreateActor: false,
-    });
-    expect(widget.actor?.el).toBeUndefined();
-    // No dialog until actor is clicked
-    expect(widget.dialog).toBeUndefined();
-  });
-
-  it('clicking on actor opens dialog and hides the actor', () => {
-    const onFormOpen = jest.fn();
-    const { widget } = createShadowAndWidget({ onFormOpen });
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-
-    // Dialog is now visible
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-
-    // Actor should be hidden
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('true');
-
-    expect(onFormOpen).toHaveBeenCalledTimes(1);
-  });
-
-  it('submits feedback successfully', async () => {
-    const onSubmitSuccess = jest.fn(() => {});
-    const { shadow, widget } = createShadowAndWidget({
-      onSubmitSuccess,
-    });
-
-    (sendFeedbackRequest as jest.Mock).mockImplementation(() => {
-      return Promise.resolve({ statusCode: 200 });
-    });
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-
-    const nameEl = widget.dialog?.el?.querySelector('[name="name"]') as HTMLInputElement;
-    nameEl.value = 'Jane Doe';
-    const emailEl = widget.dialog?.el?.querySelector('[name="email"]') as HTMLInputElement;
-    emailEl.value = 'jane@example.com';
-    const messageEl = widget.dialog?.el?.querySelector('[name="message"]') as HTMLTextAreaElement;
-    messageEl.value = 'My feedback';
-
-    nameEl.dispatchEvent(new Event('change'));
-    emailEl.dispatchEvent(new Event('change'));
-    messageEl.dispatchEvent(new Event('change'));
-
-    widget.dialog?.el?.querySelector('form')?.dispatchEvent(new Event('submit'));
-    expect(sendFeedbackRequest).toHaveBeenCalledWith(
-      {
-        feedback: {
-          name: 'Jane Doe',
-          email: 'jane@example.com',
-          message: 'My feedback',
-          url: 'http://localhost/',
-          source: 'widget',
-        },
-      },
-      {},
-    );
-
-    // sendFeedbackRequest is async
-    await flushPromises();
-
-    expect(onSubmitSuccess).toHaveBeenCalledTimes(1);
-
-    expect(widget.dialog).toBeUndefined();
-    expect(shadow.querySelector('.success-message')?.textContent).toBe(SUCCESS_MESSAGE_TEXT);
-
-    jest.runAllTimers();
-    expect(shadow.querySelector('.success-message')).toBeNull();
-  });
-
-  it('only submits feedback successfully when all required fields are filled', async () => {
-    const onSubmitSuccess = jest.fn(() => {});
-    const { shadow, widget } = createShadowAndWidget({
-      isNameRequired: true,
-      isEmailRequired: true,
-      onSubmitSuccess,
-    });
-
-    (sendFeedbackRequest as jest.Mock).mockImplementation(() => {
-      return Promise.resolve({ statusCode: 200 });
-    });
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-
-    const nameEl = widget.dialog?.el?.querySelector('[name="name"]') as HTMLInputElement;
-    const emailEl = widget.dialog?.el?.querySelector('[name="email"]') as HTMLInputElement;
-    const messageEl = widget.dialog?.el?.querySelector('[name="message"]') as HTMLTextAreaElement;
-
-    nameEl.value = '';
-    emailEl.value = '';
-    messageEl.value = '';
-
-    widget.dialog?.el?.querySelector('form')?.dispatchEvent(new Event('submit'));
-    expect(sendFeedbackRequest).toHaveBeenCalledTimes(0);
-
-    // sendFeedbackRequest is async
-    await flushPromises();
-    expect(onSubmitSuccess).toHaveBeenCalledTimes(0);
-
-    nameEl.value = '';
-    emailEl.value = '';
-    messageEl.value = 'My feedback';
-
-    widget.dialog?.el?.querySelector('form')?.dispatchEvent(new Event('submit'));
-    expect(sendFeedbackRequest).toHaveBeenCalledTimes(0);
-
-    // sendFeedbackRequest is async
-    await flushPromises();
-    expect(onSubmitSuccess).toHaveBeenCalledTimes(0);
-
-    nameEl.value = 'Jane Doe';
-    emailEl.value = 'jane@example.com';
-    messageEl.value = 'My feedback';
-
-    widget.dialog?.el?.querySelector('form')?.dispatchEvent(new Event('submit'));
-    expect(sendFeedbackRequest).toHaveBeenCalledWith(
-      {
-        feedback: {
-          name: 'Jane Doe',
-          email: 'jane@example.com',
-          message: 'My feedback',
-          url: 'http://localhost/',
-          source: 'widget',
-        },
-      },
-      {},
-    );
-
-    // sendFeedbackRequest is async
-    await flushPromises();
-    expect(onSubmitSuccess).toHaveBeenCalledTimes(1);
-
-    expect(widget.dialog).toBeUndefined();
-    expect(shadow.querySelector('.success-message')?.textContent).toBe(SUCCESS_MESSAGE_TEXT);
-
-    jest.runAllTimers();
-    expect(shadow.querySelector('.success-message')).toBeNull();
-  });
-
-  it('submits feedback with error on request', async () => {
-    const onSubmitError = jest.fn(() => {});
-    const { shadow, widget } = createShadowAndWidget({
-      onSubmitError,
-    });
-
-    (sendFeedbackRequest as jest.Mock).mockImplementation(() => {
-      throw new Error('Unable to send feedback');
-    });
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-
-    const messageEl = widget.dialog?.el?.querySelector('[name="message"]') as HTMLTextAreaElement;
-    messageEl.value = 'My feedback';
-
-    messageEl.dispatchEvent(new Event('change'));
-
-    widget.dialog?.el?.querySelector('form')?.dispatchEvent(new Event('submit'));
-    expect(sendFeedbackRequest).toHaveBeenCalledWith(
-      {
-        feedback: {
-          name: '',
-          email: '',
-          message: 'My feedback',
-          url: 'http://localhost/',
-          source: 'widget',
-        },
-      },
-      {},
-    );
-
-    // sendFeedbackRequest is async
-    await flushPromises();
-
-    expect(onSubmitError).toHaveBeenCalledTimes(1);
-
-    expect(widget.dialog).not.toBeUndefined();
-    expect(shadow.querySelector('.form__error-container')?.textContent).toBe(
-      'There was a problem submitting feedback, please wait and try again.',
-    );
-  });
-
-  it('closes when Cancel button is clicked', () => {
-    const onFormClose = jest.fn();
-    const { widget } = createShadowAndWidget({ onFormClose });
-
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(true);
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('true');
-
-    // Click cancel button
-    widget.dialog?.el?.querySelector('[aria-label="Cancel"]')?.dispatchEvent(new Event('click'));
-
-    // Element/component should still exist, but it will be in a closed state
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(false);
-    expect(onFormClose).toHaveBeenCalledTimes(1);
-
-    // Actor should now be visible too
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('false');
-
-    // Open it up again
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(true);
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('true');
-  });
-
-  it('closes when dialog (background)) is clicked', () => {
-    const onFormClose = jest.fn();
-    const { widget } = createShadowAndWidget({ onFormClose });
-
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(true);
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('true');
-
-    // Click the actual dialog element (which serves as modal backdrop)
-    widget.dialog?.el?.dispatchEvent(new Event('click'));
-
-    // Element/component should still exist, but it will be in a closed state
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(false);
-    expect(onFormClose).toHaveBeenCalledTimes(1);
-
-    // Actor should now be visible too
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('false');
-
-    // Open it up again
-    widget.actor?.el?.dispatchEvent(new Event('click'));
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(true);
-    expect(widget.actor?.el?.getAttribute('aria-hidden')).toBe('true');
-  });
-
-  it('attaches to a custom actor element', () => {
-    const onFormOpen = jest.fn();
-    // This element is in the normal DOM
-    const myActor = document.createElement('div');
-    myActor.textContent = 'my button';
-
-    const { widget } = createShadowAndWidget(
-      {
-        autoInject: false,
-        onFormOpen,
-      },
-      {
-        attachTo: myActor,
-      },
-    );
-
-    myActor.dispatchEvent(new Event('click'));
-    expect(widget.dialog?.el).toBeInstanceOf(HTMLDialogElement);
-    expect(widget.dialog?.el?.open).toBe(true);
-    expect(onFormOpen).toHaveBeenCalledTimes(1);
-    // This is all we do with `attachTo` (open dialog)
-  });
-});
diff --git a/packages/feedback/tsconfig.json b/packages/feedback/tsconfig.json
index f8f54556da93..c1fc08578508 100644
--- a/packages/feedback/tsconfig.json
+++ b/packages/feedback/tsconfig.json
@@ -1,7 +1,17 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "module": "esnext"
+    "module": "esnext",
+
+    /* Preact Config */
+    "jsx": "react-jsx",
+    "jsxImportSource": "preact",
+    "skipLibCheck": true,
+    "baseUrl": "./",
+    "paths": {
+      "react": ["./node_modules/preact/compat/"],
+      "react-dom": ["./node_modules/preact/compat/"]
+    }
   },
-  "include": ["src/**/*.ts"]
+  "include": ["src/**/*.ts","src/**/*.tsx"]
 }
diff --git a/packages/gatsby/README.md b/packages/gatsby/README.md
index c20f3355e297..b87b99c365c1 100644
--- a/packages/gatsby/README.md
+++ b/packages/gatsby/README.md
@@ -13,17 +13,19 @@ module.exports = {
   // ...
   plugins: [
     {
-      resolve: "@sentry/gatsby",
+      resolve: '@sentry/gatsby',
       options: {
-          dsn: process.env.SENTRY_DSN, // this is the default
-      }
+        dsn: process.env.SENTRY_DSN, // this is the default
+      },
     },
     // ...
-  ]
-}
+  ],
+};
 ```
 
-Options will be passed directly to `Sentry.init`. See all available options in [our docs](https://docs.sentry.io/error-reporting/configuration/?platform=javascript). The `environment` value defaults to `NODE_ENV` (or `'development'` if `NODE_ENV` is not set).
+Options will be passed directly to `Sentry.init`. See all available options in
+[our docs](https://docs.sentry.io/error-reporting/configuration/?platform=javascript). The `environment` value defaults
+to `NODE_ENV` (or `'development'` if `NODE_ENV` is not set).
 
 ## GitHub Actions
 
@@ -35,18 +37,21 @@ The `release` value is inferred from `COMMIT_REF`.
 
 ## Vercel
 
-To automatically capture the `release` value on Vercel you will need to register appropriate [system environment variable](https://vercel.com/docs/v2/build-step#system-environment-variables) (e.g. `VERCEL_GITHUB_COMMIT_SHA`) in your project.
+To automatically capture the `release` value on Vercel you will need to register appropriate
+[system environment variable](https://vercel.com/docs/v2/build-step#system-environment-variables) (e.g.
+`VERCEL_GITHUB_COMMIT_SHA`) in your project.
 
 ## Sentry Performance
 
-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.
+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 = {
   // ...
   plugins: [
     {
-      resolve: "@sentry/gatsby",
+      resolve: '@sentry/gatsby',
       options: {
         dsn: process.env.SENTRY_DSN, // this is the default
 
@@ -60,24 +65,21 @@ module.exports = {
           // for this transaction.
           // Can return 0 to drop the transaction entirely.
 
-          if ("...") {
-            return 0.5 // These are important - take a big sample
-          }
-          else if ("...") {
-            return 0.01 // These are less important or happen much more frequently - only take 1% of them
-          }
-          else if ("...") {
-            return 0 // These aren't something worth tracking - drop all transactions like this
+          if ('...') {
+            return 0.5; // These are important - take a big sample
+          } else if ('...') {
+            return 0.01; // These are less important or happen much more frequently - only take 1% of them
+          } else if ('...') {
+            return 0; // These aren't something worth tracking - drop all transactions like this
+          } else {
+            return 0.1; // Default sample rate
           }
-          else {
-            return 0.1 // Default sample rate
-          }
-        }
-      }
+        },
+      },
     },
     // ...
-  ]
-}
+  ],
+};
 ```
 
 If you want to supply options to the `BrowserTracing` integration, use the `browserTracingOptions` parameter.
@@ -87,19 +89,19 @@ module.exports = {
   // ...
   plugins: [
     {
-      resolve: "@sentry/gatsby",
+      resolve: '@sentry/gatsby',
       options: {
-          dsn: process.env.SENTRY_DSN, // this is the default
-          tracesSampleRate: 1, // or tracesSampler (see above)
-          browserTracingOptions: {
-            // disable creating spans for XHR requests
-            traceXHR: false,
-          }
-      }
+        dsn: process.env.SENTRY_DSN, // this is the default
+        tracesSampleRate: 1, // or tracesSampler (see above)
+        browserTracingOptions: {
+          // disable creating spans for XHR requests
+          traceXHR: false,
+        },
+      },
     },
     // ...
-  ]
-}
+  ],
+};
 ```
 
 ## Links
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 102b287526fb..8cec3aa0bdb2 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -11,7 +11,7 @@
     "gatsby-plugin"
   ],
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -26,6 +26,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/google-cloud-serverless/.eslintrc.js b/packages/google-cloud-serverless/.eslintrc.js
new file mode 100644
index 000000000000..99fcba0976da
--- /dev/null
+++ b/packages/google-cloud-serverless/.eslintrc.js
@@ -0,0 +1,23 @@
+module.exports = {
+  env: {
+    node: true,
+  },
+  extends: ['../../.eslintrc.js'],
+  rules: {
+    '@sentry-internal/sdk/no-optional-chaining': 'off',
+  },
+  overrides: [
+    {
+      files: ['scripts/**/*.ts'],
+      parserOptions: {
+        project: ['../../tsconfig.dev.json'],
+      },
+    },
+    {
+      files: ['test/**'],
+      parserOptions: {
+        sourceType: 'module',
+      },
+    },
+  ],
+};
diff --git a/packages/google-cloud-serverless/LICENSE b/packages/google-cloud-serverless/LICENSE
new file mode 100644
index 000000000000..ea5e82344f87
--- /dev/null
+++ b/packages/google-cloud-serverless/LICENSE
@@ -0,0 +1,14 @@
+Copyright (c) 2024 Sentry (https://sentry.io) and individual contributors. All rights reserved.
+
+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.
diff --git a/packages/google-cloud-serverless/README.md b/packages/google-cloud-serverless/README.md
new file mode 100644
index 000000000000..124ca28d6c16
--- /dev/null
+++ b/packages/google-cloud-serverless/README.md
@@ -0,0 +1,47 @@
+<p align="center">
+  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
+    <img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
+  </a>
+</p>
+
+# Official Sentry SDK for Google Cloud Functions
+
+## Links
+
+- [Official SDK Docs](https://docs.sentry.io/)
+- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
+
+## General
+
+This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
+methods available in `@sentry/node` can be imported from `@sentry/google-cloud-serverless`.
+
+To use this SDK, call `Sentry.init(options)` at the very beginning of your JavaScript file.
+
+```javascript
+const Sentry = require('@sentry/google-cloud-serverless');
+
+Sentry.init({
+  dsn: '__DSN__',
+  tracesSampleRate: 1.0,
+  // ...
+});
+
+// For HTTP Functions:
+
+exports.helloHttp = Sentry.wrapHttpFunction((req, res) => {
+  throw new Error('oh, hello there!');
+});
+
+// For Background Functions:
+
+exports.helloEvents = Sentry.wrapEventFunction((data, context, callback) => {
+  throw new Error('oh, hello there!');
+});
+
+// For CloudEvents:
+
+exports.helloEvents = Sentry.wrapCloudEventFunction((context, callback) => {
+  throw new Error('oh, hello there!');
+});
+```
diff --git a/packages/google-cloud-serverless/jest.config.js b/packages/google-cloud-serverless/jest.config.js
new file mode 100644
index 000000000000..24f49ab59a4c
--- /dev/null
+++ b/packages/google-cloud-serverless/jest.config.js
@@ -0,0 +1 @@
+module.exports = require('../../jest/jest.config.js');
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
new file mode 100644
index 000000000000..5fab9e8c8237
--- /dev/null
+++ b/packages/google-cloud-serverless/package.json
@@ -0,0 +1,81 @@
+{
+  "name": "@sentry/google-cloud-serverless",
+  "version": "8.0.0-alpha.2",
+  "description": "Official Sentry SDK for Google Cloud Functions",
+  "repository": "git://github.com/getsentry/sentry-javascript.git",
+  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud",
+  "author": "Sentry",
+  "license": "MIT",
+  "engines": {
+    "node": ">=14.18"
+  },
+  "files": [
+    "cjs",
+    "esm",
+    "types",
+    "types-ts3.8"
+  ],
+  "main": "build/cjs/index.js",
+  "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
+  "typesVersions": {
+    "<4.9": {
+      "build/types/index.d.ts": [
+        "build/types-ts3.8/index.d.ts"
+      ]
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@sentry/core": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
+    "@sentry/types": "8.0.0-alpha.2",
+    "@sentry/utils": "8.0.0-alpha.2",
+    "@types/express": "^4.17.14"
+  },
+  "devDependencies": {
+    "@google-cloud/bigquery": "^5.3.0",
+    "@google-cloud/common": "^3.4.1",
+    "@google-cloud/functions-framework": "^1.7.1",
+    "@google-cloud/pubsub": "^2.5.0",
+    "@types/node": "^14.6.4",
+    "find-up": "^5.0.0",
+    "google-gax": "^2.9.0",
+    "nock": "^13.0.4",
+    "npm-packlist": "^2.1.4"
+  },
+  "scripts": {
+    "build": "run-p build:transpile build:types",
+    "build:dev": "yarn build",
+    "build:transpile": "rollup -c rollup.npm.config.mjs",
+    "build:types": "run-s build:types:core build:types:downlevel",
+    "build:types:core": "tsc -p tsconfig.types.json",
+    "build:types:downlevel": "yarn downlevel-dts build/types build/types-ts3.8 --to ts3.8",
+    "build:watch": "run-p build:transpile:watch build:types:watch",
+    "build:dev:watch": "yarn build:watch",
+    "build:transpile:watch": "rollup -c rollup.npm.config.mjs --watch",
+    "build:types:watch": "tsc -p tsconfig.types.json --watch",
+    "build:tarball": "ts-node ../../scripts/prepack.ts && npm pack ./build",
+    "circularDepCheck": "madge --circular src/index.ts",
+    "clean": "rimraf build coverage sentry-google-cloud-*.tgz",
+    "fix": "eslint . --format stylish --fix",
+    "lint": "eslint . --format stylish",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "yalc:publish": "ts-node ../../scripts/prepack.ts && yalc publish build --push --sig"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sideEffects": false
+}
diff --git a/packages/google-cloud-serverless/rollup.npm.config.mjs b/packages/google-cloud-serverless/rollup.npm.config.mjs
new file mode 100644
index 000000000000..84a06f2fb64a
--- /dev/null
+++ b/packages/google-cloud-serverless/rollup.npm.config.mjs
@@ -0,0 +1,3 @@
+import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
+
+export default makeNPMConfigVariants(makeBaseNPMConfig());
diff --git a/packages/google-cloud-serverless/src/debug-build.ts b/packages/google-cloud-serverless/src/debug-build.ts
new file mode 100644
index 000000000000..60aa50940582
--- /dev/null
+++ b/packages/google-cloud-serverless/src/debug-build.ts
@@ -0,0 +1,8 @@
+declare const __DEBUG_BUILD__: boolean;
+
+/**
+ * This serves as a build time flag that will be true by default, but false in non-debug builds or if users replace `__SENTRY_DEBUG__` in their generated code.
+ *
+ * ATTENTION: This constant must never cross package boundaries (i.e. be exported) to guarantee that it can be used for tree shaking.
+ */
+export const DEBUG_BUILD = __DEBUG_BUILD__;
diff --git a/packages/serverless/src/gcpfunction/cloud_events.ts b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
similarity index 97%
rename from packages/serverless/src/gcpfunction/cloud_events.ts
rename to packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
index 3d5ac9d3d1dc..c2d1aa307cda 100644
--- a/packages/serverless/src/gcpfunction/cloud_events.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
@@ -1,5 +1,5 @@
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, handleCallbackErrors } from '@sentry/core';
-import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node-experimental';
+import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
@@ -48,7 +48,7 @@ function _wrapCloudEventFunction(
           if (args[0] !== null && args[0] !== undefined) {
             captureException(args[0], scope => markEventUnhandled(scope));
           }
-          span?.end();
+          span.end();
 
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
           flush(options.flushTimeout)
diff --git a/packages/serverless/src/gcpfunction/events.ts b/packages/google-cloud-serverless/src/gcpfunction/events.ts
similarity index 97%
rename from packages/serverless/src/gcpfunction/events.ts
rename to packages/google-cloud-serverless/src/gcpfunction/events.ts
index 3503a427ee1f..bdecbeff9868 100644
--- a/packages/serverless/src/gcpfunction/events.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/events.ts
@@ -1,5 +1,5 @@
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, handleCallbackErrors } from '@sentry/core';
-import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node-experimental';
+import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
@@ -51,7 +51,7 @@ function _wrapEventFunction<F extends EventFunction | EventFunctionWithCallback>
           if (args[0] !== null && args[0] !== undefined) {
             captureException(args[0], scope => markEventUnhandled(scope));
           }
-          span?.end();
+          span.end();
 
           // eslint-disable-next-line @typescript-eslint/no-floating-promises
           flush(options.flushTimeout)
diff --git a/packages/serverless/src/gcpfunction/general.ts b/packages/google-cloud-serverless/src/gcpfunction/general.ts
similarity index 100%
rename from packages/serverless/src/gcpfunction/general.ts
rename to packages/google-cloud-serverless/src/gcpfunction/general.ts
diff --git a/packages/serverless/src/gcpfunction/http.ts b/packages/google-cloud-serverless/src/gcpfunction/http.ts
similarity index 89%
rename from packages/serverless/src/gcpfunction/http.ts
rename to packages/google-cloud-serverless/src/gcpfunction/http.ts
index 17ee38d18e0e..6ce957884ea9 100644
--- a/packages/serverless/src/gcpfunction/http.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/http.ts
@@ -5,13 +5,11 @@ import {
   handleCallbackErrors,
   setHttpStatus,
 } from '@sentry/core';
-import { continueTrace, startSpanManual } from '@sentry/node-experimental';
-import { getCurrentScope } from '@sentry/node-experimental';
-import { captureException, flush } from '@sentry/node-experimental';
+import { captureException, continueTrace, flush, getCurrentScope, startSpanManual } from '@sentry/node';
 import { isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { domainify, markEventUnhandled, proxyFunction } from './../utils';
+import { domainify, markEventUnhandled, proxyFunction } from '../utils';
 import type { HttpFunction, WrapperOptions } from './general';
 
 /**
@@ -73,10 +71,8 @@ function _wrapHttpFunction(fn: HttpFunction, options: Partial<WrapperOptions>):
           const _end = res.end;
           // eslint-disable-next-line @typescript-eslint/no-explicit-any
           res.end = function (chunk?: any | (() => void), encoding?: string | (() => void), cb?: () => void): any {
-            if (span) {
-              setHttpStatus(span, res.statusCode);
-              span.end();
-            }
+            setHttpStatus(span, res.statusCode);
+            span.end();
 
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             flush(flushTimeout)
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
new file mode 100644
index 000000000000..6505088d7c93
--- /dev/null
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -0,0 +1,109 @@
+export {
+  addEventProcessor,
+  addBreadcrumb,
+  addIntegration,
+  captureException,
+  captureEvent,
+  captureMessage,
+  captureCheckIn,
+  startSession,
+  captureSession,
+  endSession,
+  withMonitor,
+  createTransport,
+  // eslint-disable-next-line deprecation/deprecation
+  getCurrentHub,
+  getClient,
+  isInitialized,
+  getCurrentScope,
+  getGlobalScope,
+  getIsolationScope,
+  Hub,
+  setCurrentClient,
+  Scope,
+  SDK_VERSION,
+  setContext,
+  setExtra,
+  setExtras,
+  setTag,
+  setTags,
+  setUser,
+  getSpanStatusFromHttpCode,
+  setHttpStatus,
+  withScope,
+  withIsolationScope,
+  makeNodeTransport,
+  NodeClient,
+  defaultStackParser,
+  flush,
+  close,
+  getSentryRelease,
+  addRequestDataToEvent,
+  DEFAULT_USER_INCLUDES,
+  extractRequestData,
+  createGetModuleFromFilename,
+  anrIntegration,
+  consoleIntegration,
+  httpIntegration,
+  nativeNodeFetchIntegration,
+  onUncaughtExceptionIntegration,
+  onUnhandledRejectionIntegration,
+  modulesIntegration,
+  contextLinesIntegration,
+  nodeContextIntegration,
+  localVariablesIntegration,
+  requestDataIntegration,
+  functionToStringIntegration,
+  inboundFiltersIntegration,
+  linkedErrorsIntegration,
+  setMeasurement,
+  getActiveSpan,
+  startSpan,
+  startInactiveSpan,
+  startSpanManual,
+  withActiveSpan,
+  getRootSpan,
+  getSpanDescendants,
+  continueTrace,
+  getAutoPerformanceIntegrations,
+  cron,
+  metrics,
+  parameterize,
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+} from '@sentry/node';
+
+export {
+  captureConsoleIntegration,
+  debugIntegration,
+  dedupeIntegration,
+  extraErrorDataIntegration,
+  rewriteFramesIntegration,
+  sessionTimingIntegration,
+} from '@sentry/core';
+
+export { getDefaultIntegrations, init } from './sdk';
+
+export { googleCloudHttpIntegration } from './integrations/google-cloud-http';
+export { googleCloudGrpcIntegration } from './integrations/google-cloud-grpc';
+
+export { wrapCloudEventFunction } from './gcpfunction/cloud_events';
+export { wrapHttpFunction } from './gcpfunction/http';
+export { wrapEventFunction } from './gcpfunction/events';
diff --git a/packages/serverless/src/google-cloud-grpc.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
similarity index 84%
rename from packages/serverless/src/google-cloud-grpc.ts
rename to packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
index e982563fb36e..0b1aa11a0a9d 100644
--- a/packages/serverless/src/google-cloud-grpc.ts
+++ b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
@@ -1,12 +1,7 @@
 import type { EventEmitter } from 'events';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  convertIntegrationFnToClass,
-  defineIntegration,
-  getClient,
-} from '@sentry/core';
-import { startInactiveSpan } from '@sentry/node-experimental';
-import type { Client, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, getClient } from '@sentry/core';
+import { startInactiveSpan } from '@sentry/node';
+import type { Client, IntegrationFn } from '@sentry/types';
 import { fill } from '@sentry/utils';
 
 interface GrpcFunction extends CallableFunction {
@@ -62,21 +57,10 @@ const _googleCloudGrpcIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const googleCloudGrpcIntegration = defineIntegration(_googleCloudGrpcIntegration);
-
 /**
  * Google Cloud Platform service requests tracking for GRPC APIs.
- *
- * @deprecated Use `googleCloudGrpcIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const GoogleCloudGrpc = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  googleCloudGrpcIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type GoogleCloudGrpc = typeof GoogleCloudGrpc;
+export const googleCloudGrpcIntegration = defineIntegration(_googleCloudGrpcIntegration);
 
 /** Returns a wrapped function that returns a stub with tracing enabled */
 function wrapCreateStub(origCreate: CreateStubFunc): CreateStubFunc {
diff --git a/packages/serverless/src/google-cloud-http.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
similarity index 76%
rename from packages/serverless/src/google-cloud-http.ts
rename to packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
index 78abb2f97ff1..e33f016b204f 100644
--- a/packages/serverless/src/google-cloud-http.ts
+++ b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
@@ -1,12 +1,7 @@
 import type * as common from '@google-cloud/common';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  convertIntegrationFnToClass,
-  defineIntegration,
-  getClient,
-} from '@sentry/core';
-import { startInactiveSpan } from '@sentry/node-experimental';
-import type { Client, Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SentryNonRecordingSpan, defineIntegration, getClient } from '@sentry/core';
+import { startInactiveSpan } from '@sentry/node';
+import type { Client, IntegrationFn } from '@sentry/types';
 import { fill } from '@sentry/utils';
 
 type RequestOptions = common.DecorateRequestOptions;
@@ -41,21 +36,10 @@ const _googleCloudHttpIntegration = ((options: { optional?: boolean } = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const googleCloudHttpIntegration = defineIntegration(_googleCloudHttpIntegration);
-
 /**
  * Google Cloud Platform service requests tracking for RESTful APIs.
- *
- * @deprecated Use `googleCloudHttpIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const GoogleCloudHttp = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  googleCloudHttpIntegration,
-) as IntegrationClass<Integration>;
-
-// eslint-disable-next-line deprecation/deprecation
-export type GoogleCloudHttp = typeof GoogleCloudHttp;
+export const googleCloudHttpIntegration = defineIntegration(_googleCloudHttpIntegration);
 
 /** Returns a wrapped function that makes a request with tracing enabled */
 function wrapRequestFunction(orig: RequestFunction): RequestFunction {
@@ -70,11 +54,9 @@ function wrapRequestFunction(orig: RequestFunction): RequestFunction {
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.serverless',
           },
         })
-      : undefined;
+      : new SentryNonRecordingSpan();
     orig.call(this, reqOpts, (...args: Parameters<ResponseCallback>) => {
-      if (span) {
-        span.end();
-      }
+      span.end();
       callback(...args);
     });
   };
diff --git a/packages/serverless/src/gcpfunction/index.ts b/packages/google-cloud-serverless/src/sdk.ts
similarity index 63%
rename from packages/serverless/src/gcpfunction/index.ts
rename to packages/google-cloud-serverless/src/sdk.ts
index ad415b2fb761..838a3d97a4a3 100644
--- a/packages/serverless/src/gcpfunction/index.ts
+++ b/packages/google-cloud-serverless/src/sdk.ts
@@ -1,17 +1,9 @@
-import type { NodeOptions } from '@sentry/node-experimental';
-import {
-  SDK_VERSION,
-  getDefaultIntegrations as getDefaultNodeIntegrations,
-  init as initNode,
-} from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
+import { SDK_VERSION, getDefaultIntegrations as getDefaultNodeIntegrations, init as initNode } from '@sentry/node';
 import type { Integration, Options, SdkMetadata } from '@sentry/types';
 
-import { googleCloudGrpcIntegration } from '../google-cloud-grpc';
-import { googleCloudHttpIntegration } from '../google-cloud-http';
-
-export * from './http';
-export * from './events';
-export * from './cloud_events';
+import { googleCloudGrpcIntegration } from './integrations/google-cloud-grpc';
+import { googleCloudHttpIntegration } from './integrations/google-cloud-http';
 
 /** Get the default integrations for the GCP SDK. */
 export function getDefaultIntegrations(options: Options): Integration[] {
@@ -33,11 +25,10 @@ export function init(options: NodeOptions = {}): void {
   };
 
   opts._metadata.sdk = opts._metadata.sdk || {
-    name: 'sentry.javascript.serverless',
-    integrations: ['GCPFunction'],
+    name: 'sentry.javascript.google-cloud-serverless',
     packages: [
       {
-        name: 'npm:@sentry/serverless',
+        name: 'npm:@sentry/google-cloud-serverless',
         version: SDK_VERSION,
       },
     ],
diff --git a/packages/serverless/src/utils.ts b/packages/google-cloud-serverless/src/utils.ts
similarity index 100%
rename from packages/serverless/src/utils.ts
rename to packages/google-cloud-serverless/src/utils.ts
diff --git a/packages/google-cloud-serverless/test/__mocks__/dns.ts b/packages/google-cloud-serverless/test/__mocks__/dns.ts
new file mode 100644
index 000000000000..d03aa8d3f84b
--- /dev/null
+++ b/packages/google-cloud-serverless/test/__mocks__/dns.ts
@@ -0,0 +1,2 @@
+export const lookup = jest.fn();
+export const resolveTxt = jest.fn();
diff --git a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
new file mode 100644
index 000000000000..5c1824077b8d
--- /dev/null
+++ b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
@@ -0,0 +1,184 @@
+import * as domain from 'domain';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+
+import { wrapCloudEventFunction } from '../../src/gcpfunction/cloud_events';
+import type { CloudEventFunction, CloudEventFunctionWithCallback } from '../../src/gcpfunction/general';
+
+const mockStartSpanManual = jest.fn((...spanArgs) => ({ ...spanArgs }));
+const mockFlush = jest.fn((...args) => Promise.resolve(args));
+const mockCaptureException = jest.fn();
+
+const mockScope = {
+  setContext: jest.fn(),
+};
+
+const mockSpan = {
+  end: jest.fn(),
+};
+
+jest.mock('@sentry/node', () => {
+  const original = jest.requireActual('@sentry/node');
+  return {
+    ...original,
+    startSpanManual: (...args: unknown[]) => {
+      mockStartSpanManual(...args);
+      mockSpan.end();
+      return original.startSpanManual(...args);
+    },
+    getCurrentScope: () => {
+      return mockScope;
+    },
+    flush: (...args: unknown[]) => {
+      return mockFlush(...args);
+    },
+    captureException: (...args: unknown[]) => {
+      mockCaptureException(...args);
+    },
+  };
+});
+
+describe('wrapCloudEventFunction', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  function handleCloudEvent(fn: CloudEventFunctionWithCallback): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const d = domain.create();
+      // d.on('error', () => res.end());
+      const context = {
+        type: 'event.type',
+      };
+      d.on('error', reject);
+      d.run(() =>
+        process.nextTick(fn, context, (err: any, result: any) => {
+          if (err != null || err != undefined) {
+            reject(err);
+          } else {
+            resolve(result);
+          }
+        }),
+      );
+    });
+  }
+
+  describe('wrapCloudEventFunction() without callback', () => {
+    test('successful execution', async () => {
+      const func: CloudEventFunction = _context => {
+        return 42;
+      };
+      const wrappedHandler = wrapCloudEventFunction(func);
+      await expect(handleCloudEvent(wrappedHandler)).resolves.toBe(42);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.cloud_event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: CloudEventFunction = _context => {
+        throw error;
+      };
+      const wrappedHandler = wrapCloudEventFunction(handler);
+      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.cloud_event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+  });
+
+  describe('wrapCloudEventFunction() with callback', () => {
+    test('successful execution', async () => {
+      const func: CloudEventFunctionWithCallback = (_context, cb) => {
+        cb(null, 42);
+      };
+      const wrappedHandler = wrapCloudEventFunction(func);
+      await expect(handleCloudEvent(wrappedHandler)).resolves.toBe(42);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.cloud_event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: CloudEventFunctionWithCallback = (_context, cb) => {
+        cb(error);
+      };
+      const wrappedHandler = wrapCloudEventFunction(handler);
+      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.cloud_event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+
+    test('capture exception', async () => {
+      const error = new Error('wat');
+      const handler: CloudEventFunctionWithCallback = (_context, _cb) => {
+        throw error;
+      };
+      const wrappedHandler = wrapCloudEventFunction(handler);
+      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.cloud_event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+    });
+  });
+
+  test('wrapCloudEventFunction scope data', async () => {
+    const handler: CloudEventFunction = _context => 42;
+    const wrappedHandler = wrapCloudEventFunction(handler);
+    await handleCloudEvent(wrappedHandler);
+    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', { type: 'event.type' });
+  });
+});
diff --git a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
new file mode 100644
index 000000000000..9a3bf0d189dd
--- /dev/null
+++ b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
@@ -0,0 +1,265 @@
+import * as domain from 'domain';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+
+import type { Event } from '@sentry/types';
+import { wrapEventFunction } from '../../src/gcpfunction/events';
+import type { EventFunction, EventFunctionWithCallback } from '../../src/gcpfunction/general';
+
+const mockStartSpanManual = jest.fn((...spanArgs) => ({ ...spanArgs }));
+const mockFlush = jest.fn((...args) => Promise.resolve(args));
+const mockCaptureException = jest.fn();
+
+const mockScope = {
+  setContext: jest.fn(),
+};
+
+const mockSpan = {
+  end: jest.fn(),
+};
+
+jest.mock('@sentry/node', () => {
+  const original = jest.requireActual('@sentry/node');
+  return {
+    ...original,
+    startSpanManual: (...args: unknown[]) => {
+      mockStartSpanManual(...args);
+      mockSpan.end();
+      return original.startSpanManual(...args);
+    },
+    getCurrentScope: () => {
+      return mockScope;
+    },
+    flush: (...args: unknown[]) => {
+      return mockFlush(...args);
+    },
+    captureException: (...args: unknown[]) => {
+      mockCaptureException(...args);
+    },
+  };
+});
+
+describe('wrapEventFunction', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  function handleEvent(fn: EventFunctionWithCallback): Promise<any> {
+    return new Promise((resolve, reject) => {
+      const d = domain.create();
+      // d.on('error', () => res.end());
+      const context = {
+        eventType: 'event.type',
+        resource: 'some.resource',
+      };
+      d.on('error', reject);
+      d.run(() =>
+        process.nextTick(fn, {}, context, (err: any, result: any) => {
+          if (err != null || err != undefined) {
+            reject(err);
+          } else {
+            resolve(result);
+          }
+        }),
+      );
+    });
+  }
+
+  describe('wrapEventFunction() without callback', () => {
+    test('successful execution', async () => {
+      const func: EventFunction = (_data, _context) => {
+        return 42;
+      };
+      const wrappedHandler = wrapEventFunction(func);
+      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: EventFunction = (_data, _context) => {
+        throw error;
+      };
+      const wrappedHandler = wrapEventFunction(handler);
+      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+  });
+
+  describe('wrapEventFunction() as Promise', () => {
+    test('successful execution', async () => {
+      const func: EventFunction = (_data, _context) =>
+        new Promise(resolve => {
+          setTimeout(() => {
+            resolve(42);
+          }, 10);
+        });
+      const wrappedHandler = wrapEventFunction(func);
+      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: EventFunction = (_data, _context) =>
+        new Promise((_, reject) => {
+          setTimeout(() => {
+            reject(error);
+          }, 10);
+        });
+
+      const wrappedHandler = wrapEventFunction(handler);
+      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+  });
+
+  describe('wrapEventFunction() with callback', () => {
+    test('successful execution', async () => {
+      const func: EventFunctionWithCallback = (_data, _context, cb) => {
+        cb(null, 42);
+      };
+      const wrappedHandler = wrapEventFunction(func);
+      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: EventFunctionWithCallback = (_data, _context, cb) => {
+        cb(error);
+      };
+      const wrappedHandler = wrapEventFunction(handler);
+      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+
+    test('capture exception', async () => {
+      const error = new Error('wat');
+      const handler: EventFunctionWithCallback = (_data, _context, _cb) => {
+        throw error;
+      };
+      const wrappedHandler = wrapEventFunction(handler);
+      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
+
+      const fakeTransactionContext = {
+        name: 'event.type',
+        op: 'function.gcp.event',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+    });
+  });
+
+  test('marks the captured error as unhandled', async () => {
+    const error = new Error('wat');
+    const handler: EventFunctionWithCallback = (_data, _context, _cb) => {
+      throw error;
+    };
+    const wrappedHandler = wrapEventFunction(handler);
+    await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
+
+    expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+
+    const scopeFunction = mockCaptureException.mock.calls[0][1];
+    const event: Event = { exception: { values: [{}] } };
+    let evtProcessor: ((e: Event) => Event) | undefined = undefined;
+    scopeFunction({ addEventProcessor: jest.fn().mockImplementation(proc => (evtProcessor = proc)) });
+
+    expect(evtProcessor).toBeInstanceOf(Function);
+    // @ts-expect-error just mocking around...
+    expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
+      handled: false,
+      type: 'generic',
+    });
+  });
+
+  test('wrapEventFunction scope data', async () => {
+    const handler: EventFunction = (_data, _context) => 42;
+    const wrappedHandler = wrapEventFunction(handler);
+    await handleEvent(wrappedHandler);
+    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', {
+      eventType: 'event.type',
+      resource: 'some.resource',
+    });
+  });
+});
diff --git a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
new file mode 100644
index 000000000000..e0793fb5691d
--- /dev/null
+++ b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
@@ -0,0 +1,187 @@
+import * as domain from 'domain';
+
+import type { Integration } from '@sentry/types';
+
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+
+import { wrapHttpFunction } from '../../src/gcpfunction/http';
+
+import type { HttpFunction, Request, Response } from '../../src/gcpfunction/general';
+
+import { init } from '../../src/sdk';
+
+const mockStartSpanManual = jest.fn((...spanArgs) => ({ ...spanArgs }));
+const mockFlush = jest.fn((...args) => Promise.resolve(args));
+const mockCaptureException = jest.fn();
+const mockInit = jest.fn();
+
+const mockScope = {
+  setSDKProcessingMetadata: jest.fn(),
+};
+
+const mockSpan = {
+  end: jest.fn(),
+};
+
+jest.mock('@sentry/node', () => {
+  const original = jest.requireActual('@sentry/node');
+  return {
+    ...original,
+    init: (options: unknown) => {
+      mockInit(options);
+    },
+    startSpanManual: (...args: unknown[]) => {
+      mockStartSpanManual(...args);
+      mockSpan.end();
+      return original.startSpanManual(...args);
+    },
+    getCurrentScope: () => {
+      return mockScope;
+    },
+    flush: (...args: unknown[]) => {
+      return mockFlush(...args);
+    },
+    captureException: (...args: unknown[]) => {
+      mockCaptureException(...args);
+    },
+  };
+});
+
+describe('GCPFunction', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  async function handleHttp(fn: HttpFunction, trace_headers: { [key: string]: string } | null = null): Promise<void> {
+    let headers: { [key: string]: string } = { host: 'hostname', 'content-type': 'application/json' };
+    if (trace_headers) {
+      headers = { ...headers, ...trace_headers };
+    }
+    return new Promise((resolve, _reject) => {
+      const d = domain.create();
+      const req = {
+        method: 'POST',
+        url: '/path?q=query',
+        headers: headers,
+        body: { foo: 'bar' },
+      } as Request;
+      const res = { end: resolve } as Response;
+      d.on('error', () => res.end());
+      d.run(() => process.nextTick(fn, req, res));
+    });
+  }
+
+  describe('wrapHttpFunction() options', () => {
+    test('flushTimeout', async () => {
+      const handler: HttpFunction = (_, res) => {
+        res.end();
+      };
+      const wrappedHandler = wrapHttpFunction(handler, { flushTimeout: 1337 });
+
+      await handleHttp(wrappedHandler);
+      expect(mockFlush).toBeCalledWith(1337);
+    });
+  });
+
+  describe('wrapHttpFunction()', () => {
+    test('successful execution', async () => {
+      const handler: HttpFunction = (_req, res) => {
+        res.statusCode = 200;
+        res.end();
+      };
+      const wrappedHandler = wrapHttpFunction(handler);
+      await handleHttp(wrappedHandler);
+
+      const fakeTransactionContext = {
+        name: 'POST /path',
+        op: 'function.gcp.http',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_http',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalledWith(2000);
+    });
+
+    test('capture error', async () => {
+      const error = new Error('wat');
+      const handler: HttpFunction = (_req, _res) => {
+        throw error;
+      };
+      const wrappedHandler = wrapHttpFunction(handler);
+
+      await handleHttp(wrappedHandler);
+
+      const fakeTransactionContext = {
+        name: 'POST /path',
+        op: 'function.gcp.http',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_http',
+        },
+      };
+
+      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
+      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
+      expect(mockSpan.end).toBeCalled();
+      expect(mockFlush).toBeCalled();
+    });
+
+    test('should not throw when flush rejects', async () => {
+      const handler: HttpFunction = async (_req, res) => {
+        res.statusCode = 200;
+        res.end();
+      };
+
+      const wrappedHandler = wrapHttpFunction(handler);
+
+      const request = {
+        method: 'POST',
+        url: '/path?q=query',
+        headers: { host: 'hostname', 'content-type': 'application/json' },
+        body: { foo: 'bar' },
+      } as Request;
+
+      const mockEnd = jest.fn();
+      const response = { end: mockEnd } as unknown as Response;
+
+      mockFlush.mockImplementationOnce(async () => {
+        throw new Error();
+      });
+
+      await expect(wrappedHandler(request, response)).resolves.toBeUndefined();
+      expect(mockEnd).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  // This tests that the necessary pieces are in place for request data to get added to event - the `RequestData`
+  // integration is included in the defaults and the necessary data is stored in `sdkProcessingMetadata`. The
+  // integration's tests cover testing that it uses that data correctly.
+  test('wrapHttpFunction request data prereqs', async () => {
+    init({});
+
+    const handler: HttpFunction = (_req, res) => {
+      res.end();
+    };
+    const wrappedHandler = wrapHttpFunction(handler);
+
+    await handleHttp(wrappedHandler);
+
+    const initOptions = (mockInit as unknown as jest.SpyInstance).mock.calls[0];
+    const defaultIntegrations = initOptions[0].defaultIntegrations.map((i: Integration) => i.name);
+
+    expect(defaultIntegrations).toContain('RequestData');
+
+    expect(mockScope.setSDKProcessingMetadata).toHaveBeenCalledWith({
+      request: {
+        method: 'POST',
+        url: '/path?q=query',
+        headers: { host: 'hostname', 'content-type': 'application/json' },
+        body: { foo: 'bar' },
+      },
+    });
+  });
+});
diff --git a/packages/serverless/test/google-cloud-grpc.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
similarity index 95%
rename from packages/serverless/test/google-cloud-grpc.test.ts
rename to packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
index d9d789d33480..2e6c9039e075 100644
--- a/packages/serverless/test/google-cloud-grpc.test.ts
+++ b/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
@@ -9,17 +9,17 @@ import * as http2 from 'http2';
 import * as nock from 'nock';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { NodeClient, createTransport, setCurrentClient } from '@sentry/node-experimental';
-import { googleCloudGrpcIntegration } from '../src/google-cloud-grpc';
+import { NodeClient, createTransport, setCurrentClient } from '@sentry/node';
+import { googleCloudGrpcIntegration } from '../../src/integrations/google-cloud-grpc';
 
 const spyConnect = jest.spyOn(http2, 'connect');
 
 const mockSpanEnd = jest.fn();
 const mockStartInactiveSpan = jest.fn(spanArgs => ({ ...spanArgs }));
 
-jest.mock('@sentry/node-experimental', () => {
+jest.mock('@sentry/node', () => {
   return {
-    ...jest.requireActual('@sentry/node-experimental'),
+    ...jest.requireActual('@sentry/node'),
     startInactiveSpan: (ctx: unknown) => {
       mockStartInactiveSpan(ctx);
       return { end: mockSpanEnd };
diff --git a/packages/serverless/test/google-cloud-http.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
similarity index 95%
rename from packages/serverless/test/google-cloud-http.test.ts
rename to packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
index 804156a1bf02..5d90077df1fd 100644
--- a/packages/serverless/test/google-cloud-http.test.ts
+++ b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
@@ -5,14 +5,14 @@ import * as nock from 'nock';
 
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { NodeClient, createTransport, setCurrentClient } from '@sentry/node-experimental';
-import { googleCloudHttpIntegration } from '../src/google-cloud-http';
+import { googleCloudHttpIntegration } from '../../src/integrations/google-cloud-http';
 
 const mockSpanEnd = jest.fn();
 const mockStartInactiveSpan = jest.fn(spanArgs => ({ ...spanArgs }));
 
-jest.mock('@sentry/node-experimental', () => {
+jest.mock('@sentry/node', () => {
   return {
-    ...jest.requireActual('@sentry/node-experimental'),
+    ...jest.requireActual('@sentry/node'),
     startInactiveSpan: (ctx: unknown) => {
       mockStartInactiveSpan(ctx);
       return { end: mockSpanEnd };
diff --git a/packages/serverless/test/private.pem b/packages/google-cloud-serverless/test/integrations/private.pem
similarity index 100%
rename from packages/serverless/test/private.pem
rename to packages/google-cloud-serverless/test/integrations/private.pem
diff --git a/packages/google-cloud-serverless/test/sdk.test.ts b/packages/google-cloud-serverless/test/sdk.test.ts
new file mode 100644
index 000000000000..ee4a1fc6fa17
--- /dev/null
+++ b/packages/google-cloud-serverless/test/sdk.test.ts
@@ -0,0 +1,40 @@
+import { init } from '../src/sdk';
+
+const mockInit = jest.fn();
+
+jest.mock('@sentry/node', () => {
+  const original = jest.requireActual('@sentry/node');
+  return {
+    ...original,
+    init: (options: unknown) => {
+      mockInit(options);
+    },
+  };
+});
+
+describe('init()', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('calls Sentry.init with correct sdk info metadata', () => {
+    init({});
+
+    expect(mockInit).toBeCalledWith(
+      expect.objectContaining({
+        _metadata: {
+          sdk: {
+            name: 'sentry.javascript.google-cloud-serverless',
+            packages: [
+              {
+                name: 'npm:@sentry/google-cloud-serverless',
+                version: expect.any(String),
+              },
+            ],
+            version: expect.any(String),
+          },
+        },
+      }),
+    );
+  });
+});
diff --git a/packages/google-cloud-serverless/tsconfig.json b/packages/google-cloud-serverless/tsconfig.json
new file mode 100644
index 000000000000..a2731860dfa0
--- /dev/null
+++ b/packages/google-cloud-serverless/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+
+  "include": ["src/**/*"],
+
+  "compilerOptions": {
+    // package-specific options
+    "target": "ES2018",
+    "resolveJsonModule": true
+  }
+}
diff --git a/packages/google-cloud-serverless/tsconfig.test.json b/packages/google-cloud-serverless/tsconfig.test.json
new file mode 100644
index 000000000000..87f6afa06b86
--- /dev/null
+++ b/packages/google-cloud-serverless/tsconfig.test.json
@@ -0,0 +1,12 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["test/**/*"],
+
+  "compilerOptions": {
+    // should include all types from `./tsconfig.json` plus types for all test frameworks used
+    "types": ["node", "jest"]
+
+    // other package-specific, test-specific options
+  }
+}
diff --git a/packages/google-cloud-serverless/tsconfig.types.json b/packages/google-cloud-serverless/tsconfig.types.json
new file mode 100644
index 000000000000..65455f66bd75
--- /dev/null
+++ b/packages/google-cloud-serverless/tsconfig.types.json
@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.json",
+
+  "compilerOptions": {
+    "declaration": true,
+    "declarationMap": true,
+    "emitDeclarationOnly": true,
+    "outDir": "build/types"
+  }
+}
diff --git a/packages/integration-shims/README.md b/packages/integration-shims/README.md
index 523e3e4fd85f..e315b1f61051 100644
--- a/packages/integration-shims/README.md
+++ b/packages/integration-shims/README.md
@@ -6,4 +6,5 @@
 
 # Sentry Integration Shims
 
-This internal package exports shims for Integrations, which are used in order to guarantee a consistent CDN bundle output.
+This internal package exports shims for Integrations, which are used in order to guarantee a consistent CDN bundle
+output.
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 738ea4283aa8..e3d037178ac1 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -5,6 +5,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
@@ -44,7 +57,7 @@
     "@sentry/utils": "8.0.0-alpha.2"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/integration-shims/src/BrowserTracing.ts b/packages/integration-shims/src/BrowserTracing.ts
index 32841d842718..7fa357dffabf 100644
--- a/packages/integration-shims/src/BrowserTracing.ts
+++ b/packages/integration-shims/src/BrowserTracing.ts
@@ -9,7 +9,7 @@ import { consoleSandbox } from '@sentry/utils';
 export const browserTracingIntegrationShim = defineIntegration((_options?: unknown) => {
   consoleSandbox(() => {
     // eslint-disable-next-line no-console
-    console.warn('You are using new BrowserTracing() even though this bundle does not include tracing.');
+    console.warn('You are using browserTracingIntegration() even though this bundle does not include tracing.');
   });
 
   return {
diff --git a/packages/integration-shims/src/Feedback.ts b/packages/integration-shims/src/Feedback.ts
index 419071d2bd26..e6bf1607927b 100644
--- a/packages/integration-shims/src/Feedback.ts
+++ b/packages/integration-shims/src/Feedback.ts
@@ -1,81 +1,37 @@
 import type { Integration } from '@sentry/types';
 import { consoleSandbox } from '@sentry/utils';
+import { FAKE_FUNCTION } from './common';
 
-/**
- * This is a shim for the Feedback integration.
- * It is needed in order for the CDN bundles to continue working when users add/remove feedback
- * from it, without changing their config. This is necessary for the loader mechanism.
- *
- * @deprecated Use `feedbackIntegration()` instead.
- */
-export class FeedbackShim implements Integration {
-  /**
-   * @inheritDoc
-   */
-  public static id: string = 'Feedback';
-
-  /**
-   * @inheritDoc
-   */
-  public name: string;
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public constructor(_options: any) {
-    // eslint-disable-next-line deprecation/deprecation
-    this.name = FeedbackShim.id;
+const FEEDBACK_INTEGRATION_METHODS = [
+  'openDialog',
+  'closeDialog',
+  'attachTo',
+  'createWidget',
+  'removeWidget',
+  'getWidget',
+  'remove',
+] as const;
 
-    consoleSandbox(() => {
-      // eslint-disable-next-line no-console
-      console.warn('You are using new Feedback() even though this bundle does not include Feedback.');
-    });
-  }
+type FeedbackSpecificMethods = Record<(typeof FEEDBACK_INTEGRATION_METHODS)[number], () => void>;
 
-  /** jsdoc */
-  public setupOnce(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public openDialog(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public closeDialog(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public attachTo(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public createWidget(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public removeWidget(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public getWidget(): void {
-    // noop
-  }
-  /** jsdoc */
-  public remove(): void {
-    // noop
-  }
-}
+interface FeedbackIntegration extends Integration, FeedbackSpecificMethods {}
 
 /**
  * This is a shim for the Feedback integration.
  * It is needed in order for the CDN bundles to continue working when users add/remove feedback
  * from it, without changing their config. This is necessary for the loader mechanism.
  */
-export function feedbackIntegrationShim(_options: unknown): Integration {
-  // eslint-disable-next-line deprecation/deprecation
-  return new FeedbackShim({});
+export function feedbackIntegrationShim(_options: unknown): FeedbackIntegration {
+  consoleSandbox(() => {
+    // eslint-disable-next-line no-console
+    console.warn('You are using feedbackIntegration() even though this bundle does not include feedback.');
+  });
+
+  return {
+    name: 'Feedback',
+    ...(FEEDBACK_INTEGRATION_METHODS.reduce((acc, method) => {
+      acc[method] = FAKE_FUNCTION;
+      return acc;
+    }, {} as FeedbackSpecificMethods) as FeedbackSpecificMethods),
+  };
 }
diff --git a/packages/integration-shims/src/Replay.ts b/packages/integration-shims/src/Replay.ts
index ddebdbb14402..1f44fdf6bb3a 100644
--- a/packages/integration-shims/src/Replay.ts
+++ b/packages/integration-shims/src/Replay.ts
@@ -1,62 +1,29 @@
 import type { Integration } from '@sentry/types';
 import { consoleSandbox } from '@sentry/utils';
+import { FAKE_FUNCTION } from './common';
 
-/**
- * This is a shim for the Replay integration.
- * It is needed in order for the CDN bundles to continue working when users add/remove replay
- * from it, without changing their config. This is necessary for the loader mechanism.
- *
- * @deprecated Use `replayIntegration()` instead.
- */
-export class ReplayShim implements Integration {
-  /**
-   * @inheritDoc
-   */
-  public static id: string = 'Replay';
-
-  /**
-   * @inheritDoc
-   */
-  public name: string;
+const REPLAY_INTEGRATION_METHODS = ['start', 'stop', 'flush'] as const;
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  public constructor(_options: any) {
-    // eslint-disable-next-line deprecation/deprecation
-    this.name = ReplayShim.id;
+type ReplaySpecificMethods = Record<(typeof REPLAY_INTEGRATION_METHODS)[number], () => void>;
 
-    consoleSandbox(() => {
-      // eslint-disable-next-line no-console
-      console.warn('You are using new Replay() even though this bundle does not include replay.');
-    });
-  }
-
-  /** jsdoc */
-  public setupOnce(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public start(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public stop(): void {
-    // noop
-  }
-
-  /** jsdoc */
-  public flush(): void {
-    // noop
-  }
-}
+interface ReplayIntegration extends Integration, ReplaySpecificMethods {}
 
 /**
  * This is a shim for the Replay integration.
  * It is needed in order for the CDN bundles to continue working when users add/remove replay
  * from it, without changing their config. This is necessary for the loader mechanism.
  */
-export function replayIntegrationShim(_options: unknown): Integration {
-  // eslint-disable-next-line deprecation/deprecation
-  return new ReplayShim({});
+export function replayIntegrationShim(_options: unknown): ReplayIntegration {
+  consoleSandbox(() => {
+    // eslint-disable-next-line no-console
+    console.warn('You are using replayIntegration() even though this bundle does not include replay.');
+  });
+
+  return {
+    name: 'Replay',
+    ...(REPLAY_INTEGRATION_METHODS.reduce((acc, method) => {
+      acc[method] = FAKE_FUNCTION;
+      return acc;
+    }, {} as ReplaySpecificMethods) as ReplaySpecificMethods),
+  };
 }
diff --git a/packages/integration-shims/src/common.ts b/packages/integration-shims/src/common.ts
new file mode 100644
index 000000000000..48fe24ac124f
--- /dev/null
+++ b/packages/integration-shims/src/common.ts
@@ -0,0 +1 @@
+export const FAKE_FUNCTION = (): undefined => undefined;
diff --git a/packages/integration-shims/src/index.ts b/packages/integration-shims/src/index.ts
index 64124f4a93cc..5dfb2caabea1 100644
--- a/packages/integration-shims/src/index.ts
+++ b/packages/integration-shims/src/index.ts
@@ -1,15 +1,5 @@
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  FeedbackShim,
-  feedbackIntegrationShim,
-} from './Feedback';
-
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayShim,
-  replayIntegrationShim,
-} from './Replay';
-
+export { feedbackIntegrationShim } from './Feedback';
+export { replayIntegrationShim } from './Replay';
 export {
   browserTracingIntegrationShim,
   addTracingExtensionsShim,
diff --git a/packages/nextjs/README.md b/packages/nextjs/README.md
index 26322828afe4..119a591621df 100644
--- a/packages/nextjs/README.md
+++ b/packages/nextjs/README.md
@@ -21,7 +21,8 @@ Currently, the minimum Next.js supported version is `10.0.8`.
 
 ## General
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/react` for the client, with added functionality related to Next.js.
+This package is a wrapper around `@sentry/node` for the server and `@sentry/react` for the client, with added
+functionality related to Next.js.
 
 To use this SDK, init it in the Sentry config files.
 
@@ -31,7 +32,7 @@ To use this SDK, init it in the Sentry config files.
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
-  dsn: "__DSN__",
+  dsn: '__DSN__',
   // ...
 });
 ```
@@ -42,7 +43,7 @@ Sentry.init({
 import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
-  dsn: "__DSN__",
+  dsn: '__DSN__',
   // ...
 });
 ```
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index b2007ba6a0e5..58e5962f53e0 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -7,12 +7,23 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "main": "build/cjs/index.server.js",
   "module": "build/esm/index.server.js",
   "browser": "build/esm/index.client.js",
   "types": "build/types/index.types.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "browser": {
+        "import": "./build/esm/index.client.js",
+        "require": "./build/cjs/index.client.js"
+      },
+      "node": "./build/cjs/index.server.js",
+      "types": "./build/types/index.types.d.ts"
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -31,10 +42,10 @@
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
     "@sentry/vercel-edge": "8.0.0-alpha.2",
-    "@sentry/webpack-plugin": "1.21.0",
+    "@sentry/webpack-plugin": "2.14.3",
     "chalk": "3.0.0",
     "resolve": "1.22.8",
-    "rollup": "2.78.0",
+    "rollup": "3.29.4",
     "stacktrace-parser": "^0.1.10"
   },
   "devDependencies": {
diff --git a/packages/nextjs/src/client/browserTracingIntegration.ts b/packages/nextjs/src/client/browserTracingIntegration.ts
index d70eb3da0746..c50dbbf1686e 100644
--- a/packages/nextjs/src/client/browserTracingIntegration.ts
+++ b/packages/nextjs/src/client/browserTracingIntegration.ts
@@ -1,10 +1,6 @@
-import {
-  browserTracingIntegration as originalBrowserTracingIntegration,
-  startBrowserTracingNavigationSpan,
-  startBrowserTracingPageLoadSpan,
-} from '@sentry/react';
-import type { Integration, StartSpanOptions } from '@sentry/types';
-import { nextRouterInstrumentation } from './routing/nextRoutingInstrumentation';
+import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react';
+import type { Integration } from '@sentry/types';
+import { nextRouterInstrumentNavigation, nextRouterInstrumentPageLoad } from './routing/nextRoutingInstrumentation';
 
 /**
  * A custom browser tracing integration for Next.js.
@@ -18,36 +14,24 @@ export function browserTracingIntegration(
     instrumentPageLoad: false,
   });
 
+  const { instrumentPageLoad = true, instrumentNavigation = true } = options;
+
   return {
     ...browserTracingIntegrationInstance,
     afterAllSetup(client) {
-      const startPageloadCallback = (startSpanOptions: StartSpanOptions): void => {
-        startBrowserTracingPageLoadSpan(client, startSpanOptions);
-      };
-
-      const startNavigationCallback = (startSpanOptions: StartSpanOptions): void => {
-        startBrowserTracingNavigationSpan(client, startSpanOptions);
-      };
-
       // We need to run the navigation span instrumentation before the `afterAllSetup` hook on the normal browser
       // tracing integration because we need to ensure the order of execution is as follows:
       // Instrumentation to start span on RSC fetch request runs -> Instrumentation to put tracing headers from active span on fetch runs
       // If it were the other way around, the RSC fetch request would not receive the tracing headers from the navigation transaction.
-      nextRouterInstrumentation(
-        false,
-        options.instrumentNavigation === undefined ? true : options.instrumentNavigation,
-        startPageloadCallback,
-        startNavigationCallback,
-      );
+      if (instrumentNavigation) {
+        nextRouterInstrumentNavigation(client);
+      }
 
       browserTracingIntegrationInstance.afterAllSetup(client);
 
-      nextRouterInstrumentation(
-        options.instrumentPageLoad === undefined ? true : options.instrumentPageLoad,
-        false,
-        startPageloadCallback,
-        startNavigationCallback,
-      );
+      if (instrumentPageLoad) {
+        nextRouterInstrumentPageLoad(client);
+      }
     },
   };
 }
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index fd155705a885..157e2cf70560 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -2,6 +2,7 @@ import { addEventProcessor, applySdkMetadata, hasTracingEnabled, setTag } from '
 import type { BrowserOptions } from '@sentry/react';
 import { getDefaultIntegrations as getReactDefaultIntegrations, init as reactInit } from '@sentry/react';
 import type { EventProcessor, Integration } from '@sentry/types';
+import { GLOBAL_OBJ } from '@sentry/utils';
 
 import { devErrorSymbolicationEventProcessor } from '../common/devErrorSymbolicationEventProcessor';
 import { getVercelEnv } from '../common/getVercelEnv';
@@ -13,7 +14,7 @@ export * from '@sentry/react';
 
 export { captureUnderscoreErrorException } from '../common/_error';
 
-const globalWithInjectedValues = global as typeof global & {
+const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   __rewriteFramesAssetPrefixPath__: string;
 };
 
diff --git a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
index 8459f88454a3..25c1496d25b4 100644
--- a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
@@ -3,71 +3,55 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
 } from '@sentry/core';
-import { WINDOW } from '@sentry/react';
-import type { StartSpanOptions } from '@sentry/types';
+import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
+import type { Client } from '@sentry/types';
 import { addFetchInstrumentationHandler, browserPerformanceTimeOrigin } from '@sentry/utils';
 
-type StartSpanCb = (context: StartSpanOptions) => void;
-
-/**
- * Instruments the Next.js Client App Router.
- */
-export function appRouterInstrumentation(
-  shouldInstrumentPageload: boolean,
-  shouldInstrumentNavigation: boolean,
-  startPageloadSpanCallback: StartSpanCb,
-  startNavigationSpanCallback: StartSpanCb,
-): void {
-  // We keep track of the previous location name so we can set the `from` field on navigation transactions.
-  // This is either a route or a pathname.
-  let currPathname = WINDOW.location.pathname;
-
-  if (shouldInstrumentPageload) {
-    startPageloadSpanCallback({
-      name: currPathname,
-      // pageload should always start at timeOrigin (and needs to be in s, not ms)
-      startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
-      attributes: {
-        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
-        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.nextjs.app_router_instrumentation',
-        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-      },
-    });
-  }
+/** Instruments the Next.js app router for pageloads. */
+export function appRouterInstrumentPageLoad(client: Client): void {
+  startBrowserTracingPageLoadSpan(client, {
+    name: WINDOW.location.pathname,
+    // pageload should always start at timeOrigin (and needs to be in s, not ms)
+    startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.nextjs.app_router_instrumentation',
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+    },
+  });
+}
 
-  if (shouldInstrumentNavigation) {
-    addFetchInstrumentationHandler(handlerData => {
-      // The instrumentation handler is invoked twice - once for starting a request and once when the req finishes
-      // We can use the existence of the end-timestamp to filter out "finishing"-events.
-      if (handlerData.endTimestamp !== undefined) {
-        return;
-      }
+/** Instruments the Next.js app router for navigation. */
+export function appRouterInstrumentNavigation(client: Client): void {
+  addFetchInstrumentationHandler(handlerData => {
+    // The instrumentation handler is invoked twice - once for starting a request and once when the req finishes
+    // We can use the existence of the end-timestamp to filter out "finishing"-events.
+    if (handlerData.endTimestamp !== undefined) {
+      return;
+    }
 
-      // Only GET requests can be navigating RSC requests
-      if (handlerData.fetchData.method !== 'GET') {
-        return;
-      }
+    // Only GET requests can be navigating RSC requests
+    if (handlerData.fetchData.method !== 'GET') {
+      return;
+    }
 
-      const parsedNavigatingRscFetchArgs = parseNavigatingRscFetchArgs(handlerData.args);
+    const parsedNavigatingRscFetchArgs = parseNavigatingRscFetchArgs(handlerData.args);
 
-      if (parsedNavigatingRscFetchArgs === null) {
-        return;
-      }
+    if (parsedNavigatingRscFetchArgs === null) {
+      return;
+    }
 
-      const newPathname = parsedNavigatingRscFetchArgs.targetPathname;
-      currPathname = newPathname;
+    const newPathname = parsedNavigatingRscFetchArgs.targetPathname;
 
-      startNavigationSpanCallback({
-        name: newPathname,
-        attributes: {
-          from: currPathname,
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.app_router_instrumentation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-        },
-      });
+    startBrowserTracingNavigationSpan(client, {
+      name: newPathname,
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.app_router_instrumentation',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+      },
     });
-  }
+  });
 }
 
 function parseNavigatingRscFetchArgs(fetchArgs: unknown[]): null | {
diff --git a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
index f092b2c0b3db..a25c765e0143 100644
--- a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
@@ -1,34 +1,29 @@
 import { WINDOW } from '@sentry/react';
-import type { StartSpanOptions } from '@sentry/types';
+import type { Client } from '@sentry/types';
 
-import { appRouterInstrumentation } from './appRouterRoutingInstrumentation';
-import { pagesRouterInstrumentation } from './pagesRouterRoutingInstrumentation';
+import { appRouterInstrumentNavigation, appRouterInstrumentPageLoad } from './appRouterRoutingInstrumentation';
+import { pagesRouterInstrumentNavigation, pagesRouterInstrumentPageLoad } from './pagesRouterRoutingInstrumentation';
 
-type StartSpanCb = (context: StartSpanOptions) => void;
+/**
+ * Instruments the Next.js Client Router for page loads.
+ */
+export function nextRouterInstrumentPageLoad(client: Client): void {
+  const isAppRouter = !WINDOW.document.getElementById('__NEXT_DATA__');
+  if (isAppRouter) {
+    appRouterInstrumentPageLoad(client);
+  } else {
+    pagesRouterInstrumentPageLoad(client);
+  }
+}
 
 /**
- * Instruments the Next.js Client Router.
+ * Instruments the Next.js Client Router for navigation.
  */
-export function nextRouterInstrumentation(
-  shouldInstrumentPageload: boolean,
-  shouldInstrumentNavigation: boolean,
-  startPageloadSpanCallback: StartSpanCb,
-  startNavigationSpanCallback: StartSpanCb,
-): void {
+export function nextRouterInstrumentNavigation(client: Client): void {
   const isAppRouter = !WINDOW.document.getElementById('__NEXT_DATA__');
   if (isAppRouter) {
-    appRouterInstrumentation(
-      shouldInstrumentPageload,
-      shouldInstrumentNavigation,
-      startPageloadSpanCallback,
-      startNavigationSpanCallback,
-    );
+    appRouterInstrumentNavigation(client);
   } else {
-    pagesRouterInstrumentation(
-      shouldInstrumentPageload,
-      shouldInstrumentNavigation,
-      startPageloadSpanCallback,
-      startNavigationSpanCallback,
-    );
+    pagesRouterInstrumentNavigation(client);
   }
 }
diff --git a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
index fe28ad71558e..720921ddb1e9 100644
--- a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
@@ -3,18 +3,18 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  getClient,
 } from '@sentry/core';
-import { WINDOW } from '@sentry/react';
-import type { StartSpanOptions, TransactionSource } from '@sentry/types';
-import {
-  browserPerformanceTimeOrigin,
-  logger,
-  propagationContextFromHeaders,
-  stripUrlQueryAndFragment,
-} from '@sentry/utils';
+import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
+import type { Client, TransactionSource } from '@sentry/types';
+import { browserPerformanceTimeOrigin, logger, stripUrlQueryAndFragment } from '@sentry/utils';
 import type { NEXT_DATA as NextData } from 'next/dist/next-server/lib/utils';
-import { default as Router } from 'next/router';
+import RouterImport from 'next/router';
+
+// next/router v10 is CJS
+//
+// For ESM/CJS interoperability 'reasons', depending on how this file is loaded, Router might be on the default export
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
+const Router: typeof RouterImport = RouterImport.events ? RouterImport : (RouterImport as any).default;
 
 import { DEBUG_BUILD } from '../../common/debug-build';
 
@@ -24,8 +24,6 @@ const globalObject = WINDOW as typeof WINDOW & {
   };
 };
 
-type StartSpanCb = (context: StartSpanOptions) => void;
-
 /**
  * Describes data located in the __NEXT_DATA__ script tag. This tag is present on every page of a Next.js app.
  */
@@ -98,73 +96,67 @@ function extractNextDataTagInformation(): NextDataTagInfo {
 }
 
 /**
- * Instruments the Next.js pages router. Only supported for
- * client side routing. Works for Next >= 10.
+ * Instruments the Next.js pages router for pageloads.
+ * Only supported for client side routing. Works for Next >= 10.
  *
  * Leverages the SingletonRouter from the `next/router` to
  * generate pageload/navigation transactions and parameterize
  * transaction names.
  */
-export function pagesRouterInstrumentation(
-  shouldInstrumentPageload: boolean,
-  shouldInstrumentNavigation: boolean,
-  startPageloadSpanCallback: StartSpanCb,
-  startNavigationSpanCallback: StartSpanCb,
-): void {
+export function pagesRouterInstrumentPageLoad(client: Client): void {
   const { route, params, sentryTrace, baggage } = extractNextDataTagInformation();
-  const { traceId, dsc, parentSpanId, sampled } = propagationContextFromHeaders(sentryTrace, baggage);
-  let prevLocationName = route || globalObject.location.pathname;
+  const name = route || globalObject.location.pathname;
 
-  if (shouldInstrumentPageload) {
-    const client = getClient();
-    startPageloadSpanCallback({
-      name: prevLocationName,
+  startBrowserTracingPageLoadSpan(
+    client,
+    {
+      name,
       // pageload should always start at timeOrigin (and needs to be in s, not ms)
       startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
-      traceId,
-      parentSpanId,
-      parentSampled: sampled,
-      ...(params && client && client.getOptions().sendDefaultPii && { data: params }),
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.nextjs.pages_router_instrumentation',
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: route ? 'route' : 'url',
+        ...(params && client.getOptions().sendDefaultPii && { ...params }),
       },
-      metadata: {
-        dynamicSamplingContext: dsc,
-      },
-    });
-  }
+    },
+    { sentryTrace, baggage },
+  );
+}
+
+/**
+ * Instruments the Next.js pages router for navigation.
+ * Only supported for client side routing. Works for Next >= 10.
+ *
+ * Leverages the SingletonRouter from the `next/router` to
+ * generate pageload/navigation transactions and parameterize
+ * transaction names.
+ */
+export function pagesRouterInstrumentNavigation(client: Client): void {
+  Router.events.on('routeChangeStart', (navigationTarget: string) => {
+    const strippedNavigationTarget = stripUrlQueryAndFragment(navigationTarget);
+    const matchedRoute = getNextRouteFromPathname(strippedNavigationTarget);
+
+    let newLocation: string;
+    let spanSource: TransactionSource;
+
+    if (matchedRoute) {
+      newLocation = matchedRoute;
+      spanSource = 'route';
+    } else {
+      newLocation = strippedNavigationTarget;
+      spanSource = 'url';
+    }
 
-  if (shouldInstrumentNavigation) {
-    Router.events.on('routeChangeStart', (navigationTarget: string) => {
-      const strippedNavigationTarget = stripUrlQueryAndFragment(navigationTarget);
-      const matchedRoute = getNextRouteFromPathname(strippedNavigationTarget);
-
-      let newLocation: string;
-      let spanSource: TransactionSource;
-
-      if (matchedRoute) {
-        newLocation = matchedRoute;
-        spanSource = 'route';
-      } else {
-        newLocation = strippedNavigationTarget;
-        spanSource = 'url';
-      }
-
-      startNavigationSpanCallback({
-        name: newLocation,
-        attributes: {
-          from: prevLocationName,
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.pages_router_instrumentation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: spanSource,
-        },
-      });
-
-      prevLocationName = newLocation;
+    startBrowserTracingNavigationSpan(client, {
+      name: newLocation,
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.nextjs.pages_router_instrumentation',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: spanSource,
+      },
     });
-  }
+  });
 }
 
 function getNextRouteFromPathname(pathname: string): string | undefined {
diff --git a/packages/nextjs/src/client/tunnelRoute.ts b/packages/nextjs/src/client/tunnelRoute.ts
index 6ac5fb50a640..3c93b93e41f2 100644
--- a/packages/nextjs/src/client/tunnelRoute.ts
+++ b/packages/nextjs/src/client/tunnelRoute.ts
@@ -1,9 +1,9 @@
 import type { BrowserOptions } from '@sentry/react';
-import { dsnFromString, logger } from '@sentry/utils';
+import { GLOBAL_OBJ, dsnFromString, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../common/debug-build';
 
-const globalWithInjectedValues = global as typeof global & {
+const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   __sentryRewritesTunnelPath__?: string;
 };
 
@@ -17,10 +17,14 @@ export function applyTunnelRouteOption(options: BrowserOptions): void {
     if (!dsnComponents) {
       return;
     }
-    const sentrySaasDsnMatch = dsnComponents.host.match(/^o(\d+)\.ingest\.sentry\.io$/);
+    const sentrySaasDsnMatch = dsnComponents.host.match(/^o(\d+)\.ingest(?:\.([a-z]{2}))?\.sentry\.io$/);
     if (sentrySaasDsnMatch) {
       const orgId = sentrySaasDsnMatch[1];
-      const tunnelPath = `${tunnelRouteOption}?o=${orgId}&p=${dsnComponents.projectId}`;
+      const regionCode = sentrySaasDsnMatch[2];
+      let tunnelPath = `${tunnelRouteOption}?o=${orgId}&p=${dsnComponents.projectId}`;
+      if (regionCode) {
+        tunnelPath += `&r=${regionCode}`;
+      }
       options.tunnel = tunnelPath;
       DEBUG_BUILD && logger.info(`Tunneling events to "${tunnelPath}"`);
     } else {
diff --git a/packages/nextjs/src/common/utils/edgeWrapperUtils.ts b/packages/nextjs/src/common/utils/edgeWrapperUtils.ts
index be0c56236233..5806c2cd0bd8 100644
--- a/packages/nextjs/src/common/utils/edgeWrapperUtils.ts
+++ b/packages/nextjs/src/common/utils/edgeWrapperUtils.ts
@@ -5,6 +5,7 @@ import {
   addTracingExtensions,
   captureException,
   continueTrace,
+  getIsolationScope,
   handleCallbackErrors,
   setHttpStatus,
   startSpan,
@@ -39,6 +40,9 @@ export function withEdgeWrapping<H extends EdgeRouteHandler>(
         baggage,
       },
       () => {
+        getIsolationScope().setSDKProcessingMetadata({
+          request: req instanceof Request ? winterCGRequestToRequestData(req) : undefined,
+        });
         return startSpan(
           {
             name: options.spanDescription,
@@ -47,9 +51,6 @@ export function withEdgeWrapping<H extends EdgeRouteHandler>(
               [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs.withEdgeWrapping',
             },
-            metadata: {
-              request: req instanceof Request ? winterCGRequestToRequestData(req) : undefined,
-            },
           },
           async span => {
             const handlerResult = await handleCallbackErrors(
@@ -67,12 +68,10 @@ export function withEdgeWrapping<H extends EdgeRouteHandler>(
               },
             );
 
-            if (span) {
-              if (handlerResult instanceof Response) {
-                setHttpStatus(span, handlerResult.status);
-              } else {
-                span.setStatus({ code: SPAN_STATUS_OK });
-              }
+            if (handlerResult instanceof Response) {
+              setHttpStatus(span, handlerResult.status);
+            } else {
+              span.setStatus({ code: SPAN_STATUS_OK });
             }
 
             return handlerResult;
diff --git a/packages/nextjs/src/common/utils/responseEnd.ts b/packages/nextjs/src/common/utils/responseEnd.ts
index 501208f81e84..c287933f6c39 100644
--- a/packages/nextjs/src/common/utils/responseEnd.ts
+++ b/packages/nextjs/src/common/utils/responseEnd.ts
@@ -39,11 +39,9 @@ export function autoEndSpanOnResponseEnd(span: Span, res: ServerResponse): void
 }
 
 /** Finish the given response's span and set HTTP status data */
-export function finishSpan(span: Span | undefined, res: ServerResponse): void {
-  if (span) {
-    setHttpStatus(span, res.statusCode);
-    span.end();
-  }
+export function finishSpan(span: Span, res: ServerResponse): void {
+  setHttpStatus(span, res.statusCode);
+  span.end();
 }
 
 /** Flush the event queue to ensure that events get sent to Sentry before the response is finished and the lambda ends */
diff --git a/packages/nextjs/src/common/utils/wrapperUtils.ts b/packages/nextjs/src/common/utils/wrapperUtils.ts
index 5e489fb90c09..84aa0df2a642 100644
--- a/packages/nextjs/src/common/utils/wrapperUtils.ts
+++ b/packages/nextjs/src/common/utils/wrapperUtils.ts
@@ -35,8 +35,8 @@ export function getSpanFromRequest(req: IncomingMessage): Span | undefined {
   return req._sentrySpan;
 }
 
-function setSpanOnRequest(transaction: Span, req: IncomingMessage): void {
-  req._sentrySpan = transaction;
+function setSpanOnRequest(span: Span, req: IncomingMessage): void {
+  req._sentrySpan = span;
 }
 
 /**
@@ -99,25 +99,9 @@ export function withTracedServerSideDataFetcher<F extends (...args: any[]) => Pr
       const baggage = req.headers?.baggage;
 
       return continueTrace({ sentryTrace, baggage }, () => {
-        let requestSpan: Span | undefined = getSpanFromRequest(req);
-        if (!requestSpan) {
-          // TODO(v8): Simplify these checks when startInactiveSpan always returns a span
-          requestSpan = startInactiveSpan({
-            name: options.requestedRouteName,
-            op: 'http.server',
-            attributes: {
-              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs',
-              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-            },
-          });
-          if (requestSpan) {
-            requestSpan.setStatus({ code: SPAN_STATUS_OK });
-            setSpanOnRequest(requestSpan, req);
-            autoEndSpanOnResponseEnd(requestSpan, res);
-          }
-        }
+        const requestSpan = getOrStartRequestSpan(req, res, options.requestedRouteName);
 
-        const withActiveSpanCallback = (): Promise<ReturnType<F>> => {
+        return withActiveSpan(requestSpan, () => {
           return startSpanManual(
             {
               op: 'function.nextjs',
@@ -128,33 +112,49 @@ export function withTracedServerSideDataFetcher<F extends (...args: any[]) => Pr
               },
             },
             async dataFetcherSpan => {
-              dataFetcherSpan?.setStatus({ code: SPAN_STATUS_OK });
+              dataFetcherSpan.setStatus({ code: SPAN_STATUS_OK });
               try {
                 return await origDataFetcher.apply(this, args);
               } catch (e) {
-                dataFetcherSpan?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                dataFetcherSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
                 requestSpan?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
                 throw e;
               } finally {
-                dataFetcherSpan?.end();
+                dataFetcherSpan.end();
                 if (!platformSupportsStreaming()) {
                   await flushQueue();
                 }
               }
             },
           );
-        };
-
-        if (requestSpan) {
-          return withActiveSpan(requestSpan, withActiveSpanCallback);
-        } else {
-          return withActiveSpanCallback();
-        }
+        });
       });
     });
   };
 }
 
+function getOrStartRequestSpan(req: IncomingMessage, res: ServerResponse, name: string): Span {
+  const existingSpan = getSpanFromRequest(req);
+  if (existingSpan) {
+    return existingSpan;
+  }
+
+  const requestSpan = startInactiveSpan({
+    name,
+    op: 'http.server',
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs',
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+    },
+  });
+
+  requestSpan.setStatus({ code: SPAN_STATUS_OK });
+  setSpanOnRequest(requestSpan, req);
+  autoEndSpanOnResponseEnd(requestSpan, res);
+
+  return requestSpan;
+}
+
 /**
  * Call a data fetcher and trace it. Only traces the function if there is an active transaction on the scope.
  *
@@ -182,16 +182,16 @@ export async function callDataFetcherTraced<F extends (...args: any[]) => Promis
       },
     },
     async dataFetcherSpan => {
-      dataFetcherSpan?.setStatus({ code: SPAN_STATUS_OK });
+      dataFetcherSpan.setStatus({ code: SPAN_STATUS_OK });
 
       try {
         return await origFunction(...origFunctionArgs);
       } catch (e) {
-        dataFetcherSpan?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+        dataFetcherSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
         captureException(e, { mechanism: { handled: false } });
         throw e;
       } finally {
-        dataFetcherSpan?.end();
+        dataFetcherSpan.end();
         if (!platformSupportsStreaming()) {
           await flushQueue();
         }
diff --git a/packages/nextjs/src/common/withServerActionInstrumentation.ts b/packages/nextjs/src/common/withServerActionInstrumentation.ts
index 39c26e4dfca6..44d22606b974 100644
--- a/packages/nextjs/src/common/withServerActionInstrumentation.ts
+++ b/packages/nextjs/src/common/withServerActionInstrumentation.ts
@@ -102,11 +102,11 @@ async function withServerActionInstrumentationImplementation<A extends (...args:
               const result = await handleCallbackErrors(callback, error => {
                 if (isNotFoundNavigationError(error)) {
                   // We don't want to report "not-found"s
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
                 } else if (isRedirectNavigationError(error)) {
                   // Don't do anything for redirects
                 } else {
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
                   captureException(error, {
                     mechanism: {
                       handled: false,
diff --git a/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts
index 1c217ac9cbf6..dbbfcfb7911e 100644
--- a/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts
+++ b/packages/nextjs/src/common/wrapApiHandlerWithSentry.ts
@@ -91,18 +91,13 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                   [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
                   [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.nextjs',
                 },
-                metadata: {
-                  request: req,
-                },
               },
               async span => {
                 // eslint-disable-next-line @typescript-eslint/unbound-method
                 res.end = new Proxy(res.end, {
                   apply(target, thisArg, argArray) {
-                    if (span) {
-                      setHttpStatus(span, res.statusCode);
-                      span.end();
-                    }
+                    setHttpStatus(span, res.statusCode);
+                    span.end();
                     if (platformSupportsStreaming() && !wrappingTarget.__sentry_test_doesnt_support_streaming__) {
                       target.apply(thisArg, argArray);
                     } else {
@@ -155,10 +150,8 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                   res.statusCode = 500;
                   res.statusMessage = 'Internal Server Error';
 
-                  if (span) {
-                    setHttpStatus(span, res.statusCode);
-                    span.end();
-                  }
+                  setHttpStatus(span, res.statusCode);
+                  span.end();
 
                   // Make sure we have a chance to finish the transaction and flush events to Sentry before the handler errors
                   // out. (Apps which are deployed on Vercel run their API routes in lambdas, and those lambdas will shut down the
diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
index 0041d84c9838..e78ca34ebcd6 100644
--- a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
+++ b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
@@ -68,7 +68,6 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
           {
             op: 'function.nextjs',
             name: `${componentType}.${generationFunctionIdentifier} (${componentRoute})`,
-            data,
             attributes: {
               [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs',
@@ -80,12 +79,12 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
               err => {
                 if (isNotFoundNavigationError(err)) {
                   // We don't want to report "not-found"s
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
                 } else if (isRedirectNavigationError(err)) {
                   // We don't want to report redirects
-                  span?.setStatus({ code: SPAN_STATUS_OK });
+                  span.setStatus({ code: SPAN_STATUS_OK });
                 } else {
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
                   captureException(err, {
                     mechanism: {
                       handled: false,
@@ -94,7 +93,7 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
                 }
               },
               () => {
-                span?.end();
+                span.end();
               },
             );
           },
diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
index 06a72a61ac18..4740f366940a 100644
--- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
+++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -69,12 +69,12 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
               error => {
                 if (isNotFoundNavigationError(error)) {
                   // We don't want to report "not-found"s
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'not_found' });
                 } else if (isRedirectNavigationError(error)) {
                   // We don't want to report redirects
-                  span?.setStatus({ code: SPAN_STATUS_OK });
+                  span.setStatus({ code: SPAN_STATUS_OK });
                 } else {
-                  span?.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                  span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
                   captureException(error, {
                     mechanism: {
                       handled: false,
@@ -83,7 +83,7 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
                 }
               },
               () => {
-                span?.end();
+                span.end();
 
                 // flushQueue should not throw
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
diff --git a/packages/nextjs/src/config/index.ts b/packages/nextjs/src/config/index.ts
index f537125a75f3..c4032ee44d46 100644
--- a/packages/nextjs/src/config/index.ts
+++ b/packages/nextjs/src/config/index.ts
@@ -1,2 +1 @@
-export type { SentryWebpackPluginOptions } from './types';
 export { withSentryConfig } from './withSentryConfig';
diff --git a/packages/nextjs/src/config/loaders/types.ts b/packages/nextjs/src/config/loaders/types.ts
index 8e03a57ade36..c4facd590844 100644
--- a/packages/nextjs/src/config/loaders/types.ts
+++ b/packages/nextjs/src/config/loaders/types.ts
@@ -1,4 +1,4 @@
-import type webpack from 'webpack';
+import type * as webpack from 'webpack';
 
 export type LoaderThis<Options> = {
   /**
diff --git a/packages/nextjs/src/config/types.ts b/packages/nextjs/src/config/types.ts
index c74990cb6a69..75d4c87ac963 100644
--- a/packages/nextjs/src/config/types.ts
+++ b/packages/nextjs/src/config/types.ts
@@ -1,32 +1,15 @@
 import type { GLOBAL_OBJ } from '@sentry/utils';
-import type { SentryCliPluginOptions } from '@sentry/webpack-plugin';
+import type { SentryWebpackPluginOptions } from '@sentry/webpack-plugin';
 import type { DefinePlugin, WebpackPluginInstance } from 'webpack';
 
-export type SentryWebpackPluginOptions = SentryCliPluginOptions;
-export type SentryWebpackPlugin = WebpackPluginInstance & { options: SentryWebpackPluginOptions };
 // Export this from here because importing something from Webpack (the library) in `webpack.ts` confuses the heck out of
 // madge, which we use for circular dependency checking. We've manually excluded this file from the check (which is
 // safe, since it only includes types), so we can import it here without causing madge to fail. See
 // https://github.com/pahen/madge/issues/306.
 export type { WebpackPluginInstance };
 
-/**
- * Overall Nextjs config
- */
-
-// The first argument to `withSentryConfig` (which is the user's next config) may contain a `sentry` key, which we'll
-// remove once we've captured it, in order to prevent nextjs from throwing warnings. Since it's only in there
-// temporarily, we don't include it in the main `NextConfigObject` or `NextConfigFunction` types.
-export type ExportedNextConfig = NextConfigObjectWithSentry | NextConfigFunctionWithSentry;
-
-export type NextConfigObjectWithSentry = NextConfigObject & {
-  sentry?: UserSentryOptions;
-};
-
-export type NextConfigFunctionWithSentry = (
-  phase: string,
-  defaults: { defaultConfig: NextConfigObject },
-) => NextConfigObjectWithSentry | PromiseLike<NextConfigObjectWithSentry>;
+// The first argument to `withSentryConfig` (which is the user's next config).
+export type ExportedNextConfig = NextConfigObject | NextConfigFunction;
 
 // Vendored from Next.js (this type is not complete - extend if necessary)
 type NextRewrite = {
@@ -62,18 +45,284 @@ export type NextConfigObject = {
   >;
 };
 
-export type UserSentryOptions = {
+export type SentryBuildOptions = {
+  /**
+   * The slug of the Sentry organization associated with the app.
+   *
+   * This value can also be specified via the `SENTRY_ORG` environment variable.
+   */
+  org?: string;
+
+  /**
+   * The slug of the Sentry project associated with the app.
+   *
+   * This value can also be specified via the `SENTRY_PROJECT` environment variable.
+   */
+  project?: string;
+
+  /**
+   * The authentication token to use for all communication with Sentry.
+   * Can be obtained from https://sentry.io/orgredirect/organizations/:orgslug/settings/auth-tokens/.
+   *
+   * This value can also be specified via the `SENTRY_AUTH_TOKEN` environment variable.
+   */
+  authToken?: string;
+
+  /**
+   * The base URL of your Sentry instance. Use this if you are using a self-hosted
+   * or Sentry instance other than sentry.io.
+   *
+   * This value can also be set via the `SENTRY_URL` environment variable.
+   *
+   * Defaults to https://sentry.io/, which is the correct value for SaaS customers.
+   */
+  sentryUrl?: string;
+
+  /**
+   * Headers added to every outgoing network request.
+   */
+  headers?: Record<string, string>;
+
+  /**
+   * If set to true, internal plugin errors and performance data will be sent to Sentry.
+   *
+   * At Sentry we like to use Sentry ourselves to deliver faster and more stable products.
+   * We're very careful of what we're sending. We won't collect anything other than error
+   * and high-level performance data. We will never collect your code or any details of the
+   * projects in which you're using this plugin.
+   *
+   * Defaults to `true`.
+   */
+  telemetry?: boolean;
+
   /**
-   * Override the SDK's default decision about whether or not to enable to the Sentry webpack plugin for server files.
-   * Note that `false` forces the plugin to be enabled, even in situations where it's not recommended.
+   * Suppresses all Sentry SDK build logs.
+   *
+   * Defaults to `false`.
    */
-  disableServerWebpackPlugin?: boolean;
+  // TODO: Actually implement this for the non-plugin code.
+  silent?: boolean;
 
   /**
-   * Override the SDK's default decision about whether or not to enable to the Sentry webpack plugin for client files.
-   * Note that `false` forces the plugin to be enabled, even in situations where it's not recommended.
+   * Prints additional debug information about the SDK and uploading source maps when building the application.
+   *
+   * Defaults to `false`.
    */
-  disableClientWebpackPlugin?: boolean;
+  // TODO: Actually implement this for the non-plugin code.
+  debug?: boolean;
+
+  /**
+   * Options for source maps uploading.
+   */
+  sourcemaps?: {
+    /**
+     * Disable any functionality related to source maps upload.
+     */
+    disable?: boolean;
+
+    /**
+     * A glob or an array of globs that specifies the build artifacts that should be uploaded to Sentry.
+     *
+     * If this option is not specified, the plugin will try to upload all JavaScript files and source map files that are created during build.
+     *
+     * The globbing patterns follow the implementation of the `glob` package. (https://www.npmjs.com/package/glob)
+     *
+     * Use the `debug` option to print information about which files end up being uploaded.
+     */
+    assets?: string | string[];
+
+    /**
+     * A glob or an array of globs that specifies which build artifacts should not be uploaded to Sentry.
+     *
+     * Default: `[]`
+     *
+     * The globbing patterns follow the implementation of the `glob` package. (https://www.npmjs.com/package/glob)
+     *
+     * Use the `debug` option to print information about which files end up being uploaded.
+     */
+    ignore?: string | string[];
+
+    /**
+     * Toggle whether generated source maps within your Next.js build folder should be automatically deleted after being uploaded to Sentry.
+     *
+     * Defaults to `false`.
+     */
+    // TODO: Add this option
+    // deleteSourcemapsAfterUpload?: boolean;
+  };
+
+  /**
+   * Options related to managing the Sentry releases for a build.
+   *
+   * More info: https://docs.sentry.io/product/releases/
+   */
+  release?: {
+    /**
+     * Unique identifier for the release you want to create.
+     *
+     * This value can also be specified via the `SENTRY_RELEASE` environment variable.
+     *
+     * Defaults to automatically detecting a value for your environment.
+     * This includes values for Cordova, Heroku, AWS CodeBuild, CircleCI, Xcode, and Gradle, and otherwise uses the git `HEAD`'s commit SHA.
+     * (the latter requires access to git CLI and for the root directory to be a valid repository)
+     *
+     * If you didn't provide a value and the plugin can't automatically detect one, no release will be created.
+     */
+    name?: string;
+
+    /**
+     * Whether the plugin should create a release on Sentry during the build.
+     * Note that a release may still appear in Sentry even if this is value is `false` because any Sentry event that has a release value attached will automatically create a release.
+     * (for example via the `inject` option)
+     *
+     * Defaults to `true`.
+     */
+    create?: boolean;
+
+    /**
+     * Whether the Sentry release should be automatically finalized (meaning an end timestamp is added) after the build ends.
+     *
+     * Defaults to `true`.
+     */
+    finalize?: boolean;
+
+    /**
+     * Unique identifier for the distribution, used to further segment your release.
+     * Usually your build number.
+     */
+    dist?: string;
+
+    /**
+     * Version control system remote name.
+     *
+     * This value can also be specified via the `SENTRY_VSC_REMOTE` environment variable.
+     *
+     * Defaults to 'origin'.
+     */
+    vcsRemote?: string;
+
+    /**
+     * Associates the release with its commits in Sentry.
+     */
+    setCommits?: (
+      | {
+          /**
+           * Automatically sets `commit` and `previousCommit`. Sets `commit` to `HEAD`
+           * and `previousCommit` as described in the option's documentation.
+           *
+           * If you set this to `true`, manually specified `commit` and `previousCommit`
+           * options will be overridden. It is best to not specify them at all if you
+           * set this option to `true`.
+           */
+          auto: true;
+
+          repo?: undefined;
+          commit?: undefined;
+        }
+      | {
+          auto?: false | undefined;
+
+          /**
+           * The full repo name as defined in Sentry.
+           *
+           * Required if the `auto` option is not set to `true`.
+           */
+          repo: string;
+
+          /**
+           * The current (last) commit in the release.
+           *
+           * Required if the `auto` option is not set to `true`.
+           */
+          commit: string;
+        }
+    ) & {
+      /**
+       * The commit before the beginning of this release (in other words,
+       * the last commit of the previous release).
+       *
+       * Defaults to the last commit of the previous release in Sentry.
+       *
+       * If there was no previous release, the last 10 commits will be used.
+       */
+      previousCommit?: string;
+
+      /**
+       * If the flag is to `true` and the previous release commit was not found
+       * in the repository, the plugin creates a release with the default commits
+       * count instead of failing the command.
+       *
+       * Defaults to `false`.
+       */
+      ignoreMissing?: boolean;
+
+      /**
+       * If this flag is set, the setCommits step will not fail and just exit
+       * silently if no new commits for a given release have been found.
+       *
+       * Defaults to `false`.
+       */
+      ignoreEmpty?: boolean;
+    };
+
+    /**
+     * Adds deployment information to the release in Sentry.
+     */
+    deploy?: {
+      /**
+       * Environment for this release. Values that make sense here would
+       * be `production` or `staging`.
+       */
+      env: string;
+
+      /**
+       * Deployment start time in Unix timestamp (in seconds) or ISO 8601 format.
+       */
+      started?: number | string;
+
+      /**
+       * Deployment finish time in Unix timestamp (in seconds) or ISO 8601 format.
+       */
+      finished?: number | string;
+
+      /**
+       * Deployment duration (in seconds). Can be used instead of started and finished.
+       */
+      time?: number;
+
+      /**
+       * Human readable name for the deployment.
+       */
+      name?: string;
+
+      /**
+       * URL that points to the deployment.
+       */
+      url?: string;
+    };
+  };
+
+  /**
+   * Options related to react component name annotations.
+   * Disabled by default, unless a value is set for this option.
+   * When enabled, your app's DOM will automatically be annotated during build-time with their respective component names.
+   * This will unlock the capability to search for Replays in Sentry by component name, as well as see component names in breadcrumbs and performance monitoring.
+   * Please note that this feature is not currently supported by the esbuild bundler plugins, and will only annotate React components
+   */
+  reactComponentAnnotation?: {
+    /**
+     * Whether the component name annotate plugin should be enabled or not.
+     */
+    enabled?: boolean;
+  };
+
+  /**
+   * Options to be passed directly to the Sentry Webpack Plugin (`@sentry/webpack-plugin`) that ships with the Sentry Next.js SDK.
+   * You can use this option to override any options the SDK passes to the webpack plugin.
+   *
+   * Please note that this option is unstable and may change in a breaking way in any release.
+   */
+  unstable_sentryWebpackPluginOptions?: SentryWebpackPluginOptions;
 
   /**
    * Use `hidden-source-map` for webpack `devtool` option, which strips the `sourceMappingURL` from the bottom of built
@@ -88,13 +337,16 @@ export type UserSentryOptions = {
   transpileClientSDK?: boolean;
 
   /**
-   * Instructs the Sentry webpack plugin to upload source files from `<distDir>/static/chunks` rather than
-   * `<distDir>/static/chunks/pages`. Usually files outside of `pages/` only contain third-party code, but in cases
-   * where they contain user code, restricting the webpack plugin's upload breaks sourcemaps for those
-   * user-code-containing files, because it keeps them from being uploaded. Defaults to `false`.
+   * Include Next.js-internal code and code from dependencies when uploading source maps.
+   *
+   * Note: Enabling this option can lead to longer build times.
+   * Disabling this option will leave you without readable stacktraces for dependencies and Next.js-internal code.
+   *
+   * Defaults to `false`.
    */
-  // We don't want to widen the scope if we don't have to, because we're guaranteed to end up uploading too many files,
-  // which is why this defaults to`false`.
+  // Enabling this option may upload a lot of source maps and since the sourcemap upload endpoint in Sentry is super
+  // slow we don't enable it by default so that we don't opaquely increase build times for users.
+  // TODO: Add an alias to this function called "uploadSourceMapsForDependencies"
   widenClientFileUpload?: boolean;
 
   /**
@@ -157,7 +409,7 @@ export type NextConfigFunction = (
 export type WebpackConfigFunction = (config: WebpackConfigObject, options: BuildContext) => WebpackConfigObject;
 export type WebpackConfigObject = {
   devtool?: string;
-  plugins?: Array<WebpackPluginInstance | SentryWebpackPlugin>;
+  plugins?: Array<WebpackPluginInstance>;
   entry: WebpackEntryProperty;
   output: { filename: string; path: string };
   target: string;
@@ -190,8 +442,8 @@ export type BuildContext = {
     DefinePlugin: typeof DefinePlugin;
   };
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  defaultLoaders: any;
-  totalPages: number;
+  defaultLoaders: any; // needed for type tests (test:types)
+  totalPages: number; // needed for type tests (test:types)
   nextRuntime?: 'nodejs' | 'edge'; // Added in Next.js 12+
 };
 
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index a6555c3b3343..0a8484c9afc8 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -1,13 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
 /* eslint-disable complexity */
 /* eslint-disable max-lines */
+
+import * as fs from 'fs';
+import * as path from 'path';
 import { getSentryRelease } from '@sentry/node-experimental';
-import { arrayify, dropUndefinedKeys, escapeStringForRegex, loadModule, logger } from '@sentry/utils';
-import type SentryCliPlugin from '@sentry/webpack-plugin';
+import { arrayify, escapeStringForRegex, loadModule, logger } from '@sentry/utils';
 import * as chalk from 'chalk';
 import { sync as resolveSync } from 'resolve';
-import type { Compiler } from 'webpack';
 
 import { DEBUG_BUILD } from '../common/debug-build';
 import type { VercelCronsConfig } from '../common/types';
@@ -17,15 +16,14 @@ import type {
   BuildContext,
   EntryPropertyObject,
   NextConfigObject,
-  SentryWebpackPluginOptions,
-  UserSentryOptions,
+  SentryBuildOptions,
   WebpackConfigFunction,
   WebpackConfigObject,
   WebpackConfigObjectWithModuleRules,
   WebpackEntryProperty,
   WebpackModuleRule,
-  WebpackPluginInstance,
 } from './types';
+import { getWebpackPluginOptions } from './webpackPluginOptions';
 
 const RUNTIME_TO_SDK_ENTRYPOINT_MAP = {
   client: './client',
@@ -35,17 +33,8 @@ const RUNTIME_TO_SDK_ENTRYPOINT_MAP = {
 
 // 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;
-let showedMissingCliBinaryWarningMsg = false;
 let showedMissingGlobalErrorWarningMsg = 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?
-
 /**
  * Construct the function which will be used as the nextjs config's `webpack` value.
  *
@@ -60,8 +49,7 @@ let showedMissingGlobalErrorWarningMsg = false;
  */
 export function constructWebpackConfigFunction(
   userNextConfig: NextConfigObject = {},
-  userSentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions> = {},
-  userSentryOptions: UserSentryOptions = {},
+  userSentryOptions: SentryBuildOptions = {},
 ): WebpackConfigFunction {
   // Will be called by nextjs and passed its default webpack configuration and context data about the build (whether
   // we're building server or client, whether we're in dev, what version of webpack we're using, etc). Note that
@@ -86,7 +74,7 @@ export function constructWebpackConfigFunction(
     const newConfig = setUpModuleRules(rawNewConfig);
 
     // Add a loader which will inject code that sets global values
-    addValueInjectionLoader(newConfig, userNextConfig, userSentryOptions, buildContext, userSentryWebpackPluginOptions);
+    addValueInjectionLoader(newConfig, userNextConfig, userSentryOptions, buildContext);
 
     newConfig.module.rules.push({
       test: /node_modules[/\\]@sentry[/\\]nextjs/,
@@ -347,6 +335,7 @@ export function constructWebpackConfigFunction(
       }
     }
 
+    // TODO(v8): Remove this logic since we are deprecating es5.
     // The SDK uses syntax (ES6 and ES6+ features like object spread) which isn't supported by older browsers. For users
     // who want to support such browsers, `transpileClientSDK` allows them to force the SDK code to go through the same
     // transpilation that their code goes through. We don't turn this on by default because it increases bundle size
@@ -386,37 +375,28 @@ export function constructWebpackConfigFunction(
     const origEntryProperty = newConfig.entry;
     newConfig.entry = async () => addSentryToEntryProperty(origEntryProperty, buildContext, userSentryOptions);
 
-    // Enable the Sentry plugin (which uploads source maps to Sentry when not in dev) by default
-    if (shouldEnableWebpackPlugin(buildContext, userSentryOptions)) {
-      // TODO Handle possibility that user is using `SourceMapDevToolPlugin` (see
-      // https://webpack.js.org/plugins/source-map-dev-tool-plugin/)
-
-      // TODO (v9 or v10, maybe): Remove this
-      handleSourcemapHidingOptionWarning(userSentryOptions, isServer);
-
-      // Next doesn't let you change `devtool` in dev even if you want to, so don't bother trying - see
-      // https://github.com/vercel/next.js/blob/master/errors/improper-devtool.md
-      if (!isDev) {
-        // TODO (v8): Default `hideSourceMaps` to `true`
-
-        // `hidden-source-map` produces the same sourcemaps as `source-map`, but doesn't include the `sourceMappingURL`
-        // comment at the bottom. For folks who aren't publicly hosting their sourcemaps, this is helpful because then
-        // the browser won't look for them and throw errors into the console when it can't find them. Because this is a
-        // front-end-only problem, and because `sentry-cli` handles sourcemaps more reliably with the comment than
-        // without, the option to use `hidden-source-map` only applies to the client-side build.
-        newConfig.devtool = userSentryOptions.hideSourceMaps && !isServer ? 'hidden-source-map' : 'source-map';
-
-        const SentryWebpackPlugin = loadModule<SentryCliPlugin>('@sentry/webpack-plugin');
-        if (SentryWebpackPlugin) {
-          newConfig.plugins = newConfig.plugins || [];
-          newConfig.plugins.push(new SentryCliDownloadPlugin());
-          newConfig.plugins.push(
-            // @ts-expect-error - this exists, the dynamic import just doesn't know about it
-            new SentryWebpackPlugin(
-              getWebpackPluginOptions(buildContext, userSentryWebpackPluginOptions, userSentryOptions),
-            ),
-          );
+    // Next doesn't let you change `devtool` in dev even if you want to, so don't bother trying - see
+    // https://github.com/vercel/next.js/blob/master/errors/improper-devtool.md
+    if (!isDev) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const { sentryWebpackPlugin } = loadModule('@sentry/webpack-plugin') as any;
+      if (sentryWebpackPlugin) {
+        if (!userSentryOptions.sourcemaps?.disable) {
+          // `hidden-source-map` produces the same sourcemaps as `source-map`, but doesn't include the `sourceMappingURL`
+          // comment at the bottom. For folks who aren't publicly hosting their sourcemaps, this is helpful because then
+          // the browser won't look for them and throw errors into the console when it can't find them. Because this is a
+          // front-end-only problem, and because `sentry-cli` handles sourcemaps more reliably with the comment than
+          // without, the option to use `hidden-source-map` only applies to the client-side build.
+          newConfig.devtool = !isServer ? 'hidden-source-map' : 'source-map';
         }
+
+        newConfig.plugins = newConfig.plugins || [];
+        const sentryWebpackPluginInstance = sentryWebpackPlugin(
+          getWebpackPluginOptions(buildContext, userSentryOptions),
+        );
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        sentryWebpackPluginInstance._name = 'sentry-webpack-plugin'; // For tests and debugging. Serves no other purpose.
+        newConfig.plugins.push(sentryWebpackPluginInstance);
       }
     }
 
@@ -511,7 +491,7 @@ function findTranspilationRules(rules: WebpackModuleRule[] | undefined, projectD
 async function addSentryToEntryProperty(
   currentEntryProperty: WebpackEntryProperty,
   buildContext: BuildContext,
-  userSentryOptions: UserSentryOptions,
+  userSentryOptions: SentryBuildOptions,
 ): Promise<EntryPropertyObject> {
   // The `entry` entry in a webpack config can be a string, array of strings, object, or function. By default, nextjs
   // sets it to an async function which returns the promise of an object of string arrays. Because we don't know whether
@@ -673,30 +653,6 @@ function addFilesToExistingEntryPoint(
   entryProperty[entryPointName] = newEntryPoint;
 }
 
-/**
- * Check the SentryWebpackPlugin options provided by the user against the options we set by default, and warn if any of
- * our default options are getting overridden. (Note: If any of our default values is undefined, it won't be included in
- * the warning.)
- *
- * @param defaultOptions Default SentryWebpackPlugin options
- * @param userOptions The user's SentryWebpackPlugin options
- */
-function checkWebpackPluginOverrides(
-  defaultOptions: SentryWebpackPluginOptions,
-  userOptions: Partial<SentryWebpackPluginOptions>,
-): void {
-  // warn if any of the default options for the webpack plugin are getting overridden
-  const sentryWebpackPluginOptionOverrides = Object.keys(defaultOptions).filter(key => key in userOptions);
-  if (sentryWebpackPluginOptionOverrides.length > 0) {
-    DEBUG_BUILD &&
-      logger.warn(
-        '[Sentry] You are overriding the following automatically-set SentryWebpackPlugin config options:\n' +
-          `\t${sentryWebpackPluginOptionOverrides.toString()},\n` +
-          "which has the possibility of breaking source map upload and application. This is only a good idea if you know what you're doing.",
-      );
-  }
-}
-
 /**
  * Determine if this is an entry point into which both `Sentry.init()` code and the release value should be injected
  *
@@ -714,238 +670,6 @@ function shouldAddSentryToEntryPoint(entryPointName: string, runtime: 'node' | '
   );
 }
 
-/**
- * Combine default and user-provided SentryWebpackPlugin options, accounting for whether we're building server files or
- * client files.
- *
- * @param buildContext Nexjs-provided data about the current build
- * @param userPluginOptions User-provided SentryWebpackPlugin options
- * @returns Final set of combined options
- */
-export function getWebpackPluginOptions(
-  buildContext: BuildContext,
-  userPluginOptions: Partial<SentryWebpackPluginOptions>,
-  userSentryOptions: UserSentryOptions,
-): SentryWebpackPluginOptions {
-  const { buildId, isServer, config, dir: projectDir } = buildContext;
-  const userNextConfig = config as NextConfigObject;
-
-  const distDirAbsPath = path.resolve(projectDir, userNextConfig.distDir || '.next'); // `.next` is the default directory
-
-  const isServerless = userNextConfig.target === 'experimental-serverless-trace';
-  const hasSentryProperties = fs.existsSync(path.resolve(projectDir, 'sentry.properties'));
-  const urlPrefix = '~/_next';
-
-  const serverInclude = isServerless
-    ? [{ paths: [`${distDirAbsPath}/serverless/`], urlPrefix: `${urlPrefix}/serverless` }]
-    : [{ paths: [`${distDirAbsPath}/server/`], urlPrefix: `${urlPrefix}/server` }];
-
-  const serverIgnore: string[] = [];
-
-  const clientInclude = userSentryOptions.widenClientFileUpload
-    ? [{ paths: [`${distDirAbsPath}/static/chunks`], urlPrefix: `${urlPrefix}/static/chunks` }]
-    : [
-        { paths: [`${distDirAbsPath}/static/chunks/pages`], urlPrefix: `${urlPrefix}/static/chunks/pages` },
-        { paths: [`${distDirAbsPath}/static/chunks/app`], urlPrefix: `${urlPrefix}/static/chunks/app` },
-      ];
-
-  // Widening the upload scope is necessarily going to lead to us uploading files we don't need to (ones which
-  // don't include any user code). In order to lessen that where we can, exclude the internal nextjs files we know
-  // will be there.
-  const clientIgnore = userSentryOptions.widenClientFileUpload
-    ? ['framework-*', 'framework.*', 'main-*', 'polyfills-*', 'webpack-*']
-    : [];
-
-  const defaultPluginOptions = dropUndefinedKeys({
-    include: isServer ? serverInclude : clientInclude,
-    ignore: isServer ? serverIgnore : clientIgnore,
-    url: process.env.SENTRY_URL,
-    org: process.env.SENTRY_ORG,
-    project: process.env.SENTRY_PROJECT,
-    authToken: process.env.SENTRY_AUTH_TOKEN,
-    configFile: hasSentryProperties ? 'sentry.properties' : undefined,
-    stripPrefix: ['webpack://_N_E/', 'webpack://'],
-    urlPrefix,
-    entries: [], // The webpack plugin's release injection breaks the `app` directory - we inject the release manually with the value injection loader instead.
-    release: getSentryRelease(buildId),
-  });
-
-  checkWebpackPluginOverrides(defaultPluginOptions, userPluginOptions);
-
-  return {
-    ...defaultPluginOptions,
-    ...userPluginOptions,
-    errorHandler(err, invokeErr, compilation) {
-      if (err) {
-        const errorMessagePrefix = `${chalk.red('error')} -`;
-
-        if (err.message.includes('ENOENT')) {
-          if (!showedMissingCliBinaryWarningMsg) {
-            // eslint-disable-next-line no-console
-            console.error(
-              `\n${errorMessagePrefix} ${chalk.bold(
-                'The Sentry binary to upload sourcemaps could not be found.',
-              )} Source maps will not be uploaded. Please check that post-install scripts are enabled in your package manager when installing your dependencies and please run your build once without any caching to avoid caching issues of dependencies.\n`,
-            );
-            showedMissingCliBinaryWarningMsg = true;
-          }
-          return;
-        }
-
-        // Hardcoded way to check for missing auth token until we have a better way of doing this.
-        if (err.message.includes('Authentication credentials were not provided.')) {
-          let msg;
-
-          if (process.env.VERCEL) {
-            msg = `To fix this, use Sentry's Vercel integration to automatically set the ${chalk.bold.cyan(
-              'SENTRY_AUTH_TOKEN',
-            )} environment variable: https://vercel.com/integrations/sentry`;
-          } else {
-            msg =
-              'You can find information on how to generate a Sentry auth token here: https://docs.sentry.io/api/auth/\n' +
-              `After generating a Sentry auth token, set it via the ${chalk.bold.cyan(
-                'SENTRY_AUTH_TOKEN',
-              )} environment variable during the build.`;
-          }
-
-          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;
-        }
-
-        // Hardcoded way to check for missing org slug until we have a better way of doing this.
-        if (err.message.includes('An organization slug is required')) {
-          let msg;
-          if (process.env.VERCEL) {
-            msg = `To fix this, use Sentry's Vercel integration to automatically set the ${chalk.bold.cyan(
-              'SENTRY_ORG',
-            )} environment variable: https://vercel.com/integrations/sentry`;
-          } else {
-            msg = `To fix this, set the ${chalk.bold.cyan(
-              'SENTRY_ORG',
-            )} environment variable to the to your organization slug during the build.`;
-          }
-
-          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;
-        }
-
-        // Hardcoded way to check for missing project slug until we have a better way of doing this.
-        if (err.message.includes('A project slug is required')) {
-          let msg;
-          if (process.env.VERCEL) {
-            msg = `To fix this, use Sentry's Vercel integration to automatically set the ${chalk.bold.cyan(
-              'SENTRY_PROJECT',
-            )} environment variable: https://vercel.com/integrations/sentry`;
-          } else {
-            msg = `To fix this, set the ${chalk.bold.cyan(
-              'SENTRY_PROJECT',
-            )} environment variable to the name of your Sentry project during the build.`;
-          }
-
-          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;
-        }
-      }
-
-      if (userPluginOptions.errorHandler) {
-        return userPluginOptions.errorHandler(err, invokeErr, compilation);
-      }
-
-      return invokeErr();
-    },
-  };
-}
-
-/** Check various conditions to decide if we should run the plugin */
-function shouldEnableWebpackPlugin(buildContext: BuildContext, userSentryOptions: UserSentryOptions): boolean {
-  const { isServer } = buildContext;
-  const { disableServerWebpackPlugin, disableClientWebpackPlugin } = userSentryOptions;
-
-  if (isServer && disableServerWebpackPlugin !== undefined) {
-    return !disableServerWebpackPlugin;
-  } else if (!isServer && disableClientWebpackPlugin !== undefined) {
-    return !disableClientWebpackPlugin;
-  }
-
-  return true;
-}
-
-/** Handle warning messages about `hideSourceMaps` option. Can be removed in v9 or v10 (or whenever we consider that
- * enough people will have upgraded the SDK that the warning about the default in v8 - currently commented out - is
- * overkill). */
-function handleSourcemapHidingOptionWarning(userSentryOptions: UserSentryOptions, isServer: boolean): void {
-  // This is nextjs's own logging formatting, vendored since it's not exported. See
-  // https://github.com/vercel/next.js/blob/c3ceeb03abb1b262032bd96457e224497d3bbcef/packages/next/build/output/log.ts#L3-L11
-  // and
-  // https://github.com/vercel/next.js/blob/de7aa2d6e486c40b8be95a1327639cbed75a8782/packages/next/lib/eslint/runLintCheck.ts#L321-L323.
-  const codeFormat = (str: string): string => chalk.bold.cyan(str);
-
-  const _warningPrefix_ = `${chalk.yellow('warn')}  -`;
-  const _sentryNextjs_ = codeFormat('@sentry/nextjs');
-  const _hideSourceMaps_ = codeFormat('hideSourceMaps');
-  const _true_ = codeFormat('true');
-  const _false_ = codeFormat('false');
-  const _sentry_ = codeFormat('sentry');
-  const _nextConfigJS_ = codeFormat('next.config.js');
-
-  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 ` +
-        'them to the Sentry server. Depending on your deployment setup, this means your original code may be visible ' +
-        `in browser devtools in production. To prevent this, set ${_hideSourceMaps_} to ${_true_} in the ${_sentry_} ` +
-        `options in your ${_nextConfigJS_}. To disable this warning without changing sourcemap behavior, set ` +
-        `${_hideSourceMaps_} to ${_false_}. (In ${_sentryNextjs_} version 8.0.0 and beyond, this option will default ` +
-        `to ${_true_}.) See https://webpack.js.org/configuration/devtool/ and ` +
-        '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
-
-  //   const infoPrefix = `${chalk.cyan('info')}  -`;
-  //
-  //   if (isServer && userSentryOptions.hideSourceMaps === true) {
-  //     // eslint-disable-next-line no-console
-  //     console.log(
-  //       `\n${infoPrefix} Starting in ${_sentryNextjs_} version 8.0.0, ${_hideSourceMaps_} defaults to ${_true_}, and ` +
-  //         `thus can be removed from the ${_sentry_} options in ${_nextConfigJS_}. See ` +
-  //         'https://webpack.js.org/configuration/devtool/ and ' +
-  //         'https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/#use-hidden-source-map for more ' +
-  //         'information.\n',
-  //     );
-  //   }
-}
-
 /**
  * Ensure that `newConfig.module.rules` exists. Modifies the given config in place but also returns it in order to
  * change its type.
@@ -969,9 +693,8 @@ function setUpModuleRules(newConfig: WebpackConfigObject): WebpackConfigObjectWi
 function addValueInjectionLoader(
   newConfig: WebpackConfigObjectWithModuleRules,
   userNextConfig: NextConfigObject,
-  userSentryOptions: UserSentryOptions,
+  userSentryOptions: SentryBuildOptions,
   buildContext: BuildContext,
-  sentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions>,
 ): void {
   const assetPrefix = userNextConfig.assetPrefix || userNextConfig.basePath || '';
 
@@ -986,7 +709,7 @@ function addValueInjectionLoader(
     // Having a release defined in dev-mode spams releases in Sentry so we only set one in non-dev mode
     SENTRY_RELEASE: buildContext.dev
       ? undefined
-      : { id: sentryWebpackPluginOptions.release ?? getSentryRelease(buildContext.buildId) },
+      : { id: userSentryOptions.release?.name ?? getSentryRelease(buildContext.buildId) },
     __sentryBasePath: buildContext.dev ? userNextConfig.basePath : undefined,
   };
 
@@ -1076,54 +799,3 @@ function getRequestAsyncStorageModuleLocation(
 
   return undefined;
 }
-
-let downloadingCliAttempted = false;
-
-class SentryCliDownloadPlugin implements WebpackPluginInstance {
-  public apply(compiler: Compiler): void {
-    compiler.hooks.beforeRun.tapAsync('SentryCliDownloadPlugin', (compiler, callback) => {
-      const SentryWebpackPlugin = loadModule<SentryCliPlugin>('@sentry/webpack-plugin');
-      if (!SentryWebpackPlugin) {
-        // Pretty much an invariant.
-        return callback();
-      }
-
-      // @ts-expect-error - this exists, the dynamic import just doesn't know it
-      if (SentryWebpackPlugin.cliBinaryExists()) {
-        return callback();
-      }
-
-      if (!downloadingCliAttempted) {
-        downloadingCliAttempted = true;
-        // eslint-disable-next-line no-console
-        logger.info(
-          `\n${chalk.cyan('info')}  - ${chalk.bold(
-            'Sentry binary to upload source maps not found.',
-          )} Package manager post-install scripts are likely disabled or there is a caching issue. Manually downloading instead...`,
-        );
-
-        // @ts-expect-error - this exists, the dynamic import just doesn't know it
-        const cliDownloadPromise: Promise<void> = SentryWebpackPlugin.downloadCliBinary({
-          log: () => {
-            // No logs from directly from CLI
-          },
-        });
-
-        cliDownloadPromise.then(
-          () => {
-            // eslint-disable-next-line no-console
-            logger.info(`${chalk.cyan('info')}  - Sentry binary was successfully downloaded.\n`);
-            return callback();
-          },
-          e => {
-            // eslint-disable-next-line no-console
-            logger.error(`${chalk.red('error')} - Sentry binary download failed:`, e);
-            return callback();
-          },
-        );
-      } else {
-        return callback();
-      }
-    });
-  }
-}
diff --git a/packages/nextjs/src/config/webpackPluginOptions.ts b/packages/nextjs/src/config/webpackPluginOptions.ts
new file mode 100644
index 000000000000..8f3c7aab28de
--- /dev/null
+++ b/packages/nextjs/src/config/webpackPluginOptions.ts
@@ -0,0 +1,94 @@
+import * as path from 'path';
+import { getSentryRelease } from '@sentry/node-experimental';
+import type { SentryWebpackPluginOptions } from '@sentry/webpack-plugin';
+import type { BuildContext, NextConfigObject, SentryBuildOptions } from './types';
+
+/**
+ * Combine default and user-provided SentryWebpackPlugin options, accounting for whether we're building server files or
+ * client files.
+ */
+export function getWebpackPluginOptions(
+  buildContext: BuildContext,
+  sentryBuildOptions: SentryBuildOptions,
+): SentryWebpackPluginOptions {
+  const { buildId, isServer, config: userNextConfig, dir: projectDir } = buildContext;
+
+  const distDirAbsPath = path.join(projectDir, (userNextConfig as NextConfigObject).distDir || '.next'); // `.next` is the default directory
+
+  let sourcemapUploadAssets: string[] = [];
+  const sourcemapUploadIgnore: string[] = [];
+
+  if (isServer) {
+    sourcemapUploadAssets.push(
+      path.join(distDirAbsPath, 'server', '**'), // This is normally where Next.js outputs things
+      path.join(distDirAbsPath, 'serverless', '**'), // This was the output location for serverless Next.js
+    );
+  } else {
+    if (sentryBuildOptions.widenClientFileUpload) {
+      sourcemapUploadAssets.push(path.join(distDirAbsPath, 'static', 'chunks', '**'));
+    } else {
+      sourcemapUploadAssets.push(
+        path.join(distDirAbsPath, 'static', 'chunks', 'pages', '**'),
+        path.join(distDirAbsPath, 'static', 'chunks', 'app', '**'),
+      );
+    }
+
+    // TODO: We should think about uploading these when `widenClientFileUpload` is `true`. They may be useful in some situations.
+    sourcemapUploadIgnore.push(
+      path.join(distDirAbsPath, 'static', 'chunks', 'framework-*'),
+      path.join(distDirAbsPath, 'static', 'chunks', 'framework.*'),
+      path.join(distDirAbsPath, 'static', 'chunks', 'main-*'),
+      path.join(distDirAbsPath, 'static', 'chunks', 'polyfills-*'),
+      path.join(distDirAbsPath, 'static', 'chunks', 'webpack-*'),
+    );
+  }
+
+  if (sentryBuildOptions.sourcemaps?.disable) {
+    sourcemapUploadAssets = [];
+  }
+
+  return {
+    authToken: sentryBuildOptions.authToken,
+    headers: sentryBuildOptions.headers,
+    org: sentryBuildOptions.org,
+    project: sentryBuildOptions.project,
+    telemetry: sentryBuildOptions.telemetry,
+    debug: sentryBuildOptions.debug,
+    reactComponentAnnotation: {
+      ...sentryBuildOptions.reactComponentAnnotation,
+      ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.reactComponentAnnotation,
+    },
+    silent: sentryBuildOptions.silent,
+    url: sentryBuildOptions.sentryUrl,
+    sourcemaps: {
+      rewriteSources(source) {
+        if (source.startsWith('webpack://_N_E/')) {
+          return source.replace('webpack://_N_E/', '');
+        } else if (source.startsWith('webpack://')) {
+          return source.replace('webpack://', '');
+        } else {
+          return source;
+        }
+      },
+      assets: sentryBuildOptions.sourcemaps?.assets ?? sourcemapUploadAssets,
+      ignore: sentryBuildOptions.sourcemaps?.ignore ?? sourcemapUploadIgnore,
+      // TODO: Add this functionality
+      // filesToDeleteAfterUpload: sentryBuildOptions.sourcemaps?.deleteSourcemapsAfterUpload
+      //   ? path.join(distDirAbsPath, '**', '*.js.map')
+      //   : undefined,
+      ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.sourcemaps,
+    },
+    release: {
+      inject: false, // The webpack plugin's release injection breaks the `app` directory - we inject the release manually with the value injection loader instead.
+      name: sentryBuildOptions.release?.name ?? getSentryRelease(buildId),
+      create: sentryBuildOptions.release?.create,
+      finalize: sentryBuildOptions.release?.finalize,
+      dist: sentryBuildOptions.release?.dist,
+      vcsRemote: sentryBuildOptions.release?.vcsRemote,
+      setCommits: sentryBuildOptions.release?.setCommits,
+      deploy: sentryBuildOptions.release?.deploy,
+      ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.release,
+    },
+    ...sentryBuildOptions.unstable_sentryWebpackPluginOptions,
+  };
+}
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
index a665aa892c8c..f9f03b0af2fd 100644
--- a/packages/nextjs/src/config/withSentryConfig.ts
+++ b/packages/nextjs/src/config/withSentryConfig.ts
@@ -1,64 +1,59 @@
 import { isThenable } from '@sentry/utils';
 
 import type {
-  ExportedNextConfig,
+  ExportedNextConfig as NextConfig,
   NextConfigFunction,
   NextConfigObject,
-  NextConfigObjectWithSentry,
-  SentryWebpackPluginOptions,
-  UserSentryOptions,
+  SentryBuildOptions,
 } from './types';
 import { constructWebpackConfigFunction } from './webpack';
 
 let showedExportModeTunnelWarning = false;
 
 /**
- * Add Sentry options to the config to be exported from the user's `next.config.js` file.
+ * Modifies the passed in Next.js configuration with automatic build-time instrumentation and source map upload.
  *
- * @param exportedUserNextConfig The existing config to be exported prior to adding Sentry
- * @param userSentryWebpackPluginOptions Configuration for SentryWebpackPlugin
- * @param sentryOptions Optional additional options to add as alternative to `sentry` property of config
+ * @param nextConfig A Next.js configuration object, as usually exported in `next.config.js` or `next.config.mjs`.
+ * @param sentryWebpackPluginOptions Options to configure the automatically included Sentry Webpack Plugin for source maps and release management in Sentry.
+ * @param sentryBuildOptions Additional options to configure instrumentation and
  * @returns The modified config to be exported
  */
 export function withSentryConfig(
-  exportedUserNextConfig: ExportedNextConfig = {},
-  userSentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions> = {},
-  sentryOptions?: UserSentryOptions,
+  nextConfig: NextConfig = {},
+  sentryBuildOptions: SentryBuildOptions = {},
 ): NextConfigFunction | NextConfigObject {
-  if (typeof exportedUserNextConfig === 'function') {
+  if (typeof nextConfig === 'function') {
     return function (this: unknown, ...webpackConfigFunctionArgs: unknown[]): ReturnType<NextConfigFunction> {
-      const maybeUserNextConfigObject: NextConfigObjectWithSentry = exportedUserNextConfig.apply(
-        this,
-        webpackConfigFunctionArgs,
-      );
+      const maybePromiseNextConfig: ReturnType<typeof nextConfig> = nextConfig.apply(this, webpackConfigFunctionArgs);
 
-      if (isThenable(maybeUserNextConfigObject)) {
-        return maybeUserNextConfigObject.then(function (userNextConfigObject: NextConfigObjectWithSentry) {
-          const userSentryOptions = { ...userNextConfigObject.sentry, ...sentryOptions };
-          return getFinalConfigObject(userNextConfigObject, userSentryOptions, userSentryWebpackPluginOptions);
+      if (isThenable(maybePromiseNextConfig)) {
+        return maybePromiseNextConfig.then(promiseResultNextConfig => {
+          return getFinalConfigObject(promiseResultNextConfig, sentryBuildOptions);
         });
       }
 
-      // Reassign for naming-consistency sake.
-      const userNextConfigObject = maybeUserNextConfigObject;
-      const userSentryOptions = { ...userNextConfigObject.sentry, ...sentryOptions };
-      return getFinalConfigObject(userNextConfigObject, userSentryOptions, userSentryWebpackPluginOptions);
+      return getFinalConfigObject(maybePromiseNextConfig, sentryBuildOptions);
     };
   } else {
-    const userSentryOptions = { ...exportedUserNextConfig.sentry, ...sentryOptions };
-    return getFinalConfigObject(exportedUserNextConfig, userSentryOptions, userSentryWebpackPluginOptions);
+    return getFinalConfigObject(nextConfig, sentryBuildOptions);
   }
 }
 
 // Modify the materialized object form of the user's next config by deleting the `sentry` property and wrapping the
 // `webpack` property
 function getFinalConfigObject(
-  incomingUserNextConfigObject: NextConfigObjectWithSentry,
-  userSentryOptions: UserSentryOptions,
-  userSentryWebpackPluginOptions: Partial<SentryWebpackPluginOptions>,
+  incomingUserNextConfigObject: NextConfigObject,
+  userSentryOptions: SentryBuildOptions,
 ): NextConfigObject {
-  // Next 12.2.3+ warns about non-canonical properties on `userNextConfig`.
-  delete incomingUserNextConfigObject.sentry;
+  if ('sentry' in incomingUserNextConfigObject) {
+    // eslint-disable-next-line no-console
+    console.warn(
+      '[@sentry/nextjs] Setting a `sentry` property on the Next.js config is no longer supported. Please use the `sentrySDKOptions` argument of `withSentryConfig` instead.',
+    );
+
+    // Next 12.2.3+ warns about non-canonical properties on `userNextConfig`.
+    delete incomingUserNextConfigObject.sentry;
+  }
 
   if (userSentryOptions?.tunnelRoute) {
     if (incomingUserNextConfigObject.output === 'export') {
@@ -76,11 +71,7 @@ function getFinalConfigObject(
 
   return {
     ...incomingUserNextConfigObject,
-    webpack: constructWebpackConfigFunction(
-      incomingUserNextConfigObject,
-      userSentryWebpackPluginOptions,
-      userSentryOptions,
-    ),
+    webpack: constructWebpackConfigFunction(incomingUserNextConfigObject, userSentryOptions),
   };
 }
 
@@ -96,7 +87,7 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
   // This function doesn't take any arguments at the time of writing but we future-proof
   // here in case Next.js ever decides to pass some
   userNextConfig.rewrites = async (...args: unknown[]) => {
-    const injectedRewrite = {
+    const tunnelRouteRewrite = {
       // Matched rewrite routes will look like the following: `[tunnelPath]?o=[orgid]&p=[projectid]`
       // Nextjs will automatically convert `source` into a regex for us
       source: `${tunnelPath}(/?)`,
@@ -115,19 +106,43 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
       destination: 'https://o:orgid.ingest.sentry.io/api/:projectid/envelope/?hsts=0',
     };
 
+    const tunnelRouteRewriteWithRegion = {
+      // Matched rewrite routes will look like the following: `[tunnelPath]?o=[orgid]&p=[projectid]?r=[region]`
+      // Nextjs will automatically convert `source` into a regex for us
+      source: `${tunnelPath}(/?)`,
+      has: [
+        {
+          type: 'query',
+          key: 'o', // short for orgId - we keep it short so matching is harder for ad-blockers
+          value: '(?<orgid>\\d*)',
+        },
+        {
+          type: 'query',
+          key: 'p', // short for projectId - we keep it short so matching is harder for ad-blockers
+          value: '(?<projectid>\\d*)',
+        },
+        {
+          type: 'query',
+          key: 'r', // short for region - we keep it short so matching is harder for ad-blockers
+          value: '(?<region>\\[a-z\\]{2})',
+        },
+      ],
+      destination: 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0',
+    };
+
     if (typeof originalRewrites !== 'function') {
-      return [injectedRewrite];
+      return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite];
     }
 
     // @ts-expect-error Expected 0 arguments but got 1 - this is from the future-proofing mentioned above, so we don't care about it
     const originalRewritesResult = await originalRewrites(...args);
 
     if (Array.isArray(originalRewritesResult)) {
-      return [injectedRewrite, ...originalRewritesResult];
+      return [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...originalRewritesResult];
     } else {
       return {
         ...originalRewritesResult,
-        beforeFiles: [injectedRewrite, ...(originalRewritesResult.beforeFiles || [])],
+        beforeFiles: [tunnelRouteRewriteWithRegion, tunnelRouteRewrite, ...(originalRewritesResult.beforeFiles || [])],
       };
     }
   };
diff --git a/packages/nextjs/src/edge/rewriteFramesIntegration.ts b/packages/nextjs/src/edge/rewriteFramesIntegration.ts
index f19a3c79a4c5..84d5a41b0922 100644
--- a/packages/nextjs/src/edge/rewriteFramesIntegration.ts
+++ b/packages/nextjs/src/edge/rewriteFramesIntegration.ts
@@ -37,11 +37,7 @@ export const customRewriteFramesIntegration = ((options?: RewriteFramesOptions)
 
   // Do nothing if we can't find a distDirName
   return {
-    // eslint-disable-next-line deprecation/deprecation
     name: 'RewriteFrames',
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    setupOnce: () => {},
-    processEvent: event => event,
   };
 }) satisfies IntegrationFn;
 
diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
index 976644d0992a..ec1cb1721b9d 100644
--- a/packages/nextjs/src/index.types.ts
+++ b/packages/nextjs/src/index.types.ts
@@ -30,6 +30,7 @@ export declare const defaultStackParser: StackParser;
 export declare function getSentryRelease(fallback?: string): string | undefined;
 
 export declare const ErrorBoundary: typeof clientSdk.ErrorBoundary;
+export declare const createReduxEnhancer: typeof clientSdk.createReduxEnhancer;
 export declare const showReportDialog: typeof clientSdk.showReportDialog;
 export declare const withErrorBoundary: typeof clientSdk.withErrorBoundary;
 
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index 5820b783b1b9..6ec2f500a8c3 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -16,7 +16,6 @@ import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegrati
 import { Http } from './httpIntegration';
 import { OnUncaughtException } from './onUncaughtExceptionIntegration';
 
-export { createReduxEnhancer } from '@sentry/react';
 export * from '@sentry/node-experimental';
 export { captureUnderscoreErrorException } from '../common/_error';
 
@@ -47,6 +46,13 @@ export const ErrorBoundary = (props: React.PropsWithChildren<unknown>): React.Re
   return props.children as React.ReactNode;
 };
 
+/**
+ * A passthrough redux enhancer for the server that doesn't depend on anything from the `@sentry/react` package.
+ */
+export function createReduxEnhancer() {
+  return (createStore: unknown) => createStore;
+}
+
 /**
  * A passthrough error boundary wrapper for the server that doesn't depend on any react. Error boundaries don't catch
  * SSR errors so they should simply be a passthrough.
diff --git a/packages/nextjs/src/server/rewriteFramesIntegration.ts b/packages/nextjs/src/server/rewriteFramesIntegration.ts
index 5b7c64d81b7a..6438ccb0d922 100644
--- a/packages/nextjs/src/server/rewriteFramesIntegration.ts
+++ b/packages/nextjs/src/server/rewriteFramesIntegration.ts
@@ -37,11 +37,7 @@ export const customRewriteFramesIntegration = ((options?: RewriteFramesOptions)
 
   // Do nothing if we can't find a distDirName
   return {
-    // eslint-disable-next-line deprecation/deprecation
     name: 'RewriteFrames',
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    setupOnce: () => {},
-    processEvent: event => event,
   };
 }) satisfies IntegrationFn;
 
diff --git a/packages/nextjs/test/clientSdk.test.ts b/packages/nextjs/test/clientSdk.test.ts
index 2a19b74d5fcd..dc5fe5c109f5 100644
--- a/packages/nextjs/test/clientSdk.test.ts
+++ b/packages/nextjs/test/clientSdk.test.ts
@@ -91,10 +91,9 @@ describe('Client init()', () => {
     const transportSend = jest.spyOn(getClient()!.getTransport()!, 'send');
 
     // Ensure we have no current span, so our next span is a transaction
-    // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(undefined);
-
-    SentryReact.startInactiveSpan({ name: '/404' })?.end();
+    SentryReact.withActiveSpan(null, () => {
+      SentryReact.startInactiveSpan({ name: '/404' })?.end();
+    });
 
     expect(transportSend).not.toHaveBeenCalled();
     expect(captureEvent.mock.results[0].value).toBeUndefined();
diff --git a/packages/nextjs/test/config/fixtures.ts b/packages/nextjs/test/config/fixtures.ts
index 69f15a18f088..7da47e37be33 100644
--- a/packages/nextjs/test/config/fixtures.ts
+++ b/packages/nextjs/test/config/fixtures.ts
@@ -3,7 +3,6 @@ import type {
   EntryPropertyFunction,
   ExportedNextConfig,
   NextConfigObject,
-  NextConfigObjectWithSentry,
   WebpackConfigObject,
 } from '../../src/config/types';
 
@@ -26,7 +25,7 @@ export const userNextConfig: NextConfigObject = {
 };
 
 /** Mocks of the arguments passed to `withSentryConfig` */
-export const exportedNextConfig = userNextConfig as NextConfigObjectWithSentry;
+export const exportedNextConfig = userNextConfig;
 export const userSentryWebpackPluginConfig = { org: 'squirrelChasers', project: 'simulator' };
 process.env.SENTRY_AUTH_TOKEN = 'dogsarebadatkeepingsecrets';
 process.env.SENTRY_RELEASE = 'doGsaREgReaT';
diff --git a/packages/nextjs/test/config/testUtils.ts b/packages/nextjs/test/config/testUtils.ts
index c9bed5dbe358..1e93e3740152 100644
--- a/packages/nextjs/test/config/testUtils.ts
+++ b/packages/nextjs/test/config/testUtils.ts
@@ -1,12 +1,9 @@
-import type { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
-import type { WebpackPluginInstance } from 'webpack';
-
 import type {
   BuildContext,
   EntryPropertyFunction,
   ExportedNextConfig,
   NextConfigObject,
-  SentryWebpackPluginOptions,
+  SentryBuildOptions,
   WebpackConfigObject,
   WebpackConfigObjectWithModuleRules,
 } from '../../src/config/types';
@@ -26,10 +23,10 @@ import { defaultRuntimePhase, defaultsObject } from './fixtures';
  */
 export function materializeFinalNextConfig(
   exportedNextConfig: ExportedNextConfig,
-  userSentryWebpackPluginConfig?: Partial<SentryWebpackPluginOptions>,
   runtimePhase?: string,
+  sentryBuildOptions?: SentryBuildOptions,
 ): NextConfigObject {
-  const sentrifiedConfig = withSentryConfig(exportedNextConfig, userSentryWebpackPluginConfig);
+  const sentrifiedConfig = withSentryConfig(exportedNextConfig, sentryBuildOptions);
   let finalConfigValues = sentrifiedConfig;
 
   if (typeof sentrifiedConfig === 'function') {
@@ -56,12 +53,11 @@ export function materializeFinalNextConfig(
  */
 export async function materializeFinalWebpackConfig(options: {
   exportedNextConfig: ExportedNextConfig;
-  userSentryWebpackPluginConfig?: Partial<SentryWebpackPluginOptions>;
   incomingWebpackConfig: WebpackConfigObject;
   incomingWebpackBuildContext: BuildContext;
+  sentryBuildTimeOptions?: SentryBuildOptions;
 }): Promise<WebpackConfigObjectWithModuleRules> {
-  const { exportedNextConfig, userSentryWebpackPluginConfig, incomingWebpackConfig, incomingWebpackBuildContext } =
-    options;
+  const { exportedNextConfig, incomingWebpackConfig, incomingWebpackBuildContext } = options;
 
   // if the user's next config is a function, run it so we have access to the values
   const materializedUserNextConfig =
@@ -69,15 +65,10 @@ export async function materializeFinalWebpackConfig(options: {
       ? await exportedNextConfig('phase-production-build', defaultsObject)
       : exportedNextConfig;
 
-  // extract the `sentry` property as we do in `withSentryConfig`
-  const { sentry: sentryConfig } = materializedUserNextConfig;
-  delete materializedUserNextConfig.sentry;
-
   // get the webpack config function we'd normally pass back to next
   const webpackConfigFunction = constructWebpackConfigFunction(
     materializedUserNextConfig,
-    userSentryWebpackPluginConfig,
-    sentryConfig,
+    options.sentryBuildTimeOptions,
   );
 
   // call it to get concrete values for comparison
@@ -87,37 +78,3 @@ export async function materializeFinalWebpackConfig(options: {
 
   return finalWebpackConfigValue as WebpackConfigObjectWithModuleRules;
 }
-
-// helper function to make sure we're checking the correct plugin's data
-
-/**
- * Given a webpack config, find a plugin (or the plugins) with the given name.
- *
- * Note that this function will error if more than one instance is found, unless the `allowMultiple` flag is passed.
- *
- * @param webpackConfig The webpack config object
- * @param pluginName The name of the plugin's constructor
- * @returns The plugin instance(s), or undefined if it's not found.
- */
-export function findWebpackPlugin(
-  webpackConfig: WebpackConfigObject,
-  pluginName: string,
-  multipleAllowed: boolean = false,
-): WebpackPluginInstance | SentryWebpackPlugin | WebpackPluginInstance[] | SentryWebpackPlugin[] | undefined {
-  const plugins = webpackConfig.plugins || [];
-  const matchingPlugins = plugins.filter(plugin => plugin.constructor.name === pluginName);
-
-  if (matchingPlugins.length > 1 && !multipleAllowed) {
-    throw new Error(
-      `More than one ${pluginName} instance found. Please use the \`multipleAllowed\` flag if this is intentional.\nExisting plugins: ${plugins.map(
-        plugin => plugin.constructor.name,
-      )}`,
-    );
-  }
-
-  if (matchingPlugins.length > 0) {
-    return multipleAllowed ? matchingPlugins : matchingPlugins[0];
-  }
-
-  return undefined;
-}
diff --git a/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts b/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
index b70e6d3d642e..a9d8b812f8a9 100644
--- a/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
+++ b/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
@@ -1,8 +1,6 @@
 // mock helper functions not tested directly in this file
 import '../mocks';
 
-import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
-
 import {
   CLIENT_SDK_CONFIG_FILE,
   clientBuildContext,
@@ -26,7 +24,7 @@ describe('constructWebpackConfigFunction()', () => {
       expect.objectContaining({
         devtool: 'source-map',
         entry: expect.any(Object), // `entry` is tested specifically elsewhere
-        plugins: expect.arrayContaining([expect.any(SentryWebpackPlugin)]),
+        plugins: expect.arrayContaining([expect.objectContaining({ _name: 'sentry-webpack-plugin' })]),
       }),
     );
   });
@@ -48,36 +46,41 @@ describe('constructWebpackConfigFunction()', () => {
   });
 
   it("doesn't set devtool if webpack plugin is disabled", () => {
-    const finalNextConfig = materializeFinalNextConfig({
-      ...exportedNextConfig,
-      webpack: () =>
-        ({
-          ...serverWebpackConfig,
-          devtool: 'something-besides-source-map',
-        }) as any,
-      sentry: { disableServerWebpackPlugin: true },
-    });
+    const finalNextConfig = materializeFinalNextConfig(
+      {
+        ...exportedNextConfig,
+        webpack: () =>
+          ({
+            ...serverWebpackConfig,
+            devtool: 'something-besides-source-map',
+          }) as any,
+      },
+      undefined,
+      {
+        sourcemaps: {
+          disable: true,
+        },
+      },
+    );
+
     const finalWebpackConfig = finalNextConfig.webpack?.(serverWebpackConfig, serverBuildContext);
 
     expect(finalWebpackConfig?.devtool).not.toEqual('source-map');
   });
 
   it('allows for the use of `hidden-source-map` as `devtool` value for client-side builds', async () => {
-    const exportedNextConfigHiddenSourceMaps = {
-      ...exportedNextConfig,
-      sentry: { ...exportedNextConfig.sentry, hideSourceMaps: true },
-    };
-
     const finalClientWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig: exportedNextConfigHiddenSourceMaps,
+      exportedNextConfig: exportedNextConfig,
       incomingWebpackConfig: clientWebpackConfig,
       incomingWebpackBuildContext: clientBuildContext,
+      sentryBuildTimeOptions: { hideSourceMaps: true },
     });
 
     const finalServerWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig: exportedNextConfigHiddenSourceMaps,
+      exportedNextConfig: exportedNextConfig,
       incomingWebpackConfig: serverWebpackConfig,
       incomingWebpackBuildContext: serverBuildContext,
+      sentryBuildTimeOptions: { hideSourceMaps: true },
     });
 
     expect(finalClientWebpackConfig.devtool).toEqual('hidden-source-map');
diff --git a/packages/nextjs/test/config/webpack/sentryWebpackPlugin.test.ts b/packages/nextjs/test/config/webpack/sentryWebpackPlugin.test.ts
deleted file mode 100644
index ddcc8965a6c1..000000000000
--- a/packages/nextjs/test/config/webpack/sentryWebpackPlugin.test.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-import * as fs from 'fs';
-import * as os from 'os';
-import * as path from 'path';
-import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
-
-import type { BuildContext, ExportedNextConfig } from '../../../src/config/types';
-import { getUserConfigFile, getWebpackPluginOptions } from '../../../src/config/webpack';
-import {
-  clientBuildContext,
-  clientWebpackConfig,
-  exportedNextConfig,
-  getBuildContext,
-  serverBuildContext,
-  serverWebpackConfig,
-  userSentryWebpackPluginConfig,
-} from '../fixtures';
-import { exitsSync, mkdtempSyncSpy, mockExistsSync, realExistsSync } from '../mocks';
-import { findWebpackPlugin, materializeFinalWebpackConfig } from '../testUtils';
-
-describe('Sentry webpack plugin config', () => {
-  it('includes expected properties', async () => {
-    // also, can pull from either env or user config (see notes on specific properties below)
-    const finalWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig,
-      userSentryWebpackPluginConfig,
-      incomingWebpackConfig: serverWebpackConfig,
-      incomingWebpackBuildContext: serverBuildContext,
-    });
-    const sentryWebpackPluginInstance = findWebpackPlugin(finalWebpackConfig, 'SentryCliPlugin') as SentryWebpackPlugin;
-
-    expect(sentryWebpackPluginInstance.options).toEqual(
-      expect.objectContaining({
-        include: expect.any(Array), // default, tested separately elsewhere
-        ignore: [], // default
-        org: 'squirrelChasers', // from user webpack plugin config
-        project: 'simulator', // from user webpack plugin config
-        authToken: 'dogsarebadatkeepingsecrets', // picked up from env
-        stripPrefix: ['webpack://_N_E/', 'webpack://'], // default
-        urlPrefix: '~/_next', // default
-        entries: [],
-        release: 'doGsaREgReaT', // picked up from env
-      }),
-    );
-  });
-
-  it('preserves unrelated plugin config options', async () => {
-    const finalWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig,
-      userSentryWebpackPluginConfig: { ...userSentryWebpackPluginConfig, debug: true },
-      incomingWebpackConfig: serverWebpackConfig,
-      incomingWebpackBuildContext: serverBuildContext,
-    });
-    const sentryWebpackPluginInstance = findWebpackPlugin(finalWebpackConfig, 'SentryCliPlugin') as SentryWebpackPlugin;
-
-    expect(sentryWebpackPluginInstance.options.debug).toEqual(true);
-  });
-
-  it('warns when overriding certain default values', () => {
-    // TODO
-  });
-
-  it("merges default include and ignore/ignoreFile options with user's values", () => {
-    // do we even want to do this?
-  });
-
-  describe('Sentry webpack plugin `include` option', () => {
-    it('has the correct value when building client bundles', async () => {
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig,
-        incomingWebpackConfig: clientWebpackConfig,
-        incomingWebpackBuildContext: clientBuildContext,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.include).toEqual([
-        { paths: [`${clientBuildContext.dir}/.next/static/chunks/pages`], urlPrefix: '~/_next/static/chunks/pages' },
-        { paths: [`${clientBuildContext.dir}/.next/static/chunks/app`], urlPrefix: '~/_next/static/chunks/app' },
-      ]);
-    });
-
-    it('has the correct value when building client bundles using `widenClientFileUpload` option', async () => {
-      const exportedNextConfigWithWidening = { ...exportedNextConfig, sentry: { widenClientFileUpload: true } };
-      const buildContext = getBuildContext('client', exportedNextConfigWithWidening);
-
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig: exportedNextConfigWithWidening,
-        incomingWebpackConfig: clientWebpackConfig,
-        incomingWebpackBuildContext: buildContext,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.include).toEqual([
-        { paths: [`${buildContext.dir}/.next/static/chunks`], urlPrefix: '~/_next/static/chunks' },
-      ]);
-    });
-
-    it('has the correct value when building serverless server bundles', async () => {
-      const exportedNextConfigServerless = {
-        ...exportedNextConfig,
-        target: 'experimental-serverless-trace' as const,
-      };
-      const buildContext = getBuildContext('server', exportedNextConfigServerless);
-
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig: exportedNextConfigServerless,
-        incomingWebpackConfig: serverWebpackConfig,
-        incomingWebpackBuildContext: buildContext,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.include).toEqual([
-        { paths: [`${buildContext.dir}/.next/serverless/`], urlPrefix: '~/_next/serverless' },
-      ]);
-    });
-
-    it('has the correct value when building serverful server bundles using webpack 4', async () => {
-      const serverBuildContextWebpack4 = getBuildContext('server', exportedNextConfig);
-      serverBuildContextWebpack4.webpack.version = '4.15.13';
-
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig,
-        incomingWebpackConfig: serverWebpackConfig,
-        incomingWebpackBuildContext: serverBuildContextWebpack4,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.include).toEqual([
-        { paths: [`${serverBuildContextWebpack4.dir}/.next/server/`], urlPrefix: '~/_next/server' },
-      ]);
-    });
-
-    it('has the correct value when building serverful server bundles using webpack 5', async () => {
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig,
-        incomingWebpackConfig: serverWebpackConfig,
-        incomingWebpackBuildContext: serverBuildContext,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.include).toEqual([
-        { paths: [`${serverBuildContext.dir}/.next/server/`], urlPrefix: '~/_next/server' },
-      ]);
-    });
-  });
-
-  describe('Sentry webpack plugin `ignore` option', () => {
-    it('has the correct value when building client bundles', async () => {
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig,
-        incomingWebpackConfig: clientWebpackConfig,
-        incomingWebpackBuildContext: clientBuildContext,
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.ignore).toEqual([]);
-    });
-
-    it('has the correct value when building client bundles using `widenClientFileUpload` option', async () => {
-      const exportedNextConfigWithWidening = { ...exportedNextConfig, sentry: { widenClientFileUpload: true } };
-      const finalWebpackConfig = await materializeFinalWebpackConfig({
-        exportedNextConfig: exportedNextConfigWithWidening,
-        incomingWebpackConfig: clientWebpackConfig,
-        incomingWebpackBuildContext: getBuildContext('client', exportedNextConfigWithWidening),
-      });
-
-      const sentryWebpackPluginInstance = findWebpackPlugin(
-        finalWebpackConfig,
-        'SentryCliPlugin',
-      ) as SentryWebpackPlugin;
-
-      expect(sentryWebpackPluginInstance.options.ignore).toEqual([
-        'framework-*',
-        'framework.*',
-        'main-*',
-        'polyfills-*',
-        'webpack-*',
-      ]);
-    });
-  });
-
-  describe('SentryWebpackPlugin enablement', () => {
-    let processEnvBackup: typeof process.env;
-
-    beforeEach(() => {
-      processEnvBackup = { ...process.env };
-    });
-
-    afterEach(() => {
-      process.env = processEnvBackup;
-    });
-
-    it.each([
-      // [testName, exportedNextConfig, extraEnvValues, shouldFindServerPlugin, shouldFindClientPlugin]
-      [
-        'obeys `disableClientWebpackPlugin = true`',
-        {
-          ...exportedNextConfig,
-          sentry: { disableClientWebpackPlugin: true },
-        },
-        {},
-        true,
-        false,
-      ],
-
-      [
-        'obeys `disableServerWebpackPlugin = true`',
-        {
-          ...exportedNextConfig,
-          sentry: { disableServerWebpackPlugin: true },
-        },
-        {},
-        false,
-        true,
-      ],
-    ])(
-      '%s',
-      async (
-        _testName: string,
-        exportedNextConfig: ExportedNextConfig,
-        extraEnvValues: Record<string, string>,
-        shouldFindServerPlugin: boolean,
-        shouldFindClientPlugin: boolean,
-      ) => {
-        process.env = { ...process.env, ...extraEnvValues };
-
-        // We create a copy of the next config for each `materializeFinalWebpackConfig` call because the `sentry`
-        // property gets deleted along the way, and its value matters for some of our test cases
-        const serverFinalWebpackConfig = await materializeFinalWebpackConfig({
-          exportedNextConfig: { ...exportedNextConfig },
-          userSentryWebpackPluginConfig,
-          incomingWebpackConfig: serverWebpackConfig,
-          incomingWebpackBuildContext: serverBuildContext,
-        });
-
-        const clientFinalWebpackConfig = await materializeFinalWebpackConfig({
-          exportedNextConfig: { ...exportedNextConfig },
-          userSentryWebpackPluginConfig,
-          incomingWebpackConfig: clientWebpackConfig,
-          incomingWebpackBuildContext: clientBuildContext,
-        });
-
-        const genericSentryWebpackPluginInstance = expect.any(SentryWebpackPlugin);
-
-        expect(findWebpackPlugin(serverFinalWebpackConfig, 'SentryCliPlugin')).toEqual(
-          shouldFindServerPlugin ? genericSentryWebpackPluginInstance : undefined,
-        );
-        expect(findWebpackPlugin(clientFinalWebpackConfig, 'SentryCliPlugin')).toEqual(
-          shouldFindClientPlugin ? genericSentryWebpackPluginInstance : undefined,
-        );
-      },
-    );
-  });
-
-  describe('getUserConfigFile', () => {
-    let tempDir: string;
-
-    beforeAll(() => {
-      exitsSync.mockImplementation(realExistsSync);
-    });
-
-    beforeEach(() => {
-      // these will get cleaned up by the file's overall `afterAll` function, and the `mkdtempSync` mock above ensures
-      // that the location of the created folder is stored in `tempDir`
-      const tempDirPathPrefix = path.join(os.tmpdir(), 'sentry-nextjs-test-');
-      fs.mkdtempSync(tempDirPathPrefix);
-      tempDir = mkdtempSyncSpy.mock.results[0].value;
-    });
-
-    afterAll(() => {
-      exitsSync.mockImplementation(mockExistsSync);
-    });
-
-    it('successfully finds js files', () => {
-      fs.writeFileSync(path.resolve(tempDir, 'sentry.server.config.js'), 'Dogs are great!');
-      fs.writeFileSync(path.resolve(tempDir, 'sentry.client.config.js'), 'Squirrel!');
-
-      expect(getUserConfigFile(tempDir, 'server')).toEqual('sentry.server.config.js');
-      expect(getUserConfigFile(tempDir, 'client')).toEqual('sentry.client.config.js');
-    });
-
-    it('successfully finds ts files', () => {
-      fs.writeFileSync(path.resolve(tempDir, 'sentry.server.config.ts'), 'Sit. Stay. Lie Down.');
-      fs.writeFileSync(path.resolve(tempDir, 'sentry.client.config.ts'), 'Good dog!');
-
-      expect(getUserConfigFile(tempDir, 'server')).toEqual('sentry.server.config.ts');
-      expect(getUserConfigFile(tempDir, 'client')).toEqual('sentry.client.config.ts');
-    });
-
-    it('errors when files are missing', () => {
-      expect(() => getUserConfigFile(tempDir, 'server')).toThrowError(
-        `Cannot find 'sentry.server.config.ts' or 'sentry.server.config.js' in '${tempDir}'`,
-      );
-      expect(() => getUserConfigFile(tempDir, 'client')).toThrowError(
-        `Cannot find 'sentry.client.config.ts' or 'sentry.client.config.js' in '${tempDir}'`,
-      );
-    });
-  });
-
-  describe('correct paths from `distDir` in WebpackPluginOptions', () => {
-    it.each([
-      [getBuildContext('client', {}), '.next'],
-      [getBuildContext('server', { target: 'experimental-serverless-trace' }), '.next'], // serverless
-      [getBuildContext('server', {}, '4'), '.next'],
-      [getBuildContext('server', {}, '5'), '.next'],
-    ])('`distDir` is not defined', (buildContext: BuildContext, expectedDistDir) => {
-      const includePaths = getWebpackPluginOptions(
-        buildContext,
-        {}, // userPluginOptions
-        {}, // userSentryOptions
-      ).include as { paths: [] }[];
-
-      for (const pathDescriptor of includePaths) {
-        for (const path of pathDescriptor.paths) {
-          expect(path).toMatch(new RegExp(`${buildContext.dir}/${expectedDistDir}.*`));
-        }
-      }
-    });
-
-    it.each([
-      [getBuildContext('client', { distDir: 'tmpDir' }), 'tmpDir'],
-      [getBuildContext('server', { distDir: 'tmpDir', target: 'experimental-serverless-trace' }), 'tmpDir'], // serverless
-      [getBuildContext('server', { distDir: 'tmpDir' }, '4'), 'tmpDir'],
-      [getBuildContext('server', { distDir: 'tmpDir' }, '5'), 'tmpDir'],
-    ])('`distDir` is defined', (buildContext: BuildContext, expectedDistDir) => {
-      const includePaths = getWebpackPluginOptions(
-        buildContext,
-        {}, // userPluginOptions
-        {}, // userSentryOptions
-      ).include as { paths: [] }[];
-
-      for (const pathDescriptor of includePaths) {
-        for (const path of pathDescriptor.paths) {
-          expect(path).toMatch(new RegExp(`${buildContext.dir}/${expectedDistDir}.*`));
-        }
-      }
-    });
-  });
-});
diff --git a/packages/nextjs/test/config/webpack/webpack.test.ts b/packages/nextjs/test/config/webpack/webpack.test.ts
new file mode 100644
index 000000000000..d0f8606e3b4c
--- /dev/null
+++ b/packages/nextjs/test/config/webpack/webpack.test.ts
@@ -0,0 +1,51 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+
+import { getUserConfigFile } from '../../../src/config/webpack';
+import { exitsSync, mkdtempSyncSpy, mockExistsSync, realExistsSync } from '../mocks';
+
+describe('getUserConfigFile', () => {
+  let tempDir: string;
+
+  beforeAll(() => {
+    exitsSync.mockImplementation(realExistsSync);
+  });
+
+  beforeEach(() => {
+    // these will get cleaned up by the file's overall `afterAll` function, and the `mkdtempSync` mock above ensures
+    // that the location of the created folder is stored in `tempDir`
+    const tempDirPathPrefix = path.join(os.tmpdir(), 'sentry-nextjs-test-');
+    fs.mkdtempSync(tempDirPathPrefix);
+    tempDir = mkdtempSyncSpy.mock.results[0].value;
+  });
+
+  afterAll(() => {
+    exitsSync.mockImplementation(mockExistsSync);
+  });
+
+  it('successfully finds js files', () => {
+    fs.writeFileSync(path.resolve(tempDir, 'sentry.server.config.js'), 'Dogs are great!');
+    fs.writeFileSync(path.resolve(tempDir, 'sentry.client.config.js'), 'Squirrel!');
+
+    expect(getUserConfigFile(tempDir, 'server')).toEqual('sentry.server.config.js');
+    expect(getUserConfigFile(tempDir, 'client')).toEqual('sentry.client.config.js');
+  });
+
+  it('successfully finds ts files', () => {
+    fs.writeFileSync(path.resolve(tempDir, 'sentry.server.config.ts'), 'Sit. Stay. Lie Down.');
+    fs.writeFileSync(path.resolve(tempDir, 'sentry.client.config.ts'), 'Good dog!');
+
+    expect(getUserConfigFile(tempDir, 'server')).toEqual('sentry.server.config.ts');
+    expect(getUserConfigFile(tempDir, 'client')).toEqual('sentry.client.config.ts');
+  });
+
+  it('errors when files are missing', () => {
+    expect(() => getUserConfigFile(tempDir, 'server')).toThrowError(
+      `Cannot find 'sentry.server.config.ts' or 'sentry.server.config.js' in '${tempDir}'`,
+    );
+    expect(() => getUserConfigFile(tempDir, 'client')).toThrowError(
+      `Cannot find 'sentry.client.config.ts' or 'sentry.client.config.js' in '${tempDir}'`,
+    );
+  });
+});
diff --git a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
new file mode 100644
index 000000000000..54d55a179e28
--- /dev/null
+++ b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
@@ -0,0 +1,157 @@
+import type { BuildContext, NextConfigObject } from '../../../src/config/types';
+import { getWebpackPluginOptions } from '../../../src/config/webpackPluginOptions';
+
+function generateBuildContext(overrides: {
+  isServer: boolean;
+  nextjsConfig?: NextConfigObject;
+}): BuildContext {
+  return {
+    dev: false, // The plugin is not included in dev mode
+    isServer: overrides.isServer,
+    buildId: 'test-build-id',
+    dir: '/my/project/dir',
+    config: overrides.nextjsConfig ?? {},
+    totalPages: 2,
+    defaultLoaders: true,
+    webpack: {
+      version: '4.0.0',
+      DefinePlugin: {} as any,
+    },
+  };
+}
+
+describe('getWebpackPluginOptions()', () => {
+  it('forwards relevant options', () => {
+    const buildContext = generateBuildContext({ isServer: false });
+    const generatedPluginOptions = getWebpackPluginOptions(buildContext, {
+      authToken: 'my-auth-token',
+      headers: { 'my-test-header': 'test' },
+      org: 'my-org',
+      project: 'my-project',
+      telemetry: false,
+      reactComponentAnnotation: {
+        enabled: true,
+      },
+      silent: false,
+      debug: true,
+      sentryUrl: 'my-url',
+      sourcemaps: {
+        assets: ['my-asset'],
+        ignore: ['my-ignore'],
+      },
+      release: {
+        name: 'my-release',
+        create: false,
+        finalize: false,
+        dist: 'my-dist',
+        vcsRemote: 'my-origin',
+        setCommits: {
+          auto: true,
+        },
+        deploy: {
+          env: 'my-env',
+        },
+      },
+    });
+
+    expect(generatedPluginOptions.authToken).toBe('my-auth-token');
+    expect(generatedPluginOptions.debug).toBe(true);
+    expect(generatedPluginOptions.headers).toStrictEqual({ 'my-test-header': 'test' });
+    expect(generatedPluginOptions.org).toBe('my-org');
+    expect(generatedPluginOptions.project).toBe('my-project');
+    expect(generatedPluginOptions.reactComponentAnnotation?.enabled).toBe(true);
+    expect(generatedPluginOptions.release?.create).toBe(false);
+    expect(generatedPluginOptions.release?.deploy?.env).toBe('my-env');
+    expect(generatedPluginOptions.release?.dist).toBe('my-dist');
+    expect(generatedPluginOptions.release?.finalize).toBe(false);
+    expect(generatedPluginOptions.release?.name).toBe('my-release');
+    expect(generatedPluginOptions.release?.setCommits?.auto).toBe(true);
+    expect(generatedPluginOptions.release?.vcsRemote).toBe('my-origin');
+    expect(generatedPluginOptions.silent).toBe(false);
+    expect(generatedPluginOptions.sourcemaps?.assets).toStrictEqual(['my-asset']);
+    expect(generatedPluginOptions.sourcemaps?.ignore).toStrictEqual(['my-ignore']);
+    expect(generatedPluginOptions.telemetry).toBe(false);
+    expect(generatedPluginOptions.url).toBe('my-url');
+
+    expect(generatedPluginOptions).toMatchObject({
+      authToken: 'my-auth-token',
+      debug: true,
+      headers: {
+        'my-test-header': 'test',
+      },
+      org: 'my-org',
+      project: 'my-project',
+      reactComponentAnnotation: {
+        enabled: true,
+      },
+      release: {
+        create: false,
+        deploy: {
+          env: 'my-env',
+        },
+        dist: 'my-dist',
+        finalize: false,
+        inject: false,
+        name: 'my-release',
+        setCommits: {
+          auto: true,
+        },
+        vcsRemote: 'my-origin',
+      },
+      silent: false,
+      sourcemaps: {
+        assets: ['my-asset'],
+        ignore: ['my-ignore'],
+      },
+      telemetry: false,
+      url: 'my-url',
+    });
+  });
+
+  it('returns the right `assets` and `ignore` values during the server build', () => {
+    const buildContext = generateBuildContext({ isServer: true });
+    const generatedPluginOptions = getWebpackPluginOptions(buildContext, {});
+    expect(generatedPluginOptions.sourcemaps).toMatchObject({
+      assets: ['/my/project/dir/.next/server/**', '/my/project/dir/.next/serverless/**'],
+      ignore: [],
+    });
+  });
+
+  it('returns the right `assets` and `ignore` values during the client build', () => {
+    const buildContext = generateBuildContext({ isServer: false });
+    const generatedPluginOptions = getWebpackPluginOptions(buildContext, {});
+    expect(generatedPluginOptions.sourcemaps).toMatchObject({
+      assets: ['/my/project/dir/.next/static/chunks/pages/**', '/my/project/dir/.next/static/chunks/app/**'],
+      ignore: [
+        '/my/project/dir/.next/static/chunks/framework-*',
+        '/my/project/dir/.next/static/chunks/framework.*',
+        '/my/project/dir/.next/static/chunks/main-*',
+        '/my/project/dir/.next/static/chunks/polyfills-*',
+        '/my/project/dir/.next/static/chunks/webpack-*',
+      ],
+    });
+  });
+
+  it('returns the right `assets` and `ignore` values during the client build with `widenClientFileUpload`', () => {
+    const buildContext = generateBuildContext({ isServer: false });
+    const generatedPluginOptions = getWebpackPluginOptions(buildContext, { widenClientFileUpload: true });
+    expect(generatedPluginOptions.sourcemaps).toMatchObject({
+      assets: ['/my/project/dir/.next/static/chunks/**'],
+      ignore: [
+        '/my/project/dir/.next/static/chunks/framework-*',
+        '/my/project/dir/.next/static/chunks/framework.*',
+        '/my/project/dir/.next/static/chunks/main-*',
+        '/my/project/dir/.next/static/chunks/polyfills-*',
+        '/my/project/dir/.next/static/chunks/webpack-*',
+      ],
+    });
+  });
+
+  it('sets `sourcemaps.assets` to an empty array when `sourcemaps.disable` is true', () => {
+    const buildContext = generateBuildContext({ isServer: false });
+    const generatedPluginOptions = getWebpackPluginOptions(buildContext, { sourcemaps: { disable: true } });
+    expect(generatedPluginOptions.sourcemaps).toMatchObject({
+      assets: [],
+    });
+  });
+});
diff --git a/packages/nextjs/test/config/withSentry.test.ts b/packages/nextjs/test/config/withSentry.test.ts
index b199782cd7a6..2551e7af8350 100644
--- a/packages/nextjs/test/config/withSentry.test.ts
+++ b/packages/nextjs/test/config/withSentry.test.ts
@@ -47,12 +47,13 @@ describe('withSentry', () => {
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.nextjs',
           },
-          metadata: {
-            request: expect.objectContaining({ url: 'http://dogs.are.great' }),
-          },
         },
         expect.any(Function),
       );
+
+      expect(SentryCore.getIsolationScope().getScopeData().sdkProcessingMetadata).toEqual({
+        request: expect.objectContaining({ url: 'http://dogs.are.great' }),
+      });
     });
   });
 });
diff --git a/packages/nextjs/test/config/withSentryConfig.test.ts b/packages/nextjs/test/config/withSentryConfig.test.ts
index 4ed6f2d40770..e457174f5fa9 100644
--- a/packages/nextjs/test/config/withSentryConfig.test.ts
+++ b/packages/nextjs/test/config/withSentryConfig.test.ts
@@ -49,14 +49,4 @@ describe('withSentryConfig', () => {
 
     expect(exportedNextConfigFunction).toHaveBeenCalledWith(defaultRuntimePhase, defaultsObject);
   });
-
-  it('removes `sentry` property', () => {
-    // It's unclear why we need this cast -
-    const finalConfig = materializeFinalNextConfig({ ...exportedNextConfig, sentry: {} });
-    // const finalConfig = materializeFinalNextConfig({ ...exportedNextConfig, sentry: {} } as ExportedNextConfig);
-
-    // We have to check using `in` because TS knows it shouldn't be there and throws a type error if we try to access it
-    // directly
-    expect('sentry' in finalConfig).toBe(false);
-  });
 });
diff --git a/packages/nextjs/test/edge/edgeWrapperUtils.test.ts b/packages/nextjs/test/edge/edgeWrapperUtils.test.ts
index 495e6336e2cd..1dea31811bbf 100644
--- a/packages/nextjs/test/edge/edgeWrapperUtils.test.ts
+++ b/packages/nextjs/test/edge/edgeWrapperUtils.test.ts
@@ -82,9 +82,6 @@ describe('withEdgeWrapping', () => {
     expect(startSpanSpy).toHaveBeenCalledTimes(1);
     expect(startSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        metadata: {
-          request: { headers: {} },
-        },
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           [coreSdk.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs.withEdgeWrapping',
@@ -94,6 +91,10 @@ describe('withEdgeWrapping', () => {
       }),
       expect.any(Function),
     );
+
+    expect(coreSdk.getIsolationScope().getScopeData().sdkProcessingMetadata).toEqual({
+      request: { headers: {} },
+    });
   });
 
   it("should return a function that doesn't crash when req isn't passed", async () => {
diff --git a/packages/nextjs/test/edge/withSentryAPI.test.ts b/packages/nextjs/test/edge/withSentryAPI.test.ts
index 071bdda93952..f3b5bfded4a9 100644
--- a/packages/nextjs/test/edge/withSentryAPI.test.ts
+++ b/packages/nextjs/test/edge/withSentryAPI.test.ts
@@ -53,9 +53,6 @@ describe('wrapApiHandlerWithSentry', () => {
     expect(startSpanSpy).toHaveBeenCalledTimes(1);
     expect(startSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        metadata: {
-          request: { headers: {}, method: 'POST', url: 'https://sentry.io/' },
-        },
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs.withEdgeWrapping',
@@ -65,6 +62,10 @@ describe('wrapApiHandlerWithSentry', () => {
       }),
       expect.any(Function),
     );
+
+    expect(coreSdk.getIsolationScope().getScopeData().sdkProcessingMetadata).toEqual({
+      request: { headers: {}, method: 'POST', url: 'https://sentry.io/' },
+    });
   });
 
   it('should return a function that calls trace without throwing when no request is passed', async () => {
@@ -77,7 +78,6 @@ describe('wrapApiHandlerWithSentry', () => {
     expect(startSpanSpy).toHaveBeenCalledTimes(1);
     expect(startSpanSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        metadata: {},
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           [coreSdk.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.nextjs.withEdgeWrapping',
@@ -87,5 +87,7 @@ describe('wrapApiHandlerWithSentry', () => {
       }),
       expect.any(Function),
     );
+
+    expect(coreSdk.getIsolationScope().getScopeData().sdkProcessingMetadata).toEqual({});
   });
 });
diff --git a/packages/nextjs/test/integration/next.config.js b/packages/nextjs/test/integration/next.config.js
index 3f209311c332..815eba98e889 100644
--- a/packages/nextjs/test/integration/next.config.js
+++ b/packages/nextjs/test/integration/next.config.js
@@ -5,16 +5,9 @@ const moduleExports = {
     ignoreDuringBuilds: true,
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
-  },
-};
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
 };
 
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/next10.config.template b/packages/nextjs/test/integration/next10.config.template
index 6e55fa099a22..e01358c9e4d4 100644
--- a/packages/nextjs/test/integration/next10.config.template
+++ b/packages/nextjs/test/integration/next10.config.template
@@ -6,20 +6,9 @@ const moduleExports = {
     webpack5: %RUN_WEBPACK_5%,
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: [
-      '/api/excludedEndpoints/excludedWithString',
-      /\/api\/excludedEndpoints\/excludedWithRegExp/,
-    ],
-  },
-};
-
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
 };
 
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/next11.config.template b/packages/nextjs/test/integration/next11.config.template
index 28aaba18639a..5215e38a9e5b 100644
--- a/packages/nextjs/test/integration/next11.config.template
+++ b/packages/nextjs/test/integration/next11.config.template
@@ -7,20 +7,9 @@ const moduleExports = {
     ignoreDuringBuilds: true,
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: [
-      '/api/excludedEndpoints/excludedWithString',
-      /\/api\/excludedEndpoints\/excludedWithRegExp/,
-    ],
-  },
-};
-
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
 };
 
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/next12.config.template b/packages/nextjs/test/integration/next12.config.template
index 80b928629534..82fe205e279d 100644
--- a/packages/nextjs/test/integration/next12.config.template
+++ b/packages/nextjs/test/integration/next12.config.template
@@ -5,17 +5,9 @@ const moduleExports = async () => ({
     ignoreDuringBuilds: true,
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
-  },
 });
 
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
-};
-
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/next13.appdir.config.template b/packages/nextjs/test/integration/next13.appdir.config.template
index 4b17134ee1d7..e9e4e4e04b2e 100644
--- a/packages/nextjs/test/integration/next13.appdir.config.template
+++ b/packages/nextjs/test/integration/next13.appdir.config.template
@@ -8,18 +8,9 @@ const moduleExports = {
     appDir: Number(process.env.NODE_MAJOR) >= 16, // experimental.appDir requires Node v16.8.0 or later.
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
-  },
-};
-
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
 };
 
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
-
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/next13.config.template b/packages/nextjs/test/integration/next13.config.template
index e32ecec4b0f4..815eba98e889 100644
--- a/packages/nextjs/test/integration/next13.config.template
+++ b/packages/nextjs/test/integration/next13.config.template
@@ -5,18 +5,9 @@ const moduleExports = {
     ignoreDuringBuilds: true,
   },
   pageExtensions: ['jsx', 'js', 'tsx', 'ts', 'page.tsx'],
-  sentry: {
-    // Suppress the warning message from `handleSourcemapHidingOptionWarning` in `src/config/webpack.ts`
-    // TODO (v8): This can come out in v8, because this option will get a default value
-    hideSourceMaps: false,
-    excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
-  },
-};
-
-const SentryWebpackPluginOptions = {
-  dryRun: true,
-  silent: true,
 };
 
-module.exports = withSentryConfig(moduleExports, SentryWebpackPluginOptions);
-
+module.exports = withSentryConfig(moduleExports, {
+  debug: true,
+  excludeServerRoutes: ['/api/excludedEndpoints/excludedWithString', /\/api\/excludedEndpoints\/excludedWithRegExp/],
+});
diff --git a/packages/nextjs/test/integration/test/client/tracingClientGetInitialProps.test.ts b/packages/nextjs/test/integration/test/client/tracingClientGetInitialProps.test.ts
index ddacc8bbca91..3f6cad97fe00 100644
--- a/packages/nextjs/test/integration/test/client/tracingClientGetInitialProps.test.ts
+++ b/packages/nextjs/test/integration/test/client/tracingClientGetInitialProps.test.ts
@@ -1,9 +1,9 @@
 import { expect, test } from '@playwright/test';
-import { Transaction } from '@sentry/types';
+import { TransactionEvent } from '@sentry/types';
 import { countEnvelopes, getMultipleSentryEnvelopeRequests } from './utils/helpers';
 
 test('should instrument `getInitialProps` for performance tracing', async ({ page }) => {
-  const transaction = await getMultipleSentryEnvelopeRequests<Transaction>(page, 1, {
+  const transaction = await getMultipleSentryEnvelopeRequests<TransactionEvent>(page, 1, {
     url: '/42/withInitialProps',
     envelopeType: 'transaction',
   });
@@ -19,8 +19,7 @@ test('should instrument `getInitialProps` for performance tracing', async ({ pag
   const nextDataTag = await page.waitForSelector('#__NEXT_DATA__', { state: 'attached' });
   const nextDataTagValue = JSON.parse(await nextDataTag.evaluate(tag => (tag as HTMLElement).innerText));
 
-  // @ts-expect-error - We know `contexts` is defined in the Transaction envelope
-  const traceId = transaction[0].contexts.trace.trace_id;
+  const traceId = transaction[0].contexts?.trace?.trace_id;
 
   expect(traceId).toBeDefined();
 
diff --git a/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts b/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts
index 6a10c502ed83..434f12ecca22 100644
--- a/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts
+++ b/packages/nextjs/test/integration/test/client/tracingNavigate.test.ts
@@ -31,9 +31,7 @@ test('should report navigation transactions', async ({ page }) => {
     contexts: {
       trace: {
         op: 'navigation',
-        data: {
-          from: '/[id]/withInitialProps',
-        },
+        data: {},
       },
     },
   });
@@ -51,9 +49,7 @@ test('should report navigation transactions', async ({ page }) => {
     contexts: {
       trace: {
         op: 'navigation',
-        data: {
-          from: '/[id]/withServerSideProps',
-        },
+        data: {},
       },
     },
   });
diff --git a/packages/nextjs/test/integration/tsconfig.json b/packages/nextjs/test/integration/tsconfig.json
index a804126c855b..49a874193c18 100644
--- a/packages/nextjs/test/integration/tsconfig.json
+++ b/packages/nextjs/test/integration/tsconfig.json
@@ -24,7 +24,6 @@
         "name": "next"
       }
     ],
-    "incremental": true
   },
   "exclude": ["node_modules"],
   "include": ["**/*.ts", "**/*.tsx", "../../playwright.config.ts", ".next/types/**/*.ts"]
diff --git a/packages/nextjs/test/performance/appRouterInstrumentation.test.ts b/packages/nextjs/test/performance/appRouterInstrumentation.test.ts
index 077b68769b38..16992a498f83 100644
--- a/packages/nextjs/test/performance/appRouterInstrumentation.test.ts
+++ b/packages/nextjs/test/performance/appRouterInstrumentation.test.ts
@@ -1,9 +1,12 @@
 import { WINDOW } from '@sentry/react';
-import type { HandlerDataFetch } from '@sentry/types';
+import type { Client, HandlerDataFetch } from '@sentry/types';
 import * as sentryUtils from '@sentry/utils';
 import { JSDOM } from 'jsdom';
 
-import { appRouterInstrumentation } from '../../src/client/routing/appRouterRoutingInstrumentation';
+import {
+  appRouterInstrumentNavigation,
+  appRouterInstrumentPageLoad,
+} from '../../src/client/routing/appRouterRoutingInstrumentation';
 
 const addFetchInstrumentationHandlerSpy = jest.spyOn(sentryUtils, 'addFetchInstrumentationHandler');
 
@@ -17,7 +20,7 @@ function setUpPage(url: string) {
   Object.defineProperty(WINDOW, 'location', { value: dom.window.document.location, writable: true });
 }
 
-describe('appRouterInstrumentation', () => {
+describe('appRouterInstrumentPageLoad', () => {
   const originalGlobalDocument = WINDOW.document;
   const originalGlobalLocation = WINDOW.location;
 
@@ -29,11 +32,17 @@ describe('appRouterInstrumentation', () => {
 
   it('should create a pageload transactions with the current location name', () => {
     setUpPage('https://example.com/some/page?someParam=foobar');
-    const mockStartPageloadSpan = jest.fn();
-    const mockStartNavigationSpan = jest.fn();
 
-    appRouterInstrumentation(true, false, mockStartPageloadSpan, mockStartNavigationSpan);
-    expect(mockStartPageloadSpan).toHaveBeenCalledWith(
+    const emit = jest.fn();
+    const client = {
+      emit,
+    } as unknown as Client;
+
+    appRouterInstrumentPageLoad(client);
+
+    expect(emit).toHaveBeenCalledTimes(1);
+    expect(emit).toHaveBeenCalledWith(
+      'startPageLoadSpan',
       expect.objectContaining({
         name: '/some/page',
         attributes: {
@@ -42,17 +51,19 @@ describe('appRouterInstrumentation', () => {
           'sentry.source': 'url',
         },
       }),
+      undefined,
     );
   });
+});
 
-  it('should not create a pageload transaction when `startTransactionOnPageLoad` is false', () => {
-    setUpPage('https://example.com/some/page?someParam=foobar');
-    const startTransactionCallbackFn = jest.fn();
-    const mockStartPageloadSpan = jest.fn();
-    const mockStartNavigationSpan = jest.fn();
+describe('appRouterInstrumentNavigation', () => {
+  const originalGlobalDocument = WINDOW.document;
+  const originalGlobalLocation = WINDOW.location;
 
-    appRouterInstrumentation(false, false, mockStartPageloadSpan, mockStartNavigationSpan);
-    expect(startTransactionCallbackFn).not.toHaveBeenCalled();
+  afterEach(() => {
+    // Clean up JSDom
+    Object.defineProperty(WINDOW, 'document', { value: originalGlobalDocument });
+    Object.defineProperty(WINDOW, 'location', { value: originalGlobalLocation });
   });
 
   it('should create a navigation transactions when a navigation RSC request is sent', () => {
@@ -63,10 +74,12 @@ describe('appRouterInstrumentation', () => {
       fetchInstrumentationHandlerCallback = callback;
     });
 
-    const mockStartPageloadSpan = jest.fn();
-    const mockStartNavigationSpan = jest.fn();
+    const emit = jest.fn();
+    const client = {
+      emit,
+    } as unknown as Client;
 
-    appRouterInstrumentation(false, true, mockStartPageloadSpan, mockStartNavigationSpan);
+    appRouterInstrumentNavigation(client);
 
     fetchInstrumentationHandlerCallback!({
       args: [
@@ -81,10 +94,10 @@ describe('appRouterInstrumentation', () => {
       startTimestamp: 1337,
     });
 
-    expect(mockStartNavigationSpan).toHaveBeenCalledWith({
+    expect(emit).toHaveBeenCalledTimes(1);
+    expect(emit).toHaveBeenCalledWith('startNavigationSpan', {
       name: '/some/server/component/page',
       attributes: {
-        from: '/some/server/component/page',
         'sentry.op': 'navigation',
         'sentry.origin': 'auto.navigation.nextjs.app_router_instrumentation',
         'sentry.source': 'url',
@@ -147,26 +160,15 @@ describe('appRouterInstrumentation', () => {
         fetchInstrumentationHandlerCallback = callback;
       });
 
-      const startTransactionCallbackFn = jest.fn();
-      const mockStartPageloadSpan = jest.fn();
-      const mockStartNavigationSpan = jest.fn();
+      const emit = jest.fn();
+      const client = {
+        emit,
+      } as unknown as Client;
 
-      appRouterInstrumentation(false, true, mockStartPageloadSpan, mockStartNavigationSpan);
+      appRouterInstrumentNavigation(client);
       fetchInstrumentationHandlerCallback!(fetchCallbackData);
-      expect(startTransactionCallbackFn).not.toHaveBeenCalled();
-      expect(mockStartNavigationSpan).not.toHaveBeenCalled();
+
+      expect(emit).toHaveBeenCalledTimes(0);
     },
   );
-
-  it('should not create navigation transactions when `startTransactionOnLocationChange` is false', () => {
-    setUpPage('https://example.com/some/page?someParam=foobar');
-    const addFetchInstrumentationHandlerImpl = jest.fn();
-    const mockStartPageloadSpan = jest.fn();
-    const mockStartNavigationSpan = jest.fn();
-
-    addFetchInstrumentationHandlerSpy.mockImplementationOnce(addFetchInstrumentationHandlerImpl);
-    appRouterInstrumentation(false, false, mockStartPageloadSpan, mockStartNavigationSpan);
-    expect(addFetchInstrumentationHandlerImpl).not.toHaveBeenCalled();
-    expect(mockStartNavigationSpan).not.toHaveBeenCalled();
-  });
 });
diff --git a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
index aaf7a7417c15..7ca1f01ff8d6 100644
--- a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
+++ b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
@@ -1,9 +1,13 @@
 import { WINDOW } from '@sentry/react';
+import type { Client } from '@sentry/types';
 import { JSDOM } from 'jsdom';
 import type { NEXT_DATA as NextData } from 'next/dist/next-server/lib/utils';
-import { default as Router } from 'next/router';
+import Router from 'next/router';
 
-import { pagesRouterInstrumentation } from '../../src/client/routing/pagesRouterRoutingInstrumentation';
+import {
+  pagesRouterInstrumentNavigation,
+  pagesRouterInstrumentPageLoad,
+} from '../../src/client/routing/pagesRouterRoutingInstrumentation';
 
 const globalObject = WINDOW as typeof WINDOW & {
   __BUILD_MANIFEST?: {
@@ -44,7 +48,7 @@ jest.mock('next/router', () => {
   };
 });
 
-describe('pagesRouterInstrumentation', () => {
+describe('pagesRouterInstrumentPageLoad', () => {
   const originalGlobalDocument = WINDOW.document;
   const originalGlobalLocation = WINDOW.location;
 
@@ -106,169 +110,229 @@ describe('pagesRouterInstrumentation', () => {
     jest.clearAllMocks();
   });
 
-  describe('pageload transactions', () => {
-    it.each([
-      [
-        'https://example.com/lforst/posts/1337?q=42',
-        '/[user]/posts/[id]',
-        { user: 'lforst', id: '1337', q: '42' },
-        {
-          pageProps: {
-            _sentryTraceData: 'c82b8554881b4d28ad977de04a4fb40a-a755953cd3394d5f-1',
-            _sentryBaggage: 'other=vendor,foo=bar,third=party,last=item,sentry-release=2.1.0,sentry-environment=myEnv',
-          },
+  it.each([
+    [
+      'https://example.com/lforst/posts/1337?q=42',
+      '/[user]/posts/[id]',
+      { user: 'lforst', id: '1337', q: '42' },
+      {
+        pageProps: {
+          _sentryTraceData: 'c82b8554881b4d28ad977de04a4fb40a-a755953cd3394d5f-1',
+          _sentryBaggage: 'other=vendor,foo=bar,third=party,last=item,sentry-release=2.1.0,sentry-environment=myEnv',
         },
-        true,
-        {
-          name: '/[user]/posts/[id]',
-          attributes: {
-            'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
-            'sentry.source': 'route',
-          },
+      },
+      true,
+      {
+        name: '/[user]/posts/[id]',
+        attributes: {
+          'sentry.op': 'pageload',
+          'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
+          'sentry.source': 'route',
         },
-      ],
-      [
-        'https://example.com/some-page',
-        '/some-page',
-        {},
-        {
-          pageProps: {
-            _sentryTraceData: 'c82b8554881b4d28ad977de04a4fb40a-a755953cd3394d5f-1',
-            _sentryBaggage: 'other=vendor,foo=bar,third=party,last=item,sentry-release=2.1.0,sentry-environment=myEnv',
-          },
+      },
+    ],
+    [
+      'https://example.com/some-page',
+      '/some-page',
+      {},
+      {
+        pageProps: {
+          _sentryTraceData: 'c82b8554881b4d28ad977de04a4fb40a-a755953cd3394d5f-1',
+          _sentryBaggage: 'other=vendor,foo=bar,third=party,last=item,sentry-release=2.1.0,sentry-environment=myEnv',
         },
-        true,
-        {
-          name: '/some-page',
-          attributes: {
-            'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
-            'sentry.source': 'route',
-          },
+      },
+      true,
+      {
+        name: '/some-page',
+        attributes: {
+          'sentry.op': 'pageload',
+          'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
+          'sentry.source': 'route',
         },
-      ],
-      [
-        'https://example.com/',
-        '/',
-        {},
-        {},
-        true,
-        {
-          name: '/',
-          attributes: {
-            'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
-            'sentry.source': 'route',
-          },
+      },
+    ],
+    [
+      'https://example.com/',
+      '/',
+      {},
+      {},
+      true,
+      {
+        name: '/',
+        attributes: {
+          'sentry.op': 'pageload',
+          'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
+          'sentry.source': 'route',
+        },
+      },
+    ],
+    [
+      'https://example.com/lforst/posts/1337?q=42',
+      '/',
+      {},
+      {},
+      false, // no __NEXT_DATA__ tag
+      {
+        name: '/lforst/posts/1337',
+        attributes: {
+          'sentry.op': 'pageload',
+          'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
+          'sentry.source': 'url',
         },
-      ],
-      [
-        'https://example.com/lforst/posts/1337?q=42',
-        '/',
-        {},
-        {},
-        false, // no __NEXT_DATA__ tag
+      },
+    ],
+  ])(
+    'creates a pageload transaction (#%#)',
+    (url, route, query, props, hasNextData, expectedStartTransactionArgument) => {
+      setUpNextPage({ url, route, query, props, hasNextData });
+
+      const emit = jest.fn();
+      const client = {
+        emit,
+        getOptions: () => ({}),
+      } as unknown as Client;
+
+      pagesRouterInstrumentPageLoad(client);
+
+      const sentryTrace = (props as any).pageProps?._sentryTraceData;
+      const baggage = (props as any).pageProps?._sentryBaggage;
+
+      expect(emit).toHaveBeenCalledTimes(1);
+      expect(emit).toHaveBeenCalledWith(
+        'startPageLoadSpan',
+        expect.objectContaining(expectedStartTransactionArgument),
         {
-          name: '/lforst/posts/1337',
-          attributes: {
-            'sentry.op': 'pageload',
-            'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
-            'sentry.source': 'url',
-          },
+          sentryTrace,
+          baggage,
         },
-      ],
-    ])(
-      'creates a pageload transaction (#%#)',
-      (url, route, query, props, hasNextData, expectedStartTransactionArgument) => {
-        const mockStartPageloadSpan = jest.fn();
-        const mockStartNavigationSpan = jest.fn();
+      );
+    },
+  );
+});
 
-        setUpNextPage({ url, route, query, props, hasNextData });
-        pagesRouterInstrumentation(true, true, mockStartPageloadSpan, mockStartNavigationSpan);
+describe('pagesRouterInstrumentNavigation', () => {
+  const originalGlobalDocument = WINDOW.document;
+  const originalGlobalLocation = WINDOW.location;
 
-        expect(mockStartPageloadSpan).toHaveBeenCalledWith(expect.objectContaining(expectedStartTransactionArgument));
-      },
-    );
-  });
+  function setUpNextPage(pageProperties: {
+    url: string;
+    route: string;
+    query?: any;
+    props?: any;
+    navigatableRoutes?: string[];
+    hasNextData: boolean;
+  }) {
+    const nextDataContent: NextData = {
+      props: pageProperties.props,
+      page: pageProperties.route,
+      query: pageProperties.query,
+      buildId: 'y76hvndNJBAithejdVGLW',
+      isFallback: false,
+      gssp: true,
+      appGip: true,
+      scriptLoader: [],
+    };
 
-  describe('new navigation transactions', () => {
-    it.each([
-      ['/news', '/news', 'route'],
-      ['/news/', '/news', 'route'],
-      ['/some-route-that-is-not-defined-12332', '/some-route-that-is-not-defined-12332', 'url'], // unknown route
-      ['/some-route-that-is-not-defined-12332?q=42', '/some-route-that-is-not-defined-12332', 'url'], // unknown route w/ query param
-      ['/posts/42', '/posts/[id]', 'route'],
-      ['/posts/42/', '/posts/[id]', 'route'],
-      ['/posts/42?someParam=1', '/posts/[id]', 'route'], // query params are ignored
-      ['/posts/42/details', '/posts/[id]/details', 'route'],
-      ['/users/1337/friends/closeby/good', '/users/[id]/friends/[...filters]', 'route'],
-      ['/users/1337/friends', '/users/1337/friends', 'url'],
-      ['/statistics/page-visits', '/statistics/[[...parameters]]', 'route'],
-      ['/statistics', '/statistics/[[...parameters]]', 'route'],
-      ['/a/b/c/d', '/[a]/b/[c]/[...d]', 'route'],
-      ['/a/b/c/d/e', '/[a]/b/[c]/[...d]', 'route'],
-      ['/a/b/c', '/a/b/c', 'url'],
-      ['/e/f/g/h', '/e/[f]/[g]/[[...h]]', 'route'],
-      ['/e/f/g/h/i', '/e/[f]/[g]/[[...h]]', 'route'],
-      ['/e/f/g', '/e/[f]/[g]/[[...h]]', 'route'],
-    ])(
-      'should create a parameterized transaction on route change (%s)',
-      (targetLocation, expectedTransactionName, expectedTransactionSource) => {
-        const mockStartPageloadSpan = jest.fn();
-        const mockStartNavigationSpan = jest.fn();
-
-        setUpNextPage({
-          url: 'https://example.com/home',
-          route: '/home',
-          hasNextData: true,
-          navigatableRoutes: [
-            '/home',
-            '/news',
-            '/posts/[id]',
-            '/posts/[id]/details',
-            '/users/[id]/friends/[...filters]',
-            '/statistics/[[...parameters]]',
-            // just some complicated routes to see if we get the matching right
-            '/[a]/b/[c]/[...d]',
-            '/e/[f]/[g]/[[...h]]',
-          ],
-        });
-
-        pagesRouterInstrumentation(false, true, mockStartPageloadSpan, mockStartNavigationSpan);
-
-        Router.events.emit('routeChangeStart', targetLocation);
-
-        expect(mockStartNavigationSpan).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name: expectedTransactionName,
-            attributes: {
-              from: '/home',
-              'sentry.op': 'navigation',
-              'sentry.origin': 'auto.navigation.nextjs.pages_router_instrumentation',
-              'sentry.source': expectedTransactionSource,
-            },
-          }),
-        );
-      },
+    const dom = new JSDOM(
+      // Just an example of what a __NEXT_DATA__ tag might look like
+      pageProperties.hasNextData
+        ? `<body><script id="__NEXT_DATA__" type="application/json">${JSON.stringify(nextDataContent)}</script></body>`
+        : '<body><h1>No next data :(</h1></body>',
+      { url: pageProperties.url },
     );
 
-    it('should not create transaction when navigation transactions are disabled', () => {
-      const mockStartPageloadSpan = jest.fn();
-      const mockStartNavigationSpan = jest.fn();
+    // The Next.js routing instrumentations requires a few things to be present on pageload:
+    // 1. Access to window.document API for `window.document.getElementById`
+    // 2. Access to window.location API for `window.location.pathname`
+    Object.defineProperty(WINDOW, 'document', { value: dom.window.document, writable: true });
+    Object.defineProperty(WINDOW, 'location', { value: dom.window.document.location, writable: true });
+
+    // Define Next.js clientside build manifest with navigatable routes
+    globalObject.__BUILD_MANIFEST = {
+      ...globalObject.__BUILD_MANIFEST,
+      sortedPages: pageProperties.navigatableRoutes as string[],
+    };
+  }
 
+  afterEach(() => {
+    // Clean up JSDom
+    Object.defineProperty(WINDOW, 'document', { value: originalGlobalDocument });
+    Object.defineProperty(WINDOW, 'location', { value: originalGlobalLocation });
+
+    // Reset Next.js' __BUILD_MANIFEST
+    globalObject.__BUILD_MANIFEST = originalBuildManifest;
+    if (globalObject.__BUILD_MANIFEST) {
+      globalObject.__BUILD_MANIFEST.sortedPages = originalBuildManifestRoutes as string[];
+    }
+
+    // Clear all event handlers
+    eventHandlers = {};
+
+    // Necessary to clear all Router.events.off() mock call numbers
+    jest.clearAllMocks();
+  });
+
+  it.each([
+    ['/news', '/news', 'route'],
+    ['/news/', '/news', 'route'],
+    ['/some-route-that-is-not-defined-12332', '/some-route-that-is-not-defined-12332', 'url'], // unknown route
+    ['/some-route-that-is-not-defined-12332?q=42', '/some-route-that-is-not-defined-12332', 'url'], // unknown route w/ query param
+    ['/posts/42', '/posts/[id]', 'route'],
+    ['/posts/42/', '/posts/[id]', 'route'],
+    ['/posts/42?someParam=1', '/posts/[id]', 'route'], // query params are ignored
+    ['/posts/42/details', '/posts/[id]/details', 'route'],
+    ['/users/1337/friends/closeby/good', '/users/[id]/friends/[...filters]', 'route'],
+    ['/users/1337/friends', '/users/1337/friends', 'url'],
+    ['/statistics/page-visits', '/statistics/[[...parameters]]', 'route'],
+    ['/statistics', '/statistics/[[...parameters]]', 'route'],
+    ['/a/b/c/d', '/[a]/b/[c]/[...d]', 'route'],
+    ['/a/b/c/d/e', '/[a]/b/[c]/[...d]', 'route'],
+    ['/a/b/c', '/a/b/c', 'url'],
+    ['/e/f/g/h', '/e/[f]/[g]/[[...h]]', 'route'],
+    ['/e/f/g/h/i', '/e/[f]/[g]/[[...h]]', 'route'],
+    ['/e/f/g', '/e/[f]/[g]/[[...h]]', 'route'],
+  ])(
+    'should create a parameterized transaction on route change (%s)',
+    (targetLocation, expectedTransactionName, expectedTransactionSource) => {
       setUpNextPage({
         url: 'https://example.com/home',
         route: '/home',
         hasNextData: true,
-        navigatableRoutes: ['/home', '/posts/[id]'],
+        navigatableRoutes: [
+          '/home',
+          '/news',
+          '/posts/[id]',
+          '/posts/[id]/details',
+          '/users/[id]/friends/[...filters]',
+          '/statistics/[[...parameters]]',
+          // just some complicated routes to see if we get the matching right
+          '/[a]/b/[c]/[...d]',
+          '/e/[f]/[g]/[[...h]]',
+        ],
       });
 
-      pagesRouterInstrumentation(false, false, mockStartPageloadSpan, mockStartNavigationSpan);
+      const emit = jest.fn();
+      const client = {
+        emit,
+        getOptions: () => ({}),
+      } as unknown as Client;
 
-      Router.events.emit('routeChangeStart', '/posts/42');
+      pagesRouterInstrumentNavigation(client);
 
-      expect(mockStartNavigationSpan).not.toHaveBeenCalled();
-    });
-  });
+      Router.events.emit('routeChangeStart', targetLocation);
+
+      expect(emit).toHaveBeenCalledTimes(1);
+      expect(emit).toHaveBeenCalledWith(
+        'startNavigationSpan',
+        expect.objectContaining({
+          name: expectedTransactionName,
+          attributes: {
+            'sentry.op': 'navigation',
+            'sentry.origin': 'auto.navigation.nextjs.pages_router_instrumentation',
+            'sentry.source': expectedTransactionSource,
+          },
+        }),
+      );
+    },
+  );
 });
diff --git a/packages/nextjs/test/run-integration-tests.sh b/packages/nextjs/test/run-integration-tests.sh
index 79adf0016075..2522b05f6acb 100755
--- a/packages/nextjs/test/run-integration-tests.sh
+++ b/packages/nextjs/test/run-integration-tests.sh
@@ -68,9 +68,15 @@ for NEXTJS_VERSION in 10 11 12 13; do
     if [ "$NEXTJS_VERSION" -eq "13" ]; then
       npm i --save react@18.2.0 react-dom@18.2.0
     fi
-    # We have to use `--ignore-engines` because sucrase claims to need Node 12, even though tests pass just fine on Node
-    # 10
-    yarn --no-lockfile --ignore-engines --silent >/dev/null 2>&1
+
+    # Yarn install randomly started failing because it couldn't find some cache  so for now we need to run these two commands which seem to fix it.
+    # It was pretty much this issue: https://github.com/yarnpkg/yarn/issues/5275
+    rm -rf node_modules
+    yarn cache clean
+
+    # We have to use `--ignore-engines` because sucrase claims to need Node 12, even though tests pass just fine on Node 10
+    yarn --no-lockfile --ignore-engines
+
     # if applicable, use local versions of `@sentry/cli` and/or `@sentry/webpack-plugin` (these commands no-op unless
     # LINKED_CLI_REPO and/or LINKED_PLUGIN_REPO are set)
     linkcli && linkplugin
@@ -125,13 +131,6 @@ for NEXTJS_VERSION in 10 11 12 13; do
       echo "[nextjs@$NEXTJS_VERSION | webpack@$WEBPACK_VERSION] Building..."
       yarn build
 
-      # if the user hasn't passed any args, use the default one, which restricts each test to only outputting success and
-      # failure messages
-      args=$*
-      if [[ ! $args ]]; then
-        args="--silent"
-      fi
-
       # we keep this updated as we run the tests, so that if it's ever non-zero, we can bail
       EXIT_CODE=0
 
diff --git a/packages/nextjs/test/types/next.config.ts b/packages/nextjs/test/types/next.config.ts
index 36e50a276125..74ea16a946db 100644
--- a/packages/nextjs/test/types/next.config.ts
+++ b/packages/nextjs/test/types/next.config.ts
@@ -13,6 +13,4 @@ const config: NextConfig = {
   }),
 };
 
-module.exports = withSentryConfig(config, {
-  validate: true,
-});
+module.exports = withSentryConfig(config);
diff --git a/packages/nextjs/test/utils/tunnelRoute.test.ts b/packages/nextjs/test/utils/tunnelRoute.test.ts
index 62b2fb28cf9c..576898c061b2 100644
--- a/packages/nextjs/test/utils/tunnelRoute.test.ts
+++ b/packages/nextjs/test/utils/tunnelRoute.test.ts
@@ -64,4 +64,15 @@ describe('applyTunnelRouteOption()', () => {
 
     expect(options.tunnel).toBeUndefined();
   });
+
+  it('Correctly applies `tunnelRoute` option to region DSNs', () => {
+    globalWithInjectedValues.__sentryRewritesTunnelPath__ = '/my-error-monitoring-route';
+    const options: any = {
+      dsn: 'https://11111111111111111111111111111111@o2222222.ingest.us.sentry.io/3333333',
+    } as BrowserOptions;
+
+    applyTunnelRouteOption(options);
+
+    expect(options.tunnel).toBe('/my-error-monitoring-route?o=2222222&p=3333333&r=us');
+  });
 });
diff --git a/packages/nextjs/vercel/instructions.md b/packages/nextjs/vercel/instructions.md
index 90e074968a90..6a1890494ffc 100644
--- a/packages/nextjs/vercel/instructions.md
+++ b/packages/nextjs/vercel/instructions.md
@@ -12,7 +12,7 @@ repo, only a full repo itself. Since we run a monorepo, this won't work in our c
 
 From `packages/nextjs`, run
 
-  `yarn vercel:branch`.
+`yarn vercel:branch`.
 
 This will delete unneeded packages (angular, vue, etc) in order to speed up deployment. It will then commit that change.
 When your branch is ready to PR, just rebase and drop that commit.
@@ -24,7 +24,7 @@ want to test are pushed to GitHub.
 
 From `packages/nextjs`, run
 
-  `yarn vercel:project <path/to/testapp>`.
+`yarn vercel:project <path/to/testapp>`.
 
 This will copy the `install-sentry-from-branch.sh` script into a `.sentry` folder at the root level of your test app,
 and create a `set-branch-name.sh` script in the same location. (The first script is the one you'll run on Vercel. The
@@ -33,11 +33,11 @@ commit (but not push) this change.
 
 Go into your project settings on Vercel and change the install command to
 
-  `bash .sentry/install-sentry-from-branch.sh`
+`bash .sentry/install-sentry-from-branch.sh`
 
 and the build command to
 
-  `yarn build && bash .sentry/post-app-build.sh`.
+`yarn build && bash .sentry/post-app-build.sh`.
 
 If you're using bundle analyzer, the post-build script will move the visualizations it creates so that they're available
 on your deployed site at `/client.html` and `/server.html`.
diff --git a/packages/node-experimental/.eslintrc.js b/packages/node-experimental/.eslintrc.js
index bec6469d0e28..9d915d4f4c3b 100644
--- a/packages/node-experimental/.eslintrc.js
+++ b/packages/node-experimental/.eslintrc.js
@@ -6,7 +6,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/node-experimental/README.md b/packages/node-experimental/README.md
index 715359fc55f8..324700199b53 100644
--- a/packages/node-experimental/README.md
+++ b/packages/node-experimental/README.md
@@ -4,36 +4,28 @@
   </a>
 </p>
 
-# Official Sentry SDK for Node (EXPERIMENTAL)
+# Official Sentry SDK for Node
 
-[![npm version](https://img.shields.io/npm/v/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
-[![npm dm](https://img.shields.io/npm/dm/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
-[![npm dt](https://img.shields.io/npm/dt/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
-
-This is a WIP, proof of concept implementation of a Node SDK that uses OpenTelemetry for performance instrumentation under the hood.
-
-THIS MAY/WILL BREAK IN MANY UNEXPECTED WAYS. We may remove, add, change any of the integrations, add/remove any exports, etc.
-This package is **NOT READY TO USE IN ANY FORM OF PRODUCTION ENVIRONMENT**!
-
-This SDK is **considered experimental and in an alpha state**. It may experience breaking changes, and may be discontinued at any time. Please reach out on
-[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback/concerns.
+[![npm version](https://img.shields.io/npm/v/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
+[![npm dm](https://img.shields.io/npm/dm/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
+[![npm dt](https://img.shields.io/npm/dt/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
 
 ## Installation
 
 ```bash
-npm install @sentry/node-experimental
+npm install @sentry/node
 
 # Or yarn
-yarn add @sentry/node-experimental
+yarn add @sentry/node
 ```
 
 ## Usage
 
 ```js
 // CJS Syntax
-const Sentry = require('@sentry/node-experimental');
+const Sentry = require('@sentry/node');
 // ESM Syntax
-import * as Sentry from '@sentry/node-experimental';
+import * as Sentry from '@sentry/node';
 
 Sentry.init({
   dsn: '__DSN__',
@@ -43,65 +35,12 @@ Sentry.init({
 
 Note that it is necessary to initialize Sentry **before you import any package that may be instrumented by us**.
 
-## Status of this Experiment
-
-Currently, this SDK:
-
-* Will capture errors (same as @sentry/node)
-* Auto-instrument for performance - see below for which performance integrations are available.
-* Provide _some_ manual instrumentation APIs
-* Sync OpenTelemetry Context with our Sentry Hub/Scope
-
-### Manual Instrumentation
-
-You can manual instrument using the following APIs:
-
-```js
-const Sentry = require('@sentry/node-experimental');
-
-Sentry.startSpan({ description: 'outer' }, function (span) {
-  span.setData(customData);
-  doSomethingSlow();
-  Sentry.startSpan({ description: 'inner' }, function() {
-    // inner span is a child of outer span
-    doSomethingVerySlow();
-    // inner span is auto-ended when this callback ends
-  });
-  // outer span is auto-ended when this callback ends
-});
-```
-
-You can also create spans without marking them as the active span.
-Note that for most scenarios, we recommend the `startSpan` syntax.
-
-```js
-const Sentry = require('@sentry/node-experimental');
-
-// This will _not_ be put on the scope/set as active, so no other spans will be attached to it
-const span = Sentry.startInactiveSpan({ description: 'non-active span' });
-
-doSomethingSlow();
-
-span.end();
-```
-
-Finally you can also get the currently active span, if you need to do more with it:
-
-```js
-const Sentry = require('@sentry/node-experimental');
-const span = Sentry.getActiveSpan();
-```
-
-### Async Context
-
-We leverage the OpenTelemetry context forking in order to ensure isolation of parallel requests.
-This means that as long as you are using an OpenTelemetry instrumentation for your framework of choice
-(currently: Express or Fastify), you do not need to setup any `requestHandler` or similar.
+[More information on how to set up Sentry for Node in v8.](./../../docs/v8-node.md)
 
 ### ESM Support
 
-Due to the way OpenTelemetry handles instrumentation, this only works out of the box for CommonJS (`require`) applications.
-
+Due to the way OpenTelemetry handles instrumentation, this only works out of the box for CommonJS (`require`)
+applications.
 
 There is experimental support for running OpenTelemetry with ESM (`"type": "module"`):
 
@@ -111,27 +50,9 @@ node --experimental-loader=@opentelemetry/instrumentation/hook.mjs ./app.js
 
 You'll need to install `@opentelemetry/instrumentation` in your app to ensure this works.
 
-See [OpenTelemetry Instrumentation Docs](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation#instrumentation-for-es-modules-in-nodejs-experimental) for details on this -
-but note that this is a) experimental, and b) does not work with all integrations.
-
-
-## Available (Performance) Integrations
-
-* Http
-* Express
-* Fastify
-* Nest
-* Mysql
-* Mysql2
-* GraphQL
-* Mongo
-* Mongoose
-* Postgres
-* Prisma
-
-All of these are auto-discovered, you don't need to configure anything for performance.
-You still need to register middlewares etc. for error capturing.
-Other, non-performance integrations from `@sentry/node` are also available (except for Undici).
+See
+[OpenTelemetry Instrumentation Docs](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation#instrumentation-for-es-modules-in-nodejs-experimental)
+for details on this - but note that this is a) experimental, and b) does not work with all integrations.
 
 ## Links
 
diff --git a/packages/node-experimental/package.json b/packages/node-experimental/package.json
index d3a13592ed95..ed227381c4d6 100644
--- a/packages/node-experimental/package.json
+++ b/packages/node-experimental/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
@@ -52,7 +65,9 @@
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/opentelemetry": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
-    "@sentry/utils": "8.0.0-alpha.2",
+    "@sentry/utils": "8.0.0-alpha.2"
+  },
+  "devDependencies": {
     "@types/node": "14.18.63"
   },
   "optionalDependencies": {
diff --git a/packages/node-experimental/rollup.anr-worker.config.mjs b/packages/node-experimental/rollup.anr-worker.config.mjs
index 9887342c63fd..bd3c1d4b825c 100644
--- a/packages/node-experimental/rollup.anr-worker.config.mjs
+++ b/packages/node-experimental/rollup.anr-worker.config.mjs
@@ -1,35 +1,31 @@
 import { makeBaseBundleConfig } from '@sentry-internal/rollup-utils';
 
-function createAnrWorkerConfig(destDir, esm) {
-  return makeBaseBundleConfig({
-    bundleType: 'node-worker',
-    entrypoints: ['src/integrations/anr/worker.ts'],
-    jsVersion: 'es6',
-    licenseTitle: '@sentry/node',
-    outputFileBase: () => 'worker-script.js',
-    packageSpecificConfig: {
-      output: {
-        dir: destDir,
-        sourcemap: false,
-      },
-      plugins: [
-        {
-          name: 'output-base64-worker-script',
-          renderChunk(code) {
-            const base64Code = Buffer.from(code).toString('base64');
-            if (esm) {
-              return `export const base64WorkerScript = '${base64Code}';`;
-            } else {
-              return `exports.base64WorkerScript = '${base64Code}';`;
-            }
-          },
+export function createAnrWorkerCode() {
+  let base64Code;
+
+  return {
+    workerRollupConfig: makeBaseBundleConfig({
+      bundleType: 'node-worker',
+      entrypoints: ['src/integrations/anr/worker.ts'],
+      licenseTitle: '@sentry/node',
+      outputFileBase: () => 'worker-script.js',
+      packageSpecificConfig: {
+        output: {
+          dir: 'build/esm/integrations/anr',
+          sourcemap: false,
         },
-      ],
+        plugins: [
+          {
+            name: 'output-base64-worker-script',
+            renderChunk(code) {
+              base64Code = Buffer.from(code).toString('base64');
+            },
+          },
+        ],
+      },
+    }),
+    getBase64Code() {
+      return base64Code;
     },
-  });
+  };
 }
-
-export const anrWorkerConfigs = [
-  createAnrWorkerConfig('build/esm/integrations/anr', true),
-  createAnrWorkerConfig('build/cjs/integrations/anr', false),
-];
diff --git a/packages/node-experimental/rollup.npm.config.mjs b/packages/node-experimental/rollup.npm.config.mjs
index 88c90de4825f..17c0727d7eff 100644
--- a/packages/node-experimental/rollup.npm.config.mjs
+++ b/packages/node-experimental/rollup.npm.config.mjs
@@ -1,8 +1,32 @@
+import replace from '@rollup/plugin-replace';
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
-import { anrWorkerConfigs } from './rollup.anr-worker.config.mjs';
+import { createAnrWorkerCode } from './rollup.anr-worker.config.mjs';
+
+const { workerRollupConfig, getBase64Code } = createAnrWorkerCode();
 
 export default [
-  ...makeNPMConfigVariants(makeBaseNPMConfig()),
-  // The ANR worker builds must come after the main build because they overwrite the worker-script.js file
-  ...anrWorkerConfigs,
+  // The worker needs to be built first since it's output is used in the main bundle.
+  workerRollupConfig,
+  ...makeNPMConfigVariants(
+    makeBaseNPMConfig({
+      packageSpecificConfig: {
+        output: {
+          // set exports to 'named' or 'auto' so that rollup doesn't warn
+          exports: 'named',
+          // set preserveModules to false because we want to bundle everything into one file.
+          preserveModules: false,
+        },
+        plugins: [
+          replace({
+            delimiters: ['###', '###'],
+            // removes some webpack warnings
+            preventAssignment: true,
+            values: {
+              base64WorkerScript: () => getBase64Code(),
+            },
+          }),
+        ],
+      },
+    }),
+  ),
 ];
diff --git a/packages/node-experimental/src/index.ts b/packages/node-experimental/src/index.ts
index 9f0712cac96a..a8d511702189 100644
--- a/packages/node-experimental/src/index.ts
+++ b/packages/node-experimental/src/index.ts
@@ -11,7 +11,7 @@ export { onUnhandledRejectionIntegration } from './integrations/onunhandledrejec
 export { anrIntegration } from './integrations/anr';
 
 export { expressIntegration, expressErrorHandler, setupExpressErrorHandler } from './integrations/tracing/express';
-export { fastifyIntegration } from './integrations/tracing/fastify';
+export { fastifyIntegration, setupFastifyErrorHandler } from './integrations/tracing/fastify';
 export { graphqlIntegration } from './integrations/tracing/graphql';
 export { mongoIntegration } from './integrations/tracing/mongo';
 export { mongooseIntegration } from './integrations/tracing/mongoose';
@@ -21,6 +21,7 @@ export { nestIntegration } from './integrations/tracing/nest';
 export { postgresIntegration } from './integrations/tracing/postgres';
 export { prismaIntegration } from './integrations/tracing/prisma';
 export { hapiIntegration, setupHapiErrorHandler } from './integrations/tracing/hapi';
+export { spotlightIntegration } from './integrations/spotlight';
 
 export { init, getDefaultIntegrations } from './sdk/init';
 export { getAutoPerformanceIntegrations } from './integrations/tracing';
@@ -38,15 +39,7 @@ export { NodeClient } from './sdk/client';
 export { getCurrentHub } from './sdk/hub';
 export { cron } from './cron';
 
-export type { Span, NodeOptions } from './types';
-
-export {
-  startSpan,
-  startSpanManual,
-  startInactiveSpan,
-  getActiveSpan,
-  withActiveSpan,
-} from '@sentry/opentelemetry';
+export type { NodeOptions } from './types';
 
 export {
   addRequestDataToEvent,
@@ -54,6 +47,10 @@ export {
   extractRequestData,
 } from '@sentry/utils';
 
+// These are custom variants that need to be used instead of the core one
+// As they have slightly different implementations
+export { continueTrace } from '@sentry/opentelemetry';
+
 export {
   addBreadcrumb,
   isInitialized,
@@ -85,7 +82,7 @@ export {
   setCurrentClient,
   Scope,
   setMeasurement,
-  continueTrace,
+  getSpanDescendants,
   parameterize,
   getCurrentScope,
   getIsolationScope,
@@ -100,6 +97,17 @@ export {
   extraErrorDataIntegration,
   rewriteFramesIntegration,
   sessionTimingIntegration,
+  metricsDefault as metrics,
+  startSession,
+  captureSession,
+  endSession,
+  addIntegration,
+  startSpan,
+  startSpanManual,
+  startInactiveSpan,
+  getActiveSpan,
+  withActiveSpan,
+  getRootSpan,
 } from '@sentry/core';
 
 export type {
@@ -118,4 +126,5 @@ export type {
   Thread,
   Transaction,
   User,
+  Span,
 } from '@sentry/types';
diff --git a/packages/node-experimental/src/integrations/anr/worker-script.ts b/packages/node-experimental/src/integrations/anr/worker-script.ts
index 16394eaacfe1..c70323e0fc50 100644
--- a/packages/node-experimental/src/integrations/anr/worker-script.ts
+++ b/packages/node-experimental/src/integrations/anr/worker-script.ts
@@ -1,2 +1,2 @@
-// This file is a placeholder that gets overwritten in the build directory.
-export const base64WorkerScript = '';
+// This string is a placeholder that gets overwritten with the worker code.
+export const base64WorkerScript = '###base64WorkerScript###';
diff --git a/packages/node-experimental/src/integrations/http.ts b/packages/node-experimental/src/integrations/http.ts
index 0c53a0c7e889..ed93ebacdaa5 100644
--- a/packages/node-experimental/src/integrations/http.ts
+++ b/packages/node-experimental/src/integrations/http.ts
@@ -1,11 +1,11 @@
-import type { ClientRequest, ServerResponse } from 'http';
+import type { ServerResponse } from 'http';
 import type { Span } from '@opentelemetry/api';
 import { SpanKind } from '@opentelemetry/api';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 
 import { addBreadcrumb, defineIntegration, getIsolationScope, isSentryRequestUrl } from '@sentry/core';
-import { _INTERNAL, getClient, getSpanKind, setSpanMetadata } from '@sentry/opentelemetry';
+import { _INTERNAL, getClient, getSpanKind } from '@sentry/opentelemetry';
 import type { IntegrationFn } from '@sentry/types';
 
 import type { NodeClient } from '../sdk/client';
@@ -81,7 +81,7 @@ const _httpIntegration = ((options: HttpOptions = {}) => {
           requireParentforOutgoingSpans: true,
           requireParentforIncomingSpans: false,
           requestHook: (span, req) => {
-            _updateSpan(span, req);
+            _updateSpan(span);
 
             // Update the isolation scope, isolate this request
             if (getSpanKind(span) === SpanKind.SERVER) {
@@ -117,15 +117,15 @@ const _httpIntegration = ((options: HttpOptions = {}) => {
   };
 }) satisfies IntegrationFn;
 
+/**
+ * The http integration instruments Node's internal http and https modules.
+ * It creates breadcrumbs and spans for outgoing HTTP requests which will be attached to the currently active span.
+ */
 export const httpIntegration = defineIntegration(_httpIntegration);
 
 /** Update the span with data we need. */
-function _updateSpan(span: Span, request: ClientRequest | HTTPModuleRequestIncomingMessage): void {
+function _updateSpan(span: Span): void {
   addOriginToSpan(span, 'auto.http.otel.http');
-
-  if (getSpanKind(span) === SpanKind.SERVER) {
-    setSpanMetadata(span, { request: request as HTTPModuleRequestIncomingMessage });
-  }
 }
 
 /** Add a breadcrumb for outgoing requests. */
diff --git a/packages/node-experimental/src/integrations/node-fetch.ts b/packages/node-experimental/src/integrations/node-fetch.ts
index 254b3f93e930..a80d015515bb 100644
--- a/packages/node-experimental/src/integrations/node-fetch.ts
+++ b/packages/node-experimental/src/integrations/node-fetch.ts
@@ -27,22 +27,20 @@ const _nativeNodeFetchIntegration = ((options: NodeFetchOptions = {}) => {
   const _breadcrumbs = typeof options.breadcrumbs === 'undefined' ? true : options.breadcrumbs;
   const _ignoreOutgoingRequests = options.ignoreOutgoingRequests;
 
-  function getInstrumentation(): [Instrumentation] | void {
+  async function getInstrumentation(): Promise<[Instrumentation] | void> {
     // Only add NodeFetch if Node >= 16, as previous versions do not support it
     if (NODE_MAJOR < 16) {
       return;
     }
 
     try {
-      // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const { FetchInstrumentation } = require('opentelemetry-instrumentation-fetch-node');
+      const pkg = await import('opentelemetry-instrumentation-fetch-node');
       return [
-        new FetchInstrumentation({
+        new pkg.FetchInstrumentation({
           ignoreRequestHook: (request: { origin?: string }) => {
             const url = request.origin;
             return _ignoreOutgoingRequests && url && _ignoreOutgoingRequests(url);
           },
-
           onRequest: ({ span }: { span: Span }) => {
             _updateSpan(span);
 
@@ -50,7 +48,8 @@ const _nativeNodeFetchIntegration = ((options: NodeFetchOptions = {}) => {
               _addRequestBreadcrumb(span);
             }
           },
-        }),
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any),
       ];
     } catch (error) {
       // Could not load instrumentation
@@ -60,13 +59,14 @@ const _nativeNodeFetchIntegration = ((options: NodeFetchOptions = {}) => {
   return {
     name: 'NodeFetch',
     setupOnce() {
-      const instrumentations = getInstrumentation();
-
-      if (instrumentations) {
-        registerInstrumentations({
-          instrumentations,
-        });
-      }
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      getInstrumentation().then(instrumentations => {
+        if (instrumentations) {
+          registerInstrumentations({
+            instrumentations,
+          });
+        }
+      });
     },
   };
 }) satisfies IntegrationFn;
diff --git a/packages/node-experimental/src/integrations/tracing/fastify.ts b/packages/node-experimental/src/integrations/tracing/fastify.ts
index 11742d960dff..3da89599401a 100644
--- a/packages/node-experimental/src/integrations/tracing/fastify.ts
+++ b/packages/node-experimental/src/integrations/tracing/fastify.ts
@@ -1,6 +1,6 @@
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { FastifyInstrumentation } from '@opentelemetry/instrumentation-fastify';
-import { defineIntegration } from '@sentry/core';
+import { captureException, defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 
 import { addOriginToSpan } from '../../utils/addOriginToSpan';
@@ -28,3 +28,30 @@ const _fastifyIntegration = (() => {
  * Capture tracing data for fastify.
  */
 export const fastifyIntegration = defineIntegration(_fastifyIntegration);
+
+// We inline the types we care about here
+interface Fastify {
+  register: (plugin: unknown) => void;
+  addHook: (hook: string, handler: (request: unknown, reply: unknown, error: Error) => void) => void;
+}
+
+/**
+ * Setup an error handler for Fastify.
+ */
+export function setupFastifyErrorHandler(fastify: Fastify): void {
+  const plugin = Object.assign(
+    function (fastify: Fastify, options: unknown, done: () => void): void {
+      fastify.addHook('onError', async (_request, _reply, error) => {
+        captureException(error);
+      });
+
+      done();
+    },
+    {
+      [Symbol.for('skip-override')]: true,
+      [Symbol.for('fastify.display-name')]: 'sentry-fastify-error-handler',
+    },
+  );
+
+  fastify.register(plugin);
+}
diff --git a/packages/node-experimental/src/integrations/tracing/prisma.ts b/packages/node-experimental/src/integrations/tracing/prisma.ts
index 1f78262b9a3c..e261e95b9196 100644
--- a/packages/node-experimental/src/integrations/tracing/prisma.ts
+++ b/packages/node-experimental/src/integrations/tracing/prisma.ts
@@ -1,5 +1,6 @@
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
-import { PrismaInstrumentation } from '@prisma/instrumentation';
+// When importing CJS modules into an ESM module, we cannot import the named exports directly.
+import * as prismaInstrumentation from '@prisma/instrumentation';
 import { defineIntegration } from '@sentry/core';
 import type { IntegrationFn } from '@sentry/types';
 
@@ -10,7 +11,7 @@ const _prismaIntegration = (() => {
       registerInstrumentations({
         instrumentations: [
           // does not have a hook to adjust spans & add origin
-          new PrismaInstrumentation({}),
+          new prismaInstrumentation.PrismaInstrumentation({}),
         ],
       });
     },
diff --git a/packages/node-experimental/src/proxy/helpers.ts b/packages/node-experimental/src/proxy/helpers.ts
index 2fa5b84f6ccb..031878511f6c 100644
--- a/packages/node-experimental/src/proxy/helpers.ts
+++ b/packages/node-experimental/src/proxy/helpers.ts
@@ -27,8 +27,8 @@
  */
 
 /* eslint-disable jsdoc/require-jsdoc */
-import * as http from 'http';
-import * as https from 'https';
+import * as http from 'node:http';
+import * as https from 'node:https';
 import type { Readable } from 'stream';
 
 export type ThenableRequest = http.ClientRequest & {
diff --git a/packages/node-experimental/src/proxy/index.ts b/packages/node-experimental/src/proxy/index.ts
index 89c4f4f5b4a2..83f72d56fb4e 100644
--- a/packages/node-experimental/src/proxy/index.ts
+++ b/packages/node-experimental/src/proxy/index.ts
@@ -28,7 +28,6 @@
 
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import assert from 'assert';
 import type * as http from 'http';
 import type { OutgoingHttpHeaders } from 'http';
 import * as net from 'net';
@@ -188,8 +187,6 @@ export class HttpsProxyAgent<Uri extends string> extends Agent {
     // Need to wait for the "socket" event to re-play the "data" events.
     req.once('socket', (s: net.Socket) => {
       debug('Replaying proxy buffer for failed request');
-      assert(s.listenerCount('data') > 0);
-
       // Replay the "buffered" Buffer onto the fake `socket`, since at
       // this point the HTTP module machinery has been hooked up for
       // the user.
diff --git a/packages/node-experimental/src/sdk/client.ts b/packages/node-experimental/src/sdk/client.ts
index 6037df31c849..b2d23ea31cc2 100644
--- a/packages/node-experimental/src/sdk/client.ts
+++ b/packages/node-experimental/src/sdk/client.ts
@@ -19,7 +19,7 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
       serverName: options.serverName || global.process.env.SENTRY_NAME || os.hostname(),
     };
 
-    applySdkMetadata(clientOptions, 'node-experimental');
+    applySdkMetadata(clientOptions, 'node');
 
     super(clientOptions);
   }
@@ -30,7 +30,7 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
       return this._tracer;
     }
 
-    const name = '@sentry/node-experimental';
+    const name = '@sentry/node';
     const version = SDK_VERSION;
     const tracer = trace.getTracer(name, version);
     this._tracer = tracer;
diff --git a/packages/node-experimental/src/sdk/hub.ts b/packages/node-experimental/src/sdk/hub.ts
index 42a7c8c7ea22..0ab3e0cd320c 100644
--- a/packages/node-experimental/src/sdk/hub.ts
+++ b/packages/node-experimental/src/sdk/hub.ts
@@ -1,14 +1,4 @@
-import type {
-  Client,
-  CustomSamplingContext,
-  EventHint,
-  Hub,
-  Integration,
-  IntegrationClass,
-  Scope,
-  SeverityLevel,
-  TransactionContext,
-} from '@sentry/types';
+import type { Client, EventHint, Hub, Integration, IntegrationClass, Scope, SeverityLevel } from '@sentry/types';
 
 import {
   addBreadcrumb,
@@ -76,18 +66,6 @@ export function getCurrentHub(): Hub {
       return getClient().getIntegration(integration);
     },
 
-    startTransaction(
-      _context: TransactionContext,
-      _customSamplingContext?: CustomSamplingContext,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ): any {
-      // eslint-disable-next-line no-console
-      console.warn('startTransaction is a noop in @sentry/node-experimental. Use `startSpan` instead.');
-      // We return an object here as hub.ts checks for the result of this
-      // and renders a different warning if this is empty
-      return {};
-    },
-
     startSession,
 
     endSession,
diff --git a/packages/node-experimental/src/sdk/init.ts b/packages/node-experimental/src/sdk/init.ts
index 5e62a01de6cd..e969b2d52966 100644
--- a/packages/node-experimental/src/sdk/init.ts
+++ b/packages/node-experimental/src/sdk/init.ts
@@ -39,9 +39,12 @@ import { defaultStackParser, getSentryRelease } from './api';
 import { NodeClient } from './client';
 import { initOtel } from './initOtel';
 
+function getCjsOnlyIntegrations(isCjs = typeof require !== 'undefined'): Integration[] {
+  return isCjs ? [modulesIntegration()] : [];
+}
+
 /** Get the default integrations for the Node Experimental SDK. */
 export function getDefaultIntegrations(options: Options): Integration[] {
-  // TODO
   return [
     // Common
     inboundFiltersIntegration(),
@@ -59,9 +62,8 @@ export function getDefaultIntegrations(options: Options): Integration[] {
     contextLinesIntegration(),
     localVariablesIntegration(),
     nodeContextIntegration(),
-    modulesIntegration(),
     httpIntegration(),
-    nativeNodeFetchIntegration(),
+    ...getCjsOnlyIntegrations(),
     ...(hasTracingEnabled(options) ? getAutoPerformanceIntegrations() : []),
   ];
 }
diff --git a/packages/node-experimental/src/sdk/initOtel.ts b/packages/node-experimental/src/sdk/initOtel.ts
index af6de43f5e9a..dd8d78382616 100644
--- a/packages/node-experimental/src/sdk/initOtel.ts
+++ b/packages/node-experimental/src/sdk/initOtel.ts
@@ -48,7 +48,7 @@ export function setupOtel(client: NodeClient): BasicTracerProvider {
   const provider = new BasicTracerProvider({
     sampler: new SentrySampler(client),
     resource: new Resource({
-      [SemanticResourceAttributes.SERVICE_NAME]: 'node-experimental',
+      [SemanticResourceAttributes.SERVICE_NAME]: 'node',
       [SemanticResourceAttributes.SERVICE_NAMESPACE]: 'sentry',
       [SemanticResourceAttributes.SERVICE_VERSION]: SDK_VERSION,
     }),
diff --git a/packages/node-experimental/src/transports/http-module.ts b/packages/node-experimental/src/transports/http-module.ts
index 26bb37b6f4b9..f5cbe6fd35f9 100644
--- a/packages/node-experimental/src/transports/http-module.ts
+++ b/packages/node-experimental/src/transports/http-module.ts
@@ -1,5 +1,5 @@
-import type { ClientRequest, IncomingHttpHeaders, RequestOptions as HTTPRequestOptions } from 'http';
-import type { RequestOptions as HTTPSRequestOptions } from 'https';
+import type { ClientRequest, IncomingHttpHeaders, RequestOptions as HTTPRequestOptions } from 'node:http';
+import type { RequestOptions as HTTPSRequestOptions } from 'node:https';
 
 export type HTTPModuleRequestOptions = HTTPRequestOptions | HTTPSRequestOptions | string | URL;
 
diff --git a/packages/node-experimental/src/transports/http.ts b/packages/node-experimental/src/transports/http.ts
index 532367578fb5..1fb84d9e8570 100644
--- a/packages/node-experimental/src/transports/http.ts
+++ b/packages/node-experimental/src/transports/http.ts
@@ -1,5 +1,5 @@
-import * as http from 'http';
-import * as https from 'https';
+import * as http from 'node:http';
+import * as https from 'node:https';
 import { Readable } from 'stream';
 import { createGzip } from 'zlib';
 import { createTransport } from '@sentry/core';
diff --git a/packages/node-experimental/src/types.ts b/packages/node-experimental/src/types.ts
index 19a825e176f4..d78e1761fd79 100644
--- a/packages/node-experimental/src/types.ts
+++ b/packages/node-experimental/src/types.ts
@@ -1,6 +1,6 @@
 import type { Span as WriteableSpan } from '@opentelemetry/api';
-import type { ReadableSpan, Span } from '@opentelemetry/sdk-trace-base';
-import type { ClientOptions, Options, SamplingContext, Scope, TracePropagationTargets } from '@sentry/types';
+import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
+import type { ClientOptions, Options, SamplingContext, Scope, Span, TracePropagationTargets } from '@sentry/types';
 
 import type { NodeTransportOptions } from './transports';
 
@@ -104,6 +104,4 @@ export interface CurrentScopes {
  * Note that technically, the `Span` exported from `@opentelemwetry/sdk-trace-base` matches this,
  * but we cannot be 100% sure that we are actually getting such a span, so this type is more defensive.
  */
-export type AbstractSpan = WriteableSpan | ReadableSpan;
-
-export type { Span };
+export type AbstractSpan = WriteableSpan | ReadableSpan | Span;
diff --git a/packages/node-experimental/src/utils/addOriginToSpan.ts b/packages/node-experimental/src/utils/addOriginToSpan.ts
index 10fb7cf3402f..9d2acfcd83b2 100644
--- a/packages/node-experimental/src/utils/addOriginToSpan.ts
+++ b/packages/node-experimental/src/utils/addOriginToSpan.ts
@@ -1,8 +1,8 @@
 import type { Span } from '@opentelemetry/api';
-import { _INTERNAL } from '@sentry/opentelemetry';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import type { SpanOrigin } from '@sentry/types';
 
 /** Adds an origin to an OTEL Span. */
 export function addOriginToSpan(span: Span, origin: SpanOrigin): void {
-  _INTERNAL.addOriginToSpan(span, origin);
+  span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, origin);
 }
diff --git a/packages/node-experimental/test/helpers/error.ts b/packages/node-experimental/test/helpers/error.ts
new file mode 100644
index 000000000000..03d4150c3f11
--- /dev/null
+++ b/packages/node-experimental/test/helpers/error.ts
@@ -0,0 +1,4 @@
+/* this method is exported from an external file to be able to test contextlines when adding an external file */
+export function getError(): Error {
+  return new Error('mock error');
+}
diff --git a/packages/node-experimental/test/integration/scope.test.ts b/packages/node-experimental/test/integration/scope.test.ts
index 19848c4c78fc..e740ca0584f7 100644
--- a/packages/node-experimental/test/integration/scope.test.ts
+++ b/packages/node-experimental/test/integration/scope.test.ts
@@ -1,5 +1,6 @@
-import { getCurrentScope, setGlobalScope } from '@sentry/core';
+import { getCurrentScope } from '@sentry/core';
 import { getClient, getSpanScopes } from '@sentry/opentelemetry';
+import { clearGlobalScope } from '../../../core/test/lib/clear-global-scope';
 
 import * as Sentry from '../../src/';
 import type { NodeClient } from '../../src/sdk/client';
@@ -64,6 +65,8 @@ describe('Integration | Scope', () => {
               trace: {
                 span_id: spanId,
                 trace_id: traceId,
+                // local span ID from propagation context
+                ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
               },
             }),
           }),
@@ -109,6 +112,8 @@ describe('Integration | Scope', () => {
                 status: 'ok',
                 trace_id: traceId,
                 origin: 'manual',
+                // local span ID from propagation context
+                parent_span_id: expect.any(String),
               },
             }),
             spans: [],
@@ -193,7 +198,8 @@ describe('Integration | Scope', () => {
               ? {
                   span_id: spanId1,
                   trace_id: traceId1,
-                  parent_span_id: undefined,
+                  // local span ID from propagation context
+                  ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
                 }
               : expect.any(Object),
           }),
@@ -219,7 +225,8 @@ describe('Integration | Scope', () => {
               ? {
                   span_id: spanId2,
                   trace_id: traceId2,
-                  parent_span_id: undefined,
+                  // local span ID from propagation context
+                  ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
                 }
               : expect.any(Object),
           }),
@@ -246,7 +253,7 @@ describe('Integration | Scope', () => {
 
   describe('global scope', () => {
     beforeEach(() => {
-      setGlobalScope(undefined);
+      clearGlobalScope();
     });
 
     it('works before calling init', () => {
diff --git a/packages/node-experimental/test/integration/transactions.test.ts b/packages/node-experimental/test/integration/transactions.test.ts
index aedde492cd63..ea368a7b2fb8 100644
--- a/packages/node-experimental/test/integration/transactions.test.ts
+++ b/packages/node-experimental/test/integration/transactions.test.ts
@@ -1,6 +1,6 @@
 import { TraceFlags, context, trace } from '@opentelemetry/api';
 import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
 import { SentrySpanProcessor } from '@sentry/opentelemetry';
 import type { TransactionEvent } from '@sentry/types';
 import { logger } from '@sentry/utils';
@@ -15,9 +15,17 @@ describe('Integration | Transactions', () => {
   });
 
   it('correctly creates transaction & spans', async () => {
-    const beforeSendTransaction = jest.fn(() => null);
+    const transactions: TransactionEvent[] = [];
+    const beforeSendTransaction = jest.fn(event => {
+      transactions.push(event);
+      return null;
+    });
 
-    mockSdkInit({ enableTracing: true, beforeSendTransaction });
+    mockSdkInit({
+      enableTracing: true,
+      beforeSendTransaction,
+      release: '8.0.0',
+    });
 
     const client = Sentry.getClient()!;
 
@@ -28,10 +36,9 @@ describe('Integration | Transactions', () => {
       {
         op: 'test op',
         name: 'test name',
-        origin: 'auto.test',
-        metadata: { requestPath: 'test-path' },
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
         },
       },
       span => {
@@ -58,86 +65,74 @@ describe('Integration | Transactions', () => {
 
     await client.flush();
 
-    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
-    expect(beforeSendTransaction).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        breadcrumbs: [
-          { message: 'test breadcrumb 1', timestamp: 123456 },
-          { message: 'test breadcrumb 2', timestamp: 123456 },
-          { message: 'test breadcrumb 3', timestamp: 123456 },
-        ],
-        contexts: {
-          otel: {
-            attributes: {
-              'test.outer': 'test value',
-              'sentry.op': 'test op',
-              'sentry.origin': 'auto.test',
-              'sentry.source': 'task',
-            },
-            resource: {
-              'service.name': 'node-experimental',
-              'service.namespace': 'sentry',
-              'service.version': expect.any(String),
-              'telemetry.sdk.language': 'nodejs',
-              'telemetry.sdk.name': 'opentelemetry',
-              'telemetry.sdk.version': expect.any(String),
-            },
-          },
-          runtime: { name: 'node', version: expect.any(String) },
-          trace: {
-            data: {
-              'otel.kind': 'INTERNAL',
-              'sentry.op': 'test op',
-              'sentry.origin': 'auto.test',
-              'sentry.source': 'task',
-              'sentry.sample_rate': 1,
-              'test.outer': 'test value',
-            },
-            op: 'test op',
-            span_id: expect.any(String),
-            status: 'ok',
-            trace_id: expect.any(String),
-            origin: 'auto.test',
-          },
-        },
-        environment: 'production',
-        event_id: expect.any(String),
-        platform: 'node',
-        sdkProcessingMetadata: expect.objectContaining({
-          dynamicSamplingContext: expect.objectContaining({
-            environment: 'production',
-            public_key: expect.any(String),
-            sample_rate: '1',
-            sampled: 'true',
-            trace_id: expect.any(String),
-            transaction: 'test name',
-          }),
-          sampleRate: 1,
-          spanMetadata: expect.any(Object),
-          requestPath: 'test-path',
-        }),
-        server_name: expect.any(String),
-        // spans are circular (they have a reference to the transaction), which leads to jest choking on this
-        // instead we compare them in detail below
-        spans: [expect.any(Object), expect.any(Object)],
-        start_timestamp: expect.any(Number),
-        tags: {
-          'outer.tag': 'test value',
-          'test.tag': 'test value',
-        },
-        timestamp: expect.any(Number),
-        transaction: 'test name',
-        transaction_info: { source: 'task' },
-        type: 'transaction',
-      }),
-      {
-        event_id: expect.any(String),
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.breadcrumbs).toEqual([
+      { message: 'test breadcrumb 1', timestamp: 123456 },
+      { message: 'test breadcrumb 2', timestamp: 123456 },
+      { message: 'test breadcrumb 3', timestamp: 123456 },
+    ]);
+
+    expect(transaction.contexts?.otel).toEqual({
+      attributes: {
+        'test.outer': 'test value',
+        'sentry.op': 'test op',
+        'sentry.origin': 'auto.test',
+        'sentry.source': 'task',
       },
-    );
+      resource: {
+        'service.name': 'node',
+        'service.namespace': 'sentry',
+        'service.version': expect.any(String),
+        'telemetry.sdk.language': 'nodejs',
+        'telemetry.sdk.name': 'opentelemetry',
+        'telemetry.sdk.version': expect.any(String),
+      },
+    });
 
-    // Checking the spans here, as they are circular to the transaction...
-    const runArgs = beforeSendTransaction.mock.calls[0] as unknown as [TransactionEvent, unknown];
-    const spans = runArgs[0].spans || [];
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        'otel.kind': 'INTERNAL',
+        'sentry.op': 'test op',
+        'sentry.origin': 'auto.test',
+        'sentry.source': 'task',
+        'sentry.sample_rate': 1,
+        'test.outer': 'test value',
+      },
+      op: 'test op',
+      span_id: expect.any(String),
+      status: 'ok',
+      trace_id: expect.any(String),
+      origin: 'auto.test',
+    });
+
+    expect(transaction.sdkProcessingMetadata?.sampleRate).toEqual(1);
+    expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({
+      environment: 'production',
+      public_key: expect.any(String),
+      sample_rate: '1',
+      sampled: 'true',
+      release: '8.0.0',
+      trace_id: expect.any(String),
+      transaction: 'test name',
+    });
+
+    expect(transaction.environment).toEqual('production');
+    expect(transaction.event_id).toEqual(expect.any(String));
+    expect(transaction.start_timestamp).toEqual(expect.any(Number));
+    expect(transaction.timestamp).toEqual(expect.any(Number));
+    expect(transaction.transaction).toEqual('test name');
+
+    expect(transaction.tags).toEqual({
+      'outer.tag': 'test value',
+      'test.tag': 'test value',
+    });
+    expect(transaction.transaction_info).toEqual({ source: 'task' });
+    expect(transaction.type).toEqual('transaction');
+
+    expect(transaction.spans).toHaveLength(2);
+    const spans = transaction.spans || [];
 
     // note: Currently, spans do not have any context/span added to them
     // This is the same behavior as for the "regular" SDKs
@@ -184,26 +179,36 @@ describe('Integration | Transactions', () => {
     Sentry.addBreadcrumb({ message: 'test breadcrumb 1', timestamp: 123456 });
 
     Sentry.withIsolationScope(() => {
-      Sentry.startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
-        Sentry.addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
+      Sentry.startSpan(
+        {
+          op: 'test op',
+          name: 'test name',
+          attributes: {
+            [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+            [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+          },
+        },
+        span => {
+          Sentry.addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
 
-        span.setAttributes({
-          'test.outer': 'test value',
-        });
+          span.setAttributes({
+            'test.outer': 'test value',
+          });
 
-        const subSpan = Sentry.startInactiveSpan({ name: 'inner span 1' });
-        subSpan.end();
+          const subSpan = Sentry.startInactiveSpan({ name: 'inner span 1' });
+          subSpan.end();
 
-        Sentry.setTag('test.tag', 'test value');
+          Sentry.setTag('test.tag', 'test value');
 
-        Sentry.startSpan({ name: 'inner span 2' }, innerSpan => {
-          Sentry.addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
+          Sentry.startSpan({ name: 'inner span 2' }, innerSpan => {
+            Sentry.addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
 
-          innerSpan.setAttributes({
-            'test.inner': 'test value',
+            innerSpan.setAttributes({
+              'test.inner': 'test value',
+            });
           });
-        });
-      });
+        },
+      );
     });
 
     Sentry.withIsolationScope(() => {
@@ -262,6 +267,8 @@ describe('Integration | Transactions', () => {
             status: 'ok',
             trace_id: expect.any(String),
             origin: 'auto.test',
+            // local span ID from propagation context
+            parent_span_id: expect.any(String),
           },
         }),
         spans: [expect.any(Object), expect.any(Object)],
@@ -307,6 +314,8 @@ describe('Integration | Transactions', () => {
             status: 'ok',
             trace_id: expect.any(String),
             origin: 'manual',
+            // local span ID from propagation context
+            parent_span_id: expect.any(String),
           },
         }),
         spans: [expect.any(Object), expect.any(Object)],
@@ -498,8 +507,10 @@ describe('Integration | Transactions', () => {
         {
           op: 'test op',
           name: 'test name',
-          origin: 'auto.test',
-          attributes: { [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task' },
+          attributes: {
+            [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+            [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+          },
         },
         () => {
           const subSpan = Sentry.startInactiveSpan({ name: 'inner span 1' });
@@ -623,7 +634,7 @@ describe('Integration | Transactions', () => {
 
     void Sentry.startSpan({ name: 'test name' }, async () => {
       const subSpan = Sentry.startInactiveSpan({ name: 'inner span 1' });
-      innerSpan1Id = subSpan?.spanContext().spanId;
+      innerSpan1Id = subSpan.spanContext().spanId;
       subSpan.end();
 
       Sentry.startSpan({ name: 'inner span 2' }, innerSpan => {
diff --git a/packages/node-experimental/test/integrations/contextlines.test.ts b/packages/node-experimental/test/integrations/contextlines.test.ts
index ba3fa8575e79..c4ef1efaa292 100644
--- a/packages/node-experimental/test/integrations/contextlines.test.ts
+++ b/packages/node-experimental/test/integrations/contextlines.test.ts
@@ -1,9 +1,10 @@
-import * as fs from 'fs';
+import { promises } from 'fs';
 import type { StackFrame } from '@sentry/types';
 import { parseStackFrames } from '@sentry/utils';
 
 import { _contextLinesIntegration, resetFileContentCache } from '../../src/integrations/contextlines';
 import { defaultStackParser } from '../../src/sdk/api';
+import { getError } from '../helpers/error';
 
 jest.mock('fs', () => {
   const actual = jest.requireActual('fs');
@@ -17,7 +18,7 @@ jest.mock('fs', () => {
 });
 
 describe('ContextLines', () => {
-  const readFileSpy = fs.promises.readFile as unknown as jest.SpyInstance;
+  const readFileSpy = promises.readFile as unknown as jest.SpyInstance;
   let contextLines: ReturnType<typeof _contextLinesIntegration>;
 
   async function addContext(frames: StackFrame[]): Promise<void> {
@@ -144,7 +145,3 @@ describe('ContextLines', () => {
     expect(readFileSpy).toHaveBeenCalledTimes(1);
   });
 });
-
-function getError(): Error {
-  return new Error('mock error');
-}
diff --git a/packages/node-experimental/test/sdk/client.test.ts b/packages/node-experimental/test/sdk/client.test.ts
index bde4ad23e291..19f90bc8d9b6 100644
--- a/packages/node-experimental/test/sdk/client.test.ts
+++ b/packages/node-experimental/test/sdk/client.test.ts
@@ -43,10 +43,10 @@ describe('NodeClient', () => {
       stackParser: options.stackParser,
       _metadata: {
         sdk: {
-          name: 'sentry.javascript.node-experimental',
+          name: 'sentry.javascript.node',
           packages: [
             {
-              name: 'npm:@sentry/node-experimental',
+              name: 'npm:@sentry/node',
               version: SDK_VERSION,
             },
           ],
diff --git a/packages/node-experimental/tsconfig.json b/packages/node-experimental/tsconfig.json
index 5fc0658105eb..5a6bb72e5fd3 100644
--- a/packages/node-experimental/tsconfig.json
+++ b/packages/node-experimental/tsconfig.json
@@ -4,6 +4,7 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "lib": ["es6"]
+    "lib": ["es2017"],
+    "module": "Node16"
   }
 }
diff --git a/packages/node/.eslintrc.js b/packages/node/.eslintrc.js
index bec6469d0e28..9d915d4f4c3b 100644
--- a/packages/node/.eslintrc.js
+++ b/packages/node/.eslintrc.js
@@ -6,7 +6,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/node/README.md b/packages/node/README.md
index bd588bbbc34e..af6819c9a4ce 100644
--- a/packages/node/README.md
+++ b/packages/node/README.md
@@ -4,27 +4,36 @@
   </a>
 </p>
 
-# Official Sentry SDK for NodeJS
+# Legacy Sentry SDK for NodeJS
 
-[![npm version](https://img.shields.io/npm/v/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
-[![npm dm](https://img.shields.io/npm/dm/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
-[![npm dt](https://img.shields.io/npm/dt/@sentry/node.svg)](https://www.npmjs.com/package/@sentry/node)
+[![npm version](https://img.shields.io/npm/v/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
+[![npm dm](https://img.shields.io/npm/dm/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
+[![npm dt](https://img.shields.io/npm/dt/@sentry/node-experimental.svg)](https://www.npmjs.com/package/@sentry/node-experimental)
 
 ## Links
 
 - [Official SDK Docs](https://docs.sentry.io/quickstart/)
 - [TypeDoc](http://getsentry.github.io/sentry-javascript/)
 
+## Status
+
+Since v8, this is the _legacy_ SDK, and it will most likely be completely removed before v8 is fully stable. It only
+exists so that Meta-SDKs like `@sentry/nextjs` or `@sentry/sveltekit` can be migrated to the new `@sentry/node`
+step-by-step.
+
+You should instead use [@sentry/node](./../node-experimental/).
+
 ## Usage
 
 To use this SDK, call `init(options)` as early as possible in the main entry module. This will initialize the SDK and
-hook into the environment. Note that you can turn off almost all side effects using the respective options. Minimum supported Node version is Node 14.
+hook into the environment. Note that you can turn off almost all side effects using the respective options. Minimum
+supported Node version is Node 14.
 
 ```javascript
 // CJS syntax
-const Sentry = require('@sentry/node');
+const Sentry = require('@sentry/node-experimental');
 // ESM syntax
-import * as Sentry from '@sentry/node';
+import * as Sentry from '@sentry/node-experimental';
 
 Sentry.init({
   dsn: '__DSN__',
@@ -32,8 +41,8 @@ Sentry.init({
 });
 ```
 
-To set context information or send manual events, use the exported functions of `@sentry/node`. Note that these
-functions will not perform any action before you have called `init()`:
+To set context information or send manual events, use the exported functions of `@sentry/node-experimental`. Note that
+these functions will not perform any action before you have called `init()`:
 
 ```javascript
 // Set user information, as well as tags and further extras
diff --git a/packages/node/package.json b/packages/node/package.json
index dc592187497c..48cd6f557668 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
@@ -38,7 +51,7 @@
     "@types/cookie": "0.5.2",
     "@types/express": "^4.17.14",
     "@types/lru-cache": "^5.1.0",
-    "@types/node": "~10.17.0",
+    "@types/node": "14.18.63",
     "express": "^4.17.1",
     "nock": "^13.0.5",
     "undici": "^5.21.0"
diff --git a/packages/node/rollup.anr-worker.config.mjs b/packages/node/rollup.anr-worker.config.mjs
index 9887342c63fd..48463d5763ee 100644
--- a/packages/node/rollup.anr-worker.config.mjs
+++ b/packages/node/rollup.anr-worker.config.mjs
@@ -4,7 +4,6 @@ function createAnrWorkerConfig(destDir, esm) {
   return makeBaseBundleConfig({
     bundleType: 'node-worker',
     entrypoints: ['src/integrations/anr/worker.ts'],
-    jsVersion: 'es6',
     licenseTitle: '@sentry/node',
     outputFileBase: () => 'worker-script.js',
     packageSpecificConfig: {
diff --git a/packages/node/src/handlers.ts b/packages/node/src/handlers.ts
index 5c1c0a26e481..1eca85b55ed8 100644
--- a/packages/node/src/handlers.ts
+++ b/packages/node/src/handlers.ts
@@ -1,5 +1,7 @@
 import type * as http from 'http';
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Transaction } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
@@ -12,7 +14,7 @@ import {
   getIsolationScope,
   hasTracingEnabled,
   setHttpStatus,
-  startTransaction,
+  startInactiveSpan,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
@@ -21,7 +23,6 @@ import type { AddRequestDataToEventOptions } from '@sentry/utils';
 import {
   addRequestDataToTransaction,
   extractPathForTransaction,
-  extractRequestData,
   isString,
   isThenable,
   logger,
@@ -58,37 +59,27 @@ export function tracingHandler(): (
       return next();
     }
 
+    // We depend here on the fact that we update the current scope...
+    // so we keep this legacy behavior here for now
+    const scope = getCurrentScope();
+
     const [name, source] = extractPathForTransaction(req, { path: true, method: true });
-    const transaction = continueTrace({ sentryTrace, baggage }, ctx =>
-      // TODO: Refactor this to use `startSpan()`
-      // eslint-disable-next-line deprecation/deprecation
-      startTransaction(
-        {
-          name,
-          op: 'http.server',
-          origin: 'auto.http.node.tracingHandler',
-          ...ctx,
-          attributes: {
-            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-          },
-          metadata: {
-            // eslint-disable-next-line deprecation/deprecation
-            ...ctx.metadata,
-            // The request should already have been stored in `scope.sdkProcessingMetadata` (which will become
-            // `event.sdkProcessingMetadata` the same way the metadata here will) by `sentryRequestMiddleware`, but on the
-            // off chance someone is using `sentryTracingMiddleware` without `sentryRequestMiddleware`, it doesn't hurt to
-            // be sure
-            request: req,
-          },
+    const transaction = continueTrace({ sentryTrace, baggage }, () => {
+      scope.setPropagationContext(getCurrentScope().getPropagationContext());
+      return startInactiveSpan({
+        name,
+        op: 'http.server',
+        forceTransaction: true,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.node.tracingHandler',
         },
-        // extra context passed to the tracesSampler
-        { request: extractRequestData(req) },
-      ),
-    );
+      }) as Transaction;
+    });
 
     // We put the transaction on the scope so users can attach children to it
     // eslint-disable-next-line deprecation/deprecation
-    getCurrentScope().setSpan(transaction);
+    scope.setSpan(transaction);
 
     // We also set __sentry_transaction on the response so people can grab the transaction there to add
     // spans to it later.
@@ -141,6 +132,8 @@ export function requestHandler(
     if (options && options.flushTimeout && options.flushTimeout > 0) {
       // eslint-disable-next-line @typescript-eslint/unbound-method
       const _end = res.end;
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore I've only updated the node types and this package will soon be removed
       res.end = function (chunk?: any | (() => void), encoding?: string | (() => void), cb?: () => void): void {
         void flush(options.flushTimeout)
           .then(() => {
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index 571cef862d9c..73cd82c93b32 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -46,8 +46,6 @@ export {
   makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -63,10 +61,12 @@ export {
   withMonitor,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
   continueTrace,
   parameterize,
   functionToStringIntegration,
diff --git a/packages/node/src/integrations/anr/index.ts b/packages/node/src/integrations/anr/index.ts
index bfb81557fd75..7e0de1d0badc 100644
--- a/packages/node/src/integrations/anr/index.ts
+++ b/packages/node/src/integrations/anr/index.ts
@@ -120,6 +120,7 @@ async function _startWorker(client: NodeClient, _options: Partial<AnrIntegration
   });
 
   process.on('exit', () => {
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     worker.terminate();
   });
 
diff --git a/packages/node/src/integrations/hapi/index.ts b/packages/node/src/integrations/hapi/index.ts
index 3af732ce730a..0c500fbd1ae1 100644
--- a/packages/node/src/integrations/hapi/index.ts
+++ b/packages/node/src/integrations/hapi/index.ts
@@ -5,13 +5,15 @@ import {
   continueTrace,
   convertIntegrationFnToClass,
   defineIntegration,
-  getActiveTransaction,
+  getActiveSpan,
   getCurrentScope,
   getDynamicSamplingContextFromSpan,
+  getRootSpan,
   setHttpStatus,
   spanToTraceHeader,
-  startTransaction,
+  startInactiveSpan,
 } from '@sentry/core';
+
 import type { IntegrationFn } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader, fill } from '@sentry/utils';
 
@@ -49,8 +51,8 @@ export const hapiErrorPlugin = {
     const server = serverArg as unknown as Server;
 
     server.events.on('request', (request, event) => {
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction();
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
 
       if (request.response && isBoomObject(request.response)) {
         sendErrorToSentry(request.response);
@@ -58,9 +60,9 @@ export const hapiErrorPlugin = {
         sendErrorToSentry(event.error);
       }
 
-      if (transaction) {
-        transaction.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
-        transaction.end();
+      if (rootSpan) {
+        rootSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+        rootSpan.end();
       }
     });
   },
@@ -79,12 +81,11 @@ export const hapiTracingPlugin = {
           sentryTrace: request.headers['sentry-trace'] || undefined,
           baggage: request.headers['baggage'] || undefined,
         },
-        transactionContext => {
-          // eslint-disable-next-line deprecation/deprecation
-          return startTransaction({
-            ...transactionContext,
+        () => {
+          return startInactiveSpan({
             op: 'hapi.request',
             name: `${request.route.method} ${request.path}`,
+            forceTransaction: true,
           });
         },
       );
@@ -96,15 +97,15 @@ export const hapiTracingPlugin = {
     });
 
     server.ext('onPreResponse', (request, h) => {
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction();
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
 
-      if (request.response && isResponseObject(request.response) && transaction) {
+      if (request.response && isResponseObject(request.response) && rootSpan) {
         const response = request.response as ResponseObject;
-        response.header('sentry-trace', spanToTraceHeader(transaction));
+        response.header('sentry-trace', spanToTraceHeader(rootSpan));
 
         const dynamicSamplingContext = dynamicSamplingContextToSentryBaggageHeader(
-          getDynamicSamplingContextFromSpan(transaction),
+          getDynamicSamplingContextFromSpan(rootSpan),
         );
 
         if (dynamicSamplingContext) {
@@ -116,15 +117,15 @@ export const hapiTracingPlugin = {
     });
 
     server.ext('onPostHandler', (request, h) => {
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction();
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
 
-      if (transaction) {
+      if (rootSpan) {
         if (request.response && isResponseObject(request.response)) {
-          setHttpStatus(transaction, request.response.statusCode);
+          setHttpStatus(rootSpan, request.response.statusCode);
         }
 
-        transaction.end();
+        rootSpan.end();
       }
 
       return h.continue;
diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts
index 00858d6b15cf..a8ca8b832455 100644
--- a/packages/node/src/integrations/http.ts
+++ b/packages/node/src/integrations/http.ts
@@ -1,11 +1,11 @@
 /* eslint-disable max-lines */
 import type * as http from 'http';
 import type * as https from 'https';
-import type { Hub, SentrySpan } from '@sentry/core';
+import type { Hub } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
 import { defineIntegration, getIsolationScope, hasTracingEnabled } from '@sentry/core';
 import {
   addBreadcrumb,
-  getActiveSpan,
   getClient,
   getCurrentHub,
   getCurrentScope,
@@ -138,8 +138,8 @@ const _httpIntegration = ((options: HttpIntegrationOptions = {}) => {
 export const httpIntegration = defineIntegration(_httpIntegration);
 
 /**
- * The http module integration instruments Node's internal http module. It creates breadcrumbs, transactions for outgoing
- * http requests and attaches trace data when tracing is enabled via its `tracing` option.
+ * The http integration instruments Node's internal http and https modules.
+ * It creates breadcrumbs and spans for outgoing HTTP requests which will be attached to the currently active span.
  *
  * @deprecated Use `httpIntegration()` instead.
  */
@@ -206,7 +206,7 @@ export class Http implements Integration {
     // It has been changed in Node 9, so for all versions equal and above, we patch `https` separately.
     if (NODE_VERSION.major > 8) {
       // eslint-disable-next-line @typescript-eslint/no-var-requires
-      const httpsModule = require('https');
+      const httpsModule = require('node:https');
       const wrappedHttpsHandlerMaker = _createWrappedRequestMethodFactory(
         httpsModule,
         this._breadcrumbs,
@@ -319,17 +319,18 @@ function _createWrappedRequestMethodFactory(
 
       const scope = getCurrentScope();
       const isolationScope = getIsolationScope();
-      const parentSpan = getActiveSpan() as SentrySpan;
 
-      const data = getRequestSpanData(requestUrl, requestOptions);
+      const attributes = getRequestSpanData(requestUrl, requestOptions);
 
       const requestSpan = shouldCreateSpan(rawRequestUrl)
-        ? // eslint-disable-next-line deprecation/deprecation
-          parentSpan?.startChild({
+        ? startInactiveSpan({
+            onlyIfParent: true,
             op: 'http.client',
-            origin: 'auto.http.node.http',
-            name: `${data['http.method']} ${data.url}`,
-            data,
+            name: `${attributes['http.method']} ${attributes.url}`,
+            attributes: {
+              ...attributes,
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.node.http',
+            },
           })
         : undefined;
 
@@ -365,7 +366,7 @@ function _createWrappedRequestMethodFactory(
           // eslint-disable-next-line @typescript-eslint/no-this-alias
           const req = this;
           if (breadcrumbsEnabled) {
-            addRequestBreadcrumb('response', data, req, res);
+            addRequestBreadcrumb('response', attributes, req, res);
           }
           if (requestSpan) {
             if (res.statusCode) {
@@ -380,7 +381,7 @@ function _createWrappedRequestMethodFactory(
           const req = this;
 
           if (breadcrumbsEnabled) {
-            addRequestBreadcrumb('error', data, req);
+            addRequestBreadcrumb('error', attributes, req);
           }
           if (requestSpan) {
             setHttpStatus(requestSpan, 500);
diff --git a/packages/node/src/integrations/undici/index.ts b/packages/node/src/integrations/undici/index.ts
index 5c27841c462d..76d94947ee2d 100644
--- a/packages/node/src/integrations/undici/index.ts
+++ b/packages/node/src/integrations/undici/index.ts
@@ -1,9 +1,8 @@
-import type { SentrySpan } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
 import {
   SPAN_STATUS_ERROR,
   addBreadcrumb,
   defineIntegration,
-  getActiveSpan,
   getClient,
   getCurrentScope,
   getDynamicSamplingContextFromClient,
@@ -14,7 +13,14 @@ import {
   setHttpStatus,
   spanToTraceHeader,
 } from '@sentry/core';
-import type { EventProcessor, Integration, IntegrationFn, IntegrationFnResult, Span } from '@sentry/types';
+import type {
+  EventProcessor,
+  Integration,
+  IntegrationFn,
+  IntegrationFnResult,
+  Span,
+  SpanAttributes,
+} from '@sentry/types';
 import {
   LRUMap,
   dynamicSamplingContextToSentryBaggageHeader,
@@ -185,9 +191,8 @@ export class Undici implements Integration {
     const clientOptions = client.getOptions();
     const scope = getCurrentScope();
     const isolationScope = getIsolationScope();
-    const parentSpan = getActiveSpan() as SentrySpan;
 
-    const span = this._shouldCreateSpan(stringUrl) ? createRequestSpan(parentSpan, request, stringUrl) : undefined;
+    const span = this._shouldCreateSpan(stringUrl) ? createRequestSpan(request, stringUrl) : undefined;
     if (span) {
       request.__sentry_span__ = span;
     }
@@ -308,8 +313,13 @@ function setHeadersOnRequest(
   sentryTrace: string,
   sentryBaggageHeader: string | undefined,
 ): void {
-  const headerLines = request.headers.split('\r\n');
-  const hasSentryHeaders = headerLines.some(headerLine => headerLine.startsWith('sentry-trace:'));
+  let hasSentryHeaders: boolean;
+  if (Array.isArray(request.headers)) {
+    hasSentryHeaders = request.headers.some(headerLine => headerLine === 'sentry-trace');
+  } else {
+    const headerLines = request.headers.split('\r\n');
+    hasSentryHeaders = headerLines.some(headerLine => headerLine.startsWith('sentry-trace:'));
+  }
 
   if (hasSentryHeaders) {
     return;
@@ -321,28 +331,24 @@ function setHeadersOnRequest(
   }
 }
 
-function createRequestSpan(
-  activeSpan: SentrySpan | undefined,
-  request: RequestWithSentry,
-  stringUrl: string,
-): Span | undefined {
+function createRequestSpan(request: RequestWithSentry, stringUrl: string): Span {
   const url = parseUrl(stringUrl);
 
   const method = request.method || 'GET';
-  const data: Record<string, unknown> = {
+  const attributes: SpanAttributes = {
     'http.method': method,
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.node.undici',
   };
   if (url.search) {
-    data['http.query'] = url.search;
+    attributes['http.query'] = url.search;
   }
   if (url.hash) {
-    data['http.fragment'] = url.hash;
+    attributes['http.fragment'] = url.hash;
   }
-  // eslint-disable-next-line deprecation/deprecation
-  return activeSpan?.startChild({
+  return startInactiveSpan({
+    onlyIfParent: true,
     op: 'http.client',
-    origin: 'auto.http.node.undici',
     name: `${method} ${getSanitizedUrlString(url)}`,
-    data,
+    attributes,
   });
 }
diff --git a/packages/node/src/integrations/undici/types.ts b/packages/node/src/integrations/undici/types.ts
index b51da3da2d34..05732811dc68 100644
--- a/packages/node/src/integrations/undici/types.ts
+++ b/packages/node/src/integrations/undici/types.ts
@@ -224,7 +224,9 @@ export interface UndiciRequest {
   // Originally was Dispatcher.HttpMethod, but did not want to vendor that in.
   method?: string;
   path: string;
-  headers: string;
+  // string for undici@<=6.6.2 and string[] for undici@>=6.7.0.
+  // see for more information: https://github.com/getsentry/sentry-javascript/issues/10936
+  headers: string | string[];
   addHeader(key: string, value: string): RequestWithSentry;
 }
 
diff --git a/packages/node/src/integrations/utils/errorhandling.ts b/packages/node/src/integrations/utils/errorhandling.ts
index 5d3abb90afce..fc2a2c2b8e7b 100644
--- a/packages/node/src/integrations/utils/errorhandling.ts
+++ b/packages/node/src/integrations/utils/errorhandling.ts
@@ -20,6 +20,7 @@ export function logAndExitProcess(error: Error): void {
   if (client === undefined) {
     DEBUG_BUILD && logger.warn('No NodeClient was defined, we are exiting the process now.');
     global.process.exit(1);
+    return;
   }
 
   const options = client.getOptions();
diff --git a/packages/node/src/integrations/utils/http.ts b/packages/node/src/integrations/utils/http.ts
index 87982f5b3ba3..82319c2fcdb8 100644
--- a/packages/node/src/integrations/utils/http.ts
+++ b/packages/node/src/integrations/utils/http.ts
@@ -1,5 +1,5 @@
-import type * as http from 'http';
-import type * as https from 'https';
+import type * as http from 'node:http';
+import type * as https from 'node:https';
 import { URL } from 'url';
 
 import { NODE_VERSION } from '../../nodeVersion';
diff --git a/packages/node/src/proxy/helpers.ts b/packages/node/src/proxy/helpers.ts
index 119ffd9317ce..a5064408855d 100644
--- a/packages/node/src/proxy/helpers.ts
+++ b/packages/node/src/proxy/helpers.ts
@@ -27,8 +27,8 @@
  */
 
 /* eslint-disable jsdoc/require-jsdoc */
-import * as http from 'http';
-import * as https from 'https';
+import * as http from 'node:http';
+import * as https from 'node:https';
 import type { Readable } from 'stream';
 // TODO (v8): Remove this when Node < 12 is no longer supported
 import type { URL } from 'url';
diff --git a/packages/node/src/proxy/index.ts b/packages/node/src/proxy/index.ts
index 4129a9f65cd7..15c700ed3e62 100644
--- a/packages/node/src/proxy/index.ts
+++ b/packages/node/src/proxy/index.ts
@@ -28,7 +28,6 @@
 
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import assert from 'assert';
 import type * as http from 'http';
 import type { OutgoingHttpHeaders } from 'http';
 import * as net from 'net';
@@ -190,8 +189,6 @@ export class HttpsProxyAgent<Uri extends string> extends Agent {
     // Need to wait for the "socket" event to re-play the "data" events.
     req.once('socket', (s: net.Socket) => {
       debug('Replaying proxy buffer for failed request');
-      assert(s.listenerCount('data') > 0);
-
       // Replay the "buffered" Buffer onto the fake `socket`, since at
       // this point the HTTP module machinery has been hooked up for
       // the user.
diff --git a/packages/node/src/transports/http.ts b/packages/node/src/transports/http.ts
index 83d8bab5141a..a6a05fc07c95 100644
--- a/packages/node/src/transports/http.ts
+++ b/packages/node/src/transports/http.ts
@@ -1,5 +1,5 @@
-import * as http from 'http';
-import * as https from 'https';
+import * as http from 'node:http';
+import * as https from 'node:https';
 import { Readable } from 'stream';
 import { URL } from 'url';
 import { createGzip } from 'zlib';
diff --git a/packages/node/test/handlers.test.ts b/packages/node/test/handlers.test.ts
index 861cfdf13259..8a84cffd758a 100644
--- a/packages/node/test/handlers.test.ts
+++ b/packages/node/test/handlers.test.ts
@@ -1,7 +1,6 @@
 import * as http from 'http';
 import * as sentryCore from '@sentry/core';
 import {
-  Hub,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   Transaction,
   getClient,
@@ -151,6 +150,7 @@ describe('requestHandler', () => {
 
     setImmediate(() => {
       expect(flush).toHaveBeenCalledWith(1337);
+      // eslint-disable-next-line deprecation/deprecation
       expect(res.finished).toBe(true);
       done();
     });
@@ -164,6 +164,7 @@ describe('requestHandler', () => {
     res.end('ok');
 
     setImmediate(() => {
+      // eslint-disable-next-line deprecation/deprecation
       expect(res.finished).toBe(true);
       done();
     });
@@ -249,38 +250,38 @@ describe('tracingHandler', () => {
   }
 
   it('creates a transaction when handling a request', () => {
-    const startTransaction = jest.spyOn(sentryCore, 'startTransaction');
+    const startInactiveSpan = jest.spyOn(sentryCore, 'startInactiveSpan');
 
     sentryTracingMiddleware(req, res, next);
 
-    expect(startTransaction).toHaveBeenCalled();
+    expect(startInactiveSpan).toHaveBeenCalled();
   });
 
   it("doesn't create a transaction when handling a `HEAD` request", () => {
-    const startTransaction = jest.spyOn(sentryCore, 'startTransaction');
+    const startInactiveSpan = jest.spyOn(sentryCore, 'startInactiveSpan');
     req.method = 'HEAD';
 
     sentryTracingMiddleware(req, res, next);
 
-    expect(startTransaction).not.toHaveBeenCalled();
+    expect(startInactiveSpan).not.toHaveBeenCalled();
   });
 
   it("doesn't create a transaction when handling an `OPTIONS` request", () => {
-    const startTransaction = jest.spyOn(sentryCore, 'startTransaction');
+    const startInactiveSpan = jest.spyOn(sentryCore, 'startInactiveSpan');
     req.method = 'OPTIONS';
 
     sentryTracingMiddleware(req, res, next);
 
-    expect(startTransaction).not.toHaveBeenCalled();
+    expect(startInactiveSpan).not.toHaveBeenCalled();
   });
 
   it("doesn't create a transaction if tracing is disabled", () => {
     delete getClient()?.getOptions().tracesSampleRate;
-    const startTransaction = jest.spyOn(sentryCore, 'startTransaction');
+    const startInactiveSpan = jest.spyOn(sentryCore, 'startInactiveSpan');
 
     sentryTracingMiddleware(req, res, next);
 
-    expect(startTransaction).not.toHaveBeenCalled();
+    expect(startInactiveSpan).not.toHaveBeenCalled();
   });
 
   it("pulls parent's data from tracing header on the request", () => {
@@ -344,29 +345,6 @@ describe('tracingHandler', () => {
     expect(transaction.metadata?.dynamicSamplingContext).toStrictEqual({ version: '1.0', environment: 'production' });
   });
 
-  it('extracts request data for sampling context', () => {
-    const tracesSampler = jest.fn();
-    const options = getDefaultNodeClientOptions({ tracesSampler });
-    const client = new NodeClient(options);
-    setCurrentClient(client);
-
-    withScope(() => {
-      sentryTracingMiddleware(req, res, next);
-
-      expect(tracesSampler).toHaveBeenCalledWith(
-        expect.objectContaining({
-          request: {
-            headers,
-            method,
-            url: `http://${hostname}${path}?${queryString}`,
-            cookies: { favorite: 'zukes' },
-            query_string: queryString,
-          },
-        }),
-      );
-    });
-  });
-
   it('puts its transaction on the scope', () => {
     const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
     const client = new NodeClient(options);
@@ -398,7 +376,7 @@ describe('tracingHandler', () => {
   it('pulls status code from the response', done => {
     // eslint-disable-next-line deprecation/deprecation
     const transaction = new Transaction({ name: 'mockTransaction' });
-    jest.spyOn(sentryCore, 'startTransaction').mockReturnValue(transaction as Transaction);
+    jest.spyOn(sentryCore, 'startInactiveSpan').mockReturnValue(transaction as Transaction);
     const finishTransaction = jest.spyOn(transaction, 'end');
 
     sentryTracingMiddleware(req, res, next);
@@ -446,7 +424,7 @@ describe('tracingHandler', () => {
   it('closes the transaction when request processing is done', done => {
     // eslint-disable-next-line deprecation/deprecation
     const transaction = new Transaction({ name: 'mockTransaction' });
-    jest.spyOn(sentryCore, 'startTransaction').mockReturnValue(transaction as Transaction);
+    jest.spyOn(sentryCore, 'startInactiveSpan').mockReturnValue(transaction as Transaction);
     const finishTransaction = jest.spyOn(transaction, 'end');
 
     sentryTracingMiddleware(req, res, next);
@@ -461,13 +439,12 @@ describe('tracingHandler', () => {
   it('waits to finish transaction until all spans are finished, even though `transaction.end()` is registered on `res.finish` event first', done => {
     // eslint-disable-next-line deprecation/deprecation
     const transaction = new Transaction({ name: 'mockTransaction', sampled: true });
-    transaction.initSpanRecorder();
     // eslint-disable-next-line deprecation/deprecation
     const span = transaction.startChild({
       name: 'reallyCoolHandler',
       op: 'middleware',
     });
-    jest.spyOn(sentryCore, 'startTransaction').mockReturnValue(transaction as Transaction);
+    jest.spyOn(sentryCore, 'startInactiveSpan').mockReturnValue(transaction as Transaction);
     const finishSpan = jest.spyOn(span, 'end');
     const finishTransaction = jest.spyOn(transaction, 'end');
 
@@ -491,24 +468,6 @@ describe('tracingHandler', () => {
       done();
     });
   });
-
-  it('stores request in transaction metadata', () => {
-    const options = getDefaultNodeClientOptions({ tracesSampleRate: 1.0 });
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = new Hub(new NodeClient(options));
-
-    jest.spyOn(sentryCore, 'getCurrentHub').mockReturnValue(hub);
-    // eslint-disable-next-line deprecation/deprecation
-    jest.spyOn(sentryCore, 'getCurrentScope').mockImplementation(() => hub.getScope());
-
-    sentryTracingMiddleware(req, res, next);
-
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = getCurrentScope().getTransaction();
-
-    // eslint-disable-next-line deprecation/deprecation
-    expect(transaction?.metadata.request).toEqual(req);
-  });
 });
 
 describe('errorHandler()', () => {
diff --git a/packages/node/test/index.test.ts b/packages/node/test/index.test.ts
index c6fc8a611aee..8379ea34abf1 100644
--- a/packages/node/test/index.test.ts
+++ b/packages/node/test/index.test.ts
@@ -411,7 +411,7 @@ describe('SentryNode initialization', () => {
       expect(sdkData.version).toEqual(SDK_VERSION);
     });
 
-    // wrapper packages (like @sentry/serverless) set their SDK data in their `init` methods, which are
+    // wrapper packages (like @sentry/aws-serverless) set their SDK data in their `init` methods, which are
     // called before the client is instantiated, and we don't want to clobber that data
     it("shouldn't overwrite SDK data that's already there", () => {
       init({
@@ -419,10 +419,10 @@ describe('SentryNode initialization', () => {
         // this would normally be set by the wrapper SDK in init()
         _metadata: {
           sdk: {
-            name: 'sentry.javascript.serverless',
+            name: 'sentry.javascript.aws-serverless',
             packages: [
               {
-                name: 'npm:@sentry/serverless',
+                name: 'npm:@sentry/aws-serverless',
                 version: SDK_VERSION,
               },
             ],
@@ -433,8 +433,8 @@ describe('SentryNode initialization', () => {
 
       const sdkData = getClient()?.getOptions()._metadata?.sdk || {};
 
-      expect(sdkData.name).toEqual('sentry.javascript.serverless');
-      expect(sdkData.packages?.[0].name).toEqual('npm:@sentry/serverless');
+      expect(sdkData.name).toEqual('sentry.javascript.aws-serverless');
+      expect(sdkData.packages?.[0].name).toEqual('npm:@sentry/aws-serverless');
       expect(sdkData.packages?.[0].version).toEqual(SDK_VERSION);
       expect(sdkData.version).toEqual(SDK_VERSION);
     });
diff --git a/packages/node/test/integrations/http.test.ts b/packages/node/test/integrations/http.test.ts
index 0a0f8f16645b..00e642ae6e10 100644
--- a/packages/node/test/integrations/http.test.ts
+++ b/packages/node/test/integrations/http.test.ts
@@ -1,7 +1,7 @@
 import * as http from 'http';
 import * as https from 'https';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import type { Hub, SentrySpan } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getSpanDescendants, startSpan } from '@sentry/core';
+import type { Hub } from '@sentry/core';
 import { getCurrentHub, getIsolationScope, setCurrentClient } from '@sentry/core';
 import { Transaction } from '@sentry/core';
 import { getCurrentScope, setUser, spanToJSON, startInactiveSpan } from '@sentry/core';
@@ -55,7 +55,6 @@ describe('tracing', () => {
     });
 
     expect(transaction).toBeInstanceOf(Transaction);
-
     // eslint-disable-next-line deprecation/deprecation
     getCurrentScope().setSpan(transaction);
 
@@ -81,12 +80,10 @@ describe('tracing', () => {
     nock('http://dogs.are.great').get('/').reply(200);
 
     const transaction = createTransactionOnScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
     http.get('http://dogs.are.great/');
 
-    expect(spans.length).toEqual(2);
+    const spans = getSpanDescendants(transaction);
 
     // our span is at index 1 because the transaction itself is at index 0
     expect(spanToJSON(spans[1]).description).toEqual('GET http://dogs.are.great/');
@@ -97,11 +94,11 @@ describe('tracing', () => {
     nock('http://squirrelchasers.ingest.sentry.io').get('/api/12312012/store/').reply(200);
 
     const transaction = createTransactionOnScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
     http.get('http://squirrelchasers.ingest.sentry.io/api/12312012/store/');
 
+    const spans = getSpanDescendants(transaction);
+
     // only the transaction itself should be there
     expect(spans.length).toEqual(1);
     expect(spanToJSON(spans[0]).description).toEqual('dogpark');
@@ -209,19 +206,20 @@ describe('tracing', () => {
 
     const { traceId } = getCurrentScope().getPropagationContext();
 
-    const request = http.get('http://dogs.are.great/');
+    // Needs an outer span, or else we skip it
+    const request = startSpan({ name: 'outer' }, () => http.get('http://dogs.are.great/'));
     const sentryTraceHeader = request.getHeader('sentry-trace') as string;
     const baggageHeader = request.getHeader('baggage') as string;
 
     const parts = sentryTraceHeader.split('-');
 
-    // Should not include sampling decision since we don't wanna influence the tracing decisions downstream
-    expect(parts.length).toEqual(2);
+    expect(parts.length).toEqual(3);
     expect(parts[0]).toEqual(traceId);
     expect(parts[1]).toEqual(expect.any(String));
+    expect(parts[2]).toEqual('1');
 
     expect(baggageHeader).toEqual(
-      `sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId}`,
+      `sentry-environment=production,sentry-release=1.0.0,sentry-public_key=dogsarebadatkeepingsecrets,sentry-trace_id=${traceId},sentry-sample_rate=1,sentry-transaction=outer,sentry-sampled=true`,
     );
   });
 
@@ -239,7 +237,8 @@ describe('tracing', () => {
       },
     });
 
-    const request = http.get('http://dogs.are.great/');
+    // Needs an outer span, or else we skip it
+    const request = startSpan({ name: 'outer' }, () => http.get('http://dogs.are.great/'));
     const sentryTraceHeader = request.getHeader('sentry-trace') as string;
     const baggageHeader = request.getHeader('baggage') as string;
 
@@ -263,11 +262,11 @@ describe('tracing', () => {
     nock('http://dogs.are.great').get('/spaniel?tail=wag&cute=true#learn-more').reply(200);
 
     const transaction = createTransactionOnScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
     http.get('http://dogs.are.great/spaniel?tail=wag&cute=true#learn-more');
 
+    const spans = getSpanDescendants(transaction);
+
     expect(spans.length).toEqual(2);
 
     // our span is at index 1 because the transaction itself is at index 0
@@ -286,11 +285,11 @@ describe('tracing', () => {
     nock('http://dogs.are.great').get('/spaniel?tail=wag&cute=true#learn-more').reply(200);
 
     const transaction = createTransactionOnScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
     http.request({ method: 'GET', host: 'dogs.are.great', path: '/spaniel?tail=wag&cute=true#learn-more' });
 
+    const spans = getSpanDescendants(transaction);
+
     expect(spans.length).toEqual(2);
 
     const spanAttributes = spanToJSON(spans[1]).data || {};
@@ -314,11 +313,11 @@ describe('tracing', () => {
     nock(`http://${auth}@dogs.are.great`).get('/').reply(200);
 
     const transaction = createTransactionOnScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
     http.get(`http://${auth}@dogs.are.great/`);
 
+    const spans = getSpanDescendants(transaction);
+
     expect(spans.length).toEqual(2);
 
     // our span is at index 1 because the transaction itself is at index 0
@@ -374,11 +373,11 @@ describe('tracing', () => {
         );
 
         const transaction = createTransactionAndPutOnScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
         const request = http.get(url);
 
+        const spans = getSpanDescendants(transaction);
+
         // There should be no http spans
         const httpSpans = spans.filter(span => spanToJSON(span).op?.startsWith('http'));
         expect(httpSpans.length).toBe(0);
@@ -483,11 +482,11 @@ describe('tracing', () => {
         );
 
         const transaction = createTransactionAndPutOnScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const spans = (transaction as unknown as SentrySpan).spanRecorder?.spans as SentrySpan[];
 
         const request = http.get(url);
 
+        const spans = getSpanDescendants(transaction);
+
         // There should be no http spans
         const httpSpans = spans.filter(span => spanToJSON(span).op?.startsWith('http'));
         expect(httpSpans.length).toBe(0);
diff --git a/packages/node/test/integrations/undici.test.ts b/packages/node/test/integrations/undici.test.ts
index 381251d83edd..37a53b5e29c6 100644
--- a/packages/node/test/integrations/undici.test.ts
+++ b/packages/node/test/integrations/undici.test.ts
@@ -6,6 +6,7 @@ import {
   getCurrentScope,
   getIsolationScope,
   getMainCarrier,
+  getSpanDescendants,
   setCurrentClient,
   spanToJSON,
   startSpan,
@@ -125,8 +126,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       await fetch(request, requestInit);
 
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      const spans = getSpanDescendants(outerSpan);
 
       expect(spans.length).toBe(2);
 
@@ -144,8 +144,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       }
 
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      const spans = getSpanDescendants(outerSpan);
 
       expect(spans.length).toBe(2);
 
@@ -165,8 +164,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       }
 
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      const spans = getSpanDescendants(outerSpan);
 
       expect(spans.length).toBe(2);
 
@@ -187,8 +185,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
       }
 
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      const spans = getSpanDescendants(outerSpan);
 
       expect(spans.length).toBe(1);
     });
@@ -207,18 +204,17 @@ conditionalTest({ min: 16 })('Undici integration', () => {
   it('does create a span if `shouldCreateSpanForRequest` is defined', async () => {
     await startSpan({ name: 'outer-span' }, async outerSpan => {
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      expect(getSpanDescendants(outerSpan).length).toBe(1);
 
       const undoPatch = patchUndici({ shouldCreateSpanForRequest: url => url.includes('yes') });
 
       await fetch('http://localhost:18100/no', { method: 'POST' });
 
-      expect(spans.length).toBe(1);
+      expect(getSpanDescendants(outerSpan).length).toBe(1);
 
       await fetch('http://localhost:18100/yes', { method: 'POST' });
 
-      expect(spans.length).toBe(2);
+      expect(getSpanDescendants(outerSpan).length).toBe(2);
 
       undoPatch();
     });
@@ -232,15 +228,14 @@ conditionalTest({ min: 16 })('Undici integration', () => {
     await withIsolationScope(async () => {
       await startSpan({ name: 'outer-span' }, async outerSpan => {
         expect(outerSpan).toBeInstanceOf(Transaction);
-        // eslint-disable-next-line deprecation/deprecation
-        const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+        const spans = getSpanDescendants(outerSpan);
 
         await fetch('http://localhost:18100', { method: 'POST' });
 
         expect(spans.length).toBe(2);
         const span = spans[1];
 
-        expect(requestHeaders['sentry-trace']).toEqual(spanToTraceHeader(span!));
+        expect(requestHeaders['sentry-trace']).toEqual(spanToTraceHeader(span));
         expect(requestHeaders['baggage']).toEqual(
           `sentry-environment=production,sentry-public_key=0,sentry-trace_id=${
             span.spanContext().traceId
@@ -307,8 +302,7 @@ conditionalTest({ min: 16 })('Undici integration', () => {
 
     await startSpan({ name: 'outer-span' }, async outerSpan => {
       expect(outerSpan).toBeInstanceOf(Transaction);
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (outerSpan as Transaction).spanRecorder?.spans || [];
+      const spans = getSpanDescendants(outerSpan);
 
       expect(spans.length).toBe(1);
 
@@ -498,6 +492,7 @@ function setupTestServer() {
     res.end();
 
     // also terminate socket because keepalive hangs connection a bit
+    // eslint-disable-next-line deprecation/deprecation
     res.connection?.end();
   });
 
diff --git a/packages/node/test/manual/memory-leak/README.md b/packages/node/test/manual/memory-leak/README.md
index 3d20f607686f..844c6ffe7391 100644
--- a/packages/node/test/manual/memory-leak/README.md
+++ b/packages/node/test/manual/memory-leak/README.md
@@ -1,26 +1,36 @@
 # Manual Tests
 
 ## How this works
-`express-patient.js` is an express app with a collection of endpoints that exercise various functionalities of @sentry/node, including exception capturing, contexts, autobreadcrumbs, and the express middleware.
 
-It uses [memwatch-next](https://www.npmjs.com/package/memwatch-next) to record memory usage after each GC. `manager.js` does some child process stuff to have a fresh patient process for each test scenario, while poke-patient.sh uses apache bench to send a bunch of traffic so we can see what happens.
+`express-patient.js` is an express app with a collection of endpoints that exercise various functionalities of
+@sentry/node, including exception capturing, contexts, autobreadcrumbs, and the express middleware.
+
+It uses [memwatch-next](https://www.npmjs.com/package/memwatch-next) to record memory usage after each GC. `manager.js`
+does some child process stuff to have a fresh patient process for each test scenario, while poke-patient.sh uses apache
+bench to send a bunch of traffic so we can see what happens.
 
 ## Routes and what we test
+
 The @sentry/node express middleware is used on all endpoints, so each request constitutes its own context.
+
 - `/hello`: just send a basic response without doing anything
 - `/context/basic`: `setContext` call
 - `/breadcrumbs/capture`: manual `captureBreadcrumb` call
 - `/breadcrumbs/auto/console`: console log with console autoBreadcrumbs enabled
 - `/breadcrumbs/auto/http`: send an http request with http autoBreadcrumbs enabled
   - uses nock to mock the response, not actual request
-- If the request has querystring param `doError=true`, we pass an error via Express's error handling mechanism with `next(new Error(responseText))` which will then be captured by the @sentry/node express middleware error handler.
+- If the request has querystring param `doError=true`, we pass an error via Express's error handling mechanism with
+  `next(new Error(responseText))` which will then be captured by the @sentry/node express middleware error handler.
   - We test all 5 above cases with and without `doError=true`
 
-We also have a `/gc` endpoint for forcing a garbage collection; this is used at the end of each test scenario to see final memory usage.
+We also have a `/gc` endpoint for forcing a garbage collection; this is used at the end of each test scenario to see
+final memory usage.
 
-Note: there's a `/capture` endpoint which does a basic `captureException` call 1000 times. That's our current problem child requiring some more investigation on its memory usage.
+Note: there's a `/capture` endpoint which does a basic `captureException` call 1000 times. That's our current problem
+child requiring some more investigation on its memory usage.
 
 ## How to run it
+
 ```bash
 npm install memwatch-next nock
 node manager.js
@@ -29,10 +39,17 @@ curl localhost:3000/capture
 ```
 
 ## Why this can't be more automated
-Some objects can have long lifecycles or not be cleaned up by GC when you think they would be, and so it isn't straightforward to make the assertion "memory usage should have returned to baseline by now". Also, when the numbers look bad, it's pretty obvious to a trained eye that they're bad, but it can be hard to quantify an exact threshold of pass or fail.
+
+Some objects can have long lifecycles or not be cleaned up by GC when you think they would be, and so it isn't
+straightforward to make the assertion "memory usage should have returned to baseline by now". Also, when the numbers
+look bad, it's pretty obvious to a trained eye that they're bad, but it can be hard to quantify an exact threshold of
+pass or fail.
 
 ## Interpreting results
-Starting the manager and then running `ab -c 5 -n 5000 /context/basic && sleep 1 && curl localhost:3000/gc` will get us this output:
+
+Starting the manager and then running `ab -c 5 -n 5000 /context/basic && sleep 1 && curl localhost:3000/gc` will get us
+this output:
+
 <details>
 ```
 :[/Users/lewis/dev/raven-node/test/manual]#memleak-tests?$ node manager.js
@@ -52,6 +69,7 @@ gc #7: min 11673824, max 16864536, est base 11673824, curr base 11673824
 This test stores some basic data in the request's Raven context, with the hope being for that context data to go out of scope and be garbage collected after the request is over. We can see that we start at a base of ~11.6MB, go up to ~16.8MB during the test, and then return to ~11.6MB. Everything checks out, no memory leak issue here.
 
 Back when we had a memory leak in `captureException`, if we started the manager and ran:
+
 ```shell
 ab -c 5 -n 5000 localhost:3000/context/basic?doError=true && sleep 5 && curl localhost:3000/gc
 sleep 5
@@ -61,7 +79,9 @@ curl localhost:3000/gc
 sleep 15
 curl localhost:3000/gc
 ```
+
 we'd get this output:
+
 <details>
 ```
 [/Users/lewis/dev/raven-node/test/manual]#memleak-tests?$ node manager.js
diff --git a/packages/node/test/performance.test.ts b/packages/node/test/performance.test.ts
index 0d528e37f7e2..b8a0d34cb054 100644
--- a/packages/node/test/performance.test.ts
+++ b/packages/node/test/performance.test.ts
@@ -81,6 +81,7 @@ describe('startSpan()', () => {
 
     const transactionEvent = await transactionEventPromise;
 
+    expect(transactionEvent.spans).toHaveLength(1);
     expect(transactionEvent.spans?.[0].description).toBe('second');
   });
 });
@@ -106,7 +107,7 @@ describe('startSpanManual()', () => {
     startSpanManual({ name: 'first' }, span => {
       return new Promise<void>(resolve => {
         setTimeout(() => {
-          span?.end();
+          span.end();
           resolve();
         }, 500);
       });
@@ -115,7 +116,7 @@ describe('startSpanManual()', () => {
     startSpanManual({ name: 'second' }, span => {
       return new Promise<void>(resolve => {
         setTimeout(() => {
-          span?.end();
+          span.end();
           resolve();
         }, 500);
       });
@@ -182,7 +183,7 @@ describe('startSpanManual()', () => {
             isolationScope2.setTag('isolationScope', 2);
             withScope(scope2 => {
               scope2.setTag('scope', 2);
-              span?.end();
+              span.end();
             });
           });
         });
diff --git a/packages/node/test/transports/http.test.ts b/packages/node/test/transports/http.test.ts
index 3b3d969af5e7..d7f4535b6b6d 100644
--- a/packages/node/test/transports/http.test.ts
+++ b/packages/node/test/transports/http.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import * as http from 'http';
 
 import { createGunzip } from 'zlib';
@@ -50,7 +51,9 @@ function setupTestServer(
     res.end();
 
     // also terminate socket because keepalive hangs connection a bit
-    res.connection.end();
+    if (res.connection) {
+      res.connection.end();
+    }
   });
 
   testServer.listen(18099);
diff --git a/packages/node/test/transports/https.test.ts b/packages/node/test/transports/https.test.ts
index 58e3cb6c7faa..d6782293e666 100644
--- a/packages/node/test/transports/https.test.ts
+++ b/packages/node/test/transports/https.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable deprecation/deprecation */
 import * as http from 'http';
 import * as https from 'https';
 import { createTransport } from '@sentry/core';
@@ -49,7 +50,9 @@ function setupTestServer(
     res.end();
 
     // also terminate socket because keepalive hangs connection a bit
-    res.connection.end();
+    if (res.connection) {
+      res.connection.end();
+    }
   });
 
   testServer.listen(8099);
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
index 5fc0658105eb..d38a5701a2bf 100644
--- a/packages/node/tsconfig.json
+++ b/packages/node/tsconfig.json
@@ -4,6 +4,6 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "lib": ["es6"]
+    "lib": ["es2017"]
   }
 }
diff --git a/packages/opentelemetry/README.md b/packages/opentelemetry/README.md
index 18ae5e9572d0..66fcb1a9e287 100644
--- a/packages/opentelemetry/README.md
+++ b/packages/opentelemetry/README.md
@@ -34,7 +34,8 @@ Note that `@sentry/opentelemetry` depends on the following peer dependencies:
 
 ## Usage
 
-This package exposes a few building blocks you can add to your OpenTelemetry setup in order to capture OpenTelemetry traces to Sentry.
+This package exposes a few building blocks you can add to your OpenTelemetry setup in order to capture OpenTelemetry
+traces to Sentry.
 
 This is how you can use this in your app:
 
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 18580c872a98..903d641a103b 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/opentelemetry/rollup.npm.config.mjs b/packages/opentelemetry/rollup.npm.config.mjs
index 84a06f2fb64a..fd61fbf7c62c 100644
--- a/packages/opentelemetry/rollup.npm.config.mjs
+++ b/packages/opentelemetry/rollup.npm.config.mjs
@@ -1,3 +1,14 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-export default makeNPMConfigVariants(makeBaseNPMConfig());
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    packageSpecificConfig: {
+      output: {
+        // set exports to 'named' or 'auto' so that rollup doesn't warn
+        exports: 'named',
+        // set preserveModules to false because we want to bundle everything into one file.
+        preserveModules: false,
+      },
+    },
+  }),
+);
diff --git a/packages/opentelemetry/src/asyncContextStrategy.ts b/packages/opentelemetry/src/asyncContextStrategy.ts
index 95c4abaa3138..75169ab933ed 100644
--- a/packages/opentelemetry/src/asyncContextStrategy.ts
+++ b/packages/opentelemetry/src/asyncContextStrategy.ts
@@ -1,5 +1,6 @@
 import * as api from '@opentelemetry/api';
 import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';
+import type { withActiveSpan as defaultWithActiveSpan } from '@sentry/core';
 import type { Hub, Scope } from '@sentry/types';
 
 import {
@@ -8,8 +9,10 @@ import {
   SENTRY_FORK_SET_SCOPE_CONTEXT_KEY,
 } from './constants';
 import { getCurrentHub as _getCurrentHub } from './custom/getCurrentHub';
+import { startInactiveSpan, startSpan, startSpanManual, withActiveSpan } from './trace';
 import type { CurrentScopes } from './types';
 import { getScopesFromContext } from './utils/contextData';
+import { getActiveSpan } from './utils/getActiveSpan';
 
 /**
  * Sets the async context strategy to use follow the OTEL context under the hood.
@@ -112,5 +115,12 @@ export function setOpenTelemetryContextAsyncContextStrategy(): void {
     withIsolationScope,
     getCurrentScope,
     getIsolationScope,
+    startSpan,
+    startSpanManual,
+    startInactiveSpan,
+    getActiveSpan,
+    // The types here don't fully align, because our own `Span` type is narrower
+    // than the OTEL one - but this is OK for here, as we now we'll only have OTEL spans passed around
+    withActiveSpan: withActiveSpan as typeof defaultWithActiveSpan,
   });
 }
diff --git a/packages/opentelemetry/src/constants.ts b/packages/opentelemetry/src/constants.ts
index 0826ee6cb653..e153d50b0180 100644
--- a/packages/opentelemetry/src/constants.ts
+++ b/packages/opentelemetry/src/constants.ts
@@ -2,11 +2,10 @@ import { createContextKey } from '@opentelemetry/api';
 
 export const SENTRY_TRACE_HEADER = 'sentry-trace';
 export const SENTRY_BAGGAGE_HEADER = 'baggage';
-export const SENTRY_TRACE_STATE_DSC = 'sentry.trace';
-export const SENTRY_TRACE_STATE_PARENT_SPAN_ID = 'sentry.parent_span_id';
 
-/** Context Key to hold a Hub. */
-export const SENTRY_HUB_CONTEXT_KEY = createContextKey('sentry_hub');
+export const SENTRY_TRACE_STATE_DSC = 'sentry.dsc';
+export const SENTRY_TRACE_STATE_PARENT_SPAN_ID = 'sentry.parent_span_id';
+export const SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING = 'sentry.sampled_not_recording';
 
 export const SENTRY_SCOPES_CONTEXT_KEY = createContextKey('sentry_scopes');
 
diff --git a/packages/opentelemetry/src/contextManager.ts b/packages/opentelemetry/src/contextManager.ts
index 9036667c2b40..43568fb34398 100644
--- a/packages/opentelemetry/src/contextManager.ts
+++ b/packages/opentelemetry/src/contextManager.ts
@@ -7,8 +7,7 @@ import {
   SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY,
   SENTRY_FORK_SET_SCOPE_CONTEXT_KEY,
 } from './constants';
-import { getCurrentHub } from './custom/getCurrentHub';
-import { getScopesFromContext, setContextOnScope, setHubOnContext, setScopesOnContext } from './utils/contextData';
+import { getScopesFromContext, setContextOnScope, setScopesOnContext } from './utils/contextData';
 import { setIsSetup } from './utils/setupCheck';
 
 /**
@@ -59,25 +58,17 @@ export function wrapContextManagerClass<ContextManagerInstance extends ContextMa
         isolationScope || (shouldForkIsolationScope ? currentIsolationScope.clone() : currentIsolationScope);
       const scopes = { scope: newCurrentScope, isolationScope: newIsolationScope };
 
-      const mockHub = {
-        // eslint-disable-next-line deprecation/deprecation
-        ...getCurrentHub(),
-        getScope: () => newCurrentScope,
-        getIsolationScope: () => newIsolationScope,
-      };
-
-      const ctx1 = setHubOnContext(context, mockHub);
-      const ctx2 = setScopesOnContext(ctx1, scopes);
+      const ctx1 = setScopesOnContext(context, scopes);
 
       // Remove the unneeded values again
-      const ctx3 = ctx2
+      const ctx2 = ctx1
         .deleteValue(SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY)
         .deleteValue(SENTRY_FORK_SET_SCOPE_CONTEXT_KEY)
         .deleteValue(SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY);
 
-      setContextOnScope(newCurrentScope, ctx3);
+      setContextOnScope(newCurrentScope, ctx2);
 
-      return super.with(ctx3, fn, thisArg, ...args);
+      return super.with(ctx2, fn, thisArg, ...args);
     }
   }
 
diff --git a/packages/opentelemetry/src/custom/getCurrentHub.ts b/packages/opentelemetry/src/custom/getCurrentHub.ts
index 36699561aa99..4c257e037e38 100644
--- a/packages/opentelemetry/src/custom/getCurrentHub.ts
+++ b/packages/opentelemetry/src/custom/getCurrentHub.ts
@@ -1,14 +1,4 @@
-import type {
-  Client,
-  CustomSamplingContext,
-  EventHint,
-  Hub,
-  Integration,
-  IntegrationClass,
-  Scope,
-  SeverityLevel,
-  TransactionContext,
-} from '@sentry/types';
+import type { Client, EventHint, Hub, Integration, IntegrationClass, Scope, SeverityLevel } from '@sentry/types';
 
 import {
   addBreadcrumb,
@@ -76,18 +66,6 @@ export function getCurrentHub(): Hub {
       return getClient()?.getIntegration(integration) || null;
     },
 
-    startTransaction(
-      _context: TransactionContext,
-      _customSamplingContext?: CustomSamplingContext,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ): any {
-      // eslint-disable-next-line no-console
-      console.warn('startTransaction is a noop in @sentry/opentelemetry. Use `startSpan` instead.');
-      // We return an object here as hub.ts checks for the result of this
-      // and renders a different warning if this is empty
-      return {};
-    },
-
     startSession,
 
     endSession,
diff --git a/packages/opentelemetry/src/custom/hubextensions.ts b/packages/opentelemetry/src/custom/hubextensions.ts
deleted file mode 100644
index a70cb1aaca33..000000000000
--- a/packages/opentelemetry/src/custom/hubextensions.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { addTracingExtensions as _addTracingExtensions, getMainCarrier } from '@sentry/core';
-import type { CustomSamplingContext, TransactionContext } from '@sentry/types';
-import { consoleSandbox } from '@sentry/utils';
-
-/**
- * Add tracing extensions, ensuring a patched `startTransaction` to work with OTEL.
- */
-export function addTracingExtensions(): void {
-  _addTracingExtensions();
-
-  const carrier = getMainCarrier();
-  if (!carrier.__SENTRY__) {
-    return;
-  }
-
-  carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};
-  if (carrier.__SENTRY__.extensions.startTransaction !== startTransactionNoop) {
-    carrier.__SENTRY__.extensions.startTransaction = startTransactionNoop;
-  }
-}
-
-function startTransactionNoop(
-  _transactionContext: TransactionContext,
-  _customSamplingContext?: CustomSamplingContext,
-): unknown {
-  consoleSandbox(() => {
-    // eslint-disable-next-line no-console
-    console.warn('startTransaction is a noop in @sentry/opentelemetry. Use `startSpan` instead.');
-  });
-  // We return an object here as hub.ts checks for the result of this
-  // and renders a different warning if this is empty
-  return {};
-}
diff --git a/packages/opentelemetry/src/custom/transaction.ts b/packages/opentelemetry/src/custom/transaction.ts
deleted file mode 100644
index 5cd84892932b..000000000000
--- a/packages/opentelemetry/src/custom/transaction.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { Hub } from '@sentry/core';
-import { Transaction } from '@sentry/core';
-import type { Hub as HubInterface, TransactionContext } from '@sentry/types';
-
-/**
- * This is a fork of core's tracing/hubextensions.ts _startTransaction,
- * with some OTEL specifics.
- */
-export function startTransaction(hub: HubInterface, transactionContext: TransactionContext): Transaction {
-  // eslint-disable-next-line deprecation/deprecation
-  const client = hub.getClient();
-
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = new Transaction(transactionContext, hub as Hub);
-  // Since we do not do sampling here, we assume that this is _always_ sampled
-  // Any sampling decision happens in OpenTelemetry's sampler
-  transaction.initSpanRecorder();
-
-  if (client) {
-    client.emit('startTransaction', transaction);
-  }
-  return transaction;
-}
diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts
index aa5478e3f877..abf6640bca5c 100644
--- a/packages/opentelemetry/src/index.ts
+++ b/packages/opentelemetry/src/index.ts
@@ -1,4 +1,3 @@
-import { addOriginToSpan } from './utils/addOriginToSpan';
 import { maybeCaptureExceptionForTimedEvent } from './utils/captureExceptionForTimedEvent';
 import { getRequestSpanData } from './utils/getRequestSpanData';
 
@@ -6,13 +5,7 @@ export type { OpenTelemetryClient } from './types';
 export { wrapClientClass } from './custom/client';
 
 export { getSpanKind } from './utils/getSpanKind';
-export {
-  getSpanHub,
-  getSpanMetadata,
-  getSpanParent,
-  setSpanMetadata,
-  getSpanScopes,
-} from './utils/spanData';
+export { getSpanScopes } from './utils/spanData';
 
 export { getScopesFromContext } from './utils/contextData';
 
@@ -25,16 +18,17 @@ export {
   spanHasStatus,
 } from './utils/spanTypes';
 
+export { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
+
 export { isSentryRequestSpan } from './utils/isSentryRequest';
 
-export { getActiveSpan, getRootSpan } from './utils/getActiveSpan';
-export { startSpan, startSpanManual, startInactiveSpan, withActiveSpan } from './trace';
+export { getActiveSpan } from './utils/getActiveSpan';
+export { startSpan, startSpanManual, startInactiveSpan, withActiveSpan, continueTrace } from './trace';
 
 // eslint-disable-next-line deprecation/deprecation
 export { setupGlobalHub } from './custom/hub';
 // eslint-disable-next-line deprecation/deprecation
 export { getCurrentHub } from './custom/getCurrentHub';
-export { addTracingExtensions } from './custom/hubextensions';
 export { setupEventContextTrace } from './setupEventContextTrace';
 
 export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrategy';
@@ -53,7 +47,6 @@ export { getClient } from '@sentry/core';
  * @hidden
  */
 const _INTERNAL = {
-  addOriginToSpan,
   maybeCaptureExceptionForTimedEvent,
   getRequestSpanData,
 } as const;
diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index bfdc6ecf970c..39be6c4d764c 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -1,6 +1,8 @@
 import type { Baggage, Context, SpanContext, TextMapGetter, TextMapSetter } from '@opentelemetry/api';
+import { context } from '@opentelemetry/api';
 import { TraceFlags, propagation, trace } from '@opentelemetry/api';
 import { TraceState, W3CBaggagePropagator, isTracingSuppressed } from '@opentelemetry/core';
+import type { continueTrace } from '@sentry/core';
 import { getClient, getCurrentScope, getDynamicSamplingContextFromClient, getIsolationScope } from '@sentry/core';
 import type { DynamicSamplingContext, PropagationContext } from '@sentry/types';
 import {
@@ -16,18 +18,20 @@ import {
   SENTRY_TRACE_HEADER,
   SENTRY_TRACE_STATE_DSC,
   SENTRY_TRACE_STATE_PARENT_SPAN_ID,
+  SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING,
 } from './constants';
 import { getScopesFromContext, setScopesOnContext } from './utils/contextData';
 import { setIsSetup } from './utils/setupCheck';
 
 /** Get the Sentry propagation context from a span context. */
 export function getPropagationContextFromSpanContext(spanContext: SpanContext): PropagationContext {
-  const { traceId, spanId, traceFlags, traceState } = spanContext;
+  const { traceId, spanId, traceState } = spanContext;
 
   const dscString = traceState ? traceState.get(SENTRY_TRACE_STATE_DSC) : undefined;
   const dsc = dscString ? baggageHeaderToDynamicSamplingContext(dscString) : undefined;
   const parentSpanId = traceState ? traceState.get(SENTRY_TRACE_STATE_PARENT_SPAN_ID) : undefined;
-  const sampled = traceFlags === TraceFlags.SAMPLED;
+
+  const sampled = getSamplingDecision(spanContext);
 
   return {
     traceId,
@@ -78,32 +82,18 @@ export class SentryPropagator extends W3CBaggagePropagator {
    */
   public extract(context: Context, carrier: unknown, getter: TextMapGetter): Context {
     const maybeSentryTraceHeader: string | string[] | undefined = getter.get(carrier, SENTRY_TRACE_HEADER);
-    const maybeBaggageHeader = getter.get(carrier, SENTRY_BAGGAGE_HEADER);
+    const baggage = getter.get(carrier, SENTRY_BAGGAGE_HEADER);
 
-    const sentryTraceHeader = maybeSentryTraceHeader
+    const sentryTrace = maybeSentryTraceHeader
       ? Array.isArray(maybeSentryTraceHeader)
         ? maybeSentryTraceHeader[0]
         : maybeSentryTraceHeader
       : undefined;
 
-    const propagationContext = propagationContextFromHeaders(sentryTraceHeader, maybeBaggageHeader);
-
-    // We store the DSC as OTEL trace state on the span context
-    const traceState = makeTraceState({
-      parentSpanId: propagationContext.parentSpanId,
-      dsc: propagationContext.dsc,
-    });
-
-    const spanContext: SpanContext = {
-      traceId: propagationContext.traceId,
-      spanId: propagationContext.parentSpanId || '',
-      isRemote: true,
-      traceFlags: propagationContext.sampled === true ? TraceFlags.SAMPLED : TraceFlags.NONE,
-      traceState,
-    };
+    const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
 
     // Add remote parent span context,
-    const ctxWithSpanContext = trace.setSpanContext(context, spanContext);
+    const ctxWithSpanContext = getContextWithRemoteActiveSpan(context, { sentryTrace, baggage });
 
     // Also update the scope on the context (to be sure this is picked up everywhere)
     const scopes = getScopesFromContext(ctxWithSpanContext);
@@ -128,8 +118,13 @@ export class SentryPropagator extends W3CBaggagePropagator {
 export function makeTraceState({
   parentSpanId,
   dsc,
-}: { parentSpanId?: string; dsc?: Partial<DynamicSamplingContext> }): TraceState | undefined {
-  if (!parentSpanId && !dsc) {
+  sampled,
+}: {
+  parentSpanId?: string;
+  dsc?: Partial<DynamicSamplingContext>;
+  sampled?: boolean;
+}): TraceState | undefined {
+  if (!parentSpanId && !dsc && sampled !== false) {
     return undefined;
   }
 
@@ -140,7 +135,11 @@ export function makeTraceState({
     ? new TraceState().set(SENTRY_TRACE_STATE_PARENT_SPAN_ID, parentSpanId)
     : new TraceState();
 
-  return dscString ? traceStateBase.set(SENTRY_TRACE_STATE_DSC, dscString) : traceStateBase;
+  const traceStateWithDsc = dscString ? traceStateBase.set(SENTRY_TRACE_STATE_DSC, dscString) : traceStateBase;
+
+  // We also specifically want to store if this is sampled to be not recording,
+  // or unsampled (=could be either sampled or not)
+  return sampled === false ? traceStateWithDsc.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1') : traceStateWithDsc;
 }
 
 function getInjectionData(context: Context): {
@@ -161,7 +160,7 @@ function getInjectionData(context: Context): {
       dynamicSamplingContext,
       traceId: spanContext.traceId,
       spanId: spanContext.spanId,
-      sampled: spanContext.traceFlags === TraceFlags.SAMPLED,
+      sampled: getSamplingDecision(spanContext),
     };
   }
 
@@ -188,7 +187,7 @@ function getInjectionData(context: Context): {
       dynamicSamplingContext,
       traceId: spanContext.traceId,
       spanId: spanContext.spanId,
-      sampled: spanContext.traceFlags === TraceFlags.SAMPLED,
+      sampled: getSamplingDecision(spanContext),
     };
   }
 
@@ -221,3 +220,79 @@ function getDynamicSamplingContext(
 
   return undefined;
 }
+
+function getContextWithRemoteActiveSpan(
+  ctx: Context,
+  { sentryTrace, baggage }: Parameters<typeof continueTrace>[0],
+): Context {
+  const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
+
+  // We store the DSC as OTEL trace state on the span context
+  const traceState = makeTraceState({
+    parentSpanId: propagationContext.parentSpanId,
+    dsc: propagationContext.dsc,
+    sampled: propagationContext.sampled,
+  });
+
+  const spanContext: SpanContext = {
+    traceId: propagationContext.traceId,
+    spanId: propagationContext.parentSpanId || '',
+    isRemote: true,
+    traceFlags: propagationContext.sampled ? TraceFlags.SAMPLED : TraceFlags.NONE,
+    traceState,
+  };
+
+  return trace.setSpanContext(ctx, spanContext);
+}
+
+/**
+ * Takes trace strings and propagates them as a remote active span.
+ * This should be used in addition to `continueTrace` in OTEL-powered environments.
+ */
+export function continueTraceAsRemoteSpan<T>(
+  ctx: Context,
+  options: Parameters<typeof continueTrace>[0],
+  callback: () => T,
+): T {
+  const ctxWithSpanContext = getContextWithRemoteActiveSpan(ctx, options);
+
+  return context.with(ctxWithSpanContext, callback);
+}
+
+/**
+ * OpenTelemetry only knows about SAMPLED or NONE decision,
+ * but for us it is important to differentiate between unset and unsampled.
+ *
+ * Both of these are identified as `traceFlags === TracegFlags.NONE`,
+ * but we additionally look at a special trace state to differentiate between them.
+ */
+export function getSamplingDecision(spanContext: SpanContext): boolean | undefined {
+  const { traceFlags, traceState } = spanContext;
+
+  const sampledNotRecording = traceState ? traceState.get(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING) === '1' : false;
+
+  // If trace flag is `SAMPLED`, we interpret this as sampled
+  // If it is `NONE`, it could mean either it was sampled to be not recorder, or that it was not sampled at all
+  // For us this is an important difference, sow e look at the SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING
+  // to identify which it is
+  if (traceFlags === TraceFlags.SAMPLED) {
+    return true;
+  }
+
+  if (sampledNotRecording) {
+    return false;
+  }
+
+  // Fall back to DSC as a last resort, that may also contain `sampled`...
+  const dscString = traceState ? traceState.get(SENTRY_TRACE_STATE_DSC) : undefined;
+  const dsc = dscString ? baggageHeaderToDynamicSamplingContext(dscString) : undefined;
+
+  if (dsc?.sampled === 'true') {
+    return true;
+  }
+  if (dsc?.sampled === 'false') {
+    return false;
+  }
+
+  return undefined;
+}
diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts
index 805824834add..9ae0b60699ca 100644
--- a/packages/opentelemetry/src/sampler.ts
+++ b/packages/opentelemetry/src/sampler.ts
@@ -1,15 +1,15 @@
-/* eslint-disable no-bitwise */
 import type { Attributes, Context, SpanContext } from '@opentelemetry/api';
-import { TraceFlags, isSpanContextValid, trace } from '@opentelemetry/api';
+import { isSpanContextValid, trace } from '@opentelemetry/api';
+import { TraceState } from '@opentelemetry/core';
 import type { Sampler, SamplingResult } from '@opentelemetry/sdk-trace-base';
 import { SamplingDecision } from '@opentelemetry/sdk-trace-base';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, hasTracingEnabled } from '@sentry/core';
 import type { Client, ClientOptions, SamplingContext } from '@sentry/types';
 import { isNaN, logger } from '@sentry/utils';
+import { SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING } from './constants';
 
 import { DEBUG_BUILD } from './debug-build';
-import { getPropagationContextFromSpanContext } from './propagator';
-import { InternalSentrySemanticAttributes } from './semanticAttributes';
+import { getPropagationContextFromSpanContext, getSamplingDecision } from './propagator';
 import { setIsSetup } from './utils/setupCheck';
 
 /**
@@ -39,6 +39,7 @@ export class SentrySampler implements Sampler {
     }
 
     const parentContext = trace.getSpanContext(context);
+    const traceState = parentContext?.traceState || new TraceState();
 
     let parentSampled: boolean | undefined = undefined;
 
@@ -50,7 +51,7 @@ export class SentrySampler implements Sampler {
         DEBUG_BUILD &&
           logger.log(`[Tracing] Inheriting remote parent's sampled decision for ${spanName}: ${parentSampled}`);
       } else {
-        parentSampled = Boolean(parentContext.traceFlags & TraceFlags.SAMPLED);
+        parentSampled = getSamplingDecision(parentContext);
         DEBUG_BUILD && logger.log(`[Tracing] Inheriting parent's sampled decision for ${spanName}: ${parentSampled}`);
       }
     }
@@ -69,10 +70,6 @@ export class SentrySampler implements Sampler {
       [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: Number(sampleRate),
     };
 
-    if (typeof parentSampled === 'boolean') {
-      attributes[InternalSentrySemanticAttributes.PARENT_SAMPLED] = parentSampled;
-    }
-
     // Since this is coming from the user (or from a function provided by the user), who knows what we might get. (The
     // only valid values are booleans or numbers between 0 and 1.)
     if (!isValidSampleRate(sampleRate)) {
@@ -81,6 +78,7 @@ export class SentrySampler implements Sampler {
       return {
         decision: SamplingDecision.NOT_RECORD,
         attributes,
+        traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1'),
       };
     }
 
@@ -98,6 +96,7 @@ export class SentrySampler implements Sampler {
       return {
         decision: SamplingDecision.NOT_RECORD,
         attributes,
+        traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1'),
       };
     }
 
@@ -117,6 +116,7 @@ export class SentrySampler implements Sampler {
       return {
         decision: SamplingDecision.NOT_RECORD,
         attributes,
+        traceState: traceState.set(SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING, '1'),
       };
     }
 
diff --git a/packages/opentelemetry/src/semanticAttributes.ts b/packages/opentelemetry/src/semanticAttributes.ts
index 8f61318a3ecc..80a80f87a666 100644
--- a/packages/opentelemetry/src/semanticAttributes.ts
+++ b/packages/opentelemetry/src/semanticAttributes.ts
@@ -1,7 +1,2 @@
-/**
- * These are internal and are not supposed to be used/depended on by external parties.
- * No guarantees apply to these attributes, and the may change/disappear at any time.
- */
-export const InternalSentrySemanticAttributes = {
-  PARENT_SAMPLED: 'sentry.parentSampled',
-} as const;
+/** If this attribute is true, it means that the parent is a remote span. */
+export const SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE = 'sentry.parentIsRemote';
diff --git a/packages/opentelemetry/src/setupEventContextTrace.ts b/packages/opentelemetry/src/setupEventContextTrace.ts
index 93e9033f4969..1aa1edbbe12c 100644
--- a/packages/opentelemetry/src/setupEventContextTrace.ts
+++ b/packages/opentelemetry/src/setupEventContextTrace.ts
@@ -1,7 +1,8 @@
+import { getRootSpan } from '@sentry/core';
 import type { Client } from '@sentry/types';
 import { dropUndefinedKeys } from '@sentry/utils';
 
-import { getActiveSpan, getRootSpan } from './utils/getActiveSpan';
+import { getActiveSpan } from './utils/getActiveSpan';
 import { spanHasName, spanHasParentId } from './utils/spanTypes';
 
 /** Ensure the `trace` context is set on all events. */
diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts
index 348304c82a92..58f6ba53303e 100644
--- a/packages/opentelemetry/src/spanExporter.ts
+++ b/packages/opentelemetry/src/spanExporter.ts
@@ -1,22 +1,22 @@
+import type { Span } from '@opentelemetry/api';
 import { SpanKind } from '@opentelemetry/api';
 import type { ExportResult } from '@opentelemetry/core';
 import { ExportResultCode } from '@opentelemetry/core';
 import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import type { SentrySpan, Transaction } from '@sentry/core';
+import { captureEvent, getMetricSummaryJsonForSpan } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  getCurrentHub,
+  getStatusMessage,
 } from '@sentry/core';
-import type { Scope, SpanOrigin, TransactionSource } from '@sentry/types';
-import { addNonEnumerableProperty, dropUndefinedKeys, logger } from '@sentry/utils';
-import { startTransaction } from './custom/transaction';
+import type { SpanJSON, SpanOrigin, TraceContext, TransactionEvent, TransactionSource } from '@sentry/types';
+import { dropUndefinedKeys, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
-import { InternalSentrySemanticAttributes } from './semanticAttributes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from './semanticAttributes';
 import { convertOtelTimeToSeconds } from './utils/convertOtelTimeToSeconds';
 import { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
 import { getRequestSpanData } from './utils/getRequestSpanData';
@@ -24,7 +24,7 @@ import type { SpanNode } from './utils/groupSpansWithParents';
 import { groupSpansWithParents } from './utils/groupSpansWithParents';
 import { mapStatus } from './utils/mapStatus';
 import { parseSpanDescription } from './utils/parseSpanDescription';
-import { getSpanHub, getSpanMetadata, getSpanScopes } from './utils/spanData';
+import { getSpanScopes } from './utils/spanData';
 
 type SpanNodeCompleted = SpanNode & { span: ReadableSpan };
 
@@ -111,13 +111,20 @@ function maybeSend(spans: ReadableSpan[]): ReadableSpan[] {
   rootNodes.forEach(root => {
     remaining.delete(root);
     const span = root.span;
-    const transaction = createTransactionForOtelSpan(span);
+    const transactionEvent = createTransactionForOtelSpan(span);
+
+    // We'll recursively add all the child spans to this array
+    const spans = transactionEvent.spans || [];
 
     root.children.forEach(child => {
-      createAndFinishSpanForOtelSpan(child, transaction, remaining);
+      createAndFinishSpanForOtelSpan(child, spans, remaining);
     });
 
-    transaction.end(span.endTime);
+    transactionEvent.spans = spans;
+
+    // TODO Measurements are not yet implemented in OTEL
+
+    captureEvent(transactionEvent);
   });
 
   return Array.from(remaining)
@@ -144,69 +151,70 @@ function parseSpan(span: ReadableSpan): { op?: string; origin?: SpanOrigin; sour
   return { origin, op, source };
 }
 
-function createTransactionForOtelSpan(span: ReadableSpan): Transaction {
-  // eslint-disable-next-line deprecation/deprecation
-  const hub = getSpanHub(span) || getCurrentHub();
-  const spanContext = span.spanContext();
-  const spanId = spanContext.spanId;
-  const traceId = spanContext.traceId;
-  const parentSpanId = span.parentSpanId;
-
-  const parentSampled = span.attributes[InternalSentrySemanticAttributes.PARENT_SAMPLED] as boolean | undefined;
-
-  const { op, description, data, origin, source } = getSpanData(span);
-  const metadata = getSpanMetadata(span);
+function createTransactionForOtelSpan(span: ReadableSpan): TransactionEvent {
+  const { op, description, data, origin = 'manual', source } = getSpanData(span);
   const capturedSpanScopes = getSpanScopes(span);
 
   const sampleRate = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE] as number | undefined;
 
-  const attributes = {
+  const attributes = dropUndefinedKeys({
     [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
     [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: sampleRate,
+    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: op,
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,
     ...data,
     ...removeSentryAttributes(span.attributes),
-  };
+  });
 
-  const dynamicSamplingContext = getDynamicSamplingContextFromSpan(span);
+  const { traceId: trace_id, spanId: span_id } = span.spanContext();
+  const parent_span_id = span.parentSpanId;
 
-  const transaction = startTransaction(hub, {
-    spanId,
-    traceId,
-    parentSpanId,
-    parentSampled,
-    name: description,
+  const status = mapStatus(span);
+
+  const traceContext: TraceContext = dropUndefinedKeys({
+    parent_span_id,
+    span_id,
+    trace_id,
+    data: attributes,
+    origin,
     op,
-    startTimestamp: convertOtelTimeToSeconds(span.startTime),
-    metadata: {
+    status: getStatusMessage(status),
+  });
+
+  const transactionEvent: TransactionEvent = {
+    contexts: {
+      trace: traceContext,
+      otel: {
+        // TODO: remove the attributes here?
+        attributes: removeSentryAttributes(span.attributes),
+        resource: span.resource.attributes,
+      },
+    },
+    spans: [],
+    start_timestamp: convertOtelTimeToSeconds(span.startTime),
+    timestamp: convertOtelTimeToSeconds(span.endTime),
+    transaction: description,
+    type: 'transaction',
+    sdkProcessingMetadata: {
       ...dropUndefinedKeys({
-        dynamicSamplingContext,
+        capturedSpanScope: capturedSpanScopes?.scope,
+        capturedSpanIsolationScope: capturedSpanScopes?.isolationScope,
         sampleRate,
+        dynamicSamplingContext: getDynamicSamplingContextFromSpan(span),
       }),
-      ...metadata,
     },
-    attributes,
-    origin,
-    sampled: true,
-  });
-
-  transaction.setStatus(mapStatus(span));
-
-  // We currently don't want to write this to the scope because it would mutate it.
-  // In the future we will likely have some sort of transaction payload factory where we can pass this context in directly
-  // eslint-disable-next-line deprecation/deprecation
-  transaction.setContext('otel', {
-    attributes: removeSentryAttributes(span.attributes),
-    resource: span.resource.attributes,
-  });
-
-  if (capturedSpanScopes) {
-    setCapturedScopesOnTransaction(transaction, capturedSpanScopes.scope, capturedSpanScopes.isolationScope);
-  }
+    ...(source && {
+      transaction_info: {
+        source,
+      },
+    }),
+    _metrics_summary: getMetricSummaryJsonForSpan(span as unknown as Span),
+  };
 
-  return transaction;
+  return transactionEvent;
 }
 
-function createAndFinishSpanForOtelSpan(node: SpanNode, sentryParentSpan: SentrySpan, remaining: Set<SpanNode>): void {
+function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], remaining: Set<SpanNode>): void {
   remaining.delete(node);
   const span = node.span;
 
@@ -215,33 +223,46 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, sentryParentSpan: Sentry
   // If this span should be dropped, we still want to create spans for the children of this
   if (shouldDrop) {
     node.children.forEach(child => {
-      createAndFinishSpanForOtelSpan(child, sentryParentSpan, remaining);
+      createAndFinishSpanForOtelSpan(child, spans, remaining);
     });
     return;
   }
 
-  const spanId = span.spanContext().spanId;
-  const { attributes } = span;
+  const span_id = span.spanContext().spanId;
+  const trace_id = span.spanContext().traceId;
 
-  const { op, description, data, origin } = getSpanData(span);
-  const allData = { ...removeSentryAttributes(attributes), ...data };
+  const { attributes, startTime, endTime, parentSpanId } = span;
 
-  // eslint-disable-next-line deprecation/deprecation
-  const sentrySpan = sentryParentSpan.startChild({
-    name: description,
-    op,
+  const { op, description, data, origin = 'manual' } = getSpanData(span);
+  const allData = dropUndefinedKeys({
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,
+    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: op,
+    ...removeSentryAttributes(attributes),
+    ...data,
+  });
+
+  const status = mapStatus(span);
+
+  const spanJSON: SpanJSON = dropUndefinedKeys({
+    span_id,
+    trace_id,
     data: allData,
-    startTimestamp: convertOtelTimeToSeconds(span.startTime),
-    spanId,
+    description,
+    parent_span_id: parentSpanId,
+    start_timestamp: convertOtelTimeToSeconds(startTime),
+    // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
+    timestamp: convertOtelTimeToSeconds(endTime) || undefined,
+    status: getStatusMessage(status),
+    op,
     origin,
-  }) as SentrySpan;
-  sentrySpan.setStatus(mapStatus(span));
+    _metrics_summary: getMetricSummaryJsonForSpan(span as unknown as Span),
+  });
+
+  spans.push(spanJSON);
 
   node.children.forEach(child => {
-    createAndFinishSpanForOtelSpan(child, sentrySpan, remaining);
+    createAndFinishSpanForOtelSpan(child, spans, remaining);
   });
-
-  sentrySpan.end(convertOtelTimeToSeconds(span.endTime));
 }
 
 function getSpanData(span: ReadableSpan): {
@@ -276,8 +297,8 @@ function removeSentryAttributes(data: Record<string, unknown>): Record<string, u
   const cleanedData = { ...data };
 
   /* eslint-disable @typescript-eslint/no-dynamic-delete */
-  delete cleanedData[InternalSentrySemanticAttributes.PARENT_SAMPLED];
   delete cleanedData[SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE];
+  delete cleanedData[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE];
   /* eslint-enable @typescript-eslint/no-dynamic-delete */
 
   return cleanedData;
@@ -309,14 +330,3 @@ function getData(span: ReadableSpan): Record<string, unknown> {
 
   return data;
 }
-
-const SCOPE_ON_START_SPAN_FIELD = '_sentryScope';
-const ISOLATION_SCOPE_ON_START_SPAN_FIELD = '_sentryIsolationScope';
-
-/** Sets the scope and isolation scope to be used for when the transaction is finished. */
-function setCapturedScopesOnTransaction(span: Transaction, scope: Scope, isolationScope: Scope): void {
-  if (span) {
-    addNonEnumerableProperty(span, ISOLATION_SCOPE_ON_START_SPAN_FIELD, isolationScope);
-    addNonEnumerableProperty(span, SCOPE_ON_START_SPAN_FIELD, scope);
-  }
-}
diff --git a/packages/opentelemetry/src/spanProcessor.ts b/packages/opentelemetry/src/spanProcessor.ts
index 2f348cc877ff..5dedcb464d58 100644
--- a/packages/opentelemetry/src/spanProcessor.ts
+++ b/packages/opentelemetry/src/spanProcessor.ts
@@ -2,52 +2,59 @@ import type { Context } from '@opentelemetry/api';
 import { ROOT_CONTEXT, trace } from '@opentelemetry/api';
 import type { Span, SpanProcessor as SpanProcessorInterface } from '@opentelemetry/sdk-trace-base';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { getCurrentHub } from '@sentry/core';
+import { addChildSpanToSpan, getClient, getDefaultCurrentScope, getDefaultIsolationScope } from '@sentry/core';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from './semanticAttributes';
 import { SentrySpanExporter } from './spanExporter';
 import { maybeCaptureExceptionForTimedEvent } from './utils/captureExceptionForTimedEvent';
-import { getHubFromContext } from './utils/contextData';
+import { getScopesFromContext } from './utils/contextData';
 import { setIsSetup } from './utils/setupCheck';
-import { getSpanHub, setSpanHub, setSpanParent, setSpanScopes } from './utils/spanData';
+import { setSpanScopes } from './utils/spanData';
 
 function onSpanStart(span: Span, parentContext: Context): void {
   // This is a reliable way to get the parent span - because this is exactly how the parent is identified in the OTEL SDK
   const parentSpan = trace.getSpan(parentContext);
-  const hub = getHubFromContext(parentContext);
+
+  let scopes = getScopesFromContext(parentContext);
 
   // We need access to the parent span in order to be able to move up the span tree for breadcrumbs
-  if (parentSpan) {
-    setSpanParent(span, parentSpan);
+  if (parentSpan && !parentSpan.spanContext().isRemote) {
+    addChildSpanToSpan(parentSpan, span);
+  }
+
+  // We need this in the span exporter
+  if (parentSpan && parentSpan.spanContext().isRemote) {
+    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE, true);
   }
 
-  // The root context does not have a hub stored, so we check for this specifically
-  // We do this instead of just falling back to `getCurrentHub` to avoid attaching the wrong hub
-  let actualHub = hub;
+  // The root context does not have scopes stored, so we check for this specifically
+  // As fallback we attach the global scopes
   if (parentContext === ROOT_CONTEXT) {
-    // eslint-disable-next-line deprecation/deprecation
-    actualHub = getCurrentHub();
+    scopes = {
+      scope: getDefaultCurrentScope(),
+      isolationScope: getDefaultIsolationScope(),
+    };
   }
 
   // We need the scope at time of span creation in order to apply it to the event when the span is finished
-  if (actualHub) {
-    // eslint-disable-next-line deprecation/deprecation
-    const scope = actualHub.getScope();
-    // eslint-disable-next-line deprecation/deprecation
-    const isolationScope = actualHub.getIsolationScope();
-    setSpanHub(span, actualHub);
-    setSpanScopes(span, { scope, isolationScope });
+  if (scopes) {
+    setSpanScopes(span, scopes);
   }
+
+  const client = getClient();
+  client?.emit('spanStart', span);
 }
 
 function onSpanEnd(span: Span): void {
   // Capture exceptions as events
-  // eslint-disable-next-line deprecation/deprecation
-  const hub = getSpanHub(span) || getCurrentHub();
   span.events.forEach(event => {
-    maybeCaptureExceptionForTimedEvent(hub, event, span);
+    maybeCaptureExceptionForTimedEvent(event, span);
   });
+
+  const client = getClient();
+  client?.emit('spanEnd', span);
 }
 
 /**
@@ -67,6 +74,9 @@ export class SentrySpanProcessor extends BatchSpanProcessor implements SpanProce
   public onStart(span: Span, parentContext: Context): void {
     onSpanStart(span, parentContext);
 
+    // TODO (v8): Trigger client `spanStart` & `spanEnd` in here,
+    // once we decoupled opentelemetry from SentrySpan
+
     DEBUG_BUILD && logger.log(`[Tracing] Starting span "${span.name}" (${span.spanContext().spanId})`);
 
     return super.onStart(span, parentContext);
diff --git a/packages/opentelemetry/src/trace.ts b/packages/opentelemetry/src/trace.ts
index ea3ebea2df4e..945e60a811f1 100644
--- a/packages/opentelemetry/src/trace.ts
+++ b/packages/opentelemetry/src/trace.ts
@@ -2,25 +2,23 @@ import type { Context, Span, SpanContext, SpanOptions, Tracer } from '@opentelem
 import { TraceFlags } from '@opentelemetry/api';
 import { context } from '@opentelemetry/api';
 import { SpanStatusCode, trace } from '@opentelemetry/api';
-import { TraceState, suppressTracing } from '@opentelemetry/core';
+import { suppressTracing } from '@opentelemetry/core';
 import {
   SDK_VERSION,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  continueTrace as baseContinueTrace,
   getClient,
   getCurrentScope,
+  getDynamicSamplingContextFromClient,
+  getRootSpan,
   handleCallbackErrors,
 } from '@sentry/core';
 import type { Client, Scope } from '@sentry/types';
-import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/utils';
-import { SENTRY_TRACE_STATE_DSC } from './constants';
+import { continueTraceAsRemoteSpan, getSamplingDecision, makeTraceState } from './propagator';
 
 import type { OpenTelemetryClient, OpenTelemetrySpanContext } from './types';
-import { getContextFromScope } from './utils/contextData';
+import { getContextFromScope, getScopesFromContext } from './utils/contextData';
 import { getDynamicSamplingContextFromSpan } from './utils/dynamicSamplingContext';
-import { getRootSpan } from './utils/getActiveSpan';
-import { setSpanMetadata } from './utils/spanData';
 
 /**
  * Wraps a function with a transaction/span and finishes the span after the function is done.
@@ -64,7 +62,10 @@ export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span:
  *
  * Note that you'll always get a span passed to the callback, it may just be a NonRecordingSpan if the span is not sampled.
  */
-export function startSpanManual<T>(options: OpenTelemetrySpanContext, callback: (span: Span) => T): T {
+export function startSpanManual<T>(
+  options: OpenTelemetrySpanContext,
+  callback: (span: Span, finish: () => void) => T,
+): T {
   const tracer = getTracer();
 
   const { name } = options;
@@ -79,7 +80,7 @@ export function startSpanManual<T>(options: OpenTelemetrySpanContext, callback:
     _applySentryAttributesToSpan(span, options);
 
     return handleCallbackErrors(
-      () => callback(span),
+      () => callback(span, () => span.end()),
       () => {
         span.setStatus({ code: SpanStatusCode.ERROR });
       },
@@ -140,24 +141,11 @@ function getTracer(): Tracer {
 }
 
 function _applySentryAttributesToSpan(span: Span, options: OpenTelemetrySpanContext): void {
-  // eslint-disable-next-line deprecation/deprecation
-  const { origin, op, source, metadata } = options;
-
-  if (origin) {
-    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, origin);
-  }
+  const { op } = options;
 
   if (op) {
     span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, op);
   }
-
-  if (source) {
-    span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
-  }
-
-  if (metadata) {
-    setSpanMetadata(span, metadata);
-  }
 }
 
 function getSpanContext(options: OpenTelemetrySpanContext): SpanOptions {
@@ -180,33 +168,65 @@ function ensureTimestampInMilliseconds(timestamp: number): number {
 
 function getContext(scope: Scope | undefined, forceTransaction: boolean | undefined): Context {
   const ctx = getContextForScope(scope);
+  const actualScope = getScopesFromContext(ctx)?.scope;
 
-  if (!forceTransaction) {
-    return ctx;
-  }
-
-  // Else we need to "fix" the context to have no parent span
   const parentSpan = trace.getSpan(ctx);
 
-  // If there is no parent span, all good, nothing to do!
+  // In the case that we have no parent span, we need to "simulate" one to ensure the propagation context is correct
   if (!parentSpan) {
+    const client = getClient();
+
+    if (actualScope && client) {
+      const propagationContext = actualScope.getPropagationContext();
+      const dynamicSamplingContext =
+        propagationContext.dsc || getDynamicSamplingContextFromClient(propagationContext.traceId, client);
+
+      // We store the DSC as OTEL trace state on the span context
+      const traceState = makeTraceState({
+        parentSpanId: propagationContext.parentSpanId,
+        dsc: dynamicSamplingContext,
+        sampled: propagationContext.sampled,
+      });
+
+      const spanContext: SpanContext = {
+        traceId: propagationContext.traceId,
+        spanId: propagationContext.parentSpanId || propagationContext.spanId,
+        isRemote: true,
+        traceFlags: propagationContext.sampled ? TraceFlags.SAMPLED : TraceFlags.NONE,
+        traceState,
+      };
+
+      // Add remote parent span context,
+      return trace.setSpanContext(ctx, spanContext);
+    }
+
+    // if we have no scope or client, we just return the context as-is
     return ctx;
   }
 
+  // If we don't want to force a transaction, and we have a parent span, all good, we just return as-is!
+  if (!forceTransaction) {
+    return ctx;
+  }
+
+  // Else, if we do have a parent span but want to force a transaction, we have to simulate a "root" context
+
   // Else, we need to do two things:
   // 1. Unset the parent span from the context, so we'll create a new root span
   // 2. Ensure the propagation context is correct, so we'll continue from the parent span
   const ctxWithoutSpan = trace.deleteSpan(ctx);
 
-  const { spanId, traceId, traceFlags } = parentSpan.spanContext();
-  // eslint-disable-next-line no-bitwise
-  const sampled = Boolean(traceFlags & TraceFlags.SAMPLED);
+  const { spanId, traceId } = parentSpan.spanContext();
+  const sampled = getSamplingDecision(parentSpan.spanContext());
 
   const rootSpan = getRootSpan(parentSpan);
   const dsc = getDynamicSamplingContextFromSpan(rootSpan);
-  const dscString = dynamicSamplingContextToSentryBaggageHeader(dsc);
 
-  const traceState = dscString ? new TraceState().set(SENTRY_TRACE_STATE_DSC, dscString) : undefined;
+  const traceState = makeTraceState({
+    dsc,
+    parentSpanId: spanId,
+    sampled,
+  });
 
   const spanContext: SpanContext = {
     traceId,
@@ -231,3 +251,20 @@ function getContextForScope(scope?: Scope): Context {
 
   return context.active();
 }
+
+/**
+ * Continue a trace from `sentry-trace` and `baggage` values.
+ * These values can be obtained from incoming request headers, or in the browser from `<meta name="sentry-trace">`
+ * and `<meta name="baggage">` HTML tags.
+ *
+ * Spans started with `startSpan`, `startSpanManual` and `startInactiveSpan`, within the callback will automatically
+ * be attached to the incoming trace.
+ *
+ * This is a custom version of `continueTrace` that is used in OTEL-powered environments.
+ * It propagates the trace as a remote span, in addition to setting it on the propagation context.
+ */
+export function continueTrace<T>(options: Parameters<typeof baseContinueTrace>[0], callback: () => T): T {
+  return baseContinueTrace(options, () => {
+    return continueTraceAsRemoteSpan(context.active(), options, callback);
+  });
+}
diff --git a/packages/opentelemetry/src/types.ts b/packages/opentelemetry/src/types.ts
index ce16499c2a25..30dd025a3116 100644
--- a/packages/opentelemetry/src/types.ts
+++ b/packages/opentelemetry/src/types.ts
@@ -1,6 +1,6 @@
 import type { Span as WriteableSpan, SpanKind, Tracer } from '@opentelemetry/api';
-import type { BasicTracerProvider, ReadableSpan, Span } from '@opentelemetry/sdk-trace-base';
-import type { Scope, StartSpanOptions } from '@sentry/types';
+import type { BasicTracerProvider, ReadableSpan } from '@opentelemetry/sdk-trace-base';
+import type { Scope, Span, StartSpanOptions } from '@sentry/types';
 
 export interface OpenTelemetryClient {
   tracer: Tracer;
@@ -21,9 +21,7 @@ export interface OpenTelemetrySpanContext extends StartSpanOptions {
  * Note that technically, the `Span` exported from `@opentelemwetry/sdk-trace-base` matches this,
  * but we cannot be 100% sure that we are actually getting such a span, so this type is more defensive.
  */
-export type AbstractSpan = WriteableSpan | ReadableSpan;
-
-export type { Span };
+export type AbstractSpan = WriteableSpan | ReadableSpan | Span;
 
 export interface CurrentScopes {
   scope: Scope;
diff --git a/packages/opentelemetry/src/utils/captureExceptionForTimedEvent.ts b/packages/opentelemetry/src/utils/captureExceptionForTimedEvent.ts
index dcf02b671044..d67e26a21475 100644
--- a/packages/opentelemetry/src/utils/captureExceptionForTimedEvent.ts
+++ b/packages/opentelemetry/src/utils/captureExceptionForTimedEvent.ts
@@ -1,13 +1,13 @@
 import type { Span as OtelSpan, TimedEvent } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import type { Hub } from '@sentry/types';
+import { captureException } from '@sentry/core';
 import { isString } from '@sentry/utils';
 
 /**
  * Maybe capture a Sentry exception for an OTEL timed event.
  * This will check if the event is exception-like and in that case capture it as an exception.
  */
-export function maybeCaptureExceptionForTimedEvent(hub: Hub, event: TimedEvent, otelSpan?: OtelSpan): void {
+export function maybeCaptureExceptionForTimedEvent(event: TimedEvent, otelSpan?: OtelSpan): void {
   if (event.name !== 'exception') {
     return;
   }
@@ -35,8 +35,7 @@ export function maybeCaptureExceptionForTimedEvent(hub: Hub, event: TimedEvent,
     syntheticError.name = type;
   }
 
-  // eslint-disable-next-line deprecation/deprecation
-  hub.captureException(syntheticError, {
+  captureException(syntheticError, {
     captureContext: otelSpan
       ? {
           contexts: {
diff --git a/packages/opentelemetry/src/utils/contextData.ts b/packages/opentelemetry/src/utils/contextData.ts
index 5cb5cac79e3e..e6e4ab0548d3 100644
--- a/packages/opentelemetry/src/utils/contextData.ts
+++ b/packages/opentelemetry/src/utils/contextData.ts
@@ -1,27 +1,11 @@
 import type { Context } from '@opentelemetry/api';
-import type { Hub, Scope } from '@sentry/types';
+import type { Scope } from '@sentry/types';
 
-import { SENTRY_HUB_CONTEXT_KEY, SENTRY_SCOPES_CONTEXT_KEY } from '../constants';
+import { SENTRY_SCOPES_CONTEXT_KEY } from '../constants';
 import type { CurrentScopes } from '../types';
 
 const SCOPE_CONTEXT_MAP = new WeakMap<Scope, Context>();
 
-/**
- * Try to get the Hub from the given OTEL context.
- * This requires a Context Manager that was wrapped with getWrappedContextManager.
- */
-export function getHubFromContext(context: Context): Hub | undefined {
-  return context.getValue(SENTRY_HUB_CONTEXT_KEY) as Hub | undefined;
-}
-
-/**
- * Set a Hub on an OTEL context..
- * This will return a forked context with the Propagation Context set.
- */
-export function setHubOnContext(context: Context, hub: Hub): Context {
-  return context.setValue(SENTRY_HUB_CONTEXT_KEY, hub);
-}
-
 /**
  * Try to get the current scopes from the given OTEL context.
  * This requires a Context Manager that was wrapped with getWrappedContextManager.
diff --git a/packages/opentelemetry/src/utils/dynamicSamplingContext.ts b/packages/opentelemetry/src/utils/dynamicSamplingContext.ts
index cda72c11cac5..8fcedf65c6a4 100644
--- a/packages/opentelemetry/src/utils/dynamicSamplingContext.ts
+++ b/packages/opentelemetry/src/utils/dynamicSamplingContext.ts
@@ -1,4 +1,3 @@
-import { TraceFlags } from '@opentelemetry/api';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
@@ -8,6 +7,7 @@ import {
 import type { DynamicSamplingContext } from '@sentry/types';
 import { baggageHeaderToDynamicSamplingContext } from '@sentry/utils';
 import { SENTRY_TRACE_STATE_DSC } from '../constants';
+import { getSamplingDecision } from '../propagator';
 import type { AbstractSpan } from '../types';
 import { spanHasAttributes, spanHasName } from './spanTypes';
 
@@ -51,10 +51,10 @@ export function getDynamicSamplingContextFromSpan(span: AbstractSpan): Readonly<
     dsc.transaction = name;
   }
 
-  // TODO: Once we aligned span types, use spanIsSampled() from core instead
-  // eslint-disable-next-line no-bitwise
-  const sampled = Boolean(span.spanContext().traceFlags & TraceFlags.SAMPLED);
-  dsc.sampled = String(sampled);
+  const sampled = getSamplingDecision(span.spanContext());
+  if (sampled != null) {
+    dsc.sampled = String(sampled);
+  }
 
   client.emit('createDsc', dsc);
 
diff --git a/packages/opentelemetry/src/utils/getActiveSpan.ts b/packages/opentelemetry/src/utils/getActiveSpan.ts
index 1244a7cb4d62..e2d06176caeb 100644
--- a/packages/opentelemetry/src/utils/getActiveSpan.ts
+++ b/packages/opentelemetry/src/utils/getActiveSpan.ts
@@ -1,25 +1,9 @@
 import type { Span } from '@opentelemetry/api';
 import { trace } from '@opentelemetry/api';
 
-import { getSpanParent } from './spanData';
-
 /**
  * Returns the currently active span.
  */
 export function getActiveSpan(): Span | undefined {
   return trace.getActiveSpan();
 }
-
-/**
- * Get the root span for the given span.
- * The given span may be the root span itself.
- */
-export function getRootSpan(span: Span): Span {
-  let parent: Span = span;
-
-  while (getSpanParent(parent)) {
-    parent = getSpanParent(parent) as Span;
-  }
-
-  return parent;
-}
diff --git a/packages/opentelemetry/src/utils/groupSpansWithParents.ts b/packages/opentelemetry/src/utils/groupSpansWithParents.ts
index 6e5fb9e57c3a..2a6c667ac1cc 100644
--- a/packages/opentelemetry/src/utils/groupSpansWithParents.ts
+++ b/packages/opentelemetry/src/utils/groupSpansWithParents.ts
@@ -1,6 +1,5 @@
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
-
-import { getSpanParent } from './spanData';
+import { SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE } from '../semanticAttributes';
 
 export interface SpanNode {
   id: string;
@@ -28,8 +27,7 @@ export function groupSpansWithParents(spans: ReadableSpan[]): SpanNode[] {
 }
 
 function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
-  const parentSpan = getSpanParent(span);
-  const parentIsRemote = parentSpan ? !!parentSpan.spanContext().isRemote : false;
+  const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 
   const id = span.spanContext().spanId;
 
diff --git a/packages/opentelemetry/src/utils/spanData.ts b/packages/opentelemetry/src/utils/spanData.ts
index 174573bd19f9..8b0ea37bdcd5 100644
--- a/packages/opentelemetry/src/utils/spanData.ts
+++ b/packages/opentelemetry/src/utils/spanData.ts
@@ -1,5 +1,4 @@
-import type { Span } from '@opentelemetry/api';
-import type { Hub, Scope, TransactionMetadata } from '@sentry/types';
+import type { Scope } from '@sentry/types';
 
 import type { AbstractSpan } from '../types';
 
@@ -13,39 +12,6 @@ const SpanScopes = new WeakMap<
     isolationScope: Scope;
   }
 >();
-const SpanHub = new WeakMap<AbstractSpan, Hub>();
-const SpanParent = new WeakMap<AbstractSpan, Span>();
-const SpanMetadata = new WeakMap<AbstractSpan, Partial<TransactionMetadata>>();
-
-/** Set the Sentry hub on an OTEL span. */
-export function setSpanHub(span: AbstractSpan, hub: Hub): void {
-  SpanHub.set(span, hub);
-}
-
-/** Get the Sentry hub of an OTEL span. */
-export function getSpanHub(span: AbstractSpan): Hub | undefined {
-  return SpanHub.get(span);
-}
-
-/** Set the parent OTEL span on an OTEL span. */
-export function setSpanParent(span: AbstractSpan, parentSpan: Span): void {
-  SpanParent.set(span, parentSpan);
-}
-
-/** Get the parent OTEL span of an OTEL span. */
-export function getSpanParent(span: AbstractSpan): Span | undefined {
-  return SpanParent.get(span);
-}
-
-/** Set metadata for an OTEL span. */
-export function setSpanMetadata(span: AbstractSpan, metadata: Partial<TransactionMetadata>): void {
-  SpanMetadata.set(span, metadata);
-}
-
-/** Get metadata for an OTEL span. */
-export function getSpanMetadata(span: AbstractSpan): Partial<TransactionMetadata> | undefined {
-  return SpanMetadata.get(span);
-}
 
 /**
  * Set the Sentry scope to be used for finishing a given OTEL span.
diff --git a/packages/opentelemetry/test/custom/hubextensions.test.ts b/packages/opentelemetry/test/custom/hubextensions.test.ts
deleted file mode 100644
index 9d8f72cafb1f..000000000000
--- a/packages/opentelemetry/test/custom/hubextensions.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { getCurrentHub, setCurrentClient } from '@sentry/core';
-import { addTracingExtensions } from '../../src/custom/hubextensions';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
-
-describe('hubextensions', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('startTransaction is noop', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-    setCurrentClient(client);
-    client.init();
-    addTracingExtensions();
-
-    const mockConsole = jest.spyOn(console, 'warn').mockImplementation(() => {});
-
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = getCurrentHub().startTransaction({ name: 'test' });
-    expect(transaction).toEqual({});
-
-    expect(mockConsole).toHaveBeenCalledTimes(1);
-    expect(mockConsole).toHaveBeenCalledWith(
-      'startTransaction is a noop in @sentry/opentelemetry. Use `startSpan` instead.',
-    );
-  });
-});
diff --git a/packages/opentelemetry/test/custom/transaction.test.ts b/packages/opentelemetry/test/custom/transaction.test.ts
deleted file mode 100644
index f56350abeb8e..000000000000
--- a/packages/opentelemetry/test/custom/transaction.test.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Transaction, getCurrentHub, setCurrentClient, spanToJSON } from '@sentry/core';
-import { startTransaction } from '../../src/custom/transaction';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
-
-describe('startTranscation', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('creates a Transaction', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-    setCurrentClient(client);
-    client.init();
-
-    const transaction = startTransaction(hub, { name: 'test' });
-
-    expect(transaction).toBeInstanceOf(Transaction);
-    expect(transaction['_sampled']).toBe(undefined);
-    // eslint-disable-next-line deprecation/deprecation
-    expect(transaction.spanRecorder).toBeDefined();
-    // eslint-disable-next-line deprecation/deprecation
-    expect(transaction.spanRecorder?.spans).toHaveLength(1);
-    // eslint-disable-next-line deprecation/deprecation
-    expect(transaction.metadata).toEqual({
-      spanMetadata: {},
-    });
-
-    expect(spanToJSON(transaction)).toEqual(
-      expect.objectContaining({
-        origin: 'manual',
-        span_id: expect.any(String),
-        start_timestamp: expect.any(Number),
-        trace_id: expect.any(String),
-      }),
-    );
-  });
-
-  it('allows to pass data to transaction', () => {
-    const client = new TestClient(getDefaultTestClientOptions());
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-    setCurrentClient(client);
-    client.init();
-
-    const transaction = startTransaction(hub, {
-      name: 'test',
-      startTimestamp: 1234,
-      spanId: 'span1',
-      traceId: 'trace1',
-    });
-
-    expect(transaction).toBeInstanceOf(Transaction);
-    // eslint-disable-next-line deprecation/deprecation
-    expect(transaction.metadata).toEqual({
-      spanMetadata: {},
-    });
-
-    expect(spanToJSON(transaction)).toEqual(
-      expect.objectContaining({
-        origin: 'manual',
-        span_id: 'span1',
-        start_timestamp: 1234,
-        trace_id: 'trace1',
-      }),
-    );
-  });
-});
diff --git a/packages/opentelemetry/test/helpers/createSpan.ts b/packages/opentelemetry/test/helpers/createSpan.ts
index 38c4ed96f3a8..e68a82986dea 100644
--- a/packages/opentelemetry/test/helpers/createSpan.ts
+++ b/packages/opentelemetry/test/helpers/createSpan.ts
@@ -1,4 +1,4 @@
-import type { Context, SpanContext } from '@opentelemetry/api';
+import type { Context, SpanContext, TimeInput } from '@opentelemetry/api';
 import { SpanKind } from '@opentelemetry/api';
 import type { Tracer } from '@opentelemetry/sdk-trace-base';
 import { Span } from '@opentelemetry/sdk-trace-base';
@@ -6,7 +6,17 @@ import { uuid4 } from '@sentry/utils';
 
 export function createSpan(
   name?: string,
-  { spanId, parentSpanId }: { spanId?: string; parentSpanId?: string } = {},
+  {
+    spanId,
+    parentSpanId,
+    traceId,
+    startTime,
+  }: {
+    spanId?: string;
+    parentSpanId?: string;
+    traceId?: string;
+    startTime?: TimeInput;
+  } = {},
 ): Span {
   const spanProcessor = {
     onStart: () => {},
@@ -21,10 +31,10 @@ export function createSpan(
 
   const spanContext: SpanContext = {
     spanId: spanId || uuid4(),
-    traceId: uuid4(),
+    traceId: traceId || uuid4(),
     traceFlags: 0,
   };
 
   // eslint-disable-next-line deprecation/deprecation
-  return new Span(tracer, {} as Context, name || 'test', spanContext, SpanKind.INTERNAL, parentSpanId);
+  return new Span(tracer, {} as Context, name || 'test', spanContext, SpanKind.INTERNAL, parentSpanId, [], startTime);
 }
diff --git a/packages/opentelemetry/test/integration/scope.test.ts b/packages/opentelemetry/test/integration/scope.test.ts
index 36c794b1dbb0..7742fcf06767 100644
--- a/packages/opentelemetry/test/integration/scope.test.ts
+++ b/packages/opentelemetry/test/integration/scope.test.ts
@@ -72,6 +72,8 @@ describe('Integration | Scope', () => {
               trace: {
                 span_id: spanId,
                 trace_id: traceId,
+                // local span ID from propagation context
+                ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
               },
             },
           }),
@@ -117,6 +119,8 @@ describe('Integration | Scope', () => {
                 status: 'ok',
                 trace_id: traceId,
                 origin: 'manual',
+                // local span ID from propagation context
+                parent_span_id: expect.any(String),
               },
             }),
             spans: [],
@@ -211,6 +215,8 @@ describe('Integration | Scope', () => {
               ? {
                   span_id: spanId1,
                   trace_id: traceId1,
+                  // local span ID from propagation context
+                  ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
                 }
               : expect.any(Object),
           }),
@@ -236,7 +242,8 @@ describe('Integration | Scope', () => {
               ? {
                   span_id: spanId2,
                   trace_id: traceId2,
-                  parent_span_id: undefined,
+                  // local span ID from propagation context
+                  ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
                 }
               : expect.any(Object),
           }),
@@ -327,16 +334,21 @@ describe('Integration | Scope', () => {
 
       await client.flush();
 
+      expect(spanId1).toBeDefined();
+      expect(spanId2).toBeDefined();
+      expect(traceId1).toBeDefined();
+      expect(traceId2).toBeDefined();
+
       expect(beforeSend).toHaveBeenCalledTimes(2);
       expect(beforeSend).toHaveBeenCalledWith(
         expect.objectContaining({
           contexts: expect.objectContaining({
-            trace: spanId1
-              ? {
-                  span_id: spanId1,
-                  trace_id: traceId1,
-                }
-              : expect.any(Object),
+            trace: {
+              span_id: spanId1,
+              trace_id: traceId1,
+              // local span ID from propagation context
+              ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
+            },
           }),
           tags: {
             tag1: 'val1',
@@ -358,13 +370,12 @@ describe('Integration | Scope', () => {
       expect(beforeSend).toHaveBeenCalledWith(
         expect.objectContaining({
           contexts: expect.objectContaining({
-            trace: spanId2
-              ? {
-                  span_id: spanId2,
-                  trace_id: traceId2,
-                  parent_span_id: undefined,
-                }
-              : expect.any(Object),
+            trace: {
+              span_id: spanId2,
+              trace_id: traceId2,
+              // local span ID from propagation context
+              ...(enableTracing ? { parent_span_id: expect.any(String) } : undefined),
+            },
           }),
           tags: {
             tag1: 'val1',
diff --git a/packages/opentelemetry/test/integration/transactions.test.ts b/packages/opentelemetry/test/integration/transactions.test.ts
index 99d46abad4f9..ba382a5081d9 100644
--- a/packages/opentelemetry/test/integration/transactions.test.ts
+++ b/packages/opentelemetry/test/integration/transactions.test.ts
@@ -2,7 +2,14 @@ import type { SpanContext } from '@opentelemetry/api';
 import { ROOT_CONTEXT } from '@opentelemetry/api';
 import { TraceFlags, context, trace } from '@opentelemetry/api';
 import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addBreadcrumb, getClient, setTag, withIsolationScope } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  addBreadcrumb,
+  getClient,
+  setTag,
+  withIsolationScope,
+} from '@sentry/core';
 import type { Event, TransactionEvent } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
@@ -21,9 +28,17 @@ describe('Integration | Transactions', () => {
   });
 
   it('correctly creates transaction & spans', async () => {
-    const beforeSendTransaction = jest.fn(() => null);
+    const transactions: TransactionEvent[] = [];
+    const beforeSendTransaction = jest.fn(event => {
+      transactions.push(event);
+      return null;
+    });
 
-    mockSdkInit({ enableTracing: true, beforeSendTransaction });
+    mockSdkInit({
+      enableTracing: true,
+      beforeSendTransaction,
+      release: '8.0.0',
+    });
 
     const client = getClient() as TestClientInterface;
 
@@ -34,10 +49,9 @@ describe('Integration | Transactions', () => {
       {
         op: 'test op',
         name: 'test name',
-        origin: 'auto.test',
-        metadata: { requestPath: 'test-path' },
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
         },
       },
       span => {
@@ -64,83 +78,74 @@ describe('Integration | Transactions', () => {
 
     await client.flush();
 
-    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
-    expect(beforeSendTransaction).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        breadcrumbs: [
-          { message: 'test breadcrumb 1', timestamp: 123456 },
-          { message: 'test breadcrumb 2', timestamp: 123456 },
-          { message: 'test breadcrumb 3', timestamp: 123456 },
-        ],
-        contexts: {
-          otel: {
-            attributes: {
-              'test.outer': 'test value',
-              'sentry.op': 'test op',
-              'sentry.origin': 'auto.test',
-              'sentry.source': 'task',
-            },
-            resource: {
-              'service.name': 'opentelemetry-test',
-              'service.namespace': 'sentry',
-              'service.version': expect.any(String),
-              'telemetry.sdk.language': 'nodejs',
-              'telemetry.sdk.name': 'opentelemetry',
-              'telemetry.sdk.version': expect.any(String),
-            },
-          },
-          trace: {
-            data: {
-              'otel.kind': 'INTERNAL',
-              'sentry.op': 'test op',
-              'sentry.origin': 'auto.test',
-              'sentry.source': 'task',
-              'sentry.sample_rate': 1,
-              'test.outer': 'test value',
-            },
-            op: 'test op',
-            span_id: expect.any(String),
-            status: 'ok',
-            trace_id: expect.any(String),
-            origin: 'auto.test',
-          },
-        },
-        environment: 'production',
-        event_id: expect.any(String),
-        sdkProcessingMetadata: expect.objectContaining({
-          dynamicSamplingContext: expect.objectContaining({
-            environment: 'production',
-            public_key: expect.any(String),
-            sample_rate: '1',
-            sampled: 'true',
-            trace_id: expect.any(String),
-            transaction: 'test name',
-          }),
-          sampleRate: 1,
-          spanMetadata: expect.any(Object),
-          requestPath: 'test-path',
-        }),
-        // spans are circular (they have a reference to the transaction), which leads to jest choking on this
-        // instead we compare them in detail below
-        spans: [expect.any(Object), expect.any(Object)],
-        start_timestamp: expect.any(Number),
-        tags: {
-          'outer.tag': 'test value',
-          'test.tag': 'test value',
-        },
-        timestamp: expect.any(Number),
-        transaction: 'test name',
-        transaction_info: { source: 'task' },
-        type: 'transaction',
-      }),
-      {
-        event_id: expect.any(String),
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.breadcrumbs).toEqual([
+      { message: 'test breadcrumb 1', timestamp: 123456 },
+      { message: 'test breadcrumb 2', timestamp: 123456 },
+      { message: 'test breadcrumb 3', timestamp: 123456 },
+    ]);
+
+    expect(transaction.contexts?.otel).toEqual({
+      attributes: {
+        'test.outer': 'test value',
+        'sentry.op': 'test op',
+        'sentry.origin': 'auto.test',
+        'sentry.source': 'task',
       },
-    );
+      resource: {
+        'service.name': 'opentelemetry-test',
+        'service.namespace': 'sentry',
+        'service.version': expect.any(String),
+        'telemetry.sdk.language': 'nodejs',
+        'telemetry.sdk.name': 'opentelemetry',
+        'telemetry.sdk.version': expect.any(String),
+      },
+    });
 
-    // Checking the spans here, as they are circular to the transaction...
-    const runArgs = beforeSendTransaction.mock.calls[0] as unknown as [TransactionEvent, unknown];
-    const spans = runArgs[0].spans || [];
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        'otel.kind': 'INTERNAL',
+        'sentry.op': 'test op',
+        'sentry.origin': 'auto.test',
+        'sentry.source': 'task',
+        'sentry.sample_rate': 1,
+        'test.outer': 'test value',
+      },
+      op: 'test op',
+      span_id: expect.any(String),
+      status: 'ok',
+      trace_id: expect.any(String),
+      origin: 'auto.test',
+    });
+
+    expect(transaction.sdkProcessingMetadata?.sampleRate).toEqual(1);
+    expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({
+      environment: 'production',
+      public_key: expect.any(String),
+      sample_rate: '1',
+      sampled: 'true',
+      trace_id: expect.any(String),
+      transaction: 'test name',
+      release: '8.0.0',
+    });
+
+    expect(transaction.environment).toEqual('production');
+    expect(transaction.event_id).toEqual(expect.any(String));
+    expect(transaction.start_timestamp).toEqual(expect.any(Number));
+    expect(transaction.timestamp).toEqual(expect.any(Number));
+    expect(transaction.transaction).toEqual('test name');
+
+    expect(transaction.tags).toEqual({
+      'outer.tag': 'test value',
+      'test.tag': 'test value',
+    });
+    expect(transaction.transaction_info).toEqual({ source: 'task' });
+    expect(transaction.type).toEqual('transaction');
+
+    expect(transaction.spans).toHaveLength(2);
+    const spans = transaction.spans || [];
 
     // note: Currently, spans do not have any context/span added to them
     // This is the same behavior as for the "regular" SDKs
@@ -187,26 +192,36 @@ describe('Integration | Transactions', () => {
     addBreadcrumb({ message: 'test breadcrumb 1', timestamp: 123456 });
 
     withIsolationScope(() => {
-      startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
-        addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
+      startSpan(
+        {
+          op: 'test op',
+          name: 'test name',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          },
+        },
+        span => {
+          addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });
 
-        span.setAttributes({
-          'test.outer': 'test value',
-        });
+          span.setAttributes({
+            'test.outer': 'test value',
+          });
 
-        const subSpan = startInactiveSpan({ name: 'inner span 1' });
-        subSpan.end();
+          const subSpan = startInactiveSpan({ name: 'inner span 1' });
+          subSpan.end();
 
-        setTag('test.tag', 'test value');
+          setTag('test.tag', 'test value');
 
-        startSpan({ name: 'inner span 2' }, innerSpan => {
-          addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
+          startSpan({ name: 'inner span 2' }, innerSpan => {
+            addBreadcrumb({ message: 'test breadcrumb 3', timestamp: 123456 });
 
-          innerSpan.setAttributes({
-            'test.inner': 'test value',
+            innerSpan.setAttributes({
+              'test.inner': 'test value',
+            });
           });
-        });
-      });
+        },
+      );
     });
 
     withIsolationScope(() => {
@@ -265,6 +280,8 @@ describe('Integration | Transactions', () => {
             status: 'ok',
             trace_id: expect.any(String),
             origin: 'auto.test',
+            // local span ID from propagation context
+            parent_span_id: expect.any(String),
           },
         }),
         spans: [expect.any(Object), expect.any(Object)],
@@ -310,6 +327,8 @@ describe('Integration | Transactions', () => {
             status: 'ok',
             trace_id: expect.any(String),
             origin: 'manual',
+            // local span ID from propagation context
+            parent_span_id: expect.any(String),
           },
         }),
         spans: [expect.any(Object), expect.any(Object)],
@@ -348,12 +367,21 @@ describe('Integration | Transactions', () => {
 
     // We simulate the correct context we'd normally get from the SentryPropagator
     context.with(trace.setSpanContext(ROOT_CONTEXT, spanContext), () => {
-      startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, () => {
-        const subSpan = startInactiveSpan({ name: 'inner span 1' });
-        subSpan.end();
-
-        startSpan({ name: 'inner span 2' }, () => {});
-      });
+      startSpan(
+        {
+          op: 'test op',
+          name: 'test name',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          },
+        },
+        () => {
+          const subSpan = startInactiveSpan({ name: 'inner span 1' });
+          subSpan.end();
+          startSpan({ name: 'inner span 2' }, () => {});
+        },
+      );
     });
 
     await client.flush();
@@ -473,8 +501,8 @@ describe('Integration | Transactions', () => {
       }
 
       const subSpan = startInactiveSpan({ name: 'inner span 1' });
-      innerSpan1Id = subSpan?.spanContext().spanId;
-      subSpan?.end();
+      innerSpan1Id = subSpan.spanContext().spanId;
+      subSpan.end();
 
       startSpan({ name: 'inner span 2' }, innerSpan => {
         if (!innerSpan) {
@@ -543,25 +571,39 @@ describe('Integration | Transactions', () => {
       traceState: new TraceState().set(SENTRY_TRACE_STATE_DSC, dscString),
     };
 
-    mockSdkInit({ enableTracing: true, beforeSendTransaction });
+    mockSdkInit({
+      enableTracing: true,
+      beforeSendTransaction,
+      release: '7.0.0',
+    });
 
     const client = getClient() as TestClientInterface;
 
     // We simulate the correct context we'd normally get from the SentryPropagator
     context.with(trace.setSpanContext(ROOT_CONTEXT, spanContext), () => {
-      startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
-        expect(span.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
+      startSpan(
+        {
+          op: 'test op',
+          name: 'test name',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          },
+        },
+        span => {
+          expect(span.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
 
-        const subSpan = startInactiveSpan({ name: 'inner span 1' });
+          const subSpan = startInactiveSpan({ name: 'inner span 1' });
 
-        expect(subSpan.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
+          expect(subSpan.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
 
-        subSpan.end();
+          subSpan.end();
 
-        startSpan({ name: 'inner span 2' }, subSpan => {
-          expect(subSpan.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
-        });
-      });
+          startSpan({ name: 'inner span 2' }, subSpan => {
+            expect(subSpan.spanContext().traceState?.get(SENTRY_TRACE_STATE_DSC)).toEqual(dscString);
+          });
+        },
+      );
     });
 
     await client.flush();
diff --git a/packages/opentelemetry/test/propagator.test.ts b/packages/opentelemetry/test/propagator.test.ts
index 50629e965713..66d846085cfe 100644
--- a/packages/opentelemetry/test/propagator.test.ts
+++ b/packages/opentelemetry/test/propagator.test.ts
@@ -11,7 +11,7 @@ import { suppressTracing } from '@opentelemetry/core';
 import { addTracingExtensions, withScope } from '@sentry/core';
 
 import { SENTRY_BAGGAGE_HEADER, SENTRY_SCOPES_CONTEXT_KEY, SENTRY_TRACE_HEADER } from '../src/constants';
-import { SentryPropagator, makeTraceState } from '../src/propagator';
+import { SentryPropagator, getSamplingDecision, makeTraceState } from '../src/propagator';
 import { getScopesFromContext } from '../src/utils/contextData';
 import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 
@@ -74,6 +74,25 @@ describe('SentryPropagator', () => {
             'sentry-public_key=abc',
             'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
           ],
+          'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92',
+        ],
+        [
+          'uses remote spanContext with trace state & without DSC for unsampled remote span',
+          {
+            traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+            spanId: '6e0c63257de34c92',
+            traceFlags: TraceFlags.NONE,
+            isRemote: true,
+            traceState: makeTraceState({
+              sampled: false,
+            }),
+          },
+          [
+            'sentry-environment=production',
+            'sentry-release=1.0.0',
+            'sentry-public_key=abc',
+            'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
+          ],
           'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-0',
         ],
         [
@@ -269,6 +288,7 @@ describe('SentryPropagator', () => {
             'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
           ],
           'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-1',
+          true,
         ],
         [
           'continues a remote trace with dsc',
@@ -302,6 +322,7 @@ describe('SentryPropagator', () => {
             'sentry-replay_id=dsc_replay_id',
           ],
           'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-1',
+          true,
         ],
         [
           'continues an unsampled remote trace without dsc',
@@ -317,7 +338,28 @@ describe('SentryPropagator', () => {
             'sentry-public_key=abc',
             'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
           ],
+          'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-1',
+          undefined,
+        ],
+        [
+          'continues an unsampled remote trace with sampled trace state & without dsc',
+          {
+            traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+            spanId: '6e0c63257de34c92',
+            traceFlags: TraceFlags.NONE,
+            isRemote: true,
+            traceState: makeTraceState({
+              sampled: false,
+            }),
+          },
+          [
+            'sentry-environment=production',
+            'sentry-release=1.0.0',
+            'sentry-public_key=abc',
+            'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
+          ],
           'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-0',
+          false,
         ],
         [
           'continues an unsampled remote trace with dsc',
@@ -351,6 +393,40 @@ describe('SentryPropagator', () => {
             'sentry-replay_id=dsc_replay_id',
           ],
           'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-0',
+          false,
+        ],
+        [
+          'continues an unsampled remote trace with dsc & sampled trace state',
+          {
+            traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+            spanId: '6e0c63257de34c92',
+            traceFlags: TraceFlags.NONE,
+            isRemote: true,
+            traceState: makeTraceState({
+              sampled: false,
+              parentSpanId: '6e0c63257de34c92',
+              dsc: {
+                transaction: 'sampled-transaction',
+                trace_id: 'dsc_trace_id',
+                public_key: 'dsc_public_key',
+                environment: 'dsc_environment',
+                release: 'dsc_release',
+                sample_rate: '0.5',
+                replay_id: 'dsc_replay_id',
+              },
+            }),
+          },
+          [
+            'sentry-environment=dsc_environment',
+            'sentry-release=dsc_release',
+            'sentry-public_key=dsc_public_key',
+            'sentry-trace_id=dsc_trace_id',
+            'sentry-transaction=sampled-transaction',
+            'sentry-sample_rate=0.5',
+            'sentry-replay_id=dsc_replay_id',
+          ],
+          'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-0',
+          false,
         ],
         [
           'starts a new trace without existing dsc',
@@ -366,8 +442,11 @@ describe('SentryPropagator', () => {
             'sentry-trace_id=d4cda95b652f4a1592b449d5929fda1b',
           ],
           'd4cda95b652f4a1592b449d5929fda1b-{{spanId}}-1',
+          true,
         ],
-      ])('%s', (_name, spanContext, baggage, sentryTrace) => {
+      ])('%s', (_name, spanContext, baggage, sentryTrace, samplingDecision) => {
+        expect(getSamplingDecision(spanContext)).toBe(samplingDecision);
+
         context.with(trace.setSpanContext(ROOT_CONTEXT, spanContext), () => {
           trace.getTracer('test').startActiveSpan('test', span => {
             propagator.inject(context.active(), carrier, defaultTextMapSetter);
@@ -500,6 +579,35 @@ describe('SentryPropagator', () => {
         traceId: 'd4cda95b652f4a1592b449d5929fda1b',
         traceState: makeTraceState({ parentSpanId: '6e0c63257de34c92' }),
       });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(true);
+    });
+
+    it('sets data from negative sampled sentry trace header on span context', () => {
+      const sentryTraceHeader = 'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92-0';
+      carrier[SENTRY_TRACE_HEADER] = sentryTraceHeader;
+      const context = propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter);
+      expect(trace.getSpanContext(context)).toEqual({
+        isRemote: true,
+        spanId: '6e0c63257de34c92',
+        traceFlags: TraceFlags.NONE,
+        traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+        traceState: makeTraceState({ parentSpanId: '6e0c63257de34c92', sampled: false }),
+      });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(false);
+    });
+
+    it('sets data from not sampled sentry trace header on span context', () => {
+      const sentryTraceHeader = 'd4cda95b652f4a1592b449d5929fda1b-6e0c63257de34c92';
+      carrier[SENTRY_TRACE_HEADER] = sentryTraceHeader;
+      const context = propagator.extract(ROOT_CONTEXT, carrier, defaultTextMapGetter);
+      expect(trace.getSpanContext(context)).toEqual({
+        isRemote: true,
+        spanId: '6e0c63257de34c92',
+        traceFlags: TraceFlags.NONE,
+        traceId: 'd4cda95b652f4a1592b449d5929fda1b',
+        traceState: makeTraceState({ parentSpanId: '6e0c63257de34c92' }),
+      });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(undefined);
     });
 
     it('sets data from sentry trace header on scope', () => {
@@ -517,6 +625,7 @@ describe('SentryPropagator', () => {
         parentSpanId: '6e0c63257de34c92',
         dsc: {},
       });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(true);
     });
 
     it('handles undefined sentry trace header', () => {
@@ -529,6 +638,7 @@ describe('SentryPropagator', () => {
         traceFlags: TraceFlags.NONE,
         traceId: expect.any(String),
       });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(undefined);
     });
 
     it('sets data from baggage header on span context', () => {
@@ -554,6 +664,7 @@ describe('SentryPropagator', () => {
           },
         }),
       });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(true);
     });
 
     it('sets data from baggage header on scope', () => {
@@ -592,6 +703,7 @@ describe('SentryPropagator', () => {
         traceFlags: TraceFlags.NONE,
         traceId: expect.any(String),
       });
+      expect(getSamplingDecision(trace.getSpanContext(context)!)).toBe(undefined);
     });
 
     it('handles when sentry-trace is an empty array', () => {
diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts
index 2a6b9f6c3426..27ae4a285b8a 100644
--- a/packages/opentelemetry/test/trace.test.ts
+++ b/packages/opentelemetry/test/trace.test.ts
@@ -11,15 +11,20 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getClient,
   getCurrentScope,
+  getDynamicSamplingContextFromClient,
+  getRootSpan,
+  spanIsSampled,
+  spanToJSON,
   withScope,
 } from '@sentry/core';
 import type { Event, Scope } from '@sentry/types';
+import { getSamplingDecision, makeTraceState } from '../src/propagator';
 
-import { startInactiveSpan, startSpan, startSpanManual } from '../src/trace';
+import { continueTrace, startInactiveSpan, startSpan, startSpanManual } from '../src/trace';
 import type { AbstractSpan } from '../src/types';
-import { getActiveSpan, getRootSpan } from '../src/utils/getActiveSpan';
+import { getDynamicSamplingContextFromSpan } from '../src/utils/dynamicSamplingContext';
+import { getActiveSpan } from '../src/utils/getActiveSpan';
 import { getSpanKind } from '../src/utils/getSpanKind';
-import { getSpanMetadata } from '../src/utils/spanData';
 import { spanHasAttributes, spanHasName } from '../src/utils/spanTypes';
 import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
 
@@ -215,8 +220,6 @@ describe('trace', () => {
           expect(getSpanAttributes(span)).toEqual({
             [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
           });
-
-          expect(getSpanMetadata(span)).toEqual(undefined);
         },
       );
 
@@ -224,10 +227,9 @@ describe('trace', () => {
         {
           name: 'outer',
           op: 'my-op',
-          origin: 'auto.test.origin',
-          metadata: { requestPath: 'test-path' },
           attributes: {
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test.origin',
           },
         },
         span => {
@@ -238,8 +240,6 @@ describe('trace', () => {
             [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'my-op',
             [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
           });
-
-          expect(getSpanMetadata(span)).toEqual({ requestPath: 'test-path' });
         },
       );
     });
@@ -477,16 +477,13 @@ describe('trace', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
       });
 
-      expect(getSpanMetadata(span)).toEqual(undefined);
-
       const span2 = startInactiveSpan({
         name: 'outer',
         op: 'my-op',
-        origin: 'auto.test.origin',
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test.origin',
         },
-        metadata: { requestPath: 'test-path' },
       });
 
       expect(span2).toBeDefined();
@@ -496,8 +493,6 @@ describe('trace', () => {
         [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test.origin',
         [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'my-op',
       });
-
-      expect(getSpanMetadata(span2)).toEqual({ requestPath: 'test-path' });
     });
 
     it('allows to pass base SpanOptions', () => {
@@ -535,18 +530,17 @@ describe('trace', () => {
       const initialScope = getCurrentScope();
 
       let manualScope: Scope;
-      let parentSpan: Span;
 
-      startSpanManual({ name: 'detached' }, span => {
-        parentSpan = span;
+      const parentSpan = startSpanManual({ name: 'detached' }, span => {
         manualScope = getCurrentScope();
         manualScope.setTag('manual', 'tag');
+        return span;
       });
 
       getCurrentScope().setTag('outer', 'tag');
 
       const span = startInactiveSpan({ name: 'GET users/[id]', scope: manualScope! });
-      expect(getSpanParentSpanId(span)).toBe(parentSpan!.spanContext().spanId);
+      expect(getSpanParentSpanId(span)).toBe(parentSpan.spanContext().spanId);
 
       expect(getCurrentScope()).toBe(initialScope);
       expect(getActiveSpan()).toBe(undefined);
@@ -675,7 +669,7 @@ describe('trace', () => {
 
       client.getOptions().beforeSendTransaction = beforeSendTransaction;
 
-      let span: Span | undefined;
+      let span: Span;
 
       const scope = getCurrentScope();
       scope.setTag('outer', 'foo');
@@ -688,7 +682,7 @@ describe('trace', () => {
 
       withScope(scope => {
         scope.setTag('scope', 2);
-        span?.end();
+        span.end();
       });
 
       await client.flush();
@@ -835,13 +829,13 @@ describe('trace', () => {
           startSpanManual({ name: 'inner transaction', forceTransaction: true }, span => {
             startSpanManual({ name: 'inner span 2' }, span => {
               // all good
-              span?.end();
+              span.end();
             });
-            span?.end();
+            span.end();
           });
-          span?.end();
+          span.end();
         });
-        span?.end();
+        span.end();
       });
 
       await client.flush();
@@ -943,6 +937,111 @@ describe('trace', () => {
       });
     });
   });
+
+  describe('propagation', () => {
+    it('picks up the trace context from the scope, if there is no parent', () => {
+      withScope(scope => {
+        const propagationContext = scope.getPropagationContext();
+        const span = startInactiveSpan({ name: 'test span' });
+
+        expect(span).toBeDefined();
+        expect(spanToJSON(span).trace_id).toEqual(propagationContext.traceId);
+        expect(spanToJSON(span).parent_span_id).toEqual(propagationContext.spanId);
+        expect(getDynamicSamplingContextFromSpan(span)).toEqual(
+          getDynamicSamplingContextFromClient(propagationContext.traceId, getClient()!),
+        );
+      });
+    });
+
+    it('picks up the trace context from the parent without DSC', () => {
+      withScope(scope => {
+        const propagationContext = scope.getPropagationContext();
+
+        const ctx = trace.setSpanContext(ROOT_CONTEXT, {
+          traceId: '12312012123120121231201212312012',
+          spanId: '1121201211212012',
+          isRemote: false,
+          traceFlags: TraceFlags.SAMPLED,
+          traceState: undefined,
+        });
+
+        context.with(ctx, () => {
+          const span = startInactiveSpan({ name: 'test span' });
+
+          expect(span).toBeDefined();
+          expect(spanToJSON(span).trace_id).toEqual('12312012123120121231201212312012');
+          expect(spanToJSON(span).parent_span_id).toEqual('1121201211212012');
+          expect(getDynamicSamplingContextFromSpan(span)).toEqual({
+            ...getDynamicSamplingContextFromClient(propagationContext.traceId, getClient()!),
+            trace_id: '12312012123120121231201212312012',
+            transaction: 'test span',
+            sampled: 'true',
+            sample_rate: '1',
+          });
+        });
+      });
+    });
+
+    it('picks up the trace context from the parent with DSC', () => {
+      withScope(() => {
+        const ctx = trace.setSpanContext(ROOT_CONTEXT, {
+          traceId: '12312012123120121231201212312012',
+          spanId: '1121201211212012',
+          isRemote: false,
+          traceFlags: TraceFlags.SAMPLED,
+          traceState: makeTraceState({
+            parentSpanId: '1121201211212011',
+            dsc: {
+              release: '1.0',
+              environment: 'production',
+            },
+          }),
+        });
+
+        context.with(ctx, () => {
+          const span = startInactiveSpan({ name: 'test span' });
+
+          expect(span).toBeDefined();
+          expect(spanToJSON(span).trace_id).toEqual('12312012123120121231201212312012');
+          expect(spanToJSON(span).parent_span_id).toEqual('1121201211212012');
+          expect(getDynamicSamplingContextFromSpan(span)).toEqual({
+            release: '1.0',
+            environment: 'production',
+          });
+        });
+      });
+    });
+
+    it('picks up the trace context from a remote parent', () => {
+      withScope(() => {
+        const ctx = trace.setSpanContext(ROOT_CONTEXT, {
+          traceId: '12312012123120121231201212312012',
+          spanId: '1121201211212012',
+          isRemote: true,
+          traceFlags: TraceFlags.SAMPLED,
+          traceState: makeTraceState({
+            parentSpanId: '1121201211212011',
+            dsc: {
+              release: '1.0',
+              environment: 'production',
+            },
+          }),
+        });
+
+        context.with(ctx, () => {
+          const span = startInactiveSpan({ name: 'test span' });
+
+          expect(span).toBeDefined();
+          expect(spanToJSON(span).trace_id).toEqual('12312012123120121231201212312012');
+          expect(spanToJSON(span).parent_span_id).toEqual('1121201211212012');
+          expect(getDynamicSamplingContextFromSpan(span)).toEqual({
+            release: '1.0',
+            environment: 'production',
+          });
+        });
+      });
+    });
+  });
 });
 
 describe('trace (tracing disabled)', () => {
@@ -1254,6 +1353,152 @@ describe('trace (sampling)', () => {
   });
 });
 
+describe('continueTrace', () => {
+  beforeEach(() => {
+    mockSdkInit({ enableTracing: true });
+  });
+
+  afterEach(() => {
+    cleanupOtel();
+  });
+
+  it('works without trace & baggage data', () => {
+    const scope = continueTrace({ sentryTrace: undefined, baggage: undefined }, () => {
+      const span = getActiveSpan()!;
+      expect(span).toBeDefined();
+      expect(spanToJSON(span)).toEqual({
+        span_id: '',
+        trace_id: expect.any(String),
+      });
+      expect(getSamplingDecision(span.spanContext())).toBe(undefined);
+      expect(spanIsSampled(span)).toBe(false);
+
+      return getCurrentScope();
+    });
+
+    expect(scope.getPropagationContext()).toEqual({
+      sampled: undefined,
+      spanId: expect.any(String),
+      traceId: expect.any(String),
+    });
+
+    expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
+  });
+
+  it('works with trace data', () => {
+    const scope = continueTrace(
+      {
+        sentryTrace: '12312012123120121231201212312012-1121201211212012-0',
+        baggage: undefined,
+      },
+      () => {
+        const span = getActiveSpan()!;
+        expect(span).toBeDefined();
+        expect(spanToJSON(span)).toEqual({
+          span_id: '1121201211212012',
+          trace_id: '12312012123120121231201212312012',
+        });
+        expect(getSamplingDecision(span.spanContext())).toBe(false);
+        expect(spanIsSampled(span)).toBe(false);
+
+        return getCurrentScope();
+      },
+    );
+
+    expect(scope.getPropagationContext()).toEqual({
+      dsc: {}, // DSC should be an empty object (frozen), because there was an incoming trace
+      sampled: false,
+      parentSpanId: '1121201211212012',
+      spanId: expect.any(String),
+      traceId: '12312012123120121231201212312012',
+    });
+
+    expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
+  });
+
+  it('works with trace & baggage data', () => {
+    const scope = continueTrace(
+      {
+        sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+        baggage: 'sentry-version=1.0,sentry-environment=production',
+      },
+      () => {
+        const span = getActiveSpan()!;
+        expect(span).toBeDefined();
+        expect(spanToJSON(span)).toEqual({
+          span_id: '1121201211212012',
+          trace_id: '12312012123120121231201212312012',
+        });
+        expect(getSamplingDecision(span.spanContext())).toBe(true);
+        expect(spanIsSampled(span)).toBe(true);
+
+        return getCurrentScope();
+      },
+    );
+
+    expect(scope.getPropagationContext()).toEqual({
+      dsc: {
+        environment: 'production',
+        version: '1.0',
+      },
+      sampled: true,
+      parentSpanId: '1121201211212012',
+      spanId: expect.any(String),
+      traceId: '12312012123120121231201212312012',
+    });
+
+    expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
+  });
+
+  it('works with trace & 3rd party baggage data', () => {
+    const scope = continueTrace(
+      {
+        sentryTrace: '12312012123120121231201212312012-1121201211212012-1',
+        baggage: 'sentry-version=1.0,sentry-environment=production,dogs=great,cats=boring',
+      },
+      () => {
+        const span = getActiveSpan()!;
+        expect(span).toBeDefined();
+        expect(spanToJSON(span)).toEqual({
+          span_id: '1121201211212012',
+          trace_id: '12312012123120121231201212312012',
+        });
+        expect(getSamplingDecision(span.spanContext())).toBe(true);
+        expect(spanIsSampled(span)).toBe(true);
+
+        return getCurrentScope();
+      },
+    );
+
+    expect(scope.getPropagationContext()).toEqual({
+      dsc: {
+        environment: 'production',
+        version: '1.0',
+      },
+      sampled: true,
+      parentSpanId: '1121201211212012',
+      spanId: expect.any(String),
+      traceId: '12312012123120121231201212312012',
+    });
+
+    expect(scope.getScopeData().sdkProcessingMetadata).toEqual({});
+  });
+
+  it('returns response of callback', () => {
+    const result = continueTrace(
+      {
+        sentryTrace: '12312012123120121231201212312012-1121201211212012-0',
+        baggage: undefined,
+      },
+      () => {
+        return 'aha';
+      },
+    );
+
+    expect(result).toEqual('aha');
+  });
+});
+
 function getSpanName(span: AbstractSpan): string | undefined {
   return spanHasName(span) ? span.name : undefined;
 }
diff --git a/packages/opentelemetry/test/utils/captureExceptionForTimedEvent.test.ts b/packages/opentelemetry/test/utils/captureExceptionForTimedEvent.test.ts
index 4d0c39b3a8b9..4e6103e9a7a8 100644
--- a/packages/opentelemetry/test/utils/captureExceptionForTimedEvent.test.ts
+++ b/packages/opentelemetry/test/utils/captureExceptionForTimedEvent.test.ts
@@ -1,22 +1,22 @@
 import type { Span as OtelSpan, TimedEvent } from '@opentelemetry/sdk-trace-base';
 import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
-import type { Hub } from '@sentry/types';
+import * as SentryCore from '@sentry/core';
 
 import { maybeCaptureExceptionForTimedEvent } from '../../src/utils/captureExceptionForTimedEvent';
 
 describe('maybeCaptureExceptionForTimedEvent', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('ignores non-exception events', async () => {
     const event: TimedEvent = {
       time: [12345, 0],
       name: 'test event',
     };
 
-    const captureException = jest.fn();
-    const hub = {
-      captureException,
-    } as unknown as Hub;
-
-    maybeCaptureExceptionForTimedEvent(hub, event);
+    const captureException = jest.spyOn(SentryCore, 'captureException');
+    maybeCaptureExceptionForTimedEvent(event);
 
     expect(captureException).not.toHaveBeenCalled();
   });
@@ -27,12 +27,8 @@ describe('maybeCaptureExceptionForTimedEvent', () => {
       name: 'exception',
     };
 
-    const captureException = jest.fn();
-    const hub = {
-      captureException,
-    } as unknown as Hub;
-
-    maybeCaptureExceptionForTimedEvent(hub, event);
+    const captureException = jest.spyOn(SentryCore, 'captureException');
+    maybeCaptureExceptionForTimedEvent(event);
 
     expect(captureException).not.toHaveBeenCalled();
   });
@@ -46,12 +42,8 @@ describe('maybeCaptureExceptionForTimedEvent', () => {
       },
     };
 
-    const captureException = jest.fn();
-    const hub = {
-      captureException,
-    } as unknown as Hub;
-
-    maybeCaptureExceptionForTimedEvent(hub, event);
+    const captureException = jest.spyOn(SentryCore, 'captureException');
+    maybeCaptureExceptionForTimedEvent(event);
 
     expect(captureException).toHaveBeenCalledTimes(1);
     expect(captureException).toHaveBeenCalledWith(expect.objectContaining({ message: 'test-message' }), {
@@ -73,12 +65,8 @@ describe('maybeCaptureExceptionForTimedEvent', () => {
       },
     };
 
-    const captureException = jest.fn();
-    const hub = {
-      captureException,
-    } as unknown as Hub;
-
-    maybeCaptureExceptionForTimedEvent(hub, event);
+    const captureException = jest.spyOn(SentryCore, 'captureException');
+    maybeCaptureExceptionForTimedEvent(event);
 
     expect(captureException).toHaveBeenCalledTimes(1);
     expect(captureException).toHaveBeenCalledWith(
@@ -116,12 +104,8 @@ describe('maybeCaptureExceptionForTimedEvent', () => {
       },
     } as unknown as OtelSpan;
 
-    const captureException = jest.fn();
-    const hub = {
-      captureException,
-    } as unknown as Hub;
-
-    maybeCaptureExceptionForTimedEvent(hub, event, span);
+    const captureException = jest.spyOn(SentryCore, 'captureException');
+    maybeCaptureExceptionForTimedEvent(event, span);
 
     expect(captureException).toHaveBeenCalledTimes(1);
     expect(captureException).toHaveBeenCalledWith(expect.objectContaining({ message: 'test-message' }), {
diff --git a/packages/opentelemetry/test/utils/getActiveSpan.test.ts b/packages/opentelemetry/test/utils/getActiveSpan.test.ts
index 4859d970623e..9921f82f2982 100644
--- a/packages/opentelemetry/test/utils/getActiveSpan.test.ts
+++ b/packages/opentelemetry/test/utils/getActiveSpan.test.ts
@@ -1,7 +1,8 @@
 import { trace } from '@opentelemetry/api';
 import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { getRootSpan } from '@sentry/core';
 
-import { getActiveSpan, getRootSpan } from '../../src/utils/getActiveSpan';
+import { getActiveSpan } from '../../src/utils/getActiveSpan';
 import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
 import { setupOtel } from '../helpers/initOtel';
 import { cleanupOtel } from '../helpers/mockSdkInit';
diff --git a/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts b/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
index 5d074a1c4ea2..029c25ad968d 100644
--- a/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
+++ b/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
@@ -72,11 +72,11 @@ describe('setupEventContextTrace', () => {
     let traceId: string | undefined;
 
     client.tracer.startActiveSpan('outer', outerSpan => {
-      outerId = outerSpan?.spanContext().spanId;
-      traceId = outerSpan?.spanContext().traceId;
+      outerId = outerSpan.spanContext().spanId;
+      traceId = outerSpan.spanContext().traceId;
 
       client.tracer.startActiveSpan('inner', innerSpan => {
-        innerId = innerSpan?.spanContext().spanId;
+        innerId = innerSpan.spanContext().spanId;
         captureException(error);
       });
     });
diff --git a/packages/opentelemetry/test/utils/spanToJSON.test.ts b/packages/opentelemetry/test/utils/spanToJSON.test.ts
new file mode 100644
index 000000000000..103ede3eaafd
--- /dev/null
+++ b/packages/opentelemetry/test/utils/spanToJSON.test.ts
@@ -0,0 +1,57 @@
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
+import { createSpan } from '../helpers/createSpan';
+
+describe('spanToJSON', () => {
+  describe('OpenTelemetry Span', () => {
+    it('works with a simple span', () => {
+      const span = createSpan('test span', {
+        spanId: 'SPAN-1',
+        traceId: 'TRACE-1',
+        startTime: [123, 0],
+      });
+
+      expect(spanToJSON(span)).toEqual({
+        span_id: 'SPAN-1',
+        trace_id: 'TRACE-1',
+        start_timestamp: 123,
+        description: 'test span',
+        data: {},
+      });
+    });
+
+    it('works with a full span', () => {
+      const span = createSpan('test span', {
+        spanId: 'SPAN-1',
+        traceId: 'TRACE-1',
+        startTime: [123, 0],
+      });
+
+      span.setAttributes({
+        attr1: 'value1',
+        attr2: 2,
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'test op',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto',
+      });
+
+      span.setStatus({ code: 2, message: 'unknown_error' });
+      span.end([456, 0]);
+
+      expect(spanToJSON(span)).toEqual({
+        span_id: 'SPAN-1',
+        trace_id: 'TRACE-1',
+        start_timestamp: 123,
+        timestamp: 456,
+        description: 'test span',
+        op: 'test op',
+        origin: 'auto',
+        data: {
+          attr1: 'value1',
+          attr2: 2,
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'test op',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto',
+        },
+        status: 'unknown_error',
+      });
+    });
+  });
+});
diff --git a/packages/profiling-node/.eslintrc.js b/packages/profiling-node/.eslintrc.js
index 84ad1f9e91b7..02a39c9cf562 100644
--- a/packages/profiling-node/.eslintrc.js
+++ b/packages/profiling-node/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/profiling-node/README.md b/packages/profiling-node/README.md
index e496ba5f96a0..f2c9920f0ff1 100644
--- a/packages/profiling-node/README.md
+++ b/packages/profiling-node/README.md
@@ -38,15 +38,13 @@ Sentry.init({
 });
 ```
 
-Sentry SDK will now automatically profile all transactions, even the ones which may be started as a result of using an
+Sentry SDK will now automatically profile all root spans, even the ones which may be started as a result of using an
 automatic instrumentation integration.
 
 ```javascript
-const transaction = Sentry.startTransaction({ name: 'some workflow' });
-
-// The code between startTransaction and transaction.finish will be profiled
-
-transaction.end();
+Sentry.startSpan({ name: 'some workflow' }, () => {
+  // The code in here will be profiled
+});
 ```
 
 ### Building the package from source
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index bb5bd71c9751..e0025e41552f 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -8,6 +8,15 @@
   "license": "MIT",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": {
+        "types": "./lib/types/index.d.ts",
+        "default": "./lib/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "lib/types/index.d.ts": [
@@ -19,7 +28,7 @@
     "sentry-prune-profiler-binaries": "scripts/prune-profiler-binaries.js"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/profiling-node/src/hubextensions.ts b/packages/profiling-node/src/hubextensions.ts
deleted file mode 100644
index 2f615eb1324e..000000000000
--- a/packages/profiling-node/src/hubextensions.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import { getMainCarrier, spanToJSON } from '@sentry/core';
-import type { NodeClient } from '@sentry/node-experimental';
-import type { CustomSamplingContext, Hub, Transaction, TransactionContext } from '@sentry/types';
-import { logger, uuid4 } from '@sentry/utils';
-
-import { CpuProfilerBindings } from './cpu_profiler';
-import { DEBUG_BUILD } from './debug-build';
-import { isValidSampleRate } from './utils';
-
-export const MAX_PROFILE_DURATION_MS = 30 * 1000;
-
-type StartTransaction = (
-  this: Hub,
-  transactionContext: TransactionContext,
-  customSamplingContext?: CustomSamplingContext,
-) => Transaction;
-
-/**
- * Takes a transaction and determines if it should be profiled or not. If it should be profiled, it returns the
- * profile_id, otherwise returns undefined. Takes care of setting profile context on transaction as well
- */
-export function maybeProfileTransaction(
-  client: NodeClient | undefined,
-  transaction: Transaction,
-  customSamplingContext?: CustomSamplingContext,
-): string | undefined {
-  // profilesSampleRate is multiplied with tracesSampleRate to get the final sampling rate. We dont perform
-  // the actual multiplication to get the final rate, but we discard the profile if the transaction was sampled,
-  // so anything after this block from here is based on the transaction sampling.
-  // eslint-disable-next-line deprecation/deprecation
-  if (!transaction.sampled) {
-    return;
-  }
-
-  // Client and options are required for profiling
-  if (!client) {
-    DEBUG_BUILD && logger.log('[Profiling] Profiling disabled, no client found.');
-    return;
-  }
-
-  const options = client.getOptions();
-  if (!options) {
-    DEBUG_BUILD && logger.log('[Profiling] Profiling disabled, no options found.');
-    return;
-  }
-
-  const profilesSampler = options.profilesSampler;
-  let profilesSampleRate: number | boolean | undefined = options.profilesSampleRate;
-
-  // Prefer sampler to sample rate if both are provided.
-  if (typeof profilesSampler === 'function') {
-    // eslint-disable-next-line deprecation/deprecation
-    profilesSampleRate = profilesSampler({ transactionContext: transaction.toContext(), ...customSamplingContext });
-  }
-
-  // Since this is coming from the user (or from a function provided by the user), who knows what we might get. (The
-  // only valid values are booleans or numbers between 0 and 1.)
-  if (!isValidSampleRate(profilesSampleRate)) {
-    DEBUG_BUILD && logger.warn('[Profiling] Discarding profile because of invalid sample rate.');
-    return;
-  }
-
-  // if the function returned 0 (or false), or if `profileSampleRate` is 0, it's a sign the profile should be dropped
-  if (!profilesSampleRate) {
-    DEBUG_BUILD &&
-      logger.log(
-        `[Profiling] Discarding profile because ${
-          typeof profilesSampler === 'function'
-            ? 'profileSampler returned 0 or false'
-            : 'a negative sampling decision was inherited or profileSampleRate is set to 0'
-        }`,
-      );
-    return;
-  }
-
-  // Now we roll the dice. Math.random is inclusive of 0, but not of 1, so strict < is safe here. In case sampleRate is
-  // a boolean, the < comparison will cause it to be automatically cast to 1 if it's true and 0 if it's false.
-  const sampled = profilesSampleRate === true ? true : Math.random() < profilesSampleRate;
-  // Check if we should sample this profile
-  if (!sampled) {
-    DEBUG_BUILD &&
-      logger.log(
-        `[Profiling] Discarding profile because it's not included in the random sample (sampling rate = ${Number(
-          profilesSampleRate,
-        )})`,
-      );
-    return;
-  }
-
-  const profile_id = uuid4();
-  CpuProfilerBindings.startProfiling(profile_id);
-  DEBUG_BUILD && logger.log(`[Profiling] started profiling transaction: ${spanToJSON(transaction).description}`);
-
-  // set transaction context - do this regardless if profiling fails down the line
-  // so that we can still see the profile_id in the transaction context
-  return profile_id;
-}
-
-/**
- * Stops the profiler for profile_id and returns the profile
- * @param transaction
- * @param profile_id
- * @returns
- */
-export function stopTransactionProfile(
-  transaction: Transaction,
-  profile_id: string | undefined,
-): ReturnType<(typeof CpuProfilerBindings)['stopProfiling']> | null {
-  // Should not happen, but satisfy the type checker and be safe regardless.
-  if (!profile_id) {
-    return null;
-  }
-
-  const profile = CpuProfilerBindings.stopProfiling(profile_id);
-
-  DEBUG_BUILD && logger.log(`[Profiling] stopped profiling of transaction: ${spanToJSON(transaction).description}`);
-
-  // In case of an overlapping transaction, stopProfiling may return null and silently ignore the overlapping profile.
-  if (!profile) {
-    DEBUG_BUILD &&
-      logger.log(
-        `[Profiling] profiler returned null profile for: ${spanToJSON(transaction).description}`,
-        'this may indicate an overlapping transaction or a call to stopProfiling with a profile title that was never started',
-      );
-    return null;
-  }
-
-  // Assign profile_id to the profile
-  profile.profile_id = profile_id;
-  return profile;
-}
-
-/**
- * Wraps startTransaction and stopTransaction with profiling related logic.
- * startProfiling is called after the call to startTransaction in order to avoid our own code from
- * being profiled. Because of that same reason, stopProfiling is called before the call to stopTransaction.
- */
-export function __PRIVATE__wrapStartTransactionWithProfiling(startTransaction: StartTransaction): StartTransaction {
-  return function wrappedStartTransaction(
-    this: Hub,
-    transactionContext: TransactionContext,
-    customSamplingContext?: CustomSamplingContext,
-  ): Transaction {
-    const transaction: Transaction = startTransaction.call(this, transactionContext, customSamplingContext);
-
-    // Client is required if we want to profile
-    // eslint-disable-next-line deprecation/deprecation
-    const client = this.getClient() as NodeClient | undefined;
-    if (!client) {
-      return transaction;
-    }
-
-    // Check if we should profile this transaction. If a profile_id is returned, then profiling has been started.
-    const profile_id = maybeProfileTransaction(client, transaction, customSamplingContext);
-    if (!profile_id) {
-      return transaction;
-    }
-
-    // A couple of important things to note here:
-    // `CpuProfilerBindings.stopProfiling` will be scheduled to run in 30seconds in order to exceed max profile duration.
-    // Whichever of the two (transaction.finish/timeout) is first to run, the profiling will be stopped and the gathered profile
-    // will be processed when the original transaction is finished. Since onProfileHandler can be invoked multiple times in the
-    // event of an error or user mistake (calling transaction.finish multiple times), it is important that the behavior of onProfileHandler
-    // is idempotent as we do not want any timings or profiles to be overriden by the last call to onProfileHandler.
-    // After the original finish method is called, the event will be reported through the integration and delegated to transport.
-    let profile: ReturnType<(typeof CpuProfilerBindings)['stopProfiling']> | null = null;
-
-    const options = client.getOptions();
-    // Not intended for external use, hence missing types, but we want to profile a couple of things at Sentry that
-    // currently exceed the default timeout set by the SDKs.
-    const maxProfileDurationMs =
-      (options._experiments && options._experiments['maxProfileDurationMs']) || MAX_PROFILE_DURATION_MS;
-
-    // Enqueue a timeout to prevent profiles from running over max duration.
-    let maxDurationTimeoutID: NodeJS.Timeout | void = global.setTimeout(() => {
-      DEBUG_BUILD &&
-        logger.log(
-          '[Profiling] max profile duration elapsed, stopping profiling for:',
-          spanToJSON(transaction).description,
-        );
-
-      profile = stopTransactionProfile(transaction, profile_id);
-    }, maxProfileDurationMs);
-
-    // We need to reference the original finish call to avoid creating an infinite loop
-    const originalEnd = transaction.end.bind(transaction);
-
-    // Wrap the transaction finish method to stop profiling and set the profile on the transaction.
-    function profilingWrappedTransactionEnd(): void {
-      if (!profile_id) {
-        return originalEnd();
-      }
-
-      // We stop the handler first to ensure that the timeout is cleared and the profile is stopped.
-      if (maxDurationTimeoutID) {
-        global.clearTimeout(maxDurationTimeoutID);
-        maxDurationTimeoutID = undefined;
-      }
-
-      // onProfileHandler should always return the same profile even if this is called multiple times.
-      // Always call onProfileHandler to ensure stopProfiling is called and the timeout is cleared.
-      if (!profile) {
-        profile = stopTransactionProfile(transaction, profile_id);
-      }
-
-      // @ts-expect-error profile is not part of metadata
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setMetadata({ profile });
-      return originalEnd();
-    }
-
-    transaction.end = profilingWrappedTransactionEnd;
-    return transaction;
-  };
-}
-
-/**
- * Patches startTransaction and stopTransaction with profiling logic.
- * This is used by the SDK's that do not support event hooks.
- * @private
- */
-function _addProfilingExtensionMethods(): void {
-  const carrier = getMainCarrier();
-  if (!carrier.__SENTRY__) {
-    DEBUG_BUILD && logger.log("[Profiling] Can't find main carrier, profiling won't work.");
-    return;
-  }
-
-  carrier.__SENTRY__.extensions = carrier.__SENTRY__.extensions || {};
-  if (!carrier.__SENTRY__.extensions['startTransaction']) {
-    DEBUG_BUILD && logger.log('[Profiling] startTransaction does not exists, profiling will not work.');
-    return;
-  }
-
-  DEBUG_BUILD && logger.log('[Profiling] startTransaction exists, patching it with profiling functionality...');
-
-  carrier.__SENTRY__.extensions['startTransaction'] = __PRIVATE__wrapStartTransactionWithProfiling(
-    // This is patched by sentry/tracing, we are going to re-patch it...
-    carrier.__SENTRY__.extensions['startTransaction'] as StartTransaction,
-  );
-}
-
-/**
- * This patches the global object and injects the Profiling extensions methods
- */
-export function addProfilingExtensionMethods(): void {
-  _addProfilingExtensionMethods();
-}
diff --git a/packages/profiling-node/src/index.ts b/packages/profiling-node/src/index.ts
index 086fbb86de58..a806019cc5ee 100644
--- a/packages/profiling-node/src/index.ts
+++ b/packages/profiling-node/src/index.ts
@@ -1,5 +1 @@
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  ProfilingIntegration,
-  nodeProfilingIntegration,
-} from './integration';
+export { nodeProfilingIntegration } from './integration';
diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts
index 90c3ec6d7ffb..a417ac2b1c78 100644
--- a/packages/profiling-node/src/integration.ts
+++ b/packages/profiling-node/src/integration.ts
@@ -1,34 +1,14 @@
-import { spanToJSON } from '@sentry/core';
+import { defineIntegration, getCurrentScope, getRootSpan, spanToJSON } from '@sentry/core';
 import type { NodeClient } from '@sentry/node-experimental';
-import type {
-  Event,
-  EventProcessor,
-  Hub,
-  Integration,
-  IntegrationFn,
-  IntegrationFnResult,
-  Transaction,
-} from '@sentry/types';
+import type { IntegrationFn, Span } from '@sentry/types';
 
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
-import {
-  MAX_PROFILE_DURATION_MS,
-  addProfilingExtensionMethods,
-  maybeProfileTransaction,
-  stopTransactionProfile,
-} from './hubextensions';
+import { MAX_PROFILE_DURATION_MS, maybeProfileSpan, stopSpanProfile } from './spanProfileUtils';
 import type { Profile, RawThreadCpuProfile } from './types';
 
-import {
-  addProfilesToEnvelope,
-  createProfilingEvent,
-  createProfilingEventEnvelope,
-  findProfiledTransactionsFromEnvelope,
-  isProfiledTransactionEvent,
-  maybeRemoveProfileFromSdkMetadata,
-} from './utils';
+import { addProfilesToEnvelope, createProfilingEvent, findProfiledTransactionsFromEnvelope } from './utils';
 
 const MAX_PROFILE_QUEUE_LENGTH = 50;
 const PROFILE_QUEUE: RawThreadCpuProfile[] = [];
@@ -43,36 +23,19 @@ function addToProfileQueue(profile: RawThreadCpuProfile): void {
   }
 }
 
-/**
- * We need this integration in order to send data to Sentry. We hook into the event processor
- * and inspect each event to see if it is a transaction event and if that transaction event
- * contains a profile on it's metadata. If that is the case, we create a profiling event envelope
- * and delete the profile from the transaction metadata.
- *
- * @deprecated Use `nodeProfilingIntegration` instead.
- */
-export class ProfilingIntegration implements Integration {
-  /**
-   * @inheritDoc
-   */
-  public readonly name: string;
-  public getCurrentHub?: () => Hub;
-
-  public constructor() {
-    this.name = 'ProfilingIntegration';
-  }
+/** Exported only for tests. */
+export const _nodeProfilingIntegration = (() => {
+  return {
+    name: 'ProfilingIntegration',
+    setup(client: NodeClient) {
+      const spanToProfileIdMap = new WeakMap<Span, string>();
 
-  /**
-   * @inheritDoc
-   */
-  public setupOnce(addGlobalEventProcessor: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
-    this.getCurrentHub = getCurrentHub;
-    // eslint-disable-next-line deprecation/deprecation
-    const client = this.getCurrentHub().getClient() as NodeClient;
+      client.on('spanStart', span => {
+        if (span !== getRootSpan(span)) {
+          return;
+        }
 
-    if (client && typeof client.on === 'function') {
-      client.on('startTransaction', (transaction: Transaction) => {
-        const profile_id = maybeProfileTransaction(client, transaction, undefined);
+        const profile_id = maybeProfileSpan(client, span, undefined);
 
         if (profile_id) {
           const options = client.getOptions();
@@ -92,34 +55,31 @@ export class ProfilingIntegration implements Integration {
             DEBUG_BUILD &&
               logger.log(
                 '[Profiling] max profile duration elapsed, stopping profiling for:',
-                spanToJSON(transaction).description,
+                spanToJSON(span).description,
               );
 
-            const profile = stopTransactionProfile(transaction, profile_id);
+            const profile = stopSpanProfile(span, profile_id);
             if (profile) {
               addToProfileQueue(profile);
             }
           }, maxProfileDurationMs);
 
-          // eslint-disable-next-line deprecation/deprecation
-          transaction.setContext('profile', { profile_id });
-          // @ts-expect-error profile_id is not part of the metadata type
-          // eslint-disable-next-line deprecation/deprecation
-          transaction.setMetadata({ profile_id: profile_id });
+          getCurrentScope().setContext('profile', { profile_id });
+
+          spanToProfileIdMap.set(span, profile_id);
         }
       });
 
-      client.on('finishTransaction', transaction => {
-        // @ts-expect-error profile_id is not part of the metadata type
-        // eslint-disable-next-line deprecation/deprecation
-        const profile_id = transaction.metadata.profile_id;
-        if (profile_id && typeof profile_id === 'string') {
+      client.on('spanEnd', span => {
+        const profile_id = spanToProfileIdMap.get(span);
+
+        if (profile_id) {
           if (PROFILE_TIMEOUTS[profile_id]) {
             global.clearTimeout(PROFILE_TIMEOUTS[profile_id]);
             // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
             delete PROFILE_TIMEOUTS[profile_id];
           }
-          const profile = stopTransactionProfile(transaction, profile_id);
+          const profile = stopSpanProfile(span, profile_id);
 
           if (profile) {
             addToProfileQueue(profile);
@@ -190,71 +150,9 @@ export class ProfilingIntegration implements Integration {
 
         addProfilesToEnvelope(envelope, profilesToAddToEnvelope);
       });
-    } else {
-      // Patch the carrier methods and add the event processor.
-      addProfilingExtensionMethods();
-      addGlobalEventProcessor(this.handleGlobalEvent.bind(this));
-    }
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public async handleGlobalEvent(event: Event): Promise<Event> {
-    if (this.getCurrentHub === undefined) {
-      return maybeRemoveProfileFromSdkMetadata(event);
-    }
-
-    if (isProfiledTransactionEvent(event)) {
-      // Client, Dsn and Transport are all required to be able to send the profiling event to Sentry.
-      // If either of them is not available, we remove the profile from the transaction event.
-      // and forward it to the next event processor.
-      const hub = this.getCurrentHub();
-
-      // eslint-disable-next-line deprecation/deprecation
-      const client = hub.getClient();
-
-      if (!client) {
-        DEBUG_BUILD &&
-          logger.log(
-            '[Profiling] getClient did not return a Client, removing profile from event and forwarding to next event processors.',
-          );
-        return maybeRemoveProfileFromSdkMetadata(event);
-      }
-
-      const dsn = client.getDsn();
-      if (!dsn) {
-        DEBUG_BUILD &&
-          logger.log(
-            '[Profiling] getDsn did not return a Dsn, removing profile from event and forwarding to next event processors.',
-          );
-        return maybeRemoveProfileFromSdkMetadata(event);
-      }
-
-      const transport = client.getTransport();
-      if (!transport) {
-        DEBUG_BUILD &&
-          logger.log(
-            '[Profiling] getTransport did not return a Transport, removing profile from event and forwarding to next event processors.',
-          );
-        return maybeRemoveProfileFromSdkMetadata(event);
-      }
-
-      // If all required components are available, we construct a profiling event envelope and send it to Sentry.
-      DEBUG_BUILD && logger.log('[Profiling] Preparing envelope and sending a profiling event');
-      const envelope = createProfilingEventEnvelope(event, dsn);
-
-      if (envelope) {
-        // Fire and forget, we don't want to block the main event processing flow.
-        // eslint-disable-next-line @typescript-eslint/no-floating-promises
-        transport.send(envelope);
-      }
-    }
-
-    // Ensure sdkProcessingMetadata["profile"] is removed from the event before forwarding it to the next event processor.
-    return maybeRemoveProfileFromSdkMetadata(event);
-  }
-}
+    },
+  };
+}) satisfies IntegrationFn;
 
 /**
  * We need this integration in order to send data to Sentry. We hook into the event processor
@@ -262,7 +160,4 @@ export class ProfilingIntegration implements Integration {
  * contains a profile on it's metadata. If that is the case, we create a profiling event envelope
  * and delete the profile from the transaction metadata.
  */
-export const nodeProfilingIntegration = (() => {
-  // eslint-disable-next-line deprecation/deprecation
-  return new ProfilingIntegration() as unknown as IntegrationFnResult;
-}) satisfies IntegrationFn;
+export const nodeProfilingIntegration = defineIntegration(_nodeProfilingIntegration);
diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts
new file mode 100644
index 000000000000..61e4b7d8a4de
--- /dev/null
+++ b/packages/profiling-node/src/spanProfileUtils.ts
@@ -0,0 +1,136 @@
+import { spanIsSampled, spanToJSON } from '@sentry/core';
+import type { NodeClient } from '@sentry/node-experimental';
+import type { CustomSamplingContext, Span } from '@sentry/types';
+import { logger, uuid4 } from '@sentry/utils';
+
+import { CpuProfilerBindings } from './cpu_profiler';
+import { DEBUG_BUILD } from './debug-build';
+import { isValidSampleRate } from './utils';
+
+export const MAX_PROFILE_DURATION_MS = 30 * 1000;
+
+/**
+ * Takes a transaction and determines if it should be profiled or not. If it should be profiled, it returns the
+ * profile_id, otherwise returns undefined. Takes care of setting profile context on transaction as well
+ */
+export function maybeProfileSpan(
+  client: NodeClient | undefined,
+  span: Span,
+  customSamplingContext?: CustomSamplingContext,
+): string | undefined {
+  // profilesSampleRate is multiplied with tracesSampleRate to get the final sampling rate. We dont perform
+  // the actual multiplication to get the final rate, but we discard the profile if the span was sampled,
+  // so anything after this block from here is based on the span sampling.
+  if (!spanIsSampled(span)) {
+    return;
+  }
+
+  // Client and options are required for profiling
+  if (!client) {
+    DEBUG_BUILD && logger.log('[Profiling] Profiling disabled, no client found.');
+    return;
+  }
+
+  const options = client.getOptions();
+  if (!options) {
+    DEBUG_BUILD && logger.log('[Profiling] Profiling disabled, no options found.');
+    return;
+  }
+
+  const profilesSampler = options.profilesSampler;
+  let profilesSampleRate: number | boolean | undefined = options.profilesSampleRate;
+
+  // Prefer sampler to sample rate if both are provided.
+  if (typeof profilesSampler === 'function') {
+    const { description: spanName = '<unknown>', data } = spanToJSON(span);
+    // We bail out early if that is not the case
+    const parentSampled = true;
+
+    profilesSampleRate = profilesSampler({
+      name: spanName,
+      attributes: data,
+      transactionContext: {
+        name: spanName,
+        parentSampled,
+      },
+      parentSampled,
+      ...customSamplingContext,
+    });
+  }
+
+  // Since this is coming from the user (or from a function provided by the user), who knows what we might get. (The
+  // only valid values are booleans or numbers between 0 and 1.)
+  if (!isValidSampleRate(profilesSampleRate)) {
+    DEBUG_BUILD && logger.warn('[Profiling] Discarding profile because of invalid sample rate.');
+    return;
+  }
+
+  // if the function returned 0 (or false), or if `profileSampleRate` is 0, it's a sign the profile should be dropped
+  if (!profilesSampleRate) {
+    DEBUG_BUILD &&
+      logger.log(
+        `[Profiling] Discarding profile because ${
+          typeof profilesSampler === 'function'
+            ? 'profileSampler returned 0 or false'
+            : 'a negative sampling decision was inherited or profileSampleRate is set to 0'
+        }`,
+      );
+    return;
+  }
+
+  // Now we roll the dice. Math.random is inclusive of 0, but not of 1, so strict < is safe here. In case sampleRate is
+  // a boolean, the < comparison will cause it to be automatically cast to 1 if it's true and 0 if it's false.
+  const sampled = profilesSampleRate === true ? true : Math.random() < profilesSampleRate;
+  // Check if we should sample this profile
+  if (!sampled) {
+    DEBUG_BUILD &&
+      logger.log(
+        `[Profiling] Discarding profile because it's not included in the random sample (sampling rate = ${Number(
+          profilesSampleRate,
+        )})`,
+      );
+    return;
+  }
+
+  const profile_id = uuid4();
+  CpuProfilerBindings.startProfiling(profile_id);
+  DEBUG_BUILD && logger.log(`[Profiling] started profiling transaction: ${spanToJSON(span).description}`);
+
+  // set transaction context - do this regardless if profiling fails down the line
+  // so that we can still see the profile_id in the transaction context
+  return profile_id;
+}
+
+/**
+ * Stops the profiler for profile_id and returns the profile
+ * @param transaction
+ * @param profile_id
+ * @returns
+ */
+export function stopSpanProfile(
+  span: Span,
+  profile_id: string | undefined,
+): ReturnType<(typeof CpuProfilerBindings)['stopProfiling']> | null {
+  // Should not happen, but satisfy the type checker and be safe regardless.
+  if (!profile_id) {
+    return null;
+  }
+
+  const profile = CpuProfilerBindings.stopProfiling(profile_id);
+
+  DEBUG_BUILD && logger.log(`[Profiling] stopped profiling of transaction: ${spanToJSON(span).description}`);
+
+  // In case of an overlapping span, stopProfiling may return null and silently ignore the overlapping profile.
+  if (!profile) {
+    DEBUG_BUILD &&
+      logger.log(
+        `[Profiling] profiler returned null profile for: ${spanToJSON(span).description}`,
+        'this may indicate an overlapping span or a call to stopProfiling with a profile title that was never started',
+      );
+    return null;
+  }
+
+  // Assign profile_id to the profile
+  profile.profile_id = profile_id;
+  return profile;
+}
diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts
index 97e17eab8888..626d79db9be1 100644
--- a/packages/profiling-node/src/utils.ts
+++ b/packages/profiling-node/src/utils.ts
@@ -1,24 +1,10 @@
-/* eslint-disable max-lines */
 import * as os from 'os';
-import type {
-  Context,
-  DsnComponents,
-  DynamicSamplingContext,
-  Envelope,
-  Event,
-  EventEnvelope,
-  EventEnvelopeHeaders,
-  EventItem,
-  SdkInfo,
-  SdkMetadata,
-  StackFrame,
-  StackParser,
-} from '@sentry/types';
+import type { Context, Envelope, Event, StackFrame, StackParser } from '@sentry/types';
 import { env, versions } from 'process';
 import { isMainThread, threadId } from 'worker_threads';
 
 import * as Sentry from '@sentry/node-experimental';
-import { GLOBAL_OBJ, createEnvelope, dropUndefinedKeys, dsnToString, forEachEnvelopeItem, logger } from '@sentry/utils';
+import { GLOBAL_OBJ, forEachEnvelopeItem, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
 import type { Profile, ProfiledEvent, RawThreadCpuProfile, ThreadCpuProfile } from './types';
@@ -75,67 +61,6 @@ export function enrichWithThreadInformation(profile: ThreadCpuProfile | RawThrea
   };
 }
 
-/**
- * Extract sdk info from from the API metadata
- * @param {SdkMetadata | undefined} metadata
- * @returns {SdkInfo | undefined}
- */
-function getSdkMetadataForEnvelopeHeader(metadata?: SdkMetadata): SdkInfo | undefined {
-  if (!metadata || !metadata.sdk) {
-    return undefined;
-  }
-
-  return { name: metadata.sdk.name, version: metadata.sdk.version } as SdkInfo;
-}
-
-/**
- * Apply SdkInfo (name, version, packages, integrations) to the corresponding event key.
- * Merge with existing data if any.
- *
- * @param {Event} event
- * @param {SdkInfo | undefined} sdkInfo
- * @returns {Event}
- */
-function enhanceEventWithSdkInfo(event: Event, sdkInfo?: SdkInfo): Event {
-  if (!sdkInfo) {
-    return event;
-  }
-  event.sdk = event.sdk || {};
-  event.sdk.name = event.sdk.name || sdkInfo.name || 'unknown sdk';
-  event.sdk.version = event.sdk.version || sdkInfo.version || 'unknown sdk version';
-  event.sdk.integrations = [...(event.sdk.integrations || []), ...(sdkInfo.integrations || [])];
-  event.sdk.packages = [...(event.sdk.packages || []), ...(sdkInfo.packages || [])];
-  return event;
-}
-
-/**
- *
- * @param {Event} event
- * @param {SdkInfo | undefined} sdkInfo
- * @param {string | undefined} tunnel
- * @param {DsnComponents} dsn
- * @returns {EventEnvelopeHeaders}
- */
-function createEventEnvelopeHeaders(
-  event: Event,
-  sdkInfo: SdkInfo | undefined,
-  tunnel: string | undefined,
-  dsn: DsnComponents,
-): EventEnvelopeHeaders {
-  const dynamicSamplingContext = event.sdkProcessingMetadata && event.sdkProcessingMetadata['dynamicSamplingContext'];
-
-  return {
-    event_id: event.event_id as string,
-    sent_at: new Date().toISOString(),
-    ...(sdkInfo && { sdk: sdkInfo }),
-    ...(!!tunnel && { dsn: dsnToString(dsn) }),
-    ...(event.type === 'transaction' &&
-      dynamicSamplingContext && {
-        trace: dropUndefinedKeys({ ...dynamicSamplingContext }) as DynamicSamplingContext,
-      }),
-  };
-}
-
 /**
  * Creates a profiling event envelope from a Sentry event. If profile does not pass
  * validation, returns null.
@@ -274,67 +199,6 @@ function createProfilePayload(
   return profile;
 }
 
-/**
- * Creates an envelope from a profiling event.
- * @param {Event} Profile
- * @param {DsnComponents} dsn
- * @param {SdkMetadata} metadata
- * @param {string|undefined} tunnel
- * @returns {Envelope|null}
- */
-export function createProfilingEventEnvelope(
-  event: ProfiledEvent,
-  dsn: DsnComponents,
-  metadata?: SdkMetadata,
-  tunnel?: string,
-): EventEnvelope | null {
-  const sdkInfo = getSdkMetadataForEnvelopeHeader(metadata);
-  enhanceEventWithSdkInfo(event, metadata && metadata.sdk);
-
-  const envelopeHeaders = createEventEnvelopeHeaders(event, sdkInfo, tunnel, dsn);
-  const profile = createProfilingEventFromTransaction(event);
-
-  if (!profile) {
-    return null;
-  }
-
-  const envelopeItem: EventItem = [
-    {
-      type: 'profile',
-    },
-    // @ts-expect-error profile is not part of EventItem yet
-    profile,
-  ];
-
-  return createEnvelope<EventEnvelope>(envelopeHeaders, [envelopeItem]);
-}
-
-/**
- * Check if event metadata contains profile information
- * @param {Event}
- * @returns {boolean}
- */
-export function isProfiledTransactionEvent(event: Event): event is ProfiledEvent {
-  return !!(event.sdkProcessingMetadata && event.sdkProcessingMetadata['profile']);
-}
-
-/**
- * Due to how profiles are attached to event metadata, we may sometimes want to remove them to ensure
- * they are not processed by other Sentry integrations. This can be the case when we cannot construct a valid
- * profile from the data we have or some of the mechanisms to send the event (Hub, Transport etc) are not available to us.
- *
- * @param {Event | ProfiledEvent} event
- * @returns {Event}
- */
-export function maybeRemoveProfileFromSdkMetadata(event: Event | ProfiledEvent): Event {
-  if (!isProfiledTransactionEvent(event)) {
-    return event;
-  }
-
-  delete event.sdkProcessingMetadata.profile;
-  return event;
-}
-
 /**
  * Checks the given sample rate to make sure it is valid type and value (a boolean, or a number between 0 and 1).
  * @param {unknown} rate
diff --git a/packages/profiling-node/test/hubextensions.test.ts b/packages/profiling-node/test/hubextensions.test.ts
deleted file mode 100644
index 362803e4b48d..000000000000
--- a/packages/profiling-node/test/hubextensions.test.ts
+++ /dev/null
@@ -1,242 +0,0 @@
-import type {
-  BaseTransportOptions,
-  ClientOptions,
-  Context,
-  Hub,
-  Transaction,
-  TransactionMetadata,
-} from '@sentry/types';
-
-import type { NodeClient } from '@sentry/node-experimental';
-
-import { CpuProfilerBindings } from '../src/cpu_profiler';
-import { __PRIVATE__wrapStartTransactionWithProfiling } from '../src/hubextensions';
-
-function makeTransactionMock(options = {}): Transaction {
-  return {
-    metadata: {},
-    tags: {},
-    sampled: true,
-    contexts: {},
-    startChild: () => ({ end: () => void 0 }),
-    end() {
-      return;
-    },
-    toContext: () => {
-      return {};
-    },
-    setContext(this: Transaction, key: string, context: Context) {
-      // @ts-expect-error - contexts is private
-      this.contexts[key] = context;
-    },
-    setTag(this: Transaction, key: string, value: any) {
-      // eslint-disable-next-line deprecation/deprecation
-      this.tags[key] = value;
-    },
-    setMetadata(this: Transaction, metadata: Partial<TransactionMetadata>) {
-      // eslint-disable-next-line deprecation/deprecation
-      this.metadata = { ...metadata } as TransactionMetadata;
-    },
-    ...options,
-  } as unknown as Transaction;
-}
-
-function makeHubMock({
-  profilesSampleRate,
-  client,
-}: {
-  profilesSampleRate: number | undefined;
-  client?: Partial<NodeClient>;
-}): Hub {
-  return {
-    getClient: jest.fn().mockImplementation(() => {
-      return {
-        getOptions: jest.fn().mockImplementation(() => {
-          return {
-            profilesSampleRate,
-          } as unknown as ClientOptions<BaseTransportOptions>;
-        }),
-        ...(client ?? {}),
-      };
-    }),
-  } as unknown as Hub;
-}
-
-describe('hubextensions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-  it('skips profiling if profilesSampleRate is not set (undefined)', () => {
-    const hub = makeHubMock({ profilesSampleRate: undefined });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, {});
-    transaction.end();
-
-    expect(startTransaction).toHaveBeenCalledTimes(1);
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-    expect((transaction.metadata as any)?.profile).toBeUndefined();
-  });
-  it('skips profiling if profilesSampleRate is set to 0', () => {
-    const hub = makeHubMock({ profilesSampleRate: 0 });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, {});
-    transaction.end();
-
-    expect(startTransaction).toHaveBeenCalledTimes(1);
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-
-    expect((transaction.metadata as any)?.profile).toBeUndefined();
-  });
-  it('skips profiling when random > sampleRate', () => {
-    const hub = makeHubMock({ profilesSampleRate: 0.5 });
-    jest.spyOn(global.Math, 'random').mockReturnValue(1);
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, {});
-    transaction.end();
-
-    expect(startTransaction).toHaveBeenCalledTimes(1);
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-
-    expect((transaction.metadata as any)?.profile).toBeUndefined();
-  });
-  it('starts the profiler', () => {
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
-
-    const hub = makeHubMock({ profilesSampleRate: 1 });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, {});
-    transaction.end();
-
-    expect(startTransaction).toHaveBeenCalledTimes(1);
-    expect(startProfilingSpy).toHaveBeenCalledTimes(1);
-    expect(stopProfilingSpy).toHaveBeenCalledTimes(1);
-
-    expect((transaction.metadata as any)?.profile).toBeDefined();
-  });
-
-  it('does not start the profiler if transaction is sampled', () => {
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
-
-    const hub = makeHubMock({ profilesSampleRate: 1 });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock({ sampled: false }));
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, {});
-    transaction.end();
-
-    expect(startTransaction).toHaveBeenCalledTimes(1);
-    expect(startProfilingSpy).not.toHaveBeenCalledTimes(1);
-    expect(stopProfilingSpy).not.toHaveBeenCalledTimes(1);
-  });
-
-  it('disabled if neither profilesSampler and profilesSampleRate are not set', () => {
-    const hub = makeHubMock({ profilesSampleRate: undefined });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const samplingContext = { beep: 'boop' };
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, samplingContext);
-    transaction.end();
-
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-  });
-
-  it('does not call startProfiling if profilesSampler returns invalid rate', () => {
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    const options = { profilesSampler: jest.fn().mockReturnValue(NaN) };
-    const hub = makeHubMock({
-      profilesSampleRate: undefined,
-      client: {
-        // @ts-expect-error partial client
-        getOptions: () => options,
-      },
-    });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const samplingContext = { beep: 'boop' };
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, samplingContext);
-    transaction.end();
-
-    expect(options.profilesSampler).toHaveBeenCalled();
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-  });
-
-  it('does not call startProfiling if profilesSampleRate is invalid', () => {
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    const options = { profilesSampler: jest.fn().mockReturnValue(NaN) };
-    const hub = makeHubMock({
-      profilesSampleRate: NaN,
-      client: {
-        // @ts-expect-error partial client
-        getOptions: () => options,
-      },
-    });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const samplingContext = { beep: 'boop' };
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, samplingContext);
-    transaction.end();
-
-    expect(options.profilesSampler).toHaveBeenCalled();
-    expect(startProfilingSpy).not.toHaveBeenCalled();
-  });
-
-  it('calls profilesSampler with sampling context', () => {
-    const options = { profilesSampler: jest.fn() };
-    const hub = makeHubMock({
-      profilesSampleRate: undefined,
-      client: {
-        // @ts-expect-error partial client
-        getOptions: () => options,
-      },
-    });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const samplingContext = { beep: 'boop' };
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, samplingContext);
-    transaction.end();
-
-    expect(options.profilesSampler).toHaveBeenCalledWith({
-      ...samplingContext,
-      transactionContext: transaction.toContext(),
-    });
-  });
-
-  it('prioritizes profilesSampler outcome over profilesSampleRate', () => {
-    const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-    const options = { profilesSampler: jest.fn().mockReturnValue(1) };
-    const hub = makeHubMock({
-      profilesSampleRate: 0,
-      client: {
-        // @ts-expect-error partial client
-        getOptions: () => options,
-      },
-    });
-    const startTransaction = jest.fn().mockImplementation(() => makeTransactionMock());
-
-    const maybeStartTransactionWithProfiling = __PRIVATE__wrapStartTransactionWithProfiling(startTransaction);
-    const samplingContext = { beep: 'boop' };
-    const transaction = maybeStartTransactionWithProfiling.call(hub, { name: '' }, samplingContext);
-    transaction.end();
-
-    expect(startProfilingSpy).toHaveBeenCalled();
-  });
-});
diff --git a/packages/profiling-node/test/index.test.ts b/packages/profiling-node/test/index.test.ts
deleted file mode 100644
index 0a074226f692..000000000000
--- a/packages/profiling-node/test/index.test.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import * as Sentry from '@sentry/node-experimental';
-import type { Transport } from '@sentry/types';
-
-import { getMainCarrier } from '@sentry/core';
-import { ProfilingIntegration } from '../src/index';
-import type { Profile } from '../src/types';
-
-interface MockTransport extends Transport {
-  events: any[];
-}
-
-function makeStaticTransport(): MockTransport {
-  return {
-    events: [] as any[],
-    send: function (...args: any[]) {
-      this.events.push(args);
-      return Promise.resolve({});
-    },
-    flush: function () {
-      return Promise.resolve(true);
-    },
-  };
-}
-
-function makeClientWithoutHooks(): [Sentry.NodeClient, MockTransport] {
-  // eslint-disable-next-line deprecation/deprecation
-  const integration = new ProfilingIntegration();
-  const transport = makeStaticTransport();
-  const client = new Sentry.NodeClient({
-    stackParser: Sentry.defaultStackParser,
-    tracesSampleRate: 1,
-    profilesSampleRate: 1,
-    debug: true,
-    environment: 'test-environment',
-    dsn: 'https://7fa19397baaf433f919fbe02228d5470@o1137848.ingest.sentry.io/6625302',
-    integrations: [integration],
-    transport: () => transport,
-  });
-  // eslint-disable-next-line deprecation/deprecation
-  client.setupIntegrations = () => {
-    integration.setupOnce(
-      cb => {
-        // @ts-expect-error __SENTRY__ is private
-        getMainCarrier().__SENTRY__.globalEventProcessors = [cb];
-      },
-      // eslint-disable-next-line deprecation/deprecation
-      () => Sentry.getCurrentHub(),
-    );
-  };
-  // @ts-expect-error override private property
-  client.on = undefined;
-  return [client, transport];
-}
-
-function findAllProfiles(transport: MockTransport): [any, Profile][] | null {
-  return transport?.events.filter(call => {
-    return call[0][1][0][0].type === 'profile';
-  });
-}
-
-function findProfile(transport: MockTransport): Profile | null {
-  return (
-    transport?.events.find(call => {
-      return call[0][1][0][0].type === 'profile';
-    })?.[0][1][0][1] ?? null
-  );
-}
-
-const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
-
-describe('Sentry - Profiling', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    jest.useRealTimers();
-    // We will mock the carrier as if it has been initialized by the SDK, else everything is short circuited
-    getMainCarrier().__SENTRY__ = {};
-  });
-  afterEach(() => {
-    delete getMainCarrier().__SENTRY__;
-  });
-  describe('without hooks', () => {
-    it('profiles a transaction', async () => {
-      const [client, transport] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = Sentry.startTransaction({ name: 'title' });
-      await wait(500);
-      transaction.end();
-
-      await Sentry.flush(500);
-      expect(findProfile(transport)).not.toBe(null);
-    });
-
-    it('can profile overlapping transactions', async () => {
-      const [client, transport] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      // eslint-disable-next-line deprecation/deprecation
-      const t1 = Sentry.startTransaction({ name: 'outer' });
-      // eslint-disable-next-line deprecation/deprecation
-      const t2 = Sentry.startTransaction({ name: 'inner' });
-      await wait(500);
-
-      t2.end();
-      t1.end();
-
-      await Sentry.flush(500);
-
-      expect(findAllProfiles(transport)?.[0]?.[0]?.[1]?.[0]?.[1].transaction.name).toBe('inner');
-      expect(findAllProfiles(transport)?.[1]?.[0]?.[1]?.[0]?.[1].transaction.name).toBe('outer');
-      expect(findAllProfiles(transport)).toHaveLength(2);
-      expect(findProfile(transport)).not.toBe(null);
-    });
-
-    it('does not discard overlapping transaction with same title', async () => {
-      const [client, transport] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      // eslint-disable-next-line deprecation/deprecation
-      const t1 = Sentry.startTransaction({ name: 'same-title' });
-      // eslint-disable-next-line deprecation/deprecation
-      const t2 = Sentry.startTransaction({ name: 'same-title' });
-      await wait(500);
-      t2.end();
-      t1.end();
-
-      await Sentry.flush(500);
-      expect(findAllProfiles(transport)).toHaveLength(2);
-      expect(findProfile(transport)).not.toBe(null);
-    });
-
-    it('does not crash if end is called multiple times', async () => {
-      const [client, transport] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = Sentry.startTransaction({ name: 'title' });
-      await wait(500);
-      transaction.end();
-      transaction.end();
-
-      await Sentry.flush(500);
-      expect(findAllProfiles(transport)).toHaveLength(1);
-      expect(findProfile(transport)).not.toBe(null);
-    });
-  });
-});
diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts
index 7efd1cd03878..40ae171192e8 100644
--- a/packages/profiling-node/test/integration.test.ts
+++ b/packages/profiling-node/test/integration.test.ts
@@ -1,281 +1,74 @@
 import { EventEmitter } from 'events';
 
-import type { Event, Hub, Transport } from '@sentry/types';
-import { logger } from '@sentry/utils';
+import type { Transport } from '@sentry/types';
 
-import { ProfilingIntegration } from '../src/integration';
-import type { ProfiledEvent } from '../src/types';
-
-function assertCleanProfile(event: ProfiledEvent | Event): void {
-  expect(event.sdkProcessingMetadata?.profile).toBeUndefined();
-}
-
-function makeProfiledEvent(): ProfiledEvent {
-  return {
-    type: 'transaction',
-    sdkProcessingMetadata: {
-      profile: {
-        profile_id: 'id',
-        profiler_logging_mode: 'lazy',
-        samples: [
-          {
-            elapsed_since_start_ns: '0',
-            thread_id: '0',
-            stack_id: 0,
-          },
-          {
-            elapsed_since_start_ns: '1',
-            thread_id: '0',
-            stack_id: 0,
-          },
-        ],
-        measurements: {},
-        frames: [],
-        stacks: [],
-        resources: [],
-      },
-    },
-  };
-}
+import type { NodeClient } from '@sentry/node-experimental';
+import { _nodeProfilingIntegration } from '../src/integration';
 
 describe('ProfilingIntegration', () => {
   afterEach(() => {
     jest.clearAllMocks();
   });
   it('has a name', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    expect(new ProfilingIntegration().name).toBe('ProfilingIntegration');
-  });
-
-  it('stores a reference to getCurrentHub', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const integration = new ProfilingIntegration();
-
-    const getCurrentHub = jest.fn().mockImplementation(() => {
-      return {
-        getClient: jest.fn(),
-      };
-    });
-    const addGlobalEventProcessor = () => void 0;
-
-    integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-    expect(integration.getCurrentHub).toBe(getCurrentHub);
+    expect(_nodeProfilingIntegration().name).toBe('ProfilingIntegration');
   });
 
-  describe('without hooks', () => {
-    it('does not call transporter if null profile is received', () => {
-      const transport: Transport = {
-        send: jest.fn().mockImplementation(() => Promise.resolve()),
-        flush: jest.fn().mockImplementation(() => Promise.resolve()),
-      };
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-
-      const getCurrentHub = jest.fn((): Hub => {
+  it('does not call transporter if null profile is received', () => {
+    const transport: Transport = {
+      send: jest.fn().mockImplementation(() => Promise.resolve()),
+      flush: jest.fn().mockImplementation(() => Promise.resolve()),
+    };
+    const integration = _nodeProfilingIntegration();
+    const emitter = new EventEmitter();
+
+    const client = {
+      on: emitter.on.bind(emitter),
+      emit: emitter.emit.bind(emitter),
+      getOptions: () => {
         return {
-          getClient: () => {
-            return {
-              getOptions: () => {
-                return {
-                  _metadata: {},
-                };
-              },
-              getDsn: () => {
-                return {};
-              },
-              getTransport: () => transport,
-            };
-          },
-        } as Hub;
-      });
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-
-      integration.handleGlobalEvent({
-        type: 'transaction',
-        sdkProcessingMetadata: {
-          profile: null,
-        },
-      });
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      expect(transport.send).not.toHaveBeenCalled();
-    });
-
-    it('when Hub.getClient returns undefined', async () => {
-      const logSpy = jest.spyOn(logger, 'log');
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-
-      const getCurrentHub = jest.fn((): Hub => {
-        return { getClient: () => undefined } as Hub;
-      });
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-
-      assertCleanProfile(await integration.handleGlobalEvent(makeProfiledEvent()));
-      expect(logSpy).toHaveBeenCalledWith(
-        '[Profiling] getClient did not return a Client, removing profile from event and forwarding to next event processors.',
-      );
-    });
-    it('when getDsn returns undefined', async () => {
-      const logSpy = jest.spyOn(logger, 'log');
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-
-      const getCurrentHub = jest.fn((): Hub => {
-        return {
-          getClient: () => {
-            return {
-              getDsn: () => undefined,
-            };
-          },
-        } as Hub;
-      });
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-
-      assertCleanProfile(await integration.handleGlobalEvent(makeProfiledEvent()));
-      expect(logSpy).toHaveBeenCalledWith(
-        '[Profiling] getDsn did not return a Dsn, removing profile from event and forwarding to next event processors.',
-      );
-    });
-    it('when getTransport returns undefined', async () => {
-      const logSpy = jest.spyOn(logger, 'log');
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-
-      const getCurrentHub = jest.fn((): Hub => {
-        return {
-          getClient: () => {
-            return {
-              getDsn: () => {
-                return {};
-              },
-              getTransport: () => undefined,
-            };
-          },
-        } as Hub;
-      });
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-
-      assertCleanProfile(await integration.handleGlobalEvent(makeProfiledEvent()));
-      expect(logSpy).toHaveBeenCalledWith(
-        '[Profiling] getTransport did not return a Transport, removing profile from event and forwarding to next event processors.',
-      );
-    });
-
-    it('sends profile to sentry', async () => {
-      const logSpy = jest.spyOn(logger, 'log');
-      const transport: Transport = {
-        send: jest.fn().mockImplementation(() => Promise.resolve()),
-        flush: jest.fn().mockImplementation(() => Promise.resolve()),
-      };
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
+          _metadata: {},
+        };
+      },
+      getDsn: () => {
+        return {};
+      },
+      getTransport: () => transport,
+    } as unknown as NodeClient;
 
-      const getCurrentHub = jest.fn((): Hub => {
-        return {
-          getClient: () => {
-            return {
-              getOptions: () => {
-                return {
-                  _metadata: {},
-                };
-              },
-              getDsn: () => {
-                return {};
-              },
-              getTransport: () => transport,
-            };
-          },
-        } as Hub;
-      });
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
+    integration.setup(client);
 
-      assertCleanProfile(await integration.handleGlobalEvent(makeProfiledEvent()));
-      expect(logSpy.mock.calls?.[1]?.[0]).toBe('[Profiling] Preparing envelope and sending a profiling event');
-    });
+    // eslint-disable-next-line @typescript-eslint/unbound-method
+    expect(transport.send).not.toHaveBeenCalled();
   });
 
-  describe('with SDK hooks', () => {
-    it('does not call transporter if null profile is received', () => {
-      const transport: Transport = {
-        send: jest.fn().mockImplementation(() => Promise.resolve()),
-        flush: jest.fn().mockImplementation(() => Promise.resolve()),
-      };
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-      const emitter = new EventEmitter();
-
-      const getCurrentHub = jest.fn((): Hub => {
+  it('binds to spanStart, spanEnd and beforeEnvelope', () => {
+    const transport: Transport = {
+      send: jest.fn().mockImplementation(() => Promise.resolve()),
+      flush: jest.fn().mockImplementation(() => Promise.resolve()),
+    };
+    const integration = _nodeProfilingIntegration();
+
+    const client = {
+      on: jest.fn(),
+      emit: jest.fn(),
+      getOptions: () => {
         return {
-          getClient: () => {
-            return {
-              on: emitter.on.bind(emitter),
-              emit: emitter.emit.bind(emitter),
-              getOptions: () => {
-                return {
-                  _metadata: {},
-                };
-              },
-              getDsn: () => {
-                return {};
-              },
-              getTransport: () => transport,
-            } as any;
-          },
-        } as Hub;
-      });
-
-      const addGlobalEventProcessor = () => void 0;
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
-
-      // eslint-disable-next-line @typescript-eslint/unbound-method
-      expect(transport.send).not.toHaveBeenCalled();
-    });
-
-    it('binds to startTransaction, finishTransaction and beforeEnvelope', () => {
-      const transport: Transport = {
-        send: jest.fn().mockImplementation(() => Promise.resolve()),
-        flush: jest.fn().mockImplementation(() => Promise.resolve()),
-      };
-      // eslint-disable-next-line deprecation/deprecation
-      const integration = new ProfilingIntegration();
-      const emitter = new EventEmitter();
-
-      const getCurrentHub = jest.fn((): Hub => {
-        return {
-          getClient: () => {
-            return {
-              on: emitter.on.bind(emitter),
-              emit: emitter.emit.bind(emitter),
-              getOptions: () => {
-                return {
-                  _metadata: {},
-                };
-              },
-              getDsn: () => {
-                return {};
-              },
-              getTransport: () => transport,
-            } as any;
-          },
-        } as Hub;
-      });
-
-      const spy = jest.spyOn(emitter, 'on');
+          _metadata: {},
+        };
+      },
+      getDsn: () => {
+        return {};
+      },
+      getTransport: () => transport,
+    } as unknown as NodeClient;
 
-      const addGlobalEventProcessor = jest.fn();
-      integration.setupOnce(addGlobalEventProcessor, getCurrentHub);
+    const spy = jest.spyOn(client, 'on');
 
-      expect(spy).toHaveBeenCalledTimes(3);
-      expect(spy.mock?.calls?.[0]?.[0]).toBe('startTransaction');
-      expect(spy.mock?.calls?.[1]?.[0]).toBe('finishTransaction');
-      expect(spy.mock?.calls?.[2]?.[0]).toBe('beforeEnvelope');
+    integration.setup(client);
 
-      expect(addGlobalEventProcessor).not.toHaveBeenCalled();
-    });
+    expect(spy).toHaveBeenCalledTimes(3);
+    expect(spy).toHaveBeenCalledWith('spanStart', expect.any(Function));
+    expect(spy).toHaveBeenCalledWith('spanEnd', expect.any(Function));
+    expect(spy).toHaveBeenCalledWith('beforeEnvelope', expect.any(Function));
   });
 });
diff --git a/packages/profiling-node/test/hubextensions.hub.test.ts b/packages/profiling-node/test/spanProfileUtils.test.ts
similarity index 50%
rename from packages/profiling-node/test/hubextensions.hub.test.ts
rename to packages/profiling-node/test/spanProfileUtils.test.ts
index 2266e5cec610..cccdbcd17e31 100644
--- a/packages/profiling-node/test/hubextensions.hub.test.ts
+++ b/packages/profiling-node/test/spanProfileUtils.test.ts
@@ -4,46 +4,10 @@ import { getMainCarrier } from '@sentry/core';
 import type { Transport } from '@sentry/types';
 import { GLOBAL_OBJ, createEnvelope, logger } from '@sentry/utils';
 import { CpuProfilerBindings } from '../src/cpu_profiler';
-import { ProfilingIntegration } from '../src/index';
-
-function makeClientWithoutHooks(): [Sentry.NodeClient, Transport] {
-  // eslint-disable-next-line deprecation/deprecation
-  const integration = new ProfilingIntegration();
-  const transport = Sentry.makeNodeTransport({
-    url: 'https://7fa19397baaf433f919fbe02228d5470@o1137848.ingest.sentry.io/6625302',
-    recordDroppedEvent: () => {
-      return undefined;
-    },
-  });
-  const client = new Sentry.NodeClient({
-    stackParser: Sentry.defaultStackParser,
-    tracesSampleRate: 1,
-    profilesSampleRate: 1,
-    debug: true,
-    environment: 'test-environment',
-    dsn: 'https://7fa19397baaf433f919fbe02228d5470@o1137848.ingest.sentry.io/6625302',
-    integrations: [integration],
-    transport: _opts => transport,
-  });
-  // eslint-disable-next-line deprecation/deprecation
-  client.setupIntegrations = () => {
-    integration.setupOnce(
-      cb => {
-        // @ts-expect-error __SENTRY__ is a private property
-        getMainCarrier().__SENTRY__.globalEventProcessors = [cb];
-      },
-      // eslint-disable-next-line deprecation/deprecation
-      () => Sentry.getCurrentHub(),
-    );
-  };
-  // @ts-expect-error override private
-  client.on = undefined;
-  return [client, transport];
-}
+import { _nodeProfilingIntegration } from '../src/integration';
 
 function makeClientWithHooks(): [Sentry.NodeClient, Transport] {
-  // eslint-disable-next-line deprecation/deprecation
-  const integration = new ProfilingIntegration();
+  const integration = _nodeProfilingIntegration();
   const client = new Sentry.NodeClient({
     stackParser: Sentry.defaultStackParser,
     tracesSampleRate: 1,
@@ -61,24 +25,12 @@ function makeClientWithHooks(): [Sentry.NodeClient, Transport] {
       }),
   });
 
-  // eslint-disable-next-line deprecation/deprecation
-  client.setupIntegrations = () => {
-    integration.setupOnce(
-      cb => {
-        // @ts-expect-error __SENTRY__ is a private property
-        getMainCarrier().__SENTRY__.globalEventProcessors = [cb];
-      },
-      // eslint-disable-next-line deprecation/deprecation
-      () => Sentry.getCurrentHub(),
-    );
-  };
-
   return [client, client.getTransport() as Transport];
 }
 
 const wait = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
-describe('hubextensions', () => {
+describe('spanProfileUtils', () => {
   beforeEach(() => {
     jest.useRealTimers();
     // We will mock the carrier as if it has been initialized by the SDK, else everything is short circuited
@@ -92,16 +44,13 @@ describe('hubextensions', () => {
   });
 
   it('pulls environment from sdk init', async () => {
-    const [client, transport] = makeClientWithoutHooks();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = Sentry.getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    hub.bindClient(client);
+    const [client, transport] = makeClientWithHooks();
+    Sentry.setCurrentClient(client);
+    client.init();
 
     const transportSpy = jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = Sentry.getCurrentHub().startTransaction({ name: 'profile_hub' });
+    const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
     await wait(500);
     transaction.end();
 
@@ -112,11 +61,9 @@ describe('hubextensions', () => {
   it('logger warns user if there are insufficient samples and discards the profile', async () => {
     const logSpy = jest.spyOn(logger, 'log');
 
-    const [client, transport] = makeClientWithoutHooks();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = Sentry.getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    hub.bindClient(client);
+    const [client, transport] = makeClientWithHooks();
+    Sentry.setCurrentClient(client);
+    client.init();
 
     jest.spyOn(CpuProfilerBindings, 'stopProfiling').mockImplementation(() => {
       return {
@@ -137,15 +84,12 @@ describe('hubextensions', () => {
 
     jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = Sentry.getCurrentHub().startTransaction({ name: 'profile_hub' });
+    const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
     transaction.end();
 
     await Sentry.flush(1000);
 
-    expect(logSpy.mock?.calls[logSpy.mock.calls.length - 1]?.[0]).toBe(
-      '[Profiling] Discarding profile because it contains less than 2 samples',
-    );
+    expect(logSpy).toHaveBeenCalledWith('[Profiling] Discarding profile because it contains less than 2 samples');
 
     expect((transport.send as any).mock.calls[0][0][1][0][0].type).toBe('transaction');
     // eslint-disable-next-line @typescript-eslint/unbound-method
@@ -155,11 +99,9 @@ describe('hubextensions', () => {
   it('logger warns user if traceId is invalid', async () => {
     const logSpy = jest.spyOn(logger, 'log');
 
-    const [client, transport] = makeClientWithoutHooks();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = Sentry.getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    hub.bindClient(client);
+    const [client, transport] = makeClientWithHooks();
+    Sentry.setCurrentClient(client);
+    client.init();
 
     jest.spyOn(CpuProfilerBindings, 'stopProfiling').mockImplementation(() => {
       return {
@@ -185,30 +127,31 @@ describe('hubextensions', () => {
 
     jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = Sentry.getCurrentHub().startTransaction({ name: 'profile_hub', traceId: 'boop' });
+    Sentry.getCurrentScope().getPropagationContext().traceId = 'boop';
+    const transaction = Sentry.startInactiveSpan({
+      forceTransaction: true,
+      name: 'profile_hub',
+    });
     await wait(500);
     transaction.end();
 
     await Sentry.flush(1000);
-    expect(logSpy.mock?.calls?.[6]?.[0]).toBe('[Profiling] Invalid traceId: ' + 'boop' + ' on profiled event');
+
+    expect(logSpy).toHaveBeenCalledWith('[Profiling] Invalid traceId: ' + 'boop' + ' on profiled event');
   });
 
   describe('with hooks', () => {
     it('calls profiler when transaction is started/stopped', async () => {
       const [client, transport] = makeClientWithHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
+      Sentry.setCurrentClient(client);
+      client.init();
 
       const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
       const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
 
       jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
+      const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
       await wait(500);
       transaction.end();
 
@@ -220,15 +163,12 @@ describe('hubextensions', () => {
 
     it('sends profile in the same envelope as transaction', async () => {
       const [client, transport] = makeClientWithHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
+      Sentry.setCurrentClient(client);
+      client.init();
 
       const transportSpy = jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
+      const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
       await wait(500);
       transaction.end();
 
@@ -241,10 +181,8 @@ describe('hubextensions', () => {
 
     it('does not crash if transaction has no profile context or it is invalid', async () => {
       const [client] = makeClientWithHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
+      Sentry.setCurrentClient(client);
+      client.init();
 
       // @ts-expect-error transaction is partial
       client.emit('beforeEnvelope', createEnvelope({ type: 'transaction' }, { type: 'transaction' }));
@@ -267,10 +205,8 @@ describe('hubextensions', () => {
 
     it('if transaction was profiled, but profiler returned null', async () => {
       const [client, transport] = makeClientWithHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
+      Sentry.setCurrentClient(client);
+      client.init();
 
       jest.spyOn(CpuProfilerBindings, 'stopProfiling').mockReturnValue(null);
       // Emit is sync, so we can just assert that we got here
@@ -279,8 +215,7 @@ describe('hubextensions', () => {
         return Promise.resolve({});
       });
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
+      const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
       await wait(500);
       transaction.end();
 
@@ -293,16 +228,14 @@ describe('hubextensions', () => {
 
     it('emits preprocessEvent for profile', async () => {
       const [client] = makeClientWithHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
+      Sentry.setCurrentClient(client);
+      client.init();
+
       const onPreprocessEvent = jest.fn();
 
       client.on('preprocessEvent', onPreprocessEvent);
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
+      const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
       await wait(500);
       transaction.end();
 
@@ -317,90 +250,14 @@ describe('hubextensions', () => {
     });
   });
 
-  describe('without hooks', () => {
-    it('calls profiler when transaction is started/stopped', async () => {
-      const [client] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-      const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
-
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
-      await wait(500);
-      transaction.end();
-
-      await Sentry.flush(1000);
-
-      expect(startProfilingSpy).toHaveBeenCalledTimes(1);
-      expect((stopProfilingSpy.mock.calls[startProfilingSpy.mock.calls.length - 1]?.[0] as string).length).toBe(32);
-    });
-
-    it('sends profile in separate envelope', async () => {
-      const [client, transport] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      const transportSpy = jest.spyOn(transport, 'send').mockImplementation(() => {
-        // Do nothing so we don't send events to Sentry
-        return Promise.resolve({});
-      });
-
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = hub.startTransaction({ name: 'profile_hub' });
-      await wait(500);
-      transaction.end();
-
-      await Sentry.flush(1000);
-
-      // One for profile, the other for transaction
-      expect(transportSpy).toHaveBeenCalledTimes(2);
-      expect(transportSpy.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]).toMatchObject({ type: 'profile' });
-    });
-
-    it('respect max profile duration timeout', async () => {
-      // it seems that in node 19 globals (or least part of them) are a readonly object
-      // so when useFakeTimers is called it throws an error because it cannot override
-      // a readonly property of performance on global object. Use legacyFakeTimers for now
-      jest.useFakeTimers('legacy');
-      const startProfilingSpy = jest.spyOn(CpuProfilerBindings, 'startProfiling');
-      const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
-
-      const [client] = makeClientWithoutHooks();
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = Sentry.getCurrentHub();
-      // eslint-disable-next-line deprecation/deprecation
-      hub.bindClient(client);
-
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = Sentry.getCurrentHub().startTransaction({ name: 'timeout_transaction' });
-      expect(startProfilingSpy).toHaveBeenCalledTimes(1);
-      jest.advanceTimersByTime(30001);
-
-      expect(stopProfilingSpy).toHaveBeenCalledTimes(1);
-      expect((stopProfilingSpy.mock.calls[startProfilingSpy.mock.calls.length - 1]?.[0] as string).length).toBe(32);
-
-      transaction.end();
-      expect(stopProfilingSpy).toHaveBeenCalledTimes(1);
-    });
-  });
-
   it('does not crash if stop is called multiple times', async () => {
     const stopProfilingSpy = jest.spyOn(CpuProfilerBindings, 'stopProfiling');
 
-    const [client] = makeClientWithoutHooks();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = Sentry.getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    hub.bindClient(client);
+    const [client] = makeClientWithHooks();
+    Sentry.setCurrentClient(client);
+    client.init();
 
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = Sentry.getCurrentHub().startTransaction({ name: 'txn' });
+    const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'txn' });
     transaction.end();
     transaction.end();
     expect(stopProfilingSpy).toHaveBeenCalledTimes(1);
@@ -436,15 +293,12 @@ describe('hubextensions', () => {
     });
 
     const [client, transport] = makeClientWithHooks();
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = Sentry.getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    hub.bindClient(client);
+    Sentry.setCurrentClient(client);
+    client.init();
 
     const transportSpy = jest.spyOn(transport, 'send').mockReturnValue(Promise.resolve({}));
 
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = hub.startTransaction({ name: 'profile_hub' });
+    const transaction = Sentry.startInactiveSpan({ forceTransaction: true, name: 'profile_hub' });
     await wait(500);
     transaction.end();
 
diff --git a/packages/profiling-node/test/utils.test.ts b/packages/profiling-node/test/utils.test.ts
index 640d0eace7f2..fe661e41f07f 100644
--- a/packages/profiling-node/test/utils.test.ts
+++ b/packages/profiling-node/test/utils.test.ts
@@ -1,4 +1,4 @@
-import type { DsnComponents, Event, SdkMetadata } from '@sentry/types';
+import type { Event } from '@sentry/types';
 import { addItemToEnvelope, createEnvelope, uuid4 } from '@sentry/utils';
 
 import {
@@ -8,36 +8,7 @@ import {
   isValidSampleRate,
 } from '../src/utils';
 
-import type { Profile, ProfiledEvent } from '../src/types';
-import {
-  createProfilingEventEnvelope,
-  isProfiledTransactionEvent,
-  maybeRemoveProfileFromSdkMetadata,
-} from '../src/utils';
-
-function makeSdkMetadata(props: Partial<SdkMetadata['sdk']>): SdkMetadata {
-  return {
-    sdk: {
-      ...props,
-    },
-  };
-}
-
-function makeDsn(props: Partial<DsnComponents>): DsnComponents {
-  return {
-    protocol: 'http',
-    projectId: '1',
-    host: 'localhost',
-    ...props,
-  };
-}
-
-function makeEvent(
-  props: Partial<ProfiledEvent>,
-  profile: NonNullable<ProfiledEvent['sdkProcessingMetadata']['profile']>,
-): ProfiledEvent {
-  return { ...props, sdkProcessingMetadata: { profile: profile } };
-}
+import type { ProfiledEvent } from '../src/types';
 
 function makeProfile(
   props: Partial<ProfiledEvent['sdkProcessingMetadata']['profile']>,
@@ -57,213 +28,6 @@ function makeProfile(
   };
 }
 
-describe('isProfiledTransactionEvent', () => {
-  it('profiled event', () => {
-    expect(isProfiledTransactionEvent({ sdkProcessingMetadata: { profile: {} } })).toBe(true);
-  });
-  it('not profiled event', () => {
-    expect(isProfiledTransactionEvent({ sdkProcessingMetadata: { something: {} } })).toBe(false);
-  });
-});
-
-describe('maybeRemoveProfileFromSdkMetadata', () => {
-  it('removes profile', () => {
-    expect(maybeRemoveProfileFromSdkMetadata({ sdkProcessingMetadata: { profile: {} } })).toEqual({
-      sdkProcessingMetadata: {},
-    });
-  });
-
-  it('does nothing', () => {
-    expect(maybeRemoveProfileFromSdkMetadata({ sdkProcessingMetadata: { something: {} } })).toEqual({
-      sdkProcessingMetadata: { something: {} },
-    });
-  });
-});
-
-describe('createProfilingEventEnvelope', () => {
-  it('throws if profile_id is not set', () => {
-    const profile = makeProfile({});
-    delete profile.profile_id;
-
-    expect(() =>
-      createProfilingEventEnvelope(makeEvent({ type: 'transaction' }, profile), makeDsn({}), makeSdkMetadata({})),
-    ).toThrow('Cannot construct profiling event envelope without a valid profile id. Got undefined instead.');
-  });
-  it('throws if profile is undefined', () => {
-    expect(() =>
-      // @ts-expect-error mock profile as undefined
-      createProfilingEventEnvelope(makeEvent({ type: 'transaction' }, undefined), makeDsn({}), makeSdkMetadata({})),
-    ).toThrow('Cannot construct profiling event envelope without a valid profile. Got undefined instead.');
-    expect(() =>
-      // @ts-expect-error mock profile as null
-      createProfilingEventEnvelope(makeEvent({ type: 'transaction' }, null), makeDsn({}), makeSdkMetadata({})),
-    ).toThrow('Cannot construct profiling event envelope without a valid profile. Got null instead.');
-  });
-
-  it('envelope header is of type: profile', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent(
-        { type: 'transaction' },
-        makeProfile({
-          samples: [
-            { elapsed_since_start_ns: '0', thread_id: '0', stack_id: 0 },
-            { elapsed_since_start_ns: '0', thread_id: '0', stack_id: 0 },
-          ],
-        }),
-      ),
-      makeDsn({}),
-      makeSdkMetadata({
-        name: 'sentry.javascript.node',
-        version: '1.2.3',
-        integrations: ['integration1', 'integration2'],
-        packages: [
-          { name: 'package1', version: '1.2.3' },
-          { name: 'package2', version: '4.5.6' },
-        ],
-      }),
-    );
-    expect(envelope?.[1][0]?.[0].type).toBe('profile');
-  });
-
-  it('returns if samples.length <= 1', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent(
-        { type: 'transaction' },
-        makeProfile({
-          samples: [{ elapsed_since_start_ns: '0', thread_id: '0', stack_id: 0 }],
-        }),
-      ),
-      makeDsn({}),
-      makeSdkMetadata({
-        name: 'sentry.javascript.node',
-        version: '1.2.3',
-        integrations: ['integration1', 'integration2'],
-        packages: [
-          { name: 'package1', version: '1.2.3' },
-          { name: 'package2', version: '4.5.6' },
-        ],
-      }),
-    );
-    expect(envelope).toBe(null);
-  });
-
-  it('enriches envelope with sdk metadata', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent({ type: 'transaction' }, makeProfile({})),
-      makeDsn({}),
-      makeSdkMetadata({
-        name: 'sentry.javascript.node',
-        version: '1.2.3',
-      }),
-    );
-
-    expect(envelope && envelope[0]?.sdk?.name).toBe('sentry.javascript.node');
-    expect(envelope && envelope[0]?.sdk?.version).toBe('1.2.3');
-  });
-
-  it('handles undefined sdk metadata', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent({ type: 'transaction' }, makeProfile({})),
-      makeDsn({}),
-      undefined,
-    );
-
-    expect(envelope?.[0].sdk).toBe(undefined);
-  });
-
-  it('enriches envelope with dsn metadata', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent({ type: 'transaction' }, makeProfile({})),
-      makeDsn({
-        host: 'sentry.io',
-        projectId: '123',
-        protocol: 'https',
-        path: 'path',
-        port: '9000',
-        publicKey: 'publicKey',
-      }),
-      makeSdkMetadata({}),
-      'tunnel',
-    );
-
-    expect(envelope?.[0].dsn).toBe('https://publicKey@sentry.io:9000/path/123');
-  });
-
-  it('enriches profile with device info', () => {
-    const envelope = createProfilingEventEnvelope(
-      makeEvent({ type: 'transaction' }, makeProfile({})),
-      makeDsn({}),
-      makeSdkMetadata({}),
-    );
-    const profile = envelope?.[1][0]?.[1] as unknown as Profile;
-
-    expect(typeof profile.device.manufacturer).toBe('string');
-    expect(typeof profile.device.model).toBe('string');
-    expect(typeof profile.os.name).toBe('string');
-    expect(typeof profile.os.version).toBe('string');
-
-    expect(profile.device.manufacturer.length).toBeGreaterThan(0);
-    expect(profile.device.model.length).toBeGreaterThan(0);
-    expect(profile.os.name.length).toBeGreaterThan(0);
-    expect(profile.os.version.length).toBeGreaterThan(0);
-  });
-
-  it('throws if event.type is not a transaction', () => {
-    expect(() =>
-      createProfilingEventEnvelope(
-        makeEvent(
-          // @ts-expect-error force invalid value
-          { type: 'error' },
-          // @ts-expect-error mock tid as undefined
-          makeProfile({ samples: [{ stack_id: 0, thread_id: undefined, elapsed_since_start_ns: '0' }] }),
-        ),
-        makeDsn({}),
-        makeSdkMetadata({}),
-      ),
-    ).toThrow('Profiling events may only be attached to transactions, this should never occur.');
-  });
-
-  it('inherits transaction properties', () => {
-    const start = new Date(2022, 8, 1, 12, 0, 0);
-    const end = new Date(2022, 8, 1, 12, 0, 10);
-
-    const envelope = createProfilingEventEnvelope(
-      makeEvent(
-        {
-          event_id: uuid4(),
-          type: 'transaction',
-          transaction: 'transaction-name',
-          start_timestamp: start.getTime() / 1000,
-          timestamp: end.getTime() / 1000,
-          contexts: {
-            trace: {
-              span_id: 'span_id',
-              trace_id: 'trace_id',
-            },
-          },
-        },
-        makeProfile({
-          samples: [
-            // @ts-expect-error mock tid as undefined
-            { stack_id: 0, thread_id: undefined, elapsed_since_start_ns: '0' },
-            // @ts-expect-error mock tid as undefined
-            { stack_id: 0, thread_id: undefined, elapsed_since_start_ns: '0' },
-          ],
-        }),
-      ),
-      makeDsn({}),
-      makeSdkMetadata({}),
-    );
-
-    const profile = envelope?.[1][0]?.[1] as unknown as Profile;
-
-    expect(profile.transaction.name).toBe('transaction-name');
-    expect(typeof profile.transaction.id).toBe('string');
-    expect(profile.transaction.id?.length).toBe(32);
-    expect(profile.transaction.trace_id).toBe('trace_id');
-  });
-});
-
 describe('isValidSampleRate', () => {
   it.each([
     [0, true],
diff --git a/packages/profiling-node/tsconfig.json b/packages/profiling-node/tsconfig.json
index 0c4404d8d70c..03da9a484924 100644
--- a/packages/profiling-node/tsconfig.json
+++ b/packages/profiling-node/tsconfig.json
@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "module": "esnext",
-    "lib": ["es6"],
+    "lib": ["es2017"],
     "outDir": "lib",
     "types": ["node"]
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 5d62912e20d5..752fe8cf7c19 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/react/src/errorboundary.tsx b/packages/react/src/errorboundary.tsx
index 2a599d24e7aa..109e53116f25 100644
--- a/packages/react/src/errorboundary.tsx
+++ b/packages/react/src/errorboundary.tsx
@@ -146,7 +146,9 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
         captureContext: {
           contexts: { react: { componentStack } },
         },
-        mechanism: { handled: false },
+        // If users provide a fallback component we can assume they are handling the error.
+        // Therefore, we set the mechanism depending on the presence of the fallback prop.
+        mechanism: { handled: !!this.props.fallback },
       });
 
       if (onError) {
@@ -196,7 +198,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
     if (state.error) {
       let element: React.ReactElement | undefined = undefined;
       if (typeof fallback === 'function') {
-        element = fallback({
+        element = React.createElement(fallback, {
           error: state.error,
           componentStack: state.componentStack,
           resetError: this.resetErrorBoundary,
diff --git a/packages/react/src/reactrouter.tsx b/packages/react/src/reactrouter.tsx
index fba359e75e79..3fe40df8ece8 100644
--- a/packages/react/src/reactrouter.tsx
+++ b/packages/react/src/reactrouter.tsx
@@ -9,14 +9,15 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getActiveSpan,
+  getCurrentScope,
   getRootSpan,
   spanToJSON,
 } from '@sentry/core';
-import type { Integration, Span, StartSpanOptions, Transaction, TransactionSource } from '@sentry/types';
+import type { Client, Integration, Span, TransactionSource } from '@sentry/types';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
 
-import type { Action, Location, ReactRouterInstrumentation } from './types';
+import type { Action, Location } from './types';
 
 // We need to disable eslint no-explict-any because any is required for the
 // react-router typings.
@@ -43,8 +44,6 @@ interface ReactRouterOptions {
   matchPath?: MatchPath;
 }
 
-let activeTransaction: Transaction | undefined;
-
 /**
  * A browser tracing integration that uses React Router v4 to instrument navigations.
  * Expects `history` (and optionally `routes` and `matchPath`) to be passed as options.
@@ -65,21 +64,15 @@ export function reactRouterV4BrowserTracingIntegration(
     afterAllSetup(client) {
       integration.afterAllSetup(client);
 
-      const startPageloadCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingPageLoadSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const startNavigationCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingNavigationSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const instrumentation = createReactRouterInstrumentation(history, 'reactrouter_v4', routes, matchPath);
-
-      // Now instrument page load & navigation with correct settings
-      instrumentation(startPageloadCallback, instrumentPageLoad, false);
-      instrumentation(startNavigationCallback, false, instrumentNavigation);
+      instrumentReactRouter(
+        client,
+        instrumentPageLoad,
+        instrumentNavigation,
+        history,
+        'reactrouter_v4',
+        routes,
+        matchPath,
+      );
     },
   };
 }
@@ -97,38 +90,35 @@ export function reactRouterV5BrowserTracingIntegration(
     instrumentNavigation: false,
   });
 
-  const { history, routes, matchPath } = options;
+  const { history, routes, matchPath, instrumentPageLoad = true, instrumentNavigation = true } = options;
 
   return {
     ...integration,
     afterAllSetup(client) {
       integration.afterAllSetup(client);
 
-      const startPageloadCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingPageLoadSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const startNavigationCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingNavigationSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const instrumentation = createReactRouterInstrumentation(history, 'reactrouter_v5', routes, matchPath);
-
-      // Now instrument page load & navigation with correct settings
-      instrumentation(startPageloadCallback, options.instrumentPageLoad, false);
-      instrumentation(startNavigationCallback, false, options.instrumentNavigation);
+      instrumentReactRouter(
+        client,
+        instrumentPageLoad,
+        instrumentNavigation,
+        history,
+        'reactrouter_v5',
+        routes,
+        matchPath,
+      );
     },
   };
 }
 
-function createReactRouterInstrumentation(
+function instrumentReactRouter(
+  client: Client,
+  instrumentPageLoad: boolean,
+  instrumentNavigation: boolean,
   history: RouterHistory,
   instrumentationName: string,
   allRoutes: RouteConfig[] = [],
   matchPath?: MatchPath,
-): ReactRouterInstrumentation {
+): void {
   function getInitPathName(): string | undefined {
     if (history && history.location) {
       return history.location.pathname;
@@ -163,12 +153,11 @@ function createReactRouterInstrumentation(
     return [pathname, 'url'];
   }
 
-  return (customStartTransaction, startTransactionOnPageLoad = true, startTransactionOnLocationChange = true): void => {
+  if (instrumentPageLoad) {
     const initPathName = getInitPathName();
-
-    if (startTransactionOnPageLoad && initPathName) {
+    if (initPathName) {
       const [name, source] = normalizeTransactionName(initPathName);
-      activeTransaction = customStartTransaction({
+      startBrowserTracingPageLoadSpan(client, {
         name,
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
@@ -177,27 +166,23 @@ function createReactRouterInstrumentation(
         },
       });
     }
+  }
 
-    if (startTransactionOnLocationChange && history.listen) {
-      history.listen((location, action) => {
-        if (action && (action === 'PUSH' || action === 'POP')) {
-          if (activeTransaction) {
-            activeTransaction.end();
-          }
-
-          const [name, source] = normalizeTransactionName(location.pathname);
-          activeTransaction = customStartTransaction({
-            name,
-            attributes: {
-              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.${instrumentationName}`,
-              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-            },
-          });
-        }
-      });
-    }
-  };
+  if (instrumentNavigation && history.listen) {
+    history.listen((location, action) => {
+      if (action && (action === 'PUSH' || action === 'POP')) {
+        const [name, source] = normalizeTransactionName(location.pathname);
+        startBrowserTracingNavigationSpan(client, {
+          name,
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.${instrumentationName}`,
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+          },
+        });
+      }
+    });
+  }
 }
 
 /**
@@ -242,9 +227,13 @@ export function withSentryRouting<P extends Record<string, any>, R extends React
   const activeRootSpan = getActiveRootSpan();
 
   const WrappedRoute: React.FC<P> = (props: P) => {
-    if (activeRootSpan && props && props.computedMatch && props.computedMatch.isExact) {
-      activeRootSpan.updateName(props.computedMatch.path);
-      activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+    if (props && props.computedMatch && props.computedMatch.isExact) {
+      getCurrentScope().setTransactionName(props.computedMatch.path);
+
+      if (activeRootSpan) {
+        activeRootSpan.updateName(props.computedMatch.path);
+        activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+      }
     }
 
     // @ts-expect-error Setting more specific React Component typing for `R` generic above
@@ -263,13 +252,8 @@ export function withSentryRouting<P extends Record<string, any>, R extends React
 /* eslint-enable @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access */
 
 function getActiveRootSpan(): Span | undefined {
-  // Legacy behavior for "old" react router instrumentation
-  if (activeTransaction) {
-    return activeTransaction;
-  }
-
   const span = getActiveSpan();
-  const rootSpan = span ? getRootSpan(span) : undefined;
+  const rootSpan = span && getRootSpan(span);
 
   if (!rootSpan) {
     return undefined;
diff --git a/packages/react/src/reactrouterv3.ts b/packages/react/src/reactrouterv3.ts
index 459589d91b93..4c5c084db791 100644
--- a/packages/react/src/reactrouterv3.ts
+++ b/packages/react/src/reactrouterv3.ts
@@ -9,16 +9,9 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
 } from '@sentry/core';
-import type {
-  Integration,
-  SpanAttributes,
-  StartSpanOptions,
-  Transaction,
-  TransactionContext,
-  TransactionSource,
-} from '@sentry/types';
+import type { Integration, TransactionSource } from '@sentry/types';
 
-import type { Location, ReactRouterInstrumentation } from './types';
+import type { Location } from './types';
 
 // Many of the types below had to be mocked out to prevent typescript issues
 // these types are required for correct functionality.
@@ -64,85 +57,46 @@ export function reactRouterV3BrowserTracingIntegration(
     afterAllSetup(client) {
       integration.afterAllSetup(client);
 
-      const startPageloadCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingPageLoadSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const startNavigationCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingNavigationSpan(client, startSpanOptions);
-        return undefined;
-      };
-
-      const instrumentation = reactRouterV3Instrumentation(history, routes, match);
-
-      // Now instrument page load & navigation with correct settings
-      instrumentation(startPageloadCallback, instrumentPageLoad, false);
-      instrumentation(startNavigationCallback, false, instrumentNavigation);
-    },
-  };
-}
-
-/**
- * Creates routing instrumentation for React Router v3
- * Works for React Router >= 3.2.0 and < 4.0.0
- *
- * @param history object from the `history` library
- * @param routes a list of all routes, should be
- * @param match `Router.match` utility
- */
-function reactRouterV3Instrumentation(history: HistoryV3, routes: Route[], match: Match): ReactRouterInstrumentation {
-  return (
-    startTransaction: (context: TransactionContext) => Transaction | undefined,
-    startTransactionOnPageLoad: boolean = true,
-    startTransactionOnLocationChange: boolean = true,
-  ) => {
-    let activeTransaction: Transaction | undefined;
-    let prevName: string | undefined;
-
-    // Have to use window.location because history.location might not be defined.
-    if (startTransactionOnPageLoad && WINDOW && WINDOW.location) {
-      normalizeTransactionName(
-        routes,
-        WINDOW.location as unknown as Location,
-        match,
-        (localName: string, source: ReactRouterV3TransactionSource = 'url') => {
-          prevName = localName;
-          activeTransaction = startTransaction({
-            name: prevName,
-            attributes: {
-              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
-              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react.reactrouter_v3',
-              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-            },
-          });
-        },
-      );
-    }
+      if (instrumentPageLoad && WINDOW && WINDOW.location) {
+        normalizeTransactionName(
+          routes,
+          WINDOW.location as unknown as Location,
+          match,
+          (localName: string, source: ReactRouterV3TransactionSource = 'url') => {
+            startBrowserTracingPageLoadSpan(client, {
+              name: localName,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react.reactrouter_v3',
+                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+              },
+            });
+          },
+        );
+      }
 
-    if (startTransactionOnLocationChange && history.listen) {
-      history.listen(location => {
-        if (location.action === 'PUSH' || location.action === 'POP') {
-          if (activeTransaction) {
-            activeTransaction.end();
+      if (instrumentNavigation && history.listen) {
+        history.listen(location => {
+          if (location.action === 'PUSH' || location.action === 'POP') {
+            normalizeTransactionName(
+              routes,
+              location,
+              match,
+              (localName: string, source: TransactionSource = 'url') => {
+                startBrowserTracingNavigationSpan(client, {
+                  name: localName,
+                  attributes: {
+                    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+                    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v3',
+                    [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+                  },
+                });
+              },
+            );
           }
-          normalizeTransactionName(routes, location, match, (localName: string, source: TransactionSource = 'url') => {
-            prevName = localName;
-
-            const attributes: SpanAttributes = {
-              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v3',
-              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-            };
-
-            activeTransaction = startTransaction({
-              name: prevName,
-              attributes,
-            });
-          });
-        }
-      });
-    }
+        });
+      }
+    },
   };
 }
 
diff --git a/packages/react/src/reactrouterv6.tsx b/packages/react/src/reactrouterv6.tsx
index 73196bcfcc2a..ab67ba44bb5a 100644
--- a/packages/react/src/reactrouterv6.tsx
+++ b/packages/react/src/reactrouterv6.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 // Inspired from Donnie McNeal's solution:
 // https://gist.github.com/wontondon/e8c4bdf2888875e4c755712e99279536
 
@@ -13,17 +12,12 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   getActiveSpan,
+  getClient,
+  getCurrentScope,
   getRootSpan,
   spanToJSON,
 } from '@sentry/core';
-import type {
-  Integration,
-  Span,
-  StartSpanOptions,
-  Transaction,
-  TransactionContext,
-  TransactionSource,
-} from '@sentry/types';
+import type { Client, Integration, Span, TransactionSource } from '@sentry/types';
 import { getNumberOfUrlSegments, logger } from '@sentry/utils';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import * as React from 'react';
@@ -46,17 +40,15 @@ import type {
   UseRoutes,
 } from './types';
 
-let activeTransaction: Transaction | undefined;
-
 let _useEffect: UseEffect;
 let _useLocation: UseLocation;
 let _useNavigationType: UseNavigationType;
 let _createRoutesFromChildren: CreateRoutesFromChildren;
 let _matchRoutes: MatchRoutes;
-let _customStartTransaction: (context: TransactionContext) => Transaction | undefined;
-let _startTransactionOnLocationChange: boolean;
 let _stripBasename: boolean = false;
 
+const CLIENTS_WITH_INSTRUMENT_NAVIGATION: Client[] = [];
+
 interface ReactRouterOptions {
   useEffect: UseEffect;
   useLocation: UseLocation;
@@ -95,11 +87,6 @@ export function reactRouterV6BrowserTracingIntegration(
     afterAllSetup(client) {
       integration.afterAllSetup(client);
 
-      const startNavigationCallback = (startSpanOptions: StartSpanOptions): undefined => {
-        startBrowserTracingNavigationSpan(client, startSpanOptions);
-        return undefined;
-      };
-
       const initPathName = WINDOW && WINDOW.location && WINDOW.location.pathname;
       if (instrumentPageLoad && initPathName) {
         startBrowserTracingPageLoadSpan(client, {
@@ -119,52 +106,13 @@ export function reactRouterV6BrowserTracingIntegration(
       _createRoutesFromChildren = createRoutesFromChildren;
       _stripBasename = stripBasename || false;
 
-      _customStartTransaction = startNavigationCallback;
-      _startTransactionOnLocationChange = instrumentNavigation;
+      if (instrumentNavigation) {
+        CLIENTS_WITH_INSTRUMENT_NAVIGATION.push(client);
+      }
     },
   };
 }
 
-/**
- * @deprecated Use `reactRouterV6BrowserTracingIntegration()` instead.
- */
-export function reactRouterV6Instrumentation(
-  useEffect: UseEffect,
-  useLocation: UseLocation,
-  useNavigationType: UseNavigationType,
-  createRoutesFromChildren: CreateRoutesFromChildren,
-  matchRoutes: MatchRoutes,
-  stripBasename?: boolean,
-) {
-  return (
-    customStartTransaction: (context: TransactionContext) => Transaction | undefined,
-    startTransactionOnPageLoad = true,
-    startTransactionOnLocationChange = true,
-  ): void => {
-    const initPathName = WINDOW && WINDOW.location && WINDOW.location.pathname;
-    if (startTransactionOnPageLoad && initPathName) {
-      activeTransaction = customStartTransaction({
-        name: initPathName,
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'pageload',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react.reactrouter_v6',
-        },
-      });
-    }
-
-    _useEffect = useEffect;
-    _useLocation = useLocation;
-    _useNavigationType = useNavigationType;
-    _matchRoutes = matchRoutes;
-    _createRoutesFromChildren = createRoutesFromChildren;
-    _stripBasename = stripBasename || false;
-
-    _customStartTransaction = customStartTransaction;
-    _startTransactionOnLocationChange = startTransactionOnLocationChange;
-  };
-}
-
 /**
  * Strip the basename from a pathname if exists.
  *
@@ -251,10 +199,15 @@ function updatePageloadTransaction(
     ? matches
     : (_matchRoutes(routes, location, basename) as unknown as RouteMatch[]);
 
-  if (activeRootSpan && branches) {
+  if (branches) {
     const [name, source] = getNormalizedName(routes, location, branches, basename);
-    activeRootSpan.updateName(name);
-    activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
+
+    getCurrentScope().setTransactionName(name);
+
+    if (activeRootSpan) {
+      activeRootSpan.updateName(name);
+      activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
+    }
   }
 }
 
@@ -267,13 +220,15 @@ function handleNavigation(
 ): void {
   const branches = Array.isArray(matches) ? matches : _matchRoutes(routes, location, basename);
 
-  if (_startTransactionOnLocationChange && (navigationType === 'PUSH' || navigationType === 'POP') && branches) {
-    if (activeTransaction) {
-      activeTransaction.end();
-    }
+  const client = getClient();
+  if (!client || !CLIENTS_WITH_INSTRUMENT_NAVIGATION.includes(client)) {
+    return;
+  }
 
+  if ((navigationType === 'PUSH' || navigationType === 'POP') && branches) {
     const [name, source] = getNormalizedName(routes, location, branches, basename);
-    activeTransaction = _customStartTransaction({
+
+    startBrowserTracingNavigationSpan(client, {
       name,
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
@@ -286,18 +241,11 @@ function handleNavigation(
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function withSentryReactRouterV6Routing<P extends Record<string, any>, R extends React.FC<P>>(Routes: R): R {
-  if (
-    !_useEffect ||
-    !_useLocation ||
-    !_useNavigationType ||
-    !_createRoutesFromChildren ||
-    !_matchRoutes ||
-    !_customStartTransaction
-  ) {
+  if (!_useEffect || !_useLocation || !_useNavigationType || !_createRoutesFromChildren || !_matchRoutes) {
     DEBUG_BUILD &&
       logger.warn(`reactRouterV6Instrumentation was unable to wrap Routes because of one or more missing parameters.
       useEffect: ${_useEffect}. useLocation: ${_useLocation}. useNavigationType: ${_useNavigationType}.
-      createRoutesFromChildren: ${_createRoutesFromChildren}. matchRoutes: ${_matchRoutes}. customStartTransaction: ${_customStartTransaction}.`);
+      createRoutesFromChildren: ${_createRoutesFromChildren}. matchRoutes: ${_matchRoutes}.`);
 
     return Routes;
   }
@@ -337,7 +285,7 @@ export function withSentryReactRouterV6Routing<P extends Record<string, any>, R
 }
 
 export function wrapUseRoutes(origUseRoutes: UseRoutes): UseRoutes {
-  if (!_useEffect || !_useLocation || !_useNavigationType || !_matchRoutes || !_customStartTransaction) {
+  if (!_useEffect || !_useLocation || !_useNavigationType || !_matchRoutes) {
     DEBUG_BUILD &&
       logger.warn(
         'reactRouterV6Instrumentation was unable to wrap `useRoutes` because of one or more missing parameters.',
@@ -409,7 +357,7 @@ export function wrapCreateBrowserRouter<
 
     router.subscribe((state: RouterState) => {
       const location = state.location;
-      if (_startTransactionOnLocationChange && (state.historyAction === 'PUSH' || state.historyAction === 'POP')) {
+      if (state.historyAction === 'PUSH' || state.historyAction === 'POP') {
         handleNavigation(location, routes, state.historyAction, undefined, basename);
       }
     });
@@ -419,11 +367,6 @@ export function wrapCreateBrowserRouter<
 }
 
 function getActiveRootSpan(): Span | undefined {
-  // Legacy behavior for "old" react router instrumentation
-  if (activeTransaction) {
-    return activeTransaction;
-  }
-
   const span = getActiveSpan();
   const rootSpan = span ? getRootSpan(span) : undefined;
 
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
index fb0652acb036..ffb961bbfe3b 100644
--- a/packages/react/src/types.ts
+++ b/packages/react/src/types.ts
@@ -1,6 +1,5 @@
 // Disabling `no-explicit-any` for the whole file as `any` has became common requirement.
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import type { Transaction, TransactionContext } from '@sentry/types';
 
 export type Action = 'PUSH' | 'REPLACE' | 'POP';
 
@@ -9,12 +8,6 @@ export type Location = {
   action?: Action;
 } & Record<string, any>;
 
-export type ReactRouterInstrumentation = <T extends Transaction>(
-  startTransaction: (context: TransactionContext) => T | undefined,
-  startTransactionOnPageLoad?: boolean,
-  startTransactionOnLocationChange?: boolean,
-) => void;
-
 // React Router v6 Vendored Types
 export interface NonIndexRouteObject {
   caseSensitive?: boolean;
diff --git a/packages/react/test/errorboundary.test.tsx b/packages/react/test/errorboundary.test.tsx
index 20d9bca357b9..22bcec301142 100644
--- a/packages/react/test/errorboundary.test.tsx
+++ b/packages/react/test/errorboundary.test.tsx
@@ -35,6 +35,20 @@ function Bam(): JSX.Element {
   return <Boo title={title} />;
 }
 
+function EffectSpyFallback({ error }: { error: Error }): JSX.Element {
+  const [counter, setCounter] = useState(0);
+
+  React.useEffect(() => {
+    setCounter(c => c + 1);
+  }, []);
+
+  return (
+    <span>
+      EffectSpyFallback {counter} - {error.message}
+    </span>
+  );
+}
+
 interface TestAppProps extends ErrorBoundaryProps {
   errorComp?: JSX.Element;
 }
@@ -101,7 +115,7 @@ describe('ErrorBoundary', () => {
   it('renders null if not given a valid `fallback` prop function', () => {
     const { container } = render(
       // @ts-expect-error Passing wrong type on purpose
-      <ErrorBoundary fallback={() => 'Not a ReactElement'}>
+      <ErrorBoundary fallback={() => undefined}>
         <Bam />
       </ErrorBoundary>,
     );
@@ -118,6 +132,15 @@ describe('ErrorBoundary', () => {
     expect(container.innerHTML).toBe('<h1>Error Component</h1>');
   });
 
+  it('renders a fallback that can use react hooks', () => {
+    const { container } = render(
+      <ErrorBoundary fallback={EffectSpyFallback}>
+        <Bam />
+      </ErrorBoundary>,
+    );
+    expect(container.innerHTML).toBe('<span>EffectSpyFallback 1 - boom</span>');
+  });
+
   it('calls `onMount` when mounted', () => {
     const mockOnMount = jest.fn();
     render(
@@ -242,7 +265,7 @@ describe('ErrorBoundary', () => {
         captureContext: {
           contexts: { react: { componentStack: expect.any(String) } },
         },
-        mechanism: { handled: false },
+        mechanism: { handled: true },
       });
 
       expect(mockOnError.mock.calls[0][0]).toEqual(mockCaptureException.mock.calls[0][0]);
@@ -300,7 +323,7 @@ describe('ErrorBoundary', () => {
         captureContext: {
           contexts: { react: { componentStack: expect.any(String) } },
         },
-        mechanism: { handled: false },
+        mechanism: { handled: true },
       });
 
       // Check if error.cause -> react component stack
@@ -339,7 +362,7 @@ describe('ErrorBoundary', () => {
         captureContext: {
           contexts: { react: { componentStack: expect.any(String) } },
         },
-        mechanism: { handled: false },
+        mechanism: { handled: true },
       });
 
       expect(mockOnError.mock.calls[0][0]).toEqual(mockCaptureException.mock.calls[0][0]);
@@ -383,7 +406,7 @@ describe('ErrorBoundary', () => {
         captureContext: {
           contexts: { react: { componentStack: expect.any(String) } },
         },
-        mechanism: { handled: false },
+        mechanism: { handled: true },
       });
 
       expect(mockOnError.mock.calls[0][0]).toEqual(mockCaptureException.mock.calls[0][0]);
@@ -515,6 +538,48 @@ describe('ErrorBoundary', () => {
       expect(mockOnReset).toHaveBeenCalledTimes(1);
       expect(mockOnReset).toHaveBeenCalledWith(expect.any(Error), expect.any(String), expect.any(String));
     });
+
+    it('sets `handled: true` when a fallback is provided', async () => {
+      render(
+        <TestApp fallback={({ resetError }) => <button data-testid="reset" onClick={resetError} />}>
+          <h1>children</h1>
+        </TestApp>,
+      );
+
+      expect(mockCaptureException).toHaveBeenCalledTimes(0);
+
+      const btn = screen.getByTestId('errorBtn');
+      fireEvent.click(btn);
+
+      expect(mockCaptureException).toHaveBeenCalledTimes(1);
+      expect(mockCaptureException).toHaveBeenLastCalledWith(expect.any(Object), {
+        captureContext: {
+          contexts: { react: { componentStack: expect.any(String) } },
+        },
+        mechanism: { handled: true },
+      });
+    });
+
+    it('sets `handled: false` when no fallback is provided', async () => {
+      render(
+        <TestApp>
+          <h1>children</h1>
+        </TestApp>,
+      );
+
+      expect(mockCaptureException).toHaveBeenCalledTimes(0);
+
+      const btn = screen.getByTestId('errorBtn');
+      fireEvent.click(btn);
+
+      expect(mockCaptureException).toHaveBeenCalledTimes(1);
+      expect(mockCaptureException).toHaveBeenLastCalledWith(expect.any(Object), {
+        captureContext: {
+          contexts: { react: { componentStack: expect.any(String) } },
+        },
+        mechanism: { handled: false },
+      });
+    });
   });
 });
 
diff --git a/packages/react/test/reactrouterv3.test.tsx b/packages/react/test/reactrouterv3.test.tsx
index 964fe7e47b3d..c207ead3aab3 100644
--- a/packages/react/test/reactrouterv3.test.tsx
+++ b/packages/react/test/reactrouterv3.test.tsx
@@ -29,7 +29,6 @@ const mockStartBrowserTracingPageLoadSpan = jest.fn();
 const mockStartBrowserTracingNavigationSpan = jest.fn();
 
 const mockRootSpan = {
-  updateName: jest.fn(),
   setAttribute: jest.fn(),
   getSpanJSON() {
     return { op: 'pageload' };
@@ -84,9 +83,9 @@ describe('browserTracingReactRouterV3', () => {
   function createMockBrowserClient(): BrowserClient {
     return new BrowserClient({
       integrations: [],
+      tracesSampleRate: 1,
       transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
       stackParser: () => [],
-      debug: true,
     });
   }
 
@@ -115,6 +114,18 @@ describe('browserTracingReactRouterV3', () => {
     });
   });
 
+  it("updates the scope's `transactionName` on pageload", () => {
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    client.addIntegration(reactRouterV3BrowserTracingIntegration({ history, routes: instrumentationRoutes, match }));
+
+    client.init();
+    render(<Router history={history}>{routes}</Router>);
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+  });
+
   it('starts a navigation transaction', () => {
     const client = createMockBrowserClient();
     setCurrentClient(client);
@@ -192,4 +203,23 @@ describe('browserTracingReactRouterV3', () => {
       },
     });
   });
+
+  it("updates the scope's `transactionName` on a navigation", () => {
+    const client = createMockBrowserClient();
+
+    const history = createMemoryHistory();
+    client.addIntegration(reactRouterV3BrowserTracingIntegration({ history, routes: instrumentationRoutes, match }));
+
+    client.init();
+    const { container } = render(<Router history={history}>{routes}</Router>);
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+
+    act(() => {
+      history.push('/users/123');
+    });
+    expect(container.innerHTML).toContain('123');
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/users/:userid');
+  });
 });
diff --git a/packages/react/test/reactrouterv4.test.tsx b/packages/react/test/reactrouterv4.test.tsx
index 1028131eb0b3..0f331ba26abe 100644
--- a/packages/react/test/reactrouterv4.test.tsx
+++ b/packages/react/test/reactrouterv4.test.tsx
@@ -55,9 +55,9 @@ describe('browserTracingReactRouterV4', () => {
   function createMockBrowserClient(): BrowserClient {
     return new BrowserClient({
       integrations: [],
+      tracesSampleRate: 1,
       transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
       stackParser: () => [],
-      debug: true,
     });
   }
 
@@ -86,6 +86,18 @@ describe('browserTracingReactRouterV4', () => {
     });
   });
 
+  it("updates the scope's `transactionName` on pageload", () => {
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    const history = createMemoryHistory();
+    client.addIntegration(reactRouterV4BrowserTracingIntegration({ history }));
+
+    client.init();
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+  });
+
   it('starts a navigation transaction', () => {
     const client = createMockBrowserClient();
     setCurrentClient(client);
@@ -341,4 +353,45 @@ describe('browserTracingReactRouterV4', () => {
       },
     });
   });
+
+  it("updates the scope's `transactionName` on a route change", () => {
+    const routes: RouteConfig[] = [
+      {
+        path: '/organizations/:orgid/v1/:teamid',
+      },
+      { path: '/organizations/:orgid' },
+      { path: '/' },
+    ];
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    const history = createMemoryHistory();
+    client.addIntegration(reactRouterV4BrowserTracingIntegration({ history, routes, matchPath }));
+
+    client.init();
+
+    const SentryRoute = withSentryRouting(Route);
+
+    render(
+      <Router history={history as any}>
+        <Switch>
+          <SentryRoute path="/organizations/:orgid/v1/:teamid" component={() => <div>Team</div>} />
+          <SentryRoute path="/organizations/:orgid" component={() => <div>OrgId</div>} />
+          <SentryRoute path="/" component={() => <div>Home</div>} />
+        </Switch>
+      </Router>,
+    );
+
+    act(() => {
+      history.push('/organizations/1234/v1/758');
+    });
+
+    expect(getCurrentScope().getScopeData().transactionName).toEqual('/organizations/:orgid/v1/:teamid');
+
+    act(() => {
+      history.push('/organizations/1234');
+    });
+
+    expect(getCurrentScope().getScopeData().transactionName).toEqual('/organizations/:orgid');
+  });
 });
diff --git a/packages/react/test/reactrouterv5.test.tsx b/packages/react/test/reactrouterv5.test.tsx
index 0678f65652e4..901745f86b23 100644
--- a/packages/react/test/reactrouterv5.test.tsx
+++ b/packages/react/test/reactrouterv5.test.tsx
@@ -55,9 +55,9 @@ describe('browserTracingReactRouterV5', () => {
   function createMockBrowserClient(): BrowserClient {
     return new BrowserClient({
       integrations: [],
+      tracesSampleRate: 1,
       transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
       stackParser: () => [],
-      debug: true,
     });
   }
 
@@ -86,6 +86,18 @@ describe('browserTracingReactRouterV5', () => {
     });
   });
 
+  it("updates the scope's `transactionName` on pageload", () => {
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    const history = createMemoryHistory();
+    client.addIntegration(reactRouterV5BrowserTracingIntegration({ history }));
+
+    client.init();
+
+    expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+  });
+
   it('starts a navigation transaction', () => {
     const client = createMockBrowserClient();
     setCurrentClient(client);
@@ -341,4 +353,45 @@ describe('browserTracingReactRouterV5', () => {
       },
     });
   });
+
+  it("updates the scope's `transactionName` on a route change", () => {
+    const routes: RouteConfig[] = [
+      {
+        path: '/organizations/:orgid/v1/:teamid',
+      },
+      { path: '/organizations/:orgid' },
+      { path: '/' },
+    ];
+    const client = createMockBrowserClient();
+    setCurrentClient(client);
+
+    const history = createMemoryHistory();
+    client.addIntegration(reactRouterV5BrowserTracingIntegration({ history, routes, matchPath }));
+
+    client.init();
+
+    const SentryRoute = withSentryRouting(Route);
+
+    render(
+      <Router history={history as any}>
+        <Switch>
+          <SentryRoute path="/organizations/:orgid/v1/:teamid" component={() => <div>Team</div>} />
+          <SentryRoute path="/organizations/:orgid" component={() => <div>OrgId</div>} />
+          <SentryRoute path="/" component={() => <div>Home</div>} />
+        </Switch>
+      </Router>,
+    );
+
+    act(() => {
+      history.push('/organizations/1234/v1/758');
+    });
+
+    expect(getCurrentScope().getScopeData().transactionName).toBe('/organizations/:orgid/v1/:teamid');
+
+    act(() => {
+      history.push('/organizations/1234');
+    });
+
+    expect(getCurrentScope().getScopeData().transactionName).toBe('/organizations/:orgid');
+  });
 });
diff --git a/packages/react/test/reactrouterv6.4.test.tsx b/packages/react/test/reactrouterv6.4.test.tsx
index 2013524d5185..b2410e3bfad9 100644
--- a/packages/react/test/reactrouterv6.4.test.tsx
+++ b/packages/react/test/reactrouterv6.4.test.tsx
@@ -69,9 +69,9 @@ describe('reactRouterV6BrowserTracingIntegration (v6.4)', () => {
   function createMockBrowserClient(): BrowserClient {
     return new BrowserClient({
       integrations: [],
+      tracesSampleRate: 1,
       transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
       stackParser: () => [],
-      debug: true,
     });
   }
 
@@ -122,6 +122,39 @@ describe('reactRouterV6BrowserTracingIntegration (v6.4)', () => {
       });
     });
 
+    it("updates the scope's `transactionName` on a pageload", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+      const sentryCreateBrowserRouter = wrapCreateBrowserRouter(createMemoryRouter as CreateRouterFunction);
+
+      const router = sentryCreateBrowserRouter(
+        [
+          {
+            path: '/',
+            element: <div>TEST</div>,
+          },
+        ],
+        {
+          initialEntries: ['/'],
+        },
+      );
+
+      // @ts-expect-error router is fine
+      render(<RouterProvider router={router} />);
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+    });
+
     it('starts a navigation transaction', () => {
       const client = createMockBrowserClient();
       setCurrentClient(client);
@@ -590,5 +623,42 @@ describe('reactRouterV6BrowserTracingIntegration (v6.4)', () => {
         },
       });
     });
+
+    it("updates the scope's `transactionName` on a navigation", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+      const sentryCreateBrowserRouter = wrapCreateBrowserRouter(createMemoryRouter as CreateRouterFunction);
+
+      const router = sentryCreateBrowserRouter(
+        [
+          {
+            path: '/',
+            element: <Navigate to="/about" />,
+          },
+          {
+            path: 'about',
+            element: <div>About</div>,
+          },
+        ],
+        {
+          initialEntries: ['/'],
+        },
+      );
+
+      // @ts-expect-error router is fine
+      render(<RouterProvider router={router} />);
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/about');
+    });
   });
 });
diff --git a/packages/react/test/reactrouterv6.test.tsx b/packages/react/test/reactrouterv6.test.tsx
index 65355099476b..131161856214 100644
--- a/packages/react/test/reactrouterv6.test.tsx
+++ b/packages/react/test/reactrouterv6.test.tsx
@@ -68,9 +68,9 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
   function createMockBrowserClient(): BrowserClient {
     return new BrowserClient({
       integrations: [],
+      tracesSampleRate: 1,
       transport: () => createTransport({ recordDroppedEvent: () => undefined }, _ => Promise.resolve({})),
       stackParser: () => [],
-      debug: true,
     });
   }
 
@@ -114,6 +114,32 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
       });
     });
 
+    it("updates the scope's `transactionName` on a pageload", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+      const SentryRoutes = withSentryReactRouterV6Routing(Routes);
+
+      render(
+        <MemoryRouter initialEntries={['/']}>
+          <SentryRoutes>
+            <Route path="/" element={<div>Home</div>} />
+          </SentryRoutes>
+        </MemoryRouter>,
+      );
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+    });
+
     it('skips pageload transaction with `instrumentPageLoad: false`', () => {
       const client = createMockBrowserClient();
       setCurrentClient(client);
@@ -364,6 +390,35 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
         },
       });
     });
+
+    it("updates the scope's `transactionName` on a navigation", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+      const SentryRoutes = withSentryReactRouterV6Routing(Routes);
+
+      render(
+        <MemoryRouter initialEntries={['/']}>
+          <SentryRoutes>
+            <Route path="/about" element={<div>About</div>}>
+              <Route path="/about/:page" element={<div>page</div>} />
+            </Route>
+            <Route path="/" element={<Navigate to="/about/us" />} />
+          </SentryRoutes>
+        </MemoryRouter>,
+      );
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toBe('/about/:page');
+    });
   });
 
   describe('wrapUseRoutes', () => {
@@ -408,6 +463,39 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
       });
     });
 
+    it("updates the scope's `transactionName` on a pageload", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const wrappedUseRoutes = wrapUseRoutes(useRoutes);
+
+      const Routes = () =>
+        wrappedUseRoutes([
+          {
+            path: '/',
+            element: <div>Home</div>,
+          },
+        ]);
+
+      render(
+        <MemoryRouter initialEntries={['/']}>
+          <Routes />
+        </MemoryRouter>,
+      );
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toEqual('/');
+    });
+
     it('skips pageload transaction with `instrumentPageLoad: false`', () => {
       const client = createMockBrowserClient();
       setCurrentClient(client);
@@ -875,5 +963,41 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
       expect(mockRootSpan.updateName).toHaveBeenLastCalledWith('/tests/:testId/*');
       expect(mockRootSpan.setAttribute).toHaveBeenCalledWith(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
     });
+
+    it("updates the scope's `transactionName` on a navigation", () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+      const wrappedUseRoutes = wrapUseRoutes(useRoutes);
+
+      const Routes = () =>
+        wrappedUseRoutes([
+          {
+            path: '/',
+            element: <Navigate to="/about" />,
+          },
+          {
+            path: '/about',
+            element: <div>About</div>,
+          },
+        ]);
+
+      render(
+        <MemoryRouter initialEntries={['/']}>
+          <Routes />
+        </MemoryRouter>,
+      );
+
+      expect(getCurrentScope().getScopeData()?.transactionName).toBe('/about');
+    });
   });
 });
diff --git a/packages/remix/jest.config.js b/packages/remix/jest.config.js
index 51baeb4f27c0..7d6c8cb0990e 100644
--- a/packages/remix/jest.config.js
+++ b/packages/remix/jest.config.js
@@ -3,4 +3,6 @@ const baseConfig = require('../../jest/jest.config.js');
 module.exports = {
   ...baseConfig,
   testPathIgnorePatterns: ['<rootDir>/build/', '<rootDir>/node_modules/', '<rootDir>/test/integration/'],
+  // Some tests take longer to finish, as flushing spans with OpenTelemetry takes some more time
+  testTimeout: 15000,
 };
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 56c384aacfc8..b115b93b9ccd 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -10,7 +10,7 @@
     "sentry-upload-sourcemaps": "scripts/sentry-upload-sourcemaps.js"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -23,6 +23,17 @@
   "module": "build/esm/index.server.js",
   "browser": "build/esm/index.client.js",
   "types": "build/types/index.types.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "browser": {
+        "import": "./build/esm/index.client.js",
+        "require": "./build/cjs/index.client.js"
+      },
+      "node": "./build/cjs/index.server.js",
+      "types": "./build/types/index.types.d.ts"
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
@@ -35,9 +46,10 @@
   },
   "dependencies": {
     "@remix-run/router": "1.x",
-    "@sentry/cli": "^2.29.1",
+    "@sentry/cli": "^2.30.0",
     "@sentry/core": "8.0.0-alpha.2",
-    "@sentry/node-experimental": "8.0.0-alpha.2",
+    "@sentry/node": "8.0.0-alpha.2",
+    "@sentry/opentelemetry": "8.0.0-alpha.2",
     "@sentry/react": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2",
@@ -71,10 +83,9 @@
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
     "test": "yarn test:unit",
-    "test:integration": "run-s test:integration:v1 test:integration:v2 test:integration:tracingIntegration",
+    "test:integration": "run-s test:integration:v1 test:integration:v2",
     "test:integration:v1": "run-s test:integration:clean test:integration:prepare test:integration:client test:integration:server",
     "test:integration:v2": "export REMIX_VERSION=2 && run-s test:integration:v1",
-    "test:integration:tracingIntegration": "export TRACING_INTEGRATION=true && run-s test:integration:v2",
     "test:integration:ci": "run-s test:integration:clean test:integration:prepare test:integration:client:ci test:integration:server",
     "test:integration:prepare": "(cd test/integration && yarn install)",
     "test:integration:clean": "(cd test/integration && rimraf .cache node_modules build)",
diff --git a/packages/remix/src/client/performance.tsx b/packages/remix/src/client/performance.tsx
index fd997544bb8b..f50bd5ac2a0e 100644
--- a/packages/remix/src/client/performance.tsx
+++ b/packages/remix/src/client/performance.tsx
@@ -13,7 +13,7 @@ import {
   startBrowserTracingPageLoadSpan,
   withErrorBoundary,
 } from '@sentry/react';
-import type { Span, StartSpanOptions, Transaction, TransactionContext } from '@sentry/types';
+import type { Span, StartSpanOptions, TransactionContext } from '@sentry/types';
 import { isNodeEnv, logger } from '@sentry/utils';
 import * as React from 'react';
 
@@ -121,34 +121,6 @@ function startNavigationSpan(matches: RouteMatch<string>[]): void {
   }
 }
 
-/**
- * @deprecated Use `browserTracingIntegration` instead.
- *
- * Creates a react-router v6 instrumention for Remix applications.
- *
- * This implementation is slightly different (and simpler) from the react-router instrumentation
- * as in Remix, `useMatches` hook is available where in react-router-v6 it's not yet.
- */
-export function remixRouterInstrumentation(useEffect: UseEffect, useLocation: UseLocation, useMatches: UseMatches) {
-  return (
-    customStartTransaction: (context: TransactionContext) => Transaction | undefined,
-    startTransactionOnPageLoad = true,
-    startTransactionOnLocationChange = true,
-  ): void => {
-    setGlobals({
-      useEffect,
-      useLocation,
-      useMatches,
-      instrumentNavigation: startTransactionOnLocationChange,
-      customStartTransaction,
-    });
-
-    if (startTransactionOnPageLoad) {
-      startPageloadSpan();
-    }
-  };
-}
-
 /**
  * Wraps a remix `root` (see: https://remix.run/docs/en/v1/guides/migrating-react-router-app#creating-the-root-route)
  * To enable pageload/navigation tracing on every route.
diff --git a/packages/remix/src/index.client.tsx b/packages/remix/src/index.client.tsx
index a1d21486f6cc..17bcf6c46b31 100644
--- a/packages/remix/src/index.client.tsx
+++ b/packages/remix/src/index.client.tsx
@@ -2,11 +2,7 @@ import { applySdkMetadata, setTag } from '@sentry/core';
 import { init as reactInit } from '@sentry/react';
 import type { RemixOptions } from './utils/remixOptions';
 export { captureRemixErrorBoundaryError } from './client/errors';
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  remixRouterInstrumentation,
-  withSentry,
-} from './client/performance';
+export { withSentry } from './client/performance';
 
 export { browserTracingIntegration } from './client/browserTracingIntegration';
 
diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts
index 3b67422f4ae5..fcdf56eb2a57 100644
--- a/packages/remix/src/index.server.ts
+++ b/packages/remix/src/index.server.ts
@@ -1,6 +1,6 @@
-import { applySdkMetadata } from '@sentry/core';
-import type { NodeOptions } from '@sentry/node-experimental';
-import { getClient, init as nodeInit, setTag } from '@sentry/node-experimental';
+import { applySdkMetadata, isInitialized } from '@sentry/core';
+import type { NodeOptions } from '@sentry/node';
+import { init as nodeInit, setTag } from '@sentry/node';
 import { logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './utils/debug-build';
@@ -10,8 +10,6 @@ import type { RemixOptions } from './utils/remixOptions';
 // We need to explicitly export @sentry/node as they end up under `default` in ESM builds
 // See: https://github.com/getsentry/sentry-javascript/issues/8474
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
@@ -22,8 +20,6 @@ export {
   captureMessage,
   createTransport,
   // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
   getCurrentHub,
   getClient,
   getCurrentScope,
@@ -35,8 +31,6 @@ export {
   setCurrentClient,
   NodeClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -48,7 +42,6 @@ export {
   setHttpStatus,
   withScope,
   withIsolationScope,
-  autoDiscoverNodePerformanceMonitoringIntegrations,
   makeNodeTransport,
   getDefaultIntegrations,
   defaultStackParser,
@@ -58,7 +51,6 @@ export {
   addRequestDataToEvent,
   DEFAULT_USER_INCLUDES,
   extractRequestData,
-  Integrations,
   consoleIntegration,
   onUncaughtExceptionIntegration,
   onUnhandledRejectionIntegration,
@@ -70,48 +62,59 @@ export {
   functionToStringIntegration,
   inboundFiltersIntegration,
   linkedErrorsIntegration,
-  Handlers,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startSpanManual,
   startInactiveSpan,
   withActiveSpan,
+  getSpanDescendants,
   continueTrace,
   isInitialized,
   cron,
   parameterize,
   metrics,
   createGetModuleFromFilename,
-  hapiErrorPlugin,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
-} from '@sentry/node-experimental';
+  expressIntegration,
+  expressErrorHandler,
+  setupExpressErrorHandler,
+  fastifyIntegration,
+  graphqlIntegration,
+  mongoIntegration,
+  mongooseIntegration,
+  mysqlIntegration,
+  mysql2Integration,
+  nestIntegration,
+  postgresIntegration,
+  prismaIntegration,
+  hapiIntegration,
+  setupHapiErrorHandler,
+  spotlightIntegration,
+  setupFastifyErrorHandler,
+} from '@sentry/node';
 
 // Keeping the `*` exports for backwards compatibility and types
-export * from '@sentry/node-experimental';
+export * from '@sentry/node';
 
 export { captureRemixServerException, wrapRemixHandleError } from './utils/instrumentServer';
 export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
-// eslint-disable-next-line deprecation/deprecation
-export { remixRouterInstrumentation, withSentry } from './client/performance';
+export { withSentry } from './client/performance';
 export { captureRemixErrorBoundaryError } from './client/errors';
 export { browserTracingIntegration } from './client/browserTracingIntegration';
 export { wrapExpressCreateRequestHandler } from './utils/serverAdapters/express';
 
 export type { SentryMetaArgs } from './utils/types';
 
-function sdkAlreadyInitialized(): boolean {
-  return !!getClient();
-}
-
 /** Initializes Sentry Remix SDK on Node. */
 export function init(options: RemixOptions): void {
   applySdkMetadata(options, 'remix', ['remix', 'node']);
 
-  if (sdkAlreadyInitialized()) {
+  if (isInitialized()) {
     DEBUG_BUILD && logger.log('SDK already initialized');
 
     return;
diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts
index 5835c05b2c71..a4c619401d9d 100644
--- a/packages/remix/src/index.types.ts
+++ b/packages/remix/src/index.types.ts
@@ -14,7 +14,7 @@ export declare function init(options: RemixOptions): void;
 
 // We export a merged Integrations object so that users can (at least typing-wise) use all integrations everywhere.
 // eslint-disable-next-line deprecation/deprecation
-export declare const Integrations: typeof clientSdk.Integrations & typeof serverSdk.Integrations;
+export declare const Integrations: typeof clientSdk.Integrations;
 
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;
@@ -27,6 +27,13 @@ export declare const defaultStackParser: StackParser;
 // methods from `@sentry/core`.
 declare const runtime: 'client' | 'server';
 
+// eslint-disable-next-line deprecation/deprecation
+export declare const makeMain: typeof clientSdk.makeMain;
+// eslint-disable-next-line deprecation/deprecation
+export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
+export declare const getClient: typeof clientSdk.getClient;
+export declare const continueTrace: typeof clientSdk.continueTrace;
+
 export const close = runtime === 'client' ? clientSdk.close : serverSdk.close;
 export const flush = runtime === 'client' ? clientSdk.flush : serverSdk.flush;
 
diff --git a/packages/remix/src/utils/instrumentServer.ts b/packages/remix/src/utils/instrumentServer.ts
index aea35b7835ce..419e5e4ba0f2 100644
--- a/packages/remix/src/utils/instrumentServer.ts
+++ b/packages/remix/src/utils/instrumentServer.ts
@@ -1,20 +1,23 @@
 /* eslint-disable max-lines */
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  captureException,
+  continueTrace,
   getActiveSpan,
-  getActiveTransaction,
   getClient,
-  getCurrentScope,
-  getDynamicSamplingContextFromSpan,
+  getRootSpan,
+  handleCallbackErrors,
   hasTracingEnabled,
   setHttpStatus,
   spanToJSON,
   spanToTraceHeader,
+  startSpan,
   withIsolationScope,
 } from '@sentry/core';
-import { captureException, getCurrentHub } from '@sentry/node-experimental';
-import type { Hub, Transaction, TransactionSource, WrappedFunction } from '@sentry/types';
+import { getDynamicSamplingContextFromSpan } from '@sentry/opentelemetry';
+import type { Span, TransactionSource, WrappedFunction } from '@sentry/types';
 import {
   addExceptionMechanism,
   dynamicSamplingContextToSentryBaggageHeader,
@@ -24,7 +27,6 @@ import {
   loadModule,
   logger,
   objectify,
-  tracingContextFromHeaders,
 } from '@sentry/utils';
 
 import { DEBUG_BUILD } from './debug-build';
@@ -144,17 +146,17 @@ export async function captureRemixServerException(err: unknown, name: string, re
   const objectifiedErr = objectify(err);
 
   captureException(isResponse(objectifiedErr) ? await extractResponseError(objectifiedErr) : objectifiedErr, scope => {
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = getActiveTransaction();
-    const activeTransactionName = transaction ? spanToJSON(transaction).description : undefined;
+    const activeSpan = getActiveSpan();
+    const rootSpan = activeSpan && getRootSpan(activeSpan);
+    const activeRootSpanName = rootSpan ? spanToJSON(rootSpan).description : undefined;
 
     scope.setSDKProcessingMetadata({
       request: {
         ...normalizedRequest,
         // When `route` is not defined, `RequestData` integration uses the full URL
-        route: activeTransactionName
+        route: activeRootSpanName
           ? {
-              path: activeTransactionName,
+              path: activeRootSpanName,
             }
           : undefined,
       },
@@ -186,46 +188,50 @@ function makeWrappedDocumentRequestFunction(remixVersion?: number) {
       context: EntryContext,
       loadContext?: Record<string, unknown>,
     ): Promise<Response> {
-      let res: Response;
-      // eslint-disable-next-line deprecation/deprecation
-      const activeTransaction = getActiveTransaction();
+      const activeSpan = getActiveSpan();
+      const rootSpan = activeSpan && getRootSpan(activeSpan);
 
-      try {
-        // eslint-disable-next-line deprecation/deprecation
-        const span = activeTransaction?.startChild({
-          op: 'function.remix.document_request',
-          origin: 'auto.function.remix',
-          name: spanToJSON(activeTransaction).description,
+      const name = rootSpan ? spanToJSON(rootSpan).description : undefined;
+
+      return startSpan(
+        {
+          // If we don't have a root span, `onlyIfParent` will lead to the span not being created anyhow
+          // So we don't need to care too much about the fallback name, it's just for typing purposes....
+          name: name || '<unknown>',
+          onlyIfParent: true,
           attributes: {
             method: request.method,
             url: request.url,
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.remix',
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.remix.document_request',
           },
-        });
-
-        res = await origDocumentRequestFunction.call(
-          this,
-          request,
-          responseStatusCode,
-          responseHeaders,
-          context,
-          loadContext,
-        );
-
-        span?.end();
-      } catch (err) {
-        const isRemixV1 = !FUTURE_FLAGS?.v2_errorBoundary && remixVersion !== 2;
-
-        // This exists to capture the server-side rendering errors on Remix v1
-        // On Remix v2, we capture SSR errors at `handleError`
-        // We also skip primitives here, as we can't dedupe them, and also we don't expect any primitive SSR errors.
-        if (isRemixV1 && !isPrimitive(err)) {
-          await captureRemixServerException(err, 'documentRequest', request);
-        }
-
-        throw err;
-      }
-
-      return res;
+        },
+        () => {
+          return handleCallbackErrors(
+            () => {
+              return origDocumentRequestFunction.call(
+                this,
+                request,
+                responseStatusCode,
+                responseHeaders,
+                context,
+                loadContext,
+              );
+            },
+            err => {
+              const isRemixV1 = !FUTURE_FLAGS?.v2_errorBoundary && remixVersion !== 2;
+
+              // This exists to capture the server-side rendering errors on Remix v1
+              // On Remix v2, we capture SSR errors at `handleError`
+              // We also skip primitives here, as we can't dedupe them, and also we don't expect any primitive SSR errors.
+              if (isRemixV1 && !isPrimitive(err)) {
+                // eslint-disable-next-line @typescript-eslint/no-floating-promises
+                captureRemixServerException(err, 'documentRequest', request);
+              }
+            },
+          );
+        },
+      );
     };
   };
 }
@@ -242,47 +248,32 @@ function makeWrappedDataFunction(
       return origFn.call(this, args);
     }
 
-    let res: Response | AppData;
-    // eslint-disable-next-line deprecation/deprecation
-    const activeTransaction = getActiveTransaction();
-    const currentScope = getCurrentScope();
-
-    try {
-      // eslint-disable-next-line deprecation/deprecation
-      const span = activeTransaction?.startChild({
+    return startSpan(
+      {
         op: `function.remix.${name}`,
-        origin: 'auto.ui.remix',
         name: id,
         attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.remix',
           name,
         },
-      });
-
-      if (span) {
-        // Assign data function to hub to be able to see `db` transactions (if any) as children.
-        // eslint-disable-next-line deprecation/deprecation
-        currentScope.setSpan(span);
-      }
-
-      res = await origFn.call(this, args);
-
-      // eslint-disable-next-line deprecation/deprecation
-      currentScope.setSpan(activeTransaction);
-      span?.end();
-    } catch (err) {
-      const isRemixV2 = FUTURE_FLAGS?.v2_errorBoundary || remixVersion === 2;
-
-      // On Remix v2, we capture all unexpected errors (except the `Route Error Response`s / Thrown Responses) in `handleError` function.
-      // This is both for consistency and also avoid duplicates such as primitives like `string` or `number` being captured twice.
-      // Remix v1 does not have a `handleError` function, so we capture all errors here.
-      if (isRemixV2 ? isResponse(err) : true) {
-        await captureRemixServerException(err, name, args.request);
-      }
-
-      throw err;
-    }
-
-    return res;
+      },
+      () => {
+        return handleCallbackErrors(
+          () => origFn.call(this, args),
+          err => {
+            const isRemixV2 = FUTURE_FLAGS?.v2_errorBoundary || remixVersion === 2;
+
+            // On Remix v2, we capture all unexpected errors (except the `Route Error Response`s / Thrown Responses) in `handleError` function.
+            // This is both for consistency and also avoid duplicates such as primitives like `string` or `number` being captured twice.
+            // Remix v1 does not have a `handleError` function, so we capture all errors here.
+            if (isRemixV2 ? isResponse(err) : true) {
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
+              captureRemixServerException(err, name, args.request);
+            }
+          },
+        );
+      },
+    );
   };
 }
 
@@ -302,14 +293,12 @@ function getTraceAndBaggage(): {
   sentryTrace?: string;
   sentryBaggage?: string;
 } {
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = getActiveTransaction();
-
   if (isNodeEnv() && hasTracingEnabled()) {
     const span = getActiveSpan();
+    const rootSpan = span && getRootSpan(span);
 
-    if (span && transaction) {
-      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(transaction);
+    if (rootSpan) {
+      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(rootSpan);
 
       return {
         sentryTrace: spanToTraceHeader(span),
@@ -382,47 +371,44 @@ export function createRoutes(manifest: ServerRouteManifest, parentId?: string):
 }
 
 /**
- * Starts a new transaction for the given request to be used by different `RequestHandler` wrappers.
+ * Starts a new active span for the given request to be used by different `RequestHandler` wrappers.
  */
-export function startRequestHandlerTransaction(
-  hub: Hub,
-  name: string,
-  source: TransactionSource,
-  request: {
-    headers: {
-      'sentry-trace': string;
-      baggage: string;
-    };
+export function startRequestHandlerSpan<T>(
+  {
+    name,
+    source,
+    sentryTrace,
+    baggage,
+    method,
+  }: {
+    name: string;
+    source: TransactionSource;
+    sentryTrace: string;
+    baggage: string;
     method: string;
   },
-): Transaction {
-  // eslint-disable-next-line deprecation/deprecation
-  const { traceparentData, dynamicSamplingContext, propagationContext } = tracingContextFromHeaders(
-    request.headers['sentry-trace'],
-    request.headers.baggage,
-  );
-  // eslint-disable-next-line deprecation/deprecation
-  hub.getScope().setPropagationContext(propagationContext);
-
-  // TODO: Refactor this to `startSpan()`
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = hub.startTransaction({
-    name,
-    op: 'http.server',
-    attributes: {
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.remix',
-      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-      method: request.method,
+  callback: (span: Span) => T,
+): T {
+  return continueTrace(
+    {
+      sentryTrace,
+      baggage,
     },
-    ...traceparentData,
-    metadata: {
-      dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+    () => {
+      return startSpan(
+        {
+          name,
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.remix',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
+            method,
+          },
+        },
+        callback,
+      );
     },
-  });
-
-  // eslint-disable-next-line deprecation/deprecation
-  hub.getScope().setSpan(transaction);
-  return transaction;
+  );
 }
 
 /**
@@ -445,8 +431,6 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
     }
 
     return withIsolationScope(async isolationScope => {
-      // eslint-disable-next-line deprecation/deprecation
-      const hub = getCurrentHub();
       const options = getClient()?.getOptions();
 
       let normalizedRequest: Record<string, unknown> = request;
@@ -473,23 +457,24 @@ function wrapRequestHandler(origRequestHandler: RequestHandler, build: ServerBui
         return origRequestHandler.call(this, request, loadContext);
       }
 
-      const transaction = startRequestHandlerTransaction(hub, name, source, {
-        headers: {
-          'sentry-trace': request.headers.get('sentry-trace') || '',
+      return startRequestHandlerSpan(
+        {
+          name,
+          source,
+          sentryTrace: request.headers.get('sentry-trace') || '',
           baggage: request.headers.get('baggage') || '',
+          method: request.method,
         },
-        method: request.method,
-      });
-
-      const res = (await origRequestHandler.call(this, request, loadContext)) as Response;
+        async span => {
+          const res = (await origRequestHandler.call(this, request, loadContext)) as Response;
 
-      if (isResponse(res)) {
-        setHttpStatus(transaction, res.status);
-      }
-
-      transaction.end();
+          if (isResponse(res)) {
+            setHttpStatus(span, res.status);
+          }
 
-      return res;
+          return res;
+        },
+      );
     });
   };
 }
diff --git a/packages/remix/src/utils/remixOptions.ts b/packages/remix/src/utils/remixOptions.ts
index 6ac57b5a2f1e..4a1fe13e18e1 100644
--- a/packages/remix/src/utils/remixOptions.ts
+++ b/packages/remix/src/utils/remixOptions.ts
@@ -1,4 +1,4 @@
-import type { NodeOptions } from '@sentry/node-experimental';
+import type { NodeOptions } from '@sentry/node';
 import type { BrowserOptions } from '@sentry/react';
 import type { Options } from '@sentry/types';
 
diff --git a/packages/remix/src/utils/serverAdapters/express.ts b/packages/remix/src/utils/serverAdapters/express.ts
index de1219df5082..51e3b40e0019 100644
--- a/packages/remix/src/utils/serverAdapters/express.ts
+++ b/packages/remix/src/utils/serverAdapters/express.ts
@@ -1,10 +1,10 @@
 import { getClient, getCurrentHub, hasTracingEnabled, setHttpStatus, withIsolationScope } from '@sentry/core';
-import { flush } from '@sentry/node-experimental';
-import type { Hub, Transaction } from '@sentry/types';
+import { flush } from '@sentry/node';
+import type { Hub, Span } from '@sentry/types';
 import { extractRequestData, fill, isString, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../debug-build';
-import { createRoutes, getTransactionName, instrumentBuild, startRequestHandlerTransaction } from '../instrumentServer';
+import { createRoutes, getTransactionName, instrumentBuild, startRequestHandlerSpan } from '../instrumentServer';
 import type {
   AppLoadContext,
   ExpressCreateRequestHandler,
@@ -89,19 +89,24 @@ function startRequestHandlerTransactionWithRoutes(
   next: ExpressNextFunction,
   hub: Hub,
   url: URL,
-): Transaction | undefined {
+): unknown {
   const [name, source] = getTransactionName(routes, url);
-  const transaction = startRequestHandlerTransaction(hub, name, source, {
-    headers: {
-      'sentry-trace': (req.headers && isString(req.headers['sentry-trace']) && req.headers['sentry-trace']) || '',
+
+  return startRequestHandlerSpan(
+    {
+      name,
+      source,
+      sentryTrace: (req.headers && isString(req.headers['sentry-trace']) && req.headers['sentry-trace']) || '',
       baggage: (req.headers && isString(req.headers.baggage) && req.headers.baggage) || '',
+      method: req.method,
+    },
+    span => {
+      // save a link to the transaction on the response, so that even if there's an error (landing us outside of
+      // the domain), we can still finish it (albeit possibly missing some scope data)
+      (res as AugmentedExpressResponse).__sentrySpan = span;
+      return origRequestHandler.call(this, req, res, next);
     },
-    method: req.method,
-  });
-  // save a link to the transaction on the response, so that even if there's an error (landing us outside of
-  // the domain), we can still finish it (albeit possibly missing some scope data)
-  (res as AugmentedExpressResponse).__sentryTransaction = transaction;
-  return origRequestHandler.call(this, req, res, next);
+  );
 }
 
 function wrapGetLoadContext(origGetLoadContext: () => AppLoadContext): GetLoadContextFunction {
@@ -168,7 +173,7 @@ export function wrapExpressCreateRequestHandler(
 }
 
 export type AugmentedExpressResponse = ExpressResponse & {
-  __sentryTransaction?: Transaction;
+  __sentrySpan?: Span;
 };
 
 type ResponseEndMethod = AugmentedExpressResponse['end'];
@@ -201,16 +206,16 @@ function wrapEndMethod(origEnd: ResponseEndMethod): WrappedResponseEndMethod {
  * @param res The outgoing response for this request, on which the transaction is stored
  */
 async function finishSentryProcessing(res: AugmentedExpressResponse): Promise<void> {
-  const { __sentryTransaction: transaction } = res;
+  const { __sentrySpan: span } = res;
 
-  if (transaction) {
-    setHttpStatus(transaction, res.statusCode);
+  if (span) {
+    setHttpStatus(span, res.statusCode);
 
     // Push `transaction.finish` to the next event loop so open spans have a better chance of finishing before the
     // transaction closes, and make sure to wait until that's done before flushing events
     await new Promise<void>(resolve => {
       setImmediate(() => {
-        transaction.end();
+        span.end();
         resolve();
       });
     });
diff --git a/packages/remix/test/index.server.test.ts b/packages/remix/test/index.server.test.ts
index 71d2933f9d0e..20953ad32507 100644
--- a/packages/remix/test/index.server.test.ts
+++ b/packages/remix/test/index.server.test.ts
@@ -1,6 +1,6 @@
-import * as SentryNode from '@sentry/node-experimental';
+import * as SentryNode from '@sentry/node';
 
-import { Integrations, init } from '../src/index.server';
+import { init } from '../src/index.server';
 
 const nodeInit = jest.spyOn(SentryNode, 'init');
 
@@ -55,9 +55,4 @@ describe('Server init()', () => {
 
     expect(SentryNode.getIsolationScope().getScopeData().tags).toEqual({ runtime: 'node' });
   });
-
-  it('has both node and tracing integrations', () => {
-    expect(Integrations.Apollo).not.toBeUndefined();
-    expect(Integrations.Http).not.toBeUndefined();
-  });
 });
diff --git a/packages/remix/test/integration/app_v1/entry.server.tsx b/packages/remix/test/integration/app_v1/entry.server.tsx
index d7fcd6b1ea6b..d4ad53d80aec 100644
--- a/packages/remix/test/integration/app_v1/entry.server.tsx
+++ b/packages/remix/test/integration/app_v1/entry.server.tsx
@@ -1,7 +1,5 @@
-import type { EntryContext } from '@remix-run/node';
-import { RemixServer } from '@remix-run/react';
+// it is important this is first!
 import * as Sentry from '@sentry/remix';
-import { renderToString } from 'react-dom/server';
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -11,6 +9,10 @@ Sentry.init({
   autoSessionTracking: false,
 });
 
+import type { EntryContext } from '@remix-run/node';
+import { RemixServer } from '@remix-run/react';
+import { renderToString } from 'react-dom/server';
+
 export default function handleRequest(
   request: Request,
   responseStatusCode: number,
diff --git a/packages/remix/test/integration/app_v2/entry.server.tsx b/packages/remix/test/integration/app_v2/entry.server.tsx
index bba366801092..6d539702e955 100644
--- a/packages/remix/test/integration/app_v2/entry.server.tsx
+++ b/packages/remix/test/integration/app_v2/entry.server.tsx
@@ -1,7 +1,5 @@
-import type { EntryContext } from '@remix-run/node';
-import { RemixServer } from '@remix-run/react';
+// it is important this is first!
 import * as Sentry from '@sentry/remix';
-import { renderToString } from 'react-dom/server';
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -11,6 +9,10 @@ Sentry.init({
   autoSessionTracking: false,
 });
 
+import type { EntryContext } from '@remix-run/node';
+import { RemixServer } from '@remix-run/react';
+import { renderToString } from 'react-dom/server';
+
 export const handleError = Sentry.wrapRemixHandleError;
 
 export default function handleRequest(
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/entry.client.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/entry.client.tsx
deleted file mode 100644
index 7273433127ac..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/entry.client.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
-import { useEffect } from 'react';
-import { hydrate } from 'react-dom';
-
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  tracesSampleRate: 1,
-  integrations: [Sentry.browserTracingIntegration({ useEffect, useLocation, useMatches })],
-});
-
-hydrate(<RemixBrowser />, document);
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/entry.server.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/entry.server.tsx
deleted file mode 100644
index bba366801092..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/entry.server.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { EntryContext } from '@remix-run/node';
-import { RemixServer } from '@remix-run/react';
-import * as Sentry from '@sentry/remix';
-import { renderToString } from 'react-dom/server';
-
-Sentry.init({
-  dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  tracesSampleRate: 1,
-  tracePropagationTargets: ['example.org'],
-  // Disabling to test series of envelopes deterministically.
-  autoSessionTracking: false,
-});
-
-export const handleError = Sentry.wrapRemixHandleError;
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-) {
-  let markup = renderToString(<RemixServer context={remixContext} url={request.url} />);
-
-  responseHeaders.set('Content-Type', 'text/html');
-
-  return new Response('<!DOCTYPE html>' + markup, {
-    status: responseStatusCode,
-    headers: responseHeaders,
-  });
-}
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/root.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/root.tsx
deleted file mode 100644
index 15b78b8a6325..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/root.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { LoaderFunction, V2_MetaFunction, defer, json, redirect } from '@remix-run/node';
-import { Links, LiveReload, Meta, Outlet, Scripts, ScrollRestoration, useRouteError } from '@remix-run/react';
-import { V2_ErrorBoundaryComponent } from '@remix-run/react/dist/routeModules';
-import { captureRemixErrorBoundaryError, withSentry } from '@sentry/remix';
-
-export const ErrorBoundary: V2_ErrorBoundaryComponent = () => {
-  const error = useRouteError();
-
-  captureRemixErrorBoundaryError(error);
-
-  return <div>error</div>;
-};
-
-export const meta: V2_MetaFunction = ({ data }) => [
-  { charset: 'utf-8' },
-  { title: 'New Remix App' },
-  { name: 'viewport', content: 'width=device-width,initial-scale=1' },
-  { name: 'sentry-trace', content: data.sentryTrace },
-  { name: 'baggage', content: data.sentryBaggage },
-];
-
-export const loader: LoaderFunction = async ({ request }) => {
-  const url = new URL(request.url);
-  const type = url.searchParams.get('type');
-
-  switch (type) {
-    case 'empty':
-      return {};
-    case 'plain':
-      return {
-        data_one: [],
-        data_two: 'a string',
-      };
-    case 'json':
-      return json({ data_one: [], data_two: 'a string' }, { headers: { 'Cache-Control': 'max-age=300' } });
-    case 'defer':
-      return defer({ data_one: [], data_two: 'a string' });
-    case 'null':
-      return null;
-    case 'undefined':
-      return undefined;
-    case 'throwRedirect':
-      throw redirect('/?type=plain');
-    case 'returnRedirect':
-      return redirect('/?type=plain');
-    case 'throwRedirectToExternal':
-      throw redirect('https://example.com');
-    case 'returnRedirectToExternal':
-      return redirect('https://example.com');
-    default: {
-      return {};
-    }
-  }
-};
-
-function App() {
-  return (
-    <html lang="en">
-      <head>
-        <Meta />
-        <Links />
-      </head>
-      <body>
-        <Outlet />
-        <ScrollRestoration />
-        <Scripts />
-        <LiveReload />
-      </body>
-    </html>
-  );
-}
-
-export default withSentry(App);
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/action-json-response.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/action-json-response.$id.tsx
deleted file mode 100644
index 7a00bfb2bfe7..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/action-json-response.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/action-json-response.$id';
-export { default } from '../../common/routes/action-json-response.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-exception.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-exception.tsx
deleted file mode 100644
index 1ba745d2e63d..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-exception.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/capture-exception';
-export { default } from '../../common/routes/capture-exception';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-message.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-message.tsx
deleted file mode 100644
index 9dae2318cc14..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/capture-message.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/capture-message';
-export { default } from '../../common/routes/capture-message';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/error-boundary-capture.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/error-boundary-capture.$id.tsx
deleted file mode 100644
index 011f92462069..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/error-boundary-capture.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/error-boundary-capture.$id';
-export { default } from '../../common/routes/error-boundary-capture.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/index.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/index.tsx
deleted file mode 100644
index 22c086a4c2cf..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/index';
-export { default } from '../../common/routes/index';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-defer-response.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-defer-response.$id.tsx
deleted file mode 100644
index 69499e594ccc..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-defer-response.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/loader-defer-response.$id';
-export { default } from '../../common/routes/loader-defer-response.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-json-response.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-json-response.$id.tsx
deleted file mode 100644
index 7761875bdb76..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-json-response.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/loader-json-response.$id';
-export { default } from '../../common/routes/loader-json-response.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-throw-response.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-throw-response.$id.tsx
deleted file mode 100644
index 6b9a6a85cbef..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/loader-throw-response.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/loader-throw-response.$id';
-export { default } from '../../common/routes/loader-throw-response.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/manual-tracing.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/manual-tracing.$id.tsx
deleted file mode 100644
index a7cfebe4ed46..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/manual-tracing.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/manual-tracing.$id';
-export { default } from '../../common/routes/manual-tracing.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/scope-bleed.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/scope-bleed.$id.tsx
deleted file mode 100644
index 5ba2376f0339..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/scope-bleed.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/scope-bleed.$id';
-export { default } from '../../common/routes/scope-bleed.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/server-side-unexpected-errors.$id.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/server-side-unexpected-errors.$id.tsx
deleted file mode 100644
index d9571c68ddd5..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/server-side-unexpected-errors.$id.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/server-side-unexpected-errors.$id';
-export { default } from '../../common/routes/server-side-unexpected-errors.$id';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/ssr-error.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/ssr-error.tsx
deleted file mode 100644
index 627f7e126871..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/ssr-error.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/ssr-error';
-export { default } from '../../common/routes/ssr-error';
diff --git a/packages/remix/test/integration/app_v2_tracingIntegration/routes/throw-redirect.tsx b/packages/remix/test/integration/app_v2_tracingIntegration/routes/throw-redirect.tsx
deleted file mode 100644
index 4425f3432b58..000000000000
--- a/packages/remix/test/integration/app_v2_tracingIntegration/routes/throw-redirect.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from '../../common/routes/throw-redirect';
-export { default } from '../../common/routes/throw-redirect';
diff --git a/packages/remix/test/integration/common/routes/manual-tracing.$id.tsx b/packages/remix/test/integration/common/routes/manual-tracing.$id.tsx
index a7383f1b8f5a..1a3cc359c7c1 100644
--- a/packages/remix/test/integration/common/routes/manual-tracing.$id.tsx
+++ b/packages/remix/test/integration/common/routes/manual-tracing.$id.tsx
@@ -1,7 +1,10 @@
 import * as Sentry from '@sentry/remix';
 
 export default function ManualTracing() {
-  const transaction = Sentry.startTransaction({ name: 'test_transaction_1' });
-  transaction.end();
+  const span = Sentry.startInactiveSpan({
+    name: 'test_transaction_1',
+    forceTransaction: true,
+  });
+  span.end();
   return <div />;
 }
diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json
index e0ef0db0d556..3d7cb377a74b 100644
--- a/packages/remix/test/integration/package.json
+++ b/packages/remix/test/integration/package.json
@@ -26,7 +26,6 @@
     "@sentry/browser": "file:../../../browser",
     "@sentry/core": "file:../../../core",
     "@sentry/node": "file:../../../node-experimental",
-    "@sentry/node-experimental": "file:../../../node",
     "@sentry/opentelemetry": "file:../../../opentelemetry",
     "@sentry/react": "file:../../../react",
     "@sentry/replay": "file:../../../replay",
@@ -39,6 +38,6 @@
     "@vanilla-extract/integration": "6.2.4"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   }
 }
diff --git a/packages/remix/test/integration/remix.config.js b/packages/remix/test/integration/remix.config.js
index 418d3690f696..b4c7ac0837b8 100644
--- a/packages/remix/test/integration/remix.config.js
+++ b/packages/remix/test/integration/remix.config.js
@@ -1,9 +1,8 @@
 /** @type {import('@remix-run/dev').AppConfig} */
 const useV2 = process.env.REMIX_VERSION === '2';
-const useBrowserTracing = process.env.TRACING_INTEGRATION === 'true';
 
 module.exports = {
-  appDirectory: useBrowserTracing ? 'app_v2_tracingIntegration' : useV2 ? 'app_v2' : 'app_v1',
+  appDirectory: useV2 ? 'app_v2' : 'app_v1',
   assetsBuildDirectory: 'public/build',
   serverBuildPath: 'build/index.js',
   publicPath: '/build/',
diff --git a/packages/remix/test/integration/test/client/capture-exception.test.ts b/packages/remix/test/integration/test/client/capture-exception.test.ts
index b7e38abf2f4c..18f2fd9af196 100644
--- a/packages/remix/test/integration/test/client/capture-exception.test.ts
+++ b/packages/remix/test/integration/test/client/capture-exception.test.ts
@@ -8,7 +8,8 @@ test('should report a manually captured error.', async ({ page }) => {
   const [errorEnvelope, pageloadEnvelope] = envelopes;
 
   expect(errorEnvelope.level).toBe('error');
-  expect(errorEnvelope.transaction).toBe('/capture-exception');
+  // TODO: Comment back in once we update the scope transaction name on the client side
+  // expect(errorEnvelope.transaction).toBe('/capture-exception');
   expect(errorEnvelope.exception?.values).toMatchObject([
     {
       type: 'Error',
diff --git a/packages/remix/test/integration/test/client/capture-message.test.ts b/packages/remix/test/integration/test/client/capture-message.test.ts
index 234b6ee3d961..5c3e578ad81f 100644
--- a/packages/remix/test/integration/test/client/capture-message.test.ts
+++ b/packages/remix/test/integration/test/client/capture-message.test.ts
@@ -8,7 +8,8 @@ test('should report a manually captured message.', async ({ page }) => {
   const [messageEnvelope, pageloadEnvelope] = envelopes;
 
   expect(messageEnvelope.level).toBe('info');
-  expect(messageEnvelope.transaction).toBe('/capture-message');
+  // TODO: Comment back in once we update the scope transaction name on the client side
+  // expect(messageEnvelope.transaction).toBe('/capture-message');
   expect(messageEnvelope.message).toBe('Sentry Manually Captured Message');
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
diff --git a/packages/remix/test/integration/test/client/manualtracing.test.ts b/packages/remix/test/integration/test/client/manualtracing.test.ts
index c9985ce75cb7..4c1b01507617 100644
--- a/packages/remix/test/integration/test/client/manualtracing.test.ts
+++ b/packages/remix/test/integration/test/client/manualtracing.test.ts
@@ -7,6 +7,7 @@ const useV2 = process.env.REMIX_VERSION === '2';
 test('should report a manually created / finished transaction.', async ({ page }) => {
   const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 2, {
     url: '/manual-tracing/0',
+    envelopeType: 'transaction',
   });
 
   const [manualTransactionEnvelope, pageloadEnvelope] = envelopes;
diff --git a/packages/remix/test/integration/test/server/action.test.ts b/packages/remix/test/integration/test/server/action.test.ts
index fe0b4a749c43..884c11c64657 100644
--- a/packages/remix/test/integration/test/server/action.test.ts
+++ b/packages/remix/test/integration/test/server/action.test.ts
@@ -61,7 +61,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
     assertSentryTransaction(transaction[2], {
       contexts: {
         trace: {
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             'http.response.status_code': 500,
           },
@@ -169,7 +169,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'GET',
             'http.response.status_code': 500,
@@ -217,7 +217,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
@@ -265,7 +265,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
@@ -313,7 +313,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
@@ -361,7 +361,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
@@ -409,7 +409,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
@@ -457,7 +457,7 @@ describe.each(['builtin', 'express'])('Remix API Actions with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'POST',
             'http.response.status_code': 500,
diff --git a/packages/remix/test/integration/test/server/loader.test.ts b/packages/remix/test/integration/test/server/loader.test.ts
index c40282096e18..6e1c41ae54b8 100644
--- a/packages/remix/test/integration/test/server/loader.test.ts
+++ b/packages/remix/test/integration/test/server/loader.test.ts
@@ -19,7 +19,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
     assertSentryTransaction(transaction, {
       contexts: {
         trace: {
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             'http.response.status_code': 500,
           },
@@ -51,8 +51,23 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
     const env = await RemixTestEnv.init(adapter);
     const url = `${env.url}/loader-throw-response/-1`;
 
-    const envelopes = await env.getMultipleEnvelopeRequest({ url, count: 1, envelopeType: ['event'] });
-    const event = envelopes[0][2];
+    // We also wait for the transaction, even though we don't care about it for this test
+    // but otherwise this may leak into another test
+    const envelopes = await env.getMultipleEnvelopeRequest({ url, count: 2, envelopeType: ['event', 'transaction'] });
+
+    const event = envelopes[0][2].type === 'transaction' ? envelopes[1][2] : envelopes[0][2];
+    const transaction = envelopes[0][2].type === 'transaction' ? envelopes[0][2] : envelopes[1][2];
+
+    assertSentryTransaction(transaction, {
+      contexts: {
+        trace: {
+          status: 'unknown_error',
+          data: {
+            'http.response.status_code': 500,
+          },
+        },
+      },
+    });
 
     assertSentryEvent(event, {
       exception: {
@@ -133,7 +148,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
       contexts: {
         trace: {
           op: 'http.server',
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             method: 'GET',
             'http.response.status_code': 500,
@@ -184,9 +199,7 @@ describe.each(['builtin', 'express'])('Remix API Loaders with adapter = %s', ada
       const val = key[key.length - 1];
       expect(tags[key]).toEqual(val);
     });
-    // express tests tend to take slightly longer on node >= 20
-    // TODO: check why this is happening
-  }, 10000);
+  });
 
   it('continues transaction from sentry-trace header and baggage', async () => {
     const env = await RemixTestEnv.init(adapter);
diff --git a/packages/remix/test/integration/test/server/ssr.test.ts b/packages/remix/test/integration/test/server/ssr.test.ts
index 63b0fdf7d4cd..2e96760d2bae 100644
--- a/packages/remix/test/integration/test/server/ssr.test.ts
+++ b/packages/remix/test/integration/test/server/ssr.test.ts
@@ -13,7 +13,7 @@ describe('Server Side Rendering', () => {
     assertSentryTransaction(transaction[2], {
       contexts: {
         trace: {
-          status: 'internal_error',
+          status: 'unknown_error',
           data: {
             'http.response.status_code': 500,
           },
diff --git a/packages/replay-canvas/.eslintrc.js b/packages/replay-canvas/.eslintrc.js
index eaa6b88347ca..216184b75e47 100644
--- a/packages/replay-canvas/.eslintrc.js
+++ b/packages/replay-canvas/.eslintrc.js
@@ -8,9 +8,6 @@ module.exports = {
   overrides: [
     {
       files: ['src/**/*.ts'],
-      rules: {
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
-      },
     },
     {
       files: ['jest.setup.ts', 'jest.config.ts'],
diff --git a/packages/replay-canvas/CONTRIBUTING.md b/packages/replay-canvas/CONTRIBUTING.md
index 829930e2b05e..7b4a70f075ab 100644
--- a/packages/replay-canvas/CONTRIBUTING.md
+++ b/packages/replay-canvas/CONTRIBUTING.md
@@ -1,4 +1,7 @@
 ## Updating the rrweb dependency
 
-When [updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
-please be aware that [`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204) also needs to be updated.
+When
+[updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
+please be aware that
+[`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
+also needs to be updated.
diff --git a/packages/replay-canvas/README.md b/packages/replay-canvas/README.md
index 21af46bf2512..75e2f26a0290 100644
--- a/packages/replay-canvas/README.md
+++ b/packages/replay-canvas/README.md
@@ -12,8 +12,9 @@ Replay with canvas requires Node 14+, and browsers newer than IE11.
 
 ## Installation
 
-Replay and ReplayCanvas can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or `@sentry/vue`.
-You don't need to install anything in order to use Session Replay. The minimum version that includes Replay is 7.27.0.
+Replay and ReplayCanvas can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or
+`@sentry/vue`. You don't need to install anything in order to use Session Replay. The minimum version that includes
+Replay is 7.27.0.
 
 For details on using Replay when using Sentry via the CDN bundles, see [CDN bundle](#loading-replay-as-a-cdn-bundle).
 
@@ -22,7 +23,7 @@ For details on using Replay when using Sentry via the CDN bundles, see [CDN bund
 To set up the canvas integration, add the following to your Sentry integrations:
 
 ```javascript
-new Sentry.ReplayCanvas(),
+Sentry.replayCanvasIntegration(),
 ```
 
 ### Full Example
@@ -42,10 +43,7 @@ Sentry.init({
   // sessions when an error occurs.
   replaysOnErrorSampleRate: 1.0,
 
-  integrations: [
-    new Sentry.Replay(),
-    new Sentry.ReplayCanvas(),
-  ],
+  integrations: [Sentry.replayIntegration(), Sentry.replayCanvasIntegration()],
   // ...
 });
 ```
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index c470d8fe3929..a2f0cb81a44d 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -5,6 +5,19 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
+      "require": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -65,7 +78,7 @@
     "@sentry/utils": "8.0.0-alpha.2"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/replay-canvas/rollup.bundle.config.mjs b/packages/replay-canvas/rollup.bundle.config.mjs
index 1575b8114594..557b0da35bb0 100644
--- a/packages/replay-canvas/rollup.bundle.config.mjs
+++ b/packages/replay-canvas/rollup.bundle.config.mjs
@@ -3,7 +3,6 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal
 const baseBundleConfig = makeBaseBundleConfig({
   bundleType: 'addon',
   entrypoints: ['src/index.ts'],
-  jsVersion: 'es6',
   licenseTitle: '@sentry-internal/replay-canvas',
   outputFileBase: () => 'bundles/replay-canvas',
 });
diff --git a/packages/replay-canvas/src/canvas.ts b/packages/replay-canvas/src/canvas.ts
index 5da590a162d7..1a2ae0126be9 100644
--- a/packages/replay-canvas/src/canvas.ts
+++ b/packages/replay-canvas/src/canvas.ts
@@ -1,7 +1,7 @@
 import { CanvasManager } from '@sentry-internal/rrweb';
-import { convertIntegrationFnToClass, defineIntegration } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
 import type { CanvasManagerInterface, CanvasManagerOptions } from '@sentry/replay';
-import type { Integration, IntegrationClass, IntegrationFn } from '@sentry/types';
+import type { IntegrationFn } from '@sentry/types';
 
 interface ReplayCanvasOptions {
   enableManualSnapshot?: boolean;
@@ -104,13 +104,3 @@ export const _replayCanvasIntegration = ((options: Partial<ReplayCanvasOptions>
  * Add this in addition to `replayIntegration()` to enable canvas recording.
  */
 export const replayCanvasIntegration = defineIntegration(_replayCanvasIntegration);
-
-/**
- * @deprecated Use `replayCanvasIntegration()` instead
- */
-// eslint-disable-next-line deprecation/deprecation
-export const ReplayCanvas = convertIntegrationFnToClass(INTEGRATION_NAME, replayCanvasIntegration) as IntegrationClass<
-  Integration & {
-    getOptions: () => ReplayCanvasIntegrationOptions;
-  }
->;
diff --git a/packages/replay-canvas/src/index.ts b/packages/replay-canvas/src/index.ts
index b9dc20a69f53..ef5331d48b78 100644
--- a/packages/replay-canvas/src/index.ts
+++ b/packages/replay-canvas/src/index.ts
@@ -1,6 +1,2 @@
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  ReplayCanvas,
-  replayCanvasIntegration,
-} from './canvas';
+export { replayCanvasIntegration } from './canvas';
 export type { ReplayCanvasIntegrationOptions } from './canvas';
diff --git a/packages/replay-worker/README.md b/packages/replay-worker/README.md
index 731b289800b8..970a0b3defb1 100644
--- a/packages/replay-worker/README.md
+++ b/packages/replay-worker/README.md
@@ -6,8 +6,8 @@
 
 # Sentry Session Replay Worker
 
-This is an internal package that is used by @sentry/replay.
-It generates a web worker and converts it to a string, so that we can process it easier in replay.
+This is an internal package that is used by @sentry/replay. It generates a web worker and converts it to a string, so
+that we can process it easier in replay.
 
 By extracting this into a dedicated (private, internal) package, we can streamline the build of replay.
 
@@ -15,4 +15,5 @@ By extracting this into a dedicated (private, internal) package, we can streamli
 
 You can find an example worker for if you want to self-host the compression worker in [/examples](./examples/).
 
-This is generated from the actual soure via `yarn build:examples`, which should be run manually whenever replay-worker is updated.
+This is generated from the actual soure via `yarn build:examples`, which should be run manually whenever replay-worker
+is updated.
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index a88ba5af9237..69d4e448543e 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -52,7 +52,7 @@
     "fflate": "0.8.1"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/replay-worker/rollup.examples.config.js b/packages/replay-worker/rollup.examples.config.js
index b7e4f6e31ae2..853842dd8e3f 100644
--- a/packages/replay-worker/rollup.examples.config.js
+++ b/packages/replay-worker/rollup.examples.config.js
@@ -1,8 +1,8 @@
 import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
+import terser from '@rollup/plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import { defineConfig } from 'rollup';
-import { terser } from 'rollup-plugin-terser';
 
 import { makeLicensePlugin } from '../../rollup/plugins/index.js';
 
diff --git a/packages/replay-worker/rollup.worker.config.mjs b/packages/replay-worker/rollup.worker.config.mjs
index 94df8f3a3be3..48d3f5d41080 100644
--- a/packages/replay-worker/rollup.worker.config.mjs
+++ b/packages/replay-worker/rollup.worker.config.mjs
@@ -2,9 +2,9 @@
 
 import commonjs from '@rollup/plugin-commonjs';
 import resolve from '@rollup/plugin-node-resolve';
+import terser from '@rollup/plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import { defineConfig } from 'rollup';
-import { terser } from 'rollup-plugin-terser';
 
 const config = defineConfig([
   {
diff --git a/packages/replay-worker/tsconfig.json b/packages/replay-worker/tsconfig.json
index 38cb52869a42..dbacce80e01c 100644
--- a/packages/replay-worker/tsconfig.json
+++ b/packages/replay-worker/tsconfig.json
@@ -4,7 +4,7 @@
     "module": "esnext",
     "lib": ["webworker", "scripthost"],
     "esModuleInterop": true,
-    "target": "es6",
+    "target": "es2017",
     "strictPropertyInitialization": false
   },
   "include": ["src/**/*.ts"]
diff --git a/packages/replay/.eslintrc.js b/packages/replay/.eslintrc.js
index 4f69827ac50b..6af926975df0 100644
--- a/packages/replay/.eslintrc.js
+++ b/packages/replay/.eslintrc.js
@@ -8,9 +8,6 @@ module.exports = {
   overrides: [
     {
       files: ['src/**/*.ts'],
-      rules: {
-        '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
-      },
     },
     {
       files: ['jest.setup.ts', 'jest.config.ts'],
diff --git a/packages/replay/CONTRIBUTING.md b/packages/replay/CONTRIBUTING.md
index 829930e2b05e..7b4a70f075ab 100644
--- a/packages/replay/CONTRIBUTING.md
+++ b/packages/replay/CONTRIBUTING.md
@@ -1,4 +1,7 @@
 ## Updating the rrweb dependency
 
-When [updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
-please be aware that [`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204) also needs to be updated.
+When
+[updating the `rrweb` dependency](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/package.json?plain=1#LL55),
+please be aware that
+[`@sentry/replay`'s README.md](https://github.com/getsentry/sentry-javascript/blob/a493aa6a46555b944c8d896a2164bcd8b11caaf5/packages/replay/README.md?plain=1#LL204)
+also needs to be updated.
diff --git a/packages/replay/MIGRATION.md b/packages/replay/MIGRATION.md
index ba6326939970..d61689499d7d 100644
--- a/packages/replay/MIGRATION.md
+++ b/packages/replay/MIGRATION.md
@@ -1,9 +1,10 @@
 # End of Replay Beta
 
-Sentry Replay is now out of Beta. This means that the usual stability guarantees apply.
+> For further migration changes please refer to the [general SDK migration notes](../../MIGRATION.md).
 
-Because of experimentation and rapid iteration, during the Beta period some bugs and problems came up which have since been fixed/improved.
-We **strongly** recommend anyone using Replay in a version before 7.39.0 to update to 7.39.0 or newer, in order to prevent running Replay with known problems that have since been fixed.
+Because of experimentation and rapid iteration, during the Beta period some bugs and problems came up which have since
+been fixed/improved. We **strongly** recommend anyone using Replay in a version before 7.39.0 to update to 7.39.0 or
+newer, in order to prevent running Replay with known problems that have since been fixed.
 
 Below you can find a list of relevant replay issues that have been resolved until 7.39.0:
 
@@ -33,7 +34,7 @@ Below you can find a list of relevant replay issues that have been resolved unti
 - Handle removed attributes ([#65](https://github.com/getsentry/rrweb/pull/65))
 - Change LCP calculation (#7187, #7225)
 - Fix debounced flushes not respecting `maxWait` (#7207, #7208)
-- Fix svgs not getting unblocked  (#7132)
+- Fix svgs not getting unblocked (#7132)
 - Fix missing fetch/xhr requests (#7134)
 - Fix feature detection of PerformanceObserver (#7029)
 - Fix `checkoutEveryNms` (#6722)
@@ -44,14 +45,18 @@ Below you can find a list of relevant replay issues that have been resolved unti
 
 # Upgrading Replay from 7.34.0 to 7.35.0 - #6645
 
-This release will remove the ability to change the default rrweb recording options (outside of privacy options). The following are the new configuration values all replays will use:
-`slimDOMOptions: 'all'` - Removes `script`, comments, `favicon`, whitespace in `head`, and a few `meta` tags in `head`
-`recordCanvas: false` - This option did not do anything as playback of recorded canvas means we would have to remove the playback sandbox (which is a security concern).
-`inlineStylesheet: true` - Inlines styles into the recording itself instead of attempting to fetch it remotely. This means that styles in the replay will reflect the styles at the time of recording and not the current styles of the remote stylesheet.
-`collectFonts: true` - Attempts to load custom fonts.
-`inlineImages: false` - Does not inline images to recording and instead loads the asset remotely. During playback, images may not load due to CORS (add sentry.io as an origin).
+This release will remove the ability to change the default rrweb recording options (outside of privacy options). The
+following are the new configuration values all replays will use: `slimDOMOptions: 'all'` - Removes `script`, comments,
+`favicon`, whitespace in `head`, and a few `meta` tags in `head` `recordCanvas: false` - This option did not do anything
+as playback of recorded canvas means we would have to remove the playback sandbox (which is a security concern).
+`inlineStylesheet: true` - Inlines styles into the recording itself instead of attempting to fetch it remotely. This
+means that styles in the replay will reflect the styles at the time of recording and not the current styles of the
+remote stylesheet. `collectFonts: true` - Attempts to load custom fonts. `inlineImages: false` - Does not inline images
+to recording and instead loads the asset remotely. During playback, images may not load due to CORS (add sentry.io as an
+origin).
 
-Additionally, we have streamlined the privacy options. The following table lists the deprecated value, and what it is replaced by:
+Additionally, we have streamlined the privacy options. The following table lists the deprecated value, and what it is
+replaced by:
 
 | deprecated key   | replaced by | description                                                                                                                                      |
 | ---------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -64,17 +69,17 @@ Additionally, we have streamlined the privacy options. The following table lists
 
 # Upgrading Replay from 7.31.0 to 7.32.0
 
-In 7.32.0, we have removed the default values for the replay sample rates.
-Previously, they were:
+In 7.32.0, we have removed the default values for the replay sample rates. Previously, they were:
 
-* `replaysSessionSampleRate: 0.1`
-* `replaysOnErrorSampleRate: 1.0`
+- `replaysSessionSampleRate: 0.1`
+- `replaysOnErrorSampleRate: 1.0`
 
 Now, you have to explicitly set the sample rates, otherwise they default to 0.
 
 # Upgrading Replay from 0.6.x to 7.24.0
 
-The Sentry Replay integration was moved to the Sentry JavaScript SDK monorepo. Hence we're jumping from version 0.x to the monorepo's 7.x version which is shared across all JS SDK packages.
+The Sentry Replay integration was moved to the Sentry JavaScript SDK monorepo. Hence we're jumping from version 0.x to
+the monorepo's 7.x version which is shared across all JS SDK packages.
 
 ## Replay sample rates are defined on top level (https://github.com/getsentry/sentry-javascript/issues/6351)
 
@@ -87,7 +92,7 @@ Sentry.init({
     new Replay({
       sessionSampleRate: 0.1,
       errorSampleRate: 1.0,
-    })
+    }),
   ],
   // ...
 });
@@ -103,23 +108,25 @@ Sentry.init({
   integrations: [
     new Replay({
       // other replay config still goes in here
-    })
+    }),
   ],
 });
 ```
 
-Note that the sample rate options inside of `new Replay({})` have been deprecated and will be removed in a future update.
+Note that the sample rate options inside of `new Replay({})` have been deprecated and will be removed in a future
+update.
 
 ## Removed deprecated options (https://github.com/getsentry/sentry-javascript/pull/6370)
 
 Two options, which have been deprecated for some time, have been removed:
 
-* `replaysSamplingRate` - instead use `sessionSampleRate`
-* `captureOnlyOnError` - instead use `errorSampleRate`
+- `replaysSamplingRate` - instead use `sessionSampleRate`
+- `captureOnlyOnError` - instead use `errorSampleRate`
 
 ## New NPM package structure (https://github.com/getsentry/sentry-javascript/issues/6280)
 
-The internal structure of the npm package has changed. This is unlikely to affect you, unless you have imported something from e.g.:
+The internal structure of the npm package has changed. This is unlikely to affect you, unless you have imported
+something from e.g.:
 
 ```js
 import something from '@sentry/replay/submodule';
@@ -134,8 +141,8 @@ Unless you manually imported this and used it somewhere in your codebase, this w
 
 ## Session object is now a plain object (https://github.com/getsentry/sentry-javascript/pull/6417)
 
-The `Session` object exported from Replay is now a plain object, instead of a class.
-This should not affect you unless you specifically accessed this class & did custom things with it.
+The `Session` object exported from Replay is now a plain object, instead of a class. This should not affect you unless
+you specifically accessed this class & did custom things with it.
 
 ## Reduce public API of Replay integration (https://github.com/getsentry/sentry-javascript/pull/6407)
 
diff --git a/packages/replay/README.md b/packages/replay/README.md
index e87aa7861b94..2583065c9787 100644
--- a/packages/replay/README.md
+++ b/packages/replay/README.md
@@ -16,15 +16,15 @@
 
 ## Installation
 
-Replay can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or `@sentry/vue`.
-You don't need to install anything in order to use Session Replay. The minimum version that includes Replay is 7.27.0.
+Replay can be imported from `@sentry/browser`, or a respective SDK package like `@sentry/react` or `@sentry/vue`. You
+don't need to install anything in order to use Session Replay. The minimum version that includes Replay is 7.27.0.
 
 For details on using Replay when using Sentry via the CDN bundles, see [CDN bundle](#loading-replay-as-a-cdn-bundle).
 
 ## Setup
 
-To set up the integration, add the following to your Sentry initialization. Several options are supported and passable via the integration constructor.
-See the [configuration section](#configuration) below for more details.
+To set up the integration, add the following to your Sentry initialization. Several options are supported and passable
+via the integration constructor. See the [configuration section](#configuration) below for more details.
 
 ```javascript
 import * as Sentry from '@sentry/browser';
@@ -42,12 +42,12 @@ Sentry.init({
   replaysOnErrorSampleRate: 1.0,
 
   integrations: [
-    new Sentry.Replay({
+    Sentry.replayIntegration({
       // Additional SDK configuration goes in here, for example:
       maskAllText: true,
-      blockAllMedia: true
+      blockAllMedia: true,
       // See below for all available options
-    })
+    }),
   ],
   // ...
 });
@@ -55,9 +55,8 @@ Sentry.init({
 
 ### Lazy loading Replay
 
-Replay will start automatically when you add the integration.
-If you do not want to start Replay immediately (e.g. if you want to lazy-load it),
-you can also use `addIntegration` to load it later:
+Replay will start automatically when you add the integration. If you do not want to start Replay immediately (e.g. if
+you want to lazy-load it), you can also use `addIntegration` to load it later:
 
 ```js
 import * as Sentry from "@sentry/react";
@@ -73,28 +72,31 @@ const { Replay } = await import('@sentry/browser');
 const client = Sentry.getCurrentHub().getClient<BrowserClient>();
 
 // Client can be undefined
-client?.addIntegration(new Replay());
+client?.addIntegration(Sentry.replayIntegration());
 ```
 
 ### Identifying Users
 
-If you have only followed the above instructions to setup session replays, you will only see IP addresses in Sentry's UI. In order to associate a user identity to a session replay, use [`setUser`](https://docs.sentry.io/platforms/javascript/enriching-events/identify-user/).
+If you have only followed the above instructions to setup session replays, you will only see IP addresses in Sentry's
+UI. In order to associate a user identity to a session replay, use
+[`setUser`](https://docs.sentry.io/platforms/javascript/enriching-events/identify-user/).
 
 ```javascript
-import * as Sentry from "@sentry/browser";
+import * as Sentry from '@sentry/browser';
 
-Sentry.setUser({ email: "jane.doe@example.com" });
+Sentry.setUser({ email: 'jane.doe@example.com' });
 ```
 
 ### Stopping & starting Replays manually
 
-Replay recording only starts when it is included in the `integrations` array when calling `Sentry.init` or calling `addIntegration` from the a Sentry client instance. To stop recording you can call `stop()`.
+Replay recording only starts when it is included in the `integrations` array when calling `Sentry.init` or calling
+`addIntegration` from the a Sentry client instance. To stop recording you can call `stop()`.
 
 ```js
 import * as Sentry from "@sentry/react";
 import { BrowserClient } from "@sentry/browser";
 
-const replay = new Replay();
+const replay = Sentry.replayIntegration();
 
 Sentry.init({
   integrations: [replay]
@@ -109,20 +111,19 @@ client?.addIntegration(replay);
 replay.stop();
 ```
 
-When both `replaysSessionSampleRate` and `replaysOnErrorSampleRate` are `0`, recording will _not_ start.
-In this case, you can manually start recording:
+When both `replaysSessionSampleRate` and `replaysOnErrorSampleRate` are `0`, recording will _not_ start. In this case,
+you can manually start recording:
 
 ```js
 replay.start(); // Will start a session in "session" mode, regardless of sample rates
 replay.startBuffering(); // Will start a session in "buffer" mode, regardless of sample rates
 ```
 
-
-
 ## Loading Replay as a CDN Bundle
 
-As an alternative to the NPM package, you can use Replay as a CDN bundle.
-Please refer to the [Session Replay installation guide](https://docs.sentry.io/platforms/javascript/session-replay/#install) for CDN bundle instructions.
+As an alternative to the NPM package, you can use Replay as a CDN bundle. Please refer to the
+[Session Replay installation guide](https://docs.sentry.io/platforms/javascript/session-replay/#install) for CDN bundle
+instructions.
 
 <details>
 <summary>Deprecated Replay integration bundle</summary>
@@ -131,44 +132,47 @@ complete CDN bundles that already contain the replay integration. No need to kee
 The `replay.(min.)js` bundle will be removed in v8 of the JS SDKs.
 
 ```html
-<script
-  src="https://browser.sentry-cdn.com/7.41.0/bundle.min.js"
-  crossorigin="anonymous"
-></script>
-<script
-  src="https://browser.sentry-cdn.com/7.41.0/replay.min.js"
-  crossorigin="anonymous"
-></script>
+<script src="https://browser.sentry-cdn.com/7.41.0/bundle.min.js" crossorigin="anonymous"></script>
+<script src="https://browser.sentry-cdn.com/7.41.0/replay.min.js" crossorigin="anonymous"></script>
 ```
+
 </details>
 
 ## Sessions
 
-A session starts when the Session Replay SDK is first loaded and initialized. The session will continue until 5 minutes passes without any user interactions[^1] with the application *OR* until a maximum of 30 minutes have elapsed. Closing the browser tab will end the session immediately according to the rules for [SessionStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage).
+A session starts when the Session Replay SDK is first loaded and initialized. The session will continue until 5 minutes
+passes without any user interactions[^1] with the application _OR_ until a maximum of 30 minutes have elapsed. Closing
+the browser tab will end the session immediately according to the rules for
+[SessionStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage).
 
 [^1]: An 'interaction' refers to either a mouse click or a browser navigation event.
 
 ### Accessing the Replay Session ID
 
-You can get the ID of the currently running session via `replay.getReplayId()`.
-This will return `undefined` if no session is ongoing.
+You can get the ID of the currently running session via `replay.getReplayId()`. This will return `undefined` if no
+session is ongoing.
 
 ### Replay Captures Only on Errors
 
-Alternatively, rather than recording an entire session, you can capture a replay only when an error occurs. In this case, the integration will buffer up to one minute worth of events prior to the error being thrown. It will continue to record the session following the rules above regarding session life and activity. Read the [sampling](#Sampling) section for configuration options.
+Alternatively, rather than recording an entire session, you can capture a replay only when an error occurs. In this
+case, the integration will buffer up to one minute worth of events prior to the error being thrown. It will continue to
+record the session following the rules above regarding session life and activity. Read the [sampling](#Sampling) section
+for configuration options.
 
 ## Sampling
 
-Sampling allows you to control how much of your website's traffic will result in a Session Replay. There are two sample rates you can adjust to get the replays more relevant to your interests:
+Sampling allows you to control how much of your website's traffic will result in a Session Replay. There are two sample
+rates you can adjust to get the replays more relevant to your interests:
 
-- `replaysSessionSampleRate` - The sample rate for replays that begin recording immediately and last the entirety of the user's session.
-- `replaysOnErrorSampleRate` - The sample rate for replays that are recorded when an error happens. This type of replay will record up to a minute of events prior to the error and continue recording until the session ends.
+- `replaysSessionSampleRate` - The sample rate for replays that begin recording immediately and last the entirety of the
+  user's session.
+- `replaysOnErrorSampleRate` - The sample rate for replays that are recorded when an error happens. This type of replay
+  will record up to a minute of events prior to the error and continue recording until the session ends.
 
-When Replay is initialized, we check the `replaysSessionSampleRate`.
-If it is sampled, then we start recording & sending Replay data immediately.
-Else, if `replaysOnErrorSampleRate > 0`, we'll start recording in buffering mode.
-In this mode, whenever an error occurs we'll check `replaysOnErrorSampleRate`.
-If it is sampled, when we'll upload the Replay to Sentry and continue recording normally.
+When Replay is initialized, we check the `replaysSessionSampleRate`. If it is sampled, then we start recording & sending
+Replay data immediately. Else, if `replaysOnErrorSampleRate > 0`, we'll start recording in buffering mode. In this mode,
+whenever an error occurs we'll check `replaysOnErrorSampleRate`. If it is sampled, when we'll upload the Replay to
+Sentry and continue recording normally.
 
 ## Configuration
 
@@ -176,76 +180,87 @@ If it is sampled, when we'll upload the Replay to Sentry and continue recording
 
 The following options can be configured on the root level of your browser-based Sentry SDK, in `init({})`:
 
-
-| key                 | type    | default | description                                                                                                                                                                                                                     |
-| ------------------- | ------- | ------- | -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------   |
-| replaysSessionSampleRate   | number  | `0`   | The sample rate for replays that begin recording immediately and last the entirety of the user's session. 1.0 will collect all replays, 0 will collect no replays.                                           |
-| replaysOnErrorSampleRate     | number  | `0`   |The sample rate for replays that are recorded when an error happens. This type of replay will record up to a minute of events prior to the error and continue recording until the session ends. 1.0 capturing all sessions with an error, and 0 capturing none.
+| key                      | type   | default | description                                                                                                                                                                                                                                                     |
+| ------------------------ | ------ | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| replaysSessionSampleRate | number | `0`     | The sample rate for replays that begin recording immediately and last the entirety of the user's session. 1.0 will collect all replays, 0 will collect no replays.                                                                                              |
+| replaysOnErrorSampleRate | number | `0`     | The sample rate for replays that are recorded when an error happens. This type of replay will record up to a minute of events prior to the error and continue recording until the session ends. 1.0 capturing all sessions with an error, and 0 capturing none. |
 
 ### General Integration Configuration
 
-The following options can be configured as options to the integration, in `new Replay({})`:
-
-| key                 | type    | default | description                                                                                                                                                                                                                     |
-| ------------------- | ------- | ------- | -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------   |
-| stickySession       | boolean | `true`  | Keep track of the user across page loads. Note a single user using multiple tabs will result in multiple sessions. Closing a tab will result in the session being closed as well.                                               |
+The following options can be configured as options to the integration, in `Sentry.replayIntegration({})`:
 
+| key           | type    | default | description                                                                                                                                                                       |
+| ------------- | ------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| stickySession | boolean | `true`  | Keep track of the user across page loads. Note a single user using multiple tabs will result in multiple sessions. Closing a tab will result in the session being closed as well. |
 
 ### Privacy Configuration
 
-The following options can be configured as options to the integration, in `new Replay({})`:
+The following options can be configured as options to the integration, in `Sentry.replayIntegration({})`:
 
-| key              | type                     | default                                 | description                                                                                                                                  |
-| ---------------- | ------------------------ | --------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
-| maskAllText      | boolean                  | `true`                                  | Mask _all_ text content. Will pass text content through `maskFn` before sending to server.                                                   |
-| maskAllInputs    | boolean                  | `true`                                  | Mask values of `<input>` elements. Passes input values through `maskInputFn` before sending to server.                                       |
-| blockAllMedia    | boolean                  | `true`                                  | Block _all_ media elements (`img, svg, video, object, picture, embed, map, audio`)                                                           |
-| maskFn           | (text: string) => string | `(text) => '*'.repeat(text.length)`     | Function to customize how text content is masked before sending to server. By default, masks text with `*`.                                  |
-| block            | Array<string>            | `.sentry-block, [data-sentry-block]`    | Redact any elements that match the DOM selectors. See [privacy](#blocking) section for an example.                                           |
-| unblock          | Array<string>            | `.sentry-unblock, [data-sentry-unblock]`| Do not redact any elements that match the DOM selectors. Useful when using `blockAllMedia`. See [privacy](#blocking) section for an example. |
-| mask             | Array<string>            | `.sentry-mask, [data-sentry-mask]`      | Mask all elements that match the given DOM selectors. See [privacy](#masking) section for an example.                                        |
-| unmask           | Array<string>            | `.sentry-unmask, [data-sentry-unmask]`  | Unmask all elements that match the given DOM selectors. Useful when using `maskAllText`. See [privacy](#masking) section for an example.     |
-| ignore           | Array<string>            | `.sentry-ignore, [data-sentry-ignore]`  | Ignores all events on the matching input fields. See [privacy](#ignoring) section for an example.                                            |
+| key           | type                     | default                                | description                                                                                                                                  |
+| ------------- | ------------------------ | -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
+| maskAllText   | boolean                  | `true`                                 | Mask _all_ text content. Will pass text content through `maskFn` before sending to server.                                                   |
+| maskAllInputs | boolean                  | `true`                                 | Mask values of `<input>` elements. Passes input values through `maskInputFn` before sending to server.                                       |
+| blockAllMedia | boolean                  | `true`                                 | Block _all_ media elements (`img, svg, video, object, picture, embed, map, audio`)                                                           |
+| maskFn        | (text: string) => string | `(text) => '*'.repeat(text.length)`    | Function to customize how text content is masked before sending to server. By default, masks text with `*`.                                  |
+| block         | Array<string>            | `.sentry-block, [data-sentry-block]`   | Redact any elements that match the DOM selectors. See [privacy](#blocking) section for an example.                                           |
+| unblock       | Array<string>            | []                                     | Do not redact any elements that match the DOM selectors. Useful when using `blockAllMedia`. See [privacy](#blocking) section for an example. |
+| mask          | Array<string>            | `.sentry-mask, [data-sentry-mask]`     | Mask all elements that match the given DOM selectors. See [privacy](#masking) section for an example.                                        |
+| unmask        | Array<string>            | []                                     | Unmask all elements that match the given DOM selectors. Useful when using `maskAllText`. See [privacy](#masking) section for an example.     |
+| ignore        | Array<string>            | `.sentry-ignore, [data-sentry-ignore]` | Ignores all events on the matching input fields. See [privacy](#ignoring) section for an example.                                            |
 
 #### Deprecated options
-In order to streamline our privacy options, the following have been deprecated in favor for the respective options above.
-
-| deprecated key   | replaced by | description |
-| ---------------- | ----------- | ----------- |
-| maskInputOptions | mask        | Use CSS selectors in `mask` in order to mask all inputs of a certain type. For example, `input[type="address"]` |
-| blockSelector    | block       | The selector(s) can be moved directly in the `block` array. |
-| blockClass       | block       | Convert the class name to a CSS selector and add to `block` array. For example, `first-name` becomes `.first-name`. Regexes can be moved as-is. |
-| maskClass        | mask        | Convert the class name to a CSS selector and add to `mask` array. For example, `first-name` becomes `.first-name`. Regexes can be moved as-is. |
-| maskSelector     | mask        | The selector(s) can be moved directly in the `mask` array. |
+
+In order to streamline our privacy options, the following have been deprecated in favor for the respective options
+above.
+
+| deprecated key   | replaced by | description                                                                                                                                      |
+| ---------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| maskInputOptions | mask        | Use CSS selectors in `mask` in order to mask all inputs of a certain type. For example, `input[type="address"]`                                  |
+| blockSelector    | block       | The selector(s) can be moved directly in the `block` array.                                                                                      |
+| blockClass       | block       | Convert the class name to a CSS selector and add to `block` array. For example, `first-name` becomes `.first-name`. Regexes can be moved as-is.  |
+| maskClass        | mask        | Convert the class name to a CSS selector and add to `mask` array. For example, `first-name` becomes `.first-name`. Regexes can be moved as-is.   |
+| maskSelector     | mask        | The selector(s) can be moved directly in the `mask` array.                                                                                       |
 | ignoreClass      | ignore      | Convert the class name to a CSS selector and add to `ignore` array. For example, `first-name` becomes `.first-name`. Regexes can be moved as-is. |
 
 ## Privacy
-There are several ways to deal with PII. By default, the integration will mask all text content with `*` and block all media elements (`img, svg, video, object, picture, embed, map, audio`). This can be disabled by setting `maskAllText` to `false`. It is also possible to add the following CSS classes to specific DOM elements to prevent recording its contents: `sentry-block`, `sentry-ignore`, and `sentry-mask`. The following sections will show examples of how content is handled by the differing methods.
+
+There are several ways to deal with PII. By default, the integration will mask all text content with `*` and block all
+media elements (`img, svg, video, object, picture, embed, map, audio`). This can be disabled by setting `maskAllText` to
+`false`. It is also possible to add the following CSS classes to specific DOM elements to prevent recording its
+contents: `sentry-block`, `sentry-ignore`, and `sentry-mask`. The following sections will show examples of how content
+is handled by the differing methods.
 
 ### Masking
-Masking replaces the text content with something else. The default masking behavior is to replace each character with a `*`. In this example the relevant html code is: `<table class="sentry-mask">...</table>`.
+
+Masking replaces the text content with something else. The default masking behavior is to replace each character with a
+`*`. In this example the relevant html code is: `<table class="sentry-mask">...</table>`.
 ![Masking example](https://user-images.githubusercontent.com/79684/193118192-dee1d3d8-5813-47e8-b532-f9ee1c8714b3.png)
 
 ### Blocking
-Blocking replaces the element with a placeholder that has the same dimensions. The recording will show an empty space where the content was. In this example the relevant html code is: `<table data-sentry-block>...</table>`.
+
+Blocking replaces the element with a placeholder that has the same dimensions. The recording will show an empty space
+where the content was. In this example the relevant html code is: `<table data-sentry-block>...</table>`.
 ![Blocking example](https://user-images.githubusercontent.com/79684/193118084-51a589fc-2160-476a-a8dc-b681eddb136c.png)
 
 ### Ignoring
-Ignoring only applies to form inputs. Events will be ignored on the input element so that the replay does not show what occurs inside of the input. In the below example, notice how the results in the table below the input changes, but no text is visible in the input.
+
+Ignoring only applies to form inputs. Events will be ignored on the input element so that the replay does not show what
+occurs inside of the input. In the below example, notice how the results in the table below the input changes, but no
+text is visible in the input.
 
 https://user-images.githubusercontent.com/79684/192815134-a6451c3f-d3cb-455f-a699-7c3fe04d0a2e.mov
 
 ## Error Linking
 
-Currently, errors that happen on the page while a replay is running are linked to the Replay,
-making it as easy as possible to jump between related issues/replays.
-However, please note that it is _possible_ that the error count reported on the Replay Detail page
-does not match the actual errors that have been captured.
-The reason for that is that errors _can_ be lost, e.g. a network request fails, or similar.
-This should not happen to often, but be aware that it is theoretically possible.
+Currently, errors that happen on the page while a replay is running are linked to the Replay, making it as easy as
+possible to jump between related issues/replays. However, please note that it is _possible_ that the error count
+reported on the Replay Detail page does not match the actual errors that have been captured. The reason for that is that
+errors _can_ be lost, e.g. a network request fails, or similar. This should not happen to often, but be aware that it is
+theoretically possible.
 
 ## Manually sending replay data
 
-You can use `replay.flush()` to immediately send all currently captured replay data.
-When Replay is currently in buffering mode, this will send up to the last 60 seconds of replay data,
-and also continue sending afterwards, similar to when an error happens & is recorded.
+You can use `replay.flush()` to immediately send all currently captured replay data. When Replay is currently in
+buffering mode, this will send up to the last 60 seconds of replay data, and also continue sending afterwards, similar
+to when an error happens & is recorded.
diff --git a/packages/replay/package.json b/packages/replay/package.json
index 408c525021fa..e84da910e56f 100644
--- a/packages/replay/package.json
+++ b/packages/replay/package.json
@@ -5,6 +5,19 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
+      "require": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
@@ -66,7 +79,7 @@
     "@sentry/utils": "8.0.0-alpha.2"
   },
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/replay/rollup.bundle.config.mjs b/packages/replay/rollup.bundle.config.mjs
index a209b8d41af4..8bdc41f8001c 100644
--- a/packages/replay/rollup.bundle.config.mjs
+++ b/packages/replay/rollup.bundle.config.mjs
@@ -3,7 +3,6 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal
 const baseBundleConfig = makeBaseBundleConfig({
   bundleType: 'addon',
   entrypoints: ['src/index.ts'],
-  jsVersion: 'es6',
   licenseTitle: '@sentry/replay',
   outputFileBase: () => 'bundles/replay',
 });
diff --git a/packages/replay/src/index.ts b/packages/replay/src/index.ts
index d16fd7733c20..e57ca98915a3 100644
--- a/packages/replay/src/index.ts
+++ b/packages/replay/src/index.ts
@@ -1,8 +1,4 @@
-export {
-  // eslint-disable-next-line deprecation/deprecation
-  Replay,
-  replayIntegration,
-} from './integration';
+export { replayIntegration } from './integration';
 
 export type {
   ReplayConfiguration,
diff --git a/packages/replay/src/integration.ts b/packages/replay/src/integration.ts
index c52cccd51dd2..dca865c50590 100644
--- a/packages/replay/src/integration.ts
+++ b/packages/replay/src/integration.ts
@@ -11,6 +11,7 @@ import {
 } from './constants';
 import { ReplayContainer } from './replay';
 import type {
+  InitialReplayPluginOptions,
   RecordingOptions,
   ReplayCanvasIntegrationOptions,
   ReplayConfiguration,
@@ -27,17 +28,29 @@ const DEFAULT_NETWORK_HEADERS = ['content-length', 'content-type', 'accept'];
 
 let _initialized = false;
 
-type InitialReplayPluginOptions = Omit<ReplayPluginOptions, 'sessionSampleRate' | 'errorSampleRate'> &
-  Partial<Pick<ReplayPluginOptions, 'sessionSampleRate' | 'errorSampleRate'>>;
-
+/**
+ * Sentry integration for [Session Replay](https://sentry.io/for/session-replay/).
+ *
+ * See the [Replay documentation](https://docs.sentry.io/platforms/javascript/guides/session-replay/) for more information.
+ *
+ * @example
+ *
+ * ```
+ * Sentry.init({
+ *   dsn: '__DSN__',
+ *   integrations: [Sentry.replayIntegration()],
+ * });
+ * ```
+ */
 export const replayIntegration = ((options?: ReplayConfiguration) => {
-  // eslint-disable-next-line deprecation/deprecation
   return new Replay(options);
 }) satisfies IntegrationFn;
 
 /**
- * The main replay integration class, to be passed to `init({  integrations: [] })`.
- * @deprecated Use `replayIntegration()` instead.
+ * Replay integration
+ *
+ * TODO: Rewrite this to be functional integration
+ * Exported for tests.
  */
 export class Replay implements Integration {
   /**
@@ -75,8 +88,6 @@ export class Replay implements Integration {
     useCompression = true,
     workerUrl,
     _experiments = {},
-    sessionSampleRate,
-    errorSampleRate,
     maskAllText = true,
     maskAllInputs = true,
     blockAllMedia = true,
@@ -117,7 +128,6 @@ export class Replay implements Integration {
     // eslint-disable-next-line deprecation/deprecation
     ignoreClass,
   }: ReplayConfiguration = {}) {
-    // eslint-disable-next-line deprecation/deprecation
     this.name = Replay.id;
 
     const privacyOptions = getPrivacyOptions({
@@ -175,8 +185,6 @@ export class Replay implements Integration {
       minReplayDuration: Math.min(minReplayDuration, MIN_REPLAY_DURATION_LIMIT),
       maxReplayDuration: Math.min(maxReplayDuration, MAX_REPLAY_DURATION),
       stickySession,
-      sessionSampleRate,
-      errorSampleRate,
       useCompression,
       workerUrl,
       blockAllMedia,
@@ -197,30 +205,6 @@ export class Replay implements Integration {
       _experiments,
     };
 
-    if (typeof sessionSampleRate === 'number') {
-      // eslint-disable-next-line
-      console.warn(
-        `[Replay] You are passing \`sessionSampleRate\` to the Replay integration.
-This option is deprecated and will be removed soon.
-Instead, configure \`replaysSessionSampleRate\` directly in the SDK init options, e.g.:
-Sentry.init({ replaysSessionSampleRate: ${sessionSampleRate} })`,
-      );
-
-      this._initialOptions.sessionSampleRate = sessionSampleRate;
-    }
-
-    if (typeof errorSampleRate === 'number') {
-      // eslint-disable-next-line
-      console.warn(
-        `[Replay] You are passing \`errorSampleRate\` to the Replay integration.
-This option is deprecated and will be removed soon.
-Instead, configure \`replaysOnErrorSampleRate\` directly in the SDK init options, e.g.:
-Sentry.init({ replaysOnErrorSampleRate: ${errorSampleRate} })`,
-      );
-
-      this._initialOptions.errorSampleRate = errorSampleRate;
-    }
-
     if (this._initialOptions.blockAllMedia) {
       // `blockAllMedia` is a more user friendly option to configure blocking
       // embedded media elements
@@ -387,7 +371,11 @@ function loadReplayOptionsFromClient(initialOptions: InitialReplayPluginOptions)
   const client = getClient();
   const opt = client && (client.getOptions() as BrowserClientReplayOptions);
 
-  const finalOptions = { sessionSampleRate: 0, errorSampleRate: 0, ...dropUndefinedKeys(initialOptions) };
+  const finalOptions: ReplayPluginOptions = {
+    sessionSampleRate: 0,
+    errorSampleRate: 0,
+    ...dropUndefinedKeys(initialOptions),
+  };
 
   if (!opt) {
     consoleSandbox(() => {
@@ -397,12 +385,7 @@ function loadReplayOptionsFromClient(initialOptions: InitialReplayPluginOptions)
     return finalOptions;
   }
 
-  if (
-    initialOptions.sessionSampleRate == null && // TODO remove once deprecated rates are removed
-    initialOptions.errorSampleRate == null && // TODO remove once deprecated rates are removed
-    opt.replaysSessionSampleRate == null &&
-    opt.replaysOnErrorSampleRate == null
-  ) {
+  if (opt.replaysSessionSampleRate == null && opt.replaysOnErrorSampleRate == null) {
     consoleSandbox(() => {
       // eslint-disable-next-line no-console
       console.warn(
diff --git a/packages/replay/src/replay.ts b/packages/replay/src/replay.ts
index 30ccda422544..6588a9e4d79d 100644
--- a/packages/replay/src/replay.ts
+++ b/packages/replay/src/replay.ts
@@ -3,11 +3,12 @@ import { EventType, record } from '@sentry-internal/rrweb';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   captureException,
+  getActiveSpan,
   getClient,
-  getCurrentScope,
+  getRootSpan,
   spanToJSON,
 } from '@sentry/core';
-import type { ReplayRecordingMode, Transaction } from '@sentry/types';
+import type { ReplayRecordingMode, Span } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
 import {
@@ -87,10 +88,10 @@ export class ReplayContainer implements ReplayContainerInterface {
   public recordingMode: ReplayRecordingMode;
 
   /**
-   * The current or last active transcation.
+   * The current or last active span.
    * This is only available when performance is enabled.
    */
-  public lastTransaction?: Transaction;
+  public lastActiveSpan?: Span;
 
   /**
    * These are here so we can overwrite them in tests etc.
@@ -720,16 +721,16 @@ export class ReplayContainer implements ReplayContainerInterface {
    * This is only available if performance is enabled, and if an instrumented router is used.
    */
   public getCurrentRoute(): string | undefined {
-    // eslint-disable-next-line deprecation/deprecation
-    const lastTransaction = this.lastTransaction || getCurrentScope().getTransaction();
+    const lastActiveSpan = this.lastActiveSpan || getActiveSpan();
+    const lastRootSpan = lastActiveSpan && getRootSpan(lastActiveSpan);
 
-    const attributes = (lastTransaction && spanToJSON(lastTransaction).data) || {};
+    const attributes = (lastRootSpan && spanToJSON(lastRootSpan).data) || {};
     const source = attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
-    if (!lastTransaction || !source || !['route', 'custom'].includes(source)) {
+    if (!lastRootSpan || !source || !['route', 'custom'].includes(source)) {
       return undefined;
     }
 
-    return spanToJSON(lastTransaction).description;
+    return spanToJSON(lastRootSpan).description;
   }
 
   /**
diff --git a/packages/replay/src/types/replay.ts b/packages/replay/src/types/replay.ts
index 61325e4a9959..8f63c4e4b5f2 100644
--- a/packages/replay/src/types/replay.ts
+++ b/packages/replay/src/types/replay.ts
@@ -6,7 +6,7 @@ import type {
   ReplayRecordingData,
   ReplayRecordingMode,
   SentryWrappedXMLHttpRequest,
-  Transaction,
+  Span,
   XhrBreadcrumbHint,
 } from '@sentry/types';
 
@@ -235,6 +235,20 @@ export interface ReplayPluginOptions extends ReplayNetworkOptions {
   }>;
 }
 
+/**
+ * The options that can be set in the plugin options. `sessionSampleRate` and `errorSampleRate` are added
+ * in the root level of the SDK options as `replaysSessionSampleRate` and `replaysOnErrorSampleRate`.
+ */
+export type InitialReplayPluginOptions = Omit<ReplayPluginOptions, 'sessionSampleRate' | 'errorSampleRate'>;
+
+// These are optional for ReplayPluginOptions because the plugin sets default values
+type OptionalReplayPluginOptions = Partial<InitialReplayPluginOptions> & {
+  /**
+   * Mask element attributes that are contained in list
+   */
+  maskAttributes?: string[];
+};
+
 /**
  * Session options that are configurable by the integration configuration
  */
@@ -280,14 +294,6 @@ export interface ReplayIntegrationPrivacyOptions {
   maskFn?: (s: string) => string;
 }
 
-// These are optional for ReplayPluginOptions because the plugin sets default values
-type OptionalReplayPluginOptions = Partial<ReplayPluginOptions> & {
-  /**
-   * Mask element attributes that are contained in list
-   */
-  maskAttributes?: string[];
-};
-
 export interface DeprecatedPrivacyOptions {
   /**
    * @deprecated Use `block` which accepts an array of CSS selectors
@@ -478,7 +484,7 @@ export interface ReplayContainer {
   session: Session | undefined;
   recordingMode: ReplayRecordingMode;
   timeouts: Timeouts;
-  lastTransaction?: Transaction;
+  lastActiveSpan?: Span;
   throttledAddEvent: (
     event: RecordingEvent,
     isCheckout?: boolean,
diff --git a/packages/replay/src/util/addGlobalListeners.ts b/packages/replay/src/util/addGlobalListeners.ts
index a5900fdea696..164b054ba2ac 100644
--- a/packages/replay/src/util/addGlobalListeners.ts
+++ b/packages/replay/src/util/addGlobalListeners.ts
@@ -44,14 +44,14 @@ export function addGlobalListeners(replay: ReplayContainer): void {
       }
     });
 
-    client.on('startTransaction', transaction => {
-      replay.lastTransaction = transaction;
+    client.on('spanStart', span => {
+      replay.lastActiveSpan = span;
     });
 
-    // We may be missing the initial startTransaction due to timing issues,
+    // We may be missing the initial spanStart due to timing issues,
     // so we capture it on finish again.
-    client.on('finishTransaction', transaction => {
-      replay.lastTransaction = transaction;
+    client.on('spanEnd', span => {
+      replay.lastActiveSpan = span;
     });
 
     // We want to flush replay
diff --git a/packages/replay/src/util/getPrivacyOptions.ts b/packages/replay/src/util/getPrivacyOptions.ts
index 7d0584b7ba7b..495ab01df83a 100644
--- a/packages/replay/src/util/getPrivacyOptions.ts
+++ b/packages/replay/src/util/getPrivacyOptions.ts
@@ -74,7 +74,7 @@ export function getPrivacyOptions({
   const defaultBlockedElements = ['base[href="/"]'];
 
   const maskSelector = getOption(mask, ['.sentry-mask', '[data-sentry-mask]'], maskTextClass, maskTextSelector);
-  const unmaskSelector = getOption(unmask, ['.sentry-unmask', '[data-sentry-unmask]']);
+  const unmaskSelector = getOption(unmask, []);
 
   const options: GetPrivacyReturn = {
     // We are making the decision to make text and input selectors the same
@@ -87,7 +87,7 @@ export function getPrivacyOptions({
       blockClass,
       blockSelector,
     ),
-    unblockSelector: getOption(unblock, ['.sentry-unblock', '[data-sentry-unblock]']),
+    unblockSelector: getOption(unblock, []),
     ignoreSelector: getOption(ignore, ['.sentry-ignore', '[data-sentry-ignore]', 'input[type="file"]'], ignoreClass),
   };
 
diff --git a/packages/replay/test/integration/beforeAddRecordingEvent.test.ts b/packages/replay/test/integration/beforeAddRecordingEvent.test.ts
index e8076875386b..c6b14d1f1bb8 100644
--- a/packages/replay/test/integration/beforeAddRecordingEvent.test.ts
+++ b/packages/replay/test/integration/beforeAddRecordingEvent.test.ts
@@ -2,7 +2,7 @@ import * as SentryCore from '@sentry/core';
 import type { Transport } from '@sentry/types';
 import * as SentryUtils from '@sentry/utils';
 
-import type { Replay } from '../../src';
+import type { Replay } from '../../src/integration';
 import type { ReplayContainer } from '../../src/replay';
 import { clearSession } from '../../src/session/clearSession';
 import { createPerformanceEntries } from '../../src/util/createPerformanceEntries';
@@ -23,7 +23,6 @@ type MockTransportSend = jest.MockedFunction<Transport['send']>;
 
 describe('Integration | beforeAddRecordingEvent', () => {
   let replay: ReplayContainer;
-  // eslint-disable-next-line deprecation/deprecation
   let integration: Replay;
   let mockTransportSend: MockTransportSend;
   let mockSendReplayRequest: jest.SpyInstance<any>;
diff --git a/packages/replay/test/integration/integrationSettings.test.ts b/packages/replay/test/integration/integrationSettings.test.ts
index 9f92c9833145..0178f5266ce2 100644
--- a/packages/replay/test/integration/integrationSettings.test.ts
+++ b/packages/replay/test/integration/integrationSettings.test.ts
@@ -42,26 +42,6 @@ describe('Integration | integrationSettings', () => {
       mockConsole.mockRestore();
     });
 
-    it('works with defining settings in integration', async () => {
-      const { replay } = await mockSdk({
-        replayOptions: { sessionSampleRate: 0.5 },
-        sentryOptions: { replaysSessionSampleRate: undefined },
-      });
-
-      expect(replay.getOptions().sessionSampleRate).toBe(0.5);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
-    it('works with defining 0 in integration but logs warnings', async () => {
-      const { replay } = await mockSdk({
-        replayOptions: { sessionSampleRate: 0 },
-        sentryOptions: { replaysSessionSampleRate: undefined },
-      });
-
-      expect(replay.getOptions().sessionSampleRate).toBe(0);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
     it('works with defining settings in SDK', async () => {
       const { replay } = await mockSdk({ sentryOptions: { replaysSessionSampleRate: 0.5 }, replayOptions: {} });
 
@@ -75,26 +55,6 @@ describe('Integration | integrationSettings', () => {
       expect(replay.getOptions().sessionSampleRate).toBe(0);
       expect(mockConsole).toBeCalledTimes(0);
     });
-
-    it('SDK option takes precedence', async () => {
-      const { replay } = await mockSdk({
-        sentryOptions: { replaysSessionSampleRate: 0.5 },
-        replayOptions: { sessionSampleRate: 0.1 },
-      });
-
-      expect(replay.getOptions().sessionSampleRate).toBe(0.5);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
-    it('SDK option takes precedence even when 0', async () => {
-      const { replay } = await mockSdk({
-        sentryOptions: { replaysSessionSampleRate: 0 },
-        replayOptions: { sessionSampleRate: 0.1 },
-      });
-
-      expect(replay.getOptions().sessionSampleRate).toBe(0);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
   });
 
   describe('replaysOnErrorSampleRate', () => {
@@ -108,26 +68,6 @@ describe('Integration | integrationSettings', () => {
       mockConsole.mockRestore();
     });
 
-    it('works with defining settings in integration', async () => {
-      const { replay } = await mockSdk({
-        replayOptions: { errorSampleRate: 0.5 },
-        sentryOptions: { replaysOnErrorSampleRate: undefined },
-      });
-
-      expect(replay.getOptions().errorSampleRate).toBe(0.5);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
-    it('works with defining 0 in integration', async () => {
-      const { replay } = await mockSdk({
-        replayOptions: { errorSampleRate: 0 },
-        sentryOptions: { replaysOnErrorSampleRate: undefined },
-      });
-
-      expect(replay.getOptions().errorSampleRate).toBe(0);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
     it('works with defining settings in SDK', async () => {
       const { replay } = await mockSdk({ sentryOptions: { replaysOnErrorSampleRate: 0.5 }, replayOptions: {} });
 
@@ -141,26 +81,6 @@ describe('Integration | integrationSettings', () => {
       expect(replay.getOptions().errorSampleRate).toBe(0);
       expect(mockConsole).toBeCalledTimes(0);
     });
-
-    it('SDK option takes precedence', async () => {
-      const { replay } = await mockSdk({
-        sentryOptions: { replaysOnErrorSampleRate: 0.5 },
-        replayOptions: { errorSampleRate: 0.1 },
-      });
-
-      expect(replay.getOptions().errorSampleRate).toBe(0.5);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
-
-    it('SDK option takes precedence even when 0', async () => {
-      const { replay } = await mockSdk({
-        sentryOptions: { replaysOnErrorSampleRate: 0 },
-        replayOptions: { errorSampleRate: 0.1 },
-      });
-
-      expect(replay.getOptions().errorSampleRate).toBe(0);
-      expect(mockConsole).toBeCalledTimes(1);
-    });
   });
 
   describe('all sample rates', () => {
diff --git a/packages/replay/test/integration/rrweb.test.ts b/packages/replay/test/integration/rrweb.test.ts
index 82dd18f2d6ec..4423c45246ea 100644
--- a/packages/replay/test/integration/rrweb.test.ts
+++ b/packages/replay/test/integration/rrweb.test.ts
@@ -35,8 +35,8 @@ describe('Integration | rrweb', () => {
         "maskTextSelector": ".sentry-mask,[data-sentry-mask]",
         "onMutation": [Function],
         "slimDOMOptions": "all",
-        "unblockSelector": ".sentry-unblock,[data-sentry-unblock]",
-        "unmaskTextSelector": ".sentry-unmask,[data-sentry-unmask]",
+        "unblockSelector": "",
+        "unmaskTextSelector": "",
       }
     `);
   });
diff --git a/packages/replay/test/integration/stop.test.ts b/packages/replay/test/integration/stop.test.ts
index 75faef8f0d04..d1af26e74776 100644
--- a/packages/replay/test/integration/stop.test.ts
+++ b/packages/replay/test/integration/stop.test.ts
@@ -1,7 +1,7 @@
 import * as SentryUtils from '@sentry/utils';
 
-import type { Replay } from '../../src';
 import { WINDOW } from '../../src/constants';
+import type { Replay } from '../../src/integration';
 import type { ReplayContainer } from '../../src/replay';
 import { clearSession } from '../../src/session/clearSession';
 import { addEvent } from '../../src/util/addEvent';
@@ -17,7 +17,6 @@ type MockRunFlush = jest.MockedFunction<ReplayContainer['_runFlush']>;
 
 describe('Integration | stop', () => {
   let replay: ReplayContainer;
-  // eslint-disable-next-line deprecation/deprecation
   let integration: Replay;
   const prevLocation = WINDOW.location;
 
diff --git a/packages/replay/test/mocks/mockSdk.ts b/packages/replay/test/mocks/mockSdk.ts
index 2ada7cec506f..f57ef8c51d71 100644
--- a/packages/replay/test/mocks/mockSdk.ts
+++ b/packages/replay/test/mocks/mockSdk.ts
@@ -1,6 +1,6 @@
 import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/types';
 
-import type { Replay as ReplayIntegration } from '../../src';
+import type { Replay as ReplayIntegration } from '../../src/integration';
 import type { ReplayContainer } from '../../src/replay';
 import type { ReplayConfiguration } from '../../src/types';
 import type { TestClientOptions } from '../utils/TestClient';
@@ -46,11 +46,9 @@ class MockTransport implements Transport {
 
 export async function mockSdk({ replayOptions, sentryOptions, autoStart = true }: MockSdkParams = {}): Promise<{
   replay: ReplayContainer;
-  // eslint-disable-next-line deprecation/deprecation
   integration: ReplayIntegration;
 }> {
-  // eslint-disable-next-line deprecation/deprecation
-  const { Replay } = await import('../../src');
+  const { Replay } = await import('../../src/integration');
 
   // Scope this to the test, instead of the module
   let _initialized = false;
diff --git a/packages/replay/test/mocks/resetSdkMock.ts b/packages/replay/test/mocks/resetSdkMock.ts
index 8c60f6d1c742..a8fdd97ef5ac 100644
--- a/packages/replay/test/mocks/resetSdkMock.ts
+++ b/packages/replay/test/mocks/resetSdkMock.ts
@@ -1,7 +1,7 @@
 import type { EventProcessor } from '@sentry/types';
 import { getGlobalSingleton, resetInstrumentationHandlers } from '@sentry/utils';
 
-import type { Replay as ReplayIntegration } from '../../src';
+import type { Replay as ReplayIntegration } from '../../src/integration';
 import type { ReplayContainer } from '../../src/replay';
 import type { RecordMock } from './../index';
 import { BASE_TIMESTAMP } from './../index';
@@ -13,7 +13,6 @@ export async function resetSdkMock({ replayOptions, sentryOptions, autoStart }:
   domHandler: DomHandler;
   mockRecord: RecordMock;
   replay: ReplayContainer;
-  // eslint-disable-next-line deprecation/deprecation
   integration: ReplayIntegration;
 }> {
   let domHandler: DomHandler;
diff --git a/packages/replay/test/unit/util/getPrivacyOptions.test.ts b/packages/replay/test/unit/util/getPrivacyOptions.test.ts
index c1e7695487e3..61dfef693e0c 100644
--- a/packages/replay/test/unit/util/getPrivacyOptions.test.ts
+++ b/packages/replay/test/unit/util/getPrivacyOptions.test.ts
@@ -22,8 +22,8 @@ describe('Unit | util | getPrivacyOptions', () => {
         "blockSelector": ".custom-block,.sentry-block,[data-sentry-block],base[href=\\"/\\"]",
         "ignoreSelector": ".custom-ignore,.sentry-ignore,[data-sentry-ignore],input[type=\\"file\\"]",
         "maskTextSelector": ".custom-mask,.sentry-mask,[data-sentry-mask]",
-        "unblockSelector": ".custom-unblock,.sentry-unblock,[data-sentry-unblock]",
-        "unmaskTextSelector": ".custom-unmask,.sentry-unmask,[data-sentry-unmask]",
+        "unblockSelector": ".custom-unblock",
+        "unmaskTextSelector": ".custom-unmask",
       }
     `);
   });
@@ -48,8 +48,8 @@ describe('Unit | util | getPrivacyOptions', () => {
         "blockSelector": ".custom-block,.deprecated-block-selector,.sentry-block,[data-sentry-block],base[href=\\"/\\"],.deprecated-block-class",
         "ignoreSelector": ".custom-ignore,.sentry-ignore,[data-sentry-ignore],input[type=\\"file\\"],.deprecated-ignore-class",
         "maskTextSelector": ".custom-mask,.deprecated-mask-selector,.sentry-mask,[data-sentry-mask],.deprecated-mask-class",
-        "unblockSelector": ".custom-unblock,.sentry-unblock,[data-sentry-unblock]",
-        "unmaskTextSelector": ".custom-unmask,.sentry-unmask,[data-sentry-unmask]",
+        "unblockSelector": ".custom-unblock",
+        "unmaskTextSelector": ".custom-unmask",
       }
     `);
   });
@@ -73,8 +73,8 @@ describe('Unit | util | getPrivacyOptions', () => {
         "ignoreSelector": ".custom-ignore,.sentry-ignore,[data-sentry-ignore],input[type=\\"file\\"]",
         "maskTextClass": /deprecated-mask-\\*/,
         "maskTextSelector": ".custom-mask,.sentry-mask,[data-sentry-mask]",
-        "unblockSelector": ".custom-unblock,.sentry-unblock,[data-sentry-unblock]",
-        "unmaskTextSelector": ".custom-unmask,.sentry-unmask,[data-sentry-unmask]",
+        "unblockSelector": ".custom-unblock",
+        "unmaskTextSelector": ".custom-unmask",
       }
     `);
   });
diff --git a/packages/serverless/README.md b/packages/serverless/README.md
deleted file mode 100644
index aec2e5e27872..000000000000
--- a/packages/serverless/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-<p align="center">
-  <a href="https://sentry.io/?utm_source=github&utm_medium=logo" target="_blank">
-    <img src="https://sentry-brand.storage.googleapis.com/sentry-wordmark-dark-280x84.png" alt="Sentry" width="280" height="84">
-  </a>
-</p>
-
-# Official Sentry SDK for Serverless environments
-
-## Links
-
-- [Official SDK Docs](https://docs.sentry.io/)
-- [TypeDoc](http://getsentry.github.io/sentry-javascript/)
-
-## General
-
-This package is a wrapper around `@sentry/node`, with added functionality related to various Serverless solutions. All
-methods available in `@sentry/node` can be imported from `@sentry/serverless`.
-
-Currently supported environment:
-
-### AWS Lambda
-
-To use this SDK, call `Sentry.AWSLambda.init(options)` at the very beginning of your JavaScript file.
-
-```javascript
-import * as Sentry from '@sentry/serverless';
-
-Sentry.AWSLambda.init({
-  dsn: '__DSN__',
-  // ...
-});
-
-// async (recommended)
-exports.handler = Sentry.AWSLambda.wrapHandler(async (event, context) => {
-  throw new Error('oh, hello there!');
-});
-
-// sync
-exports.handler = Sentry.AWSLambda.wrapHandler((event, context, callback) => {
-  throw new Error('oh, hello there!');
-});
-```
-
-If you also want to trace performance of all the incoming requests and also outgoing AWS service requests, just set the `tracesSampleRate` option.
-
-```javascript
-import * as Sentry from '@sentry/serverless';
-
-Sentry.AWSLambda.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-});
-```
-
-#### Integrate Sentry using internal extension
-
-Another and much simpler way to integrate Sentry to your AWS Lambda function is to add an official layer.
-
-1. Choose Layers -> Add Layer.
-2. Specify an ARN: `arn:aws:lambda:us-west-1:TODO:layer:TODO:VERSION`.
-3. Go to Environment variables and add:
-   - `NODE_OPTIONS`: `-r @sentry/serverless/build/npm/cjs/awslambda-auto`.
-   - `SENTRY_DSN`: `your dsn`.
-   - `SENTRY_TRACES_SAMPLE_RATE`: a number between 0 and 1 representing the chance a transaction is sent to Sentry. For more information, see [docs](https://docs.sentry.io/platforms/node/guides/aws-lambda/configuration/options/#tracesSampleRate).
-
-### Google Cloud Functions
-
-To use this SDK, call `Sentry.GCPFunction.init(options)` at the very beginning of your JavaScript file.
-
-```javascript
-import * as Sentry from '@sentry/serverless';
-
-Sentry.GCPFunction.init({
-  dsn: '__DSN__',
-  tracesSampleRate: 1.0,
-  // ...
-});
-
-// For HTTP Functions:
-
-exports.helloHttp = Sentry.GCPFunction.wrapHttpFunction((req, res) => {
-  throw new Error('oh, hello there!');
-});
-
-// For Background Functions:
-
-exports.helloEvents = Sentry.GCPFunction.wrapEventFunction((data, context, callback) => {
-  throw new Error('oh, hello there!');
-});
-
-// For CloudEvents:
-
-exports.helloEvents = Sentry.GCPFunction.wrapCloudEventFunction((context, callback) => {
-  throw new Error('oh, hello there!');
-});
-```
diff --git a/packages/serverless/src/index.awslambda.ts b/packages/serverless/src/index.awslambda.ts
deleted file mode 100644
index 481c9b13d62f..000000000000
--- a/packages/serverless/src/index.awslambda.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/** This file is used as the entrypoint for the lambda layer bundle, and is not included in the npm package. */
-
-// https://medium.com/unsplash/named-namespace-imports-7345212bbffb
-import * as AWSLambda from './awslambda';
-export { AWSLambda };
-
-export * from './awsservices';
-export * from '@sentry/node-experimental';
diff --git a/packages/serverless/test/gcpfunction.test.ts b/packages/serverless/test/gcpfunction.test.ts
deleted file mode 100644
index c9566200a46d..000000000000
--- a/packages/serverless/test/gcpfunction.test.ts
+++ /dev/null
@@ -1,595 +0,0 @@
-import * as domain from 'domain';
-
-import type { Event, Integration } from '@sentry/types';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-
-import { wrapCloudEventFunction, wrapEventFunction, wrapHttpFunction } from '../src/gcpfunction';
-import type {
-  CloudEventFunction,
-  CloudEventFunctionWithCallback,
-  EventFunction,
-  EventFunctionWithCallback,
-  HttpFunction,
-  Request,
-  Response,
-} from '../src/gcpfunction/general';
-
-import { init } from '../src/gcpfunction';
-
-const mockStartInactiveSpan = jest.fn((...spanArgs) => ({ ...spanArgs }));
-const mockStartSpanManual = jest.fn((...spanArgs) => ({ ...spanArgs }));
-const mockFlush = jest.fn((...args) => Promise.resolve(args));
-const mockWithScope = jest.fn();
-const mockCaptureMessage = jest.fn();
-const mockCaptureException = jest.fn();
-const mockInit = jest.fn();
-
-const mockScope = {
-  setTag: jest.fn(),
-  setContext: jest.fn(),
-  addEventProcessor: jest.fn(),
-  setSDKProcessingMetadata: jest.fn(),
-};
-
-const mockSpan = {
-  end: jest.fn(),
-};
-
-jest.mock('@sentry/node-experimental', () => {
-  const original = jest.requireActual('@sentry/node-experimental');
-  return {
-    ...original,
-    init: (options: unknown) => {
-      mockInit(options);
-    },
-    startInactiveSpan: (...args: unknown[]) => {
-      mockStartInactiveSpan(...args);
-      return mockSpan;
-    },
-    startSpanManual: (...args: unknown[]) => {
-      mockStartSpanManual(...args);
-      mockSpan.end();
-      return original.startSpanManual(...args);
-    },
-    getCurrentScope: () => {
-      return mockScope;
-    },
-    flush: (...args: unknown[]) => {
-      return mockFlush(...args);
-    },
-    withScope: (fn: (scope: unknown) => void) => {
-      mockWithScope(fn);
-      fn(mockScope);
-    },
-    captureMessage: (...args: unknown[]) => {
-      mockCaptureMessage(...args);
-    },
-    captureException: (...args: unknown[]) => {
-      mockCaptureException(...args);
-    },
-  };
-});
-
-describe('GCPFunction', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  async function handleHttp(fn: HttpFunction, trace_headers: { [key: string]: string } | null = null): Promise<void> {
-    let headers: { [key: string]: string } = { host: 'hostname', 'content-type': 'application/json' };
-    if (trace_headers) {
-      headers = { ...headers, ...trace_headers };
-    }
-    return new Promise((resolve, _reject) => {
-      const d = domain.create();
-      const req = {
-        method: 'POST',
-        url: '/path?q=query',
-        headers: headers,
-        body: { foo: 'bar' },
-      } as Request;
-      const res = { end: resolve } as Response;
-      d.on('error', () => res.end());
-      d.run(() => process.nextTick(fn, req, res));
-    });
-  }
-
-  function handleEvent(fn: EventFunctionWithCallback): Promise<any> {
-    return new Promise((resolve, reject) => {
-      const d = domain.create();
-      // d.on('error', () => res.end());
-      const context = {
-        eventType: 'event.type',
-        resource: 'some.resource',
-      };
-      d.on('error', reject);
-      d.run(() =>
-        process.nextTick(fn, {}, context, (err: any, result: any) => {
-          if (err != null || err != undefined) {
-            reject(err);
-          } else {
-            resolve(result);
-          }
-        }),
-      );
-    });
-  }
-
-  function handleCloudEvent(fn: CloudEventFunctionWithCallback): Promise<any> {
-    return new Promise((resolve, reject) => {
-      const d = domain.create();
-      // d.on('error', () => res.end());
-      const context = {
-        type: 'event.type',
-      };
-      d.on('error', reject);
-      d.run(() =>
-        process.nextTick(fn, context, (err: any, result: any) => {
-          if (err != null || err != undefined) {
-            reject(err);
-          } else {
-            resolve(result);
-          }
-        }),
-      );
-    });
-  }
-
-  describe('wrapHttpFunction() options', () => {
-    test('flushTimeout', async () => {
-      const handler: HttpFunction = (_, res) => {
-        res.end();
-      };
-      const wrappedHandler = wrapHttpFunction(handler, { flushTimeout: 1337 });
-
-      await handleHttp(wrappedHandler);
-      expect(mockFlush).toBeCalledWith(1337);
-    });
-  });
-
-  describe('wrapHttpFunction()', () => {
-    test('successful execution', async () => {
-      const handler: HttpFunction = (_req, res) => {
-        res.statusCode = 200;
-        res.end();
-      };
-      const wrappedHandler = wrapHttpFunction(handler);
-      await handleHttp(wrappedHandler);
-
-      const fakeTransactionContext = {
-        name: 'POST /path',
-        op: 'function.gcp.http',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_http',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: HttpFunction = (_req, _res) => {
-        throw error;
-      };
-      const wrappedHandler = wrapHttpFunction(handler);
-
-      await handleHttp(wrappedHandler);
-
-      const fakeTransactionContext = {
-        name: 'POST /path',
-        op: 'function.gcp.http',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_http',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-
-    test('should not throw when flush rejects', async () => {
-      const handler: HttpFunction = async (_req, res) => {
-        res.statusCode = 200;
-        res.end();
-      };
-
-      const wrappedHandler = wrapHttpFunction(handler);
-
-      const request = {
-        method: 'POST',
-        url: '/path?q=query',
-        headers: { host: 'hostname', 'content-type': 'application/json' },
-        body: { foo: 'bar' },
-      } as Request;
-
-      const mockEnd = jest.fn();
-      const response = { end: mockEnd } as unknown as Response;
-
-      mockFlush.mockImplementationOnce(async () => {
-        throw new Error();
-      });
-
-      await expect(wrappedHandler(request, response)).resolves.toBeUndefined();
-      expect(mockEnd).toHaveBeenCalledTimes(1);
-    });
-  });
-
-  // This tests that the necessary pieces are in place for request data to get added to event - the `RequestData`
-  // integration is included in the defaults and the necessary data is stored in `sdkProcessingMetadata`. The
-  // integration's tests cover testing that it uses that data correctly.
-  test('wrapHttpFunction request data prereqs', async () => {
-    init({});
-
-    const handler: HttpFunction = (_req, res) => {
-      res.end();
-    };
-    const wrappedHandler = wrapHttpFunction(handler);
-
-    await handleHttp(wrappedHandler);
-
-    const initOptions = (mockInit as unknown as jest.SpyInstance).mock.calls[0];
-    const defaultIntegrations = initOptions[0].defaultIntegrations.map((i: Integration) => i.name);
-
-    expect(defaultIntegrations).toContain('RequestData');
-
-    expect(mockScope.setSDKProcessingMetadata).toHaveBeenCalledWith({
-      request: {
-        method: 'POST',
-        url: '/path?q=query',
-        headers: { host: 'hostname', 'content-type': 'application/json' },
-        body: { foo: 'bar' },
-      },
-    });
-  });
-
-  describe('wrapEventFunction() without callback', () => {
-    test('successful execution', async () => {
-      const func: EventFunction = (_data, _context) => {
-        return 42;
-      };
-      const wrappedHandler = wrapEventFunction(func);
-      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: EventFunction = (_data, _context) => {
-        throw error;
-      };
-      const wrappedHandler = wrapEventFunction(handler);
-      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-  });
-
-  describe('wrapEventFunction() as Promise', () => {
-    test('successful execution', async () => {
-      const func: EventFunction = (_data, _context) =>
-        new Promise(resolve => {
-          setTimeout(() => {
-            resolve(42);
-          }, 10);
-        });
-      const wrappedHandler = wrapEventFunction(func);
-      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: EventFunction = (_data, _context) =>
-        new Promise((_, reject) => {
-          setTimeout(() => {
-            reject(error);
-          }, 10);
-        });
-
-      const wrappedHandler = wrapEventFunction(handler);
-      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-  });
-
-  describe('wrapEventFunction() with callback', () => {
-    test('successful execution', async () => {
-      const func: EventFunctionWithCallback = (_data, _context, cb) => {
-        cb(null, 42);
-      };
-      const wrappedHandler = wrapEventFunction(func);
-      await expect(handleEvent(wrappedHandler)).resolves.toBe(42);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: EventFunctionWithCallback = (_data, _context, cb) => {
-        cb(error);
-      };
-      const wrappedHandler = wrapEventFunction(handler);
-      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-
-    test('capture exception', async () => {
-      const error = new Error('wat');
-      const handler: EventFunctionWithCallback = (_data, _context, _cb) => {
-        throw error;
-      };
-      const wrappedHandler = wrapEventFunction(handler);
-      await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-    });
-  });
-
-  test('marks the captured error as unhandled', async () => {
-    const error = new Error('wat');
-    const handler: EventFunctionWithCallback = (_data, _context, _cb) => {
-      throw error;
-    };
-    const wrappedHandler = wrapEventFunction(handler);
-    await expect(handleEvent(wrappedHandler)).rejects.toThrowError(error);
-
-    expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-
-    const scopeFunction = mockCaptureException.mock.calls[0][1];
-    const event: Event = { exception: { values: [{}] } };
-    let evtProcessor: ((e: Event) => Event) | undefined = undefined;
-    scopeFunction({ addEventProcessor: jest.fn().mockImplementation(proc => (evtProcessor = proc)) });
-
-    expect(evtProcessor).toBeInstanceOf(Function);
-    // @ts-expect-error just mocking around...
-    expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
-      handled: false,
-      type: 'generic',
-    });
-  });
-
-  test('wrapEventFunction scope data', async () => {
-    const handler: EventFunction = (_data, _context) => 42;
-    const wrappedHandler = wrapEventFunction(handler);
-    await handleEvent(wrappedHandler);
-    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', {
-      eventType: 'event.type',
-      resource: 'some.resource',
-    });
-  });
-
-  describe('wrapCloudEventFunction() without callback', () => {
-    test('successful execution', async () => {
-      const func: CloudEventFunction = _context => {
-        return 42;
-      };
-      const wrappedHandler = wrapCloudEventFunction(func);
-      await expect(handleCloudEvent(wrappedHandler)).resolves.toBe(42);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.cloud_event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: CloudEventFunction = _context => {
-        throw error;
-      };
-      const wrappedHandler = wrapCloudEventFunction(handler);
-      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.cloud_event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-  });
-
-  describe('wrapCloudEventFunction() with callback', () => {
-    test('successful execution', async () => {
-      const func: CloudEventFunctionWithCallback = (_context, cb) => {
-        cb(null, 42);
-      };
-      const wrappedHandler = wrapCloudEventFunction(func);
-      await expect(handleCloudEvent(wrappedHandler)).resolves.toBe(42);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.cloud_event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalledWith(2000);
-    });
-
-    test('capture error', async () => {
-      const error = new Error('wat');
-      const handler: CloudEventFunctionWithCallback = (_context, cb) => {
-        cb(error);
-      };
-      const wrappedHandler = wrapCloudEventFunction(handler);
-      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.cloud_event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-      expect(mockSpan.end).toBeCalled();
-      expect(mockFlush).toBeCalled();
-    });
-
-    test('capture exception', async () => {
-      const error = new Error('wat');
-      const handler: CloudEventFunctionWithCallback = (_context, _cb) => {
-        throw error;
-      };
-      const wrappedHandler = wrapCloudEventFunction(handler);
-      await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
-
-      const fakeTransactionContext = {
-        name: 'event.type',
-        op: 'function.gcp.cloud_event',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_cloud_event',
-        },
-      };
-
-      expect(mockStartSpanManual).toBeCalledWith(fakeTransactionContext, expect.any(Function));
-      expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
-    });
-  });
-
-  test('wrapCloudEventFunction scope data', async () => {
-    const handler: CloudEventFunction = _context => 42;
-    const wrappedHandler = wrapCloudEventFunction(handler);
-    await handleCloudEvent(wrappedHandler);
-    expect(mockScope.setContext).toBeCalledWith('gcp.function.context', { type: 'event.type' });
-  });
-
-  describe('init()', () => {
-    test('calls Sentry.init with correct sdk info metadata', () => {
-      init({});
-
-      expect(mockInit).toBeCalledWith(
-        expect.objectContaining({
-          _metadata: {
-            sdk: {
-              name: 'sentry.javascript.serverless',
-              integrations: ['GCPFunction'],
-              packages: [
-                {
-                  name: 'npm:@sentry/serverless',
-                  version: expect.any(String),
-                },
-              ],
-              version: expect.any(String),
-            },
-          },
-        }),
-      );
-    });
-  });
-});
diff --git a/packages/svelte/.eslintrc.js b/packages/svelte/.eslintrc.js
index b6d4608e8e7b..8afbbfe212c6 100644
--- a/packages/svelte/.eslintrc.js
+++ b/packages/svelte/.eslintrc.js
@@ -11,7 +11,4 @@ module.exports = {
     },
   ],
   extends: ['../../.eslintrc.js'],
-  rules: {
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
-  },
 };
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 10d3772c2dd3..fa8e69a8be84 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/svelte/src/performance.ts b/packages/svelte/src/performance.ts
index 302f346e32b9..df3862f3258a 100644
--- a/packages/svelte/src/performance.ts
+++ b/packages/svelte/src/performance.ts
@@ -1,5 +1,5 @@
-import { getCurrentScope } from '@sentry/browser';
-import type { Span, Transaction } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan } from '@sentry/browser';
+import type { Span } from '@sentry/types';
 import { afterUpdate, beforeUpdate, onMount } from 'svelte';
 import { current_component } from 'svelte/internal';
 
@@ -26,11 +26,6 @@ const defaultTrackComponentOptions: {
 export function trackComponent(options?: TrackComponentOptions): void {
   const mergedOptions = { ...defaultTrackComponentOptions, ...options };
 
-  const transaction = getActiveTransaction();
-  if (!transaction) {
-    return;
-  }
-
   const customComponentName = mergedOptions.componentName;
 
   // current_component.ctor.name is likely to give us the component's name automatically
@@ -39,7 +34,7 @@ export function trackComponent(options?: TrackComponentOptions): void {
 
   let initSpan: Span | undefined = undefined;
   if (mergedOptions.trackInit) {
-    initSpan = recordInitSpan(transaction, componentName);
+    initSpan = recordInitSpan(componentName);
   }
 
   if (mergedOptions.trackUpdates) {
@@ -47,12 +42,12 @@ export function trackComponent(options?: TrackComponentOptions): void {
   }
 }
 
-function recordInitSpan(transaction: Transaction, componentName: string): Span {
-  // eslint-disable-next-line deprecation/deprecation
-  const initSpan = transaction.startChild({
+function recordInitSpan(componentName: string): Span | undefined {
+  const initSpan = startInactiveSpan({
+    onlyIfParent: true,
     op: UI_SVELTE_INIT,
     name: componentName,
-    origin: 'auto.ui.svelte',
+    attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.svelte' },
   });
 
   onMount(() => {
@@ -67,21 +62,25 @@ function recordUpdateSpans(componentName: string, initSpan?: Span): void {
   beforeUpdate(() => {
     // We need to get the active transaction again because the initial one could
     // already be finished or there is currently no transaction going on.
-    const transaction = getActiveTransaction();
-    if (!transaction) {
+    const activeSpan = getActiveSpan();
+    if (!activeSpan) {
       return;
     }
 
     // If we are initializing the component when the update span is started, we start it as child
     // of the init span. Else, we start it as a child of the transaction.
     const parentSpan =
-      initSpan && initSpan.isRecording() && getRootSpan(initSpan) === transaction ? initSpan : transaction;
+      initSpan && initSpan.isRecording() && getRootSpan(initSpan) === getRootSpan(activeSpan)
+        ? initSpan
+        : getRootSpan(activeSpan);
+
+    if (!parentSpan) return;
 
     updateSpan = withActiveSpan(parentSpan, () => {
       return startInactiveSpan({
         op: UI_SVELTE_UPDATE,
         name: componentName,
-        origin: 'auto.ui.svelte',
+        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.svelte' },
       });
     });
   });
@@ -94,8 +93,3 @@ function recordUpdateSpans(componentName: string, initSpan?: Span): void {
     updateSpan = undefined;
   });
 }
-
-function getActiveTransaction(): Transaction | undefined {
-  // eslint-disable-next-line deprecation/deprecation
-  return getCurrentScope().getTransaction();
-}
diff --git a/packages/sveltekit/README.md b/packages/sveltekit/README.md
index 477d9181b8a5..895c8dad23e1 100644
--- a/packages/sveltekit/README.md
+++ b/packages/sveltekit/README.md
@@ -16,26 +16,30 @@
 
 ## Compatibility
 
-The minimum supported version of SvelteKit is `1.0.0`.
-The SDK works best with Vite 4.2 and newer.
-Older Vite versions might not generate source maps correctly.
+The minimum supported version of SvelteKit is `1.0.0`. The SDK works best with Vite 4.2 and newer. Older Vite versions
+might not generate source maps correctly.
 
 The SDK supports the following SvelteKit adapters:
-- `@sveltejs/adapter-auto` - for Vercel with the Node runtime. Other deployment targets might work but we don't guarantee compatibility.
+
+- `@sveltejs/adapter-auto` - for Vercel with the Node runtime. Other deployment targets might work but we don't
+  guarantee compatibility.
 - `@sveltejs/adapter-vercel` - only for Node (Lambda) runtimes, not yet Vercel's edge runtime
 - `@sveltejs/adapter-node`
 
-If you use the SDK with other adapters, we cannot guarantee that everything works as expected.
-You might need to [manually configure source maps upload](#-configuring-source-maps-upload).
-The SDK is currently not compatible with none-Node server runtimes, such as Vercel's Edge runtime or Cloudflare workers.
+If you use the SDK with other adapters, we cannot guarantee that everything works as expected. You might need to
+[manually configure source maps upload](#-configuring-source-maps-upload). The SDK is currently not compatible with
+none-Node server runtimes, such as Vercel's Edge runtime or Cloudflare workers.
 
 ## General
 
-This package is a wrapper around `@sentry/node` for the server and `@sentry/svelte` for the client side, 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.
 
 ## Automatic Setup
 
-We recommend installing the SDK by running the [Sentry wizard](https://docs.sentry.io/platforms/javascript/guides/sveltekit/#install) in the root directory of your project:
+We recommend installing the SDK by running the
+[Sentry wizard](https://docs.sentry.io/platforms/javascript/guides/sveltekit/#install) in the root directory of your
+project:
 
 ```sh
 npx @sentry/wizard@latest -i sveltekit
@@ -61,39 +65,40 @@ If the setup through the wizard doesn't work for you, you can also set up the SD
 
 ### 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.
+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 client hooks file, create a new one in  `src/hooks.client.(js|ts)`.
+1. If you don't already have a client hooks file, create a new one in `src/hooks.client.(js|ts)`.
 
 2. On the top of your `hooks.client.(js|ts)` file, initialize the Sentry SDK:
 
    ```javascript
-    // hooks.client.(js|ts)
-    import * as Sentry from '@sentry/sveltekit';
-
-    Sentry.init({
-      dsn: '__DSN__',
-      tracesSampleRate: 1.0,
-      // For instance, initialize Session Replay:
-      replaysSessionSampleRate: 0.1,
-      replaysOnErrorSampleRate: 1.0,
-      integrations: [new Sentry.Replay()],
-    });
+   // hooks.client.(js|ts)
+   import * as Sentry from '@sentry/sveltekit';
+
+   Sentry.init({
+     dsn: '__DSN__',
+     tracesSampleRate: 1.0,
+     // For instance, initialize Session Replay:
+     replaysSessionSampleRate: 0.1,
+     replaysOnErrorSampleRate: 1.0,
+     integrations: [Sentry.replayIntegration()],
+   });
    ```
 
 3. Add our `handleErrorWithSentry` function to the `handleError` hook:
 
    ```javascript
-    // hooks.client.(js|ts)
-    import { handleErrorWithSentry } from '@sentry/sveltekit';
+   // hooks.client.(js|ts)
+   import { handleErrorWithSentry } from '@sentry/sveltekit';
 
-    const myErrorHandler = (({ error, event }) => {
-      console.error('An error occurred on the client side:', error, event);
-    });
+   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();
+   export const handleError = handleErrorWithSentry(myErrorHandler);
+   // or alternatively, if you don't have a custom error handler:
+   // export const handleError = handleErrorWithSentry();
    ```
 
 ### 3. Server-side Setup
@@ -102,47 +107,47 @@ The Sentry SvelteKit SDK mostly relies on [SvelteKit Hooks](https://kit.svelte.d
 
 2. On the top of your `hooks.server.(js|ts)` file, initialize the Sentry SDK:
 
-    ```javascript
-    // hooks.server.(js|ts)
-    import * as Sentry from '@sentry/sveltekit';
+   ```javascript
+   // hooks.server.(js|ts)
+   import * as Sentry from '@sentry/sveltekit';
 
-    Sentry.init({
-      dsn: '__DSN__',
-      tracesSampleRate: 1.0,
-    });
+   Sentry.init({
+     dsn: '__DSN__',
+     tracesSampleRate: 1.0,
+   });
    ```
 
 3. Add our `handleErrorWithSentry` function to the `handleError` hook:
 
    ```javascript
-    // hooks.server.(js|ts)
-    import { handleErrorWithSentry } from '@sentry/sveltekit';
+   // hooks.server.(js|ts)
+   import { handleErrorWithSentry } from '@sentry/sveltekit';
 
-    const myErrorHandler = (({ error, event }) => {
-      console.error('An error occurred on the server side:', error, event);
-    });
+   const myErrorHandler = ({ error, event }) => {
+     console.error('An error occurred on the server side:', error, event);
+   };
 
-    export const handleError = handleErrorWithSentry(myErrorHandler);
-    // or alternatively, if you don't have a custom error handler:
-    // export const handleError = handleErrorWithSentry();
+   export const handleError = handleErrorWithSentry(myErrorHandler);
+   // or alternatively, if you don't have a custom error handler:
+   // export const handleError = handleErrorWithSentry();
    ```
 
 4. Add our request handler to the `handle` hook in `hooks.server.ts`:
 
    ```javascript
-    // hooks.server.(js|ts)
-    import { sentryHandle } from '@sentry/sveltekit';
+   // hooks.server.(js|ts)
+   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());
+   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());
    ```
 
 ### 4. Vite Setup
 
-Add `sentrySvelteKit` to your Vite plugins in  `vite.config.(js|ts)` file so that the Sentry SDK can apply build-time features.
-Make sure that it is added _before_ the `sveltekit` plugin:
+Add `sentrySvelteKit` to your Vite plugins in `vite.config.(js|ts)` file so that the Sentry SDK can apply build-time
+features. Make sure that it is added _before_ the `sveltekit` plugin:
 
 ```javascript
 // vite.config.(js|ts)
@@ -155,7 +160,9 @@ export default {
 };
 ```
 
-This adds the [Sentry Vite Plugin](https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/vite-plugin) to your Vite config to automatically upload source maps to Sentry.
+This adds the
+[Sentry Vite Plugin](https://github.com/getsentry/sentry-javascript-bundler-plugins/tree/main/packages/vite-plugin) to
+your Vite config to automatically upload source maps to Sentry.
 
 ---
 
@@ -194,8 +201,8 @@ export default {
 ### Configuring Source maps upload
 
 Under `sourceMapsUploadOptions`, you can also specify all additional options supported by the
-[Sentry Vite Plugin](https://www.npmjs.com/package/@sentry/vite-plugin).
-This might be useful if you're using adapters other than the Node adapter or have a more customized build setup.
+[Sentry Vite Plugin](https://www.npmjs.com/package/@sentry/vite-plugin). This might be useful if you're using adapters
+other than the Node adapter or have a more customized build setup.
 
 ```js
 // vite.config.(js|ts)
@@ -244,15 +251,21 @@ export default {
 
 ## Configure Auto-Instrumentation
 
-The SDK mostly relies on [SvelteKit's hooks](https://kit.svelte.dev/docs/hooks) to collect error and performance data. However, SvelteKit doesn't yet offer a hook for universal or server-only `load` function calls. Therefore, the SDK uses a Vite plugin to auto-instrument `load` functions so that you don't have to add a Sentry wrapper to each function manually. Auto-instrumentation is enabled by default, as soon as you add the `sentrySvelteKit()` function call to your `vite.config.(js|ts)`. However, you can customize the behavior, or disable it entirely. In this case, you can still manually wrap specific `load` functions with the `withSentry` function.
-
-Note: The SDK will only auto-instrument `load` functions in `+page` or `+layout` files that do not yet contain any Sentry code.
-If you already have custom Sentry code in such files, you'll have to [manually](#instrument-load-functions-manually) add our wrapper to your `load` functions.
+The SDK mostly relies on [SvelteKit's hooks](https://kit.svelte.dev/docs/hooks) to collect error and performance data.
+However, SvelteKit doesn't yet offer a hook for universal or server-only `load` function calls. Therefore, the SDK uses
+a Vite plugin to auto-instrument `load` functions so that you don't have to add a Sentry wrapper to each function
+manually. Auto-instrumentation is enabled by default, as soon as you add the `sentrySvelteKit()` function call to your
+`vite.config.(js|ts)`. However, you can customize the behavior, or disable it entirely. In this case, you can still
+manually wrap specific `load` functions with the `withSentry` function.
 
+Note: The SDK will only auto-instrument `load` functions in `+page` or `+layout` files that do not yet contain any
+Sentry code. If you already have custom Sentry code in such files, you'll have to
+[manually](#instrument-load-functions-manually) add our wrapper to your `load` functions.
 
 ### Customize Auto-instrumentation
 
-By passing the `autoInstrument` option to `sentrySvelteKit` you can disable auto-instrumentation entirely, or customize which `load` functions should be instrumented:
+By passing the `autoInstrument` option to `sentrySvelteKit` you can disable auto-instrumentation entirely, or customize
+which `load` functions should be instrumented:
 
 ```javascript
 // vite.config.(js|ts)
@@ -275,7 +288,8 @@ export default {
 
 ### Disable Auto-instrumentation
 
-If you set the `autoInstrument` option to `false`, the SDK won't auto-instrument any `load` function. You can still [manually instrument](#instrument-load-functions-manually) specific `load` functions.
+If you set the `autoInstrument` option to `false`, the SDK won't auto-instrument any `load` function. You can still
+[manually instrument](#instrument-load-functions-manually) specific `load` functions.
 
 ```javascript
 // vite.config.(js|ts)
@@ -295,25 +309,27 @@ export default {
 
 ### Instrument `load` Functions Manually
 
-If you don't want to use auto-instrumentation, you can also manually instrument specific `load` functions with our load function wrappers:
+If you don't want to use auto-instrumentation, you can also manually instrument specific `load` functions with our load
+function wrappers:
 
-To instrument your universal `load` functions in `+(page|layout).(js|ts)`, wrap our `wrapLoadWithSentry` function around your load code:
+To instrument your universal `load` functions in `+(page|layout).(js|ts)`, wrap our `wrapLoadWithSentry` function around
+your load code:
 
 ```javascript
 import { wrapLoadWithSentry } from '@sentry/sveltekit';
 
-export const load = wrapLoadWithSentry((event) => {
+export const load = wrapLoadWithSentry(event => {
   //... your load code
 });
 ```
 
-To instrument server `load` functions in `+(page|layout).server.(js|ts)`, wrap our `wrapServerLoadWithSentry` function around your load code:
+To instrument server `load` functions in `+(page|layout).server.(js|ts)`, wrap our `wrapServerLoadWithSentry` function
+around your load code:
 
 ```javascript
 import { wrapServerLoadWithSentry } from '@sentry/sveltekit';
 
-export const load = wrapServerLoadWithSentry((event) => {
+export const load = wrapServerLoadWithSentry(event => {
   //... your server load code
 });
 ```
-
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 88dd294872b9..e3698b691205 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -50,7 +50,6 @@
   },
   "devDependencies": {
     "@sveltejs/kit": "^2.0.2",
-    "rollup": "^3.20.2",
     "svelte": "^4.2.8",
     "vite": "^5.0.10"
   },
diff --git a/packages/sveltekit/src/client/browserTracingIntegration.ts b/packages/sveltekit/src/client/browserTracingIntegration.ts
index 10df93b20524..716223a17c5c 100644
--- a/packages/sveltekit/src/client/browserTracingIntegration.ts
+++ b/packages/sveltekit/src/client/browserTracingIntegration.ts
@@ -78,7 +78,7 @@ function _instrumentNavigations(client: Client): void {
   navigating.subscribe(navigation => {
     if (!navigation) {
       // `navigating` emits a 'null' value when the navigation is completed.
-      // So in this case, we can finish the routing span. If the transaction was an IdleTransaction,
+      // So in this case, we can finish the routing span. If the span was an idle span,
       // it will finish automatically and if it was user-created users also need to finish it.
       if (routingSpan) {
         routingSpan.end();
diff --git a/packages/sveltekit/src/server/handle.ts b/packages/sveltekit/src/server/handle.ts
index f37742b2f09b..4de371d03ed6 100644
--- a/packages/sveltekit/src/server/handle.ts
+++ b/packages/sveltekit/src/server/handle.ts
@@ -1,16 +1,16 @@
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  continueTrace,
   getActiveSpan,
-  getCurrentScope,
   getDynamicSamplingContextFromSpan,
+  getRootSpan,
   setHttpStatus,
   spanToTraceHeader,
   withIsolationScope,
 } from '@sentry/core';
-import { getActiveTransaction, startSpan } from '@sentry/core';
+import { startSpan } from '@sentry/core';
 import { captureException } from '@sentry/node-experimental';
-/* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import type { Span } from '@sentry/types';
 import { dynamicSamplingContextToSentryBaggageHeader, objectify } from '@sentry/utils';
 import type { Handle, ResolveOptions } from '@sveltejs/kit';
@@ -104,12 +104,12 @@ export function addSentryCodeToPage(options: SentryHandleOptions): NonNullable<R
   const nonce = fetchProxyScriptNonce ? `nonce="${fetchProxyScriptNonce}"` : '';
 
   return ({ html }) => {
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = getActiveTransaction();
-    if (transaction) {
-      const traceparentData = spanToTraceHeader(transaction);
+    const activeSpan = getActiveSpan();
+    const rootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;
+    if (rootSpan) {
+      const traceparentData = spanToTraceHeader(rootSpan);
       const dynamicSamplingContext = dynamicSamplingContextToSentryBaggageHeader(
-        getDynamicSamplingContextFromSpan(transaction),
+        getDynamicSamplingContextFromSpan(rootSpan),
       );
       const contentMeta = `<head>
     <meta name="sentry-trace" content="${traceparentData}"/>
@@ -171,38 +171,35 @@ async function instrumentHandle(
     return resolve(event);
   }
 
-  const { dynamicSamplingContext, traceparentData, propagationContext } = getTracePropagationData(event);
-  getCurrentScope().setPropagationContext(propagationContext);
-
-  try {
-    const resolveResult = await startSpan(
-      {
-        op: 'http.server',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: event.route?.id ? 'route' : 'url',
+  const { sentryTrace, baggage } = getTracePropagationData(event);
+
+  return continueTrace({ sentryTrace, baggage }, async () => {
+    try {
+      const resolveResult = await startSpan(
+        {
+          op: 'http.server',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
+            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: event.route?.id ? 'route' : 'url',
+          },
+          name: `${event.request.method} ${event.route?.id || event.url.pathname}`,
         },
-        name: `${event.request.method} ${event.route?.id || event.url.pathname}`,
-        ...traceparentData,
-        metadata: {
-          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
+        async (span?: Span) => {
+          const res = await resolve(event, {
+            transformPageChunk: addSentryCodeToPage(options),
+          });
+          if (span) {
+            setHttpStatus(span, res.status);
+          }
+          return res;
         },
-      },
-      async (span?: Span) => {
-        const res = await resolve(event, {
-          transformPageChunk: addSentryCodeToPage(options),
-        });
-        if (span) {
-          setHttpStatus(span, res.status);
-        }
-        return res;
-      },
-    );
-    return resolveResult;
-  } catch (e: unknown) {
-    sendErrorToSentry(e);
-    throw e;
-  } finally {
-    await flushIfServerless();
-  }
+      );
+      return resolveResult;
+    } catch (e: unknown) {
+      sendErrorToSentry(e);
+      throw e;
+    } finally {
+      await flushIfServerless();
+    }
+  });
 }
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 2f1126ea329f..d843ab8499c7 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -30,8 +30,6 @@ export {
   makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -68,6 +66,7 @@ export {
   Handlers,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
diff --git a/packages/sveltekit/src/server/load.ts b/packages/sveltekit/src/server/load.ts
index 6646ac5055bc..38f9353a18d7 100644
--- a/packages/sveltekit/src/server/load.ts
+++ b/packages/sveltekit/src/server/load.ts
@@ -1,15 +1,13 @@
-/* eslint-disable @sentry-internal/sdk/no-optional-chaining */
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  getCurrentScope,
+  continueTrace,
   startSpan,
 } from '@sentry/core';
 import { captureException } from '@sentry/node-experimental';
 import { addNonEnumerableProperty, objectify } from '@sentry/utils';
 import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
 
-import type { TransactionContext } from '@sentry/types';
 import type { SentryWrappedFlag } from '../common/utils';
 import { isHttpError, isRedirect } from '../common/utils';
 import { flushIfServerless, getTracePropagationData } from './utils';
@@ -70,18 +68,19 @@ export function wrapLoadWithSentry<T extends (...args: any) => any>(origLoad: T)
 
       const routeId = event.route && event.route.id;
 
-      const traceLoadContext: TransactionContext = {
-        op: 'function.sveltekit.load',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
-        },
-        name: routeId ? routeId : event.url.pathname,
-      };
-
       try {
         // We need to await before returning, otherwise we won't catch any errors thrown by the load function
-        return await startSpan(traceLoadContext, () => wrappingTarget.apply(thisArg, args));
+        return await startSpan(
+          {
+            op: 'function.sveltekit.load',
+            attributes: {
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
+            },
+            name: routeId ? routeId : event.url.pathname,
+          },
+          () => wrappingTarget.apply(thisArg, args),
+        );
       } catch (e) {
         sendErrorToSentry(e);
         throw e;
@@ -133,34 +132,30 @@ export function wrapServerLoadWithSentry<T extends (...args: any) => any>(origSe
       // https://github.com/sveltejs/kit/blob/e133aba479fa9ba0e7f9e71512f5f937f0247e2c/packages/kit/src/runtime/server/page/load_data.js#L111C3-L124
       const routeId = event.route && (Object.getOwnPropertyDescriptor(event.route, 'id')?.value as string | undefined);
 
-      const { dynamicSamplingContext, traceparentData, propagationContext } = getTracePropagationData(event);
-      getCurrentScope().setPropagationContext(propagationContext);
-
-      const traceLoadContext: TransactionContext = {
-        op: 'function.sveltekit.server.load',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
-        },
-        name: routeId ? routeId : event.url.pathname,
-        metadata: {
-          dynamicSamplingContext: traceparentData && !dynamicSamplingContext ? {} : dynamicSamplingContext,
-        },
-        data: {
-          'http.method': event.request.method,
-        },
-        ...traceparentData,
-      };
-
-      try {
-        // We need to await before returning, otherwise we won't catch any errors thrown by the load function
-        return await startSpan(traceLoadContext, () => wrappingTarget.apply(thisArg, args));
-      } catch (e: unknown) {
-        sendErrorToSentry(e);
-        throw e;
-      } finally {
-        await flushIfServerless();
-      }
+      const { sentryTrace, baggage } = getTracePropagationData(event);
+
+      return continueTrace({ sentryTrace, baggage }, async () => {
+        try {
+          // We need to await before returning, otherwise we won't catch any errors thrown by the load function
+          return await startSpan(
+            {
+              op: 'function.sveltekit.server.load',
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
+                'http.method': event.request.method,
+              },
+              name: routeId ? routeId : event.url.pathname,
+            },
+            () => wrappingTarget.apply(thisArg, args),
+          );
+        } catch (e: unknown) {
+          sendErrorToSentry(e);
+          throw e;
+        } finally {
+          await flushIfServerless();
+        }
+      });
     },
   });
 }
diff --git a/packages/sveltekit/src/server/utils.ts b/packages/sveltekit/src/server/utils.ts
index ad6765209548..a202742a9eea 100644
--- a/packages/sveltekit/src/server/utils.ts
+++ b/packages/sveltekit/src/server/utils.ts
@@ -1,5 +1,5 @@
 import { flush } from '@sentry/node-experimental';
-import { logger, tracingContextFromHeaders } from '@sentry/utils';
+import { logger } from '@sentry/utils';
 import type { RequestEvent } from '@sveltejs/kit';
 
 import { DEBUG_BUILD } from '../common/debug-build';
@@ -10,12 +10,11 @@ import { DEBUG_BUILD } from '../common/debug-build';
  *
  * Sets propagation context as a side effect.
  */
-// eslint-disable-next-line deprecation/deprecation
-export function getTracePropagationData(event: RequestEvent): ReturnType<typeof tracingContextFromHeaders> {
-  const sentryTraceHeader = event.request.headers.get('sentry-trace') || '';
-  const baggageHeader = event.request.headers.get('baggage');
-  // eslint-disable-next-line deprecation/deprecation
-  return tracingContextFromHeaders(sentryTraceHeader, baggageHeader);
+export function getTracePropagationData(event: RequestEvent): { sentryTrace: string; baggage: string | null } {
+  const sentryTrace = event.request.headers.get('sentry-trace') || '';
+  const baggage = event.request.headers.get('baggage');
+
+  return { sentryTrace, baggage };
 }
 
 /** Flush the event queue to ensure that events get sent to Sentry before the response is finished and the lambda ends */
diff --git a/packages/sveltekit/src/vite/sentryVitePlugins.ts b/packages/sveltekit/src/vite/sentryVitePlugins.ts
index 07111432e942..83a5cf4e19d6 100644
--- a/packages/sveltekit/src/vite/sentryVitePlugins.ts
+++ b/packages/sveltekit/src/vite/sentryVitePlugins.ts
@@ -1,5 +1,6 @@
 import type { Plugin } from 'vite';
 
+import type { SentryVitePluginOptions } from '@sentry/vite-plugin';
 import type { AutoInstrumentSelection } from './autoInstrument';
 import { makeAutoInstrumentationPlugin } from './autoInstrument';
 import type { SupportedSvelteKitAdapters } from './detectAdapter';
@@ -114,6 +115,21 @@ type SourceMapsUploadOptions = {
        */
       inject?: boolean;
     };
+
+    /**
+     * Options to further customize the Sentry Vite Plugin (@sentry/vite-plugin) behavior directly.
+     * Options specified in this object take precedence over the options specified in
+     * the `sourcemaps` and `release` objects.
+     *
+     * @see https://www.npmjs.com/package/@sentry/vite-plugin/v/2.14.2#options which lists all available options.
+     *
+     * Warning: Options within this object are subject to change at any time.
+     * We DO NOT guarantee semantic versioning for these options, meaning breaking
+     * changes can occur at any time within a major SDK version.
+     *
+     * Furthermore, some options are untested with SvelteKit specifically. Use with caution.
+     */
+    unstable_sentryVitePluginOptions?: Partial<SentryVitePluginOptions>;
   };
 };
 
@@ -196,15 +212,35 @@ export async function sentrySvelteKit(options: SentrySvelteKitPluginOptions = {}
   }
 
   if (mergedOptions.autoUploadSourceMaps && process.env.NODE_ENV !== 'development') {
-    const sourceMapsUploadOptions = mergedOptions.sourceMapsUploadOptions;
+    const { unstable_sentryVitePluginOptions, ...sourceMapsUploadOptions } =
+      mergedOptions.sourceMapsUploadOptions || {};
 
-    const sentryVitePlugins = await makeCustomSentryVitePlugins({
+    const sentryVitePluginsOptions = {
       ...sourceMapsUploadOptions,
 
+      ...unstable_sentryVitePluginOptions,
+
       adapter: mergedOptions.adapter,
       // override the plugin's debug flag with the one from the top-level options
       debug: mergedOptions.debug,
-    });
+    };
+
+    if (sentryVitePluginsOptions.sourcemaps) {
+      sentryVitePluginsOptions.sourcemaps = {
+        ...sourceMapsUploadOptions?.sourcemaps,
+        ...unstable_sentryVitePluginOptions?.sourcemaps,
+      };
+    }
+
+    if (sentryVitePluginsOptions.release) {
+      sentryVitePluginsOptions.release = {
+        ...sourceMapsUploadOptions?.release,
+        ...unstable_sentryVitePluginOptions?.release,
+      };
+    }
+
+    const sentryVitePlugins = await makeCustomSentryVitePlugins(sentryVitePluginsOptions);
+
     sentryPlugins.push(...sentryVitePlugins);
   }
 
diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts
index fbaf0f1e0581..42326baeade3 100644
--- a/packages/sveltekit/test/server/handle.test.ts
+++ b/packages/sveltekit/test/server/handle.test.ts
@@ -1,8 +1,14 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addTracingExtensions, spanIsSampled, spanToJSON } from '@sentry/core';
-import type { Transaction as TransactionClass } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  addTracingExtensions,
+  getRootSpan,
+  getSpanDescendants,
+  spanIsSampled,
+  spanToJSON,
+} from '@sentry/core';
 import { NodeClient, setCurrentClient } from '@sentry/node-experimental';
 import * as SentryNode from '@sentry/node-experimental';
-import type { Span, Transaction } from '@sentry/types';
+import type { Span } from '@sentry/types';
 import type { Handle } from '@sveltejs/kit';
 import { redirect } from '@sveltejs/kit';
 import { vi } from 'vitest';
@@ -119,8 +125,10 @@ describe('handleSentry', () => {
 
     it("creates a transaction if there's no active span", async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
 
       try {
@@ -138,17 +146,18 @@ describe('handleSentry', () => {
 
       expect(spanToJSON(_span!).timestamp).toBeDefined();
 
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (_span! as TransactionClass).spanRecorder?.spans;
+      const spans = getSpanDescendants(_span!);
       expect(spans).toHaveLength(1);
     });
 
     it('creates a child span for nested server calls (i.e. if there is an active span)', async () => {
       let _span: Span | undefined = undefined;
       let txnCount = 0;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
-        ++txnCount;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+          ++txnCount;
+        }
       });
 
       try {
@@ -177,8 +186,7 @@ describe('handleSentry', () => {
 
       expect(spanToJSON(_span!).timestamp).toBeDefined();
 
-      // eslint-disable-next-line deprecation/deprecation
-      const spans = (_span! as TransactionClass).spanRecorder?.spans?.map(spanToJSON);
+      const spans = getSpanDescendants(_span!).map(spanToJSON);
 
       expect(spans).toHaveLength(2);
       expect(spans).toEqual(
@@ -205,8 +213,10 @@ describe('handleSentry', () => {
       });
 
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
 
       try {
@@ -215,7 +225,7 @@ describe('handleSentry', () => {
         //
       }
 
-      expect(_span!).toBeDefined();
+      expect(_span).toBeDefined();
       expect(_span!.spanContext().traceId).toEqual('1234567890abcdef1234567890abcdef');
       expect(spanToJSON(_span!).parent_span_id).toEqual('1234567890abcdef');
       expect(spanIsSampled(_span!)).toEqual(true);
@@ -245,8 +255,10 @@ describe('handleSentry', () => {
       });
 
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
 
       try {
@@ -309,8 +321,10 @@ describe('handleSentry', () => {
 
     it("doesn't create a transaction if there's no route", async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
 
       try {
@@ -324,8 +338,10 @@ describe('handleSentry', () => {
 
     it("Creates a transaction if there's no route but `handleUnknownRequests` is true", async () => {
       let _span: Span | undefined = undefined;
-      client.on('finishTransaction', (transaction: Transaction) => {
-        _span = transaction;
+      client.on('spanEnd', span => {
+        if (span === getRootSpan(span)) {
+          _span = span;
+        }
       });
 
       try {
diff --git a/packages/sveltekit/test/server/load.test.ts b/packages/sveltekit/test/server/load.test.ts
index 8b8a5cbd80d4..00c9d3a34f46 100644
--- a/packages/sveltekit/test/server/load.test.ts
+++ b/packages/sveltekit/test/server/load.test.ts
@@ -1,5 +1,13 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addTracingExtensions } from '@sentry/core';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+  addTracingExtensions,
+} from '@sentry/core';
+import { getClient, getCurrentScope, getIsolationScope, init } from '@sentry/node-experimental';
 import * as SentryNode from '@sentry/node-experimental';
+import type { Event } from '@sentry/types';
 import type { Load, ServerLoad } from '@sveltejs/kit';
 import { error, redirect } from '@sveltejs/kit';
 import { vi } from 'vitest';
@@ -241,124 +249,180 @@ describe('wrapServerLoadWithSentry calls trace', () => {
     };
   }
 
+  beforeEach(() => {
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+  });
+
   it('attaches trace data if available', async () => {
+    const transactions: Event[] = [];
+
+    init({
+      enableTracing: true,
+      release: '8.0.0',
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      beforeSendTransaction: event => {
+        transactions.push(event);
+        return null;
+      },
+    });
+    const client = getClient()!;
+
     const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
     await wrappedLoad(getServerOnlyArgs());
 
-    expect(mockStartSpan).toHaveBeenCalledTimes(1);
-    expect(mockStartSpan).toHaveBeenCalledWith(
-      {
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-        },
-        op: 'function.sveltekit.server.load',
-        name: '/users/[id]',
-        parentSampled: true,
-        parentSpanId: '1234567890abcdef',
-        traceId: '1234567890abcdef1234567890abcdef',
-        data: {
-          'http.method': 'GET',
-        },
-        metadata: {
-          dynamicSamplingContext: {
-            environment: 'production',
-            public_key: 'dogsarebadatkeepingsecrets',
-            release: '1.0.0',
-            sample_rate: '1',
-            trace_id: '1234567890abcdef1234567890abcdef',
-            transaction: 'dogpark',
-          },
-        },
+    await client.flush();
+
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
+        'http.method': 'GET',
       },
-      expect.any(Function),
-    );
+      op: 'function.sveltekit.server.load',
+      parent_span_id: '1234567890abcdef',
+      span_id: expect.any(String),
+      trace_id: '1234567890abcdef1234567890abcdef',
+      origin: 'auto.function.sveltekit',
+    });
+    expect(transaction.transaction).toEqual('/users/[id]');
+    expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({
+      environment: 'production',
+      public_key: 'dogsarebadatkeepingsecrets',
+      release: '1.0.0',
+      sample_rate: '1',
+      trace_id: '1234567890abcdef1234567890abcdef',
+      transaction: 'dogpark',
+    });
   });
 
   it("doesn't attach trace data if it's not available", async () => {
+    const transactions: Event[] = [];
+
+    init({
+      enableTracing: true,
+      release: '8.0.0',
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      beforeSendTransaction: event => {
+        transactions.push(event);
+        return null;
+      },
+    });
+    const client = getClient()!;
+
     const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
     await wrappedLoad(getServerArgsWithoutTracingHeaders());
 
-    expect(mockStartSpan).toHaveBeenCalledTimes(1);
-    expect(mockStartSpan).toHaveBeenCalledWith(
-      {
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-        },
-        op: 'function.sveltekit.server.load',
-        name: '/users/[id]',
-        metadata: {},
-        data: {
-          'http.method': 'GET',
-        },
+    await client.flush();
+
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE]: 1,
+        'http.method': 'GET',
       },
-      expect.any(Function),
-    );
+      op: 'function.sveltekit.server.load',
+      span_id: expect.any(String),
+      trace_id: expect.not.stringContaining('1234567890abcdef1234567890abcdef'),
+      origin: 'auto.function.sveltekit',
+    });
+    expect(transaction.transaction).toEqual('/users/[id]');
+    expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({
+      environment: 'production',
+      public_key: 'public',
+      sample_rate: '1',
+      sampled: 'true',
+      release: '8.0.0',
+      trace_id: transaction.contexts?.trace?.trace_id,
+      transaction: '/users/[id]',
+    });
   });
 
   it("doesn't attach the DSC data if the baggage header not available", async () => {
+    const transactions: Event[] = [];
+
+    init({
+      enableTracing: true,
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      beforeSendTransaction: event => {
+        transactions.push(event);
+        return null;
+      },
+    });
+    const client = getClient()!;
+
     const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
     await wrappedLoad(getServerArgsWithoutBaggageHeader());
 
-    expect(mockStartSpan).toHaveBeenCalledTimes(1);
-    expect(mockStartSpan).toHaveBeenCalledWith(
-      {
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-        },
-        op: 'function.sveltekit.server.load',
-        name: '/users/[id]',
-        parentSampled: true,
-        parentSpanId: '1234567890abcdef',
-        traceId: '1234567890abcdef1234567890abcdef',
-        data: {
-          'http.method': 'GET',
-        },
-        metadata: {
-          dynamicSamplingContext: {},
-        },
+    await client.flush();
+
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
+        'http.method': 'GET',
       },
-      expect.any(Function),
-    );
+      op: 'function.sveltekit.server.load',
+      parent_span_id: '1234567890abcdef',
+      span_id: expect.any(String),
+      trace_id: '1234567890abcdef1234567890abcdef',
+      origin: 'auto.function.sveltekit',
+    });
+    expect(transaction.transaction).toEqual('/users/[id]');
+    expect(transaction.sdkProcessingMetadata?.dynamicSamplingContext).toEqual({});
   });
 
   it('falls back to the raw url if `event.route.id` is not available', async () => {
+    const transactions: Event[] = [];
+
+    init({
+      enableTracing: true,
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      beforeSendTransaction: event => {
+        transactions.push(event);
+        return null;
+      },
+    });
+    const client = getClient()!;
+
     const event = getServerOnlyArgs();
     // @ts-expect-error - this is fine (just tests here)
     delete event.route;
     const wrappedLoad = wrapServerLoadWithSentry(serverLoad);
     await wrappedLoad(event);
 
-    expect(mockStartSpan).toHaveBeenCalledTimes(1);
-    expect(mockStartSpan).toHaveBeenCalledWith(
-      {
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-        },
-        op: 'function.sveltekit.server.load',
-        name: '/users/123',
-        parentSampled: true,
-        parentSpanId: '1234567890abcdef',
-        traceId: '1234567890abcdef1234567890abcdef',
-        data: {
-          'http.method': 'GET',
-        },
-        metadata: {
-          dynamicSamplingContext: {
-            environment: 'production',
-            public_key: 'dogsarebadatkeepingsecrets',
-            release: '1.0.0',
-            sample_rate: '1',
-            trace_id: '1234567890abcdef1234567890abcdef',
-            transaction: 'dogpark',
-          },
-        },
+    await client.flush();
+
+    expect(transactions).toHaveLength(1);
+    const transaction = transactions[0];
+
+    expect(transaction.contexts?.trace).toEqual({
+      data: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.sveltekit',
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+        [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.sveltekit.server.load',
+        'http.method': 'GET',
       },
-      expect.any(Function),
-    );
+      op: 'function.sveltekit.server.load',
+      parent_span_id: '1234567890abcdef',
+      span_id: expect.any(String),
+      trace_id: '1234567890abcdef1234567890abcdef',
+      origin: 'auto.function.sveltekit',
+    });
+    expect(transaction.transaction).toEqual('/users/123');
   });
 
   it("doesn't wrap server load more than once if the wrapper was applied multiple times", async () => {
diff --git a/packages/sveltekit/test/server/utils.test.ts b/packages/sveltekit/test/server/utils.test.ts
index 3543a1128835..f3cac3eb47a0 100644
--- a/packages/sveltekit/test/server/utils.test.ts
+++ b/packages/sveltekit/test/server/utils.test.ts
@@ -23,32 +23,27 @@ const MOCK_REQUEST_EVENT: any = {
 };
 
 describe('getTracePropagationData', () => {
-  it('returns traceParentData and DSC if both are available', () => {
+  it('returns sentryTrace & baggage strings 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',
-    });
+    const { sentryTrace, baggage } = getTracePropagationData(event);
+
+    expect(sentryTrace).toEqual('1234567890abcdef1234567890abcdef-1234567890abcdef-1');
+    expect(baggage?.split(',').sort()).toEqual([
+      'sentry-environment=production',
+      'sentry-public_key=dogsarebadatkeepingsecrets',
+      'sentry-release=1.0.0',
+      'sentry-sample_rate=1',
+      'sentry-trace_id=1234567890abcdef1234567890abcdef',
+      'sentry-transaction=dogpark',
+    ]);
   });
 
-  it('returns undefined if the necessary header is not avaolable', () => {
+  it('returns empty if the necessary header is not available', () => {
     const event: any = { request: { headers: { get: () => undefined } } };
-    const { traceparentData, dynamicSamplingContext } = getTracePropagationData(event);
+    const { sentryTrace, baggage } = getTracePropagationData(event);
 
-    expect(traceparentData).toBeUndefined();
-    expect(dynamicSamplingContext).toBeUndefined();
+    expect(sentryTrace).toBe('');
+    expect(baggage).toBeUndefined();
   });
 });
diff --git a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
index 5519a4e33953..44f34362162f 100644
--- a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
+++ b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
@@ -113,6 +113,63 @@ describe('sentrySvelteKit()', () => {
     });
   });
 
+  it('passes user-specified vite plugin options to the custom sentry source maps plugin', async () => {
+    const makePluginSpy = vi.spyOn(sourceMaps, 'makeCustomSentryVitePlugins');
+    await getSentrySvelteKitPlugins({
+      debug: true,
+      sourceMapsUploadOptions: {
+        org: 'my-org',
+        sourcemaps: {
+          assets: ['nope/*.js'],
+          filesToDeleteAfterUpload: ['baz/*.js'],
+        },
+        release: {
+          inject: false,
+          name: '2.0.0',
+        },
+        unstable_sentryVitePluginOptions: {
+          org: 'other-org',
+          sourcemaps: {
+            assets: ['foo/*.js'],
+            ignore: ['bar/*.js'],
+          },
+          release: {
+            name: '3.0.0',
+            setCommits: {
+              auto: true,
+            },
+          },
+          headers: {
+            'X-My-Header': 'foo',
+          },
+        },
+      },
+      autoInstrument: false,
+      adapter: 'vercel',
+    });
+
+    expect(makePluginSpy).toHaveBeenCalledWith({
+      debug: true,
+      org: 'other-org',
+      sourcemaps: {
+        assets: ['foo/*.js'],
+        ignore: ['bar/*.js'],
+        filesToDeleteAfterUpload: ['baz/*.js'],
+      },
+      release: {
+        inject: false,
+        name: '3.0.0',
+        setCommits: {
+          auto: true,
+        },
+      },
+      headers: {
+        'X-My-Header': 'foo',
+      },
+      adapter: 'vercel',
+    });
+  });
+
   it('passes user-specified options to the auto instrument plugin', async () => {
     const makePluginSpy = vi.spyOn(autoInstrument, 'makeAutoInstrumentationPlugin');
     const plugins = await getSentrySvelteKitPlugins({
diff --git a/packages/tracing-internal/README.md b/packages/tracing-internal/README.md
index 89fb3d609619..76f035499f0d 100644
--- a/packages/tracing-internal/README.md
+++ b/packages/tracing-internal/README.md
@@ -8,4 +8,5 @@
 
 This is an internal package that is being used to migrate @sentry/tracing code to its respective runtime packages.
 
-For v8, @sentry/tracing will be dropped and the code in this package will be split into @sentry/browser and @sentry/node.
+For v8, @sentry/tracing will be dropped and the code in this package will be split into @sentry/browser and
+@sentry/node.
diff --git a/packages/tracing-internal/package.json b/packages/tracing-internal/package.json
index e44b65b30b3a..c2b523736e1b 100644
--- a/packages/tracing-internal/package.json
+++ b/packages/tracing-internal/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/tracing-internal/rollup.npm.config.mjs b/packages/tracing-internal/rollup.npm.config.mjs
index 84a06f2fb64a..fd61fbf7c62c 100644
--- a/packages/tracing-internal/rollup.npm.config.mjs
+++ b/packages/tracing-internal/rollup.npm.config.mjs
@@ -1,3 +1,14 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-export default makeNPMConfigVariants(makeBaseNPMConfig());
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    packageSpecificConfig: {
+      output: {
+        // set exports to 'named' or 'auto' so that rollup doesn't warn
+        exports: 'named',
+        // set preserveModules to false because we want to bundle everything into one file.
+        preserveModules: false,
+      },
+    },
+  }),
+);
diff --git a/packages/tracing-internal/src/browser/backgroundtab.ts b/packages/tracing-internal/src/browser/backgroundtab.ts
index ad0c57d55fe6..928503ba6869 100644
--- a/packages/tracing-internal/src/browser/backgroundtab.ts
+++ b/packages/tracing-internal/src/browser/backgroundtab.ts
@@ -18,9 +18,6 @@ export function registerBackgroundTabDetection(): void {
       }
 
       const rootSpan = getRootSpan(activeSpan);
-      if (!rootSpan) {
-        return;
-      }
 
       if (WINDOW.document.hidden && rootSpan) {
         const cancelledStatus = 'cancelled';
diff --git a/packages/tracing-internal/src/browser/browserTracingIntegration.ts b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
index 9c0877045084..713e4f986c2b 100644
--- a/packages/tracing-internal/src/browser/browserTracingIntegration.ts
+++ b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
@@ -1,31 +1,21 @@
-import type { IdleTransaction } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { getActiveSpan } from '@sentry/core';
-import { getCurrentHub } from '@sentry/core';
 import {
+  SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   TRACING_DEFAULTS,
   addTracingExtensions,
-  getActiveTransaction,
+  continueTrace,
+  getActiveSpan,
+  getClient,
+  getCurrentScope,
+  getRootSpan,
   spanToJSON,
-  startIdleTransaction,
+  startIdleSpan,
+  withScope,
 } from '@sentry/core';
-import type {
-  Client,
-  IntegrationFn,
-  StartSpanOptions,
-  Transaction,
-  TransactionContext,
-  TransactionSource,
-} from '@sentry/types';
+import type { Client, IntegrationFn, StartSpanOptions, TransactionSource } from '@sentry/types';
 import type { Span } from '@sentry/types';
-import {
-  addHistoryInstrumentationHandler,
-  browserPerformanceTimeOrigin,
-  getDomElement,
-  logger,
-  propagationContextFromHeaders,
-} from '@sentry/utils';
+import { addHistoryInstrumentationHandler, browserPerformanceTimeOrigin, getDomElement, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../common/debug-build';
 import { registerBackgroundTabDetection } from './backgroundtab';
@@ -43,34 +33,28 @@ export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';
 /** Options for Browser Tracing integration */
 export interface BrowserTracingOptions {
   /**
-   * The time to wait in ms until the transaction will be finished during an idle state. An idle state is defined
-   * by a moment where there are no in-progress spans.
-   *
-   * The transaction will use the end timestamp of the last finished span as the endtime for the transaction.
-   * If there are still active spans when this the `idleTimeout` is set, the `idleTimeout` will get reset.
-   * Time is in ms.
+   * The time that has to pass without any span being created.
+   * If this time is exceeded, the idle span will finish.
    *
-   * Default: 1000
+   * Default: 1000 (ms)
    */
   idleTimeout: number;
 
   /**
-   * The max duration for a transaction. If a transaction duration hits the `finalTimeout` value, it
-   * will be finished.
-   * Time is in ms.
+   * The max. time an idle span may run.
+   * If this time is exceeded, the idle span will finish no matter what.
    *
-   * Default: 30000
+   * Default: 30000 (ms)
    */
   finalTimeout: number;
 
   /**
-   * The heartbeat interval. If no new spans are started or open spans are finished within 3 heartbeats,
-   * the transaction will be finished.
-   * Time is in ms.
+   The max. time an idle span may run.
+   * If this time is exceeded, the idle span will finish no matter what.
    *
-   * Default: 5000
+   * Default: 15000 (ms)
    */
-  heartbeatInterval: number;
+  childSpanTimeout: number;
 
   /**
    * If a span should be created on page load.
@@ -176,7 +160,7 @@ const DEFAULT_BROWSER_TRACING_OPTIONS: BrowserTracingOptions = {
  * actions as transactions, and captures requests, metrics and errors as spans.
  *
  * The integration can be configured with a variety of options, and can be extended to use
- * any routing library. This integration uses {@see IdleTransaction} to create transactions.
+ * any routing library.
  *
  * We explicitly export the proper type here, as this has to be extended in some cases.
  */
@@ -201,88 +185,53 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
   let latestRouteSource: TransactionSource | undefined;
 
   /** Create routing idle transaction. */
-  function _createRouteTransaction(context: TransactionContext): Transaction | undefined {
-    // eslint-disable-next-line deprecation/deprecation
-    const hub = getCurrentHub();
-
-    const { beforeStartSpan, idleTimeout, finalTimeout, heartbeatInterval } = options;
-
-    const isPageloadTransaction = context.op === 'pageload';
-
-    let expandedContext: TransactionContext;
-    if (isPageloadTransaction) {
-      const sentryTrace = isPageloadTransaction ? getMetaContent('sentry-trace') : '';
-      const baggage = isPageloadTransaction ? getMetaContent('baggage') : undefined;
-      const { traceId, dsc, parentSpanId, sampled } = propagationContextFromHeaders(sentryTrace, baggage);
-      expandedContext = {
-        traceId,
-        parentSpanId,
-        parentSampled: sampled,
-        ...context,
-        metadata: {
-          // eslint-disable-next-line deprecation/deprecation
-          ...context.metadata,
-          dynamicSamplingContext: dsc,
-        },
-        trimEnd: true,
-      };
-    } else {
-      expandedContext = {
-        trimEnd: true,
-        ...context,
-      };
-    }
+  function _createRouteSpan(client: Client, startSpanOptions: StartSpanOptions): Span {
+    const { beforeStartSpan, idleTimeout, finalTimeout, childSpanTimeout } = options;
 
-    const finalContext: TransactionContext = beforeStartSpan ? beforeStartSpan(expandedContext) : expandedContext;
+    const isPageloadTransaction = startSpanOptions.op === 'pageload';
+
+    const finalStartSpanOptions: StartSpanOptions = beforeStartSpan
+      ? beforeStartSpan(startSpanOptions)
+      : startSpanOptions;
 
     // If `beforeStartSpan` set a custom name, record that fact
-    finalContext.attributes =
-      finalContext.name !== expandedContext.name
-        ? { ...finalContext.attributes, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom' }
-        : finalContext.attributes;
-
-    latestRouteName = finalContext.name;
-    if (finalContext.attributes) {
-      latestRouteSource = finalContext.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
-    }
+    const attributes = finalStartSpanOptions.attributes || {};
 
-    if (finalContext.sampled === false) {
-      DEBUG_BUILD && logger.log(`[Tracing] Will not send ${finalContext.op} transaction because of beforeNavigate.`);
+    if (finalStartSpanOptions.name !== finalStartSpanOptions.name) {
+      attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE] = 'custom';
+      finalStartSpanOptions.attributes = attributes;
     }
 
-    DEBUG_BUILD && logger.log(`[Tracing] Starting ${finalContext.op} transaction on scope`);
+    latestRouteName = finalStartSpanOptions.name;
+    latestRouteSource = attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
 
-    const { location } = WINDOW;
+    DEBUG_BUILD && logger.log(`[Tracing] Starting ${finalStartSpanOptions.op} idle span on scope`);
 
-    const idleTransaction = startIdleTransaction(
-      hub,
-      finalContext,
+    const idleSpan = startIdleSpan(finalStartSpanOptions, {
       idleTimeout,
       finalTimeout,
-      true,
-      { location }, // for use in the tracesSampler
-      heartbeatInterval,
-      isPageloadTransaction, // should wait for finish signal if it's a pageload transaction
-    );
+      childSpanTimeout,
+      // should wait for finish signal if it's a pageload transaction
+      disableAutoFinish: isPageloadTransaction,
+      beforeSpanEnd: span => {
+        _collectWebVitals();
+        addPerformanceEntries(span);
+      },
+    });
 
     if (isPageloadTransaction && WINDOW.document) {
       WINDOW.document.addEventListener('readystatechange', () => {
         if (['interactive', 'complete'].includes(WINDOW.document.readyState)) {
-          idleTransaction.sendAutoFinishSignal();
+          client.emit('idleSpanEnableAutoFinish', idleSpan);
         }
       });
 
       if (['interactive', 'complete'].includes(WINDOW.document.readyState)) {
-        idleTransaction.sendAutoFinishSignal();
+        client.emit('idleSpanEnableAutoFinish', idleSpan);
       }
     }
 
-    idleTransaction.registerBeforeFinishCallback(transaction => {
-      _collectWebVitals();
-      addPerformanceEntries(transaction);
-    });
-
-    return idleTransaction as Transaction;
+    return idleSpan;
   }
 
   return {
@@ -296,32 +245,61 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
       let activeSpan: Span | undefined;
       let startingUrl: string | undefined = WINDOW.location && WINDOW.location.href;
 
-      client.on('startNavigationSpan', (context: StartSpanOptions) => {
+      client.on('startNavigationSpan', startSpanOptions => {
+        if (getClient() !== client) {
+          return;
+        }
+
         if (activeSpan) {
           DEBUG_BUILD && logger.log(`[Tracing] Finishing current transaction with op: ${spanToJSON(activeSpan).op}`);
           // If there's an open transaction on the scope, we need to finish it before creating an new one.
           activeSpan.end();
         }
-        activeSpan = _createRouteTransaction({
+        activeSpan = _createRouteSpan(client, {
           op: 'navigation',
-          ...context,
+          ...startSpanOptions,
         });
       });
 
-      client.on('startPageLoadSpan', (context: StartSpanOptions) => {
+      client.on('startPageLoadSpan', (startSpanOptions, traceOptions) => {
+        if (getClient() !== client) {
+          return;
+        }
+
         if (activeSpan) {
           DEBUG_BUILD && logger.log(`[Tracing] Finishing current transaction with op: ${spanToJSON(activeSpan).op}`);
           // If there's an open transaction on the scope, we need to finish it before creating an new one.
           activeSpan.end();
         }
-        activeSpan = _createRouteTransaction({
-          op: 'pageload',
-          ...context,
+
+        const sentryTrace = traceOptions?.sentryTrace || getMetaContent('sentry-trace');
+        const baggage = traceOptions?.baggage || getMetaContent('baggage');
+
+        // Continue trace updates the scope in the callback only, but we want to break out of it again...
+        // This is a bit hacky, because we want to get the span to use both the correct scope _and_ the correct propagation context
+        // but afterwards, we want to reset it to avoid this also applying to other spans
+        const scope = getCurrentScope();
+        const propagationContextBefore = scope.getPropagationContext();
+
+        activeSpan = continueTrace({ sentryTrace, baggage }, () => {
+          // We update the outer current scope to have the correct propagation context...
+          scope.setPropagationContext(getCurrentScope().getPropagationContext());
+
+          // Ensure we are on the original current scope again, so the span is set as active on it
+          return withScope(scope, () => {
+            return _createRouteSpan(client, {
+              op: 'pageload',
+              ...startSpanOptions,
+            });
+          });
         });
+
+        // Reset this back to what it was before
+        scope.setPropagationContext(propagationContextBefore);
       });
 
       if (options.instrumentPageLoad && WINDOW.location) {
-        const context: StartSpanOptions = {
+        const startSpanOptions: StartSpanOptions = {
           name: WINDOW.location.pathname,
           // pageload should always start at timeOrigin (and needs to be in s, not ms)
           startTime: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
@@ -330,7 +308,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
           },
         };
-        startBrowserTracingPageLoadSpan(client, context);
+        startBrowserTracingPageLoadSpan(client, startSpanOptions);
       }
 
       if (options.instrumentNavigation && WINDOW.location) {
@@ -351,7 +329,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
 
           if (from !== to) {
             startingUrl = undefined;
-            const context: StartSpanOptions = {
+            const startSpanOptions: StartSpanOptions = {
               name: WINDOW.location.pathname,
               attributes: {
                 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
@@ -359,7 +337,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
               },
             };
 
-            startBrowserTracingNavigationSpan(client, context);
+            startBrowserTracingNavigationSpan(client, startSpanOptions);
           }
         });
       }
@@ -386,9 +364,18 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
 /**
  * Manually start a page load span.
  * This will only do something if a browser tracing integration integration has been setup.
+ *
+ * If you provide a custom `traceOptions` object, it will be used to continue the trace
+ * instead of the default behavior, which is to look it up on the <meta> tags.
  */
-export function startBrowserTracingPageLoadSpan(client: Client, spanOptions: StartSpanOptions): Span | undefined {
-  client.emit('startPageLoadSpan', spanOptions);
+export function startBrowserTracingPageLoadSpan(
+  client: Client,
+  spanOptions: StartSpanOptions,
+  traceOptions?: { sentryTrace?: string | undefined; baggage?: string | undefined },
+): Span | undefined {
+  client.emit('startPageLoadSpan', spanOptions, traceOptions);
+
+  getCurrentScope().setTransactionName(spanOptions.name);
 
   const span = getActiveSpan();
   const op = span && spanToJSON(span).op;
@@ -402,6 +389,8 @@ export function startBrowserTracingPageLoadSpan(client: Client, spanOptions: Sta
 export function startBrowserTracingNavigationSpan(client: Client, spanOptions: StartSpanOptions): Span | undefined {
   client.emit('startNavigationSpan', spanOptions);
 
+  getCurrentScope().setTransactionName(spanOptions.name);
+
   const span = getActiveSpan();
   const op = span && spanToJSON(span).op;
   return op === 'navigation' ? span : undefined;
@@ -423,28 +412,26 @@ function registerInteractionListener(
   latestRouteName: string | undefined,
   latestRouteSource: TransactionSource | undefined,
 ): void {
-  let inflightInteractionTransaction: IdleTransaction | undefined;
+  let inflightInteractionSpan: Span | undefined;
   const registerInteractionTransaction = (): void => {
-    const { idleTimeout, finalTimeout, heartbeatInterval } = options;
+    const { idleTimeout, finalTimeout, childSpanTimeout } = options;
     const op = 'ui.action.click';
 
-    // eslint-disable-next-line deprecation/deprecation
-    const currentTransaction = getActiveTransaction();
-    if (currentTransaction) {
-      const currentTransactionOp = spanToJSON(currentTransaction).op;
-      if (currentTransactionOp && ['navigation', 'pageload'].includes(currentTransactionOp)) {
+    const activeSpan = getActiveSpan();
+    const rootSpan = activeSpan && getRootSpan(activeSpan);
+    if (rootSpan) {
+      const currentRootSpanOp = spanToJSON(rootSpan).op;
+      if (['navigation', 'pageload'].includes(currentRootSpanOp as string)) {
         DEBUG_BUILD &&
-          logger.warn(
-            `[Tracing] Did not create ${op} transaction because a pageload or navigation transaction is in progress.`,
-          );
+          logger.warn(`[Tracing] Did not create ${op} span because a pageload or navigation span is in progress.`);
         return undefined;
       }
     }
 
-    if (inflightInteractionTransaction) {
-      inflightInteractionTransaction.setFinishReason('interactionInterrupted');
-      inflightInteractionTransaction.end();
-      inflightInteractionTransaction = undefined;
+    if (inflightInteractionSpan) {
+      inflightInteractionSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON, 'interactionInterrupted');
+      inflightInteractionSpan.end();
+      inflightInteractionSpan = undefined;
     }
 
     if (!latestRouteName) {
@@ -452,26 +439,19 @@ function registerInteractionListener(
       return undefined;
     }
 
-    const { location } = WINDOW;
-
-    const context: TransactionContext = {
-      name: latestRouteName,
-      op,
-      trimEnd: true,
-      data: {
-        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: latestRouteSource || 'url',
+    inflightInteractionSpan = startIdleSpan(
+      {
+        name: latestRouteName,
+        op,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: latestRouteSource || 'url',
+        },
+      },
+      {
+        idleTimeout,
+        finalTimeout,
+        childSpanTimeout,
       },
-    };
-
-    inflightInteractionTransaction = startIdleTransaction(
-      // eslint-disable-next-line deprecation/deprecation
-      getCurrentHub(),
-      context,
-      idleTimeout,
-      finalTimeout,
-      true,
-      { location }, // for use in the tracesSampler
-      heartbeatInterval,
     );
   };
 
diff --git a/packages/tracing-internal/src/browser/browsertracing.ts b/packages/tracing-internal/src/browser/browsertracing.ts
deleted file mode 100644
index e499fd9ff11b..000000000000
--- a/packages/tracing-internal/src/browser/browsertracing.ts
+++ /dev/null
@@ -1,455 +0,0 @@
-import type { Hub, IdleTransaction } from '@sentry/core';
-import { spanToJSON } from '@sentry/core';
-import {
-  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
-  TRACING_DEFAULTS,
-  addTracingExtensions,
-  getActiveTransaction,
-  startIdleTransaction,
-} from '@sentry/core';
-import type { EventProcessor, Integration, Transaction, TransactionContext, TransactionSource } from '@sentry/types';
-import { getDomElement, logger, propagationContextFromHeaders } from '@sentry/utils';
-
-import { DEBUG_BUILD } from '../common/debug-build';
-import { registerBackgroundTabDetection } from './backgroundtab';
-import {
-  addPerformanceEntries,
-  startTrackingInteractions,
-  startTrackingLongTasks,
-  startTrackingWebVitals,
-} from './metrics';
-import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
-import { instrumentRoutingWithDefaults } from './router';
-import { WINDOW } from './types';
-
-export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';
-
-/** Options for Browser Tracing integration */
-export interface BrowserTracingOptions {
-  /**
-   * The time to wait in ms until the transaction will be finished during an idle state. An idle state is defined
-   * by a moment where there are no in-progress spans.
-   *
-   * The transaction will use the end timestamp of the last finished span as the endtime for the transaction.
-   * If there are still active spans when this the `idleTimeout` is set, the `idleTimeout` will get reset.
-   * Time is in ms.
-   *
-   * Default: 1000
-   */
-  idleTimeout: number;
-
-  /**
-   * The max duration for a transaction. If a transaction duration hits the `finalTimeout` value, it
-   * will be finished.
-   * Time is in ms.
-   *
-   * Default: 30000
-   */
-  finalTimeout: number;
-
-  /**
-   * The heartbeat interval. If no new spans are started or open spans are finished within 3 heartbeats,
-   * the transaction will be finished.
-   * Time is in ms.
-   *
-   * Default: 5000
-   */
-  heartbeatInterval: number;
-
-  /**
-   * Flag to enable/disable creation of `navigation` transaction on history changes.
-   *
-   * Default: true
-   */
-  startTransactionOnLocationChange: boolean;
-
-  /**
-   * Flag to enable/disable creation of `pageload` transaction on first pageload.
-   *
-   * Default: true
-   */
-  startTransactionOnPageLoad: boolean;
-
-  /**
-   * Flag Transactions where tabs moved to background with "cancelled". Browser background tab timing is
-   * not suited towards doing precise measurements of operations. By default, we recommend that this option
-   * be enabled as background transactions can mess up your statistics in nondeterministic ways.
-   *
-   * Default: true
-   */
-  markBackgroundTransactions: boolean;
-
-  /**
-   * If true, Sentry will capture long tasks and add them to the corresponding transaction.
-   *
-   * Default: true
-   */
-  enableLongTask: boolean;
-
-  /**
-   * Flag to disable patching all together for fetch requests.
-   *
-   * Default: true
-   */
-  traceFetch: boolean;
-
-  /**
-   * Flag to disable patching all together for xhr requests.
-   *
-   * Default: true
-   */
-  traceXHR: boolean;
-
-  /**
-   * If true, Sentry will capture http timings and add them to the corresponding http spans.
-   *
-   * Default: true
-   */
-  enableHTTPTimings: boolean;
-
-  /**
-   * _metricOptions allows the user to send options to change how metrics are collected.
-   *
-   * _metricOptions is currently experimental.
-   *
-   * Default: undefined
-   */
-  _metricOptions?: Partial<{
-    /**
-     * @deprecated This property no longer has any effect and will be removed in v8.
-     */
-    _reportAllChanges: boolean;
-  }>;
-
-  /**
-   * _experiments allows the user to send options to define how this integration works.
-   * Note that the `enableLongTask` options is deprecated in favor of the option at the top level, and will be removed in v8.
-   *
-   * TODO (v8): Remove enableLongTask
-   *
-   * Default: undefined
-   */
-  _experiments: Partial<{
-    enableLongTask: boolean;
-    enableInteractions: boolean;
-    onStartRouteTransaction: (t: Transaction | undefined, ctx: TransactionContext, getCurrentHub: () => Hub) => void;
-  }>;
-
-  /**
-   * beforeNavigate is called before a pageload/navigation transaction is created and allows users to modify transaction
-   * context data, or drop the transaction entirely (by setting `sampled = false` in the context).
-   *
-   * Note: For legacy reasons, transactions can also be dropped by returning `undefined`.
-   *
-   * @param context: The context data which will be passed to `startTransaction` by default
-   *
-   * @returns A (potentially) modified context object, with `sampled = false` if the transaction should be dropped.
-   */
-  beforeNavigate?(this: void, context: TransactionContext): TransactionContext | undefined;
-
-  /**
-   * Instrumentation that creates routing change transactions. By default creates
-   * pageload and navigation transactions.
-   */
-  routingInstrumentation<T extends Transaction>(
-    this: void,
-    customStartTransaction: (context: TransactionContext) => T | undefined,
-    startTransactionOnPageLoad?: boolean,
-    startTransactionOnLocationChange?: boolean,
-  ): void;
-
-  /**
-   * This function will be called before creating a span for a request with the given url.
-   * Return false if you don't want a span for the given url.
-   *
-   * Default: (url: string) => true
-   */
-  shouldCreateSpanForRequest?(this: void, url: string): boolean;
-}
-
-const DEFAULT_BROWSER_TRACING_OPTIONS: BrowserTracingOptions = {
-  ...TRACING_DEFAULTS,
-  markBackgroundTransactions: true,
-  routingInstrumentation: instrumentRoutingWithDefaults,
-  startTransactionOnLocationChange: true,
-  startTransactionOnPageLoad: true,
-  enableLongTask: true,
-  _experiments: {},
-  ...defaultRequestInstrumentationOptions,
-};
-
-/**
- * The Browser Tracing integration automatically instruments browser pageload/navigation
- * actions as transactions, and captures requests, metrics and errors as spans.
- *
- * The integration can be configured with a variety of options, and can be extended to use
- * any routing library. This integration uses {@see IdleTransaction} to create transactions.
- *
- * @deprecated Use `browserTracingIntegration()` instead.
- */
-export class BrowserTracing implements Integration {
-  // This class currently doesn't have a static `id` field like the other integration classes, because it prevented
-  // @sentry/tracing from being treeshaken. Tree shakers do not like static fields, because they behave like side effects.
-  // TODO: Come up with a better plan, than using static fields on integration classes, and use that plan on all
-  // integrations.
-
-  /** Browser Tracing integration options */
-  public options: BrowserTracingOptions;
-
-  /**
-   * @inheritDoc
-   */
-  public name: string;
-
-  private _getCurrentHub?: () => Hub;
-
-  private _latestRouteName?: string;
-  private _latestRouteSource?: TransactionSource;
-
-  private _collectWebVitals: () => void;
-
-  public constructor(_options?: Partial<BrowserTracingOptions>) {
-    this.name = BROWSER_TRACING_INTEGRATION_ID;
-
-    addTracingExtensions();
-
-    this.options = {
-      ...DEFAULT_BROWSER_TRACING_OPTIONS,
-      ..._options,
-    };
-
-    // Special case: enableLongTask can be set in _experiments
-    // TODO (v8): Remove this in v8
-    if (this.options._experiments.enableLongTask !== undefined) {
-      this.options.enableLongTask = this.options._experiments.enableLongTask;
-    }
-
-    this._collectWebVitals = startTrackingWebVitals();
-    if (this.options.enableLongTask) {
-      startTrackingLongTasks();
-    }
-    if (this.options._experiments.enableInteractions) {
-      startTrackingInteractions();
-    }
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
-    this._getCurrentHub = getCurrentHub;
-    const hub = getCurrentHub();
-    // eslint-disable-next-line deprecation/deprecation
-    const client = hub.getClient();
-    const clientOptions = client && client.getOptions();
-
-    const {
-      routingInstrumentation: instrumentRouting,
-      startTransactionOnLocationChange,
-      startTransactionOnPageLoad,
-      markBackgroundTransactions,
-      traceFetch,
-      traceXHR,
-      shouldCreateSpanForRequest,
-      enableHTTPTimings,
-      _experiments,
-    } = this.options;
-
-    instrumentRouting(
-      (context: TransactionContext) => {
-        const transaction = this._createRouteTransaction(context);
-
-        this.options._experiments.onStartRouteTransaction &&
-          this.options._experiments.onStartRouteTransaction(transaction, context, getCurrentHub);
-
-        return transaction;
-      },
-      startTransactionOnPageLoad,
-      startTransactionOnLocationChange,
-    );
-
-    if (markBackgroundTransactions) {
-      registerBackgroundTabDetection();
-    }
-
-    if (_experiments.enableInteractions) {
-      this._registerInteractionListener();
-    }
-
-    instrumentOutgoingRequests({
-      traceFetch,
-      traceXHR,
-      tracePropagationTargets: clientOptions && clientOptions.tracePropagationTargets,
-      shouldCreateSpanForRequest,
-      enableHTTPTimings,
-    });
-  }
-
-  /** Create routing idle transaction. */
-  private _createRouteTransaction(context: TransactionContext): Transaction | undefined {
-    if (!this._getCurrentHub) {
-      DEBUG_BUILD &&
-        logger.warn(`[Tracing] Did not create ${context.op} transaction because _getCurrentHub is invalid.`);
-      return undefined;
-    }
-
-    const hub = this._getCurrentHub();
-
-    const { beforeNavigate, idleTimeout, finalTimeout, heartbeatInterval } = this.options;
-
-    const isPageloadTransaction = context.op === 'pageload';
-
-    let expandedContext: TransactionContext;
-    if (isPageloadTransaction) {
-      const sentryTrace = isPageloadTransaction ? getMetaContent('sentry-trace') : '';
-      const baggage = isPageloadTransaction ? getMetaContent('baggage') : undefined;
-      const { traceId, dsc, parentSpanId, sampled } = propagationContextFromHeaders(sentryTrace, baggage);
-      expandedContext = {
-        traceId,
-        parentSpanId,
-        parentSampled: sampled,
-        ...context,
-        metadata: {
-          // eslint-disable-next-line deprecation/deprecation
-          ...context.metadata,
-          dynamicSamplingContext: dsc,
-        },
-        trimEnd: true,
-      };
-    } else {
-      expandedContext = {
-        trimEnd: true,
-        ...context,
-      };
-    }
-
-    const modifiedContext = typeof beforeNavigate === 'function' ? beforeNavigate(expandedContext) : expandedContext;
-
-    // For backwards compatibility reasons, beforeNavigate can return undefined to "drop" the transaction (prevent it
-    // from being sent to Sentry).
-    const finalContext = modifiedContext === undefined ? { ...expandedContext, sampled: false } : modifiedContext;
-
-    // If `beforeNavigate` set a custom name, record that fact
-    finalContext.attributes =
-      finalContext.name !== expandedContext.name
-        ? { ...finalContext.attributes, [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'custom' }
-        : finalContext.attributes;
-
-    this._latestRouteName = finalContext.name;
-    if (finalContext.attributes) {
-      this._latestRouteSource = finalContext.attributes[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
-    }
-
-    if (finalContext.sampled === false) {
-      DEBUG_BUILD && logger.log(`[Tracing] Will not send ${finalContext.op} transaction because of beforeNavigate.`);
-    }
-
-    DEBUG_BUILD && logger.log(`[Tracing] Starting ${finalContext.op} transaction on scope`);
-
-    const { location } = WINDOW;
-
-    const idleTransaction = startIdleTransaction(
-      hub,
-      finalContext,
-      idleTimeout,
-      finalTimeout,
-      true,
-      { location }, // for use in the tracesSampler
-      heartbeatInterval,
-      isPageloadTransaction, // should wait for finish signal if it's a pageload transaction
-    );
-
-    if (isPageloadTransaction) {
-      WINDOW.document.addEventListener('readystatechange', () => {
-        if (['interactive', 'complete'].includes(WINDOW.document.readyState)) {
-          idleTransaction.sendAutoFinishSignal();
-        }
-      });
-
-      if (['interactive', 'complete'].includes(WINDOW.document.readyState)) {
-        idleTransaction.sendAutoFinishSignal();
-      }
-    }
-
-    idleTransaction.registerBeforeFinishCallback(transaction => {
-      this._collectWebVitals();
-      addPerformanceEntries(transaction);
-    });
-
-    return idleTransaction as Transaction;
-  }
-
-  /** Start listener for interaction transactions */
-  private _registerInteractionListener(): void {
-    let inflightInteractionTransaction: IdleTransaction | undefined;
-    const registerInteractionTransaction = (): void => {
-      const { idleTimeout, finalTimeout, heartbeatInterval } = this.options;
-      const op = 'ui.action.click';
-
-      // eslint-disable-next-line deprecation/deprecation
-      const currentTransaction = getActiveTransaction();
-      if (currentTransaction) {
-        const currentTransactionOp = spanToJSON(currentTransaction).op;
-        if (currentTransactionOp && ['navigation', 'pageload'].includes(currentTransactionOp)) {
-          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.end();
-        inflightInteractionTransaction = undefined;
-      }
-
-      if (!this._getCurrentHub) {
-        DEBUG_BUILD && logger.warn(`[Tracing] Did not create ${op} transaction because _getCurrentHub is invalid.`);
-        return undefined;
-      }
-
-      if (!this._latestRouteName) {
-        DEBUG_BUILD && logger.warn(`[Tracing] Did not create ${op} transaction because _latestRouteName is missing.`);
-        return undefined;
-      }
-
-      const hub = this._getCurrentHub();
-      const { location } = WINDOW;
-
-      const context: TransactionContext = {
-        name: this._latestRouteName,
-        op,
-        trimEnd: true,
-        data: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: this._latestRouteSource || 'url',
-        },
-      };
-
-      inflightInteractionTransaction = startIdleTransaction(
-        hub,
-        context,
-        idleTimeout,
-        finalTimeout,
-        true,
-        { location }, // for use in the tracesSampler
-        heartbeatInterval,
-      );
-    };
-
-    ['click'].forEach(type => {
-      addEventListener(type, registerInteractionTransaction, { once: false, capture: true });
-    });
-  }
-}
-
-/** Returns the value of a meta tag */
-export function getMetaContent(metaName: string): string | undefined {
-  // Can't specify generic to `getDomElement` because tracing can be used
-  // in a variety of environments, have to disable `no-unsafe-member-access`
-  // as a result.
-  const metaTag = getDomElement(`meta[name=${metaName}]`);
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-  return metaTag ? metaTag.getAttribute('content') : undefined;
-}
diff --git a/packages/tracing-internal/src/browser/index.ts b/packages/tracing-internal/src/browser/index.ts
index 17464ad780af..d1bbbffe02b3 100644
--- a/packages/tracing-internal/src/browser/index.ts
+++ b/packages/tracing-internal/src/browser/index.ts
@@ -2,8 +2,8 @@ export * from '../exports';
 
 export type { RequestInstrumentationOptions } from './request';
 
-export { BROWSER_TRACING_INTEGRATION_ID } from './browsertracing';
 export {
+  BROWSER_TRACING_INTEGRATION_ID,
   browserTracingIntegration,
   startBrowserTracingNavigationSpan,
   startBrowserTracingPageLoadSpan,
diff --git a/packages/tracing-internal/src/browser/metrics/index.ts b/packages/tracing-internal/src/browser/metrics/index.ts
index 9bd3a19e770d..4eabd49f218c 100644
--- a/packages/tracing-internal/src/browser/metrics/index.ts
+++ b/packages/tracing-internal/src/browser/metrics/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable max-lines */
-import type { IdleTransaction, Transaction } from '@sentry/core';
-import { getActiveTransaction, setMeasurement } from '@sentry/core';
-import type { Measurements, SpanContext } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan, startInactiveSpan } from '@sentry/core';
+import { setMeasurement } from '@sentry/core';
+import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sentry/types';
 import { browserPerformanceTimeOrigin, getComponentName, htmlTreeAsString, logger, parseUrl } from '@sentry/utils';
 
 import { spanToJSON } from '@sentry/core';
@@ -15,7 +15,7 @@ import {
 import { WINDOW } from '../types';
 import { getVisibilityWatcher } from '../web-vitals/lib/getVisibilityWatcher';
 import type { NavigatorDeviceMemory, NavigatorNetworkInformation } from '../web-vitals/types';
-import { _startChild, isMeasurementValue } from './utils';
+import { isMeasurementValue, startAndEndSpan } from './utils';
 
 const MAX_INT_AS_BYTES = 2147483647;
 
@@ -71,22 +71,23 @@ export function startTrackingWebVitals(): () => void {
 export function startTrackingLongTasks(): void {
   addPerformanceInstrumentationHandler('longtask', ({ entries }) => {
     for (const entry of entries) {
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction | undefined;
-      if (!transaction) {
+      if (!getActiveSpan()) {
         return;
       }
       const startTime = msToSec((browserPerformanceTimeOrigin as number) + entry.startTime);
       const duration = msToSec(entry.duration);
 
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.startChild({
+      const span = startInactiveSpan({
         name: 'Main UI thread blocked',
         op: 'ui.long-task',
-        origin: 'auto.ui.browser.metrics',
-        startTimestamp: startTime,
-        endTimestamp: startTime + duration,
+        startTime,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+        },
       });
+      if (span) {
+        span.end(startTime + duration);
+      }
     }
   });
 }
@@ -97,9 +98,7 @@ export function startTrackingLongTasks(): void {
 export function startTrackingInteractions(): void {
   addPerformanceInstrumentationHandler('event', ({ entries }) => {
     for (const entry of entries) {
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction | undefined;
-      if (!transaction) {
+      if (!getActiveSpan()) {
         return;
       }
 
@@ -107,21 +106,24 @@ export function startTrackingInteractions(): void {
         const startTime = msToSec((browserPerformanceTimeOrigin as number) + entry.startTime);
         const duration = msToSec(entry.duration);
 
-        const span: SpanContext = {
+        const spanOptions: StartSpanOptions = {
           name: htmlTreeAsString(entry.target),
           op: `ui.interaction.${entry.name}`,
-          origin: 'auto.ui.browser.metrics',
-          startTimestamp: startTime,
-          endTimestamp: startTime + duration,
+          startTime: startTime,
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+          },
         };
 
         const componentName = getComponentName(entry.target);
         if (componentName) {
-          span.attributes = { 'ui.component_name': componentName };
+          spanOptions.attributes = { 'ui.component_name': componentName };
         }
 
-        // eslint-disable-next-line deprecation/deprecation
-        transaction.startChild(span);
+        const span = startInactiveSpan(spanOptions);
+        if (span) {
+          span.end(startTime + duration);
+        }
       }
     }
   });
@@ -171,8 +173,8 @@ function _trackFID(): () => void {
   });
 }
 
-/** Add performance related spans to a transaction */
-export function addPerformanceEntries(transaction: Transaction): void {
+/** Add performance related spans to a span */
+export function addPerformanceEntries(span: Span): void {
   const performance = getBrowserPerformanceAPI();
   if (!performance || !WINDOW.performance.getEntries || !browserPerformanceTimeOrigin) {
     // Gatekeeper if performance API not available
@@ -187,7 +189,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
   let responseStartTimestamp: number | undefined;
   let requestStartTimestamp: number | undefined;
 
-  const { op, start_timestamp: transactionStartTime } = spanToJSON(transaction);
+  const { op, start_timestamp: transactionStartTime } = spanToJSON(span);
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   performanceEntries.slice(_performanceCursor).forEach((entry: Record<string, any>) => {
@@ -200,7 +202,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
 
     switch (entry.entryType) {
       case 'navigation': {
-        _addNavigationSpans(transaction, entry, timeOrigin);
+        _addNavigationSpans(span, entry, timeOrigin);
         responseStartTimestamp = timeOrigin + msToSec(entry.responseStart);
         requestStartTimestamp = timeOrigin + msToSec(entry.requestStart);
         break;
@@ -208,7 +210,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
       case 'mark':
       case 'paint':
       case 'measure': {
-        _addMeasureSpans(transaction, entry, startTime, duration, timeOrigin);
+        _addMeasureSpans(span, entry, startTime, duration, timeOrigin);
 
         // capture web vitals
         const firstHidden = getVisibilityWatcher();
@@ -226,7 +228,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
         break;
       }
       case 'resource': {
-        _addResourceSpans(transaction, entry, entry.name as string, startTime, duration, timeOrigin);
+        _addResourceSpans(span, entry, entry.name as string, startTime, duration, timeOrigin);
         break;
       }
       default:
@@ -236,7 +238,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
 
   _performanceCursor = Math.max(performanceEntries.length - 1, 0);
 
-  _trackNavigator(transaction);
+  _trackNavigator(span);
 
   // Measurements are only available for pageload transactions
   if (op === 'pageload') {
@@ -247,8 +249,8 @@ export function addPerformanceEntries(transaction: Transaction): void {
         return;
       }
       // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
-      // Unfortunately, timeOrigin is not captured within the transaction span data, so these web vitals will need
-      // to be adjusted to be relative to transaction.startTimestamp.
+      // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
+      // to be adjusted to be relative to span.startTimestamp.
       const oldValue = _measurements[name].value;
       const measurementTimestamp = timeOrigin + msToSec(oldValue);
 
@@ -263,12 +265,12 @@ export function addPerformanceEntries(transaction: Transaction): void {
     const fidMark = _measurements['mark.fid'];
     if (fidMark && _measurements['fid']) {
       // create span for FID
-      _startChild(transaction, {
+      startAndEndSpan(span, fidMark.value, fidMark.value + msToSec(_measurements['fid'].value), {
         name: 'first input delay',
-        endTimestamp: fidMark.value + msToSec(_measurements['fid'].value),
         op: 'ui.action',
-        origin: 'auto.ui.browser.metrics',
-        startTimestamp: fidMark.value,
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+        },
       });
 
       // Delete mark.fid as we don't want it to be part of final payload
@@ -285,7 +287,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
       setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
     });
 
-    _tagMetricInfo(transaction);
+    _tagMetricInfo(span);
   }
 
   _lcpEntry = undefined;
@@ -295,7 +297,7 @@ export function addPerformanceEntries(transaction: Transaction): void {
 
 /** Create measure related spans */
 export function _addMeasureSpans(
-  transaction: Transaction,
+  span: Span,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   entry: Record<string, any>,
   startTime: number,
@@ -305,12 +307,12 @@ export function _addMeasureSpans(
   const measureStartTimestamp = timeOrigin + startTime;
   const measureEndTimestamp = measureStartTimestamp + duration;
 
-  _startChild(transaction, {
+  startAndEndSpan(span, measureStartTimestamp, measureEndTimestamp, {
     name: entry.name as string,
-    endTimestamp: measureEndTimestamp,
     op: entry.entryType as string,
-    origin: 'auto.resource.browser.metrics',
-    startTimestamp: measureStartTimestamp,
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+    },
   });
 
   return measureStartTimestamp;
@@ -318,19 +320,19 @@ export function _addMeasureSpans(
 
 /** Instrument navigation entries */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _addNavigationSpans(transaction: Transaction, entry: Record<string, any>, timeOrigin: number): void {
+function _addNavigationSpans(span: Span, entry: Record<string, any>, timeOrigin: number): void {
   ['unloadEvent', 'redirect', 'domContentLoadedEvent', 'loadEvent', 'connect'].forEach(event => {
-    _addPerformanceNavigationTiming(transaction, entry, event, timeOrigin);
+    _addPerformanceNavigationTiming(span, entry, event, timeOrigin);
   });
-  _addPerformanceNavigationTiming(transaction, entry, 'secureConnection', timeOrigin, 'TLS/SSL', 'connectEnd');
-  _addPerformanceNavigationTiming(transaction, entry, 'fetch', timeOrigin, 'cache', 'domainLookupStart');
-  _addPerformanceNavigationTiming(transaction, entry, 'domainLookup', timeOrigin, 'DNS');
-  _addRequest(transaction, entry, timeOrigin);
+  _addPerformanceNavigationTiming(span, entry, 'secureConnection', timeOrigin, 'TLS/SSL', 'connectEnd');
+  _addPerformanceNavigationTiming(span, entry, 'fetch', timeOrigin, 'cache', 'domainLookupStart');
+  _addPerformanceNavigationTiming(span, entry, 'domainLookup', timeOrigin, 'DNS');
+  _addRequest(span, entry, timeOrigin);
 }
 
 /** Create performance navigation related spans */
 function _addPerformanceNavigationTiming(
-  transaction: Transaction,
+  span: Span,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   entry: Record<string, any>,
   event: string,
@@ -343,38 +345,48 @@ function _addPerformanceNavigationTiming(
   if (!start || !end) {
     return;
   }
-  _startChild(transaction, {
+  startAndEndSpan(span, timeOrigin + msToSec(start), timeOrigin + msToSec(end), {
     op: 'browser',
-    origin: 'auto.browser.browser.metrics',
     name: name || event,
-    startTimestamp: timeOrigin + msToSec(start),
-    endTimestamp: timeOrigin + msToSec(end),
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+    },
   });
 }
 
 /** Create request and response related spans */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function _addRequest(transaction: Transaction, entry: Record<string, any>, timeOrigin: number): void {
+function _addRequest(span: Span, entry: Record<string, any>, timeOrigin: number): void {
   if (entry.responseEnd) {
     // It is possible that we are collecting these metrics when the page hasn't finished loading yet, for example when the HTML slowly streams in.
     // In this case, ie. when the document request hasn't finished yet, `entry.responseEnd` will be 0.
     // In order not to produce faulty spans, where the end timestamp is before the start timestamp, we will only collect
-    // these spans when the responseEnd value is available. The backend (Relay) would drop the entire transaction if it contained faulty spans.
-    _startChild(transaction, {
-      op: 'browser',
-      origin: 'auto.browser.browser.metrics',
-      name: 'request',
-      startTimestamp: timeOrigin + msToSec(entry.requestStart as number),
-      endTimestamp: timeOrigin + msToSec(entry.responseEnd as number),
-    });
+    // these spans when the responseEnd value is available. The backend (Relay) would drop the entire span if it contained faulty spans.
+    startAndEndSpan(
+      span,
+      timeOrigin + msToSec(entry.requestStart as number),
+      timeOrigin + msToSec(entry.responseEnd as number),
+      {
+        op: 'browser',
+        name: 'request',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+        },
+      },
+    );
 
-    _startChild(transaction, {
-      op: 'browser',
-      origin: 'auto.browser.browser.metrics',
-      name: 'response',
-      startTimestamp: timeOrigin + msToSec(entry.responseStart as number),
-      endTimestamp: timeOrigin + msToSec(entry.responseEnd as number),
-    });
+    startAndEndSpan(
+      span,
+      timeOrigin + msToSec(entry.responseStart as number),
+      timeOrigin + msToSec(entry.responseEnd as number),
+      {
+        op: 'browser',
+        name: 'response',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.browser.metrics',
+        },
+      },
+    );
   }
 }
 
@@ -388,7 +400,7 @@ export interface ResourceEntry extends Record<string, unknown> {
 
 /** Create resource-related spans */
 export function _addResourceSpans(
-  transaction: Transaction,
+  span: Span,
   entry: ResourceEntry,
   resourceUrl: string,
   startTime: number,
@@ -403,42 +415,40 @@ export function _addResourceSpans(
 
   const parsedUrl = parseUrl(resourceUrl);
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const data: Record<string, any> = {};
-  setResourceEntrySizeData(data, entry, 'transferSize', 'http.response_transfer_size');
-  setResourceEntrySizeData(data, entry, 'encodedBodySize', 'http.response_content_length');
-  setResourceEntrySizeData(data, entry, 'decodedBodySize', 'http.decoded_response_content_length');
+  const attributes: SpanAttributes = {
+    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+  };
+  setResourceEntrySizeData(attributes, entry, 'transferSize', 'http.response_transfer_size');
+  setResourceEntrySizeData(attributes, entry, 'encodedBodySize', 'http.response_content_length');
+  setResourceEntrySizeData(attributes, entry, 'decodedBodySize', 'http.decoded_response_content_length');
 
   if ('renderBlockingStatus' in entry) {
-    data['resource.render_blocking_status'] = entry.renderBlockingStatus;
+    attributes['resource.render_blocking_status'] = entry.renderBlockingStatus;
   }
   if (parsedUrl.protocol) {
-    data['url.scheme'] = parsedUrl.protocol.split(':').pop(); // the protocol returned by parseUrl includes a :, but OTEL spec does not, so we remove it.
+    attributes['url.scheme'] = parsedUrl.protocol.split(':').pop(); // the protocol returned by parseUrl includes a :, but OTEL spec does not, so we remove it.
   }
 
   if (parsedUrl.host) {
-    data['server.address'] = parsedUrl.host;
+    attributes['server.address'] = parsedUrl.host;
   }
 
-  data['url.same_origin'] = resourceUrl.includes(WINDOW.location.origin);
+  attributes['url.same_origin'] = resourceUrl.includes(WINDOW.location.origin);
 
   const startTimestamp = timeOrigin + startTime;
   const endTimestamp = startTimestamp + duration;
 
-  _startChild(transaction, {
+  startAndEndSpan(span, startTimestamp, endTimestamp, {
     name: resourceUrl.replace(WINDOW.location.origin, ''),
-    endTimestamp,
     op: entry.initiatorType ? `resource.${entry.initiatorType}` : 'resource.other',
-    origin: 'auto.resource.browser.metrics',
-    startTimestamp,
-    data,
+    attributes,
   });
 }
 
 /**
  * Capture the information of the user agent.
  */
-function _trackNavigator(transaction: Transaction): void {
+function _trackNavigator(span: Span): void {
   const navigator = WINDOW.navigator as null | (Navigator & NavigatorNetworkInformation & NavigatorDeviceMemory);
   if (!navigator) {
     return;
@@ -448,15 +458,11 @@ function _trackNavigator(transaction: Transaction): void {
   const connection = navigator.connection;
   if (connection) {
     if (connection.effectiveType) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('effectiveConnectionType', connection.effectiveType);
+      span.setAttribute('effectiveConnectionType', connection.effectiveType);
     }
 
     if (connection.type) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('connectionType', connection.type);
+      span.setAttribute('connectionType', connection.type);
     }
 
     if (isMeasurementValue(connection.rtt)) {
@@ -465,69 +471,55 @@ function _trackNavigator(transaction: Transaction): void {
   }
 
   if (isMeasurementValue(navigator.deviceMemory)) {
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('deviceMemory', `${navigator.deviceMemory} GB`);
+    span.setAttribute('deviceMemory', `${navigator.deviceMemory} GB`);
   }
 
   if (isMeasurementValue(navigator.hardwareConcurrency)) {
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('hardwareConcurrency', String(navigator.hardwareConcurrency));
+    span.setAttribute('hardwareConcurrency', String(navigator.hardwareConcurrency));
   }
 }
 
-/** Add LCP / CLS data to transaction to allow debugging */
-function _tagMetricInfo(transaction: Transaction): void {
+/** Add LCP / CLS data to span to allow debugging */
+function _tagMetricInfo(span: Span): void {
   if (_lcpEntry) {
     DEBUG_BUILD && logger.log('[Measurements] Adding LCP Data');
 
     // Capture Properties of the LCP element that contributes to the LCP.
 
     if (_lcpEntry.element) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.element', htmlTreeAsString(_lcpEntry.element));
+      span.setAttribute('lcp.element', htmlTreeAsString(_lcpEntry.element));
     }
 
     if (_lcpEntry.id) {
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.id', _lcpEntry.id);
+      span.setAttribute('lcp.id', _lcpEntry.id);
     }
 
     if (_lcpEntry.url) {
       // Trim URL to the first 200 characters.
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag('lcp.url', _lcpEntry.url.trim().slice(0, 200));
+      span.setAttribute('lcp.url', _lcpEntry.url.trim().slice(0, 200));
     }
 
-    // TODO: Can we rewrite this to an attribute?
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.setTag('lcp.size', _lcpEntry.size);
+    span.setAttribute('lcp.size', _lcpEntry.size);
   }
 
   // See: https://developer.mozilla.org/en-US/docs/Web/API/LayoutShift
   if (_clsEntry && _clsEntry.sources) {
     DEBUG_BUILD && logger.log('[Measurements] Adding CLS Data');
     _clsEntry.sources.forEach((source, index) =>
-      // TODO: Can we rewrite this to an attribute?
-      // eslint-disable-next-line deprecation/deprecation
-      transaction.setTag(`cls.source.${index + 1}`, htmlTreeAsString(source.node)),
+      span.setAttribute(`cls.source.${index + 1}`, htmlTreeAsString(source.node)),
     );
   }
 }
 
 function setResourceEntrySizeData(
-  data: Record<string, unknown>,
+  attributes: SpanAttributes,
   entry: ResourceEntry,
   key: keyof Pick<ResourceEntry, 'transferSize' | 'encodedBodySize' | 'decodedBodySize'>,
   dataKey: 'http.response_transfer_size' | 'http.response_content_length' | 'http.decoded_response_content_length',
 ): void {
   const entryVal = entry[key];
   if (entryVal != null && entryVal < MAX_INT_AS_BYTES) {
-    data[dataKey] = entryVal;
+    attributes[dataKey] = entryVal;
   }
 }
 
@@ -542,7 +534,7 @@ export function _addTtfbToMeasurements(
   requestStartTimestamp: number | undefined,
   transactionStartTime: number | undefined,
 ): void {
-  // Generate TTFB (Time to First Byte), which measured as the time between the beginning of the transaction and the
+  // Generate TTFB (Time to First Byte), which measured as the time between the beginning of the span and the
   // start of the response in milliseconds
   if (typeof responseStartTimestamp === 'number' && transactionStartTime) {
     DEBUG_BUILD && logger.log('[Measurements] Adding TTFB');
diff --git a/packages/tracing-internal/src/browser/metrics/utils.ts b/packages/tracing-internal/src/browser/metrics/utils.ts
index 4669ff13b762..facb3f429e3a 100644
--- a/packages/tracing-internal/src/browser/metrics/utils.ts
+++ b/packages/tracing-internal/src/browser/metrics/utils.ts
@@ -1,5 +1,6 @@
-import type { Transaction } from '@sentry/core';
-import type { Span, SpanContext } from '@sentry/types';
+import type { SentrySpan } from '@sentry/core';
+import { spanToJSON, startInactiveSpan, withActiveSpan } from '@sentry/core';
+import type { Span, SpanTimeInput, StartSpanOptions } from '@sentry/types';
 
 /**
  * Checks if a given value is a valid measurement value.
@@ -16,16 +17,31 @@ export function isMeasurementValue(value: unknown): value is number {
  * Note: this will not be possible anymore in v8,
  * unless we do some special handling for browser here...
  */
-export function _startChild(transaction: Transaction, { startTimestamp, ...ctx }: SpanContext): Span {
-  // eslint-disable-next-line deprecation/deprecation
-  if (startTimestamp && transaction.startTimestamp > startTimestamp) {
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.startTimestamp = startTimestamp;
+export function startAndEndSpan(
+  parentSpan: Span,
+  startTimeInSeconds: number,
+  endTime: SpanTimeInput,
+  { ...ctx }: StartSpanOptions,
+): Span | undefined {
+  const parentStartTime = spanToJSON(parentSpan).start_timestamp;
+  if (parentStartTime && parentStartTime > startTimeInSeconds) {
+    // We can only do this for SentrySpans...
+    if (typeof (parentSpan as Partial<SentrySpan>).updateStartTime === 'function') {
+      (parentSpan as SentrySpan).updateStartTime(startTimeInSeconds);
+    }
   }
 
-  // eslint-disable-next-line deprecation/deprecation
-  return transaction.startChild({
-    startTimestamp,
-    ...ctx,
+  // The return value only exists for tests
+  return withActiveSpan(parentSpan, () => {
+    const span = startInactiveSpan({
+      startTime: startTimeInSeconds,
+      ...ctx,
+    });
+
+    if (span) {
+      span.end(endTime);
+    }
+
+    return span;
   });
 }
diff --git a/packages/tracing-internal/src/browser/request.ts b/packages/tracing-internal/src/browser/request.ts
index 5bcea7eac108..b808136b0325 100644
--- a/packages/tracing-internal/src/browser/request.ts
+++ b/packages/tracing-internal/src/browser/request.ts
@@ -1,11 +1,13 @@
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SentryNonRecordingSpan,
   getClient,
   getCurrentScope,
   getDynamicSamplingContextFromClient,
   getDynamicSamplingContextFromSpan,
   getIsolationScope,
   hasTracingEnabled,
+  instrumentFetchRequest,
   setHttpStatus,
   spanToJSON,
   spanToTraceHeader,
@@ -23,7 +25,6 @@ import {
   stringMatchesSomePattern,
 } from '@sentry/utils';
 
-import { instrumentFetchRequest } from '../common/fetch';
 import { addPerformanceInstrumentationHandler } from './instrument';
 import { WINDOW } from './types';
 
@@ -320,12 +321,10 @@ export function xhrCallback(
         },
         op: 'http.client',
       })
-    : undefined;
+    : new SentryNonRecordingSpan();
 
-  if (span) {
-    xhr.__sentry_xhr_span_id__ = span.spanContext().spanId;
-    spans[xhr.__sentry_xhr_span_id__] = span;
-  }
+  xhr.__sentry_xhr_span_id__ = span.spanContext().spanId;
+  spans[xhr.__sentry_xhr_span_id__] = span;
 
   const client = getClient();
 
diff --git a/packages/tracing-internal/src/browser/router.ts b/packages/tracing-internal/src/browser/router.ts
index ff08af13a0cd..b94911046171 100644
--- a/packages/tracing-internal/src/browser/router.ts
+++ b/packages/tracing-internal/src/browser/router.ts
@@ -1,4 +1,4 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core';
 import type { Transaction, TransactionContext } from '@sentry/types';
 import { addHistoryInstrumentationHandler, browserPerformanceTimeOrigin, logger } from '@sentry/utils';
 
@@ -27,9 +27,9 @@ export function instrumentRoutingWithDefaults<T extends Transaction>(
       // pageload should always start at timeOrigin (and needs to be in s, not ms)
       startTimestamp: browserPerformanceTimeOrigin ? browserPerformanceTimeOrigin / 1000 : undefined,
       op: 'pageload',
-      origin: 'auto.pageload.browser',
       attributes: {
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
       },
     });
   }
@@ -61,9 +61,9 @@ export function instrumentRoutingWithDefaults<T extends Transaction>(
         activeTransaction = customStartTransaction({
           name: WINDOW.location.pathname,
           op: 'navigation',
-          origin: 'auto.navigation.browser',
           attributes: {
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
           },
         });
       }
diff --git a/packages/tracing-internal/src/browser/web-vitals/README.md b/packages/tracing-internal/src/browser/web-vitals/README.md
index 09add37239aa..73a0a72c2e4b 100644
--- a/packages/tracing-internal/src/browser/web-vitals/README.md
+++ b/packages/tracing-internal/src/browser/web-vitals/README.md
@@ -4,7 +4,8 @@
 
 This was vendored from: https://github.com/GoogleChrome/web-vitals: v3.0.4
 
-The commit SHA used is: [7f0ed0bfb03c356e348a558a3eda111b498a2a11](https://github.com/GoogleChrome/web-vitals/tree/7f0ed0bfb03c356e348a558a3eda111b498a2a11)
+The commit SHA used is:
+[7f0ed0bfb03c356e348a558a3eda111b498a2a11](https://github.com/GoogleChrome/web-vitals/tree/7f0ed0bfb03c356e348a558a3eda111b498a2a11)
 
 Current vendored web vitals are:
 
@@ -14,8 +15,9 @@ Current vendored web vitals are:
 
 ## Notable Changes from web-vitals library
 
-This vendored web-vitals library is meant to be used in conjunction with the `@sentry/tracing` `BrowserTracing` integration.
-As such, logic around `BFCache` and multiple reports were removed from the library as our web-vitals only report once per pageload.
+This vendored web-vitals library is meant to be used in conjunction with the `@sentry/tracing` `BrowserTracing`
+integration. As such, logic around `BFCache` and multiple reports were removed from the library as our web-vitals only
+report once per pageload.
 
 ## License
 
@@ -24,16 +26,21 @@ As such, logic around `BFCache` and multiple reports were removed from the libra
 ## CHANGELOG
 
 https://github.com/getsentry/sentry-javascript/pull/5987
+
 - Bumped from Web Vitals v2.1.0 to v3.0.4
 
 https://github.com/getsentry/sentry-javascript/pull/3781
+
 - Bumped from Web Vitals v0.2.4 to v2.1.0
 
 https://github.com/getsentry/sentry-javascript/pull/3515
+
 - Remove support for Time to First Byte (TTFB)
 
 https://github.com/getsentry/sentry-javascript/pull/2964
+
 - Added support for Cumulative Layout Shift (CLS) and Time to First Byte (TTFB)
 
 https://github.com/getsentry/sentry-javascript/pull/2909
+
 - Added support for FID (First Input Delay) and LCP (Largest Contentful Paint)
diff --git a/packages/tracing-internal/src/exports/index.ts b/packages/tracing-internal/src/exports/index.ts
index 284f16edbf9d..48106a40abf9 100644
--- a/packages/tracing-internal/src/exports/index.ts
+++ b/packages/tracing-internal/src/exports/index.ts
@@ -2,8 +2,6 @@ export {
   // eslint-disable-next-line deprecation/deprecation
   getActiveTransaction,
   hasTracingEnabled,
-  IdleTransaction,
-  startIdleTransaction,
   Transaction,
 } from '@sentry/core';
 export { stripUrlQueryAndFragment, TRACEPARENT_REGEXP } from '@sentry/utils';
diff --git a/packages/tracing-internal/src/index.ts b/packages/tracing-internal/src/index.ts
index 3dbbba685010..98efc8dc1032 100644
--- a/packages/tracing-internal/src/index.ts
+++ b/packages/tracing-internal/src/index.ts
@@ -25,6 +25,4 @@ export {
   addLcpInstrumentationHandler,
 } from './browser';
 
-export { addTracingHeadersToFetchRequest, instrumentFetchRequest } from './common/fetch';
-
 export type { RequestInstrumentationOptions } from './browser';
diff --git a/packages/tracing-internal/src/node/integrations/apollo.ts b/packages/tracing-internal/src/node/integrations/apollo.ts
index 2b4268239d63..17ba0ab15482 100644
--- a/packages/tracing-internal/src/node/integrations/apollo.ts
+++ b/packages/tracing-internal/src/node/integrations/apollo.ts
@@ -1,6 +1,5 @@
-import type { Hub, SentrySpan } from '@sentry/core';
-import type { EventProcessor } from '@sentry/types';
-import { arrayify, fill, isThenable, loadModule, logger } from '@sentry/utils';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';
+import { arrayify, fill, loadModule, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../../common/debug-build';
 import type { LazyLoadedIntegration } from './lazy';
@@ -75,7 +74,7 @@ export class Apollo implements LazyLoadedIntegration<GraphQLModule & ApolloModul
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     if (this._useNest) {
       const pkg = this.loadDependency();
 
@@ -99,7 +98,7 @@ export class Apollo implements LazyLoadedIntegration<GraphQLModule & ApolloModul
               return function (this: unknown) {
                 const resolvers = arrayify(orig.call(this));
 
-                const instrumentedResolvers = instrumentResolvers(resolvers, getCurrentHub);
+                const instrumentedResolvers = instrumentResolvers(resolvers);
 
                 return instrumentedResolvers;
               };
@@ -146,7 +145,7 @@ export class Apollo implements LazyLoadedIntegration<GraphQLModule & ApolloModul
 
           const resolvers = arrayify(this.config.resolvers);
 
-          this.config.resolvers = instrumentResolvers(resolvers, getCurrentHub);
+          this.config.resolvers = instrumentResolvers(resolvers);
 
           return orig.call(this);
         };
@@ -155,7 +154,7 @@ export class Apollo implements LazyLoadedIntegration<GraphQLModule & ApolloModul
   }
 }
 
-function instrumentResolvers(resolvers: ApolloModelResolvers[], getCurrentHub: () => Hub): ApolloModelResolvers[] {
+function instrumentResolvers(resolvers: ApolloModelResolvers[]): ApolloModelResolvers[] {
   return resolvers.map(model => {
     Object.keys(model).forEach(resolverGroupName => {
       Object.keys(model[resolverGroupName]).forEach(resolverName => {
@@ -163,7 +162,7 @@ function instrumentResolvers(resolvers: ApolloModelResolvers[], getCurrentHub: (
           return;
         }
 
-        wrapResolver(model, resolverGroupName, resolverName, getCurrentHub);
+        wrapResolver(model, resolverGroupName, resolverName);
       });
     });
 
@@ -174,37 +173,22 @@ function instrumentResolvers(resolvers: ApolloModelResolvers[], getCurrentHub: (
 /**
  * Wrap a single resolver which can be a parent of other resolvers and/or db operations.
  */
-function wrapResolver(
-  model: ApolloModelResolvers,
-  resolverGroupName: string,
-  resolverName: string,
-  getCurrentHub: () => Hub,
-): void {
+function wrapResolver(model: ApolloModelResolvers, resolverGroupName: string, resolverName: string): void {
   fill(model[resolverGroupName], resolverName, function (orig: () => unknown | Promise<unknown>) {
     return function (this: unknown, ...args: unknown[]) {
-      // eslint-disable-next-line deprecation/deprecation
-      const scope = getCurrentHub().getScope();
-      // eslint-disable-next-line deprecation/deprecation
-      const parentSpan = scope.getSpan() as SentrySpan | undefined;
-      // eslint-disable-next-line deprecation/deprecation
-      const span = parentSpan?.startChild({
-        name: `${resolverGroupName}.${resolverName}`,
-        op: 'graphql.resolve',
-        origin: 'auto.graphql.apollo',
-      });
-
-      const rv = orig.call(this, ...args);
-
-      if (isThenable(rv)) {
-        return rv.then((res: unknown) => {
-          span?.end();
-          return res;
-        });
-      }
-
-      span?.end();
-
-      return rv;
+      return startSpan(
+        {
+          onlyIfParent: true,
+          name: `${resolverGroupName}.${resolverName}`,
+          op: 'graphql.resolve',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.graphql.apollo',
+          },
+        },
+        () => {
+          return orig.call(this, ...args);
+        },
+      );
     };
   });
 }
diff --git a/packages/tracing-internal/src/node/integrations/express.ts b/packages/tracing-internal/src/node/integrations/express.ts
index b6012bad9a72..430a72faa5a3 100644
--- a/packages/tracing-internal/src/node/integrations/express.ts
+++ b/packages/tracing-internal/src/node/integrations/express.ts
@@ -1,5 +1,7 @@
 /* eslint-disable max-lines */
 import type { Transaction } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { startInactiveSpan, withActiveSpan } from '@sentry/core';
 import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core';
 import type { Integration, PolymorphicRequest } from '@sentry/types';
 import {
@@ -153,11 +155,14 @@ function wrap(fn: Function, method: Method): (...args: any[]) => void {
       return function (this: NodeJS.Global, req: unknown, res: ExpressResponse & SentryTracingResponse): void {
         const transaction = res.__sentry_transaction;
         if (transaction) {
-          // eslint-disable-next-line deprecation/deprecation
-          const span = transaction.startChild({
-            name: fn.name,
-            op: `middleware.express.${method}`,
-            origin: 'auto.middleware.express',
+          const span = withActiveSpan(transaction, () => {
+            return startInactiveSpan({
+              name: fn.name,
+              op: `middleware.express.${method}`,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.middleware.express',
+              },
+            });
           });
           res.once('finish', () => {
             span.end();
@@ -174,12 +179,17 @@ function wrap(fn: Function, method: Method): (...args: any[]) => void {
         next: () => void,
       ): void {
         const transaction = res.__sentry_transaction;
-        // eslint-disable-next-line deprecation/deprecation
-        const span = transaction?.startChild({
-          name: fn.name,
-          op: `middleware.express.${method}`,
-          origin: 'auto.middleware.express',
-        });
+        const span = transaction
+          ? withActiveSpan(transaction, () => {
+              return startInactiveSpan({
+                name: fn.name,
+                op: `middleware.express.${method}`,
+                attributes: {
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.middleware.express',
+                },
+              });
+            })
+          : undefined;
         fn.call(this, req, res, function (this: NodeJS.Global, ...args: unknown[]): void {
           span?.end();
           next.call(this, ...args);
@@ -195,12 +205,17 @@ function wrap(fn: Function, method: Method): (...args: any[]) => void {
         next: () => void,
       ): void {
         const transaction = res.__sentry_transaction;
-        // eslint-disable-next-line deprecation/deprecation
-        const span = transaction?.startChild({
-          name: fn.name,
-          op: `middleware.express.${method}`,
-          origin: 'auto.middleware.express',
-        });
+        const span = transaction
+          ? withActiveSpan(transaction, () => {
+              return startInactiveSpan({
+                name: fn.name,
+                op: `middleware.express.${method}`,
+                attributes: {
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.middleware.express',
+                },
+              });
+            })
+          : undefined;
         fn.call(this, err, req, res, function (this: NodeJS.Global, ...args: unknown[]): void {
           span?.end();
           next.call(this, ...args);
diff --git a/packages/tracing-internal/src/node/integrations/graphql.ts b/packages/tracing-internal/src/node/integrations/graphql.ts
index b2ddee7530f3..e61010e5953c 100644
--- a/packages/tracing-internal/src/node/integrations/graphql.ts
+++ b/packages/tracing-internal/src/node/integrations/graphql.ts
@@ -1,6 +1,5 @@
-import type { Hub, SentrySpan } from '@sentry/core';
-import type { EventProcessor } from '@sentry/types';
-import { fill, isThenable, loadModule, logger } from '@sentry/utils';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startSpan } from '@sentry/core';
+import { fill, loadModule, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../../common/debug-build';
 import type { LazyLoadedIntegration } from './lazy';
@@ -35,7 +34,7 @@ export class GraphQL implements LazyLoadedIntegration<GraphQLModule> {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     const pkg = this.loadDependency();
 
     if (!pkg) {
@@ -45,37 +44,19 @@ export class GraphQL implements LazyLoadedIntegration<GraphQLModule> {
 
     fill(pkg, 'execute', function (orig: () => void | Promise<unknown>) {
       return function (this: unknown, ...args: unknown[]) {
-        // eslint-disable-next-line deprecation/deprecation
-        const scope = getCurrentHub().getScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const parentSpan = scope.getSpan() as SentrySpan | undefined;
-
-        // eslint-disable-next-line deprecation/deprecation
-        const span = parentSpan?.startChild({
-          name: 'execute',
-          op: 'graphql.execute',
-          origin: 'auto.graphql.graphql',
-        });
-
-        // eslint-disable-next-line deprecation/deprecation
-        scope?.setSpan(span);
-
-        const rv = orig.call(this, ...args);
-
-        if (isThenable(rv)) {
-          return rv.then((res: unknown) => {
-            span?.end();
-            // eslint-disable-next-line deprecation/deprecation
-            scope?.setSpan(parentSpan);
-
-            return res;
-          });
-        }
-
-        span?.end();
-        // eslint-disable-next-line deprecation/deprecation
-        scope?.setSpan(parentSpan);
-        return rv;
+        return startSpan(
+          {
+            onlyIfParent: true,
+            name: 'execute',
+            op: 'graphql.execute',
+            attributes: {
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.graphql.graphql',
+            },
+          },
+          () => {
+            return orig.call(this, ...args);
+          },
+        );
       };
     });
   }
diff --git a/packages/tracing-internal/src/node/integrations/mongo.ts b/packages/tracing-internal/src/node/integrations/mongo.ts
index e052eafa6378..7c6f1bf97159 100644
--- a/packages/tracing-internal/src/node/integrations/mongo.ts
+++ b/packages/tracing-internal/src/node/integrations/mongo.ts
@@ -1,5 +1,6 @@
-import type { Hub, SentrySpan } from '@sentry/core';
-import type { EventProcessor, SpanContext } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
+import { getClient } from '@sentry/core';
+import type { EventProcessor, SpanAttributes, StartSpanOptions } from '@sentry/types';
 import { fill, isThenable, loadModule, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../../common/debug-build';
@@ -138,7 +139,7 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(_: (callback: EventProcessor) => void): void {
     const pkg = this.loadDependency();
 
     if (!pkg) {
@@ -147,20 +148,20 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
       return;
     }
 
-    this._instrumentOperations(pkg.Collection, this._operations, getCurrentHub);
+    this._instrumentOperations(pkg.Collection, this._operations);
   }
 
   /**
    * Patches original collection methods
    */
-  private _instrumentOperations(collection: MongoCollection, operations: Operation[], getCurrentHub: () => Hub): void {
-    operations.forEach((operation: Operation) => this._patchOperation(collection, operation, getCurrentHub));
+  private _instrumentOperations(collection: MongoCollection, operations: Operation[]): void {
+    operations.forEach((operation: Operation) => this._patchOperation(collection, operation));
   }
 
   /**
    * Patches original collection to utilize our tracing functionality
    */
-  private _patchOperation(collection: MongoCollection, operation: Operation, getCurrentHub: () => Hub): void {
+  private _patchOperation(collection: MongoCollection, operation: Operation): void {
     if (!(operation in collection.prototype)) return;
 
     const getSpanContext = this._getSpanContextFromOperationArguments.bind(this);
@@ -168,21 +169,15 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
     fill(collection.prototype, operation, function (orig: () => void | Promise<unknown>) {
       return function (this: unknown, ...args: unknown[]) {
         const lastArg = args[args.length - 1];
-        const hub = getCurrentHub();
-        // eslint-disable-next-line deprecation/deprecation
-        const scope = hub.getScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const client = hub.getClient();
-        // eslint-disable-next-line deprecation/deprecation
-        const parentSpan = scope.getSpan() as SentrySpan | undefined;
+
+        const client = getClient();
 
         const sendDefaultPii = client?.getOptions().sendDefaultPii;
 
         // Check if the operation was passed a callback. (mapReduce requires a different check, as
         // its (non-callback) arguments can also be functions.)
         if (typeof lastArg !== 'function' || (operation === 'mapReduce' && args.length === 2)) {
-          // eslint-disable-next-line deprecation/deprecation
-          const span = parentSpan?.startChild(getSpanContext(this, operation, args, sendDefaultPii));
+          const span = startInactiveSpan(getSpanContext(this, operation, args, sendDefaultPii));
           const maybePromiseOrCursor = orig.call(this, ...args);
 
           if (isThenable(maybePromiseOrCursor)) {
@@ -213,8 +208,7 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
           }
         }
 
-        // eslint-disable-next-line deprecation/deprecation
-        const span = parentSpan?.startChild(getSpanContext(this, operation, args.slice(0, -1)));
+        const span = startInactiveSpan(getSpanContext(this, operation, args.slice(0, -1)));
 
         return orig.call(this, ...args.slice(0, -1), function (err: Error, result: unknown) {
           span?.end();
@@ -232,19 +226,19 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
     operation: Operation,
     args: unknown[],
     sendDefaultPii: boolean | undefined = false,
-  ): SpanContext {
-    const data: { [key: string]: string } = {
+  ): StartSpanOptions {
+    const attributes: SpanAttributes = {
       'db.system': 'mongodb',
       'db.name': collection.dbName,
       'db.operation': operation,
       'db.mongodb.collection': collection.collectionName,
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `${collection.collectionName}.${operation}`,
     };
-    const spanContext: SpanContext = {
+    const spanContext: StartSpanOptions = {
       op: 'db',
-      // TODO v8: Use `${collection.collectionName}.${operation}`
-      origin: 'auto.db.mongo',
       name: operation,
-      data,
+      attributes,
+      onlyIfParent: true,
     };
 
     // If the operation takes no arguments besides `options` and `callback`, or if argument
@@ -262,11 +256,11 @@ export class Mongo implements LazyLoadedIntegration<MongoModule> {
       // Special case for `mapReduce`, as the only one accepting functions as arguments.
       if (operation === 'mapReduce') {
         const [map, reduce] = args as { name?: string }[];
-        data[signature[0]] = typeof map === 'string' ? map : map.name || '<anonymous>';
-        data[signature[1]] = typeof reduce === 'string' ? reduce : reduce.name || '<anonymous>';
+        attributes[signature[0]] = typeof map === 'string' ? map : map.name || '<anonymous>';
+        attributes[signature[1]] = typeof reduce === 'string' ? reduce : reduce.name || '<anonymous>';
       } else {
         for (let i = 0; i < signature.length; i++) {
-          data[`db.mongodb.${signature[i]}`] = JSON.stringify(args[i]);
+          attributes[`db.mongodb.${signature[i]}`] = JSON.stringify(args[i]);
         }
       }
     } catch (_oO) {
diff --git a/packages/tracing-internal/src/node/integrations/mysql.ts b/packages/tracing-internal/src/node/integrations/mysql.ts
index 3cca1c8d5ccd..c62a6db0028f 100644
--- a/packages/tracing-internal/src/node/integrations/mysql.ts
+++ b/packages/tracing-internal/src/node/integrations/mysql.ts
@@ -1,5 +1,5 @@
-import type { Hub, SentrySpan } from '@sentry/core';
-import type { EventProcessor, Span } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
+import type { Span } from '@sentry/types';
 import { fill, loadModule, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../../common/debug-build';
@@ -44,7 +44,7 @@ export class Mysql implements LazyLoadedIntegration<MysqlConnection> {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     const pkg = this.loadDependency();
 
     if (!pkg) {
@@ -97,18 +97,13 @@ export class Mysql implements LazyLoadedIntegration<MysqlConnection> {
     //    function (options, values, callback) => void
     fill(pkg, 'createQuery', function (orig: () => void) {
       return function (this: unknown, options: unknown, values: unknown, callback: unknown) {
-        // eslint-disable-next-line deprecation/deprecation
-        const scope = getCurrentHub().getScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const parentSpan = scope.getSpan() as SentrySpan | undefined;
-
-        // eslint-disable-next-line deprecation/deprecation
-        const span = parentSpan?.startChild({
+        const span = startInactiveSpan({
+          onlyIfParent: true,
           name: typeof options === 'string' ? options : (options as { sql: string }).sql,
           op: 'db',
-          origin: 'auto.db.mysql',
-          data: {
+          attributes: {
             'db.system': 'mysql',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.mysql',
           },
         });
 
diff --git a/packages/tracing-internal/src/node/integrations/postgres.ts b/packages/tracing-internal/src/node/integrations/postgres.ts
index 3c883bb64de1..30f94e41998c 100644
--- a/packages/tracing-internal/src/node/integrations/postgres.ts
+++ b/packages/tracing-internal/src/node/integrations/postgres.ts
@@ -1,5 +1,5 @@
-import type { Hub, SentrySpan } from '@sentry/core';
-import type { EventProcessor } from '@sentry/types';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/core';
+import type { SpanAttributes } from '@sentry/types';
 import { fill, isThenable, loadModule, logger } from '@sentry/utils';
 
 import { DEBUG_BUILD } from '../../common/debug-build';
@@ -74,7 +74,7 @@ export class Postgres implements LazyLoadedIntegration<PGModule> {
   /**
    * @inheritDoc
    */
-  public setupOnce(_: (callback: EventProcessor) => void, getCurrentHub: () => Hub): void {
+  public setupOnce(): void {
     const pkg = this.loadDependency();
 
     if (!pkg) {
@@ -98,38 +98,33 @@ export class Postgres implements LazyLoadedIntegration<PGModule> {
      */
     fill(Client.prototype, 'query', function (orig: PgClientQuery) {
       return function (this: PgClientThis, config: unknown, values: unknown, callback: unknown) {
-        // eslint-disable-next-line deprecation/deprecation
-        const scope = getCurrentHub().getScope();
-        // eslint-disable-next-line deprecation/deprecation
-        const parentSpan = scope.getSpan() as SentrySpan | undefined;
-
-        const data: Record<string, string | number> = {
+        const attributes: SpanAttributes = {
           'db.system': 'postgresql',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.db.postgres',
         };
 
         try {
           if (this.database) {
-            data['db.name'] = this.database;
+            attributes['db.name'] = this.database;
           }
           if (this.host) {
-            data['server.address'] = this.host;
+            attributes['server.address'] = this.host;
           }
           if (this.port) {
-            data['server.port'] = this.port;
+            attributes['server.port'] = this.port;
           }
           if (this.user) {
-            data['db.user'] = this.user;
+            attributes['db.user'] = this.user;
           }
         } catch (e) {
           // ignore
         }
 
-        // eslint-disable-next-line deprecation/deprecation
-        const span = parentSpan?.startChild({
+        const span = startInactiveSpan({
+          onlyIfParent: true,
           name: typeof config === 'string' ? config : (config as { text: string }).text,
           op: 'db',
-          origin: 'auto.db.postgres',
-          data,
+          attributes,
         });
 
         if (typeof callback === 'function') {
diff --git a/packages/tracing-internal/test/browser/backgroundtab.test.ts b/packages/tracing-internal/test/browser/backgroundtab.test.ts
index bb90927ec099..d44f08621ddc 100644
--- a/packages/tracing-internal/test/browser/backgroundtab.test.ts
+++ b/packages/tracing-internal/test/browser/backgroundtab.test.ts
@@ -50,7 +50,7 @@ describe('registerBackgroundTabDetection', () => {
       global.document.hidden = true;
       events.visibilitychange();
 
-      const { status, timestamp, data } = spanToJSON(span!);
+      const { status, timestamp, data } = spanToJSON(span);
 
       expect(status).toBe('cancelled');
       expect(status).toBeDefined();
diff --git a/packages/tracing-internal/test/browser/browserTracingIntegration.test.ts b/packages/tracing-internal/test/browser/browserTracingIntegration.test.ts
index 1e29fa8528b6..243ef14f159c 100644
--- a/packages/tracing-internal/test/browser/browserTracingIntegration.test.ts
+++ b/packages/tracing-internal/test/browser/browserTracingIntegration.test.ts
@@ -1,4 +1,3 @@
-import type { IdleTransaction } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -6,15 +5,15 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   TRACING_DEFAULTS,
   getActiveSpan,
-  getActiveTransaction,
   getCurrentScope,
+  getDynamicSamplingContextFromSpan,
+  getIsolationScope,
   setCurrentClient,
   spanIsSampled,
   spanToJSON,
   startInactiveSpan,
 } from '@sentry/core';
-import * as hubExtensions from '@sentry/core';
-import type { StartSpanOptions } from '@sentry/types';
+import type { Span, StartSpanOptions } from '@sentry/types';
 import { timestampInSeconds } from '@sentry/utils';
 import { JSDOM } from 'jsdom';
 import { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '../..';
@@ -41,9 +40,15 @@ afterAll(() => {
 });
 
 describe('browserTracingIntegration', () => {
-  afterEach(() => {
+  beforeEach(() => {
     getCurrentScope().clear();
+    getIsolationScope().clear();
     getCurrentScope().setClient(undefined);
+    document.head.innerHTML = '';
+  });
+
+  afterEach(() => {
+    getActiveSpan()?.end();
   });
 
   it('works with tracing enabled', () => {
@@ -85,8 +90,7 @@ describe('browserTracingIntegration', () => {
     client.init();
 
     const span = getActiveSpan();
-    expect(span).toBeDefined();
-    expect(spanIsSampled(span!)).toBe(false);
+    expect(span).toBeUndefined();
   });
 
   it("doesn't create a pageload span when instrumentPageLoad is false", () => {
@@ -201,59 +205,11 @@ describe('browserTracingIntegration', () => {
     });
   });
 
-  it('extracts window.location/self.location for sampling context in pageload transactions', () => {
-    // this is what is used to get the span name - JSDOM does not update this on it's own!
-    const dom = new JSDOM(undefined, { url: 'https://example.com/test' });
-    Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });
-
-    const tracesSampler = jest.fn();
-    const client = new TestClient(
-      getDefaultClientOptions({
-        tracesSampleRate: 1,
-        integrations: [browserTracingIntegration()],
-        tracesSampler,
-      }),
-    );
-    setCurrentClient(client);
-    client.init();
-
-    expect(tracesSampler).toHaveBeenCalledWith(
-      expect.objectContaining({
-        location: dom.window.document.location,
-      }),
-    );
-  });
-
-  it('extracts window.location/self.location for sampling context in navigation transactions', () => {
-    const tracesSampler = jest.fn();
-    const client = new TestClient(
-      getDefaultClientOptions({
-        tracesSampleRate: 1,
-        integrations: [browserTracingIntegration({ instrumentPageLoad: false })],
-        tracesSampler,
-      }),
-    );
-    setCurrentClient(client);
-    client.init();
-
-    // this is what is used to get the span name - JSDOM does not update this on it's own!
-    const dom = new JSDOM(undefined, { url: 'https://example.com/test' });
-    Object.defineProperty(global, 'location', { value: dom.window.document.location, writable: true });
-
-    WINDOW.history.pushState({}, '', '/test');
-
-    expect(tracesSampler).toHaveBeenCalledWith(
-      expect.objectContaining({
-        location: dom.window.document.location,
-      }),
-    );
-  });
-
-  it("trims pageload transactions to the max duration of the transaction's children", () => {
+  it("trims pageload transactions to the max duration of the transaction's children", async () => {
     const client = new TestClient(
       getDefaultClientOptions({
         tracesSampleRate: 1,
-        integrations: [browserTracingIntegration()],
+        integrations: [browserTracingIntegration({ idleTimeout: 10 })],
       }),
     );
 
@@ -264,8 +220,10 @@ describe('browserTracingIntegration', () => {
     const childSpan = startInactiveSpan({ name: 'pageload-child' });
     const timestamp = timestampInSeconds();
 
-    childSpan?.end(timestamp);
-    pageloadSpan?.end(timestamp + 12345);
+    childSpan.end(timestamp);
+
+    // Wait for 10ms for idle timeout
+    await new Promise(resolve => setTimeout(resolve, 10));
 
     expect(spanToJSON(pageloadSpan!).timestamp).toBe(timestamp);
   });
@@ -343,8 +301,10 @@ describe('browserTracingIntegration', () => {
 
       const span = startBrowserTracingPageLoadSpan(client, {
         name: 'test span',
-        origin: 'auto.test',
-        attributes: { testy: 'yes' },
+        attributes: {
+          testy: 'yes',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+        },
       });
 
       expect(span).toBeDefined();
@@ -416,6 +376,20 @@ describe('browserTracingIntegration', () => {
 
       expect(spanToJSON(pageloadSpan!).op).toBe('test op');
     });
+
+    it('sets the pageload span name on `scope.transactionName`', () => {
+      const client = new TestClient(
+        getDefaultClientOptions({
+          integrations: [browserTracingIntegration()],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
+
+      startBrowserTracingPageLoadSpan(client, { name: 'test pageload span' });
+
+      expect(getCurrentScope().getScopeData().transactionName).toBe('test pageload span');
+    });
   });
 
   it('sets source to "custom" if name is changed in beforeStartSpan', () => {
@@ -520,8 +494,10 @@ describe('browserTracingIntegration', () => {
 
       const span = startBrowserTracingNavigationSpan(client, {
         name: 'test span',
-        origin: 'auto.test',
-        attributes: { testy: 'yes' },
+        attributes: {
+          testy: 'yes',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.test',
+        },
       });
 
       expect(span).toBeDefined();
@@ -626,45 +602,24 @@ describe('browserTracingIntegration', () => {
       expect(spanToJSON(pageloadSpan!).description).toBe('changed');
       expect(spanToJSON(pageloadSpan!).data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]).toBe('custom');
     });
-  });
 
-  it('sets transaction context from sentry-trace header for pageload transactions', () => {
-    const name = 'sentry-trace';
-    const content = '126de09502ae4e0fb26c6967190756a4-b6e54397b12a2a0f-1';
-    document.head.innerHTML =
-      `<meta name="${name}" content="${content}">` + '<meta name="baggage" content="sentry-release=2.1.14,foo=bar">';
-    const startIdleTransaction = jest.spyOn(hubExtensions, 'startIdleTransaction');
+    it('sets the pageload span name on `scope.transactionName`', () => {
+      const client = new TestClient(
+        getDefaultClientOptions({
+          integrations: [browserTracingIntegration()],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
 
-    const client = new TestClient(
-      getDefaultClientOptions({
-        tracesSampleRate: 1,
-        integrations: [browserTracingIntegration()],
-      }),
-    );
-    setCurrentClient(client);
-    client.init();
+      startBrowserTracingPageLoadSpan(client, { name: 'test navigation span' });
 
-    expect(startIdleTransaction).toHaveBeenCalledWith(
-      expect.any(Object),
-      expect.objectContaining({
-        traceId: '126de09502ae4e0fb26c6967190756a4',
-        parentSpanId: 'b6e54397b12a2a0f',
-        parentSampled: true,
-        metadata: {
-          dynamicSamplingContext: { release: '2.1.14' },
-        },
-      }),
-      expect.any(Number),
-      expect.any(Number),
-      expect.any(Boolean),
-      expect.any(Object),
-      expect.any(Number),
-      true,
-    );
+      expect(getCurrentScope().getScopeData().transactionName).toBe('test navigation span');
+    });
   });
 
   describe('using the <meta> tag data', () => {
-    it('uses the tracing data for pageload transactions', () => {
+    it('uses the tracing data for pageload span', () => {
       // make sampled false here, so we can see that it's being used rather than the tracesSampleRate-dictated one
       document.head.innerHTML =
         '<meta name="sentry-trace" content="12312012123120121231201212312012-1121201211212012-0">' +
@@ -672,6 +627,7 @@ describe('browserTracingIntegration', () => {
 
       const client = new TestClient(
         getDefaultClientOptions({
+          tracesSampleRate: 1,
           integrations: [browserTracingIntegration()],
         }),
       );
@@ -680,24 +636,27 @@ describe('browserTracingIntegration', () => {
       // pageload transactions are created as part of the browserTracingIntegration's initialization
       client.init();
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction;
-      // eslint-disable-next-line deprecation/deprecation
-      const dynamicSamplingContext = transaction.getDynamicSamplingContext()!;
-
-      expect(transaction).toBeDefined();
-      expect(spanToJSON(transaction).op).toBe('pageload');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.traceId).toEqual('12312012123120121231201212312012');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.parentSpanId).toEqual('1121201211212012');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.sampled).toBe(false);
+      const idleSpan = getActiveSpan()!;
+      expect(idleSpan).toBeDefined();
+
+      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan!);
+      const propagationContext = getCurrentScope().getPropagationContext();
+
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('pageload');
+      expect(spanToJSON(idleSpan).trace_id).toEqual('12312012123120121231201212312012');
+      expect(spanToJSON(idleSpan).parent_span_id).toEqual('1121201211212012');
+      expect(spanIsSampled(idleSpan)).toBe(false);
+
       expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({ release: '2.1.14' });
+
+      // Propagation context is reset and does not contain the meta tag data
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
     });
 
-    it('puts frozen Dynamic Sampling Context on pageload transactions if sentry-trace data and only 3rd party baggage is present', () => {
+    it('puts frozen Dynamic Sampling Context on pageload span if sentry-trace data and only 3rd party baggage is present', () => {
       // make sampled false here, so we can see that it's being used rather than the tracesSampleRate-dictated one
       document.head.innerHTML =
         '<meta name="sentry-trace" content="12312012123120121231201212312012-1121201211212012-0">' +
@@ -705,6 +664,7 @@ describe('browserTracingIntegration', () => {
 
       const client = new TestClient(
         getDefaultClientOptions({
+          tracesSampleRate: 1,
           integrations: [browserTracingIntegration()],
         }),
       );
@@ -713,29 +673,34 @@ describe('browserTracingIntegration', () => {
       // pageload transactions are created as part of the browserTracingIntegration's initialization
       client.init();
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction;
-      // eslint-disable-next-line deprecation/deprecation
-      const dynamicSamplingContext = transaction.getDynamicSamplingContext()!;
-
-      expect(transaction).toBeDefined();
-      expect(spanToJSON(transaction).op).toBe('pageload');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.traceId).toEqual('12312012123120121231201212312012');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.parentSpanId).toEqual('1121201211212012');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.sampled).toBe(false);
+      const idleSpan = getActiveSpan()!;
+      expect(idleSpan).toBeDefined();
+
+      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan);
+      const propagationContext = getCurrentScope().getPropagationContext();
+
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('pageload');
+      expect(spanToJSON(idleSpan).trace_id).toEqual('12312012123120121231201212312012');
+      expect(spanToJSON(idleSpan).parent_span_id).toEqual('1121201211212012');
+      expect(spanIsSampled(idleSpan)).toBe(false);
+
+      expect(dynamicSamplingContext).toBeDefined();
       expect(dynamicSamplingContext).toStrictEqual({});
+
+      // Propagation context is reset and does not contain the meta tag data
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
     });
 
-    it('ignores the meta tag data for navigation transactions', () => {
+    it('ignores the meta tag data for navigation spans', () => {
       document.head.innerHTML =
         '<meta name="sentry-trace" content="12312012123120121231201212312012-1121201211212012-0">' +
         '<meta name="baggage" content="sentry-release=2.1.14">';
 
       const client = new TestClient(
         getDefaultClientOptions({
+          tracesSampleRate: 1,
           integrations: [browserTracingIntegration({ instrumentPageLoad: false })],
         }),
       );
@@ -750,21 +715,78 @@ describe('browserTracingIntegration', () => {
 
       WINDOW.history.pushState({}, '', '/navigation-test');
 
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction;
-      // eslint-disable-next-line deprecation/deprecation
-      const dynamicSamplingContext = transaction.getDynamicSamplingContext()!;
-
-      expect(transaction).toBeDefined();
-      expect(spanToJSON(transaction).op).toBe('navigation');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.traceId).not.toEqual('12312012123120121231201212312012');
-      // eslint-disable-next-line deprecation/deprecation
-      expect(transaction.parentSpanId).toBeUndefined();
-      expect(dynamicSamplingContext).toMatchObject({
-        trace_id: expect.not.stringMatching('12312012123120121231201212312012'),
+      const idleSpan = getActiveSpan()!;
+      expect(idleSpan).toBeDefined();
+
+      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan);
+      const propagationContext = getCurrentScope().getPropagationContext();
+
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('navigation');
+      expect(spanToJSON(idleSpan).trace_id).not.toEqual('12312012123120121231201212312012');
+      expect(spanToJSON(idleSpan).parent_span_id).not.toEqual('1121201211212012');
+      expect(spanIsSampled(idleSpan)).toBe(true);
+
+      expect(dynamicSamplingContext).toBeDefined();
+      expect(dynamicSamplingContext).toStrictEqual({
+        environment: 'production',
+        public_key: 'username',
+        sample_rate: '1',
+        sampled: 'true',
+        trace_id: expect.not.stringContaining('12312012123120121231201212312012'),
       });
-      transaction.end();
+
+      // Propagation context is correct
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
+    });
+
+    it('uses passed in tracing data for pageload span over meta tags', () => {
+      // make sampled false here, so we can see that it's being used rather than the tracesSampleRate-dictated one
+      document.head.innerHTML =
+        '<meta name="sentry-trace" content="12312012123120121231201212312012-1121201211212012-1">' +
+        '<meta name="baggage" content="sentry-release=2.1.14,foo=bar">';
+
+      const client = new TestClient(
+        getDefaultClientOptions({
+          tracesSampleRate: 1,
+          integrations: [browserTracingIntegration({ instrumentPageLoad: false })],
+        }),
+      );
+      setCurrentClient(client);
+
+      client.init();
+
+      // manually create a pageload span with tracing data
+      startBrowserTracingPageLoadSpan(
+        client,
+        {
+          name: 'test span',
+        },
+        {
+          sentryTrace: '12312012123120121231201212312011-1121201211212011-1',
+          baggage: 'sentry-release=2.2.14,foo=bar',
+        },
+      );
+
+      const idleSpan = getActiveSpan()!;
+      expect(idleSpan).toBeDefined();
+
+      const dynamicSamplingContext = getDynamicSamplingContextFromSpan(idleSpan!);
+      const propagationContext = getCurrentScope().getPropagationContext();
+
+      // Span is correct
+      expect(spanToJSON(idleSpan).op).toBe('pageload');
+      expect(spanToJSON(idleSpan).trace_id).toEqual('12312012123120121231201212312011');
+      expect(spanToJSON(idleSpan).parent_span_id).toEqual('1121201211212011');
+      expect(spanIsSampled(idleSpan)).toBe(true);
+
+      expect(dynamicSamplingContext).toBeDefined();
+      expect(dynamicSamplingContext).toStrictEqual({ release: '2.2.14' });
+
+      // Propagation context is reset and does not contain the meta tag data
+      expect(propagationContext.traceId).not.toEqual('12312012123120121231201212312012');
+      expect(propagationContext.parentSpanId).not.toEqual('1121201211212012');
     });
   });
 
@@ -780,19 +802,27 @@ describe('browserTracingIntegration', () => {
       setCurrentClient(client);
       client.init();
 
-      const mockFinish = jest.fn();
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction;
-      transaction.sendAutoFinishSignal();
-      transaction.end = mockFinish;
+      const spans: Span[] = [];
+      client.on('spanEnd', span => {
+        spans.push(span);
+      });
+
+      const idleSpan = getActiveSpan();
+      expect(idleSpan).toBeDefined();
 
-      // eslint-disable-next-line deprecation/deprecation
-      const span = transaction.startChild(); // activities = 1
-      span.end(); // activities = 0
+      client.emit('idleSpanEnableAutoFinish', idleSpan!);
+
+      const span = startInactiveSpan({ name: 'inner1' });
+      span?.end(); // activities = 0
+
+      // inner1 is now ended, all good
+      expect(spans).toHaveLength(1);
 
-      expect(mockFinish).toHaveBeenCalledTimes(0);
       jest.advanceTimersByTime(TRACING_DEFAULTS.idleTimeout);
-      expect(mockFinish).toHaveBeenCalledTimes(1);
+
+      // idle span itself is now ended
+      expect(spans).toHaveLength(2);
+      expect(spans[1]).toBe(idleSpan);
     });
 
     it('can be a custom value', () => {
@@ -807,19 +837,27 @@ describe('browserTracingIntegration', () => {
       setCurrentClient(client);
       client.init();
 
-      const mockFinish = jest.fn();
-      // eslint-disable-next-line deprecation/deprecation
-      const transaction = getActiveTransaction() as IdleTransaction;
-      transaction.sendAutoFinishSignal();
-      transaction.end = mockFinish;
+      const spans: Span[] = [];
+      client.on('spanEnd', span => {
+        spans.push(span);
+      });
+
+      const idleSpan = getActiveSpan();
+      expect(idleSpan).toBeDefined();
+
+      client.emit('idleSpanEnableAutoFinish', idleSpan!);
 
-      // eslint-disable-next-line deprecation/deprecation
-      const span = transaction.startChild(); // activities = 1
-      span.end(); // activities = 0
+      const span = startInactiveSpan({ name: 'inner1' });
+      span?.end(); // activities = 0
+
+      // inner1 is now ended, all good
+      expect(spans).toHaveLength(1);
 
-      expect(mockFinish).toHaveBeenCalledTimes(0);
       jest.advanceTimersByTime(2000);
-      expect(mockFinish).toHaveBeenCalledTimes(1);
+
+      // idle span itself is now ended
+      expect(spans).toHaveLength(2);
+      expect(spans[1]).toBe(idleSpan);
     });
   });
 
diff --git a/packages/tracing-internal/test/browser/metrics/index.test.ts b/packages/tracing-internal/test/browser/metrics/index.test.ts
index abeddad7c46c..84b3950aeeec 100644
--- a/packages/tracing-internal/test/browser/metrics/index.test.ts
+++ b/packages/tracing-internal/test/browser/metrics/index.test.ts
@@ -1,8 +1,19 @@
-import { Transaction } from '../../../src';
+import {
+  SEMANTIC_ATTRIBUTE_SENTRY_OP,
+  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  SentrySpan,
+  getClient,
+  getCurrentScope,
+  getIsolationScope,
+  setCurrentClient,
+  spanToJSON,
+} from '@sentry/core';
+import type { Span } from '@sentry/types';
 import type { ResourceEntry } from '../../../src/browser/metrics';
 import { _addTtfbToMeasurements } from '../../../src/browser/metrics';
 import { _addMeasureSpans, _addResourceSpans } from '../../../src/browser/metrics';
 import { WINDOW } from '../../../src/browser/types';
+import { TestClient, getDefaultClientOptions } from '../../utils/TestClient';
 
 const mockWindowLocation = {
   ancestorOrigins: {},
@@ -22,15 +33,28 @@ const originalLocation = WINDOW.location;
 const resourceEntryName = 'https://example.com/assets/to/css';
 
 describe('_addMeasureSpans', () => {
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = new Transaction({ op: 'pageload', name: '/' });
+  const span = new SentrySpan({ op: 'pageload', name: '/' });
 
   beforeEach(() => {
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.startChild = jest.fn();
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
+    const client = new TestClient(
+      getDefaultClientOptions({
+        tracesSampleRate: 1,
+      }),
+    );
+    setCurrentClient(client);
+    client.init();
   });
 
-  it('adds measure spans to a transaction', () => {
+  it('adds measure spans to a span', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: Omit<PerformanceMeasure, 'toJSON'> = {
       entryType: 'measure',
       name: 'measure-1',
@@ -43,25 +67,27 @@ describe('_addMeasureSpans', () => {
     const startTime = 23;
     const duration = 356;
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(0);
-    _addMeasureSpans(transaction, entry, startTime, duration, timeOrigin);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(1);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenLastCalledWith({
-      name: 'measure-1',
-      startTimestamp: timeOrigin + startTime,
-      endTimestamp: timeOrigin + startTime + duration,
-      op: 'measure',
-      origin: 'auto.resource.browser.metrics',
-    });
+    _addMeasureSpans(span, entry, startTime, duration, timeOrigin);
+
+    expect(spans).toHaveLength(1);
+    expect(spanToJSON(spans[0]!)).toEqual(
+      expect.objectContaining({
+        description: 'measure-1',
+        start_timestamp: timeOrigin + startTime,
+        timestamp: timeOrigin + startTime + duration,
+        op: 'measure',
+        origin: 'auto.resource.browser.metrics',
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'measure',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+        },
+      }),
+    );
   });
 });
 
 describe('_addResourceSpans', () => {
-  // eslint-disable-next-line deprecation/deprecation
-  const transaction = new Transaction({ op: 'pageload', name: '/' });
+  const span = new SentrySpan({ op: 'pageload', name: '/' });
 
   beforeAll(() => {
     setGlobalLocation(mockWindowLocation);
@@ -72,12 +98,25 @@ describe('_addResourceSpans', () => {
   });
 
   beforeEach(() => {
-    // eslint-disable-next-line deprecation/deprecation
-    transaction.startChild = jest.fn();
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
+    const client = new TestClient(
+      getDefaultClientOptions({
+        tracesSampleRate: 1,
+      }),
+    );
+    setCurrentClient(client);
+    client.init();
   });
 
-  // We already track xhr, we don't need to use
   it('does not create spans for xmlhttprequest', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: ResourceEntry = {
       initiatorType: 'xmlhttprequest',
       transferSize: 256,
@@ -85,13 +124,18 @@ describe('_addResourceSpans', () => {
       decodedBodySize: 256,
       renderBlockingStatus: 'non-blocking',
     };
-    _addResourceSpans(transaction, entry, resourceEntryName, 123, 456, 100);
+    _addResourceSpans(span, entry, resourceEntryName, 123, 456, 100);
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(0);
+    expect(spans).toHaveLength(0);
   });
 
   it('does not create spans for fetch', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: ResourceEntry = {
       initiatorType: 'fetch',
       transferSize: 256,
@@ -99,13 +143,18 @@ describe('_addResourceSpans', () => {
       decodedBodySize: 256,
       renderBlockingStatus: 'non-blocking',
     };
-    _addResourceSpans(transaction, entry, 'https://example.com/assets/to/me', 123, 456, 100);
+    _addResourceSpans(span, entry, 'https://example.com/assets/to/me', 123, 456, 100);
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(0);
+    expect(spans).toHaveLength(0);
   });
 
   it('creates spans for resource spans', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: ResourceEntry = {
       initiatorType: 'css',
       transferSize: 256,
@@ -118,30 +167,38 @@ describe('_addResourceSpans', () => {
     const startTime = 23;
     const duration = 356;
 
-    _addResourceSpans(transaction, entry, resourceEntryName, startTime, duration, timeOrigin);
-
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(1);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenLastCalledWith({
-      data: {
-        ['http.decoded_response_content_length']: entry.decodedBodySize,
-        ['http.response_content_length']: entry.encodedBodySize,
-        ['http.response_transfer_size']: entry.transferSize,
-        ['resource.render_blocking_status']: entry.renderBlockingStatus,
-        ['url.scheme']: 'https',
-        ['server.address']: 'example.com',
-        ['url.same_origin']: true,
-      },
-      name: '/assets/to/css',
-      endTimestamp: timeOrigin + startTime + duration,
-      op: 'resource.css',
-      origin: 'auto.resource.browser.metrics',
-      startTimestamp: timeOrigin + startTime,
-    });
+    _addResourceSpans(span, entry, resourceEntryName, startTime, duration, timeOrigin);
+
+    expect(spans).toHaveLength(1);
+    expect(spanToJSON(spans[0]!)).toEqual(
+      expect.objectContaining({
+        description: '/assets/to/css',
+        start_timestamp: timeOrigin + startTime,
+        timestamp: timeOrigin + startTime + duration,
+        op: 'resource.css',
+        origin: 'auto.resource.browser.metrics',
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+          ['http.decoded_response_content_length']: entry.decodedBodySize,
+          ['http.response_content_length']: entry.encodedBodySize,
+          ['http.response_transfer_size']: entry.transferSize,
+          ['resource.render_blocking_status']: entry.renderBlockingStatus,
+          ['url.scheme']: 'https',
+          ['server.address']: 'example.com',
+          ['url.same_origin']: true,
+        },
+      }),
+    );
   });
 
   it('creates a variety of resource spans', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const table = [
       {
         initiatorType: undefined,
@@ -164,23 +221,25 @@ describe('_addResourceSpans', () => {
         op: 'resource.script',
       },
     ];
-
-    for (const { initiatorType, op } of table) {
+    for (let i = 0; i < table.length; i++) {
+      const { initiatorType, op } = table[i];
       const entry: ResourceEntry = {
         initiatorType,
       };
-      _addResourceSpans(transaction, entry, 'https://example.com/assets/to/me', 123, 234, 465);
-
-      // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-      expect(transaction.startChild).toHaveBeenLastCalledWith(
-        expect.objectContaining({
-          op,
-        }),
-      );
+      _addResourceSpans(span, entry, 'https://example.com/assets/to/me', 123, 234, 465);
+
+      expect(spans).toHaveLength(i + 1);
+      expect(spanToJSON(spans[i]!)).toEqual(expect.objectContaining({ op }));
     }
   });
 
   it('allows for enter size of 0', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: ResourceEntry = {
       initiatorType: 'css',
       transferSize: 0,
@@ -189,14 +248,14 @@ describe('_addResourceSpans', () => {
       renderBlockingStatus: 'non-blocking',
     };
 
-    _addResourceSpans(transaction, entry, resourceEntryName, 100, 23, 345);
+    _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(1);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenLastCalledWith(
+    expect(spans).toHaveLength(1);
+    expect(spanToJSON(spans[0])).toEqual(
       expect.objectContaining({
         data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
           ['http.decoded_response_content_length']: entry.decodedBodySize,
           ['http.response_content_length']: entry.encodedBodySize,
           ['http.response_transfer_size']: entry.transferSize,
@@ -210,6 +269,12 @@ describe('_addResourceSpans', () => {
   });
 
   it('does not attach resource sizes that exceed MAX_INT bytes', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry: ResourceEntry = {
       initiatorType: 'css',
       transferSize: 2147483647,
@@ -217,19 +282,23 @@ describe('_addResourceSpans', () => {
       decodedBodySize: 2147483647,
     };
 
-    _addResourceSpans(transaction, entry, resourceEntryName, 100, 23, 345);
+    _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(1);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenLastCalledWith(
+    expect(spans).toHaveLength(1);
+    expect(spanToJSON(spans[0])).toEqual(
       expect.objectContaining({
-        data: { 'server.address': 'example.com', 'url.same_origin': true, 'url.scheme': 'https' },
-        name: '/assets/to/css',
-        endTimestamp: 468,
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+          'server.address': 'example.com',
+          'url.same_origin': true,
+          'url.scheme': 'https',
+        },
+        description: '/assets/to/css',
+        timestamp: 468,
         op: 'resource.css',
         origin: 'auto.resource.browser.metrics',
-        startTimestamp: 445,
+        start_timestamp: 445,
       }),
     );
   });
@@ -237,6 +306,12 @@ describe('_addResourceSpans', () => {
   // resource sizes can be set as null on some browsers
   // https://github.com/getsentry/sentry/pull/60601
   it('does not attach null resource sizes', () => {
+    const spans: Span[] = [];
+
+    getClient()?.on('spanEnd', span => {
+      spans.push(span);
+    });
+
     const entry = {
       initiatorType: 'css',
       transferSize: null,
@@ -244,19 +319,23 @@ describe('_addResourceSpans', () => {
       decodedBodySize: null,
     } as unknown as ResourceEntry;
 
-    _addResourceSpans(transaction, entry, resourceEntryName, 100, 23, 345);
+    _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);
 
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenCalledTimes(1);
-    // eslint-disable-next-line @typescript-eslint/unbound-method, deprecation/deprecation
-    expect(transaction.startChild).toHaveBeenLastCalledWith(
+    expect(spans).toHaveLength(1);
+    expect(spanToJSON(spans[0])).toEqual(
       expect.objectContaining({
-        data: { 'server.address': 'example.com', 'url.same_origin': true, 'url.scheme': 'https' },
-        name: '/assets/to/css',
-        endTimestamp: 468,
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.resource.browser.metrics',
+          'server.address': 'example.com',
+          'url.same_origin': true,
+          'url.scheme': 'https',
+        },
+        description: '/assets/to/css',
+        timestamp: 468,
         op: 'resource.css',
         origin: 'auto.resource.browser.metrics',
-        startTimestamp: 445,
+        start_timestamp: 445,
       }),
     );
   });
diff --git a/packages/tracing-internal/test/browser/metrics/utils.test.ts b/packages/tracing-internal/test/browser/metrics/utils.test.ts
index 9cbae997cd7e..ad9d0dc801f8 100644
--- a/packages/tracing-internal/test/browser/metrics/utils.test.ts
+++ b/packages/tracing-internal/test/browser/metrics/utils.test.ts
@@ -1,15 +1,38 @@
-import { SentrySpan, Transaction, spanToJSON } from '@sentry/core';
-import { _startChild } from '../../../src/browser/metrics/utils';
+import {
+  SentrySpan,
+  addTracingExtensions,
+  getCurrentScope,
+  getIsolationScope,
+  setCurrentClient,
+  spanToJSON,
+} from '@sentry/core';
+import { startAndEndSpan } from '../../../src/browser/metrics/utils';
+import { TestClient, getDefaultClientOptions } from '../../utils/TestClient';
+
+describe('startAndEndSpan()', () => {
+  beforeEach(() => {
+    addTracingExtensions();
+
+    getCurrentScope().clear();
+    getIsolationScope().clear();
+
+    const client = new TestClient(
+      getDefaultClientOptions({
+        tracesSampleRate: 1,
+      }),
+    );
+    setCurrentClient(client);
+    client.init();
+  });
 
-describe('_startChild()', () => {
   it('creates a span with given properties', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new Transaction({ name: 'test' });
-    const span = _startChild(transaction, {
+    const parentSpan = new SentrySpan({ name: 'test' });
+    const span = startAndEndSpan(parentSpan, 100, 200, {
       name: 'evaluation',
       op: 'script',
-    });
+    })!;
 
+    expect(span).toBeDefined();
     expect(span).toBeInstanceOf(SentrySpan);
     expect(spanToJSON(span).description).toBe('evaluation');
     expect(spanToJSON(span).op).toBe('script');
@@ -17,28 +40,26 @@ describe('_startChild()', () => {
   });
 
   it('adjusts the start timestamp if child span starts before transaction', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new Transaction({ name: 'test', startTimestamp: 123 });
-    const span = _startChild(transaction, {
+    const parentSpan = new SentrySpan({ name: 'test', startTimestamp: 123 });
+    const span = startAndEndSpan(parentSpan, 100, 200, {
       name: 'script.js',
       op: 'resource',
-      startTimestamp: 100,
-    });
+    })!;
 
-    expect(spanToJSON(transaction).start_timestamp).toEqual(spanToJSON(span).start_timestamp);
-    expect(spanToJSON(transaction).start_timestamp).toEqual(100);
+    expect(span).toBeDefined();
+    expect(spanToJSON(parentSpan).start_timestamp).toEqual(spanToJSON(span).start_timestamp);
+    expect(spanToJSON(parentSpan).start_timestamp).toEqual(100);
   });
 
   it('does not adjust start timestamp if child span starts after transaction', () => {
-    // eslint-disable-next-line deprecation/deprecation
-    const transaction = new Transaction({ name: 'test', startTimestamp: 123 });
-    const span = _startChild(transaction, {
+    const parentSpan = new SentrySpan({ name: 'test', startTimestamp: 123 });
+    const span = startAndEndSpan(parentSpan, 150, 200, {
       name: 'script.js',
       op: 'resource',
-      startTimestamp: 150,
-    });
+    })!;
 
-    expect(spanToJSON(transaction).start_timestamp).not.toEqual(spanToJSON(span).start_timestamp);
-    expect(spanToJSON(transaction).start_timestamp).toEqual(123);
+    expect(span).toBeDefined();
+    expect(spanToJSON(parentSpan).start_timestamp).not.toEqual(spanToJSON(span).start_timestamp);
+    expect(spanToJSON(parentSpan).start_timestamp).toEqual(123);
   });
 });
diff --git a/packages/tracing-internal/test/browser/router.test.ts b/packages/tracing-internal/test/browser/router.test.ts
index 96f1fb661fe5..12c44f9029c4 100644
--- a/packages/tracing-internal/test/browser/router.test.ts
+++ b/packages/tracing-internal/test/browser/router.test.ts
@@ -1,4 +1,4 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
 import type { HandlerDataHistory } from '@sentry/types';
 import { JSDOM } from 'jsdom';
 import { conditionalTest } from '../../../node/test/utils';
@@ -45,8 +45,10 @@ conditionalTest({ min: 16 })('instrumentRoutingWithDefaults', () => {
     expect(customStartTransaction).toHaveBeenLastCalledWith({
       name: 'blank',
       op: 'pageload',
-      origin: 'auto.pageload.browser',
-      attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url' },
+      attributes: {
+        [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.browser',
+      },
       startTimestamp: expect.any(Number),
     });
   });
@@ -63,12 +65,7 @@ conditionalTest({ min: 16 })('instrumentRoutingWithDefaults', () => {
 
     it('it is not created automatically', () => {
       instrumentRoutingWithDefaults(customStartTransaction);
-      expect(customStartTransaction).not.toHaveBeenLastCalledWith({
-        name: 'blank',
-        op: 'navigation',
-        origin: 'auto.navigation.browser',
-        metadata: { source: 'url' },
-      });
+      expect(customStartTransaction).not.toHaveBeenCalledWith(expect.objectContaining({ op: 'navigation' }));
     });
 
     it('is created on location change', () => {
@@ -80,8 +77,10 @@ conditionalTest({ min: 16 })('instrumentRoutingWithDefaults', () => {
       expect(customStartTransaction).toHaveBeenLastCalledWith({
         name: 'blank',
         op: 'navigation',
-        origin: 'auto.navigation.browser',
-        attributes: { [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url' },
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.browser',
+        },
       });
     });
 
diff --git a/packages/types/package.json b/packages/types/package.json
index df573a2bccff..791ec312e9f7 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/types/src/attachment.ts b/packages/types/src/attachment.ts
index 44f4123c7ad2..1e619cf108ea 100644
--- a/packages/types/src/attachment.ts
+++ b/packages/types/src/attachment.ts
@@ -1,3 +1,10 @@
+export type AttachmentType =
+  | 'event.attachment'
+  | 'event.minidump'
+  | 'event.applecrashreport'
+  | 'unreal.context'
+  | 'unreal.logs';
+
 /**
  * An attachment to an event. This is used to upload arbitrary data to Sentry.
  *
@@ -23,5 +30,5 @@ export interface Attachment {
   /**
    * The type of the attachment. Defaults to `event.attachment` if not specified.
    */
-  attachmentType?: 'event.attachment' | 'event.minidump' | 'event.applecrashreport' | 'unreal.context' | 'unreal.logs';
+  attachmentType?: AttachmentType;
 }
diff --git a/packages/types/src/client.ts b/packages/types/src/client.ts
index 83b48ac24d9c..a764023a9b0e 100644
--- a/packages/types/src/client.ts
+++ b/packages/types/src/client.ts
@@ -14,8 +14,8 @@ import type { Scope } from './scope';
 import type { SdkMetadata } from './sdkmetadata';
 import type { Session, SessionAggregates } from './session';
 import type { SeverityLevel } from './severity';
+import type { Span } from './span';
 import type { StartSpanOptions } from './startSpanOptions';
-import type { Transaction } from './transaction';
 import type { Transport, TransportMakeRequestResponse } from './transport';
 
 /**
@@ -169,6 +169,9 @@ export interface Client<O extends ClientOptions = ClientOptions> {
   /** Submits the session to Sentry */
   sendSession(session: Session | SessionAggregates): void;
 
+  /** Sends an envelope to Sentry */
+  sendEnvelope(envelope: Envelope): PromiseLike<TransportMakeRequestResponse>;
+
   /**
    * Record on the client that an event got dropped (ie, an event that will not be sent to sentry).
    *
@@ -182,16 +185,21 @@ export interface Client<O extends ClientOptions = ClientOptions> {
   /* eslint-disable @typescript-eslint/unified-signatures */
 
   /**
-   * Register a callback for transaction start.
-   * Receives the transaction as argument.
+   * Register a callback for whenever a span is started.
+   * Receives the span as argument.
    */
-  on(hook: 'startTransaction', callback: (transaction: Transaction) => void): void;
+  on(hook: 'spanStart', callback: (span: Span) => void): void;
 
   /**
-   * Register a callback for transaction finish.
-   * Receives the transaction as argument.
+   * Register a callback for whenever a span is ended.
+   * Receives the span as argument.
    */
-  on(hook: 'finishTransaction', callback: (transaction: Transaction) => void): void;
+  on(hook: 'spanEnd', callback: (span: Span) => void): void;
+
+  /**
+   * Register a callback for when an idle span is allowed to auto-finish.
+   */
+  on(hook: 'idleSpanEnableAutoFinish', callback: (span: Span) => void): void;
 
   /**
    * Register a callback for transaction start and finish.
@@ -240,7 +248,13 @@ export interface Client<O extends ClientOptions = ClientOptions> {
   /**
    * A hook for the browser tracing integrations to trigger a span start for a page load.
    */
-  on(hook: 'startPageLoadSpan', callback: (options: StartSpanOptions) => void): void;
+  on(
+    hook: 'startPageLoadSpan',
+    callback: (
+      options: StartSpanOptions,
+      traceOptions?: { sentryTrace?: string | undefined; baggage?: string | undefined },
+    ) => void,
+  ): void;
 
   /**
    * A hook for browser tracing integrations to trigger a span for a navigation.
@@ -257,17 +271,16 @@ export interface Client<O extends ClientOptions = ClientOptions> {
    */
   on(hook: 'close', callback: () => void): void;
 
-  /**
-   * Fire a hook event for transaction start.
-   * Expects to be given a transaction as the second argument.
-   */
-  emit(hook: 'startTransaction', transaction: Transaction): void;
+  /** Fire a hook whener a span starts. */
+  emit(hook: 'spanStart', span: Span): void;
+
+  /** Fire a hook whener a span ends. */
+  emit(hook: 'spanEnd', span: Span): void;
 
   /**
-   * Fire a hook event for transaction finish.
-   * Expects to be given a transaction as the second argument.
+   * Fire a hook indicating that an idle span is allowed to auto finish.
    */
-  emit(hook: 'finishTransaction', transaction: Transaction): void;
+  emit(hook: 'idleSpanEnableAutoFinish', span: Span): void;
 
   /*
    * Fire a hook event for envelope creation and sending. Expects to be given an envelope as the
@@ -314,7 +327,11 @@ export interface Client<O extends ClientOptions = ClientOptions> {
   /**
    * Emit a hook event for browser tracing integrations to trigger a span start for a page load.
    */
-  emit(hook: 'startPageLoadSpan', options: StartSpanOptions): void;
+  emit(
+    hook: 'startPageLoadSpan',
+    options: StartSpanOptions,
+    traceOptions?: { sentryTrace?: string | undefined; baggage?: string | undefined },
+  ): void;
 
   /**
    * Emit a hook event for browser tracing integrations to trigger a span for a navigation.
diff --git a/packages/types/src/envelope.ts b/packages/types/src/envelope.ts
index 05db8f118c70..721c13323bdb 100644
--- a/packages/types/src/envelope.ts
+++ b/packages/types/src/envelope.ts
@@ -1,14 +1,14 @@
+import type { AttachmentType } from './attachment';
 import type { SerializedCheckIn } from './checkin';
 import type { ClientReport } from './clientreport';
 import type { DsnComponents } from './dsn';
 import type { Event } from './event';
-import type { FeedbackEvent } from './feedback';
+import type { FeedbackEvent, UserFeedback } from './feedback';
 import type { Profile } from './profiling';
 import type { ReplayEvent, ReplayRecordingData } from './replay';
 import type { SdkInfo } from './sdkinfo';
 import type { SerializedSession, Session, SessionAggregates } from './session';
 import type { Transaction } from './transaction';
-import type { UserFeedback } from './user';
 
 // Based on: https://develop.sentry.dev/sdk/envelopes/
 
@@ -66,7 +66,7 @@ type AttachmentItemHeaders = {
   length: number;
   filename: string;
   content_type?: string;
-  attachment_type?: string;
+  attachment_type?: AttachmentType;
 };
 type UserFeedbackItemHeaders = { type: 'user_report' };
 type FeedbackItemHeaders = { type: 'feedback' };
diff --git a/packages/types/src/event.ts b/packages/types/src/event.ts
index 37146c674f52..da207156b8c8 100644
--- a/packages/types/src/event.ts
+++ b/packages/types/src/event.ts
@@ -47,7 +47,7 @@ export interface Event {
   extra?: Extras;
   user?: User;
   type?: EventType;
-  spans?: Partial<SpanJSON>[];
+  spans?: SpanJSON[];
   measurements?: Measurements;
   debug_meta?: DebugMeta;
   // A place to stash data which is needed at some point in the SDK's event processing pipeline but which shouldn't get sent to Sentry
diff --git a/packages/types/src/feedback.ts b/packages/types/src/feedback.ts
index 360064cda833..37dfe9818994 100644
--- a/packages/types/src/feedback.ts
+++ b/packages/types/src/feedback.ts
@@ -1,6 +1,17 @@
 import type { Event } from './event';
+import type { User } from './user';
 
-export interface FeedbackContext extends Record<string, unknown> {
+/**
+ * Crash report feedback object
+ */
+export interface UserFeedback {
+  event_id: string;
+  email: User['email'];
+  name: string;
+  comments: string;
+}
+
+interface FeedbackContext extends Record<string, unknown> {
   message: string;
   contact_email?: string;
   name?: string;
diff --git a/packages/types/src/hub.ts b/packages/types/src/hub.ts
index e0864d461c72..77fec1dc9a69 100644
--- a/packages/types/src/hub.ts
+++ b/packages/types/src/hub.ts
@@ -7,7 +7,6 @@ import type { Primitive } from './misc';
 import type { Scope } from './scope';
 import type { Session } from './session';
 import type { SeverityLevel } from './severity';
-import type { CustomSamplingContext, Transaction, TransactionContext } from './transaction';
 import type { User } from './user';
 
 /**
@@ -204,27 +203,6 @@ export interface Hub {
    */
   getIntegration<T extends Integration>(integration: IntegrationClass<T>): T | null;
 
-  /**
-   * Starts a new `Transaction` and returns it. This is the entry point to manual tracing instrumentation.
-   *
-   * A tree structure can be built by adding child spans to the transaction, and child spans to other spans. To start a
-   * new child span within the transaction or any span, call the respective `.startChild()` method.
-   *
-   * Every child span must be finished before the transaction is finished, otherwise the unfinished spans are discarded.
-   *
-   * The transaction must be finished with a call to its `.end()` method, at which point the transaction with all its
-   * finished child spans will be sent to Sentry.
-   *
-   * @param context Properties of the new `Transaction`.
-   * @param customSamplingContext Information given to the transaction sampling function (along with context-dependent
-   * default values). See {@link Options.tracesSampler}.
-   *
-   * @returns The transaction which was just started
-   *
-   * @deprecated Use `startSpan()`, `startSpanManual()` or `startInactiveSpan()` instead.
-   */
-  startTransaction(context: TransactionContext, customSamplingContext?: CustomSamplingContext): Transaction;
-
   /**
    * Starts a new `Session`, sets on the current scope and returns it.
    *
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 6a2216587a7f..3c6c3a6fe8a4 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -69,7 +69,7 @@ export type {
   Profile,
 } from './profiling';
 export type { ReplayEvent, ReplayRecordingData, ReplayRecordingMode } from './replay';
-export type { FeedbackEvent } from './feedback';
+export type { FeedbackEvent, UserFeedback } from './feedback';
 export type { QueryParams, Request, SanitizedRequestData } from './request';
 export type { Runtime } from './runtime';
 export type { CaptureContext, Scope, ScopeContext, ScopeData } from './scope';
@@ -131,7 +131,7 @@ export type {
   BaseTransportOptions,
   TransportRequestExecutor,
 } from './transport';
-export type { User, UserFeedback } from './user';
+export type { User } from './user';
 export type { WebFetchHeaders, WebFetchRequest } from './webfetchapi';
 export type { WrappedFunction } from './wrappedfunction';
 export type {
diff --git a/packages/types/src/scope.ts b/packages/types/src/scope.ts
index 39e93f8ac1df..7883ee0eff91 100644
--- a/packages/types/src/scope.ts
+++ b/packages/types/src/scope.ts
@@ -40,7 +40,6 @@ export interface ScopeData {
   sdkProcessingMetadata: { [key: string]: unknown };
   fingerprint: string[];
   level?: SeverityLevel;
-  /** @deprecated This will be removed in v8. */
   transactionName?: string;
   span?: Span;
 }
@@ -61,6 +60,12 @@ export interface Scope {
    */
   getClient<C extends Client>(): C | undefined;
 
+  /**
+   * Add internal on change listener. Used for sub SDKs that need to store the scope.
+   * @hidden
+   */
+  addScopeListener(callback: (scope: Scope) => void): void;
+
   /** Add new event processor that will be called during event processing. */
   addEventProcessor(callback: EventProcessor): this;
 
@@ -121,8 +126,15 @@ export interface Scope {
   setLevel(level: SeverityLevel): this;
 
   /**
-   * Sets the transaction name on the scope for future events.
-   * @deprecated Use extra or tags instead.
+   * Sets the transaction name on the scope so that the name of the transaction
+   * (e.g. taken server route or page location) is attached to future events.
+   *
+   * IMPORTANT: Calling this function does NOT change the name of the currently active
+   * span. If you want to change the name of the active span, use `span.updateName()`
+   * instead.
+   *
+   * By default, the SDK updates the scope's transaction name automatically on sensible
+   * occasions, such as a page navigation or when handling a new request on the server.
    */
   setTransactionName(name?: string): this;
 
diff --git a/packages/types/src/span.ts b/packages/types/src/span.ts
index ddc3057e6cbf..76b8ba18fcdc 100644
--- a/packages/types/src/span.ts
+++ b/packages/types/src/span.ts
@@ -50,7 +50,6 @@ export interface SpanJSON {
   span_id: string;
   start_timestamp: number;
   status?: string;
-  tags?: { [key: string]: Primitive };
   timestamp?: number;
   trace_id: string;
   origin?: SpanOrigin;
@@ -62,6 +61,44 @@ type TraceFlagNone = 0;
 type TraceFlagSampled = 1;
 export type TraceFlag = TraceFlagNone | TraceFlagSampled;
 
+export interface TraceState {
+  /**
+   * Create a new TraceState which inherits from this TraceState and has the
+   * given key set.
+   * The new entry will always be added in the front of the list of states.
+   *
+   * @param key key of the TraceState entry.
+   * @param value value of the TraceState entry.
+   */
+  set(key: string, value: string): TraceState;
+  /**
+   * Return a new TraceState which inherits from this TraceState but does not
+   * contain the given key.
+   *
+   * @param key the key for the TraceState entry to be removed.
+   */
+  unset(key: string): TraceState;
+  /**
+   * Returns the value to which the specified key is mapped, or `undefined` if
+   * this map contains no mapping for the key.
+   *
+   * @param key with which the specified value is to be associated.
+   * @returns the value to which the specified key is mapped, or `undefined` if
+   *     this map contains no mapping for the key.
+   */
+  get(key: string): string | undefined;
+  /**
+   * Serializes the TraceState to a `list` as defined below. The `list` is a
+   * series of `list-members` separated by commas `,`, and a list-member is a
+   * key/value pair separated by an equals sign `=`. Spaces and horizontal tabs
+   * surrounding `list-members` are ignored. There can be a maximum of 32
+   * `list-members` in a `list`.
+   *
+   * @returns the serialized string.
+   */
+  serialize(): string;
+}
+
 export interface SpanContextData {
   /**
    * The ID of the trace that this span belongs to. It is worldwide unique
@@ -81,7 +118,7 @@ export interface SpanContextData {
   /**
    * Only true if the SpanContext was propagated from a remote parent.
    */
-  isRemote?: boolean;
+  isRemote?: boolean | undefined;
 
   /**
    * Trace flags to propagate.
@@ -90,11 +127,11 @@ export interface SpanContextData {
    * sampled or not. When set, the least significant bit documents that the
    * caller may have recorded trace data. A caller who does not record trace
    * data out-of-band leaves this flag unset.
-   * We allow number here because otel also does, so we can't be stricter than them.
    */
   traceFlags: TraceFlag | number;
 
-  // Note: we do not have traceState here, but this is optional in OpenTelemetry anyhow
+  /** In OpenTelemetry, this can be used to store trace state, which are basically key-value pairs. */
+  traceState?: TraceState | undefined;
 }
 
 /**
@@ -132,12 +169,6 @@ export interface SpanContext {
    */
   traceId?: string | undefined;
 
-  /**
-   * Tags of the Span.
-   * @deprecated Pass `attributes` instead.
-   */
-  tags?: { [key: string]: Primitive };
-
   /**
    * Data of the Span.
    * @deprecated Pass `attributes` instead.
@@ -158,11 +189,6 @@ export interface SpanContext {
    * Timestamp in seconds (epoch time) indicating when the span ended.
    */
   endTimestamp?: number | undefined;
-
-  /**
-   * The origin of the span, giving context about what created the span.
-   */
-  origin?: SpanOrigin | undefined;
 }
 
 /**
diff --git a/packages/types/src/stacktrace.ts b/packages/types/src/stacktrace.ts
index c27cbf00a12c..59dff047ab21 100644
--- a/packages/types/src/stacktrace.ts
+++ b/packages/types/src/stacktrace.ts
@@ -6,6 +6,6 @@ export interface Stacktrace {
   frames_omitted?: [number, number];
 }
 
-export type StackParser = (stack: string, skipFirst?: number) => StackFrame[];
+export type StackParser = (stack: string, skipFirstLines?: number, framesToPop?: number) => StackFrame[];
 export type StackLineParserFn = (line: string) => StackFrame | undefined;
 export type StackLineParser = [number, StackLineParserFn];
diff --git a/packages/types/src/startSpanOptions.ts b/packages/types/src/startSpanOptions.ts
index d884d7edaeff..31874ffb6734 100644
--- a/packages/types/src/startSpanOptions.ts
+++ b/packages/types/src/startSpanOptions.ts
@@ -1,9 +1,7 @@
-import type { Primitive } from './misc';
 import type { Scope } from './scope';
-import type { SpanAttributes, SpanOrigin, SpanTimeInput } from './span';
-import type { TransactionContext, TransactionMetadata, TransactionSource } from './transaction';
+import type { SpanAttributes, SpanTimeInput } from './span';
 
-export interface StartSpanOptions extends TransactionContext {
+export interface StartSpanOptions {
   /** A manually specified start time for the created `Span` object. */
   startTime?: SpanTimeInput;
 
@@ -26,75 +24,6 @@ export interface StartSpanOptions extends TransactionContext {
    */
   forceTransaction?: boolean;
 
-  /**
-   * The origin of the span - if it comes from auto instrumentation or manual instrumentation.
-   *
-   * @deprecated Set `attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]` instead.
-   */
-  origin?: SpanOrigin;
-
   /** Attributes for the span. */
   attributes?: SpanAttributes;
-
-  // All remaining fields are deprecated
-
-  /**
-   * @deprecated Manually set the end timestamp instead.
-   */
-  trimEnd?: boolean;
-
-  /**
-   * @deprecated This cannot be set manually anymore.
-   */
-  parentSampled?: boolean;
-
-  /**
-   * @deprecated Use attributes or set data on scopes instead.
-   */
-  metadata?: Partial<TransactionMetadata>;
-
-  /**
-   * @deprecated Use `scope` instead.
-   */
-  parentSpanId?: string;
-
-  /**
-   * @deprecated You cannot manually set the span to sampled anymore.
-   */
-  sampled?: boolean;
-
-  /**
-   * @deprecated You cannot manually set the spanId anymore.
-   */
-  spanId?: string;
-
-  /**
-   * @deprecated You cannot manually set the traceId anymore.
-   */
-  traceId?: string;
-
-  /**
-   * @deprecated Use an attribute instead.
-   */
-  source?: TransactionSource;
-
-  /**
-   * @deprecated Use attributes or set tags on the scope instead.
-   */
-  tags?: { [key: string]: Primitive };
-
-  /**
-   * @deprecated Use attributes instead.
-   */
-  data?: { [key: string]: any };
-
-  /**
-   * @deprecated Use `startTime` instead.
-   */
-  startTimestamp?: number;
-
-  /**
-   * @deprecated Use `span.end()` instead.
-   */
-  endTimestamp?: number;
 }
diff --git a/packages/types/src/transaction.ts b/packages/types/src/transaction.ts
index 4b05fb430565..2e44730ac808 100644
--- a/packages/types/src/transaction.ts
+++ b/packages/types/src/transaction.ts
@@ -1,7 +1,7 @@
 import type { Context } from './context';
 import type { DynamicSamplingContext } from './envelope';
 import type { MeasurementUnit } from './measurement';
-import type { ExtractedNodeRequestData, Primitive, WorkerLocation } from './misc';
+import type { ExtractedNodeRequestData, WorkerLocation } from './misc';
 import type { PolymorphicRequest } from './polymorphics';
 import type { Span, SpanAttributes, SpanContext } from './span';
 
@@ -81,12 +81,6 @@ export interface Transaction extends Omit<TransactionContext, 'name' | 'op'>, Sp
    */
   startTimestamp: number;
 
-  /**
-   * Tags for the transaction.
-   * @deprecated Use `getSpanAttributes(transaction)` instead.
-   */
-  tags: { [key: string]: Primitive };
-
   /**
    * Data for the transaction.
    * @deprecated Use `getSpanAttributes(transaction)` instead.
diff --git a/packages/types/src/user.ts b/packages/types/src/user.ts
index afbb42261ab3..ba8e32a3d469 100644
--- a/packages/types/src/user.ts
+++ b/packages/types/src/user.ts
@@ -8,10 +8,3 @@ export interface User {
   email?: string;
   username?: string;
 }
-
-export interface UserFeedback {
-  event_id: string;
-  email: User['email'];
-  name: string;
-  comments: string;
-}
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index 9cbd605aef9a..d38a5701a2bf 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -4,6 +4,6 @@
   "include": ["src/**/*"],
 
   "compilerOptions": {
-    "lib": ["ES6"]
+    "lib": ["es2017"]
   }
 }
diff --git a/packages/typescript/README.md b/packages/typescript/README.md
index 4068d701a7a6..94eb1cbba7e6 100644
--- a/packages/typescript/README.md
+++ b/packages/typescript/README.md
@@ -46,4 +46,5 @@ Add the following config files to your project's root directory:
 }
 ```
 
-For an example of how to use this package in a monorepo, check out this package's own parent repo, https://github.com/getsentry/sentry-javascript.
+For an example of how to use this package in a monorepo, check out this package's own parent repo,
+https://github.com/getsentry/sentry-javascript.
diff --git a/packages/typescript/tsconfig.json b/packages/typescript/tsconfig.json
index 107a5888e432..8f773bca55e3 100644
--- a/packages/typescript/tsconfig.json
+++ b/packages/typescript/tsconfig.json
@@ -7,7 +7,7 @@
     "importHelpers": true,
     "inlineSources": true,
     "isolatedModules": true,
-    "lib": ["es6", "dom"],
+    "lib": ["es2017", "dom"],
     "moduleResolution": "node",
     "noErrorTruncation": true,
     "noFallthroughCasesInSwitch": true,
@@ -19,6 +19,6 @@
     "sourceMap": true,
     "strict": true,
     "strictBindCallApply": false,
-    "target": "es6"
+    "target": "es2017"
   }
 }
diff --git a/packages/utils/README.md b/packages/utils/README.md
index afa50827741b..812bb86a3525 100644
--- a/packages/utils/README.md
+++ b/packages/utils/README.md
@@ -19,4 +19,5 @@
 
 Common utilities used by the Sentry JavaScript SDKs.
 
-Note: This package is only meant to be used internally, and as such is not part of our public API contract and does not follow semver.
+Note: This package is only meant to be used internally, and as such is not part of our public API contract and does not
+follow semver.
diff --git a/packages/utils/package.json b/packages/utils/package.json
index b6fc4521fa0b..685cb3784ff2 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/utils/rollup.npm.config.mjs b/packages/utils/rollup.npm.config.mjs
index 84a06f2fb64a..fd61fbf7c62c 100644
--- a/packages/utils/rollup.npm.config.mjs
+++ b/packages/utils/rollup.npm.config.mjs
@@ -1,3 +1,14 @@
 import { makeBaseNPMConfig, makeNPMConfigVariants } from '@sentry-internal/rollup-utils';
 
-export default makeNPMConfigVariants(makeBaseNPMConfig());
+export default makeNPMConfigVariants(
+  makeBaseNPMConfig({
+    packageSpecificConfig: {
+      output: {
+        // set exports to 'named' or 'auto' so that rollup doesn't warn
+        exports: 'named',
+        // set preserveModules to false because we want to bundle everything into one file.
+        preserveModules: false,
+      },
+    },
+  }),
+);
diff --git a/packages/utils/scripts/buildRollup.ts b/packages/utils/scripts/buildRollup.ts
index 80064a14aed7..2e7486f7d005 100644
--- a/packages/utils/scripts/buildRollup.ts
+++ b/packages/utils/scripts/buildRollup.ts
@@ -12,5 +12,5 @@ function run(cmd: string, options?: childProcess.ExecSyncOptions): string | Buff
 run('yarn rollup -c rollup.npm.config.mjs');
 
 // We want to distribute the README because it contains the MIT license blurb from Sucrase and Rollup
-fs.copyFileSync('src/buildPolyfills/README.md', 'build/cjs/buildPolyfills/README.md');
-fs.copyFileSync('src/buildPolyfills/README.md', 'build/esm/buildPolyfills/README.md');
+fs.copyFileSync('src/buildPolyfills/README.md', 'build/cjs/build-polyfills-license.md');
+fs.copyFileSync('src/buildPolyfills/README.md', 'build/esm/build-polyfills-license.md');
diff --git a/packages/utils/src/buildPolyfills/README.md b/packages/utils/src/buildPolyfills/README.md
index eedea6db9959..bdae9c65c89d 100644
--- a/packages/utils/src/buildPolyfills/README.md
+++ b/packages/utils/src/buildPolyfills/README.md
@@ -1,15 +1,30 @@
 ## Build Polyfills
 
-This is a collection of syntax and import/export polyfills either copied directly from or heavily inspired by those used by [Rollup](https://github.com/rollup/rollup) and [Sucrase](https://github.com/alangpierce/sucrase). When either tool uses one of these polyfills during a build, it injects the function source code into each file needing the function, which can lead to a great deal of duplication. For our builds, we have therefore implemented something similar to [`tsc`'s `importHelpers` behavior](https://www.typescriptlang.org/tsconfig#importHelpers): Instead of leaving the polyfills injected in multiple places, we instead replace each injected function with an `import` or `require` statement.
+This is a collection of syntax and import/export polyfills either copied directly from or heavily inspired by those used
+by [Rollup](https://github.com/rollup/rollup) and [Sucrase](https://github.com/alangpierce/sucrase). When either tool
+uses one of these polyfills during a build, it injects the function source code into each file needing the function,
+which can lead to a great deal of duplication. For our builds, we have therefore implemented something similar to
+[`tsc`'s `importHelpers` behavior](https://www.typescriptlang.org/tsconfig#importHelpers): Instead of leaving the
+polyfills injected in multiple places, we instead replace each injected function with an `import` or `require`
+statement.
 
-Note that not all polyfills are currently used by the SDK, but all are included here for future compatitibility, should they ever be needed. Also, since we're never going to be calling these directly from within another TS file, their types are fairly generic. In some cases testing required more specific types, which can be found in the test files.
+Note that not all polyfills are currently used by the SDK, but all are included here for future compatitibility, should
+they ever be needed. Also, since we're never going to be calling these directly from within another TS file, their types
+are fairly generic. In some cases testing required more specific types, which can be found in the test files.
 
---------
+---
 
 _Code from both Rollup and Sucrase is used under the MIT license, copyright 2017 and 2012-2018, respectively._
 
-_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:_
+_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 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._
+_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._
diff --git a/packages/utils/src/stacktrace.ts b/packages/utils/src/stacktrace.ts
index 3fbecec82ebf..bc2274ef522f 100644
--- a/packages/utils/src/stacktrace.ts
+++ b/packages/utils/src/stacktrace.ts
@@ -16,11 +16,11 @@ const STRIP_FRAME_REGEXP = /captureMessage|captureException/;
 export function createStackParser(...parsers: StackLineParser[]): StackParser {
   const sortedParsers = parsers.sort((a, b) => a[0] - b[0]).map(p => p[1]);
 
-  return (stack: string, skipFirst: number = 0): StackFrame[] => {
+  return (stack: string, skipFirstLines: number = 0, framesToPop: number = 0): StackFrame[] => {
     const frames: StackFrame[] = [];
     const lines = stack.split('\n');
 
-    for (let i = skipFirst; i < lines.length; i++) {
+    for (let i = skipFirstLines; i < lines.length; i++) {
       const line = lines[i];
       // Ignore lines over 1kb as they are unlikely to be stack frames.
       // Many of the regular expressions use backtracking which results in run time that increases exponentially with
@@ -49,12 +49,12 @@ export function createStackParser(...parsers: StackLineParser[]): StackParser {
         }
       }
 
-      if (frames.length >= STACKTRACE_FRAME_LIMIT) {
+      if (frames.length >= STACKTRACE_FRAME_LIMIT + framesToPop) {
         break;
       }
     }
 
-    return stripSentryFramesAndReverse(frames);
+    return stripSentryFramesAndReverse(frames.slice(framesToPop));
   };
 }
 
diff --git a/packages/utils/src/worldwide.ts b/packages/utils/src/worldwide.ts
index a2fdfb67e14b..dc6b59d6bff0 100644
--- a/packages/utils/src/worldwide.ts
+++ b/packages/utils/src/worldwide.ts
@@ -12,7 +12,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import type { Integration } from '@sentry/types';
+import type { Client, Integration, MetricsAggregator, Scope } from '@sentry/types';
 
 import type { SdkSource } from './env';
 
@@ -54,6 +54,10 @@ export interface InternalGlobal {
       // eslint-disable-next-line @typescript-eslint/ban-types
       [key: string]: Function;
     };
+    globalScope: Scope | undefined;
+    defaultCurrentScope: Scope | undefined;
+    defaultIsolationScope: Scope | undefined;
+    globalMetricsAggregators: WeakMap<Client, MetricsAggregator> | undefined;
   };
   /**
    * Raw module metadata that is injected by bundler plugins.
diff --git a/packages/vercel-edge/.eslintrc.js b/packages/vercel-edge/.eslintrc.js
index bec6469d0e28..9d915d4f4c3b 100644
--- a/packages/vercel-edge/.eslintrc.js
+++ b/packages/vercel-edge/.eslintrc.js
@@ -6,7 +6,6 @@ module.exports = {
   rules: {
     '@sentry-internal/sdk/no-optional-chaining': 'off',
     '@sentry-internal/sdk/no-nullish-coalescing': 'off',
-    '@sentry-internal/sdk/no-unsupported-es6-methods': 'off',
     '@sentry-internal/sdk/no-class-field-initializers': 'off',
   },
 };
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 494972f57ce0..ba6d7d82257b 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
@@ -29,7 +42,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/tracing": "8.0.0-alpha.2",
     "@sentry/core": "8.0.0-alpha.2",
     "@sentry/types": "8.0.0-alpha.2",
     "@sentry/utils": "8.0.0-alpha.2"
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index b37ec1b92470..67b9393af3eb 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -21,8 +21,6 @@ export type { AddRequestDataToEventOptions } from '@sentry/utils';
 export type { VercelEdgeOptions } from './types';
 
 export {
-  // eslint-disable-next-line deprecation/deprecation
-  addGlobalEventProcessor,
   addEventProcessor,
   addBreadcrumb,
   addIntegration,
@@ -32,22 +30,14 @@ export {
   close,
   createTransport,
   flush,
-  // eslint-disable-next-line deprecation/deprecation
-  getActiveTransaction,
-  // eslint-disable-next-line deprecation/deprecation
-  getCurrentHub,
   getClient,
   isInitialized,
   getCurrentScope,
   getGlobalScope,
   getIsolationScope,
   Hub,
-  // eslint-disable-next-line deprecation/deprecation
-  makeMain,
   setCurrentClient,
   Scope,
-  // eslint-disable-next-line deprecation/deprecation
-  startTransaction,
   SDK_VERSION,
   setContext,
   setExtra,
@@ -63,10 +53,12 @@ export {
   withMonitor,
   setMeasurement,
   getActiveSpan,
+  getRootSpan,
   startSpan,
   startInactiveSpan,
   startSpanManual,
   withActiveSpan,
+  getSpanDescendants,
   continueTrace,
   metrics,
   functionToStringIntegration,
@@ -85,13 +77,4 @@ export {
   init,
 } from './sdk';
 
-import { RequestData } from '@sentry/core';
-
-import { WinterCGFetch } from './integrations/wintercg-fetch';
 export { winterCGFetchIntegration } from './integrations/wintercg-fetch';
-
-/** @deprecated Import the integration function directly, e.g. `inboundFiltersIntegration()` instead of `new Integrations.InboundFilter(). */
-export const Integrations = {
-  WinterCGFetch,
-  RequestData,
-};
diff --git a/packages/vercel-edge/src/integrations/wintercg-fetch.ts b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
index 2a6ffa5f749b..970e10958333 100644
--- a/packages/vercel-edge/src/integrations/wintercg-fetch.ts
+++ b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
@@ -1,18 +1,9 @@
-import { instrumentFetchRequest } from '@sentry-internal/tracing';
-import {
-  addBreadcrumb,
-  convertIntegrationFnToClass,
-  defineIntegration,
-  getClient,
-  isSentryRequestUrl,
-} from '@sentry/core';
+import { addBreadcrumb, defineIntegration, getClient, instrumentFetchRequest, isSentryRequestUrl } from '@sentry/core';
 import type {
   Client,
   FetchBreadcrumbData,
   FetchBreadcrumbHint,
   HandlerDataFetch,
-  Integration,
-  IntegrationClass,
   IntegrationFn,
   Span,
 } from '@sentry/types';
@@ -117,23 +108,10 @@ const _winterCGFetch = ((options: Partial<Options> = {}) => {
   };
 }) satisfies IntegrationFn;
 
-export const winterCGFetchIntegration = defineIntegration(_winterCGFetch);
-
 /**
  * Creates spans and attaches tracing headers to fetch requests on WinterCG runtimes.
- *
- * @deprecated Use `winterCGFetchIntegration()` instead.
  */
-// eslint-disable-next-line deprecation/deprecation
-export const WinterCGFetch = convertIntegrationFnToClass(
-  INTEGRATION_NAME,
-  winterCGFetchIntegration,
-) as IntegrationClass<Integration & { setupOnce: () => void }> & {
-  new (options?: Partial<Options>): Integration;
-};
-
-// eslint-disable-next-line deprecation/deprecation
-export type WinterCGFetch = typeof WinterCGFetch;
+export const winterCGFetchIntegration = defineIntegration(_winterCGFetch);
 
 function createBreadcrumb(handlerData: HandlerDataFetch): void {
   const { startTimestamp, endTimestamp } = handlerData;
diff --git a/packages/vercel-edge/test/wintercg-fetch.test.ts b/packages/vercel-edge/test/wintercg-fetch.test.ts
index 6439795870f7..bdcb9bedd36f 100644
--- a/packages/vercel-edge/test/wintercg-fetch.test.ts
+++ b/packages/vercel-edge/test/wintercg-fetch.test.ts
@@ -1,4 +1,3 @@
-import * as internalTracing from '@sentry-internal/tracing';
 import * as sentryCore from '@sentry/core';
 import type { HandlerDataFetch, Integration } from '@sentry/types';
 import * as sentryUtils from '@sentry/utils';
@@ -14,7 +13,7 @@ class FakeClient extends VercelEdgeClient {
 }
 
 const addFetchInstrumentationHandlerSpy = jest.spyOn(sentryUtils, 'addFetchInstrumentationHandler');
-const instrumentFetchRequestSpy = jest.spyOn(internalTracing, 'instrumentFetchRequest');
+const instrumentFetchRequestSpy = jest.spyOn(sentryCore, 'instrumentFetchRequest');
 const addBreadcrumbSpy = jest.spyOn(sentryCore, 'addBreadcrumb');
 
 describe('WinterCGFetch instrumentation', () => {
diff --git a/packages/vue/README.md b/packages/vue/README.md
index 378b15eafd0d..21f980cfb2c8 100644
--- a/packages/vue/README.md
+++ b/packages/vue/README.md
@@ -28,7 +28,7 @@ const app = createApp({
 Sentry.init({
   app,
   dsn: '__PUBLIC_DSN__',
-   integrations: [
+  integrations: [
     // Or omit `router` if you're not using vue-router
     Sentry.browserTracingIntegration({ router }),
   ],
@@ -38,10 +38,10 @@ Sentry.init({
 ### Vue 2
 
 ```javascript
-import Vue from 'vue'
-import App from './App'
-import router from './router'
-import * as Sentry from '@sentry/vue'
+import Vue from 'vue';
+import App from './App';
+import router from './router';
+import * as Sentry from '@sentry/vue';
 
 Sentry.init({
   Vue: Vue,
@@ -56,6 +56,6 @@ new Vue({
   el: '#app',
   router,
   components: { App },
-  template: '<App/>'
+  template: '<App/>',
 });
 ```
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 9a7085225bc8..371fc276001d 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
   "types": "build/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/esm/index.js"
+      },
+      "require": {
+        "types": "./build/types/index.d.ts",
+        "default": "./build/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/types/index.d.ts": [
diff --git a/packages/vue/src/router.ts b/packages/vue/src/router.ts
index b16541b1ea29..9d8e04bf75b2 100644
--- a/packages/vue/src/router.ts
+++ b/packages/vue/src/router.ts
@@ -125,7 +125,7 @@ export function instrumentVueRouter(
 
 function getActiveRootSpan(): Span | undefined {
   const span = getActiveSpan();
-  const rootSpan = span ? getRootSpan(span) : undefined;
+  const rootSpan = span && getRootSpan(span);
 
   if (!rootSpan) {
     return undefined;
diff --git a/packages/vue/src/vendor/components.ts b/packages/vue/src/vendor/components.ts
index d6bb5b113590..a19dab78d99f 100644
--- a/packages/vue/src/vendor/components.ts
+++ b/packages/vue/src/vendor/components.ts
@@ -32,9 +32,7 @@ const ROOT_COMPONENT_NAME = '<Root>';
 const ANONYMOUS_COMPONENT_NAME = '<Anonymous>';
 
 const repeat = (str: string, n: number): string => {
-  // string.repeat() is not supported by IE11, we fall back to just using the string in that case
-  // eslint-disable-next-line @sentry-internal/sdk/no-unsupported-es6-methods
-  return str.repeat ? str.repeat(n) : str;
+  return str.repeat(n);
 };
 
 export const formatComponentName = (vm?: ViewModel, includeFile?: boolean): string => {
diff --git a/packages/vue/test/router.test.ts b/packages/vue/test/router.test.ts
index c3a786a8f887..1a27e84961b1 100644
--- a/packages/vue/test/router.test.ts
+++ b/packages/vue/test/router.test.ts
@@ -288,7 +288,7 @@ describe('instrumentVueRouter()', () => {
         setAttribute: jest.fn(),
         setAttributes: jest.fn(),
         name: '',
-        toJSON: () => ({
+        getSpanJSON: () => ({
           op: 'pageload',
           data: {
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 9fc6f4c5d604..b136a6417a13 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -7,7 +7,7 @@
   "author": "Sentry",
   "license": "MIT",
   "engines": {
-    "node": ">=14.8"
+    "node": ">=14.18"
   },
   "files": [
     "cjs",
@@ -18,6 +18,19 @@
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
   "types": "build/npm/types/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "import": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/esm/index.js"
+      },
+      "require": {
+        "types": "./build/npm/types/index.d.ts",
+        "default": "./build/npm/cjs/index.js"
+      }
+    }
+  },
   "typesVersions": {
     "<4.9": {
       "build/npm/types/index.d.ts": [
diff --git a/packages/wasm/rollup.bundle.config.mjs b/packages/wasm/rollup.bundle.config.mjs
index b149d75d6244..e172565bd76f 100644
--- a/packages/wasm/rollup.bundle.config.mjs
+++ b/packages/wasm/rollup.bundle.config.mjs
@@ -3,7 +3,6 @@ import { makeBaseBundleConfig, makeBundleConfigVariants } from '@sentry-internal
 const baseBundleConfig = makeBaseBundleConfig({
   bundleType: 'addon',
   entrypoints: ['src/index.ts'],
-  jsVersion: 'es6',
   licenseTitle: '@sentry/wasm',
   outputFileBase: () => 'bundles/wasm',
 });
diff --git a/tsconfig.json b/tsconfig.json
index d09ccd93c76f..fb4ced9fa77d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "./packages/typescript/tsconfig.json",
 
   "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
     "declaration": false,
     "declarationMap": false,
     "skipLibCheck": true,
diff --git a/yarn.lock b/yarn.lock
index 1268c1052158..fbce753719c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -733,6 +733,27 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
+"@babel/core@^7.18.5":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.0.tgz#56cbda6b185ae9d9bed369816a8f4423c5f2ff1b"
+  integrity sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-compilation-targets" "^7.23.6"
+    "@babel/helper-module-transforms" "^7.23.3"
+    "@babel/helpers" "^7.24.0"
+    "@babel/parser" "^7.24.0"
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.0"
+    "@babel/types" "^7.24.0"
+    convert-source-map "^2.0.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.3"
+    semver "^6.3.1"
+
 "@babel/core@^7.22.10":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.0.tgz#f8259ae0e52a123eb40f552551e647b506a94d83"
@@ -881,7 +902,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.18.2":
+"@babel/helper-compilation-targets@^7.18.2", "@babel/helper-compilation-targets@^7.23.6":
   version "7.23.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
   integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
@@ -1089,7 +1110,7 @@
     "@babel/traverse" "^7.20.10"
     "@babel/types" "^7.20.7"
 
-"@babel/helper-module-transforms@^7.18.0":
+"@babel/helper-module-transforms@^7.18.0", "@babel/helper-module-transforms@^7.23.3":
   version "7.23.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
   integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
@@ -1299,6 +1320,15 @@
     "@babel/traverse" "^7.23.0"
     "@babel/types" "^7.23.0"
 
+"@babel/helpers@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.24.0.tgz#a3dd462b41769c95db8091e49cfe019389a9409b"
+  integrity sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==
+  dependencies:
+    "@babel/template" "^7.24.0"
+    "@babel/traverse" "^7.24.0"
+    "@babel/types" "^7.24.0"
+
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -1351,6 +1381,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
   integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
 
+"@babel/parser@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.0.tgz#26a3d1ff49031c53a97d03b604375f028746a9ac"
+  integrity sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -2519,6 +2554,15 @@
     "@babel/parser" "^7.22.15"
     "@babel/types" "^7.22.15"
 
+"@babel/template@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
+  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
+
 "@babel/traverse@^7.11.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.8", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.20.1", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.7", "@babel/traverse@^7.22.10", "@babel/traverse@^7.23.0", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
   version "7.23.2"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
@@ -2551,6 +2595,22 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
+"@babel/traverse@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.24.0.tgz#4a408fbf364ff73135c714a2ab46a5eab2831b1e"
+  integrity sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==
+  dependencies:
+    "@babel/code-frame" "^7.23.5"
+    "@babel/generator" "^7.23.6"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.24.0"
+    "@babel/types" "^7.24.0"
+    debug "^4.3.1"
+    globals "^11.1.0"
+
 "@babel/types@7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz#5a383dffa5416db1b73dedffd311ffd0788fb31c"
@@ -2605,6 +2665,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.24.0":
+  version "7.24.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
+  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+  dependencies:
+    "@babel/helper-string-parser" "^7.23.4"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -5508,18 +5577,17 @@
     magic-string "^0.25.7"
     resolve "^1.17.0"
 
-"@rollup/plugin-commonjs@^21.0.1":
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.0.1.tgz#1e57c81ae1518e4df0954d681c642e7d94588fee"
-  integrity sha512-EA+g22lbNJ8p5kuZJUYyhhDK7WgJckW5g4pNN7n4mAFUM96VuwUnNT3xr2Db2iCZPI1pJPbGyfT5mS9T1dHfMg==
+"@rollup/plugin-commonjs@^25.0.7":
+  version "25.0.7"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-25.0.7.tgz#145cec7589ad952171aeb6a585bbeabd0fd3b4cf"
+  integrity sha512-nEvcR+LRjEjsaSsc4x3XZfCCvZIaSMenZu/OiwOKGN2UhQpAYI7ru7czFvyWbErlpoGjnSX3D5Ch5FcMA3kRWQ==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
+    "@rollup/pluginutils" "^5.0.1"
     commondir "^1.0.1"
-    estree-walker "^2.0.1"
-    glob "^7.1.6"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
-    resolve "^1.17.0"
+    estree-walker "^2.0.2"
+    glob "^8.0.3"
+    is-reference "1.2.1"
+    magic-string "^0.30.3"
 
 "@rollup/plugin-json@^4.0.0", "@rollup/plugin-json@^4.1.0":
   version "4.1.0"
@@ -5528,6 +5596,13 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
+"@rollup/plugin-json@^6.1.0":
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-6.1.0.tgz#fbe784e29682e9bb6dee28ea75a1a83702e7b805"
+  integrity sha512-EGI2te5ENk1coGeADSIwZ7G2Q8CJS2sF120T7jLw4xFw9n7wIOXHo+kIYRAoVpJAN+kmqZSoO3Fp4JtoNF4ReA==
+  dependencies:
+    "@rollup/pluginutils" "^5.1.0"
+
 "@rollup/plugin-node-resolve@^13.0.0":
   version "13.3.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c"
@@ -5540,17 +5615,17 @@
     is-module "^1.0.0"
     resolve "^1.19.0"
 
-"@rollup/plugin-node-resolve@^13.1.3":
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.1.3.tgz#2ed277fb3ad98745424c1d2ba152484508a92d79"
-  integrity sha512-BdxNk+LtmElRo5d06MGY4zoepyrXX1tkzX2hrnPEZ53k78GuOMWLqmJDGIIOPwVRIFZrLQOo+Yr6KtCuLIA0AQ==
+"@rollup/plugin-node-resolve@^15.2.3":
+  version "15.2.3"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9"
+  integrity sha512-j/lym8nf5E21LwBT4Df1VD6hRO2L2iwUeUmP7litikRsVp1H6NWx20NEp0Y7su+7XGc476GnXXc4kFeZNGmaSQ==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
+    "@rollup/pluginutils" "^5.0.1"
+    "@types/resolve" "1.20.2"
     deepmerge "^4.2.2"
+    is-builtin-module "^3.2.1"
     is-module "^1.0.0"
-    resolve "^1.19.0"
+    resolve "^1.22.1"
 
 "@rollup/plugin-node-resolve@^9.0.0":
   version "9.0.0"
@@ -5564,21 +5639,30 @@
     is-module "^1.0.0"
     resolve "^1.17.0"
 
-"@rollup/plugin-replace@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz#f774550f482091719e52e9f14f67ffc0046a883d"
-  integrity sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg==
+"@rollup/plugin-replace@^5.0.5":
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.5.tgz#33d5653dce6d03cb24ef98bef7f6d25b57faefdf"
+  integrity sha512-rYO4fOi8lMaTg/z5Jb+hKnrHHVn8j2lwkqwyS4kTRhKyWOLf2wST2sWXr4WzWiTcoHTp2sTjqUbqIj2E39slKQ==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
+    "@rollup/pluginutils" "^5.0.1"
+    magic-string "^0.30.3"
 
-"@rollup/plugin-sucrase@^4.0.3":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-sucrase/-/plugin-sucrase-4.0.4.tgz#0a3b3d97cdc239ec3399f5a10711f751e9f95d98"
-  integrity sha512-YH4J8yoJb5EVnLhAwWxYAQNh2SJOR+SdZ6XdgoKEv6Kxm33riYkM8MlMaggN87UoISP52qAFyZ5ey56wu6umGg==
+"@rollup/plugin-sucrase@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-sucrase/-/plugin-sucrase-5.0.2.tgz#f8b8b54ad789a47fa882b968a76cede0194eea6e"
+  integrity sha512-4MhIVH9Dy2Hwose1/x5QMs0XF7yn9jDd/yozHqzdIrMWIolgFpGnrnVhQkqTaK1RALY/fpyrEKmwH/04vr1THA==
   dependencies:
-    "@rollup/pluginutils" "^4.1.1"
-    sucrase "^3.20.0"
+    "@rollup/pluginutils" "^5.0.1"
+    sucrase "^3.27.0"
+
+"@rollup/plugin-terser@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-0.4.4.tgz#15dffdb3f73f121aa4fbb37e7ca6be9aeea91962"
+  integrity sha512-XHeJC5Bgvs8LfukDwWZp7yeqin6ns8RTl2B9avbejt6tZqsqvVoWI7ZTQrcNsfKEDWBTnTxM8nMDkO2IFFbd0A==
+  dependencies:
+    serialize-javascript "^6.0.1"
+    smob "^1.0.0"
+    terser "^5.17.4"
 
 "@rollup/plugin-typescript@^11.1.5":
   version "11.1.5"
@@ -5588,13 +5672,13 @@
     "@rollup/pluginutils" "^5.0.1"
     resolve "^1.22.1"
 
-"@rollup/plugin-typescript@^8.3.1":
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.5.0.tgz#7ea11599a15b0a30fa7ea69ce3b791d41b862515"
-  integrity sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==
+"@rollup/plugin-typescript@^11.1.6":
+  version "11.1.6"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-11.1.6.tgz#724237d5ec12609ec01429f619d2a3e7d4d1b22b"
+  integrity sha512-R92yOmIACgYdJ7dJ97p4K69I8gg6IEHt8M7dUBxN3W6nrO8uUxX5ixl0yU/N3aZTi8WhPuICvOHXQvF6FaykAA==
   dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    resolve "^1.17.0"
+    "@rollup/pluginutils" "^5.1.0"
+    resolve "^1.22.1"
 
 "@rollup/pluginutils@^3.0.8", "@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
@@ -5605,14 +5689,6 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.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==
-  dependencies:
-    estree-walker "^2.0.1"
-    picomatch "^2.2.2"
-
 "@rollup/pluginutils@^5.0.1":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"
@@ -5622,66 +5698,140 @@
     estree-walker "^2.0.2"
     picomatch "^2.3.1"
 
+"@rollup/pluginutils@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.1.0.tgz#7e53eddc8c7f483a4ad0b94afb1f7f5fd3c771e0"
+  integrity sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==
+  dependencies:
+    "@types/estree" "^1.0.0"
+    estree-walker "^2.0.2"
+    picomatch "^2.3.1"
+
+"@rollup/rollup-android-arm-eabi@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz#b98786c1304b4ff8db3a873180b778649b5dff2b"
+  integrity sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==
+
 "@rollup/rollup-android-arm-eabi@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.1.tgz#beaf518ee45a196448e294ad3f823d2d4576cf35"
   integrity sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==
 
+"@rollup/rollup-android-arm64@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz#8833679af11172b1bf1ab7cb3bad84df4caf0c9e"
+  integrity sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==
+
 "@rollup/rollup-android-arm64@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.1.tgz#6f76cfa759c2d0fdb92122ffe28217181a1664eb"
   integrity sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==
 
+"@rollup/rollup-darwin-arm64@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz#ef02d73e0a95d406e0eb4fd61a53d5d17775659b"
+  integrity sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==
+
 "@rollup/rollup-darwin-arm64@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.1.tgz#9aaefe33a5481d66322d1c62f368171c03eabe2b"
   integrity sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==
 
+"@rollup/rollup-darwin-x64@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz#3ce5b9bcf92b3341a5c1c58a3e6bcce0ea9e7455"
+  integrity sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==
+
 "@rollup/rollup-darwin-x64@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.1.tgz#707dcaadcdc6bd3fd6c69f55d9456cd4446306a3"
   integrity sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==
 
+"@rollup/rollup-linux-arm-gnueabihf@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz#3d3d2c018bdd8e037c6bfedd52acfff1c97e4be4"
+  integrity sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==
+
 "@rollup/rollup-linux-arm-gnueabihf@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.1.tgz#7a4dbbd1dd98731d88a55aefcef0ec4c578fa9c7"
   integrity sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==
 
+"@rollup/rollup-linux-arm64-gnu@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz#5fc8cc978ff396eaa136d7bfe05b5b9138064143"
+  integrity sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==
+
 "@rollup/rollup-linux-arm64-gnu@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.1.tgz#967ba8e6f68a5f21bd00cd97773dcdd6107e94ed"
   integrity sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==
 
+"@rollup/rollup-linux-arm64-musl@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz#f2ae7d7bed416ffa26d6b948ac5772b520700eef"
+  integrity sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==
+
 "@rollup/rollup-linux-arm64-musl@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.1.tgz#d3a4e1c9f21eef3b9f4e4989f334a519a1341462"
   integrity sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==
 
+"@rollup/rollup-linux-riscv64-gnu@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz#303d57a328ee9a50c85385936f31cf62306d30b6"
+  integrity sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==
+
 "@rollup/rollup-linux-riscv64-gnu@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.1.tgz#415c0533bb752164effd05f5613858e8f6779bc9"
   integrity sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==
 
+"@rollup/rollup-linux-x64-gnu@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz#f672f6508f090fc73f08ba40ff76c20b57424778"
+  integrity sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==
+
 "@rollup/rollup-linux-x64-gnu@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.1.tgz#0983385dd753a2e0ecaddea7a81dd37fea5114f5"
   integrity sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==
 
+"@rollup/rollup-linux-x64-musl@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz#d2f34b1b157f3e7f13925bca3288192a66755a89"
+  integrity sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==
+
 "@rollup/rollup-linux-x64-musl@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.1.tgz#eb7494ebc5199cbd2e5c38c2b8acbe2603f35e03"
   integrity sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==
 
+"@rollup/rollup-win32-arm64-msvc@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz#8ffecc980ae4d9899eb2f9c4ae471a8d58d2da6b"
+  integrity sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==
+
 "@rollup/rollup-win32-arm64-msvc@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.1.tgz#5bebc66e3a7f82d4b9aa9ff448e7fc13a69656e9"
   integrity sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==
 
+"@rollup/rollup-win32-ia32-msvc@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz#a7505884f415662e088365b9218b2b03a88fc6f2"
+  integrity sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==
+
 "@rollup/rollup-win32-ia32-msvc@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.1.tgz#34156ebf8b4de3b20e6497260fe519a30263f8cf"
   integrity sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==
 
+"@rollup/rollup-win32-x64-msvc@4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz#6abd79db7ff8d01a58865ba20a63cfd23d9e2a10"
+  integrity sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==
+
 "@rollup/rollup-win32-x64-msvc@4.9.1":
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.1.tgz#d146db7a5949e10837b323ce933ed882ac878262"
@@ -5757,6 +5907,11 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.14.2.tgz#d756bed93495e97a5a2aad56e2a6dc5020305adc"
   integrity sha512-mFBVnIZmdMrpxo61rG5yf0WFt5VrRpy8cpIpJtT3mYkX9vDmcUZaZaD1ctv73iZF3QwaieVdn05Na5mWzZ8h/A==
 
+"@sentry/babel-plugin-component-annotate@2.14.3":
+  version "2.14.3"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-2.14.3.tgz#7064d656e620e73c671f23815727475369ecc070"
+  integrity sha512-h0ONVTe8j3Ma2g5SMsl9ynmLZdCf+CupLF7PQ7n06K0L8dDtrHqo8yjsWaZSJf4InGrJ9HC4MaOSItbFjiTFLw==
+
 "@sentry/bundler-plugin-core@2.14.2":
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.14.2.tgz#6750c46fa4836b46ea48556b19f5e6789a428a47"
@@ -5771,42 +5926,56 @@
     magic-string "0.27.0"
     unplugin "1.0.1"
 
-"@sentry/cli-darwin@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.29.1.tgz#09f84f2af156bac446733117b48f5d743d90467f"
-  integrity sha512-FfYkME4stq6q1sWWsxFAjTa1pxc+GV+HTHYcnajqU+X0rQReoOvFvi00AHua1qKy8+lH5/RgEvMJcDBdoa0h3A==
-
-"@sentry/cli-linux-arm64@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.29.1.tgz#5ecc844aa50178f7a6ab31eb28deea0fea7f5119"
-  integrity sha512-xcwNMJDC10kbi7T1kXRtZCMfgBtD3qLRgYEHJR0UuTONF+pF80uacdde+7oABW+rA3jy2G+4+cR5pN9M2x8wGQ==
-
-"@sentry/cli-linux-arm@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.29.1.tgz#54d418fff574faf6bd23b57d5a6df62f637e36d6"
-  integrity sha512-lqOsmAVVgRYZzNyGQA1jnmALx0LnZ/Z7zc8/2TFrQYT7FUps5FP3yDDKlsUTaB8Z8A0++k7AqFgwlIeJw7+mPQ==
-
-"@sentry/cli-linux-i686@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.29.1.tgz#d4131f36effc51b12b2f1bbef6c03b8361fac877"
-  integrity sha512-yOe7YEx42vl0Q8MgkbQmLbRe2KjijjMP+l9DYAfbOJHdTJ+3tNfBcRqFXsVNiobGxUeaVE5oDkOJ+7iGGgM2HA==
-
-"@sentry/cli-linux-x64@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.29.1.tgz#922277cacba03fc7d8634b0efc3257c99a622e11"
-  integrity sha512-fzKh/lRwzZSb+QIebuWN9qXXABGarsL9V2xONGwWv202AueK0WFxr6/ADsE7OlmM/4cDby5Sd+oMKos2eeVcVA==
-
-"@sentry/cli-win32-i686@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.29.1.tgz#93bc1b88832b498537da94a7cf8f3a688ce635b2"
-  integrity sha512-qdzg2nCSLfMgwhH7HLb6nPngJgbDvcOfDPtF+Y7axoe18iiQW0Ju7M9/e30t8vaOcUz9ZowQgFvxdgYlHJ3jMw==
-
-"@sentry/cli-win32-x64@2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.29.1.tgz#1bc0a746f3a94f7ed21108095e9cb5c9f585b7ad"
-  integrity sha512-CtGuRmwJ06WVMyVOq/Oa0l/1fI7rSAxcAlCzVAvj1p09aLXAGObGXmljXUeQ1jxE/Ll4yRAo9TjA8Y+vxPtkJw==
-
-"@sentry/cli@^1.74.4", "@sentry/cli@^1.77.1":
+"@sentry/bundler-plugin-core@2.14.3":
+  version "2.14.3"
+  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-2.14.3.tgz#b431361afb86dfb7330e4e1c593c6edc921139ee"
+  integrity sha512-iEtMdAPFUAYngvYhkfbgY8m3zB439u+5tvovj9rBXHGMr3nEB5fzZLOcVuiL47GEuUvMjDdrubl9MDGZ0c1IuQ==
+  dependencies:
+    "@babel/core" "^7.18.5"
+    "@sentry/babel-plugin-component-annotate" "2.14.3"
+    "@sentry/cli" "^2.22.3"
+    dotenv "^16.3.1"
+    find-up "^5.0.0"
+    glob "^9.3.2"
+    magic-string "0.27.0"
+    unplugin "1.0.1"
+
+"@sentry/cli-darwin@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.30.0.tgz#492ecade496a54523ae5400562e3b43e719a3d0f"
+  integrity sha512-JVesQ9PznbHBOOOwuej2X8/onfXdmAEjBH6fTyWxBl6K8mB4KmBX/aHunXWMBX+VR9X32XZghIqj7acwaFUMPA==
+
+"@sentry/cli-linux-arm64@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.30.0.tgz#bcbb0d9f91148a27b3c06d70653437b07e7e8aea"
+  integrity sha512-JNXPkkMubKoZVlcFIoClSmTb9C/I6Bz08DuAZm2jnjRaaOMiCBxI/l50H3dmfVZ6apjEguG9JkjFdb0kqKB90w==
+
+"@sentry/cli-linux-arm@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.30.0.tgz#c98e7d1ecd65ea49df2e036f332a4993115ef23a"
+  integrity sha512-MDB3iS31WKg4krCcLo520yxbUERPeA2DCtk9Qs9vSDbQl6Er64dteHllOdx1SDOyX/7GKcxrQEQ6SMmbnOo6wg==
+
+"@sentry/cli-linux-i686@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.30.0.tgz#30bb4f6d4e3567b3fb0ab074b845b6b5fde791f7"
+  integrity sha512-WhVVziFQw/fO0Cc53pY8goPAzJtIs6ORTR89fVbKwa3ZDNkX++mEOECbP7RkmD87kuRxyKzN543RPV971PcAHw==
+
+"@sentry/cli-linux-x64@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.30.0.tgz#b1a7a550d875b97bf261c58c79d9c081d3e646a9"
+  integrity sha512-QkiVDeSfspotZ0Au5Yauv2DAm/BC1fL9BwPek/WwddM18I2HqnDp6l4TA4bQeEY++o0KEuNF53cPahpepltPjw==
+
+"@sentry/cli-win32-i686@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.30.0.tgz#07697fa94d8461f6715150699ffcb48e6eaeb462"
+  integrity sha512-xLY9B1EEGuNYPKpK6M9PMmcu2PzofdvRtbraTcU6Ck2zALS5oXB9kmWc4dDKucZ/uu9JB0m+Lo4ebaNlca45qQ==
+
+"@sentry/cli-win32-x64@2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.30.0.tgz#1b6670222eedd4ae3c50f40f7180c07df38a304e"
+  integrity sha512-CiXuxnpJI0zho0XE5PVqIS9CwjDEYoMnHQRIr4Jj9OzlGTJ2iSSU6Zp3Ykd7lgo2iK4P6MfxIBm30gFQPnSvVA==
+
+"@sentry/cli@^1.74.4":
   version "1.77.1"
   resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-1.77.1.tgz#ebcf884712ef6c3c75443f491ec16f6a22148aec"
   integrity sha512-OtJ7U9LeuPUAY/xow9wwcjM9w42IJIpDtClTKI/RliE685vd/OJUIpiAvebHNthDYpQynvwb/0iuF4fonh+CKw==
@@ -5818,10 +5987,10 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/cli@^2.22.3", "@sentry/cli@^2.29.1":
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.29.1.tgz#1089aabbdd2b5c34263f1de7e89bbed5b7dc06ef"
-  integrity sha512-STtuGm8vdR4ifR3I6mFmt9y7Dk9QzeOvpyXEG5H7dkFDSvU7cepkYAlli5QiZDzECngxGx/uLAzZzFKSATF1Qw==
+"@sentry/cli@^2.22.3", "@sentry/cli@^2.30.0":
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.30.0.tgz#3cbe9ee269779e57e3124834bb0a89112366cd98"
+  integrity sha512-GTO5e98vy2QwEYQvhE/ZtGUiVrUu4XungLioJbazm+ZOen8cyac8YOapZfozN5mtxjWOWMOwhOqoTeCU3Q8YKQ==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
@@ -5829,13 +5998,13 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
   optionalDependencies:
-    "@sentry/cli-darwin" "2.29.1"
-    "@sentry/cli-linux-arm" "2.29.1"
-    "@sentry/cli-linux-arm64" "2.29.1"
-    "@sentry/cli-linux-i686" "2.29.1"
-    "@sentry/cli-linux-x64" "2.29.1"
-    "@sentry/cli-win32-i686" "2.29.1"
-    "@sentry/cli-win32-x64" "2.29.1"
+    "@sentry/cli-darwin" "2.30.0"
+    "@sentry/cli-linux-arm" "2.30.0"
+    "@sentry/cli-linux-arm64" "2.30.0"
+    "@sentry/cli-linux-i686" "2.30.0"
+    "@sentry/cli-linux-x64" "2.30.0"
+    "@sentry/cli-win32-i686" "2.30.0"
+    "@sentry/cli-win32-x64" "2.30.0"
 
 "@sentry/vite-plugin@2.14.2", "@sentry/vite-plugin@^2.14.2":
   version "2.14.2"
@@ -5852,13 +6021,14 @@
   dependencies:
     "@sentry/cli" "^1.74.4"
 
-"@sentry/webpack-plugin@1.21.0":
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-1.21.0.tgz#bbe7cb293751f80246a4a56f9a7dd6de00f14b58"
-  integrity sha512-x0PYIMWcsTauqxgl7vWUY6sANl+XGKtx7DCVnnY7aOIIlIna0jChTAPANTfA2QrK+VK+4I/4JxatCEZBnXh3Og==
+"@sentry/webpack-plugin@2.14.3":
+  version "2.14.3"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-2.14.3.tgz#b392d53381115528537355d0eb1a8cf8189662ce"
+  integrity sha512-3nsaBqdC2MJ+06BsCa5IwJIFaODT4UJis9+MSyuPLF+Ics+K3le4dlOCl8mc2Xm0WjqJUTlUmwvTj+jasnGMUw==
   dependencies:
-    "@sentry/cli" "^1.77.1"
-    webpack-sources "^2.0.0 || ^3.0.0"
+    "@sentry/bundler-plugin-core" "2.14.3"
+    unplugin "1.0.1"
+    uuid "^9.0.0"
 
 "@sideway/address@^4.1.3":
   version "4.1.4"
@@ -6537,6 +6707,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/estree@1.0.5", "@types/estree@^1.0.1":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
 "@types/estree@^0.0.50":
   version "0.0.50"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
@@ -6547,11 +6722,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/estree@^1.0.1":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
-  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
-
 "@types/express-serve-static-core@4.17.31":
   version "4.17.31"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f"
@@ -7092,6 +7262,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/resolve@1.20.2":
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
+  integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
+
 "@types/resolve@1.20.3":
   version "1.20.3"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.3.tgz#066742d69a0bbba8c5d7d517f82e1140ddeb3c3c"
@@ -8192,11 +8367,32 @@ adjust-sourcemap-loader@^4.0.0:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-agent-base@4, agent-base@5, agent-base@6, agent-base@^4.3.0, agent-base@^6.0.2, agent-base@~4.2.1:
+agent-base@4, agent-base@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
   integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
 
+agent-base@6, agent-base@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
+  dependencies:
+    debug "4"
+
+agent-base@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
+  integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
 agentkeepalive@^3.4.1:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
@@ -8396,7 +8592,7 @@ ansi-styles@^2.2.1:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
   integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-ansi-styles@^3.0.0, ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.0.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -8415,7 +8611,7 @@ ansi-styles@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
-ansi-styles@^6.0.0, ansi-styles@^6.1.0:
+ansi-styles@^6.0.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
   integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
@@ -12061,7 +12257,7 @@ comment-parser@^0.7.6:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.7.6.tgz#0e743a53c8e646c899a1323db31f6cd337b10f12"
   integrity sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==
 
-commenting@1.1.0:
+commenting@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/commenting/-/commenting-1.1.0.tgz#fae14345c6437b8554f30bc6aa6c1e1633033590"
   integrity sha512-YeNK4tavZwtH7jEgK1ZINXzLKm6DZdEMfsaaieOsCAN0S8vsY7UeuO3Q7d/M018EFgE+IeUAuBOKkFccBZsUZA==
@@ -13835,11 +14031,6 @@ duplexify@^4.0.0, duplexify@^4.1.1:
     readable-stream "^3.1.1"
     stream-shift "^1.0.0"
 
-eastasianwidth@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
-  integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -14599,26 +14790,11 @@ emittery@^0.8.1:
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
   integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
 
-emoji-regex@^10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-10.2.1.tgz#a41c330d957191efd3d9dfe6e1e8e1e9ab048b3f"
-  integrity sha512-97g6QgOk8zlDRdgq1WxwgTMgEWGVAQvB5Fdpgc1MkNy56la5SKP9GsMXKDOdqwn90/41a8yPwIGk1Y6WVbeMQA==
-
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emoji-regex@^9.2.2:
-  version "9.2.2"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72"
-  integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==
-
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -14906,6 +15082,18 @@ es6-promise@^3.1.2:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
   integrity sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==
 
+es6-promise@^4.0.3:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  integrity sha512-C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
@@ -17077,18 +17265,6 @@ glob@7.1.7:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 glob@8.0.3, glob@^8.0.1, glob@^8.0.3:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
@@ -17121,6 +17297,17 @@ glob@^10.2.2:
     minipass "^5.0.0 || ^6.0.2"
     path-scurry "^1.10.0"
 
+glob@^10.3.10:
+  version "10.3.10"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b"
+  integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==
+  dependencies:
+    foreground-child "^3.1.0"
+    jackspeak "^2.3.5"
+    minimatch "^9.0.1"
+    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    path-scurry "^1.10.1"
+
 glob@^10.3.4:
   version "10.3.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.4.tgz#c85c9c7ab98669102b6defda76d35c5b1ef9766f"
@@ -17143,7 +17330,7 @@ glob@^5.0.10, glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -17155,7 +17342,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.4, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^9.2.0:
+glob@^9.2.0, glob@^9.3.2:
   version "9.3.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-9.3.5.tgz#ca2ed8ca452781a3009685607fdf025a899dfe21"
   integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==
@@ -18770,7 +18957,7 @@ is-buffer@^2.0.0, is-buffer@~2.0.3:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
-is-builtin-module@^3.1.0:
+is-builtin-module@^3.1.0, is-builtin-module@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
   integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
@@ -18903,11 +19090,6 @@ is-finite@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
@@ -19468,6 +19650,15 @@ jackspeak@^2.0.3:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
+jackspeak@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8"
+  integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==
+  dependencies:
+    "@isaacs/cliui" "^8.0.2"
+  optionalDependencies:
+    "@pkgjs/parseargs" "^0.11.0"
+
 jake@^10.8.5:
   version "10.8.5"
   resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
@@ -19955,7 +20146,7 @@ jest-worker@27.0.0-next.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^26.2.1, jest-worker@^26.3.0:
+jest-worker@^26.3.0:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
   integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
@@ -21240,7 +21431,7 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@4.17.21, lodash@^4.17.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0:
+lodash@^4.17.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.7.0, lodash@~4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -21516,6 +21707,13 @@ magic-string@^0.30.5:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
+magic-string@~0.30.0:
+  version "0.30.8"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.8.tgz#14e8624246d2bedba70d5462aa99ac9681844613"
+  integrity sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+
 magicast@0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
@@ -22750,11 +22948,16 @@ mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp
   dependencies:
     minimist "^1.2.6"
 
-mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
+mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+mkdirp@~3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50"
+  integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==
+
 mktemp@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b"
@@ -22828,10 +23031,10 @@ module-lookup-amd@^7.0.0:
     requirejs "^2.3.5"
     requirejs-config-file "^4.0.0"
 
-moment@2.29.1:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+moment@~2.30.1:
+  version "2.30.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
+  integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
 mongodb-memory-server-core@7.6.3:
   version "7.6.3"
@@ -24685,10 +24888,10 @@ package-json@^6.3.0, package-json@^6.5.0:
     registry-url "^5.0.0"
     semver "^6.2.0"
 
-package-name-regex@2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/package-name-regex/-/package-name-regex-2.0.5.tgz#5e3548ffe3dba340b9779d28a024bdb4a19f055b"
-  integrity sha512-F0lX+FBs/Bo7KWY6EuUXj+oarXU0Og1R2Zdg3F/fVcNw3pPQAKFKxUrugno0Ds5NUztlx/gRLnQW9MF+7VTqAw==
+package-name-regex@~2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/package-name-regex/-/package-name-regex-2.0.6.tgz#b54bcb04d950e38082b7bb38fa558e01c1679334"
+  integrity sha512-gFL35q7kbE/zBaPA3UKhp2vSzcPYx2ecbYuwv1ucE9Il6IIgBDweBlH8D68UFGZic2MkllKa2KHCfC1IQBQUYA==
 
 packet-reader@1.0.0:
   version "1.0.0"
@@ -26463,6 +26666,11 @@ postgres-range@^1.1.1:
   resolved "https://registry.yarnpkg.com/postgres-range/-/postgres-range-1.1.3.tgz#9ccd7b01ca2789eb3c2e0888b3184225fa859f76"
   integrity sha512-VdlZoocy5lCP0c/t66xAfclglEapXPCIVhqqJRncYpvbCgImF0w67aPKfbqUMr72tO2k5q0TdTZwCLjPTI6C9g==
 
+preact@^10.19.4:
+  version "10.19.4"
+  resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.4.tgz#735d331d5b1bd2182cc36f2ba481fd6f0da3fe3b"
+  integrity sha512-dwaX5jAh0Ga8uENBX1hSOujmKWgx9RtL80KaKUFLc6jb4vCEAc3EeZ0rnQO/FO4VgjfPMfoLFWnNG8bHuZ9VLw==
+
 prebuild-install@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
@@ -28246,7 +28454,7 @@ roarr@^7.0.4:
     safe-stable-stringify "^2.4.1"
     semver-compare "^1.0.0"
 
-rollup-plugin-cleanup@3.2.1:
+rollup-plugin-cleanup@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-cleanup/-/rollup-plugin-cleanup-3.2.1.tgz#8cbc92ecf58babd7c210051929797f137bbf777c"
   integrity sha512-zuv8EhoO3TpnrU8MX8W7YxSbO4gmOR0ny06Lm3nkFfq0IVKdBUtHwhVzY1OAJyNCIAdLiyPnOrU0KnO0Fri1GQ==
@@ -28263,20 +28471,20 @@ rollup-plugin-dts@^6.1.0:
   optionalDependencies:
     "@babel/code-frame" "^7.22.13"
 
-rollup-plugin-license@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-license/-/rollup-plugin-license-2.6.1.tgz#20f15cc37950f362f8eefdc6e3a2e659d0cad9eb"
-  integrity sha512-JPtlXF0tZKyHztKJsyd3HHmQFSkXei+596Xrb/a/bHIdDhvFuNSKimCKkQpoXyspfeVQk7CNay1MyGpFHAXjvg==
-  dependencies:
-    commenting "1.1.0"
-    glob "7.2.0"
-    lodash "4.17.21"
-    magic-string "0.25.7"
-    mkdirp "1.0.4"
-    moment "2.29.1"
-    package-name-regex "2.0.5"
-    spdx-expression-validate "2.0.0"
-    spdx-satisfies "5.0.1"
+rollup-plugin-license@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-license/-/rollup-plugin-license-3.3.1.tgz#73b68e33477524198d6f3f9befc905f59bf37c53"
+  integrity sha512-lwZ/J8QgSnP0unVOH2FQuOBkeiyp0EBvrbYdNU33lOaYD8xP9Zoki+PGoWMD31EUq8Q07GGocSABTYlWMKkwuw==
+  dependencies:
+    commenting "~1.1.0"
+    glob "~7.2.0"
+    lodash "~4.17.21"
+    magic-string "~0.30.0"
+    mkdirp "~3.0.0"
+    moment "~2.30.1"
+    package-name-regex "~2.0.6"
+    spdx-expression-validate "~2.0.0"
+    spdx-satisfies "~5.0.1"
 
 rollup-plugin-sourcemaps@^0.6.0, rollup-plugin-sourcemaps@^0.6.3:
   version "0.6.3"
@@ -28286,16 +28494,6 @@ rollup-plugin-sourcemaps@^0.6.0, rollup-plugin-sourcemaps@^0.6.3:
     "@rollup/pluginutils" "^3.0.9"
     source-map-resolve "^0.6.0"
 
-rollup-plugin-terser@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
 rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
@@ -28310,32 +28508,47 @@ rollup@2.26.5:
   optionalDependencies:
     fsevents "~2.1.2"
 
-rollup@2.78.0:
-  version "2.78.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.78.0.tgz#00995deae70c0f712ea79ad904d5f6b033209d9e"
-  integrity sha512-4+YfbQC9QEVvKTanHhIAFVUFSRsezvQF8vFOJwtGfb9Bb+r014S+qryr9PSmw8x6sMnPkmFBGAvIFVQxvJxjtg==
+rollup@3.29.4, rollup@^3.27.1:
+  version "3.29.4"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
+  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^2.45.1, rollup@^2.67.1, rollup@^2.8.0:
+rollup@^2.45.1, rollup@^2.8.0:
   version "2.79.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
   integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^3.10.0, rollup@^3.20.2, rollup@^3.7.0:
+rollup@^3.10.0, rollup@^3.7.0:
   version "3.20.2"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.20.2.tgz#f798c600317f216de2e4ad9f4d9ab30a89b690ff"
   integrity sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^3.27.1:
-  version "3.29.4"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981"
-  integrity sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==
+rollup@^4.13.0:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.13.0.tgz#dd2ae144b4cdc2ea25420477f68d4937a721237a"
+  integrity sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==
+  dependencies:
+    "@types/estree" "1.0.5"
   optionalDependencies:
+    "@rollup/rollup-android-arm-eabi" "4.13.0"
+    "@rollup/rollup-android-arm64" "4.13.0"
+    "@rollup/rollup-darwin-arm64" "4.13.0"
+    "@rollup/rollup-darwin-x64" "4.13.0"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.13.0"
+    "@rollup/rollup-linux-arm64-gnu" "4.13.0"
+    "@rollup/rollup-linux-arm64-musl" "4.13.0"
+    "@rollup/rollup-linux-riscv64-gnu" "4.13.0"
+    "@rollup/rollup-linux-x64-gnu" "4.13.0"
+    "@rollup/rollup-linux-x64-musl" "4.13.0"
+    "@rollup/rollup-win32-arm64-msvc" "4.13.0"
+    "@rollup/rollup-win32-ia32-msvc" "4.13.0"
+    "@rollup/rollup-win32-x64-msvc" "4.13.0"
     fsevents "~2.3.2"
 
 rollup@^4.2.0:
@@ -29133,6 +29346,11 @@ smart-buffer@^4.1.0, smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+smob@^1.0.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/smob/-/smob-1.4.1.tgz#66270e7df6a7527664816c5b577a23f17ba6f5b5"
+  integrity sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==
+
 snake-case@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
@@ -29517,7 +29735,7 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
-spdx-expression-validate@2.0.0:
+spdx-expression-validate@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz#25c9408e1c63fad94fff5517bb7101ffcd23350b"
   integrity sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==
@@ -29534,7 +29752,7 @@ spdx-ranges@^2.0.0:
   resolved "https://registry.yarnpkg.com/spdx-ranges/-/spdx-ranges-2.1.1.tgz#87573927ba51e92b3f4550ab60bfc83dd07bac20"
   integrity sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==
 
-spdx-satisfies@5.0.1:
+spdx-satisfies@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz#9feeb2524686c08e5f7933c16248d4fdf07ed6a6"
   integrity sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw==
@@ -29877,7 +30095,7 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -29886,40 +30104,14 @@ string-template@~0.2.1:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-"string-width@^1.0.2 || 2", string-width@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-  dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
-
-string-width@^3.0.0, string-width@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
-string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
-  integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==
-  dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^9.2.2"
-    strip-ansi "^7.0.1"
-
-string-width@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-6.1.0.tgz#96488d6ed23f9ad5d82d13522af9e4c4c3fd7518"
-  integrity sha512-k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==
+string-width@4.1.0, "string-width@^1.0.2 || 2", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^2.1.0, string-width@^3.0.0, string-width@^3.1.0, string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3, string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2, string-width@^6.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff"
+  integrity sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==
   dependencies:
-    eastasianwidth "^0.2.0"
-    emoji-regex "^10.2.1"
-    strip-ansi "^7.0.1"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^5.2.0"
 
 string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6, string.prototype.matchall@^4.0.8:
   version "4.0.8"
@@ -30026,7 +30218,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -30236,14 +30428,14 @@ stylus@0.54.8, stylus@^0.54.7, stylus@^0.54.8:
     semver "^6.3.0"
     source-map "^0.7.3"
 
-sucrase@^3.20.0:
-  version "3.34.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f"
-  integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==
+sucrase@^3.27.0:
+  version "3.35.0"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.35.0.tgz#57f17a3d7e19b36d8995f06679d121be914ae263"
+  integrity sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"
     commander "^4.0.0"
-    glob "7.1.6"
+    glob "^10.3.10"
     lines-and-columns "^1.1.6"
     mz "^2.7.0"
     pirates "^4.0.1"
@@ -30704,6 +30896,16 @@ terser@^5.16.8:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
+terser@^5.17.4:
+  version "5.29.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.29.1.tgz#44e58045b70c09792ba14bfb7b4e14ca8755b9fa"
+  integrity sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
 terser@^5.7.0:
   version "5.16.3"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.3.tgz#3266017a9b682edfe019b8ecddd2abaae7b39c6b"
@@ -32598,7 +32800,7 @@ webpack-sources@1.4.3, webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-s
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-"webpack-sources@^2.0.0 || ^3.0.0", webpack-sources@^3.2.0, webpack-sources@^3.2.3:
+webpack-sources@^3.2.0, webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
@@ -33054,7 +33256,7 @@ workerpool@^6.4.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.4.0.tgz#f8d5cfb45fde32fa3b7af72ad617c3369567a462"
   integrity sha512-i3KR1mQMNwY2wx20ozq2EjISGtQWDIfV56We+yGJ5yDs8jTwQiLLaqHlkBHITlCuJnYlVRmXegxFxZg7gqI++A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^5.1.0, wrap-ansi@^6.2.0, wrap-ansi@^7.0.0, wrap-ansi@^8.1.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -33063,33 +33265,6 @@ workerpool@^6.4.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
-  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
-  dependencies:
-    ansi-styles "^3.2.0"
-    string-width "^3.0.0"
-    strip-ansi "^5.0.0"
-
-wrap-ansi@^6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
-  integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
-wrap-ansi@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
-  integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==
-  dependencies:
-    ansi-styles "^6.1.0"
-    string-width "^5.0.1"
-    strip-ansi "^7.0.1"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"