diff --git a/.eslintrc.js b/.eslintrc.js
index 64452fdd7c15..75ab5f048b29 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,7 @@ module.exports = {
parserOptions: {
ecmaVersion: 2018,
},
- extends: ['@sentry-internal/sdk/src/base'],
+ extends: ['@sentry-internal/sdk'],
ignorePatterns: [
'coverage/**',
'build/**',
diff --git a/.prettierignore b/.prettierignore
index cb7b3db12641..3022df3c6af7 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,2 +1,3 @@
packages/browser/test/loader.js
packages/replay-worker/examples/worker.min.js
+dev-packages/browser-integration-tests/fixtures
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/addBreadcrumb/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/addBreadcrumb/test.ts
index ac8297d6b9f3..a6a27027383d 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/addBreadcrumb/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/addBreadcrumb/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/captureException/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/captureException/test.ts
index 4404dac91364..8700d4ba8a0b 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/captureException/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/captureException/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/customOnErrorHandler/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/customOnErrorHandler/test.ts
index 64b1db8104ec..a799c2ee2bf9 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/customOnErrorHandler/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/customOnErrorHandler/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandler/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandler/test.ts
index b553fe295add..ea73f5ee46a9 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandler/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandler/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandlerLater/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandlerLater/test.ts
index 55a447e2f7f4..f8f602fdddc7 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandlerLater/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/errorHandlerLater/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/init.js
index 8b137891791f..e69de29bb2d1 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/init.js
@@ -1 +0,0 @@
-
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/pageloadTransaction/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/pageloadTransaction/test.ts
index 410cf5e72382..257934434358 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/pageloadTransaction/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/pageloadTransaction/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/init.js
index 8b137891791f..e69de29bb2d1 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/init.js
@@ -1 +0,0 @@
-
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
index b690ebb36baa..f0ea341c87f7 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replay/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
index 87d0f7ff3db4..5bb0ded84d06 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/replayError/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/sdkLoadedInMeanwhile/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/sdkLoadedInMeanwhile/test.ts
index 8a1f1a7c721f..844b5f1d7169 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/sdkLoadedInMeanwhile/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/sdkLoadedInMeanwhile/test.ts
@@ -1,8 +1,7 @@
+import { expect } from '@playwright/test';
import * as fs from 'fs';
import * as path from 'path';
-import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../../utils/fixtures';
import { LOADER_CONFIGS } from '../../../../utils/generatePlugin';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/unhandeledPromiseRejectionHandler/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/unhandeledPromiseRejectionHandler/test.ts
index d58514bb05fb..dab0eae5fbdc 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/unhandeledPromiseRejectionHandler/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/noOnLoad/unhandeledPromiseRejectionHandler/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/addBreadcrumb/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/addBreadcrumb/test.ts
index 4df22bc99288..d8b83228e0d2 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/addBreadcrumb/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/addBreadcrumb/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureException/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureException/test.ts
index f79d659b16f0..b43f37e7296c 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureException/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureException/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureExceptionInOnLoad/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureExceptionInOnLoad/test.ts
index f5355ff765e9..52153668585c 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureExceptionInOnLoad/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/captureExceptionInOnLoad/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customBrowserTracing/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customBrowserTracing/test.ts
index 12cf305fab7d..e5ffced0c1de 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customBrowserTracing/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customBrowserTracing/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/init.js
index 0ed922379b56..f0d1725d4323 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/init.js
@@ -16,9 +16,5 @@ window.sentryIsLoaded = () => {
const __sentry = window.__SENTRY__;
// If there is a global __SENTRY__ that means that in any of the callbacks init() was already invoked
- return !!(
- !(typeof __sentry === 'undefined') &&
- __sentry.version &&
- !!__sentry[__sentry.version]
- );
+ return !!(!(typeof __sentry === 'undefined') && __sentry.version && !!__sentry[__sentry.version]);
};
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/test.ts
index 689f6b88dd57..3dd7782b049b 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customInit/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { LOADER_CONFIGS } from '../../../../utils/generatePlugin';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrations/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrations/test.ts
index b8fc45402b76..3ddb36f8fb5b 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrations/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrations/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
import { shouldSkipReplayTest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrationsFunction/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrationsFunction/test.ts
index 038feb7c7652..5379333f6032 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrationsFunction/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customIntegrationsFunction/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/test.ts
index 07d877c00211..0da164dcefbf 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/customReplay/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandler/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandler/test.ts
index e1692a2e08d3..aff8e22fe6d7 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandler/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandler/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandlerLater/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandlerLater/test.ts
index 55a447e2f7f4..f8f602fdddc7 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandlerLater/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/errorHandlerLater/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/init.js b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/init.js
index ae9f3bca884b..cff88d413dfe 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/init.js
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/init.js
@@ -2,4 +2,4 @@ window.sentryOnLoad = function () {
Sentry.init({});
window.__sentryLoaded = true;
-}
+};
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/test.ts
index 0f13098d7ae6..7b04ff8a22eb 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/keepSentryGlobal/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/onLoadLate/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/onLoadLate/test.ts
index 2aa720fd274e..cba21fe45154 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/onLoadLate/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/onLoadLate/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/pageloadTransaction/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/pageloadTransaction/test.ts
index 410cf5e72382..257934434358 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/pageloadTransaction/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/pageloadTransaction/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/test.ts
index afbfbeaba0b8..d8b00740d412 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/replay/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoad/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoad/test.ts
index eea57a33e738..b44cd9ac6e35 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoad/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoad/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadAndOnLoad/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadAndOnLoad/test.ts
index d753a69b2a0c..8658bf5f21a3 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadAndOnLoad/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadAndOnLoad/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadError/test.ts b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadError/test.ts
index ab2616ef382d..4adffb2865d2 100644
--- a/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadError/test.ts
+++ b/dev-packages/browser-integration-tests/loader-suites/loader/onLoad/sentryOnLoadError/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/errors/fetch/test.ts b/dev-packages/browser-integration-tests/suites/errors/fetch/test.ts
index f9b59dd07f60..5b56f0cd695a 100644
--- a/dev-packages/browser-integration-tests/suites/errors/fetch/test.ts
+++ b/dev-packages/browser-integration-tests/suites/errors/fetch/test.ts
@@ -29,7 +29,6 @@ sentryTest('handles fetch network errors @firefox', async ({ getLocalTestUrl, pa
});
});
-
sentryTest('handles fetch network errors on subdomains @firefox', async ({ getLocalTestUrl, page, browserName }) => {
const url = await getLocalTestUrl({ testDir: __dirname });
const reqPromise = waitForErrorRequest(page);
diff --git a/dev-packages/browser-integration-tests/suites/feedback/attachTo/test.ts b/dev-packages/browser-integration-tests/suites/feedback/attachTo/test.ts
index a9888ad6edf6..e3f094022bbf 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/attachTo/test.ts
+++ b/dev-packages/browser-integration-tests/suites/feedback/attachTo/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../utils/helpers';
sentryTest('should capture feedback with custom button', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts b/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts
index 138e7225a7c8..c94f8363b107 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts
+++ b/dev-packages/browser-integration-tests/suites/feedback/captureFeedback/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../utils/helpers';
sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts
index 51374ac81947..65d9f18c48a8 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts
+++ b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackAndReplay/hasSampling/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../../utils/fixtures';
import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../../utils/helpers';
import {
collectReplayRequests,
diff --git a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/test.ts b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/test.ts
index 77eadb71173a..030d5049b0f7 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/feedback/captureFeedbackCsp/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { envelopeRequestParser, getEnvelopeType, shouldSkipFeedbackTest } from '../../../utils/helpers';
sentryTest('should capture feedback', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/feedback/logger/test.ts b/dev-packages/browser-integration-tests/suites/feedback/logger/test.ts
index fe9fdf2e8065..9cc67e0bf16b 100644
--- a/dev-packages/browser-integration-tests/suites/feedback/logger/test.ts
+++ b/dev-packages/browser-integration-tests/suites/feedback/logger/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { shouldSkipFeedbackTest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/console/capture/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/console/capture/test.ts
index de53e2cee485..affd8537596d 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/console/capture/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/console/capture/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/browser';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts
index b76c6f2d85f9..549a47c0896c 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/click/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/clickWithError/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/clickWithError/test.ts
index d965a4ac0d7d..541e2b39bab9 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/clickWithError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/clickWithError/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/browser';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts
index d56ca8a8cc00..ac00200f9dde 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/customEvent/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/multipleTypes/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/multipleTypes/test.ts
index 53372fcacc97..4ecbb1ff539b 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/multipleTypes/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/multipleTypes/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/browser';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts
index f7d1a32c4497..d0859202a54e 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/dom/textInput/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts
index 7daa0b43cb6a..bcce3b5c4000 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/get/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts
index c778276fae90..c2ba9222a108 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/getWithRequestObj/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts
index a2ef7e478c2e..317230a631d4 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/post/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts
index 60892609c5b1..ba957aec42cc 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/fetch/statusCode/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/history/navigation/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/history/navigation/test.ts
index 91bd6faaf083..c03dedd417bd 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/history/navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/history/navigation/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/browser';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts
index abcc012bc46d..3c3b41e07ea2 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/get/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts
index cb259b1a547c..f9c018d2ec70 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/post/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts
index 1fbf688f16d8..905d00cb85cd 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/Breadcrumbs/xhr/statusCode/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
index 37767e81e9db..57d0d5fc6d08 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/inline/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
index a3c8614bfb2b..51e2a7ee7517 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/noAddedLines/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
index 86c19a22ccfb..d7e09402e496 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/ContextLines/scriptTag/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/test.ts b/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/test.ts
index 7e61bc43ce0e..fc8c1b378e7f 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/captureConsole-attachStackTrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts b/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts
index 5cef9bc7e949..06d989cc4433 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/captureConsole/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/basic/test.ts
index 5cf63a4914ed..b63583906cc4 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/basic/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/withScope/test.ts
index 5fedd521b2c2..41418122b526 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/withScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/featureFlags/withScope/test.ts
@@ -1,11 +1,8 @@
import { expect } from '@playwright/test';
-
+import type { Scope } from '@sentry/browser';
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import type { Scope } from '@sentry/browser';
-
sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
if (shouldSkipFeatureFlagsTest()) {
sentryTest.skip();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/basic/test.ts
index d0adafc3d101..5d7f58bdb27b 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/basic/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/withScope/test.ts
index b84c4c008e0e..78703e4e5389 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/withScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/launchdarkly/withScope/test.ts
@@ -1,11 +1,8 @@
import { expect } from '@playwright/test';
-
+import type { Scope } from '@sentry/browser';
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import type { Scope } from '@sentry/browser';
-
sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
if (shouldSkipFeatureFlagsTest()) {
sentryTest.skip();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/basic/test.ts
index 21db2c0b7d85..77112ee82658 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/basic/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/errorHook/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/errorHook/test.ts
index bae111a5e6f5..d8f1e1311dfa 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/errorHook/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/errorHook/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Flag evaluation error hook', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/withScope/test.ts
index 60682b03e4a7..67e68becb104 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/withScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/openfeature/withScope/test.ts
@@ -1,11 +1,8 @@
import { expect } from '@playwright/test';
-
+import type { Scope } from '@sentry/browser';
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import type { Scope } from '@sentry/browser';
-
sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
if (shouldSkipFeatureFlagsTest()) {
sentryTest.skip();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/basic/test.ts
index 5b484b91ba22..cb434e49e86e 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/basic/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/withScope/test.ts
index cf41767036b6..42ee35e4604d 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/withScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/statsig/withScope/test.ts
@@ -1,11 +1,8 @@
import { expect } from '@playwright/test';
-
+import type { Scope } from '@sentry/browser';
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import type { Scope } from '@sentry/browser';
-
sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
if (shouldSkipFeatureFlagsTest()) {
sentryTest.skip();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/badSignature/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/badSignature/test.ts
index 9b95d4d51c81..8fe5729f53c2 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/badSignature/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/badSignature/test.ts
@@ -1,7 +1,5 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { shouldSkipFeatureFlagsTest } from '../../../../../utils/helpers';
sentryTest('Logs and returns if isEnabled does not match expected signature', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/basic/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/basic/test.ts
index 7e8065dc6172..b2e522fc78f4 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/basic/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/basic/test.ts
@@ -1,9 +1,6 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-
import { FLAG_BUFFER_SIZE } from '../../constants';
sentryTest('Basic test with eviction, update, and no async tasks', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/withScope/test.ts b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/withScope/test.ts
index 2d821bf6c81d..a512882b568a 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/withScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/featureFlags/unleash/withScope/test.ts
@@ -1,11 +1,8 @@
import { expect } from '@playwright/test';
-
+import type { Scope } from '@sentry/browser';
import { sentryTest } from '../../../../../utils/fixtures';
-
import { envelopeRequestParser, shouldSkipFeatureFlagsTest, waitForErrorRequest } from '../../../../../utils/helpers';
-import type { Scope } from '@sentry/browser';
-
sentryTest('Flag evaluations in forked scopes are stored separately.', async ({ getLocalTestUrl, page }) => {
if (shouldSkipFeatureFlagsTest()) {
sentryTest.skip();
diff --git a/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts b/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts
index 15dacad349b7..39c11ee20d74 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/globalHandlers/fetchStackTrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/fetch/test.ts b/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/fetch/test.ts
index c200e891f674..826e6cef48f5 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/fetch/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/fetch/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/xhr/test.ts b/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/xhr/test.ts
index 1beaf001d5a2..5089401441f2 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/xhr/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/graphqlClient/xhr/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts
index 190aae12ce18..dd8a870a3bad 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpContext/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts
index 19161be50ad3..90d2e33f60e0 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/axios/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts
index c92419aae72f..dcf7ed5ca8b1 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/simple/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts
index 4ceec6d51c38..46b886c49757 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequest/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts
index 9c408c8ade50..fdd6fd429b73 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndBodyAndOptions/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts
index 92e31819673f..d952ae2562ef 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/fetch/withRequestAndOptions/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts b/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts
index d323c73725d6..a0e11021ec67 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/httpclient/xhr/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/existingIntegration/test.ts b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/existingIntegration/test.ts
index 7faba50a3864..2ad8fea31da0 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/existingIntegration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/existingIntegration/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('it bails if the integration is already loaded', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/feedbackIntegration/test.ts b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/feedbackIntegration/test.ts
index 76e23efd7ef8..dd02c75f2b8f 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/feedbackIntegration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/feedbackIntegration/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('it allows to lazy load the feedback integration', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/moduleMetadataIntegration/test.ts b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/moduleMetadataIntegration/test.ts
index ac8465736743..a2fe58296f92 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/moduleMetadataIntegration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/moduleMetadataIntegration/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('it allows to lazy load the moduleMetadata integration', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegration/test.ts b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegration/test.ts
index 902e7f9e6515..afb14d30fd8d 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegration/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('it allows to lazy load an integration', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegrationNpm/test.ts b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegrationNpm/test.ts
index 707205912545..977b81f95399 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegrationNpm/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/lazyLoad/validIntegrationNpm/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('it allows to lazy load an integration when using the NPM package', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js
index 966bcff4925e..b0f321d1f5cd 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/init.js
@@ -1,5 +1,4 @@
import * as Sentry from '@sentry/browser';
-
import { moduleMetadataIntegration } from '@sentry/browser';
Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts
index 986f379345d5..35a0cffeb13c 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadata/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js
index 5c5998839754..f3fd6e98874d 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/init.js
@@ -1,5 +1,7 @@
-import * as Sentry from '@sentry/browser';
+/* eslint-disable import/no-duplicates */
+import * as Sentry from '@sentry/browser';
+// These need to be separate imports so they can be handled by our test runner
import { moduleMetadataIntegration } from '@sentry/browser';
import { rewriteFramesIntegration } from '@sentry/browser';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts
index 765bf7c21126..296e76c219c5 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/moduleMetadata/appliesMetadataWithRewriteFrames/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/init.js b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/init.js
index 0d76a283878e..631eb37b3eb1 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/init.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/init.js
@@ -1,6 +1,6 @@
import * as Sentry from '@sentry/browser';
-
import { createClient } from '@supabase/supabase-js';
+
window.Sentry = Sentry;
const supabaseClient = createClient('https://test.supabase.co', 'test-key');
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
index 31277f4afe3c..6366fbac4f7e 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
@@ -1,7 +1,6 @@
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
@@ -66,7 +65,6 @@ async function mockSupabaseAuthRoutesFailure(page: Page) {
});
}
-
const bundle = process.env.PW_BUNDLE || '';
// We only want to run this in non-CDN bundle mode
if (bundle.startsWith('bundle')) {
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js
index fbb60cd104c3..0f600426009f 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/init.js
@@ -1,6 +1,6 @@
import * as Sentry from '@sentry/browser';
-
import { createClient } from '@supabase/supabase-js';
+
window.Sentry = Sentry;
const supabaseClient = createClient('https://test.supabase.co', 'test-key');
diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts
index cb9fe0430228..2a10caa92c54 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/supabase/db-operations/test.ts
@@ -1,9 +1,12 @@
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
-import { getFirstSentryEnvelopeRequest, getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
+import {
+ getFirstSentryEnvelopeRequest,
+ getMultipleSentryEnvelopeRequests,
+ shouldSkipTracingTest,
+} from '../../../../utils/helpers';
async function mockSupabaseRoute(page: Page) {
await page.route('**/rest/v1/todos**', route => {
@@ -19,14 +22,12 @@ async function mockSupabaseRoute(page: Page) {
});
}
-
const bundle = process.env.PW_BUNDLE || '';
// We only want to run this in non-CDN bundle mode
if (bundle.startsWith('bundle')) {
sentryTest.skip();
}
-
sentryTest('should capture Supabase database operation breadcrumbs', async ({ getLocalTestUrl, page }) => {
if (shouldSkipTracingTest()) {
return;
@@ -83,8 +84,6 @@ sentryTest('should include correct data payload in Supabase breadcrumbs', async
expect(supabaseBreadcrumb).toBeDefined();
expect(supabaseBreadcrumb?.data).toMatchObject({
- query: expect.arrayContaining([
- 'filter(columns, )'
- ]),
+ query: expect.arrayContaining(['filter(columns, )']),
});
});
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 a02b77c89b49..733f4364a12a 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
@@ -1,14 +1,14 @@
import {
- BrowserClient,
- Scope,
breadcrumbsIntegration,
+ BrowserClient,
dedupeIntegration,
defaultStackParser,
+ eventFiltersIntegration,
functionToStringIntegration,
httpContextIntegration,
- eventFiltersIntegration,
linkedErrorsIntegration,
makeFetchTransport,
+ Scope,
} from '@sentry/browser';
const integrations = [
diff --git a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
index e77b0cfd3729..7ba25a3899b0 100644
--- a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
+++ b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/old-sdk-interop/acs/getCurrentScope/test.ts b/dev-packages/browser-integration-tests/suites/old-sdk-interop/acs/getCurrentScope/test.ts
index 18e26c659a3b..a65ef18de52f 100644
--- a/dev-packages/browser-integration-tests/suites/old-sdk-interop/acs/getCurrentScope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/old-sdk-interop/acs/getCurrentScope/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/isOlderThan/test.ts b/dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/isOlderThan/test.ts
index 5cdc3e833f8a..7519477c9c22 100644
--- a/dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/isOlderThan/test.ts
+++ b/dev-packages/browser-integration-tests/suites/old-sdk-interop/hub/isOlderThan/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts
index 37de3ad11082..1f5cbd5adfad 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/empty_obj/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts
index 765c59678d49..1443060d815a 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts
index d99ec82d88d7..c4dede3c76aa 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts
index b18b57f27c20..478d58ad6c4a 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/addBreadcrumb/undefined_arg/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts b/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts
index 92e34c398b27..e1850495b4ac 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/beforeSendTransaction/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
-
import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/browser';
+import type { Event } from '@sentry/core';
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/aggregateError/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/aggregateError/test.ts
index 41b1a09c74f3..a07ed2f9776f 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/aggregateError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/aggregateError/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts
index 04527d822407..5cdd446a1510 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/classInstance/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts
index 79f5af014476..208cf2852b47 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/emptyObj/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts
index db68fb7790b5..9d39bbc022c5 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/errorEvent/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts
index b6d68e0da3f0..910448c97a32 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/event/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts
index 887c63d896bc..64b8c3de2b12 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/eventBreadcrumbs/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts
index 2b9910e38b1d..afcb20c2669c 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/linkedErrors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts
index 05283130a679..a5897ace6260 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsDifferentStacktrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts
index fadcc4a72899..455cb94c5659 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/multipleErrorsSameStacktrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts
index 8bf55ef1eca6..19349532282e 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/plainObject/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/simpleError/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/simpleError/test.ts
index 85f001849748..e5c38d738ec7 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/simpleError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/simpleError/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts
index 0599d275b065..9f92d838ffcf 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/transactionBreadcrumbs/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts
index 87611a523b7c..814c902bd57f 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureException/undefinedArg/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/test.ts
index acf97eba586f..757bdba6ffdf 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/simple_feedback/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { FeedbackEvent } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/test.ts
index 24a2664154f5..faeff404df6b 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureException/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event, FeedbackEvent } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureMessage/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureMessage/test.ts
index 2ae261759767..4cf2e4165b55 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureMessage/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureFeedback/withCaptureMessage/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event, FeedbackEvent } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts
index 487b0e1c62c4..d544e1cc603d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/multipleMessageAttachStacktrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts
index 79f097d60a6b..74b75d4d44fa 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/parameterized_message/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts
index fdd9cba22b37..38648ff7982f 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/test.ts
index 0e769cca73fe..340dc37cf380 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts
index 2a9ab70d0622..20a4d1251618 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/captureMessage/with_level/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/debug/test.ts b/dev-packages/browser-integration-tests/suites/public-api/debug/test.ts
index 6738215c0d5a..b15c64280544 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/debug/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/debug/test.ts
@@ -1,7 +1,6 @@
/* eslint-disable no-console */
import type { ConsoleMessage } from '@playwright/test';
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts b/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts
index b6eda2f9cad0..68b6324346b8 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/denyUrls/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts
index 3101cc500cde..f210800f53ee 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/ignoreErrors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/init/built-pkg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/init/built-pkg/test.ts
index a33a138927f5..79b3447fb8d8 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/init/built-pkg/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/init/built-pkg/test.ts
@@ -1,8 +1,6 @@
import * as fs from 'node:fs';
import * as path from 'node:path';
-
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
// Regression test against https://github.com/getsentry/sentry-javascript/pull/1896
diff --git a/dev-packages/browser-integration-tests/suites/public-api/init/console/test.ts b/dev-packages/browser-integration-tests/suites/public-api/init/console/test.ts
index c581f3945f4d..8ef373dcc42b 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/init/console/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/init/console/test.ts
@@ -1,7 +1,6 @@
/* eslint-disable no-console */
import type { ConsoleMessage } from '@playwright/test';
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
// Regression test against https://github.com/getsentry/sentry-javascript/issues/4558
diff --git a/dev-packages/browser-integration-tests/suites/public-api/init/stringSampleRate/test.ts b/dev-packages/browser-integration-tests/suites/public-api/init/stringSampleRate/test.ts
index b5aeb4a3182f..3b74fd7f7860 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/init/stringSampleRate/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/init/stringSampleRate/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('parses a string sample rate', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts
index 513b3911422a..c2d0ed42d4f4 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/event-target/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/instrumentation-behaviour/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/instrumentation-behaviour/test.ts
index 2126ba3c3d35..aa758e46a3bf 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/instrumentation-behaviour/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/instrumentation-behaviour/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts
index aa215deb3141..cee945ec8cdb 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/named-function/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/init.js b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/init.js
index 95845a563c1e..15e8680cc075 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/init.js
@@ -1,10 +1,10 @@
// store references to original, unwrapped built-ins in order to make assertions re: wrapped functions
+import * as Sentry from '@sentry/browser';
+
window.originalBuiltIns = {
addEventListener: document.addEventListener,
};
-import * as Sentry from '@sentry/browser';
-
window.Sentry = Sentry;
Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/test.ts
index 964ed6c575f9..e39cf72ffe8d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/original-callback/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts
index 8958c4ce71b8..cf643d796274 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/remove/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/this-preservation/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/this-preservation/test.ts
index 0f71c89e250a..1ee3cb8035b2 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/this-preservation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/this-preservation/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest('Event listener instrumentation preserves "this" context', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts
index 276c77d9d04a..9a849fd22b88 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/thrown-error/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/wrapping/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/wrapping/test.ts
index 14159609b2bf..130d0933b083 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/wrapping/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/eventListener/wrapping/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts
index 14d42a242cf3..5f014ba2c209 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/non-string-arg/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts
index 4a4cd9e0137f..121198a374c9 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/rethrown/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts
index 51ac86e0cf62..4d7ea3a04883 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/syntax-errors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts
index 683d99b72e23..bdc878adc16c 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-errors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts
index c2d174b1cd33..27b764334143 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-objects/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts
index ff4eb3dd0002..787146c02a43 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onError/thrown-strings/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, runScriptInSandbox } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts
index 639229c2dc7b..169ad3b4b319 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/custom-event/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts
index 80fc86abd9cf..0dcf24fecc58 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/event/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts
index b895470d64f4..2eb475919a95 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-errors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts
index 88105df9a6c9..f9231fa5cda7 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-null/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts
index f9fa303d2774..adb3348563c6 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-number/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts
index 01b77e1a62a4..71f2b11864b1 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-object-complex/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts
index 4b4a1d683caf..50f1d712c15d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-objects/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts
index 220cdcf77cbd..15e4fb1bd5f6 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-strings/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts
index d7dad5318e73..51505d6f8333 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/onUnhandledRejection/thrown-undefined/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/callback/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/callback/test.ts
index d111a0b473d7..71f2b8d4ab3b 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/callback/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/callback/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts
index c9eb70150f0c..02b8771d1785 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/requestAnimationFrame/thrown-errors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts
index f8061c6ed4c1..02942b276a3a 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setInterval/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts
index c63f71650e8f..321a96d7b393 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeout/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts
index 3ae6049d8c33..c4322884cfe6 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/setTimeoutFrozen/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/test.ts
index 5b693af2f9d4..673d8522aa4d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/onreadystatechange/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts
index 2e9f97915276..330c94761854 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/instrumentation/xhr/thrown-error/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts b/dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts
index e255a6afda23..7075cdf3a979 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/logger/integration/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { OtelLogEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/logger/simple/test.ts b/dev-packages/browser-integration-tests/suites/public-api/logger/simple/test.ts
index 5995058867a0..de011cbf46a9 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/logger/simple/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/logger/simple/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { OtelLogEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, properFullEnvelopeRequestParser } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/errors/test.ts b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/errors/test.ts
index 310085607b09..06a5ede3215a 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/errors/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/replay/test.ts b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/replay/test.ts
index 4f4ad6e3003a..59bc021ce0a1 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/replay/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/replay/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/sessions/test.ts b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/sessions/test.ts
index 898e1cd9dbec..7f047337dae3 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/sessions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/sendDefaultPii/sessions/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts
index dfaab3d05b1e..73c9833f7311 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/multiple_contexts/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts
index 349ad39a3b57..a622dacbbe5d 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/non_serializable_context/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts
index beccf31ec42b..d96820414fe0 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setContext/simple_context/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts
index 6ba6202f2c4f..c77ff4ce8ede 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/multiple_extras/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts
index 742c0e19f070..c7ce03b1c0eb 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/non_serializable_extra/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts
index 6d235e6b752b..305a80868765 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setExtra/simple_extra/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts
index c7b9e6a283b9..08ebffc2ab00 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setExtras/consecutive_calls/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts
index 0e388d77b3ba..072f0c078895 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setExtras/multiple_extras/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
index b270d7216d7a..181711650074 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
index 04725491b24c..47116b6554bb 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts
index b270d7216d7a..181711650074 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_non_primitives/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts
index 04725491b24c..47116b6554bb 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTags/with_primitives/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setUser/ip_address_null/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setUser/ip_address_null/test.ts
index 9ea891858749..20c3b0ee8c14 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setUser/ip_address_null/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setUser/ip_address_null/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts
index 6fbdf6491d69..13e6786a6a60 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setUser/unset_user/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts
index b799022fa4e7..bf26aae4d61a 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setUser/update_user/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/inject-script/test.ts b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/inject-script/test.ts
index 17a7fd27ad18..d176a49d8fc0 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/inject-script/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/showReportDialog/inject-script/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
sentryTest('should inject dialog script into
with correct attributes', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/attributes/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/attributes/test.ts
index 056fa71c0ebe..4d6d78f0eea1 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/attributes/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/attributes/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
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 e4b14c17097a..735beba323e9 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,5 +1,4 @@
import { expect } from '@playwright/test';
-
import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts
index e78d377ebdff..41d49b6351ea 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/circular_data/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts
index b92de394703b..d8cecd5f09c7 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-reject/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts
index 581e0bd61f9c..79ecf0f6e9e8 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw-not-awaited/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts
index bb9db67db038..8f527b4e7238 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-async-throw/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts
index 1930695c8f3e..dfb1098bc650 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/error-sync/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getMultipleSentryEnvelopeRequests,
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts
index 6f46367a325f..b3edbfac7dcf 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-in-scope/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import type { TransactionEvent } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts
index 2cc4381c8307..62cdeb9bf7c9 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans-with-parentSpanId/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import type { TransactionEvent } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts
index df60c3ee1aa3..084b7100fa9b 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/parallel-root-spans/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import type { TransactionEvent } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts
index a5f55babd291..2604470d0a50 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/setMeasurement/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
index 0663d16b6995..8493f4e5fd97 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Envelope, EventEnvelope, SpanEnvelope, TransactionEvent } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getMultipleSentryEnvelopeRequests,
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/test.ts
index c83ba3bc61cd..0bbb6b7f32f9 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-sdk-disabled/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
index ef1019d02b1d..aaafd99c91d5 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { SpanEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
diff --git a/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts b/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts
index bf10eed2b504..75a459ef69d6 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/withScope/nested_scopes/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts b/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts
index 540cc36b2d10..66622e9509ec 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/withScope/throwError/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/autoFlushOnFeedback/test.ts b/dev-packages/browser-integration-tests/suites/replay/autoFlushOnFeedback/test.ts
index 41e94eef690b..98650cc67ce7 100644
--- a/dev-packages/browser-integration-tests/suites/replay/autoFlushOnFeedback/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/autoFlushOnFeedback/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts
index b3578c98f1b0..a9e7ad0240be 100644
--- a/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferModeManual/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import type { replayIntegration as actualReplayIntegration } from '@sentry-internal/replay';
import type { ReplayContainer } from '@sentry-internal/replay/build/npm/types/types';
-
import { sentryTest } from '../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../utils/helpers';
import { expectedClickBreadcrumb, getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/test.ts b/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/test.ts
index c26692196e2b..2c8159266e75 100644
--- a/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferModeReload/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import {
getReplaySnapshot,
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/test.ts b/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/test.ts
index affa6d2f90c5..b3cb5e9c80e4 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/manualSnapshot/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/records/test.ts b/dev-packages/browser-integration-tests/suites/replay/canvas/records/test.ts
index c6ba950978cd..2f0bf8877f03 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/records/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/records/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/test.ts b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/test.ts
index 514b22af6d5c..71ae6ca40bae 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationFirst/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/test.ts b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/test.ts
index a36fc86bcdbe..5059a481bf48 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withCanvasIntegrationSecond/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/test.ts b/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/test.ts
index 8eac849408a7..8bf21edae921 100644
--- a/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/canvas/withoutCanvasIntegration/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureComponentName/test.ts b/dev-packages/browser-integration-tests/suites/replay/captureComponentName/test.ts
index da97924804dc..cffcea0cdd1b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureComponentName/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/captureComponentName/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureConsoleLog/test.ts b/dev-packages/browser-integration-tests/suites/replay/captureConsoleLog/test.ts
index 88693c7bdae1..90612770360b 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureConsoleLog/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/captureConsoleLog/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts b/dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts
index e581a8eacd57..85dd7c27440a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/captureReplay/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
sentryTest('should capture replays (@sentry/browser export)', async ({ getLocalTestUrl, page }) => {
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 659e7b4618b2..9c6da2b02487 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js
+++ b/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/init.js
@@ -1,5 +1,5 @@
-import { replayIntegration } from '@sentry-internal/replay';
import * as Sentry from '@sentry/browser';
+import { replayIntegration } from '@sentry-internal/replay';
window.Sentry = Sentry;
window.Replay = replayIntegration({
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts b/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts
index 3a10ea72e18c..9b44ba6b218a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/captureReplayFromReplayPackage/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import { SDK_VERSION } from '@sentry/browser';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
sentryTest('should capture replays (@sentry-internal/replay export)', async ({ getLocalTestUrl, page }) => {
diff --git a/dev-packages/browser-integration-tests/suites/replay/captureReplayOffline/test.ts b/dev-packages/browser-integration-tests/suites/replay/captureReplayOffline/test.ts
index ddd4be03e376..7c6e7f7d2ebb 100644
--- a/dev-packages/browser-integration-tests/suites/replay/captureReplayOffline/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/captureReplayOffline/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/test.ts b/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/test.ts
index 01c006f5643d..b0e03e4cf154 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionDisabled/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/test.ts b/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/test.ts
index 353a5cbb2227..3de23f1d9dea 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionEnabled/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/test.ts b/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/test.ts
index 0c5710c0dfb7..86b747803992 100644
--- a/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/compressionWorkerUrl/test.ts
@@ -1,8 +1,7 @@
+import { expect } from '@playwright/test';
import fs from 'fs';
import path from 'path';
-import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
getFullRecordingSnapshots,
diff --git a/dev-packages/browser-integration-tests/suites/replay/customEvents/test.ts b/dev-packages/browser-integration-tests/suites/replay/customEvents/test.ts
index 49449ca46209..1d5eda8697f1 100644
--- a/dev-packages/browser-integration-tests/suites/replay/customEvents/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/customEvents/test.ts
@@ -1,9 +1,8 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import {
- expectedCLSPerformanceSpan,
expectedClickBreadcrumb,
+ expectedCLSPerformanceSpan,
expectedFCPPerformanceSpan,
expectedFIDPerformanceSpan,
expectedFPPerformanceSpan,
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 a0deed767979..f9a6d1041615 100644
--- a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import type * as Sentry from '@sentry/browser';
import type { EventEnvelopeHeaders } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import {
envelopeRequestParser,
diff --git a/dev-packages/browser-integration-tests/suites/replay/errorResponse/test.ts b/dev-packages/browser-integration-tests/suites/replay/errorResponse/test.ts
index 0811ecac90f3..49d88bfa67a5 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errorResponse/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errorResponse/test.ts
@@ -1,9 +1,8 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import {
- REPLAY_DEFAULT_FLUSH_MAX_DELAY,
getReplaySnapshot,
+ REPLAY_DEFAULT_FLUSH_MAX_DELAY,
shouldSkipReplayTest,
waitForReplayRequest,
} from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/test.ts
index 8c459d31b534..bf40c7a6ae0e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/beforeErrorSampling/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest, waitForReplayRunning } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/test.ts
index 58e0ffde9ee4..e202f6f63faf 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/droppedError/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser } from '../../../../utils/helpers';
import { getReplaySnapshot, isReplayEvent, shouldSkipReplayTest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorMode/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/errorMode/test.ts
index fe47856b276c..8970466ad174 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/errorMode/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorMode/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/test.ts
index b43c00593e5a..6f29f2295303 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorNotSent/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/test.ts
index 1b2af02ca2fb..d3616b8c61bd 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/errorsInSession/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser } from '../../../../utils/helpers';
import { expectedClickBreadcrumb, getExpectedReplayEvent } from '../../../../utils/replayEventTemplates';
diff --git a/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts
index 8ce1af848952..1ea8afa7caef 100644
--- a/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/errors/immediateError/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequestOnUrl } from '../../../../utils/helpers';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/eventBufferError/test.ts b/dev-packages/browser-integration-tests/suites/replay/eventBufferError/test.ts
index e9aeaef406c8..d1ac87454b03 100644
--- a/dev-packages/browser-integration-tests/suites/replay/eventBufferError/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/eventBufferError/test.ts
@@ -1,13 +1,12 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { envelopeRequestParser } from '../../../utils/helpers';
import {
- REPLAY_DEFAULT_FLUSH_MAX_DELAY,
getDecompressedRecordingEvents,
getReplaySnapshot,
isCustomSnapshot,
isReplayEvent,
+ REPLAY_DEFAULT_FLUSH_MAX_DELAY,
shouldSkipReplayTest,
waitForReplayRequest,
} from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/exceptions/test.ts b/dev-packages/browser-integration-tests/suites/replay/exceptions/test.ts
index 972ce990657f..35967fe936a5 100644
--- a/dev-packages/browser-integration-tests/suites/replay/exceptions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/exceptions/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { shouldSkipReplayTest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/test.ts
index b7fd02bc463c..e63e2fb285e0 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestBody/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/test.ts
index 9bbd1f0c487e..01afceca077c 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestHeaders/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestSize/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestSize/test.ts
index 2e7c22d29fbe..5671bdaabc1a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestSize/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureRequestSize/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/test.ts
index 1d727564a852..4f5926f742ef 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseBody/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
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 7142a16dd174..86913966aaa1 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
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseSize/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseSize/test.ts
index 805413f70884..58375d604dd2 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseSize/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureResponseSize/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/test.ts
index e3acdb5dc6e0..df63c10084b4 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/fetch/captureTimestamps/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/test.ts
index 7108bde5fc71..6b0e6e88f3e1 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestBody/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/test.ts
index 8485a7078b38..12f3a59f5fb1 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestHeaders/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestSize/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestSize/test.ts
index 8f263b1d8349..2fe599bbe831 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestSize/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureRequestSize/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/test.ts
index 8975729b7c54..4764d32b16df 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseBody/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/test.ts
index 68dcad0af664..f4b444455b46 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseHeaders/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseSize/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseSize/test.ts
index 6ffccfdbc47e..5f14ac8b17cd 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseSize/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureResponseSize/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/test.ts b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/test.ts
index 19781d7312bb..ef4b9aee3c26 100644
--- a/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/extendNetworkBreadcrumbs/xhr/captureTimestamps/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, waitForErrorRequest } from '../../../../../utils/helpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/fileInput/test.ts b/dev-packages/browser-integration-tests/suites/replay/fileInput/test.ts
index 0f41dade44f4..4e9c73a276c9 100644
--- a/dev-packages/browser-integration-tests/suites/replay/fileInput/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/fileInput/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import type { inputData } from '@sentry-internal/rrweb';
import { IncrementalSource } from '@sentry-internal/rrweb';
-
import { sentryTest } from '../../../utils/fixtures';
import type { IncrementalRecordingSnapshot } from '../../../utils/replayHelpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/flushing/test.ts b/dev-packages/browser-integration-tests/suites/replay/flushing/test.ts
index 959663a86fa0..469bd3f9fd7c 100644
--- a/dev-packages/browser-integration-tests/suites/replay/flushing/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/flushing/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/test.ts b/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/test.ts
index d06af4302d30..0d4c20e8f36f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/keyboardEvents/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts b/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
index f15b154aeb1a..ec488917d2cc 100644
--- a/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/largeMutations/defaultOptions/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts b/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts
index d31ce907f836..a6ba46a1d758 100644
--- a/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getReplayRecordingContent,
diff --git a/dev-packages/browser-integration-tests/suites/replay/logger/test.ts b/dev-packages/browser-integration-tests/suites/replay/logger/test.ts
index 684709819e85..b21247a88890 100644
--- a/dev-packages/browser-integration-tests/suites/replay/logger/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/logger/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/test.ts b/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/test.ts
index dcfb69f2d7a2..dc4c3b8a2dfc 100644
--- a/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/maxReplayDuration/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/test.ts b/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/test.ts
index 6578c5d90183..bd8d69c9f760 100644
--- a/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/minReplayDuration/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import { getReplayEvent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts b/dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts
index 4f1ba066f5e4..ac046c74d337 100644
--- a/dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/multiple-pages/test.ts
@@ -1,9 +1,8 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../utils/fixtures';
import {
- expectedCLSPerformanceSpan,
expectedClickBreadcrumb,
+ expectedCLSPerformanceSpan,
expectedFCPPerformanceSpan,
expectedFIDPerformanceSpan,
expectedFPPerformanceSpan,
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyBlock/test.ts b/dev-packages/browser-integration-tests/suites/replay/privacyBlock/test.ts
index 2c464c4575b4..da706f304ded 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyBlock/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyBlock/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import {
getFullRecordingSnapshots,
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts
index 6fa046d6b103..de6a1f680d53 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyDefault/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import {
getFullRecordingSnapshots,
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyInput/test.ts b/dev-packages/browser-integration-tests/suites/replay/privacyInput/test.ts
index 4ebe4fee009b..376f76c821f9 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyInput/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyInput/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import type { inputData } from '@sentry-internal/rrweb';
import { IncrementalSource } from '@sentry-internal/rrweb';
-
import { sentryTest } from '../../../utils/fixtures';
import type { IncrementalRecordingSnapshot } from '../../../utils/replayHelpers';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/test.ts b/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/test.ts
index f5d36f6f5017..3cda5ed5277e 100644
--- a/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/privacyInputMaskAll/test.ts
@@ -1,7 +1,6 @@
import { expect } from '@playwright/test';
import type { inputData } from '@sentry-internal/rrweb';
import { IncrementalSource } from '@sentry-internal/rrweb';
-
import { sentryTest } from '../../../utils/fixtures';
import type { IncrementalRecordingSnapshot } from '../../../utils/replayHelpers';
import {
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 ffe667d780dc..18a020dc3e2f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/replayIntegrationShim/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
sentryTest(
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 8df888863ea2..7291ae1644ba 100644
--- a/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/replayShim/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
sentryTest(
diff --git a/dev-packages/browser-integration-tests/suites/replay/requests/test.ts b/dev-packages/browser-integration-tests/suites/replay/requests/test.ts
index fc7693bf1003..9e0ee49ed58c 100644
--- a/dev-packages/browser-integration-tests/suites/replay/requests/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/requests/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { expectedFetchPerformanceSpan, expectedXHRPerformanceSpan } from '../../../utils/replayEventTemplates';
import { getReplayRecordingContent, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/sampling/test.ts b/dev-packages/browser-integration-tests/suites/replay/sampling/test.ts
index be9fd3150cda..4d8e856b3bd8 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sampling/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/sampling/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getReplaySnapshot, shouldSkipReplayTest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/test.ts b/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/test.ts
index 6bb199c42146..996e39fbd21c 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionExpiry/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionInactive/test.ts b/dev-packages/browser-integration-tests/suites/replay/sessionInactive/test.ts
index 2f346c05962f..437357a446e8 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionInactive/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionInactive/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/test.ts b/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/test.ts
index 92c917562ec4..54cd38dc0b06 100644
--- a/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/sessionMaxAge/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getExpectedReplayEvent } from '../../../utils/replayEventTemplates';
import {
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/clickTargets/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/clickTargets/test.ts
index 73910e1190e0..e31a9547f076 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/clickTargets/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/clickTargets/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/test.ts
index f5337f1feb63..c2a03003fd2f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/disable/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/error/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/error/test.ts
index 5d106fb9c0e9..0f5d80970247 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/error/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/error/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getCustomRecordingEvents,
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/ignore/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/ignore/test.ts
index 475453f6b3f0..cd7888180992 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/ignore/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/ignore/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/multiClick/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/multiClick/test.ts
index 04ab9c059f34..898a8aeeae5f 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/multiClick/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/multiClick/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getCustomRecordingEvents,
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/mutation/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/mutation/test.ts
index 1c5aab9f4183..08aad51de3ff 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/mutation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/mutation/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/scroll/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/scroll/test.ts
index cb0e467de4f6..4821900c02e2 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/scroll/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/scroll/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/timeout/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/timeout/test.ts
index 1bc8219d22ab..c4ba6fd9ee02 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/timeout/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/timeout/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/slowClick/windowOpen/test.ts b/dev-packages/browser-integration-tests/suites/replay/slowClick/windowOpen/test.ts
index b784ad570e8d..2408e0420d3a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/slowClick/windowOpen/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/slowClick/windowOpen/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/test.ts b/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/test.ts
index b01a980ea961..e5e2648944f2 100644
--- a/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/throttleBreadcrumbs/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { getCustomRecordingEvents, shouldSkipReplayTest, waitForReplayRequest } from '../../../utils/replayHelpers';
diff --git a/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/test.ts b/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/test.ts
index 3e362b38d49a..7c836d7e616d 100644
--- a/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/unicode/compressed/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFullRecordingSnapshots,
diff --git a/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/test.ts b/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/test.ts
index 679f83362ed2..2762f1e32e2a 100644
--- a/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/unicode/uncompressed/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFullRecordingSnapshots,
diff --git a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts
index b3faacc6f88d..e2e1d29717fe 100644
--- a/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts
+++ b/dev-packages/browser-integration-tests/suites/sessions/initial-scope/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { SessionContext } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts
index 0dd12d17fe95..063fcb3dbd13 100644
--- a/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts
+++ b/dev-packages/browser-integration-tests/suites/sessions/start-session/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { SessionContext } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts
index 5a576bc1672d..816cdf1dc056 100644
--- a/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts
+++ b/dev-packages/browser-integration-tests/suites/sessions/update-session/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { SessionContext } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, waitForSession } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/subject.js b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/subject.js
index b9223bc91ac0..2d6f5c892b3b 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/subject.js
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/subject.js
@@ -14,7 +14,7 @@ class Response {
}
}
-const decodeBlob = function() {
+const decodeBlob = function () {
(function readFile() {
httpsCall();
})();
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts
index 1767e2b1c5b5..ebb5ff05833d 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_containing_fn_identifiers/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/subject.js b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/subject.js
index d7ca8d22e04c..ddf3e0b5c2c4 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/subject.js
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/subject.js
@@ -14,7 +14,7 @@ class File {
}
}
-const blob = function() {
+const blob = function () {
(function file() {
https();
})();
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
index 1179080c1770..ce44389c65e8 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/protocol_fn_identifiers/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/subject.js b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/subject.js
index ff63abc6f3ca..759720c5467a 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/subject.js
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/subject.js
@@ -14,9 +14,9 @@ class Test {
}
}
-const qux = function() {
+const qux = function () {
(() => {
- (function() {
+ (function () {
foo();
})();
})();
diff --git a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts
index 62f84db7ea9e..8563a43ef8d7 100644
--- a/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts
+++ b/dev-packages/browser-integration-tests/suites/stacktraces/regular_fn_identifiers/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts
index 3047f40e67e6..924b90d3743e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-custom/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { SpanJSON } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts
index 564138235bb3..80ea1f5fa09c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/backgroundtab-pageload/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
index 9df2acd4245a..f47552f5e9b6 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts
index e8fa473e1a60..8ce215311cf9 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/interactions/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event as SentryEvent } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts
index a9c63508faa0..c36de95c5e16 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-before-navigation/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts
index a024358259c5..3d4ca79877b1 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-disabled/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts
index 542fbb1a7845..5a0e27f84c2e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-enabled/test.ts
@@ -1,8 +1,7 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
-
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser';
+import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts
index e59e9c96168b..2c8f5427cc05 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-animation-frame-non-chromium/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts
index 12ad3cb8a834..50791c09bfa9 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-and-animation-frame-enabled/test.ts
@@ -1,8 +1,7 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
-
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser';
+import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts
index 3261c99d981b..5cfad99ea53f 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-before-navigation/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts
index 23b2d31b415e..bb32e21ee1d5 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-disabled/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts
index c9c1a42ddb1a..dd3d7b536a4a 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-enabled/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts
index c9c1a42ddb1a..dd3d7b536a4a 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/long-tasks-no-animation-frame/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts
index 1d6e7044b007..1d7a14a46055 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/meta/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event, EventEnvelopeHeaders } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeHeaderRequestParser,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/test.ts
index f7f3c50ee052..1789bdf76c12 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/multiple-integrations/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts
index 5e22d9a8d502..2f170c7b7c3e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/navigation/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/on-request-span-start/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/on-request-span-start/test.ts
index 91b0c1333298..d1d90a698a77 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/on-request-span-start/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/on-request-span-start/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts
index 7d2d949898c2..ff4cd1e1fffa 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-update-txn-name/test.ts
@@ -1,12 +1,11 @@
import { expect } from '@playwright/test';
-import { type Event, SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME } from '@sentry/core';
-
import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/browser';
+import { type Event, SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-updateSpanName/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-updateSpanName/test.ts
index 69094b38e4dd..b444f55ee3a1 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-updateSpanName/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload-updateSpanName/test.ts
@@ -1,12 +1,11 @@
import { expect } from '@playwright/test';
-import { type Event, SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME } from '@sentry/core';
-
import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/browser';
+import { type Event, SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts
index 6be7a5cbb9a4..0146be46057c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageload/test.ts
@@ -1,12 +1,11 @@
import { expect } from '@playwright/test';
-import type { Event } from '@sentry/core';
-
import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/browser';
+import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts
index cf14c46d47a7..0d608a782314 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadDelayed/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
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
index ca342a5533c2..16f5a2f7f539 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/pageloadWithChildSpanTimeout/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/subject.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/subject.js
index c6fbf085140a..2a929a7e5083 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/subject.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/subject.js
@@ -3,13 +3,12 @@ const btn2 = document.getElementById('btn2');
btn1.addEventListener('click', () => {
Sentry.startNewTrace(() => {
- Sentry.startSpan({name: 'custom root span 1', op: 'custom'}, () => {});
+ Sentry.startSpan({ name: 'custom root span 1', op: 'custom' }, () => {});
});
});
-
btn2.addEventListener('click', () => {
Sentry.startNewTrace(() => {
- Sentry.startSpan({name: 'custom root span 2', op: 'custom'}, () => {});
+ Sentry.startSpan({ name: 'custom root span 2', op: 'custom' }, () => {});
});
});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/test.ts
index ab2d8ae2c8af..b8d4f43cf03b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/custom-trace/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/default/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/default/test.ts
index f36aa22e6a12..96302d731e5e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/default/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/default/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/init.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/init.js
index 5d32c7af1e43..c05bcb931630 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/init.js
@@ -5,5 +5,5 @@ window.Sentry = Sentry;
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
tracesSampleRate: 1,
- integrations: [Sentry.browserTracingIntegration({_experiments: {enableInteractions: true}})],
+ integrations: [Sentry.browserTracingIntegration({ _experiments: { enableInteractions: true } })],
});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/test.ts
index ca2a184f6680..f8d01ab4a9d7 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/interaction-spans/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/meta/test.ts
index f5e2c7d613e0..123f44e8db85 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/meta/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/meta/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/init.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/init.js
index 6c884b0632c8..f26a4197747c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/init.js
@@ -5,10 +5,10 @@ window.Sentry = Sentry;
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
integrations: [Sentry.browserTracingIntegration()],
- tracesSampler: (ctx) => {
+ tracesSampler: ctx => {
if (ctx.attributes['sentry.origin'] === 'auto.pageload.browser') {
return 0;
}
return 1;
- }
+ },
});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/test.ts
index 6c0ec874684b..7a8b69fdb364 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/negatively-sampled/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/init.js b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/init.js
index c346a6e054b3..fc053206d9ed 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/init.js
@@ -4,6 +4,6 @@ window.Sentry = Sentry;
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
- integrations: [Sentry.browserTracingIntegration({linkPreviousTrace: 'session-storage'})],
+ integrations: [Sentry.browserTracingIntegration({ linkPreviousTrace: 'session-storage' })],
tracesSampleRate: 1,
});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/test.ts
index 7489f528a0e8..19f34eef73f3 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/previous-trace-links/session-storage/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import { SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE } from '@sentry/core';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/test.ts
index ca53812a17e4..56e52cbb4de7 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/customTargets/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsMatch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsMatch/test.ts
index f9f9af3ddb47..0792cc4f52ee 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsMatch/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsMatch/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/test.ts
index 375d0f61ff8a..9851d51b99d6 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/tracePropagationTargets/defaultTargetsNoMatch/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../../utils/helpers';
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 4d98663933bd..5c0aa7c62b97 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegrationShim/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
index e8e799191d29..0136b1043617 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
@@ -1,5 +1,5 @@
-import { expect } from '@playwright/test';
import type { Page } from '@playwright/test';
+import { expect } from '@playwright/test';
import type { DynamicSamplingContext } from '@sentry/core';
import { sentryTest } from '../../../utils/fixtures';
import type { EventAndTraceHeader } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
index ff1c42f7c851..88a268e69ea2 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { EventEnvelopeHeaders } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import {
envelopeHeaderRequestParser,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
index 8f245c89ad38..9274cd0bb8ba 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { EventEnvelopeHeaders } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import {
envelopeHeaderRequestParser,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
index a3ec0c93bce8..1cb951621e21 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/connection-rtt/test.ts
@@ -1,7 +1,6 @@
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
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 625c2a8f6d9a..b40899e37521 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
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
index 4e840fd96cae..31ed4abf86e7 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-browser-spans/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
index d34167f7b256..db9c448ed19b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/init.js
@@ -1,12 +1,12 @@
// Add measure before SDK initializes
+import * as Sentry from '@sentry/browser';
+
const end = performance.now();
performance.measure('Next.js-before-hydration', {
duration: 1000,
end,
});
-import * as Sentry from '@sentry/browser';
-
window.Sentry = Sentry;
Sentry.init({
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts
index acc50d68a070..8d331118028e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-measure-spans/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
index f30083295665..4857884ca001 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import { type Event, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
index 02431dae3b79..26c621b9b227 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
@@ -1,7 +1,6 @@
import type { Page } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event as SentryEvent, EventEnvelope, SpanEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
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 61c0a20e1506..f00a2b60f100 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
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
index 663774a23920..a481364077a1 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fid/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
index 176d81edd930..9351baf09a0e 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-fp-fcp/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
index 6b3763f48d4d..7d448325b6ef 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event as SentryEvent, SpanEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
index 74170dc383f7..8056cd88c3e5 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event as SentryEvent, SpanEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
index 5705fe6863b5..46f943b08551 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { SpanEnvelope } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getMultipleSentryEnvelopeRequests,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
index b3435a49b002..ac8dccd13dce 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event as SentryEvent, SpanEnvelope, SpanJSON } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import {
getFirstSentryEnvelopeRequest,
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 c4b41923a082..4d61904c58ac 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
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
index 602b4671f342..d2997f712c39 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-ttfb/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts
index 3f29c0614f14..751a7111ce54 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals/test.ts
@@ -1,7 +1,6 @@
import type { Route } from '@playwright/test';
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-no-tracing/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-no-tracing/test.ts
index 5f209ccfb876..b6671ada0f5a 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-no-tracing/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-no-tracing/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
index 623a27299077..b1883896100c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
shouldSkipTracingTest,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
index db14ab1faa11..e1f69cb0fdf1 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
index c86595cfbf94..c2ebf52d18f6 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-request/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-request/test.ts
index 26cf5f6e6f33..7fa87e8cd768 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-request/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-with-request/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-no-tracing/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-no-tracing/test.ts
index 5f209ccfb876..b6671ada0f5a 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-no-tracing/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-no-tracing/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
index 7baedcae7a02..ef180c0dcb6d 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
-
-import { TEST_HOST, sentryTest } from '../../../../utils/fixtures';
+import { sentryTest, TEST_HOST } from '../../../../utils/fixtures';
import {
envelopeRequestParser,
shouldSkipTracingTest,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
index 53254dae0fa9..786ce872d349 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
index 3337fc988723..728133a2ac4c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../../utils/fixtures';
import { shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
index 7ad30a83b54c..cf3b11c02260 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getFirstSentryEnvelopeRequest, shouldSkipTracingTest } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/stringSampleRate/test.ts b/dev-packages/browser-integration-tests/suites/tracing/stringSampleRate/test.ts
index 1b411d16e85b..207aa7517ac7 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/stringSampleRate/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/stringSampleRate/test.ts
@@ -1,5 +1,4 @@
import { expect } from '@playwright/test';
-
import { sentryTest } from '../../../utils/fixtures';
import { envelopeRequestParser, shouldSkipTracingTest, waitForTransactionRequestOnUrl } from '../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
index 2c3749550eab..42547709e928 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
@@ -2,11 +2,11 @@ import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import type { EventAndTraceHeader } from '../../../../utils/helpers';
-import { shouldSkipFeedbackTest } from '../../../../utils/helpers';
import {
eventAndTraceHeaderRequestParser,
getFirstSentryEnvelopeRequest,
getMultipleSentryEnvelopeRequests,
+ shouldSkipFeedbackTest,
shouldSkipTracingTest,
} from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
index 18acb6d9af75..98f468818d51 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
@@ -2,11 +2,11 @@ import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import type { EventAndTraceHeader } from '../../../../utils/helpers';
-import { shouldSkipFeedbackTest } from '../../../../utils/helpers';
import {
eventAndTraceHeaderRequestParser,
getFirstSentryEnvelopeRequest,
getMultipleSentryEnvelopeRequests,
+ shouldSkipFeedbackTest,
shouldSkipTracingTest,
} from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
index d7ada2cce6d8..e889be038bdd 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
@@ -2,11 +2,11 @@ import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
import { sentryTest } from '../../../../utils/fixtures';
import type { EventAndTraceHeader } from '../../../../utils/helpers';
-import { shouldSkipFeedbackTest } from '../../../../utils/helpers';
import {
eventAndTraceHeaderRequestParser,
getFirstSentryEnvelopeRequest,
getMultipleSentryEnvelopeRequests,
+ shouldSkipFeedbackTest,
shouldSkipTracingTest,
} from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/trace-header-merging/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/trace-header-merging/test.ts
index 8280f443bc3f..18f37a5c9c28 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/trace-header-merging/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/trace-header-merging/test.ts
@@ -7,7 +7,11 @@ async function assertRequests({
page,
buttonSelector,
requestMatcher,
-}: { page: Page; buttonSelector: string; requestMatcher: string }) {
+}: {
+ page: Page;
+ buttonSelector: string;
+ requestMatcher: string;
+}) {
const requests = await new Promise(resolve => {
const requests: Request[] = [];
page
diff --git a/dev-packages/browser-integration-tests/suites/transport/multiplexed/init.js b/dev-packages/browser-integration-tests/suites/transport/multiplexed/init.js
index 9247e1d8bcc2..d24b26bdffc7 100644
--- a/dev-packages/browser-integration-tests/suites/transport/multiplexed/init.js
+++ b/dev-packages/browser-integration-tests/suites/transport/multiplexed/init.js
@@ -1,5 +1,4 @@
import * as Sentry from '@sentry/browser';
-
import { makeMultiplexedTransport } from '@sentry/browser';
window.Sentry = Sentry;
diff --git a/dev-packages/browser-integration-tests/suites/transport/multiplexed/test.ts b/dev-packages/browser-integration-tests/suites/transport/multiplexed/test.ts
index 0bf274291df4..2c23e4491fff 100644
--- a/dev-packages/browser-integration-tests/suites/transport/multiplexed/test.ts
+++ b/dev-packages/browser-integration-tests/suites/transport/multiplexed/test.ts
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../utils/helpers';
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 c330c17be1f7..13694a383c54 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
@@ -1,6 +1,5 @@
import { expect } from '@playwright/test';
import type { Event } from '@sentry/core';
-
import { sentryTest } from '../../../../utils/fixtures';
import { getMultipleSentryEnvelopeRequests } from '../../../../utils/helpers';
diff --git a/dev-packages/browser-integration-tests/suites/wasm/test.ts b/dev-packages/browser-integration-tests/suites/wasm/test.ts
index 8b519a25fc4a..3e98ab719220 100644
--- a/dev-packages/browser-integration-tests/suites/wasm/test.ts
+++ b/dev-packages/browser-integration-tests/suites/wasm/test.ts
@@ -1,7 +1,6 @@
+import { expect } from '@playwright/test';
import fs from 'fs';
import path from 'path';
-import { expect } from '@playwright/test';
-
import { sentryTest } from '../../utils/fixtures';
import { shouldSkipWASMTests } from '../../utils/wasmHelpers';
diff --git a/dev-packages/browser-integration-tests/utils/fixtures.ts b/dev-packages/browser-integration-tests/utils/fixtures.ts
index 0af573f517a0..adebce59edef 100644
--- a/dev-packages/browser-integration-tests/utils/fixtures.ts
+++ b/dev-packages/browser-integration-tests/utils/fixtures.ts
@@ -1,10 +1,9 @@
-import crypto from 'crypto';
-import fs from 'fs';
-import path from 'path';
/* eslint-disable no-empty-pattern */
import { test as base } from '@playwright/test';
-
import { SDK_VERSION } from '@sentry/browser';
+import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
import { generatePage } from './generatePage';
export const TEST_HOST = 'http://sentry-test.io';
diff --git a/dev-packages/browser-integration-tests/utils/generatePage.ts b/dev-packages/browser-integration-tests/utils/generatePage.ts
index 987bb4e3d178..3bba565fd147 100644
--- a/dev-packages/browser-integration-tests/utils/generatePage.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePage.ts
@@ -1,7 +1,6 @@
import { mkdirSync } from 'fs';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import webpack from 'webpack';
-
import webpackConfig from '../webpack.config';
import SentryScenarioGenerationPlugin from './generatePlugin';
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 1cb3fea77705..ff25097ccf50 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -1,9 +1,8 @@
-import fs from 'fs';
-import path from 'path';
import { type Package } from '@sentry/core';
+import fs from 'fs';
import HtmlWebpackPlugin, { createHtmlTagObject } from 'html-webpack-plugin';
+import path from 'path';
import type { Compiler } from 'webpack';
-
import { addStaticAsset, symlinkAsset } from './staticAssets';
const LOADER_TEMPLATE = fs.readFileSync(path.join(__dirname, '../fixtures/loader.js'), 'utf-8');
diff --git a/dev-packages/browser-integration-tests/utils/helpers.ts b/dev-packages/browser-integration-tests/utils/helpers.ts
index d08ffccd7831..feecd7c5ce09 100644
--- a/dev-packages/browser-integration-tests/utils/helpers.ts
+++ b/dev-packages/browser-integration-tests/utils/helpers.ts
@@ -1,5 +1,4 @@
import type { Page, Request } from '@playwright/test';
-import { parseEnvelope } from '@sentry/core';
import type {
Envelope,
EnvelopeItem,
@@ -10,6 +9,7 @@ import type {
SessionContext,
TransactionEvent,
} from '@sentry/core';
+import { parseEnvelope } from '@sentry/core';
export const envelopeUrlRegex = /\.sentry\.io\/api\/\d+\/envelope\//;
diff --git a/dev-packages/browser-integration-tests/utils/replayHelpers.ts b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
index 1426030d594c..f1f18967e69b 100644
--- a/dev-packages/browser-integration-tests/utils/replayHelpers.ts
+++ b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
@@ -1,6 +1,6 @@
import type { Page, Request, Response } from '@playwright/test';
-/* eslint-disable max-lines */
-import type { ReplayCanvasIntegrationOptions } from '@sentry-internal/replay-canvas';
+import type { ReplayEventWithTime } from '@sentry/browser';
+import type { Breadcrumb, Event, ReplayEvent, ReplayRecordingMode } from '@sentry/core';
import type {
InternalEventContext,
RecordingEvent,
@@ -8,12 +8,11 @@ import type {
ReplayPluginOptions,
Session,
} from '@sentry-internal/replay/build/npm/types/types';
+/* eslint-disable max-lines */
+import type { ReplayCanvasIntegrationOptions } from '@sentry-internal/replay-canvas';
import type { fullSnapshotEvent, incrementalSnapshotEvent } from '@sentry-internal/rrweb';
import { EventType } from '@sentry-internal/rrweb';
-import type { ReplayEventWithTime } from '@sentry/browser';
-import type { Breadcrumb, Event, ReplayEvent, ReplayRecordingMode } from '@sentry/core';
import { decompressSync, strFromU8 } from 'fflate';
-
import { envelopeRequestParser } from './helpers';
type CustomRecordingEvent = { tag: string; payload: Record };
diff --git a/dev-packages/clear-cache-gh-action/.eslintrc.cjs b/dev-packages/clear-cache-gh-action/.eslintrc.cjs
index 8c67e0037908..dfc1b926f803 100644
--- a/dev-packages/clear-cache-gh-action/.eslintrc.cjs
+++ b/dev-packages/clear-cache-gh-action/.eslintrc.cjs
@@ -8,7 +8,7 @@ module.exports = {
overrides: [
{
files: ['*.mjs'],
- extends: ['@sentry-internal/sdk/src/base'],
+ extends: ['@sentry-internal/sdk'],
},
],
};
diff --git a/dev-packages/clear-cache-gh-action/index.mjs b/dev-packages/clear-cache-gh-action/index.mjs
index b1cb75c5a5c0..a2a6a6305504 100644
--- a/dev-packages/clear-cache-gh-action/index.mjs
+++ b/dev-packages/clear-cache-gh-action/index.mjs
@@ -1,5 +1,4 @@
import * as core from '@actions/core';
-
import { context, getOctokit } from '@actions/github';
async function run() {
diff --git a/dev-packages/e2e-tests/lib/getTestMatrix.ts b/dev-packages/e2e-tests/lib/getTestMatrix.ts
index e29f5c13043f..890496edb440 100644
--- a/dev-packages/e2e-tests/lib/getTestMatrix.ts
+++ b/dev-packages/e2e-tests/lib/getTestMatrix.ts
@@ -1,9 +1,9 @@
import { execSync } from 'child_process';
import * as fs from 'fs';
+import { sync as globSync } from 'glob';
import * as path from 'path';
import { dirname } from 'path';
import { parseArgs } from 'util';
-import { sync as globSync } from 'glob';
interface MatrixInclude {
/** The test application (directory) name. */
diff --git a/dev-packages/e2e-tests/prepare.ts b/dev-packages/e2e-tests/prepare.ts
index 5981d1165164..d887ef310502 100644
--- a/dev-packages/e2e-tests/prepare.ts
+++ b/dev-packages/e2e-tests/prepare.ts
@@ -1,6 +1,5 @@
/* eslint-disable no-console */
import * as dotenv from 'dotenv';
-
import { registrySetup } from './registrySetup';
async function run(): Promise {
diff --git a/dev-packages/e2e-tests/publish-packages.ts b/dev-packages/e2e-tests/publish-packages.ts
index 4f2cc4056826..d342470bd06d 100644
--- a/dev-packages/e2e-tests/publish-packages.ts
+++ b/dev-packages/e2e-tests/publish-packages.ts
@@ -1,6 +1,6 @@
import * as childProcess from 'child_process';
-import * as path from 'path';
import * as glob from 'glob';
+import * as path from 'path';
const repositoryRoot = path.resolve(__dirname, '../..');
diff --git a/dev-packages/e2e-tests/registrySetup.ts b/dev-packages/e2e-tests/registrySetup.ts
index ea7dc3decca5..d34beb29c8c9 100644
--- a/dev-packages/e2e-tests/registrySetup.ts
+++ b/dev-packages/e2e-tests/registrySetup.ts
@@ -1,7 +1,6 @@
/* eslint-disable no-console */
import * as childProcess from 'child_process';
import * as path from 'path';
-
import { PUBLISH_PACKAGES_DOCKER_IMAGE_NAME, TEST_REGISTRY_CONTAINER_NAME, VERDACCIO_VERSION } from './lib/constants';
const publishScriptNodeVersion = process.env.E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION;
diff --git a/dev-packages/e2e-tests/run.ts b/dev-packages/e2e-tests/run.ts
index f8aafa5eaa01..e8901eede1b9 100644
--- a/dev-packages/e2e-tests/run.ts
+++ b/dev-packages/e2e-tests/run.ts
@@ -1,9 +1,8 @@
/* eslint-disable no-console */
import { spawn } from 'child_process';
-import { resolve } from 'path';
import * as dotenv from 'dotenv';
import { sync as globSync } from 'glob';
-
+import { resolve } from 'path';
import { registrySetup } from './registrySetup';
const DEFAULT_DSN = 'https://username@domain/123';
diff --git a/dev-packages/e2e-tests/validate-test-app-setups.ts b/dev-packages/e2e-tests/validate-test-app-setups.ts
index a4f17d5c0400..21bdc383c88d 100644
--- a/dev-packages/e2e-tests/validate-test-app-setups.ts
+++ b/dev-packages/e2e-tests/validate-test-app-setups.ts
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
import * as fs from 'fs';
-import * as path from 'path';
import * as glob from 'glob';
+import * as path from 'path';
const testRecipePaths = glob.sync('test-applications/*/test-recipe.json', {
cwd: __dirname,
diff --git a/dev-packages/e2e-tests/validate-verdaccio-configuration.ts b/dev-packages/e2e-tests/validate-verdaccio-configuration.ts
index ca727c0ec3c5..ca0b20f7213e 100644
--- a/dev-packages/e2e-tests/validate-verdaccio-configuration.ts
+++ b/dev-packages/e2e-tests/validate-verdaccio-configuration.ts
@@ -1,7 +1,7 @@
import * as assert from 'assert';
import * as fs from 'fs';
-import * as path from 'path';
import * as glob from 'glob';
+import * as path from 'path';
import * as YAML from 'yaml';
/*
diff --git a/dev-packages/external-contributor-gh-action/.eslintrc.cjs b/dev-packages/external-contributor-gh-action/.eslintrc.cjs
index 8c67e0037908..dfc1b926f803 100644
--- a/dev-packages/external-contributor-gh-action/.eslintrc.cjs
+++ b/dev-packages/external-contributor-gh-action/.eslintrc.cjs
@@ -8,7 +8,7 @@ module.exports = {
overrides: [
{
files: ['*.mjs'],
- extends: ['@sentry-internal/sdk/src/base'],
+ extends: ['@sentry-internal/sdk'],
},
],
};
diff --git a/dev-packages/node-integration-tests/.eslintrc.js b/dev-packages/node-integration-tests/.eslintrc.js
index 8d5573907fb9..c69f03a3b819 100644
--- a/dev-packages/node-integration-tests/.eslintrc.js
+++ b/dev-packages/node-integration-tests/.eslintrc.js
@@ -28,6 +28,8 @@ module.exports = {
'ts-expect-error': true,
},
],
+ // We rely on having imports after init() is called for OTEL
+ 'import/first': 'off',
},
},
],
diff --git a/dev-packages/node-integration-tests/src/index.ts b/dev-packages/node-integration-tests/src/index.ts
index 9c8971ea329d..5ad4ac1978a1 100644
--- a/dev-packages/node-integration-tests/src/index.ts
+++ b/dev-packages/node-integration-tests/src/index.ts
@@ -1,6 +1,6 @@
-import type { AddressInfo } from 'net';
import type { BaseTransportOptions, Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core';
import type { Express } from 'express';
+import type { AddressInfo } from 'net';
/**
* Debug logging transport
diff --git a/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts b/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts
index ab22aa289892..4c6f464b62f9 100644
--- a/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/before-send/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
// eslint-disable-next-line @typescript-eslint/no-floating-promises
(async () => {
diff --git a/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts b/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts
index 2b188f8d71f3..70af7e321108 100644
--- a/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/client-reports/drop-reasons/event-processors/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
// eslint-disable-next-line @typescript-eslint/no-floating-promises
(async () => {
diff --git a/dev-packages/node-integration-tests/suites/client-reports/periodic-send/scenario.ts b/dev-packages/node-integration-tests/suites/client-reports/periodic-send/scenario.ts
index ff14911469ca..72a46dcc5635 100644
--- a/dev-packages/node-integration-tests/suites/client-reports/periodic-send/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/client-reports/periodic-send/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/contextLines/memory-leak/scenario.ts b/dev-packages/node-integration-tests/suites/contextLines/memory-leak/scenario.ts
index 0ca16a75fae2..18df082e3b2d 100644
--- a/dev-packages/node-integration-tests/suites/contextLines/memory-leak/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/contextLines/memory-leak/scenario.ts
@@ -1,8 +1,7 @@
import { execSync } from 'node:child_process';
import * as path from 'node:path';
-
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts b/dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts
index c58a727e1f30..1a5170c05fe7 100644
--- a/dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts
+++ b/dev-packages/node-integration-tests/suites/contextLines/memory-leak/test.ts
@@ -1,5 +1,5 @@
+import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
-import { describe, afterAll, test } from 'vitest';
describe('ContextLines integration in CJS', () => {
afterAll(() => {
@@ -8,7 +8,7 @@ describe('ContextLines integration in CJS', () => {
// Regression test for: https://github.com/getsentry/sentry-javascript/issues/14892
test('does not leak open file handles', async () => {
- await createRunner(__dirname, 'scenario.ts')
+ await createRunner(__dirname, 'scenario.ts')
.expectN(10, {
event: {},
})
diff --git a/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts b/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts
index 17cfcf810482..5c8cd915bc12 100644
--- a/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/cron/cron/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
import { CronJob } from 'cron';
Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts b/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts
index 57e5e7123fd7..48107d0a4b1e 100644
--- a/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/cron/node-cron/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as cron from 'node-cron';
Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts b/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts
index a85f50701341..f42675f25306 100644
--- a/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/cron/node-schedule/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as schedule from 'node-schedule';
Sentry.init({
diff --git a/dev-packages/node-integration-tests/suites/express-v5/handle-error-scope-data-loss/server.ts b/dev-packages/node-integration-tests/suites/express-v5/handle-error-scope-data-loss/server.ts
index 079d9834b01c..693a22baef59 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/handle-error-scope-data-loss/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/handle-error-scope-data-loss/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-0/server.ts b/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-0/server.ts
index 3f52580dda1d..323093ce38e0 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-0/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-0/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
tracesSampleRate: 1,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-unset/server.ts b/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-unset/server.ts
index 38833d7a9bc7..eb7044faee97 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-unset/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/handle-error-tracesSampleRate-unset/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-init/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-init/server.ts
index 39d56710f043..f9952ce43a9f 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-init/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-init/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
// No dsn, means client is disabled
@@ -15,7 +15,6 @@ initialClient?.addIntegration(Sentry.httpIntegration());
// Store this so we can update the client later
const initialCurrentScope = Sentry.getCurrentScope();
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix-parameterized/server.ts
index 673c146e9d8c..6cbe4a330463 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix/server.ts
index 24073af67fa4..b07226733bc6 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-infix/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
debug: true,
@@ -9,7 +9,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized-reverse/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized-reverse/server.ts
index 755a32bf4389..99792fe8185c 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized-reverse/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized-reverse/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized/server.ts
index 7db74e8e3dea..e405a5f17d27 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized copy/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
index 654afa3b8c8d..0ef9dbee681e 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized/server.ts
index 017c810ed842..a5272e134c48 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix-same-length-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix/server.ts
index 497cbf2efffb..52cce3594b68 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/common-prefix/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/server.ts
index b7ffeeba937a..7d875b47f13b 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts
index 921017909498..fbb97cb6b1df 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/complex-router/test.ts
@@ -1,4 +1,4 @@
-import { afterAll, test, describe } from 'vitest';
+import { afterAll, describe, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
afterAll(() => {
diff --git a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/middle-layer-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/middle-layer-parameterized/server.ts
index 12a00ce4e1db..793a84924001 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/middle-layer-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/multiple-routers/middle-layer-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-header-out/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-header-out/server.ts
index 07c21c8d21ea..a66661c50bd2 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-header-out/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-header-out/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -12,9 +12,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
index 260fb34af5c2..372d413a158e 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -13,10 +13,9 @@ Sentry.init({
transport: loggingTransport,
});
-import * as http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import * as http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors/server.ts
index 1c00fbd72bde..7aea36941e99 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-other-vendors/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -13,10 +13,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-transaction-name/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-transaction-name/server.ts
index 80bb7b38a39a..ef455fb9ec52 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-transaction-name/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/baggage-transaction-name/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -15,10 +15,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/server.ts
index 6ebc2d4cac95..cc8d5657dc7f 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -12,10 +12,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/trace-header-assign/server.ts b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/trace-header-assign/server.ts
index 1cc4a0dcc639..8aa9ed85d3be 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/trace-header-assign/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/sentry-trace/trace-header-assign/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -11,10 +11,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/span-isolationScope/server.ts b/dev-packages/node-integration-tests/suites/express-v5/span-isolationScope/server.ts
index 99a9c53e932e..3e4f9d0de62b 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/span-isolationScope/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/span-isolationScope/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express-v5/without-tracing/server.ts b/dev-packages/node-integration-tests/suites/express-v5/without-tracing/server.ts
index 5b96e8b1a2a3..222566bc945b 100644
--- a/dev-packages/node-integration-tests/suites/express-v5/without-tracing/server.ts
+++ b/dev-packages/node-integration-tests/suites/express-v5/without-tracing/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/server.ts b/dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/server.ts
index 079d9834b01c..693a22baef59 100644
--- a/dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/handle-error-scope-data-loss/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-0/server.ts b/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-0/server.ts
index 3f52580dda1d..323093ce38e0 100644
--- a/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-0/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-0/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
tracesSampleRate: 1,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-unset/server.ts b/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-unset/server.ts
index 38833d7a9bc7..eb7044faee97 100644
--- a/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-unset/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/handle-error-tracesSampleRate-unset/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
index 39d56710f043..f9952ce43a9f 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-init/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
// No dsn, means client is disabled
@@ -15,7 +15,6 @@ initialClient?.addIntegration(Sentry.httpIntegration());
// Store this so we can update the client later
const initialCurrentScope = Sentry.getCurrentScope();
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
index 673c146e9d8c..6cbe4a330463 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
index 24073af67fa4..b07226733bc6 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-infix/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
debug: true,
@@ -9,7 +9,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
index 755a32bf4389..99792fe8185c 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized-reverse/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
index 7db74e8e3dea..e405a5f17d27 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
index 654afa3b8c8d..0ef9dbee681e 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized copy/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
index 017c810ed842..a5272e134c48 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix-same-length-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
index 497cbf2efffb..52cce3594b68 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/common-prefix/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
index b7ffeeba937a..7d875b47f13b 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts b/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
index 12a00ce4e1db..793a84924001 100644
--- a/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
index 07c21c8d21ea..a66661c50bd2 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -12,9 +12,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
index 260fb34af5c2..372d413a158e 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -13,10 +13,9 @@ Sentry.init({
transport: loggingTransport,
});
-import * as http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import * as http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
index 1c00fbd72bde..7aea36941e99 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -13,10 +13,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
index 80bb7b38a39a..ef455fb9ec52 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-transaction-name/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -15,10 +15,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
index 6ebc2d4cac95..cc8d5657dc7f 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -12,10 +12,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
index 1cc4a0dcc639..8aa9ed85d3be 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/trace-header-assign/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
export type TestAPIResponse = { test_data: { host: string; 'sentry-trace': string; baggage: string } };
@@ -11,10 +11,9 @@ Sentry.init({
transport: loggingTransport,
});
-import http from 'http';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import cors from 'cors';
import express from 'express';
+import http from 'http';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/span-isolationScope/server.ts b/dev-packages/node-integration-tests/suites/express/span-isolationScope/server.ts
index 99a9c53e932e..3e4f9d0de62b 100644
--- a/dev-packages/node-integration-tests/suites/express/span-isolationScope/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/span-isolationScope/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -8,7 +8,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/express/tracing/server.js b/dev-packages/node-integration-tests/suites/express/tracing/server.js
index 0291ee656995..7540b63bb07c 100644
--- a/dev-packages/node-integration-tests/suites/express/tracing/server.js
+++ b/dev-packages/node-integration-tests/suites/express/tracing/server.js
@@ -10,7 +10,7 @@ Sentry.init({
transport: loggingTransport,
integrations: [
Sentry.httpIntegration({
- ignoreIncomingRequestBody: (url) => {
+ ignoreIncomingRequestBody: url => {
if (url.includes('/test-post-ignore-body')) {
return true;
}
diff --git a/dev-packages/node-integration-tests/suites/express/tracing/test.ts b/dev-packages/node-integration-tests/suites/express/tracing/test.ts
index ebe710bdc0d0..109bab2e659c 100644
--- a/dev-packages/node-integration-tests/suites/express/tracing/test.ts
+++ b/dev-packages/node-integration-tests/suites/express/tracing/test.ts
@@ -1,6 +1,6 @@
import { afterAll, describe, expect, test } from 'vitest';
-import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
import { assertSentryTransaction } from '../../../utils/assertions';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
describe('express tracing', () => {
afterAll(() => {
diff --git a/dev-packages/node-integration-tests/suites/express/without-tracing/server.ts b/dev-packages/node-integration-tests/suites/express/without-tracing/server.ts
index 5b96e8b1a2a3..222566bc945b 100644
--- a/dev-packages/node-integration-tests/suites/express/without-tracing/server.ts
+++ b/dev-packages/node-integration-tests/suites/express/without-tracing/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -7,7 +7,6 @@ Sentry.init({
transport: loggingTransport,
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import bodyParser from 'body-parser';
import express from 'express';
diff --git a/dev-packages/node-integration-tests/suites/fs-instrumentation/server.ts b/dev-packages/node-integration-tests/suites/fs-instrumentation/server.ts
index 1320d7c3b4e2..d743e7e0942b 100644
--- a/dev-packages/node-integration-tests/suites/fs-instrumentation/server.ts
+++ b/dev-packages/node-integration-tests/suites/fs-instrumentation/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -14,12 +14,11 @@ Sentry.init({
],
});
+import express from 'express';
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
import * as util from 'util';
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
-import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/empty-obj/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/empty-obj/scenario.ts
index 1e2420a3c476..e49220c4d79d 100644
--- a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/empty-obj/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/empty-obj/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts
index 1b790c839bbd..2a28a7d19bb1 100644
--- a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/multiple_breadcrumbs/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts
index f4245dfaa0e6..5d166004c87d 100644
--- a/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/addBreadcrumb/simple_breadcrumb/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureException/catched-error/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureException/catched-error/scenario.ts
index 0c504121410a..53f994b1686e 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureException/catched-error/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureException/catched-error/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureException/empty-obj/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureException/empty-obj/scenario.ts
index 68c51dbfc3a2..081af449fd81 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureException/empty-obj/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureException/empty-obj/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureException/simple-error/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureException/simple-error/scenario.ts
index 519213a755c5..f74a8eb68035 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureException/simple-error/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureException/simple-error/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts
index d6951e4859ec..ed1a4bfb1c83 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureMessage/parameterized_message/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message/scenario.ts
index 63c21fe2560d..3d2375572830 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/scenario.ts
index b56cb5cae8e6..4761a4afc1d3 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureMessage/simple_message_attachStackTrace/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts
index 782dff96e83c..a81172775fbc 100644
--- a/dev-packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/captureMessage/with_level/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/configureScope/clear_scope/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/configureScope/clear_scope/scenario.ts
index d40b9c044f86..3435e64a9b9b 100644
--- a/dev-packages/node-integration-tests/suites/public-api/configureScope/clear_scope/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/configureScope/clear_scope/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/configureScope/set_properties/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/configureScope/set_properties/scenario.ts
index 69d301ea1196..64b13cfd1db5 100644
--- a/dev-packages/node-integration-tests/suites/public-api/configureScope/set_properties/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/configureScope/set_properties/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts
index 9da994967d58..a26e19de58d3 100644
--- a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-strict.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts
index 55b283af81ae..24b3093a554c 100644
--- a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/scenario-warn.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
index e2f2a2143438..2f4a22c835a4 100644
--- a/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/onUnhandledRejectionIntegration/test.ts
@@ -1,8 +1,7 @@
import * as childProcess from 'child_process';
import * as path from 'path';
import { afterAll, describe, expect, test } from 'vitest';
-import { cleanupChildProcesses } from '../../../utils/runner';
-import { createRunner } from '../../../utils/runner';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
describe('onUnhandledRejectionIntegration', () => {
afterAll(() => {
diff --git a/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts
index dc068a09b744..b01493237679 100644
--- a/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/scopes/initialScopes/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts
index eec2e911b609..58e6b3d07560 100644
--- a/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/scopes/isolationScope/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setContext/multiple-contexts/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setContext/multiple-contexts/scenario.ts
index 16a557a17526..1922e8c69ef0 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setContext/multiple-contexts/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setContext/multiple-contexts/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setContext/non-serializable-context/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setContext/non-serializable-context/scenario.ts
index 28a10e4a554b..1b22d2d8e8ac 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setContext/non-serializable-context/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setContext/non-serializable-context/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setContext/simple-context/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setContext/simple-context/scenario.ts
index 658df9c2b20f..1fb504808b0f 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setContext/simple-context/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setContext/simple-context/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setExtra/multiple-extras/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setExtra/multiple-extras/scenario.ts
index fa32edbf0329..d063729bcc93 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setExtra/multiple-extras/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setExtra/multiple-extras/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setExtra/non-serializable-extra/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setExtra/non-serializable-extra/scenario.ts
index 00daf54f1389..6bbe78c88aa7 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setExtra/non-serializable-extra/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setExtra/non-serializable-extra/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setExtra/simple-extra/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setExtra/simple-extra/scenario.ts
index 231e622dd3f8..4f66d74f7e7a 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setExtra/simple-extra/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setExtra/simple-extra/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setExtras/consecutive-calls/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setExtras/consecutive-calls/scenario.ts
index b122e99a0d50..2644bb47ea3c 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setExtras/consecutive-calls/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setExtras/consecutive-calls/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setExtras/multiple-extras/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setExtras/multiple-extras/scenario.ts
index 925140258972..f356949c6327 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setExtras/multiple-extras/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setExtras/multiple-extras/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setMeasurement/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setMeasurement/scenario.ts
index 921374380376..9d8c58f91033 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setMeasurement/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setMeasurement/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setTag/with-primitives/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setTag/with-primitives/scenario.ts
index 8bb972127dc0..4e0bc30c0c2b 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setTag/with-primitives/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setTag/with-primitives/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setTags/with-primitives/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setTags/with-primitives/scenario.ts
index 8bb972127dc0..4e0bc30c0c2b 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setTags/with-primitives/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setTags/with-primitives/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setUser/unset_user/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setUser/unset_user/scenario.ts
index 42df2033bb33..957bb7841d89 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setUser/unset_user/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setUser/unset_user/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/setUser/update_user/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/setUser/update_user/scenario.ts
index 001651461ab6..a7f5df98d614 100644
--- a/dev-packages/node-integration-tests/suites/public-api/setUser/update_user/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/setUser/update_user/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/scenario.ts
index 625c1377ea42..c2186df94b7f 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/basic-usage/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-root-spans/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-root-spans/scenario.ts
index fada0ea3aad4..ab031429489b 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-root-spans/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-root-spans/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope-with-parentSpanId/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope-with-parentSpanId/scenario.ts
index ca0431f2318f..bcbf0b91c4ee 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope-with-parentSpanId/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope-with-parentSpanId/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope/scenario.ts
index 69a9d5e2c0ef..80b74d48601c 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/parallel-spans-in-scope/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/updateName-method/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/updateName-method/scenario.ts
index ea30608c1c5c..38c6a5225819 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/updateName-method/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/updateName-method/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/updateSpanName-function/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/updateSpanName-function/scenario.ts
index ecf7670fa23d..15a534803598 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/updateSpanName-function/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/updateSpanName-function/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/scenario.ts
index d046a076d0b1..ce103213161b 100644
--- a/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/public-api/withScope/nested-scopes/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/withScope/nested-scopes/scenario.ts
index 58bc4efbbac2..a0d383d70841 100644
--- a/dev-packages/node-integration-tests/suites/public-api/withScope/nested-scopes/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/withScope/nested-scopes/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/sessions/server.ts b/dev-packages/node-integration-tests/suites/sessions/server.ts
index df2587aacfd4..aea0571c27dd 100644
--- a/dev-packages/node-integration-tests/suites/sessions/server.ts
+++ b/dev-packages/node-integration-tests/suites/sessions/server.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport, startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
@@ -13,7 +13,6 @@ Sentry.init({
],
});
-import { startExpressServerAndSendPortToRunner } from '@sentry-internal/node-integration-tests';
import express from 'express';
const app = express();
diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/init.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/init.ts
index c3fd63415f78..46a27dd03b74 100644
--- a/dev-packages/node-integration-tests/suites/tracing/amqplib/init.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/init.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-message.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-message.ts
index f8d2727a6e6b..16e9cf370fe3 100644
--- a/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-message.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/scenario-message.ts
@@ -1,5 +1,5 @@
-import * as Sentry from '@sentry/node';
import './init';
+import * as Sentry from '@sentry/node';
import { connectToRabbitMQ, consumeMessageFromQueue, createQueue, sendMessageToQueue } from './utils';
const queueName = 'queue1';
diff --git a/dev-packages/node-integration-tests/suites/tracing/amqplib/utils.ts b/dev-packages/node-integration-tests/suites/tracing/amqplib/utils.ts
index db8af3e932fb..702c100aa67c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/amqplib/utils.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/amqplib/utils.ts
@@ -1,5 +1,5 @@
-import amqp from 'amqplib';
import type { Channel, Connection } from 'amqplib';
+import amqp from 'amqplib';
import { ACKNOWLEDGEMENT, AMQP_URL, QUEUE_OPTIONS } from './constants';
export type RabbitMQData = {
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/apollo-server.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/apollo-server.js
index 8c1817564196..8ee6918bac71 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/apollo-server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/apollo-server.js
@@ -4,13 +4,15 @@ const Sentry = require('@sentry/node');
module.exports = () => {
return Sentry.startSpan({ name: 'Test Server Start' }, () => {
return new ApolloServer({
- typeDefs: gql`type Query {
- hello: String
- world: String
- }
- type Mutation {
- login(email: String): String
- }`,
+ typeDefs: gql`
+ type Query {
+ hello: String
+ world: String
+ }
+ type Mutation {
+ login(email: String): String
+ }
+ `,
resolvers: {
Query: {
hello: () => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
index 6defe777d464..d0f0172923ef 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
@@ -23,9 +23,11 @@ async function run() {
async span => {
// Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation
await server.executeOperation({
- query: gql`mutation Mutation($email: String){
- login(email: $email)
- }`,
+ query: gql`
+ mutation Mutation($email: String) {
+ login(email: $email)
+ }
+ `,
variables: { email: 'test@email.com' },
});
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
index 8ee9154c0e51..cf92164fc0d7 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
@@ -27,9 +27,11 @@ async function run() {
async span => {
// Ref: https://www.apollographql.com/docs/apollo-server/testing/testing/#testing-using-executeoperation
await server.executeOperation({
- query: gql`mutation TestMutation($email: String){
- login(email: $email)
- }`,
+ query: gql`
+ mutation TestMutation($email: String) {
+ login(email: $email)
+ }
+ `,
variables: { email: 'test@email.com' },
});
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts
index b77dcd34777b..a2b9492e87a1 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/test.ts
@@ -1,5 +1,5 @@
+import { describe, expect, test } from 'vitest';
import { createRunner } from '../../../../utils/runner';
-import { describe, test, expect } from 'vitest';
// Graphql Instrumentation emits some spans by default on server start
const EXPECTED_START_SERVER_TRANSACTION = {
diff --git a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-events.ts b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-events.ts
index 892167fa55b4..e9e39d1500af 100644
--- a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-events.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-events.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-headers.ts b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-headers.ts
index 8c9c01e21444..db5e5950ed8f 100644
--- a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-headers.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/scenario-headers.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
index d88751f77ff5..5890e9c365cf 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
index e5720203eb80..b45aed2e5572 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
index 16eba4ecfd4c..e87cf53b8c80 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
index 21bc821787fe..83ca2d6bab3e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
index a4a5f9290216..6ed42d22f757 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
index 7fe727534bc9..05b2e5d48de2 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/scenario.ts
index 44ea548bab8f..c3b82bc82729 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-basic/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/scenario.ts
index 0c72d545c39b..f2a440a34cde 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-basic/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-basic/scenario.ts
index 5220701b1b4d..8e8aa1781ffd 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-basic/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-basic/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/scenario.ts
index 074c9778aa75..6e978ce014b9 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink-nested.ts b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink-nested.ts
index 27282ffb2867..c455d47a5bbb 100644
--- a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink-nested.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink-nested.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink.ts b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink.ts
index d00ae669dbd7..291b1cb59b71 100644
--- a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLink.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks-nested.ts b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks-nested.ts
index 216beff5c87e..c3820ad9b635 100644
--- a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks-nested.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks-nested.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks.ts b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks.ts
index 1ce8a8a34a8f..c437b7dd352e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-addLinks.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-span-options.ts b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-span-options.ts
index 5e6debe78fc4..593f864b9a2c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/linking/scenario-span-options.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/linking/scenario-span-options.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/maxSpans/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/maxSpans/scenario.ts
index f589d221e37c..15ee1e8ca253 100644
--- a/dev-packages/node-integration-tests/suites/tracing/maxSpans/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/maxSpans/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts
index 60c5d56e1779..8c16e8b36133 100644
--- a/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/mongodb/test.ts
@@ -1,5 +1,4 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
-
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts b/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts
index ad423354a4c9..5c961a2af19e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/mongoose/test.ts
@@ -1,5 +1,4 @@
import { MongoMemoryServer } from 'mongodb-memory-server-global';
-
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
diff --git a/dev-packages/node-integration-tests/suites/tracing/redis/test.ts b/dev-packages/node-integration-tests/suites/tracing/redis/test.ts
index 0c9bb65facdc..ec9cc0d93e84 100644
--- a/dev-packages/node-integration-tests/suites/tracing/redis/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/redis/test.ts
@@ -1,4 +1,4 @@
-import { afterAll, describe, expect, test} from 'vitest';
+import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
describe('redis auto instrumentation', () => {
@@ -6,43 +6,47 @@ describe('redis auto instrumentation', () => {
cleanupChildProcesses();
});
- test('should auto-instrument `ioredis` package when using redis.set() and redis.get()', { timeout: 75_000 }, async () => {
- const EXPECTED_TRANSACTION = {
- transaction: 'Test Span',
- spans: expect.arrayContaining([
- expect.objectContaining({
- description: 'set test-key [1 other arguments]',
- op: 'db',
- origin: 'auto.db.otel.redis',
- data: expect.objectContaining({
- 'sentry.op': 'db',
- 'sentry.origin': 'auto.db.otel.redis',
- 'db.system': 'redis',
- 'net.peer.name': 'localhost',
- 'net.peer.port': 6379,
- 'db.statement': 'set test-key [1 other arguments]',
+ test(
+ 'should auto-instrument `ioredis` package when using redis.set() and redis.get()',
+ { timeout: 75_000 },
+ async () => {
+ const EXPECTED_TRANSACTION = {
+ transaction: 'Test Span',
+ spans: expect.arrayContaining([
+ expect.objectContaining({
+ description: 'set test-key [1 other arguments]',
+ op: 'db',
+ origin: 'auto.db.otel.redis',
+ data: expect.objectContaining({
+ 'sentry.op': 'db',
+ 'sentry.origin': 'auto.db.otel.redis',
+ 'db.system': 'redis',
+ 'net.peer.name': 'localhost',
+ 'net.peer.port': 6379,
+ 'db.statement': 'set test-key [1 other arguments]',
+ }),
}),
- }),
- expect.objectContaining({
- description: 'get test-key',
- op: 'db',
- origin: 'auto.db.otel.redis',
- data: expect.objectContaining({
- 'sentry.op': 'db',
- 'sentry.origin': 'auto.db.otel.redis',
- 'db.system': 'redis',
- 'net.peer.name': 'localhost',
- 'net.peer.port': 6379,
- 'db.statement': 'get test-key',
+ expect.objectContaining({
+ description: 'get test-key',
+ op: 'db',
+ origin: 'auto.db.otel.redis',
+ data: expect.objectContaining({
+ 'sentry.op': 'db',
+ 'sentry.origin': 'auto.db.otel.redis',
+ 'db.system': 'redis',
+ 'net.peer.name': 'localhost',
+ 'net.peer.port': 6379,
+ 'db.statement': 'get test-key',
+ }),
}),
- }),
- ]),
- };
+ ]),
+ };
- await createRunner(__dirname, 'scenario-ioredis.js')
- .withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['port=6379'] })
- .expect({ transaction: EXPECTED_TRANSACTION })
- .start()
- .completed();
- });
+ await createRunner(__dirname, 'scenario-ioredis.js')
+ .withDockerCompose({ workingDirectory: [__dirname], readyMatches: ['port=6379'] })
+ .expect({ transaction: EXPECTED_TRANSACTION })
+ .start()
+ .completed();
+ },
+ );
});
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
index 8d704042a8ce..6f2d895436d6 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-breadcrumbs/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/scenario.ts
index 8c2ed31ee1f8..14c47de483f1 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/scenario.ts
index 55b0a04c6784..9011cb232ef8 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/scenario.ts
index 9bbd9c9c1aeb..8cc876bd2e44 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/scenario.ts
index 9ab4c58967f2..7c55f5c1f060 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts
index 3ae59e5ee6b7..87df3af73cd7 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-breadcrumbs/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
index 3ae59e5ee6b7..87df3af73cd7 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/scenario.ts
index e98a9e9aea80..94755b6febd1 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/scenario.ts
index 373bb9b220d6..c31007afe9d0 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/scenario.ts
index 6b66b11b8ffb..e137f0ff1cf8 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/scenario.ts b/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/scenario.ts
index 373bb9b220d6..c31007afe9d0 100644
--- a/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/scenario.ts
@@ -1,5 +1,5 @@
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/winston/subject.ts b/dev-packages/node-integration-tests/suites/winston/subject.ts
index aff667aa64ca..ac70abc50d80 100644
--- a/dev-packages/node-integration-tests/suites/winston/subject.ts
+++ b/dev-packages/node-integration-tests/suites/winston/subject.ts
@@ -1,7 +1,7 @@
import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
import winston from 'winston';
import Transport from 'winston-transport';
-import { loggingTransport } from '@sentry-internal/node-integration-tests';
Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
diff --git a/dev-packages/node-integration-tests/suites/winston/test.ts b/dev-packages/node-integration-tests/suites/winston/test.ts
index 60eeb7242154..e28ec8f586ff 100644
--- a/dev-packages/node-integration-tests/suites/winston/test.ts
+++ b/dev-packages/node-integration-tests/suites/winston/test.ts
@@ -1,4 +1,4 @@
-import { afterAll, describe, test, expect } from 'vitest';
+import { afterAll, describe, expect, test } from 'vitest';
import { cleanupChildProcesses, createRunner } from '../../utils/runner';
describe('winston integration', () => {
diff --git a/dev-packages/node-integration-tests/utils/assertions.ts b/dev-packages/node-integration-tests/utils/assertions.ts
index f3925dfd493e..9eee29e36ecd 100644
--- a/dev-packages/node-integration-tests/utils/assertions.ts
+++ b/dev-packages/node-integration-tests/utils/assertions.ts
@@ -1,4 +1,3 @@
-import { SDK_VERSION } from '@sentry/core';
import type {
ClientReport,
Envelope,
@@ -9,6 +8,7 @@ import type {
SessionAggregates,
TransactionEvent,
} from '@sentry/core';
+import { SDK_VERSION } from '@sentry/core';
import { expect } from 'vitest';
/**
diff --git a/dev-packages/node-integration-tests/utils/index.ts b/dev-packages/node-integration-tests/utils/index.ts
index bf1086d82a8f..e08d89a92131 100644
--- a/dev-packages/node-integration-tests/utils/index.ts
+++ b/dev-packages/node-integration-tests/utils/index.ts
@@ -1,6 +1,6 @@
-import type * as http from 'http';
-import { parseSemver } from '@sentry/core';
import type { EnvelopeItemType } from '@sentry/core';
+import { parseSemver } from '@sentry/core';
+import type * as http from 'http';
import { describe } from 'vitest';
const NODE_VERSION = parseSemver(process.versions.node).major;
@@ -33,7 +33,10 @@ export type DataCollectorOptions = {
*
* @param {{ min?: number; max?: number }} allowedVersion
*/
-export function conditionalTest(allowedVersion: { min?: number; max?: number }): typeof describe | typeof describe.skip{
+export function conditionalTest(allowedVersion: {
+ min?: number;
+ max?: number;
+}): typeof describe | typeof describe.skip {
if (!NODE_VERSION) {
return describe.skip;
}
diff --git a/dev-packages/node-integration-tests/utils/runner.ts b/dev-packages/node-integration-tests/utils/runner.ts
index 436e03a4c330..f327dd759bfb 100644
--- a/dev-packages/node-integration-tests/utils/runner.ts
+++ b/dev-packages/node-integration-tests/utils/runner.ts
@@ -1,8 +1,4 @@
/* eslint-disable max-lines */
-import { execSync, spawn, spawnSync } from 'child_process';
-import { existsSync } from 'fs';
-import { join } from 'path';
-import { normalize } from '@sentry/core';
import type {
ClientReport,
Envelope,
@@ -15,7 +11,11 @@ import type {
SessionAggregates,
TransactionEvent,
} from '@sentry/core';
+import { normalize } from '@sentry/core';
import axios from 'axios';
+import { execSync, spawn, spawnSync } from 'child_process';
+import { existsSync } from 'fs';
+import { join } from 'path';
import {
assertEnvelopeHeader,
assertSentryCheckIn,
diff --git a/dev-packages/node-integration-tests/utils/server.ts b/dev-packages/node-integration-tests/utils/server.ts
index 93ba10e425df..92e0477c845c 100644
--- a/dev-packages/node-integration-tests/utils/server.ts
+++ b/dev-packages/node-integration-tests/utils/server.ts
@@ -1,7 +1,7 @@
-import type { AddressInfo } from 'net';
-import { parseEnvelope } from '@sentry/core';
import type { Envelope } from '@sentry/core';
+import { parseEnvelope } from '@sentry/core';
import express from 'express';
+import type { AddressInfo } from 'net';
/**
* Creates a basic Sentry server that accepts POST to the envelope endpoint
diff --git a/dev-packages/size-limit-gh-action/.eslintrc.cjs b/dev-packages/size-limit-gh-action/.eslintrc.cjs
index 4a92730d3b0b..bc17bc85b4ab 100644
--- a/dev-packages/size-limit-gh-action/.eslintrc.cjs
+++ b/dev-packages/size-limit-gh-action/.eslintrc.cjs
@@ -8,7 +8,7 @@ module.exports = {
overrides: [
{
files: ['**/*.mjs'],
- extends: ['@sentry-internal/sdk/src/base'],
+ extends: ['@sentry-internal/sdk'],
},
],
};
diff --git a/dev-packages/size-limit-gh-action/index.mjs b/dev-packages/size-limit-gh-action/index.mjs
index 8fd5e200fc53..d727cbfa5b8b 100644
--- a/dev-packages/size-limit-gh-action/index.mjs
+++ b/dev-packages/size-limit-gh-action/index.mjs
@@ -2,7 +2,6 @@
import { promises as fs } from 'node:fs';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
-
import { DefaultArtifactClient } from '@actions/artifact';
import * as core from '@actions/core';
import { exec } from '@actions/exec';
@@ -10,9 +9,8 @@ import { context, getOctokit } from '@actions/github';
import * as glob from '@actions/glob';
import * as io from '@actions/io';
import { markdownTable } from 'markdown-table';
-
-import { SizeLimitFormatter } from './utils/SizeLimitFormatter.mjs';
import { getArtifactsForBranchAndWorkflow } from './utils/getArtifactsForBranchAndWorkflow.mjs';
+import { SizeLimitFormatter } from './utils/SizeLimitFormatter.mjs';
const SIZE_LIMIT_HEADING = '## size-limit report 📦 ';
const ARTIFACT_NAME = 'size-limit-action';
diff --git a/dev-packages/test-utils/src/event-proxy-server.ts b/dev-packages/test-utils/src/event-proxy-server.ts
index 07be845bc553..0becf5a743f2 100644
--- a/dev-packages/test-utils/src/event-proxy-server.ts
+++ b/dev-packages/test-utils/src/event-proxy-server.ts
@@ -1,4 +1,6 @@
/* eslint-disable max-lines */
+import type { Envelope, EnvelopeItem, Event, SerializedSession } from '@sentry/core';
+import { parseEnvelope } from '@sentry/core';
import * as fs from 'fs';
import * as http from 'http';
import type { AddressInfo } from 'net';
@@ -6,8 +8,6 @@ import * as os from 'os';
import * as path from 'path';
import * as util from 'util';
import * as zlib from 'zlib';
-import { parseEnvelope } from '@sentry/core';
-import type { Envelope, EnvelopeItem, Event, SerializedSession } from '@sentry/core';
const readFile = util.promisify(fs.readFile);
const writeFile = util.promisify(fs.writeFile);
diff --git a/package.json b/package.json
index a3fb0123a5ae..6bdca4b79365 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"clean:all": "run-s clean:build clean:tarballs clean:caches clean:deps clean:watchman",
"fix": "run-s fix:prettier fix:lerna",
"fix:lerna": "lerna run fix",
- "fix:prettier": "prettier \"**/*.{md,css,yml,yaml}\" \"packages/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --write",
+ "fix:prettier": "prettier \"**/*.{md,css,yml,yaml}\" \"packages/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" \"dev-packages/!(e2e-tests)/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --write",
"changelog": "ts-node ./scripts/get-commit-list.ts",
"link:yarn": "lerna exec yarn link",
"lint": "run-s lint:prettier lint:lerna",
diff --git a/packages/angular/src/errorhandler.ts b/packages/angular/src/errorhandler.ts
index 09ff9a187c55..31f945b08731 100644
--- a/packages/angular/src/errorhandler.ts
+++ b/packages/angular/src/errorhandler.ts
@@ -1,11 +1,10 @@
import { HttpErrorResponse } from '@angular/common/http';
import type { ErrorHandler as AngularErrorHandler, OnDestroy } from '@angular/core';
import { Inject, Injectable } from '@angular/core';
-import * as Sentry from '@sentry/browser';
import type { ReportDialogOptions } from '@sentry/browser';
-import { consoleSandbox, isString } from '@sentry/core';
+import * as Sentry from '@sentry/browser';
import type { Event } from '@sentry/core';
-
+import { consoleSandbox, isString } from '@sentry/core';
import { runOutsideAngular } from './zone';
/**
diff --git a/packages/angular/src/sdk.ts b/packages/angular/src/sdk.ts
index 9752db9cc384..5a4ffbbde7ee 100755
--- a/packages/angular/src/sdk.ts
+++ b/packages/angular/src/sdk.ts
@@ -17,7 +17,6 @@ import {
inboundFiltersIntegration,
logger,
} from '@sentry/core';
-
import { IS_DEBUG_BUILD } from './flags';
/**
diff --git a/packages/angular/src/tracing.ts b/packages/angular/src/tracing.ts
index 6ac94b362d13..952eabbc8d6c 100644
--- a/packages/angular/src/tracing.ts
+++ b/packages/angular/src/tracing.ts
@@ -1,6 +1,6 @@
+import type { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
import { ElementRef } from '@angular/core';
-import type { AfterViewInit, OnDestroy, OnInit } from '@angular/core';
import { Directive, Injectable, Input, NgModule } from '@angular/core';
import type { ActivatedRouteSnapshot, Event, RouterState } from '@angular/router';
// Duplicated import to work around a TypeScript bug where it'd complain that `Router` isn't imported as a type.
@@ -9,23 +9,22 @@ import type { ActivatedRouteSnapshot, Event, RouterState } from '@angular/router
import { NavigationCancel, NavigationError, Router } from '@angular/router';
import { NavigationEnd, NavigationStart, ResolveEnd } from '@angular/router';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
browserTracingIntegration as originalBrowserTracingIntegration,
getActiveSpan,
getClient,
getCurrentScope,
getRootSpan,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanToJSON,
startBrowserTracingNavigationSpan,
startInactiveSpan,
} from '@sentry/browser';
-import { logger, stripUrlQueryAndFragment, timestampInSeconds } from '@sentry/core';
import type { Integration, Span } from '@sentry/core';
+import { logger, stripUrlQueryAndFragment, timestampInSeconds } from '@sentry/core';
import type { Observable } from 'rxjs';
import { Subscription } from 'rxjs';
import { filter, tap } from 'rxjs/operators';
-
import { ANGULAR_INIT_OP, ANGULAR_OP, ANGULAR_ROUTING_OP } from './constants';
import { IS_DEBUG_BUILD } from './flags';
import { runOutsideAngular } from './zone';
diff --git a/packages/angular/test/errorhandler.test.ts b/packages/angular/test/errorhandler.test.ts
index acaa0d201435..af532c12d9ae 100644
--- a/packages/angular/test/errorhandler.test.ts
+++ b/packages/angular/test/errorhandler.test.ts
@@ -2,8 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http';
import * as SentryBrowser from '@sentry/browser';
import type { Client, Event } from '@sentry/core';
import { vi } from 'vitest';
-
-import { SentryErrorHandler, createErrorHandler } from '../src/errorhandler';
+import { createErrorHandler, SentryErrorHandler } from '../src/errorhandler';
const captureExceptionSpy = vi.spyOn(SentryBrowser, 'captureException');
diff --git a/packages/angular/test/tracing.test.ts b/packages/angular/test/tracing.test.ts
index 454d194c78c5..872fc9c67505 100644
--- a/packages/angular/test/tracing.test.ts
+++ b/packages/angular/test/tracing.test.ts
@@ -6,7 +6,7 @@ import {
spanToJSON,
} from '@sentry/core';
import { describe, it } from 'vitest';
-import { TraceDirective, browserTracingIntegration, init } from '../src/index';
+import { browserTracingIntegration, init, TraceDirective } from '../src/index';
import { _updateSpanAttributesForParametrizedUrl, getParameterizedRouteFromSnapshot } from '../src/tracing';
describe('browserTracingIntegration', () => {
diff --git a/packages/astro/scripts/syncIntegration.ts b/packages/astro/scripts/syncIntegration.ts
index 2273147f7ed7..006d9b3237ac 100644
--- a/packages/astro/scripts/syncIntegration.ts
+++ b/packages/astro/scripts/syncIntegration.ts
@@ -1,7 +1,7 @@
/* eslint-disable no-console */
-import * as path from 'path';
import * as fse from 'fs-extra';
+import * as path from 'path';
const buildDir = path.resolve('build');
const srcIntegrationDir = path.resolve(path.join('src', 'integration'));
diff --git a/packages/astro/src/client/sdk.ts b/packages/astro/src/client/sdk.ts
index 24d29b3cc109..f04725d1ef1e 100644
--- a/packages/astro/src/client/sdk.ts
+++ b/packages/astro/src/client/sdk.ts
@@ -4,8 +4,8 @@ import {
getDefaultIntegrations as getBrowserDefaultIntegrations,
init as initBrowserSdk,
} from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
import type { Client, Integration } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
// Tree-shakable guard to remove all code related to tracing
declare const __SENTRY_TRACING__: boolean;
diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
index ec6713098f11..d74a885c2b37 100644
--- a/packages/astro/src/index.types.ts
+++ b/packages/astro/src/index.types.ts
@@ -1,18 +1,18 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part.
// Some of the exports collide, which is not allowed, unless we redefine the colliding
// exports in this file - which we do below.
-export * from './index.client';
-export * from './index.server';
-export * from '@sentry/node';
-
-import type { NodeOptions } from '@sentry/node';
-
import type { Client, Integration, Options, StackParser } from '@sentry/core';
-
+import type { NodeOptions } from '@sentry/node';
import type * as clientSdk from './index.client';
import type * as serverSdk from './index.server';
import sentryAstro from './index.server';
+export * from './index.client';
+export * from './index.server';
+export * from '@sentry/node';
+
/** Initializes Sentry Astro SDK */
export declare function init(options: Options | clientSdk.BrowserOptions | NodeOptions): Client | undefined;
diff --git a/packages/astro/src/integration/index.ts b/packages/astro/src/integration/index.ts
index e413bb4cf67b..12eef25a4a67 100644
--- a/packages/astro/src/integration/index.ts
+++ b/packages/astro/src/integration/index.ts
@@ -1,9 +1,8 @@
-import * as fs from 'fs';
-import * as path from 'path';
+import { consoleSandbox } from '@sentry/core';
import { sentryVitePlugin } from '@sentry/vite-plugin';
import type { AstroConfig, AstroIntegration } from 'astro';
-
-import { consoleSandbox } from '@sentry/core';
+import * as fs from 'fs';
+import * as path from 'path';
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from './snippets';
import type { SentryOptions } from './types';
diff --git a/packages/astro/src/integration/middleware/index.ts b/packages/astro/src/integration/middleware/index.ts
index 695eed6c2237..46c7ad9531b5 100644
--- a/packages/astro/src/integration/middleware/index.ts
+++ b/packages/astro/src/integration/middleware/index.ts
@@ -1,5 +1,4 @@
import type { MiddlewareResponseHandler } from 'astro';
-
import { handleRequest } from '../../server/middleware';
/**
diff --git a/packages/astro/src/integration/snippets.ts b/packages/astro/src/integration/snippets.ts
index 7ac05c163079..1d9cea1d8b6f 100644
--- a/packages/astro/src/integration/snippets.ts
+++ b/packages/astro/src/integration/snippets.ts
@@ -1,5 +1,4 @@
import * as path from 'path';
-
import type { SentryOptions } from './types';
/**
diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts
index 692a8a7256a3..f339f7b6f979 100644
--- a/packages/astro/src/server/middleware.ts
+++ b/packages/astro/src/server/middleware.ts
@@ -1,3 +1,4 @@
+import type { RequestEventData, Scope, SpanAttributes } from '@sentry/core';
import {
addNonEnumerableProperty,
extractQueryParamsFromUrl,
@@ -7,10 +8,7 @@ import {
vercelWaitUntil,
winterCGRequestToRequestData,
} from '@sentry/core';
-import type { RequestEventData, Scope, SpanAttributes } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
flush,
@@ -18,6 +16,8 @@ import {
getClient,
getCurrentScope,
getTraceMetaTags,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setHttpStatus,
startSpan,
withIsolationScope,
diff --git a/packages/astro/test/client/sdk.test.ts b/packages/astro/test/client/sdk.test.ts
index 9f3ea651697d..a537013f7c22 100644
--- a/packages/astro/test/client/sdk.test.ts
+++ b/packages/astro/test/client/sdk.test.ts
@@ -1,16 +1,15 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
import type { BrowserClient } from '@sentry/browser';
import {
browserTracingIntegration,
getActiveSpan,
+ getClient,
getCurrentScope,
getGlobalScope,
getIsolationScope,
+ SDK_VERSION,
} from '@sentry/browser';
import * as SentryBrowser from '@sentry/browser';
-import { SDK_VERSION, getClient } from '@sentry/browser';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../../src/client/sdk';
const browserInit = vi.spyOn(SentryBrowser, 'init');
diff --git a/packages/astro/test/integration/index.files.test.ts b/packages/astro/test/integration/index.files.test.ts
index 0b28b2a0550d..7df9f16ac0ca 100644
--- a/packages/astro/test/integration/index.files.test.ts
+++ b/packages/astro/test/integration/index.files.test.ts
@@ -1,5 +1,4 @@
import { afterEach, describe, expect, it, vi } from 'vitest';
-
import { sentryAstro } from '../../src/integration';
vi.mock('fs', async requireActual => {
diff --git a/packages/astro/test/integration/index.test.ts b/packages/astro/test/integration/index.test.ts
index 01d86e85baee..df6f37133191 100644
--- a/packages/astro/test/integration/index.test.ts
+++ b/packages/astro/test/integration/index.test.ts
@@ -1,10 +1,8 @@
import type { AstroConfig } from 'astro';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { getUpdatedSourceMapSettings } from '../../src/integration/index';
+import { getUpdatedSourceMapSettings, sentryAstro } from '../../src/integration';
import type { SentryOptions } from '../../src/integration/types';
-import { sentryAstro } from '../../src/integration';
-
const sentryVitePluginSpy = vi.fn(() => 'sentryVitePlugin');
vi.mock('@sentry/vite-plugin', () => ({
diff --git a/packages/astro/test/integration/middleware/index.test.ts b/packages/astro/test/integration/middleware/index.test.ts
index 3c48086a2ee2..2a63a66027e8 100644
--- a/packages/astro/test/integration/middleware/index.test.ts
+++ b/packages/astro/test/integration/middleware/index.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it, vi } from 'vitest';
-
import { onRequest } from '../../../src/integration/middleware';
vi.mock('../../../src/server/meta', () => ({
diff --git a/packages/astro/test/integration/snippets.test.ts b/packages/astro/test/integration/snippets.test.ts
index 66a3b15efd58..edc8338906ab 100644
--- a/packages/astro/test/integration/snippets.test.ts
+++ b/packages/astro/test/integration/snippets.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { buildClientSnippet, buildSdkInitFileImportSnippet, buildServerSnippet } from '../../src/integration/snippets';
const allSdkOptions = {
diff --git a/packages/astro/test/server/middleware.test.ts b/packages/astro/test/server/middleware.test.ts
index 08dcb6112421..e8c16fa570d3 100644
--- a/packages/astro/test/server/middleware.test.ts
+++ b/packages/astro/test/server/middleware.test.ts
@@ -1,9 +1,8 @@
+import type { Client, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import * as SentryCore from '@sentry/core';
-import type { Client, Span } from '@sentry/core';
import * as SentryNode from '@sentry/node';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import { handleRequest, interpolateRouteFromUrlAndParams } from '../../src/server/middleware';
vi.mock('../../src/server/meta', () => ({
diff --git a/packages/astro/test/server/sdk.test.ts b/packages/astro/test/server/sdk.test.ts
index ee3808204f5b..1d915152fdcc 100644
--- a/packages/astro/test/server/sdk.test.ts
+++ b/packages/astro/test/server/sdk.test.ts
@@ -1,7 +1,6 @@
import * as SentryNode from '@sentry/node';
import { SDK_VERSION } from '@sentry/node';
-import { vi, describe, afterEach, expect, it } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../../src/server/sdk';
const nodeInit = vi.spyOn(SentryNode, 'init');
diff --git a/packages/aws-serverless/scripts/buildLambdaLayer.ts b/packages/aws-serverless/scripts/buildLambdaLayer.ts
index 7ce98ca64a5c..52c3b50009c5 100644
--- a/packages/aws-serverless/scripts/buildLambdaLayer.ts
+++ b/packages/aws-serverless/scripts/buildLambdaLayer.ts
@@ -1,7 +1,6 @@
/* eslint-disable no-console */
import * as childProcess from 'child_process';
import * as fs from 'fs';
-
import { version } from '../package.json';
/**
diff --git a/packages/aws-serverless/src/integration/aws.ts b/packages/aws-serverless/src/integration/aws.ts
index f08513e1a342..d67f9e529f21 100644
--- a/packages/aws-serverless/src/integration/aws.ts
+++ b/packages/aws-serverless/src/integration/aws.ts
@@ -1,6 +1,6 @@
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import { AwsInstrumentation } from '@opentelemetry/instrumentation-aws-sdk';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
/**
* Instrumentation for aws-sdk package
diff --git a/packages/aws-serverless/src/integration/awslambda.ts b/packages/aws-serverless/src/integration/awslambda.ts
index 2ba148d8b165..00bca1a9219c 100644
--- a/packages/aws-serverless/src/integration/awslambda.ts
+++ b/packages/aws-serverless/src/integration/awslambda.ts
@@ -1,6 +1,6 @@
import { AwsLambdaInstrumentation } from '@opentelemetry/instrumentation-aws-lambda';
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce } from '@sentry/node';
import { eventContextExtractor } from '../utils';
diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts
index 2523e025c377..7d278414c5be 100644
--- a/packages/aws-serverless/src/sdk.ts
+++ b/packages/aws-serverless/src/sdk.ts
@@ -1,13 +1,9 @@
-import { existsSync } from 'fs';
-import { hostname } from 'os';
-import { basename, resolve } from 'path';
-import { types } from 'util';
import type { Integration, Options, Scope, Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
applySdkMetadata,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import {
@@ -22,7 +18,11 @@ import {
withScope,
} from '@sentry/node';
import type { Context, Handler } from 'aws-lambda';
+import { existsSync } from 'fs';
+import { hostname } from 'os';
+import { basename, resolve } from 'path';
import { performance } from 'perf_hooks';
+import { types } from 'util';
import { DEBUG_BUILD } from './debug-build';
import { awsIntegration } from './integration/aws';
import { awsLambdaIntegration } from './integration/awslambda';
diff --git a/packages/aws-serverless/src/utils.ts b/packages/aws-serverless/src/utils.ts
index 73038003e534..f1b0389743cb 100644
--- a/packages/aws-serverless/src/utils.ts
+++ b/packages/aws-serverless/src/utils.ts
@@ -1,10 +1,8 @@
-import type { TextMapGetter } from '@opentelemetry/api';
-import type { Context as OtelContext } from '@opentelemetry/api';
+import type { Context as OtelContext, TextMapGetter } from '@opentelemetry/api';
import { context as otelContext, propagation } from '@opentelemetry/api';
-import { addExceptionMechanism, isString } from '@sentry/core';
import type { Scope } from '@sentry/core';
-import type { Handler } from 'aws-lambda';
-import type { APIGatewayProxyEventHeaders } from 'aws-lambda';
+import { addExceptionMechanism, isString } from '@sentry/core';
+import type { APIGatewayProxyEventHeaders, Handler } from 'aws-lambda';
type HandlerEvent = Parameters }>>[0];
type HandlerContext = Parameters[1];
diff --git a/packages/aws-serverless/test/sdk.test.ts b/packages/aws-serverless/test/sdk.test.ts
index bc69a32aed68..f05deee57d88 100644
--- a/packages/aws-serverless/test/sdk.test.ts
+++ b/packages/aws-serverless/test/sdk.test.ts
@@ -1,9 +1,7 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-
import type { Event } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import type { Callback, Handler } from 'aws-lambda';
import { beforeEach, describe, expect, test, vi } from 'vitest';
-
import { init, wrapHandler } from '../src/sdk';
const mockSpanEnd = vi.fn();
diff --git a/packages/browser-utils/src/metrics/browserMetrics.ts b/packages/browser-utils/src/metrics/browserMetrics.ts
index dbdc54dca512..71470a0d8706 100644
--- a/packages/browser-utils/src/metrics/browserMetrics.ts
+++ b/packages/browser-utils/src/metrics/browserMetrics.ts
@@ -1,12 +1,12 @@
/* eslint-disable max-lines */
import type { Measurements, Span, SpanAttributes, StartSpanOptions } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
browserPerformanceTimeOrigin,
getActiveSpan,
getComponentName,
htmlTreeAsString,
parseUrl,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
setMeasurement,
spanToJSON,
} from '@sentry/core';
diff --git a/packages/browser-utils/src/metrics/cls.ts b/packages/browser-utils/src/metrics/cls.ts
index 8e362bbfae1c..a6c53800ccc1 100644
--- a/packages/browser-utils/src/metrics/cls.ts
+++ b/packages/browser-utils/src/metrics/cls.ts
@@ -1,17 +1,19 @@
+import type { SpanAttributes } from '@sentry/core';
import {
+ browserPerformanceTimeOrigin,
+ getActiveSpan,
+ getClient,
+ getCurrentScope,
+ getRootSpan,
+ htmlTreeAsString,
+ logger,
SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- getActiveSpan,
- getClient,
- getCurrentScope,
- getRootSpan,
spanToJSON,
} from '@sentry/core';
-import { browserPerformanceTimeOrigin, htmlTreeAsString, logger } from '@sentry/core';
-import type { SpanAttributes } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { addClsInstrumentationHandler } from './instrument';
import { msToSec, startStandaloneWebVitalSpan } from './utils';
diff --git a/packages/browser-utils/src/metrics/inp.ts b/packages/browser-utils/src/metrics/inp.ts
index 0392be622355..05b7d7ed17a8 100644
--- a/packages/browser-utils/src/metrics/inp.ts
+++ b/packages/browser-utils/src/metrics/inp.ts
@@ -1,15 +1,15 @@
import type { Span, SpanAttributes } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
- SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
- SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
browserPerformanceTimeOrigin,
getActiveSpan,
getCurrentScope,
getRootSpan,
htmlTreeAsString,
+ SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
+ SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
+ SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
spanToJSON,
} from '@sentry/core';
import {
diff --git a/packages/browser-utils/src/metrics/instrument.ts b/packages/browser-utils/src/metrics/instrument.ts
index b273f9d3eb5e..7b9d7e562f37 100644
--- a/packages/browser-utils/src/metrics/instrument.ts
+++ b/packages/browser-utils/src/metrics/instrument.ts
@@ -1,5 +1,4 @@
import { getFunctionName, logger } from '@sentry/core';
-
import { DEBUG_BUILD } from '../debug-build';
import { onCLS } from './web-vitals/getCLS';
import { onFID } from './web-vitals/getFID';
diff --git a/packages/browser-utils/src/metrics/web-vitals/getINP.ts b/packages/browser-utils/src/metrics/web-vitals/getINP.ts
index ba6234e43c18..af5bd05fb413 100644
--- a/packages/browser-utils/src/metrics/web-vitals/getINP.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/getINP.ts
@@ -23,7 +23,6 @@ import { onHidden } from './lib/onHidden';
import { initInteractionCountPolyfill } from './lib/polyfills/interactionCountPolyfill';
import { whenActivated } from './lib/whenActivated';
import { whenIdle } from './lib/whenIdle';
-
import type { INPMetric, MetricRatingThresholds, ReportOpts } from './types';
/** Thresholds for INP. See https://web.dev/articles/inp#what_is_a_good_inp_score */
diff --git a/packages/browser-utils/src/networkUtils.ts b/packages/browser-utils/src/networkUtils.ts
index db8bb36fe357..cbdd77640507 100644
--- a/packages/browser-utils/src/networkUtils.ts
+++ b/packages/browser-utils/src/networkUtils.ts
@@ -1,5 +1,5 @@
-import { logger } from '@sentry/core';
import type { Logger } from '@sentry/core';
+import { logger } from '@sentry/core';
import { DEBUG_BUILD } from './debug-build';
import type { NetworkMetaWarning } from './types';
diff --git a/packages/browser-utils/test/browser/browserMetrics.test.ts b/packages/browser-utils/test/browser/browserMetrics.test.ts
index 685f7e2c41ed..99cf451f824e 100644
--- a/packages/browser-utils/test/browser/browserMetrics.test.ts
+++ b/packages/browser-utils/test/browser/browserMetrics.test.ts
@@ -1,19 +1,18 @@
+import type { Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SentrySpan,
getClient,
getCurrentScope,
getIsolationScope,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SentrySpan,
setCurrentClient,
spanToJSON,
} from '@sentry/core';
-import type { Span } from '@sentry/core';
-import { describe, beforeEach, it, expect, beforeAll, afterAll } from 'vitest';
-
+import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'vitest';
import { _addMeasureSpans, _addNavigationSpans, _addResourceSpans } from '../../src/metrics/browserMetrics';
import { WINDOW } from '../../src/types';
-import { TestClient, getDefaultClientOptions } from '../utils/TestClient';
+import { getDefaultClientOptions, TestClient } from '../utils/TestClient';
const mockWindowLocation = {
ancestorOrigins: {},
diff --git a/packages/browser-utils/test/browser/utils.test.ts b/packages/browser-utils/test/browser/utils.test.ts
index 9d8a6c301e84..c620f19c8ab9 100644
--- a/packages/browser-utils/test/browser/utils.test.ts
+++ b/packages/browser-utils/test/browser/utils.test.ts
@@ -1,8 +1,7 @@
-import { SentrySpan, getCurrentScope, getIsolationScope, setCurrentClient, spanToJSON } from '@sentry/core';
-import { describe, beforeEach, it, expect, test } from 'vitest';
-
+import { getCurrentScope, getIsolationScope, SentrySpan, setCurrentClient, spanToJSON } from '@sentry/core';
+import { beforeEach, describe, expect, it, test } from 'vitest';
import { extractNetworkProtocol, startAndEndSpan } from '../../src/metrics/utils';
-import { TestClient, getDefaultClientOptions } from '../utils/TestClient';
+import { getDefaultClientOptions, TestClient } from '../utils/TestClient';
describe('startAndEndSpan()', () => {
beforeEach(() => {
diff --git a/packages/browser-utils/test/instrument/dom.test.ts b/packages/browser-utils/test/instrument/dom.test.ts
index a2c2a12dbf16..ed98828db9a6 100644
--- a/packages/browser-utils/test/instrument/dom.test.ts
+++ b/packages/browser-utils/test/instrument/dom.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { instrumentDOM } from '../../src/instrument/dom';
import { WINDOW } from '../../src/types';
diff --git a/packages/browser-utils/test/instrument/history.test.ts b/packages/browser-utils/test/instrument/history.test.ts
index 98c42580c20c..03054194472f 100644
--- a/packages/browser-utils/test/instrument/history.test.ts
+++ b/packages/browser-utils/test/instrument/history.test.ts
@@ -1,8 +1,7 @@
-import { describe, expect, it, vi, afterEach } from 'vitest';
+import * as instrumentHandlersModule from '@sentry/core';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { WINDOW } from '../../src/types';
-
import { instrumentHistory } from './../../src/instrument/history';
-import * as instrumentHandlersModule from '@sentry/core';
describe('instrumentHistory', () => {
const originalHistory = WINDOW.history;
diff --git a/packages/browser-utils/test/instrument/xhr.test.ts b/packages/browser-utils/test/instrument/xhr.test.ts
index 352cce016fcb..71ae42715daa 100644
--- a/packages/browser-utils/test/instrument/xhr.test.ts
+++ b/packages/browser-utils/test/instrument/xhr.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { instrumentXHR } from '../../src/instrument/xhr';
import { WINDOW } from '../../src/types';
diff --git a/packages/browser-utils/test/utils/TestClient.ts b/packages/browser-utils/test/utils/TestClient.ts
index 13f3ca82d3d6..058c90870d5a 100644
--- a/packages/browser-utils/test/utils/TestClient.ts
+++ b/packages/browser-utils/test/utils/TestClient.ts
@@ -1,5 +1,3 @@
-import { Client, createTransport, initAndBind } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
import type {
BrowserClientReplayOptions,
ClientOptions,
@@ -7,6 +5,7 @@ import type {
ParameterizedString,
SeverityLevel,
} from '@sentry/core';
+import { Client, createTransport, initAndBind, resolvedSyncPromise } from '@sentry/core';
export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {}
diff --git a/packages/browser-utils/vite.config.ts b/packages/browser-utils/vite.config.ts
index a5523c61f601..841ff483d7c4 100644
--- a/packages/browser-utils/vite.config.ts
+++ b/packages/browser-utils/vite.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts
index 4ae9562f7ea3..73cbd55d42db 100644
--- a/packages/browser/src/client.ts
+++ b/packages/browser/src/client.ts
@@ -10,12 +10,12 @@ import type {
SeverityLevel,
} from '@sentry/core';
import {
- Client,
+ _INTERNAL_flushLogsBuffer,
addAutoIpAddressToSession,
addAutoIpAddressToUser,
applySdkMetadata,
+ Client,
getSDKSource,
- _INTERNAL_flushLogsBuffer,
} from '@sentry/core';
import { eventFromException, eventFromMessage } from './eventbuilder';
import { WINDOW } from './helpers';
diff --git a/packages/browser/src/helpers.ts b/packages/browser/src/helpers.ts
index cd0a734102e7..76578fe356dc 100644
--- a/packages/browser/src/helpers.ts
+++ b/packages/browser/src/helpers.ts
@@ -1,11 +1,11 @@
import type { Mechanism, WrappedFunction } from '@sentry/core';
import {
- GLOBAL_OBJ,
addExceptionMechanism,
addExceptionTypeValue,
addNonEnumerableProperty,
captureException,
getOriginalFunction,
+ GLOBAL_OBJ,
markFunctionWrapped,
withScope,
} from '@sentry/core';
diff --git a/packages/browser/src/index.bundle.feedback.ts b/packages/browser/src/index.bundle.feedback.ts
index 957583d79eeb..eecad6304ebf 100644
--- a/packages/browser/src/index.bundle.feedback.ts
+++ b/packages/browser/src/index.bundle.feedback.ts
@@ -11,5 +11,3 @@ export {
feedbackAsyncIntegration as feedbackIntegration,
replayIntegrationShim as replayIntegration,
};
-
-export { captureFeedback } from '@sentry/core';
diff --git a/packages/browser/src/index.bundle.tracing.replay.feedback.ts b/packages/browser/src/index.bundle.tracing.replay.feedback.ts
index a16f07bafaf2..f8345908e8dc 100644
--- a/packages/browser/src/index.bundle.tracing.replay.feedback.ts
+++ b/packages/browser/src/index.bundle.tracing.replay.feedback.ts
@@ -1,4 +1,5 @@
import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { feedbackAsyncIntegration } from './feedbackAsync';
registerSpanErrorInstrumentation();
@@ -14,7 +15,6 @@ export {
withActiveSpan,
getSpanDescendants,
setMeasurement,
- captureFeedback,
} from '@sentry/core';
export {
@@ -22,8 +22,6 @@ export {
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
} from './tracing/browserTracingIntegration';
-
-import { feedbackAsyncIntegration } from './feedbackAsync';
export { getFeedback } from '@sentry-internal/feedback';
export { feedbackAsyncIntegration as feedbackAsyncIntegration, feedbackAsyncIntegration as feedbackIntegration };
diff --git a/packages/browser/src/index.bundle.tracing.replay.ts b/packages/browser/src/index.bundle.tracing.replay.ts
index 37f0da34ae25..47a2a16ae06b 100644
--- a/packages/browser/src/index.bundle.tracing.replay.ts
+++ b/packages/browser/src/index.bundle.tracing.replay.ts
@@ -1,4 +1,5 @@
import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
registerSpanErrorInstrumentation();
@@ -21,8 +22,6 @@ export {
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
} from './tracing/browserTracingIntegration';
-
-import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
export { feedbackIntegrationShim as feedbackAsyncIntegration, feedbackIntegrationShim as feedbackIntegration };
export { replayIntegration, getReplay } from '@sentry-internal/replay';
diff --git a/packages/browser/src/index.bundle.tracing.ts b/packages/browser/src/index.bundle.tracing.ts
index d540ff0bd6f9..72e2a40d07a1 100644
--- a/packages/browser/src/index.bundle.tracing.ts
+++ b/packages/browser/src/index.bundle.tracing.ts
@@ -1,5 +1,5 @@
-import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
import { registerSpanErrorInstrumentation } from '@sentry/core';
+import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
registerSpanErrorInstrumentation();
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index dd079cfc0241..2b2279c099b3 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -1,7 +1,9 @@
-export * from './exports';
-
+import { feedbackAsyncIntegration } from './feedbackAsync';
+import { feedbackSyncIntegration } from './feedbackSync';
import * as logger from './log';
+export * from './exports';
+
export { logger };
export { reportingObserverIntegration } from './integrations/reportingobserver';
@@ -13,7 +15,6 @@ export {
captureConsoleIntegration,
extraErrorDataIntegration,
rewriteFramesIntegration,
- captureFeedback,
consoleLoggingIntegration,
} from '@sentry/core';
@@ -31,9 +32,6 @@ export type {
} from '@sentry-internal/replay';
export { replayCanvasIntegration } from '@sentry-internal/replay-canvas';
-
-import { feedbackAsyncIntegration } from './feedbackAsync';
-import { feedbackSyncIntegration } from './feedbackSync';
export { feedbackAsyncIntegration, feedbackSyncIntegration, feedbackSyncIntegration as feedbackIntegration };
export { getFeedback, sendFeedback } from '@sentry-internal/feedback';
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
index 1abb3beacc50..636f091e5e06 100644
--- a/packages/browser/src/integrations/breadcrumbs.ts
+++ b/packages/browser/src/integrations/breadcrumbs.ts
@@ -1,12 +1,5 @@
/* eslint-disable max-lines */
-import {
- SENTRY_XHR_DATA_KEY,
- addClickKeypressInstrumentationHandler,
- addHistoryInstrumentationHandler,
- addXhrInstrumentationHandler,
-} from '@sentry-internal/browser-utils';
-import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
import type {
Breadcrumb,
Client,
@@ -37,7 +30,13 @@ import {
safeJoin,
severityLevelFromString,
} from '@sentry/core';
-
+import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
+import {
+ addClickKeypressInstrumentationHandler,
+ addHistoryInstrumentationHandler,
+ addXhrInstrumentationHandler,
+ SENTRY_XHR_DATA_KEY,
+} from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
diff --git a/packages/browser/src/integrations/browserapierrors.ts b/packages/browser/src/integrations/browserapierrors.ts
index 923079b62607..55e716fd8627 100644
--- a/packages/browser/src/integrations/browserapierrors.ts
+++ b/packages/browser/src/integrations/browserapierrors.ts
@@ -1,6 +1,5 @@
import type { IntegrationFn, WrappedFunction } from '@sentry/core';
import { defineIntegration, fill, getFunctionName, getOriginalFunction } from '@sentry/core';
-
import { WINDOW, wrap } from '../helpers';
const DEFAULT_EVENT_TARGET = [
diff --git a/packages/browser/src/integrations/browsersession.ts b/packages/browser/src/integrations/browsersession.ts
index 7863351f182f..ac74951b6596 100644
--- a/packages/browser/src/integrations/browsersession.ts
+++ b/packages/browser/src/integrations/browsersession.ts
@@ -1,5 +1,5 @@
-import { addHistoryInstrumentationHandler } from '@sentry-internal/browser-utils';
import { captureSession, defineIntegration, logger, startSession } from '@sentry/core';
+import { addHistoryInstrumentationHandler } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
diff --git a/packages/browser/src/integrations/contextlines.ts b/packages/browser/src/integrations/contextlines.ts
index 775df33f0595..07dae0b9dc32 100644
--- a/packages/browser/src/integrations/contextlines.ts
+++ b/packages/browser/src/integrations/contextlines.ts
@@ -1,5 +1,5 @@
import type { Event, IntegrationFn, StackFrame } from '@sentry/core';
-import { GLOBAL_OBJ, addContextToFrame, defineIntegration, stripUrlQueryAndFragment } from '@sentry/core';
+import { addContextToFrame, defineIntegration, GLOBAL_OBJ, stripUrlQueryAndFragment } from '@sentry/core';
const WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;
diff --git a/packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts b/packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts
index 01bc73190202..54b5680cccd1 100644
--- a/packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts
+++ b/packages/browser/src/integrations/featureFlags/featureFlagsIntegration.ts
@@ -1,5 +1,4 @@
import type { Client, Event, EventHint, Integration, IntegrationFn } from '@sentry/core';
-
import { defineIntegration } from '@sentry/core';
import { copyFlagsFromScopeToEvent, insertFlagToScope } from '../../utils/featureFlags';
diff --git a/packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts b/packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts
index d08c34a59c5e..f96b8deb8fa0 100644
--- a/packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts
+++ b/packages/browser/src/integrations/featureFlags/launchdarkly/integration.ts
@@ -1,8 +1,7 @@
import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
-import type { LDContext, LDEvaluationDetail, LDInspectionFlagUsedHandler } from './types';
-
import { defineIntegration } from '@sentry/core';
import { copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
+import type { LDContext, LDEvaluationDetail, LDInspectionFlagUsedHandler } from './types';
/**
* Sentry integration for capturing feature flags from LaunchDarkly.
diff --git a/packages/browser/src/integrations/featureFlags/openfeature/integration.ts b/packages/browser/src/integrations/featureFlags/openfeature/integration.ts
index 5b5b56d65d18..b1963e9964e6 100644
--- a/packages/browser/src/integrations/featureFlags/openfeature/integration.ts
+++ b/packages/browser/src/integrations/featureFlags/openfeature/integration.ts
@@ -6,10 +6,9 @@
* - OpenFeature.getClient().addHooks(new OpenFeatureIntegrationHook());
*/
import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
-import type { EvaluationDetails, HookContext, HookHints, JsonValue, OpenFeatureHook } from './types';
-
import { defineIntegration } from '@sentry/core';
import { copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
+import type { EvaluationDetails, HookContext, HookHints, JsonValue, OpenFeatureHook } from './types';
export const openFeatureIntegration = defineIntegration(() => {
return {
diff --git a/packages/browser/src/integrations/featureFlags/statsig/integration.ts b/packages/browser/src/integrations/featureFlags/statsig/integration.ts
index 7870f1250032..54600458cfb9 100644
--- a/packages/browser/src/integrations/featureFlags/statsig/integration.ts
+++ b/packages/browser/src/integrations/featureFlags/statsig/integration.ts
@@ -1,5 +1,4 @@
import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
-
import { defineIntegration } from '@sentry/core';
import { copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
import type { FeatureGate, StatsigClient } from './types';
diff --git a/packages/browser/src/integrations/featureFlags/unleash/integration.ts b/packages/browser/src/integrations/featureFlags/unleash/integration.ts
index e7f4602d17d7..21d945dfcaae 100644
--- a/packages/browser/src/integrations/featureFlags/unleash/integration.ts
+++ b/packages/browser/src/integrations/featureFlags/unleash/integration.ts
@@ -1,5 +1,4 @@
import type { Client, Event, EventHint, IntegrationFn } from '@sentry/core';
-
import { defineIntegration, fill, logger } from '@sentry/core';
import { DEBUG_BUILD } from '../../../debug-build';
import { copyFlagsFromScopeToEvent, insertFlagToScope } from '../../../utils/featureFlags';
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
index 21e7440b0bc3..fa4420a0416e 100644
--- a/packages/browser/src/integrations/globalhandlers.ts
+++ b/packages/browser/src/integrations/globalhandlers.ts
@@ -1,6 +1,5 @@
import type { Client, Event, IntegrationFn, Primitive, StackParser } from '@sentry/core';
import {
- UNKNOWN_FUNCTION,
addGlobalErrorInstrumentationHandler,
addGlobalUnhandledRejectionInstrumentationHandler,
captureEvent,
@@ -10,8 +9,8 @@ import {
isPrimitive,
isString,
logger,
+ UNKNOWN_FUNCTION,
} from '@sentry/core';
-
import type { BrowserClient } from '../client';
import { DEBUG_BUILD } from '../debug-build';
import { eventFromUnknownInput } from '../eventbuilder';
diff --git a/packages/browser/src/integrations/graphqlClient.ts b/packages/browser/src/integrations/graphqlClient.ts
index 2c9ce06b7794..a467a4a70ff4 100644
--- a/packages/browser/src/integrations/graphqlClient.ts
+++ b/packages/browser/src/integrations/graphqlClient.ts
@@ -1,15 +1,15 @@
-import { SENTRY_XHR_DATA_KEY, getBodyString, getFetchRequestArgBody } from '@sentry-internal/browser-utils';
-import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
+import type { Client, IntegrationFn } from '@sentry/core';
import {
+ defineIntegration,
+ isString,
SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_URL_FULL,
- defineIntegration,
- isString,
spanToJSON,
stringMatchesSomePattern,
} from '@sentry/core';
-import type { Client, IntegrationFn } from '@sentry/core';
+import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
+import { getBodyString, getFetchRequestArgBody, SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils';
interface GraphQLClientOptions {
endpoints: Array;
diff --git a/packages/browser/src/integrations/httpclient.ts b/packages/browser/src/integrations/httpclient.ts
index 7eea7c2ccb6a..11763b34d581 100644
--- a/packages/browser/src/integrations/httpclient.ts
+++ b/packages/browser/src/integrations/httpclient.ts
@@ -1,17 +1,16 @@
-import { SENTRY_XHR_DATA_KEY, addXhrInstrumentationHandler } from '@sentry-internal/browser-utils';
import type { Client, Event as SentryEvent, IntegrationFn, SentryWrappedXMLHttpRequest } from '@sentry/core';
import {
- GLOBAL_OBJ,
addExceptionMechanism,
addFetchInstrumentationHandler,
captureEvent,
defineIntegration,
getClient,
+ GLOBAL_OBJ,
isSentryRequestUrl,
logger,
supportsNativeFetch,
} from '@sentry/core';
-
+import { addXhrInstrumentationHandler, SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
export type HttpStatusCodeRange = [number, number] | number;
diff --git a/packages/browser/src/integrations/reportingobserver.ts b/packages/browser/src/integrations/reportingobserver.ts
index 647bdee3e548..571dca9db839 100644
--- a/packages/browser/src/integrations/reportingobserver.ts
+++ b/packages/browser/src/integrations/reportingobserver.ts
@@ -1,9 +1,9 @@
import type { Client, IntegrationFn } from '@sentry/core';
import {
- GLOBAL_OBJ,
captureMessage,
defineIntegration,
getClient,
+ GLOBAL_OBJ,
supportsReportingObserver,
withScope,
} from '@sentry/core';
diff --git a/packages/browser/src/integrations/spotlight.ts b/packages/browser/src/integrations/spotlight.ts
index c18457ba150f..233b85ace310 100644
--- a/packages/browser/src/integrations/spotlight.ts
+++ b/packages/browser/src/integrations/spotlight.ts
@@ -1,6 +1,6 @@
-import { getNativeImplementation } from '@sentry-internal/browser-utils';
import type { Client, Envelope, Event, IntegrationFn } from '@sentry/core';
import { defineIntegration, logger, serializeEnvelope } from '@sentry/core';
+import { getNativeImplementation } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
import type { WINDOW } from '../helpers';
diff --git a/packages/browser/src/log.ts b/packages/browser/src/log.ts
index ba4783e0c1c4..ef2614b81f55 100644
--- a/packages/browser/src/log.ts
+++ b/packages/browser/src/log.ts
@@ -1,4 +1,4 @@
-import type { LogSeverityLevel, Log, ParameterizedString } from '@sentry/core';
+import type { Log, LogSeverityLevel, ParameterizedString } from '@sentry/core';
import { _INTERNAL_captureLog } from '@sentry/core';
/**
diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts
index df3c4923d1c9..0f676bc1156c 100644
--- a/packages/browser/src/profiling/integration.ts
+++ b/packages/browser/src/profiling/integration.ts
@@ -1,16 +1,15 @@
-import { defineIntegration, getActiveSpan, getRootSpan } from '@sentry/core';
-import { logger } from '@sentry/core';
import type { EventEnvelope, IntegrationFn, Profile, Span } from '@sentry/core';
-
+import { defineIntegration, getActiveSpan, getRootSpan, logger } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { startProfileForSpan } from './startProfileForSpan';
import type { ProfiledEvent } from './utils';
-import { isAutomatedPageLoadSpan, shouldProfileSpan } from './utils';
import {
addProfilesToEnvelope,
createProfilingEvent,
findProfiledTransactionsFromEnvelope,
getActiveProfilesCount,
+ isAutomatedPageLoadSpan,
+ shouldProfileSpan,
takeProfileFromGlobalCache,
} from './utils';
diff --git a/packages/browser/src/profiling/startProfileForSpan.ts b/packages/browser/src/profiling/startProfileForSpan.ts
index 35a8ab45ea82..548508331646 100644
--- a/packages/browser/src/profiling/startProfileForSpan.ts
+++ b/packages/browser/src/profiling/startProfileForSpan.ts
@@ -1,11 +1,9 @@
-import { getCurrentScope, spanToJSON } from '@sentry/core';
-import { logger, timestampInSeconds, uuid4 } from '@sentry/core';
import type { Span } from '@sentry/core';
-
+import { getCurrentScope, logger, spanToJSON, timestampInSeconds, uuid4 } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
import type { JSSelfProfile } from './jsSelfProfiling';
-import { MAX_PROFILE_DURATION_MS, addProfileToGlobalCache, isAutomatedPageLoadSpan, startJSSelfProfile } from './utils';
+import { addProfileToGlobalCache, isAutomatedPageLoadSpan, MAX_PROFILE_DURATION_MS, startJSSelfProfile } from './utils';
/**
* Wraps startTransaction and stopTransaction with profiling related logic.
diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts
index 04661e0bbb1a..5b81364df727 100644
--- a/packages/browser/src/profiling/utils.ts
+++ b/packages/browser/src/profiling/utils.ts
@@ -1,8 +1,8 @@
/* eslint-disable max-lines */
import type { DebugImage, Envelope, Event, EventEnvelope, Profile, Span, ThreadCpuProfile } from '@sentry/core';
import {
- DEFAULT_ENVIRONMENT,
browserPerformanceTimeOrigin,
+ DEFAULT_ENVIRONMENT,
forEachEnvelopeItem,
getClient,
getDebugImagesForResources,
@@ -13,7 +13,7 @@ import {
} from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
-import type { JSSelfProfile, JSSelfProfileStack, JSSelfProfiler, JSSelfProfilerConstructor } from './jsSelfProfiling';
+import type { JSSelfProfile, JSSelfProfiler, JSSelfProfilerConstructor, JSSelfProfileStack } from './jsSelfProfiling';
const MS_TO_NS = 1e6;
// Use 0 as main thread id which is identical to threadId in node:worker_threads
diff --git a/packages/browser/src/stack-parsers.ts b/packages/browser/src/stack-parsers.ts
index 8089ace5663d..d857b2e92b36 100644
--- a/packages/browser/src/stack-parsers.ts
+++ b/packages/browser/src/stack-parsers.ts
@@ -23,8 +23,8 @@
// CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
// OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import { UNKNOWN_FUNCTION, createStackParser } from '@sentry/core';
import type { StackFrame, StackLineParser, StackLineParserFn } from '@sentry/core';
+import { createStackParser, UNKNOWN_FUNCTION } from '@sentry/core';
const OPERA10_PRIORITY = 10;
const OPERA11_PRIORITY = 20;
diff --git a/packages/browser/src/tracing/backgroundtab.ts b/packages/browser/src/tracing/backgroundtab.ts
index 1eab49e0d0fd..e6241794d6d1 100644
--- a/packages/browser/src/tracing/backgroundtab.ts
+++ b/packages/browser/src/tracing/backgroundtab.ts
@@ -1,4 +1,4 @@
-import { SPAN_STATUS_ERROR, getActiveSpan, getRootSpan, logger, spanToJSON } from '@sentry/core';
+import { getActiveSpan, getRootSpan, logger, SPAN_STATUS_ERROR, spanToJSON } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
diff --git a/packages/browser/src/tracing/browserTracingIntegration.ts b/packages/browser/src/tracing/browserTracingIntegration.ts
index 5851edfec823..92b7ddcea364 100644
--- a/packages/browser/src/tracing/browserTracingIntegration.ts
+++ b/packages/browser/src/tracing/browserTracingIntegration.ts
@@ -1,24 +1,9 @@
/* eslint-disable max-lines */
-import {
- addHistoryInstrumentationHandler,
- addPerformanceEntries,
- registerInpInteractionListener,
- startTrackingINP,
- startTrackingInteractions,
- startTrackingLongAnimationFrames,
- startTrackingLongTasks,
- startTrackingWebVitals,
-} from '@sentry-internal/browser-utils';
import type { Client, IntegrationFn, Span, StartSpanOptions, TransactionSource, WebFetchHeaders } from '@sentry/core';
-import { consoleSandbox } from '@sentry/core';
import {
- GLOBAL_OBJ,
- SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- TRACING_DEFAULTS,
addNonEnumerableProperty,
browserPerformanceTimeOrigin,
+ consoleSandbox,
generateTraceId,
getClient,
getCurrentScope,
@@ -26,23 +11,38 @@ import {
getIsolationScope,
getLocationHref,
getRootSpan,
+ GLOBAL_OBJ,
logger,
propagationContextFromHeaders,
registerSpanErrorInstrumentation,
+ SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanIsSampled,
spanToJSON,
startIdleSpan,
+ TRACING_DEFAULTS,
} from '@sentry/core';
+import {
+ addHistoryInstrumentationHandler,
+ addPerformanceEntries,
+ registerInpInteractionListener,
+ startTrackingINP,
+ startTrackingInteractions,
+ startTrackingLongAnimationFrames,
+ startTrackingLongTasks,
+ startTrackingWebVitals,
+} from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
import { WINDOW } from '../helpers';
import { registerBackgroundTabDetection } from './backgroundtab';
-import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
import type { PreviousTraceInfo } from './previousTrace';
import {
addPreviousTraceSpanLink,
getPreviousTraceFromSessionStorage,
storePreviousTraceInSessionStorage,
} from './previousTrace';
+import { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './request';
export const BROWSER_TRACING_INTEGRATION_ID = 'BrowserTracing';
diff --git a/packages/browser/src/tracing/previousTrace.ts b/packages/browser/src/tracing/previousTrace.ts
index 91e52b519dad..6d53833d718d 100644
--- a/packages/browser/src/tracing/previousTrace.ts
+++ b/packages/browser/src/tracing/previousTrace.ts
@@ -1,7 +1,7 @@
import type { Span } from '@sentry/core';
-import { logger, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE, spanToJSON, type SpanContextData } from '@sentry/core';
-import { WINDOW } from '../exports';
+import { type SpanContextData, logger, SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE, spanToJSON } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
+import { WINDOW } from '../exports';
export interface PreviousTraceInfo {
/**
diff --git a/packages/browser/src/tracing/request.ts b/packages/browser/src/tracing/request.ts
index 0a8e42547341..4fb816d1319d 100644
--- a/packages/browser/src/tracing/request.ts
+++ b/packages/browser/src/tracing/request.ts
@@ -1,15 +1,5 @@
-import {
- SENTRY_XHR_DATA_KEY,
- addPerformanceInstrumentationHandler,
- addXhrInstrumentationHandler,
- extractNetworkProtocol,
-} from '@sentry-internal/browser-utils';
-import type { XhrHint } from '@sentry-internal/browser-utils';
import type { Client, HandlerDataXhr, SentryWrappedXMLHttpRequest, Span, WebFetchHeaders } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SentryNonRecordingSpan,
addFetchEndInstrumentationHandler,
addFetchInstrumentationHandler,
browserPerformanceTimeOrigin,
@@ -20,12 +10,22 @@ import {
hasSpansEnabled,
instrumentFetchRequest,
parseUrl,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SentryNonRecordingSpan,
setHttpStatus,
spanToJSON,
startInactiveSpan,
stringMatchesSomePattern,
stripUrlQueryAndFragment,
} from '@sentry/core';
+import type { XhrHint } from '@sentry-internal/browser-utils';
+import {
+ addPerformanceInstrumentationHandler,
+ addXhrInstrumentationHandler,
+ extractNetworkProtocol,
+ SENTRY_XHR_DATA_KEY,
+} from '@sentry-internal/browser-utils';
import { WINDOW } from '../helpers';
/** Options for Request Instrumentation */
diff --git a/packages/browser/src/transports/fetch.ts b/packages/browser/src/transports/fetch.ts
index 9a414a95e927..05ec0f2e211a 100644
--- a/packages/browser/src/transports/fetch.ts
+++ b/packages/browser/src/transports/fetch.ts
@@ -1,6 +1,6 @@
-import { clearCachedImplementation, getNativeImplementation } from '@sentry-internal/browser-utils';
import type { Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
import { createTransport, rejectedSyncPromise } from '@sentry/core';
+import { clearCachedImplementation, getNativeImplementation } from '@sentry-internal/browser-utils';
import type { WINDOW } from '../helpers';
import type { BrowserTransportOptions } from './types';
diff --git a/packages/browser/src/userfeedback.ts b/packages/browser/src/userfeedback.ts
index 57e42eaafb9a..bc6fd248b480 100644
--- a/packages/browser/src/userfeedback.ts
+++ b/packages/browser/src/userfeedback.ts
@@ -1,5 +1,5 @@
-import { createEnvelope, dsnToString } from '@sentry/core';
import type { DsnComponents, EventEnvelope, SdkMetadata, UserFeedback, UserFeedbackItem } from '@sentry/core';
+import { createEnvelope, dsnToString } from '@sentry/core';
/**
* Creates an envelope from a user feedback.
diff --git a/packages/browser/src/utils/featureFlags.ts b/packages/browser/src/utils/featureFlags.ts
index 9793eda49191..a71e7233fe75 100644
--- a/packages/browser/src/utils/featureFlags.ts
+++ b/packages/browser/src/utils/featureFlags.ts
@@ -1,5 +1,4 @@
import type { Event, FeatureFlag } from '@sentry/core';
-
import { getCurrentScope, logger } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
diff --git a/packages/browser/src/utils/lazyLoadIntegration.ts b/packages/browser/src/utils/lazyLoadIntegration.ts
index 5ffbd31adff5..569e902fde28 100644
--- a/packages/browser/src/utils/lazyLoadIntegration.ts
+++ b/packages/browser/src/utils/lazyLoadIntegration.ts
@@ -1,5 +1,5 @@
-import { SDK_VERSION, getClient } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { getClient, SDK_VERSION } from '@sentry/core';
import type { BrowserClient } from '../client';
import { WINDOW } from '../helpers';
diff --git a/packages/browser/test/client.test.ts b/packages/browser/test/client.test.ts
index 66d825eea892..a90f8cdbc388 100644
--- a/packages/browser/test/client.test.ts
+++ b/packages/browser/test/client.test.ts
@@ -2,8 +2,8 @@
* @vitest-environment jsdom
*/
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import * as sentryCore from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../src/client';
import { WINDOW } from '../src/helpers';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
diff --git a/packages/browser/test/eventbuilder.test.ts b/packages/browser/test/eventbuilder.test.ts
index f9949800ee94..ef360cb9caac 100644
--- a/packages/browser/test/eventbuilder.test.ts
+++ b/packages/browser/test/eventbuilder.test.ts
@@ -3,7 +3,6 @@
*/
import { afterEach, describe, expect, it, vi } from 'vitest';
-
import { defaultStackParser } from '../src';
import { eventFromMessage, eventFromUnknownInput, extractMessage, extractType } from '../src/eventbuilder';
diff --git a/packages/browser/test/helper/browser-client-options.ts b/packages/browser/test/helper/browser-client-options.ts
index 661e0a9d1c72..237f3cec0e05 100644
--- a/packages/browser/test/helper/browser-client-options.ts
+++ b/packages/browser/test/helper/browser-client-options.ts
@@ -1,6 +1,4 @@
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
-
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
import type { BrowserClientOptions } from '../../src/client';
export function getDefaultBrowserClientOptions(options: Partial = {}): BrowserClientOptions {
diff --git a/packages/browser/test/helpers.test.ts b/packages/browser/test/helpers.test.ts
index b4ead91d15ef..3031ceae19aa 100644
--- a/packages/browser/test/helpers.test.ts
+++ b/packages/browser/test/helpers.test.ts
@@ -1,7 +1,5 @@
-import { describe, expect, it, vi } from 'vitest';
-
import type { WrappedFunction } from '@sentry/core';
-
+import { describe, expect, it, vi } from 'vitest';
import { wrap } from '../src/helpers';
describe('internal wrap()', () => {
diff --git a/packages/browser/test/index.bundle.feedback.test.ts b/packages/browser/test/index.bundle.feedback.test.ts
index 47beaa33d07c..4e2e0d33797b 100644
--- a/packages/browser/test/index.bundle.feedback.test.ts
+++ b/packages/browser/test/index.bundle.feedback.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it } from 'vitest';
-
import { browserTracingIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
+import { describe, expect, it } from 'vitest';
import { feedbackAsyncIntegration } from '../src';
-
import * as FeedbackBundle from '../src/index.bundle.feedback';
describe('index.bundle.feedback', () => {
diff --git a/packages/browser/test/index.bundle.replay.test.ts b/packages/browser/test/index.bundle.replay.test.ts
index 7efbe9ffb5b8..dac5dab59a51 100644
--- a/packages/browser/test/index.bundle.replay.test.ts
+++ b/packages/browser/test/index.bundle.replay.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it } from 'vitest';
-
import { browserTracingIntegrationShim, feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { describe, expect, it } from 'vitest';
import { replayIntegration } from '../src';
-
import * as ReplayBundle from '../src/index.bundle.replay';
describe('index.bundle.replay', () => {
diff --git a/packages/browser/test/index.bundle.test.ts b/packages/browser/test/index.bundle.test.ts
index 4b4618e2f4eb..f2f0fdf0d9a9 100644
--- a/packages/browser/test/index.bundle.test.ts
+++ b/packages/browser/test/index.bundle.test.ts
@@ -1,11 +1,9 @@
-import { describe, expect, it } from 'vitest';
-
import {
browserTracingIntegrationShim,
feedbackIntegrationShim,
replayIntegrationShim,
} from '@sentry-internal/integration-shims';
-
+import { describe, expect, it } from 'vitest';
import * as Bundle from '../src/index.bundle';
describe('index.bundle', () => {
diff --git a/packages/browser/test/index.bundle.tracing.replay.feedback.test.ts b/packages/browser/test/index.bundle.tracing.replay.feedback.test.ts
index e5a454b532e9..a15770e2869f 100644
--- a/packages/browser/test/index.bundle.tracing.replay.feedback.test.ts
+++ b/packages/browser/test/index.bundle.tracing.replay.feedback.test.ts
@@ -1,7 +1,5 @@
import { describe, expect, it } from 'vitest';
-
import { browserTracingIntegration, feedbackAsyncIntegration, replayIntegration } from '../src';
-
import * as TracingReplayFeedbackBundle from '../src/index.bundle.tracing.replay.feedback';
describe('index.bundle.tracing.replay.feedback', () => {
diff --git a/packages/browser/test/index.bundle.tracing.replay.test.ts b/packages/browser/test/index.bundle.tracing.replay.test.ts
index fa81d1b19aae..151343ab2ab9 100644
--- a/packages/browser/test/index.bundle.tracing.replay.test.ts
+++ b/packages/browser/test/index.bundle.tracing.replay.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it } from 'vitest';
-
import { feedbackIntegrationShim } from '@sentry-internal/integration-shims';
+import { describe, expect, it } from 'vitest';
import { browserTracingIntegration, replayIntegration } from '../src';
-
import * as TracingReplayBundle from '../src/index.bundle.tracing.replay';
describe('index.bundle.tracing.replay', () => {
diff --git a/packages/browser/test/index.bundle.tracing.test.ts b/packages/browser/test/index.bundle.tracing.test.ts
index dc786fd31a61..5d020c2a2e6f 100644
--- a/packages/browser/test/index.bundle.tracing.test.ts
+++ b/packages/browser/test/index.bundle.tracing.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it } from 'vitest';
-
import { feedbackIntegrationShim, replayIntegrationShim } from '@sentry-internal/integration-shims';
+import { describe, expect, it } from 'vitest';
import { browserTracingIntegration } from '../src';
-
import * as TracingBundle from '../src/index.bundle.tracing';
describe('index.bundle.tracing', () => {
diff --git a/packages/browser/test/index.test.ts b/packages/browser/test/index.test.ts
index ad4d47b1bf04..9a30596832e4 100644
--- a/packages/browser/test/index.test.ts
+++ b/packages/browser/test/index.test.ts
@@ -2,25 +2,20 @@
* @vitest-environment jsdom
*/
-import type { Mock } from 'vitest';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
- SDK_VERSION,
eventFiltersIntegration,
getGlobalScope,
getIsolationScope,
getReportDialogEndpoint,
lastEventId,
+ SDK_VERSION,
} from '@sentry/core';
import * as utils from '@sentry/core';
-
-import { setCurrentClient } from '../src';
+import type { Mock } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
- BrowserClient,
- Scope,
- WINDOW,
addBreadcrumb,
+ BrowserClient,
captureEvent,
captureException,
captureMessage,
@@ -28,8 +23,11 @@ import {
getClient,
getCurrentScope,
init,
- showReportDialog,
logger,
+ Scope,
+ setCurrentClient,
+ showReportDialog,
+ WINDOW,
} from '../src';
import { getDefaultBrowserClientOptions } from './helper/browser-client-options';
import { makeSimpleTransport } from './mocks/simpletransport';
diff --git a/packages/browser/test/integrations/breadcrumbs.test.ts b/packages/browser/test/integrations/breadcrumbs.test.ts
index 770578ef77b5..56df65c3a6ae 100644
--- a/packages/browser/test/integrations/breadcrumbs.test.ts
+++ b/packages/browser/test/integrations/breadcrumbs.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it, vi } from 'vitest';
-
import * as SentryCore from '@sentry/core';
-
-import { BrowserClient, breadcrumbsIntegration, flush } from '../../src';
+import { describe, expect, it, vi } from 'vitest';
+import { breadcrumbsIntegration, BrowserClient, flush } from '../../src';
import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
describe('Breadcrumbs', () => {
diff --git a/packages/browser/test/integrations/contextlines.test.ts b/packages/browser/test/integrations/contextlines.test.ts
index 9e41659746f7..e34479cd644e 100644
--- a/packages/browser/test/integrations/contextlines.test.ts
+++ b/packages/browser/test/integrations/contextlines.test.ts
@@ -1,7 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
import type { StackFrame } from '@sentry/core';
-
+import { describe, expect, it } from 'vitest';
import { applySourceContextToFrame } from '../../src/integrations/contextlines';
const lines = ['line1', 'line2', 'line3', 'line4', 'line5', 'line6', 'line7', 'line8', 'line9'];
diff --git a/packages/browser/test/integrations/graphqlClient.test.ts b/packages/browser/test/integrations/graphqlClient.test.ts
index 144bcc808e1f..7a647b776e69 100644
--- a/packages/browser/test/integrations/graphqlClient.test.ts
+++ b/packages/browser/test/integrations/graphqlClient.test.ts
@@ -2,10 +2,9 @@
* @vitest-environment jsdom
*/
-import { describe, expect, test } from 'vitest';
-
-import { SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils';
import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
+import { SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils';
+import { describe, expect, test } from 'vitest';
import {
getGraphQLRequestPayload,
getRequestPayloadXhrOrFetch,
diff --git a/packages/browser/test/integrations/reportingobserver.test.ts b/packages/browser/test/integrations/reportingobserver.test.ts
index a9ceff983049..4376977a1b1a 100644
--- a/packages/browser/test/integrations/reportingobserver.test.ts
+++ b/packages/browser/test/integrations/reportingobserver.test.ts
@@ -1,8 +1,6 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import * as SentryCore from '@sentry/core';
import type { Client } from '@sentry/core';
-
+import * as SentryCore from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { reportingObserverIntegration } from '../../src/integrations/reportingobserver';
const mockScope = {
diff --git a/packages/browser/test/log.test.ts b/packages/browser/test/log.test.ts
index d9bf63ce5fce..68c87069966c 100644
--- a/packages/browser/test/log.test.ts
+++ b/packages/browser/test/log.test.ts
@@ -2,11 +2,9 @@
* @vitest-environment jsdom
*/
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import * as sentryCore from '@sentry/core';
-import { getGlobalScope, getCurrentScope, getIsolationScope } from '@sentry/core';
-
+import { getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { init, logger } from '../src';
import { makeSimpleTransport } from './mocks/simpletransport';
diff --git a/packages/browser/test/mocks/simpletransport.ts b/packages/browser/test/mocks/simpletransport.ts
index 1193e217cb38..515b0f9c0865 100644
--- a/packages/browser/test/mocks/simpletransport.ts
+++ b/packages/browser/test/mocks/simpletransport.ts
@@ -1,5 +1,4 @@
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
export function makeSimpleTransport() {
return createTransport({ recordDroppedEvent: () => undefined }, () => resolvedSyncPromise({}));
diff --git a/packages/browser/test/profiling/integration.test.ts b/packages/browser/test/profiling/integration.test.ts
index 2f653563fc1a..baf0b5f64d14 100644
--- a/packages/browser/test/profiling/integration.test.ts
+++ b/packages/browser/test/profiling/integration.test.ts
@@ -2,11 +2,9 @@
* @vitest-environment jsdom
*/
-import { describe, expect, it, vi } from 'vitest';
-
import type { BrowserClient } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
-
+import { describe, expect, it, vi } from 'vitest';
import type { JSSelfProfile } from '../../src/profiling/jsSelfProfiling';
describe('BrowserProfilingIntegration', () => {
diff --git a/packages/browser/test/profiling/utils.test.ts b/packages/browser/test/profiling/utils.test.ts
index 27e81c3208dc..3ba4232e8cee 100644
--- a/packages/browser/test/profiling/utils.test.ts
+++ b/packages/browser/test/profiling/utils.test.ts
@@ -2,18 +2,16 @@
* @vitest-environment jsdom
*/
+import { JSDOM } from 'jsdom';
+import { TextDecoder, TextEncoder } from 'util';
import { afterAll, afterEach, beforeEach, describe, expect, it } from 'vitest';
+import type { JSSelfProfile } from '../../src/profiling/jsSelfProfiling';
+import { convertJSSelfProfileToSampledFormat } from '../../src/profiling/utils';
-import { TextDecoder, TextEncoder } from 'util';
const patchedEncoder = (!global.window.TextEncoder && (global.window.TextEncoder = TextEncoder)) || true;
// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
const patchedDecoder = (!global.window.TextDecoder && (global.window.TextDecoder = TextDecoder)) || true;
-import { JSDOM } from 'jsdom';
-
-import type { JSSelfProfile } from '../../src/profiling/jsSelfProfiling';
-import { convertJSSelfProfileToSampledFormat } from '../../src/profiling/utils';
-
const makeJSProfile = (partial: Partial = {}): JSSelfProfile => {
return {
resources: [],
diff --git a/packages/browser/test/sdk.test.ts b/packages/browser/test/sdk.test.ts
index 6f8bdc66f450..4761a41228fe 100644
--- a/packages/browser/test/sdk.test.ts
+++ b/packages/browser/test/sdk.test.ts
@@ -3,14 +3,11 @@
*/
/* eslint-disable @typescript-eslint/unbound-method */
-import type { Mock } from 'vitest';
-import { afterEach, beforeEach, describe, expect, it, vi, afterAll, test } from 'vitest';
-
-import * as SentryCore from '@sentry/core';
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
import type { Integration } from '@sentry/core';
-
+import * as SentryCore from '@sentry/core';
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
+import type { Mock } from 'vitest';
+import { afterAll, afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
import type { BrowserOptions } from '../src';
import { WINDOW } from '../src';
import { applyDefaultOptions, getDefaultIntegrations, init } from '../src/sdk';
diff --git a/packages/browser/test/tracekit/chromium.test.ts b/packages/browser/test/tracekit/chromium.test.ts
index 2a6589c32151..998f67e829e6 100644
--- a/packages/browser/test/tracekit/chromium.test.ts
+++ b/packages/browser/test/tracekit/chromium.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/firefox.test.ts b/packages/browser/test/tracekit/firefox.test.ts
index 4a0d3d90e7dc..d4db33bcbc4f 100644
--- a/packages/browser/test/tracekit/firefox.test.ts
+++ b/packages/browser/test/tracekit/firefox.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/ie.test.ts b/packages/browser/test/tracekit/ie.test.ts
index 97659959252f..7bf463d39f33 100644
--- a/packages/browser/test/tracekit/ie.test.ts
+++ b/packages/browser/test/tracekit/ie.test.ts
@@ -1,6 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
import { createStackParser } from '@sentry/core';
+import { describe, expect, it } from 'vitest';
import { exceptionFromError } from '../../src/eventbuilder';
import { chromeStackLineParser, geckoStackLineParser, winjsStackLineParser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/misc.test.ts b/packages/browser/test/tracekit/misc.test.ts
index 7e501b8abeef..917b1d6f0887 100644
--- a/packages/browser/test/tracekit/misc.test.ts
+++ b/packages/browser/test/tracekit/misc.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/opera.test.ts b/packages/browser/test/tracekit/opera.test.ts
index 8de84f0dcb01..d109fb39ac9c 100644
--- a/packages/browser/test/tracekit/opera.test.ts
+++ b/packages/browser/test/tracekit/opera.test.ts
@@ -1,7 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
import { createStackParser } from '@sentry/core';
-
+import { describe, expect, it } from 'vitest';
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser, opera10StackLineParser, opera11StackLineParser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/react-native.test.ts b/packages/browser/test/tracekit/react-native.test.ts
index c69703fe0c34..462c86e41689 100644
--- a/packages/browser/test/tracekit/react-native.test.ts
+++ b/packages/browser/test/tracekit/react-native.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/react.test.ts b/packages/browser/test/tracekit/react.test.ts
index dd737b798d03..20a7d2185089 100644
--- a/packages/browser/test/tracekit/react.test.ts
+++ b/packages/browser/test/tracekit/react.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracekit/safari.test.ts b/packages/browser/test/tracekit/safari.test.ts
index ca94df924910..62eafa35ef1f 100644
--- a/packages/browser/test/tracekit/safari.test.ts
+++ b/packages/browser/test/tracekit/safari.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { exceptionFromError } from '../../src/eventbuilder';
import { defaultStackParser as parser } from '../../src/stack-parsers';
diff --git a/packages/browser/test/tracing/backgroundtab.test.ts b/packages/browser/test/tracing/backgroundtab.test.ts
index c939da8b4d03..8d76e895848f 100644
--- a/packages/browser/test/tracing/backgroundtab.test.ts
+++ b/packages/browser/test/tracing/backgroundtab.test.ts
@@ -2,22 +2,18 @@
* @vitest-environment jsdom
*/
+import { getCurrentScope, setCurrentClient } from '@sentry/core';
+import { JSDOM } from 'jsdom';
+import { TextDecoder, TextEncoder } from 'util';
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { BrowserClient } from '../../src/client';
+import { registerBackgroundTabDetection } from '../../src/tracing/backgroundtab';
+import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
-import { getCurrentScope } from '@sentry/core';
-import { setCurrentClient } from '@sentry/core';
-
-import { TextDecoder, TextEncoder } from 'util';
const patchedEncoder = (!global.window.TextEncoder && (global.window.TextEncoder = TextEncoder)) || true;
// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
const patchedDecoder = (!global.window.TextDecoder && (global.window.TextDecoder = TextDecoder)) || true;
-import { JSDOM } from 'jsdom';
-
-import { BrowserClient } from '../../src/client';
-import { registerBackgroundTabDetection } from '../../src/tracing/backgroundtab';
-import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
-
describe('registerBackgroundTabDetection', () => {
afterAll(() => {
// @ts-expect-error patch the encoder on the window, else importing JSDOM fails
diff --git a/packages/browser/test/tracing/browserTracingIntegration.test.ts b/packages/browser/test/tracing/browserTracingIntegration.test.ts
index 6fd155b36e35..7d6c308a3ca5 100644
--- a/packages/browser/test/tracing/browserTracingIntegration.test.ts
+++ b/packages/browser/test/tracing/browserTracingIntegration.test.ts
@@ -2,36 +2,25 @@
* @vitest-environment jsdom
*/
-import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { TextDecoder, TextEncoder } from 'util';
-const oldTextEncoder = global.window.TextEncoder;
-const oldTextDecoder = global.window.TextDecoder;
-// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
-delete global.window.TextEncoder;
-// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
-delete global.window.TextDecoder;
-global.window.TextEncoder = TextEncoder;
-// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
-global.window.TextDecoder = TextDecoder;
-
+import type { Span, StartSpanOptions } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- TRACING_DEFAULTS,
getActiveSpan,
getCurrentScope,
getDynamicSamplingContextFromSpan,
getIsolationScope,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCurrentClient,
spanIsSampled,
spanToJSON,
startInactiveSpan,
+ TRACING_DEFAULTS,
} from '@sentry/core';
-import type { Span, StartSpanOptions } from '@sentry/core';
import { JSDOM } from 'jsdom';
+import { TextDecoder, TextEncoder } from 'util';
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../../src/client';
import { WINDOW } from '../../src/helpers';
import {
@@ -39,8 +28,18 @@ import {
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
} from '../../src/tracing/browserTracingIntegration';
-import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
import { PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE } from '../../src/tracing/previousTrace';
+import { getDefaultBrowserClientOptions } from '../helper/browser-client-options';
+
+const oldTextEncoder = global.window.TextEncoder;
+const oldTextDecoder = global.window.TextDecoder;
+// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
+delete global.window.TextEncoder;
+// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
+delete global.window.TextDecoder;
+global.window.TextEncoder = TextEncoder;
+// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
+global.window.TextDecoder = TextDecoder;
// We're setting up JSDom here because the Next.js routing instrumentations requires a few things to be present on pageload:
// 1. Access to window.document API for `window.document.getElementById`
diff --git a/packages/browser/test/tracing/previousTrace.test.ts b/packages/browser/test/tracing/previousTrace.test.ts
index e3e3e3cc597e..f11e2f0d67e5 100644
--- a/packages/browser/test/tracing/previousTrace.test.ts
+++ b/packages/browser/test/tracing/previousTrace.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { SentrySpan, spanToJSON, timestampInSeconds } from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { PreviousTraceInfo } from '../../src/tracing/previousTrace';
import {
addPreviousTraceSpanLink,
@@ -6,9 +7,8 @@ import {
PREVIOUS_TRACE_KEY,
PREVIOUS_TRACE_MAX_DURATION,
PREVIOUS_TRACE_TMP_SPAN_ATTRIBUTE,
+ storePreviousTraceInSessionStorage,
} from '../../src/tracing/previousTrace';
-import { SentrySpan, spanToJSON, timestampInSeconds } from '@sentry/core';
-import { storePreviousTraceInSessionStorage } from '../../src/tracing/previousTrace';
describe('addPreviousTraceSpanLink', () => {
it(`adds a previous_trace span link to startSpanOptions if the previous trace was created within ${PREVIOUS_TRACE_MAX_DURATION}s`, () => {
diff --git a/packages/browser/test/tracing/request.test.ts b/packages/browser/test/tracing/request.test.ts
index 717452a4dff0..d2e7f03f9287 100644
--- a/packages/browser/test/tracing/request.test.ts
+++ b/packages/browser/test/tracing/request.test.ts
@@ -1,10 +1,8 @@
-import type { MockInstance } from 'vitest';
-import { beforeAll, beforeEach, describe, expect, it, vi, afterEach } from 'vitest';
-
-import * as browserUtils from '@sentry-internal/browser-utils';
-import * as utils from '@sentry/core';
import type { Client } from '@sentry/core';
-
+import * as utils from '@sentry/core';
+import * as browserUtils from '@sentry-internal/browser-utils';
+import type { MockInstance } from 'vitest';
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { instrumentOutgoingRequests, shouldAttachHeaders } from '../../src/tracing/request';
beforeAll(() => {
diff --git a/packages/browser/test/transports/fetch.test.ts b/packages/browser/test/transports/fetch.test.ts
index 89ba25fd5fd8..cf8f8810531f 100644
--- a/packages/browser/test/transports/fetch.test.ts
+++ b/packages/browser/test/transports/fetch.test.ts
@@ -1,9 +1,7 @@
+import type { EventEnvelope, EventItem } from '@sentry/core';
+import { createEnvelope, serializeEnvelope } from '@sentry/core';
import type { Mock } from 'vitest';
import { describe, expect, it, vi } from 'vitest';
-
-import { createEnvelope, serializeEnvelope } from '@sentry/core';
-import type { EventEnvelope, EventItem } from '@sentry/core';
-
import { makeFetchTransport } from '../../src/transports/fetch';
import type { BrowserTransportOptions } from '../../src/transports/types';
diff --git a/packages/browser/test/transports/offline.test.ts b/packages/browser/test/transports/offline.test.ts
index 7b1cd5ebf6dd..993d4977ac21 100644
--- a/packages/browser/test/transports/offline.test.ts
+++ b/packages/browser/test/transports/offline.test.ts
@@ -1,17 +1,13 @@
-import { describe, expect, it, beforeAll } from 'vitest';
-
import 'fake-indexeddb/auto';
-
-import { TextDecoder, TextEncoder } from 'util';
-import { createTransport } from '@sentry/core';
-import { createEnvelope } from '@sentry/core';
import type {
EventEnvelope,
EventItem,
InternalBaseTransportOptions,
TransportMakeRequestResponse,
} from '@sentry/core';
-
+import { createEnvelope, createTransport } from '@sentry/core';
+import { TextDecoder, TextEncoder } from 'util';
+import { beforeAll, describe, expect, it } from 'vitest';
import { createStore, makeBrowserOfflineTransport, push, shift, unshift } from '../../src/transports/offline';
const MIN_DELAY = 100;
diff --git a/packages/browser/test/userfeedback.test.ts b/packages/browser/test/userfeedback.test.ts
index 93a8de33690b..e8d382a17c83 100644
--- a/packages/browser/test/userfeedback.test.ts
+++ b/packages/browser/test/userfeedback.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, test } from 'vitest';
-
import { createUserFeedbackEnvelope } from '../src/userfeedback';
describe('userFeedback', () => {
diff --git a/packages/browser/test/utils/featureFlags.test.ts b/packages/browser/test/utils/featureFlags.test.ts
index 39681a6dfe1f..1c0bed312590 100644
--- a/packages/browser/test/utils/featureFlags.test.ts
+++ b/packages/browser/test/utils/featureFlags.test.ts
@@ -1,7 +1,6 @@
import type { FeatureFlag } from '@sentry/core';
-
import { getCurrentScope, logger } from '@sentry/core';
-import { vi, describe, it, afterEach, expect } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { insertFlagToScope, insertToFlagBuffer } from '../../src/utils/featureFlags';
describe('flags', () => {
diff --git a/packages/browser/test/utils/lazyLoadIntegration.test.ts b/packages/browser/test/utils/lazyLoadIntegration.test.ts
index 82548a59faec..04afb3bfff46 100644
--- a/packages/browser/test/utils/lazyLoadIntegration.test.ts
+++ b/packages/browser/test/utils/lazyLoadIntegration.test.ts
@@ -2,17 +2,16 @@
* @vitest-environment jsdom
*/
-import { afterAll, afterEach, beforeEach, describe, expect, test } from 'vitest';
-
+import { JSDOM } from 'jsdom';
import { TextDecoder, TextEncoder } from 'util';
-import { SDK_VERSION, lazyLoadIntegration } from '../../src';
+import { afterAll, afterEach, beforeEach, describe, expect, test } from 'vitest';
+import { lazyLoadIntegration, SDK_VERSION } from '../../src';
import * as Sentry from '../../src';
+
const patchedEncoder = (!global.window.TextEncoder && (global.window.TextEncoder = TextEncoder)) || true;
// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
const patchedDecoder = (!global.window.TextDecoder && (global.window.TextDecoder = TextDecoder)) || true;
-import { JSDOM } from 'jsdom';
-
const globalDocument = global.document;
const globalWindow = global.window;
const globalLocation = global.location;
diff --git a/packages/browser/vite.config.ts b/packages/browser/vite.config.ts
index a5523c61f601..841ff483d7c4 100644
--- a/packages/browser/vite.config.ts
+++ b/packages/browser/vite.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/bun/src/client.ts b/packages/bun/src/client.ts
index a96e0c04e264..fceef3e472bc 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 { ServerRuntimeClient, applySdkMetadata } from '@sentry/core';
-
+import { applySdkMetadata, ServerRuntimeClient } from '@sentry/core';
+import * as os from 'os';
import type { BunClientOptions } from './types';
/**
diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts
index 89a86d827ea0..c31aa0e84ebc 100644
--- a/packages/bun/src/integrations/bunserver.ts
+++ b/packages/bun/src/integrations/bunserver.ts
@@ -1,18 +1,18 @@
-import type { ServeOptions } from 'bun';
import type { IntegrationFn, RequestEventData, SpanAttributes } from '@sentry/core';
import {
+ captureException,
+ continueTrace,
+ defineIntegration,
+ isURLObjectRelative,
+ parseStringToURLObject,
SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- captureException,
- isURLObjectRelative,
setHttpStatus,
- defineIntegration,
- continueTrace,
startSpan,
withIsolationScope,
- parseStringToURLObject,
} from '@sentry/core';
+import type { ServeOptions } from 'bun';
const INTEGRATION_NAME = 'BunServer';
diff --git a/packages/bun/src/sdk.ts b/packages/bun/src/sdk.ts
index 734f331c25d8..641567504818 100644
--- a/packages/bun/src/sdk.ts
+++ b/packages/bun/src/sdk.ts
@@ -1,4 +1,5 @@
import * as os from 'node:os';
+import type { Integration, Options } from '@sentry/core';
import {
applySdkMetadata,
functionToStringIntegration,
@@ -7,7 +8,6 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
} from '@sentry/core';
-import type { Integration, Options } from '@sentry/core';
import type { NodeClient } from '@sentry/node';
import {
consoleIntegration,
@@ -21,7 +21,6 @@ import {
onUncaughtExceptionIntegration,
onUnhandledRejectionIntegration,
} from '@sentry/node';
-
import { bunServerIntegration } from './integrations/bunserver';
import { makeFetchTransport } from './transports';
import type { BunOptions } from './types';
diff --git a/packages/bun/src/types.ts b/packages/bun/src/types.ts
index 6cc08edd495d..45b15f80e517 100644
--- a/packages/bun/src/types.ts
+++ b/packages/bun/src/types.ts
@@ -1,5 +1,4 @@
import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
-
import type { BunTransportOptions } from './transports';
export interface BaseBunOptions {
diff --git a/packages/bun/test/helpers.ts b/packages/bun/test/helpers.ts
index a8286378761f..017dd054cffd 100644
--- a/packages/bun/test/helpers.ts
+++ b/packages/bun/test/helpers.ts
@@ -1,6 +1,4 @@
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
-
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
import type { BunClientOptions } from '../src/types';
export function getDefaultBunClientOptions(options: Partial = {}): BunClientOptions {
diff --git a/packages/bun/test/init.test.ts b/packages/bun/test/init.test.ts
index 45b146cf8ef4..4b2ddd452713 100644
--- a/packages/bun/test/init.test.ts
+++ b/packages/bun/test/init.test.ts
@@ -1,7 +1,7 @@
import { type Integration } from '@sentry/core';
import * as sentryNode from '@sentry/node';
import type { Mock } from 'bun:test';
-import { afterEach, beforeEach, describe, it, spyOn, mock, expect } from 'bun:test';
+import { afterEach, beforeEach, describe, expect, it, mock, spyOn } from 'bun:test';
import { getClient, init } from '../src';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/bun/test/integrations/bunserver.test.ts b/packages/bun/test/integrations/bunserver.test.ts
index 29e8241917ba..77ac2440915b 100644
--- a/packages/bun/test/integrations/bunserver.test.ts
+++ b/packages/bun/test/integrations/bunserver.test.ts
@@ -1,6 +1,5 @@
-import { afterEach, beforeEach, beforeAll, describe, expect, test, spyOn } from 'bun:test';
import * as SentryCore from '@sentry/core';
-
+import { afterEach, beforeAll, beforeEach, describe, expect, spyOn, test } from 'bun:test';
import { instrumentBunServe } from '../../src/integrations/bunserver';
describe('Bun Serve Integration', () => {
diff --git a/packages/bun/test/sdk.test.ts b/packages/bun/test/sdk.test.ts
index c4f55ddbb3bb..fa2abd64e17f 100644
--- a/packages/bun/test/sdk.test.ts
+++ b/packages/bun/test/sdk.test.ts
@@ -1,6 +1,5 @@
-import { describe, expect, test } from 'bun:test';
-
import type { BaseTransportOptions, Envelope, Event, Transport, TransportMakeRequestResponse } from '@sentry/core';
+import { describe, expect, test } from 'bun:test';
import type { NodeClient } from '../src/index';
import { init } from '../src/index';
diff --git a/packages/cloudflare/src/async.ts b/packages/cloudflare/src/async.ts
index d76cdbc4c698..cd20a8d083de 100644
--- a/packages/cloudflare/src/async.ts
+++ b/packages/cloudflare/src/async.ts
@@ -1,9 +1,8 @@
-import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';
-import type { Scope } from '@sentry/core';
-
// Need to use node: prefix for cloudflare workers compatibility
// Note: Because we are using node:async_hooks, we need to set `node_compat` in the wrangler.toml
import { AsyncLocalStorage } from 'node:async_hooks';
+import type { Scope } from '@sentry/core';
+import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';
/**
* Sets the async context strategy to use AsyncLocalStorage.
diff --git a/packages/cloudflare/src/client.ts b/packages/cloudflare/src/client.ts
index dd8a0cccdec8..224865e3731e 100644
--- a/packages/cloudflare/src/client.ts
+++ b/packages/cloudflare/src/client.ts
@@ -1,5 +1,5 @@
import type { ClientOptions, Options, ServerRuntimeClientOptions } from '@sentry/core';
-import { ServerRuntimeClient, applySdkMetadata } from '@sentry/core';
+import { applySdkMetadata, ServerRuntimeClient } from '@sentry/core';
import type { CloudflareTransportOptions } from './transport';
/**
diff --git a/packages/cloudflare/src/d1.ts b/packages/cloudflare/src/d1.ts
index 7dc5e8c60f4c..ff81986dc3aa 100644
--- a/packages/cloudflare/src/d1.ts
+++ b/packages/cloudflare/src/d1.ts
@@ -1,6 +1,6 @@
import type { D1Database, D1PreparedStatement, D1Response } from '@cloudflare/workers-types';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, addBreadcrumb, startSpan } from '@sentry/core';
import type { Span, SpanAttributes, StartSpanOptions } from '@sentry/core';
+import { addBreadcrumb, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, startSpan } from '@sentry/core';
// Patching is based on internal Cloudflare D1 API
// https://github.com/cloudflare/workerd/blob/cd5279e7b305003f1d9c851e73efa9d67e4b68b2/src/cloudflare/internal/d1-api.ts
diff --git a/packages/cloudflare/src/handler.ts b/packages/cloudflare/src/handler.ts
index 06cb13bb8b05..2fa42afbbb79 100644
--- a/packages/cloudflare/src/handler.ts
+++ b/packages/cloudflare/src/handler.ts
@@ -4,10 +4,10 @@ import type {
ExportedHandlerScheduledHandler,
} from '@cloudflare/workers-types';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
flush,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startSpan,
withIsolationScope,
} from '@sentry/core';
diff --git a/packages/cloudflare/src/integrations/fetch.ts b/packages/cloudflare/src/integrations/fetch.ts
index fa1a85a7b868..7f15a7fc1759 100644
--- a/packages/cloudflare/src/integrations/fetch.ts
+++ b/packages/cloudflare/src/integrations/fetch.ts
@@ -7,7 +7,6 @@ import type {
Span,
} from '@sentry/core';
import {
- LRUMap,
addBreadcrumb,
addFetchInstrumentationHandler,
defineIntegration,
@@ -15,6 +14,7 @@ import {
getClient,
instrumentFetchRequest,
isSentryRequestUrl,
+ LRUMap,
stringMatchesSomePattern,
} from '@sentry/core';
diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts
index 979b426ef5dc..b36eaecdc232 100644
--- a/packages/cloudflare/src/request.ts
+++ b/packages/cloudflare/src/request.ts
@@ -1,14 +1,14 @@
import type { ExecutionContext, IncomingRequestCfProperties } from '@cloudflare/workers-types';
import type { SpanAttributes } from '@sentry/core';
import {
+ captureException,
+ continueTrace,
+ flush,
SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
SEMANTIC_ATTRIBUTE_URL_FULL,
- captureException,
- continueTrace,
- flush,
setHttpStatus,
startSpan,
stripUrlQueryAndFragment,
diff --git a/packages/cloudflare/src/scope-utils.ts b/packages/cloudflare/src/scope-utils.ts
index 018cb0a27c6b..9a3f7d286dfc 100644
--- a/packages/cloudflare/src/scope-utils.ts
+++ b/packages/cloudflare/src/scope-utils.ts
@@ -1,7 +1,6 @@
import type { IncomingRequestCfProperties } from '@cloudflare/workers-types';
-
-import { winterCGRequestToRequestData } from '@sentry/core';
import type { Scope } from '@sentry/core';
+import { winterCGRequestToRequestData } from '@sentry/core';
/**
* Set cloud resource context on scope.
diff --git a/packages/cloudflare/src/sdk.ts b/packages/cloudflare/src/sdk.ts
index 96e5fcc643a9..e8afb8d052cd 100644
--- a/packages/cloudflare/src/sdk.ts
+++ b/packages/cloudflare/src/sdk.ts
@@ -1,5 +1,6 @@
import type { Integration } from '@sentry/core';
import {
+ consoleIntegration,
dedupeIntegration,
functionToStringIntegration,
getIntegrationsToSetup,
@@ -8,7 +9,6 @@ import {
linkedErrorsIntegration,
requestDataIntegration,
stackParserFromStackParserOptions,
- consoleIntegration,
} from '@sentry/core';
import type { CloudflareClientOptions, CloudflareOptions } from './client';
import { CloudflareClient } from './client';
diff --git a/packages/cloudflare/src/transport.ts b/packages/cloudflare/src/transport.ts
index 108a0e915656..2ac401505fbb 100644
--- a/packages/cloudflare/src/transport.ts
+++ b/packages/cloudflare/src/transport.ts
@@ -1,5 +1,5 @@
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
-import { SENTRY_BUFFER_FULL_ERROR, createTransport, suppressTracing } from '@sentry/core';
+import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';
export interface CloudflareTransportOptions extends BaseTransportOptions {
/** Fetch API init parameters. */
diff --git a/packages/cloudflare/src/vendor/stacktrace.ts b/packages/cloudflare/src/vendor/stacktrace.ts
index 62e16bcea835..64a82a77ee32 100644
--- a/packages/cloudflare/src/vendor/stacktrace.ts
+++ b/packages/cloudflare/src/vendor/stacktrace.ts
@@ -21,8 +21,8 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
-import { basename, createStackParser, nodeStackLineParser } from '@sentry/core';
import type { StackLineParser, StackLineParserFn, StackParser } from '@sentry/core';
+import { basename, createStackParser, nodeStackLineParser } from '@sentry/core';
type GetModuleFn = (filename: string | undefined) => string | undefined;
diff --git a/packages/cloudflare/test/async.test.ts b/packages/cloudflare/test/async.test.ts
index 23ae7637dd19..d4c27e380023 100644
--- a/packages/cloudflare/test/async.test.ts
+++ b/packages/cloudflare/test/async.test.ts
@@ -1,5 +1,12 @@
-import { Scope, getCurrentScope, getGlobalScope, getIsolationScope, withIsolationScope, withScope } from '@sentry/core';
-import { GLOBAL_OBJ } from '@sentry/core';
+import {
+ getCurrentScope,
+ getGlobalScope,
+ getIsolationScope,
+ GLOBAL_OBJ,
+ Scope,
+ withIsolationScope,
+ withScope,
+} from '@sentry/core';
import { AsyncLocalStorage } from 'async_hooks';
import { beforeEach, describe, expect, it } from 'vitest';
import { setAsyncLocalStorageAsyncContextStrategy } from '../src/async';
diff --git a/packages/cloudflare/test/d1.test.ts b/packages/cloudflare/test/d1.test.ts
index c86538b96208..bc1ecc105052 100644
--- a/packages/cloudflare/test/d1.test.ts
+++ b/packages/cloudflare/test/d1.test.ts
@@ -1,9 +1,6 @@
-import { beforeEach, describe, expect, test, vi } from 'vitest';
-
-import * as SentryCore from '@sentry/core';
-
import type { D1Database, D1PreparedStatement } from '@cloudflare/workers-types';
-
+import * as SentryCore from '@sentry/core';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
import { instrumentD1WithSentry } from '../src/d1';
const MOCK_FIRST_RETURN_VALUE = { id: 1, name: 'Foo' };
diff --git a/packages/cloudflare/test/handler.test.ts b/packages/cloudflare/test/handler.test.ts
index aa5cd6b24992..4d9f1c1d7903 100644
--- a/packages/cloudflare/test/handler.test.ts
+++ b/packages/cloudflare/test/handler.test.ts
@@ -1,11 +1,10 @@
// Note: These tests run the handler in Node.js, which has some differences to the cloudflare workers runtime.
// Although this is not ideal, this is the best we can do until we have a better way to test cloudflare workers.
-import { beforeEach, describe, expect, test, vi } from 'vitest';
-
import type { ScheduledController } from '@cloudflare/workers-types';
-import * as SentryCore from '@sentry/core';
import type { Event } from '@sentry/core';
+import * as SentryCore from '@sentry/core';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
import { CloudflareClient } from '../src/client';
import { withSentry } from '../src/handler';
diff --git a/packages/cloudflare/test/integrations/fetch.test.ts b/packages/cloudflare/test/integrations/fetch.test.ts
index b0d301de3519..795b3e8c931c 100644
--- a/packages/cloudflare/test/integrations/fetch.test.ts
+++ b/packages/cloudflare/test/integrations/fetch.test.ts
@@ -1,10 +1,8 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
+import type { HandlerDataFetch, Integration } from '@sentry/core';
import * as sentryCore from '@sentry/core';
import * as sentryUtils from '@sentry/core';
import { createStackParser } from '@sentry/core';
-import type { HandlerDataFetch, Integration } from '@sentry/core';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { CloudflareClient } from '../../src/client';
import { fetchIntegration } from '../../src/integrations/fetch';
diff --git a/packages/cloudflare/test/pages-plugin.test.ts b/packages/cloudflare/test/pages-plugin.test.ts
index b1781dc397af..5cfbd1f4bb5e 100644
--- a/packages/cloudflare/test/pages-plugin.test.ts
+++ b/packages/cloudflare/test/pages-plugin.test.ts
@@ -3,7 +3,6 @@
import { beforeEach, describe, expect, test, vi } from 'vitest';
import type { CloudflareOptions } from '../src/client';
-
import { sentryPagesPlugin } from '../src/pages-plugin';
const MOCK_OPTIONS: CloudflareOptions = {
diff --git a/packages/cloudflare/test/request.test.ts b/packages/cloudflare/test/request.test.ts
index 90268c18aa22..a778b60befeb 100644
--- a/packages/cloudflare/test/request.test.ts
+++ b/packages/cloudflare/test/request.test.ts
@@ -1,10 +1,9 @@
// Note: These tests run the handler in Node.js, which has some differences to the cloudflare workers runtime.
// Although this is not ideal, this is the best we can do until we have a better way to test cloudflare workers.
-import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
-
-import * as SentryCore from '@sentry/core';
import type { Event } from '@sentry/core';
+import * as SentryCore from '@sentry/core';
+import { beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
import { setAsyncLocalStorageAsyncContextStrategy } from '../src/async';
import type { CloudflareOptions } from '../src/client';
import { CloudflareClient } from '../src/client';
diff --git a/packages/cloudflare/test/sdk.test.ts b/packages/cloudflare/test/sdk.test.ts
index 5be45e2a47f2..5c876812b035 100644
--- a/packages/cloudflare/test/sdk.test.ts
+++ b/packages/cloudflare/test/sdk.test.ts
@@ -1,6 +1,5 @@
-import { describe, expect, test, vi } from 'vitest';
-
import * as SentryCore from '@sentry/core';
+import { describe, expect, test, vi } from 'vitest';
import { CloudflareClient } from '../src/client';
import { init } from '../src/sdk';
diff --git a/packages/cloudflare/test/transport.test.ts b/packages/cloudflare/test/transport.test.ts
index d02ef18079be..5de33cc7cb80 100644
--- a/packages/cloudflare/test/transport.test.ts
+++ b/packages/cloudflare/test/transport.test.ts
@@ -1,7 +1,6 @@
-import { SENTRY_BUFFER_FULL_ERROR, createEnvelope, serializeEnvelope } from '@sentry/core';
import type { EventEnvelope, EventItem } from '@sentry/core';
+import { createEnvelope, SENTRY_BUFFER_FULL_ERROR, serializeEnvelope } from '@sentry/core';
import { afterAll, describe, expect, it, vi } from 'vitest';
-
import type { CloudflareTransportOptions } from '../src/transport';
import { IsolatedPromiseBuffer, makeCloudflareTransport } from '../src/transport';
diff --git a/packages/core/src/checkin.ts b/packages/core/src/checkin.ts
index 53dc95b81ae8..424dfb2badda 100644
--- a/packages/core/src/checkin.ts
+++ b/packages/core/src/checkin.ts
@@ -1,7 +1,7 @@
-import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types-hoist/envelope';
+import type { SerializedCheckIn } from './types-hoist/checkin';
import type { DsnComponents } from './types-hoist/dsn';
+import type { CheckInEnvelope, CheckInItem, DynamicSamplingContext } from './types-hoist/envelope';
import type { SdkMetadata } from './types-hoist/sdkmetadata';
-import type { SerializedCheckIn } from './types-hoist/checkin';
import { dsnToString } from './utils-hoist/dsn';
import { createEnvelope } from './utils-hoist/envelope';
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 3558731f5636..46854c7992bd 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -1,9 +1,22 @@
/* eslint-disable max-lines */
+import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
+import { DEFAULT_ENVIRONMENT } from './constants';
+import { getCurrentScope, getIsolationScope, getTraceContextFromScope } from './currentScopes';
+import { DEBUG_BUILD } from './debug-build';
+import { createEventEnvelope, createSessionEnvelope } from './envelope';
+import type { IntegrationIndex } from './integration';
+import { afterSetupIntegrations, setupIntegration, setupIntegrations } from './integration';
+import type { Scope } from './scope';
+import { updateSession } from './session';
+import {
+ getDynamicSamplingContextFromScope,
+ getDynamicSamplingContextFromSpan,
+} from './tracing/dynamicSamplingContext';
import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types-hoist/breadcrumb';
import type { CheckIn, MonitorConfig } from './types-hoist/checkin';
-import type { ClientOptions } from './types-hoist/options';
-import type { DataCategory } from './types-hoist/datacategory';
import type { EventDropReason, Outcome } from './types-hoist/clientreport';
+import type { TraceContext } from './types-hoist/context';
+import type { DataCategory } from './types-hoist/datacategory';
import type { DsnComponents } from './types-hoist/dsn';
import type { DynamicSamplingContext, Envelope } from './types-hoist/envelope';
import type { ErrorEvent, Event, EventHint, TransactionEvent } from './types-hoist/event';
@@ -11,43 +24,28 @@ import type { EventProcessor } from './types-hoist/eventprocessor';
import type { FeedbackEvent } from './types-hoist/feedback';
import type { Integration } from './types-hoist/integration';
import type { Log } from './types-hoist/log';
+import type { ClientOptions } from './types-hoist/options';
import type { ParameterizedString } from './types-hoist/parameterize';
import type { SdkMetadata } from './types-hoist/sdkmetadata';
import type { Session, SessionAggregates } from './types-hoist/session';
import type { SeverityLevel } from './types-hoist/severity';
import type { Span, SpanAttributes, SpanContextData, SpanJSON } from './types-hoist/span';
import type { StartSpanOptions } from './types-hoist/startSpanOptions';
-import type { TraceContext } from './types-hoist/context';
import type { Transport, TransportMakeRequestResponse } from './types-hoist/transport';
-
-import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
-import { DEFAULT_ENVIRONMENT } from './constants';
-import { getCurrentScope, getIsolationScope, getTraceContextFromScope } from './currentScopes';
-import { DEBUG_BUILD } from './debug-build';
-import { createEventEnvelope, createSessionEnvelope } from './envelope';
-import type { IntegrationIndex } from './integration';
-import { afterSetupIntegrations } from './integration';
-import { setupIntegration, setupIntegrations } from './integration';
-import type { Scope } from './scope';
-import { updateSession } from './session';
-import {
- getDynamicSamplingContextFromScope,
- getDynamicSamplingContextFromSpan,
-} from './tracing/dynamicSamplingContext';
-import { createClientReportEnvelope } from './utils-hoist/clientreport';
-import { dsnToString, makeDsn } from './utils-hoist/dsn';
-import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
-import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from './utils-hoist/is';
-import { logger } from './utils-hoist/logger';
-import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
-import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './utils-hoist/syncpromise';
import { getPossibleEventMessages } from './utils/eventUtils';
import { merge } from './utils/merge';
import { parseSampleRate } from './utils/parseSampleRate';
import { prepareEvent } from './utils/prepareEvent';
+import { _getSpanForScope } from './utils/spanOnScope';
import { showSpanDropWarning, spanToTraceContext } from './utils/spanUtils';
import { convertSpanJsonToTransactionEvent, convertTransactionEventToSpanJson } from './utils/transactionEvent';
-import { _getSpanForScope } from './utils/spanOnScope';
+import { createClientReportEnvelope } from './utils-hoist/clientreport';
+import { dsnToString, makeDsn } from './utils-hoist/dsn';
+import { addItemToEnvelope, createAttachmentEnvelopeItem } from './utils-hoist/envelope';
+import { isParameterizedString, isPlainObject, isPrimitive, isThenable } from './utils-hoist/is';
+import { logger } from './utils-hoist/logger';
+import { checkOrSetAlreadyCaught, uuid4 } from './utils-hoist/misc';
+import { rejectedSyncPromise, resolvedSyncPromise, SyncPromise } from './utils-hoist/syncpromise';
const ALREADY_SEEN_ERROR = "Not capturing exception because it's already been captured.";
const MISSING_RELEASE_FOR_SESSION_ERROR = 'Discarded session because of missing or non-string release';
diff --git a/packages/core/src/envelope.ts b/packages/core/src/envelope.ts
index 7f4a477007e1..efec02eb7323 100644
--- a/packages/core/src/envelope.ts
+++ b/packages/core/src/envelope.ts
@@ -1,23 +1,24 @@
import type { Client } from './client';
import { getDynamicSamplingContextFromSpan } from './tracing/dynamicSamplingContext';
import type { SentrySpan } from './tracing/sentrySpan';
+import type { LegacyCSPReport } from './types-hoist/csp';
import type { DsnComponents } from './types-hoist/dsn';
import type {
DynamicSamplingContext,
EventEnvelope,
EventItem,
- SpanEnvelope,
- SpanItem,
RawSecurityEnvelope,
RawSecurityItem,
SessionEnvelope,
SessionItem,
+ SpanEnvelope,
+ SpanItem,
} from './types-hoist/envelope';
import type { Event } from './types-hoist/event';
-import type { LegacyCSPReport } from './types-hoist/csp';
import type { SdkInfo } from './types-hoist/sdkinfo';
import type { SdkMetadata } from './types-hoist/sdkmetadata';
import type { Session, SessionAggregates } from './types-hoist/session';
+import { showSpanDropWarning, spanToJSON } from './utils/spanUtils';
import { dsnToString } from './utils-hoist/dsn';
import {
createEnvelope,
@@ -26,7 +27,6 @@ import {
getSdkMetadataForEnvelopeHeader,
} from './utils-hoist/envelope';
import { uuid4 } from './utils-hoist/misc';
-import { showSpanDropWarning, spanToJSON } from './utils/spanUtils';
/**
* Apply SdkInfo (name, version, packages, integrations) to the corresponding event key.
diff --git a/packages/core/src/eventProcessors.ts b/packages/core/src/eventProcessors.ts
index 7ef62c0f604e..d2405a90032b 100644
--- a/packages/core/src/eventProcessors.ts
+++ b/packages/core/src/eventProcessors.ts
@@ -1,6 +1,5 @@
import { DEBUG_BUILD } from './debug-build';
-import type { Event } from './types-hoist/event';
-import type { EventHint } from './types-hoist/event';
+import type { Event, EventHint } from './types-hoist/event';
import type { EventProcessor } from './types-hoist/eventprocessor';
import { isThenable } from './utils-hoist/is';
import { logger } from './utils-hoist/logger';
diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts
index 3c1351dec88e..d7e678b16edd 100644
--- a/packages/core/src/exports.ts
+++ b/packages/core/src/exports.ts
@@ -10,13 +10,13 @@ import type { Primitive } from './types-hoist/misc';
import type { Session, SessionContext } from './types-hoist/session';
import type { SeverityLevel } from './types-hoist/severity';
import type { User } from './types-hoist/user';
+import type { ExclusiveEventHintOrCaptureContext } from './utils/prepareEvent';
+import { parseEventHintOrCaptureContext } from './utils/prepareEvent';
import { isThenable } from './utils-hoist/is';
import { logger } from './utils-hoist/logger';
import { uuid4 } from './utils-hoist/misc';
import { timestampInSeconds } from './utils-hoist/time';
import { GLOBAL_OBJ } from './utils-hoist/worldwide';
-import type { ExclusiveEventHintOrCaptureContext } from './utils/prepareEvent';
-import { parseEventHintOrCaptureContext } from './utils/prepareEvent';
/**
* Captures an exception event and sends it to Sentry.
diff --git a/packages/core/src/fetch.ts b/packages/core/src/fetch.ts
index f6d3ab96486c..a7df2ca147f2 100644
--- a/packages/core/src/fetch.ts
+++ b/packages/core/src/fetch.ts
@@ -1,16 +1,16 @@
import { getClient } from './currentScopes';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
-import { SPAN_STATUS_ERROR, setHttpStatus, startInactiveSpan } from './tracing';
+import { setHttpStatus, SPAN_STATUS_ERROR, startInactiveSpan } from './tracing';
import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
import type { FetchBreadcrumbHint } from './types-hoist/breadcrumb';
import type { HandlerDataFetch } from './types-hoist/instrument';
import type { Span, SpanAttributes, SpanOrigin } from './types-hoist/span';
-import { SENTRY_BAGGAGE_KEY_PREFIX } from './utils-hoist/baggage';
-import { isInstanceOf, isRequest } from './utils-hoist/is';
-import { getSanitizedUrlStringFromUrlObject, isURLObjectRelative, parseStringToURLObject } from './utils-hoist/url';
import { hasSpansEnabled } from './utils/hasSpansEnabled';
import { getActiveSpan } from './utils/spanUtils';
import { getTraceData } from './utils/traceData';
+import { SENTRY_BAGGAGE_KEY_PREFIX } from './utils-hoist/baggage';
+import { isInstanceOf, isRequest } from './utils-hoist/is';
+import { getSanitizedUrlStringFromUrlObject, isURLObjectRelative, parseStringToURLObject } from './utils-hoist/url';
type PolymorphicRequestHeaders =
| Record
diff --git a/packages/core/src/integrations/dedupe.ts b/packages/core/src/integrations/dedupe.ts
index 8473f9e68e93..9b2fae754e28 100644
--- a/packages/core/src/integrations/dedupe.ts
+++ b/packages/core/src/integrations/dedupe.ts
@@ -1,10 +1,9 @@
+import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Event } from '../types-hoist/event';
import type { Exception } from '../types-hoist/exception';
import type { IntegrationFn } from '../types-hoist/integration';
import type { StackFrame } from '../types-hoist/stackframe';
-
-import { DEBUG_BUILD } from '../debug-build';
import { logger } from '../utils-hoist/logger';
import { getFramesFromEvent } from '../utils-hoist/stacktrace';
diff --git a/packages/core/src/integrations/eventFilters.ts b/packages/core/src/integrations/eventFilters.ts
index 8da0ae671b71..7e254c16f0fa 100644
--- a/packages/core/src/integrations/eventFilters.ts
+++ b/packages/core/src/integrations/eventFilters.ts
@@ -1,13 +1,12 @@
+import { DEBUG_BUILD } from '../debug-build';
+import { defineIntegration } from '../integration';
import type { Event } from '../types-hoist/event';
import type { IntegrationFn } from '../types-hoist/integration';
import type { StackFrame } from '../types-hoist/stackframe';
-
-import { DEBUG_BUILD } from '../debug-build';
-import { defineIntegration } from '../integration';
+import { getPossibleEventMessages } from '../utils/eventUtils';
import { logger } from '../utils-hoist/logger';
import { getEventDescription } from '../utils-hoist/misc';
import { stringMatchesSomePattern } from '../utils-hoist/string';
-import { getPossibleEventMessages } from '../utils/eventUtils';
// "Script error." is hard coded into browsers for errors that it can't read.
// this is the result of a script being pulled in from an external domain and CORS.
diff --git a/packages/core/src/integrations/extraerrordata.ts b/packages/core/src/integrations/extraerrordata.ts
index 0bb3724816f8..d58d116783f3 100644
--- a/packages/core/src/integrations/extraerrordata.ts
+++ b/packages/core/src/integrations/extraerrordata.ts
@@ -1,10 +1,9 @@
+import { DEBUG_BUILD } from '../debug-build';
import { defineIntegration } from '../integration';
import type { Contexts } from '../types-hoist/context';
-import type { Event, EventHint } from '../types-hoist/event';
import type { ExtendedError } from '../types-hoist/error';
+import type { Event, EventHint } from '../types-hoist/event';
import type { IntegrationFn } from '../types-hoist/integration';
-
-import { DEBUG_BUILD } from '../debug-build';
import { isError, isPlainObject } from '../utils-hoist/is';
import { logger } from '../utils-hoist/logger';
import { normalize } from '../utils-hoist/normalize';
diff --git a/packages/core/src/integrations/metadata.ts b/packages/core/src/integrations/metadata.ts
index 6c41a85d60bd..2a00d4d48137 100644
--- a/packages/core/src/integrations/metadata.ts
+++ b/packages/core/src/integrations/metadata.ts
@@ -1,7 +1,6 @@
import { defineIntegration } from '../integration';
-import type { EventItem } from '../types-hoist/envelope';
-
import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata';
+import type { EventItem } from '../types-hoist/envelope';
import { forEachEnvelopeItem } from '../utils-hoist/envelope';
/**
diff --git a/packages/core/src/integrations/supabase.ts b/packages/core/src/integrations/supabase.ts
index be82ce1b1207..63229ccbdcf4 100644
--- a/packages/core/src/integrations/supabase.ts
+++ b/packages/core/src/integrations/supabase.ts
@@ -2,16 +2,15 @@
// https://github.com/supabase-community/sentry-integration-js
/* eslint-disable max-lines */
-import type { IntegrationFn } from '../types-hoist/integration';
-import { setHttpStatus, startSpan } from '../tracing';
import { addBreadcrumb } from '../breadcrumbs';
+import { DEBUG_BUILD } from '../debug-build';
+import { captureException } from '../exports';
import { defineIntegration } from '../integration';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
-import { captureException } from '../exports';
-import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '../tracing';
-import { DEBUG_BUILD } from '../debug-build';
-import { logger } from '../utils-hoist/logger';
+import { setHttpStatus, SPAN_STATUS_ERROR, SPAN_STATUS_OK, startSpan } from '../tracing';
+import type { IntegrationFn } from '../types-hoist/integration';
import { isPlainObject } from '../utils-hoist/is';
+import { logger } from '../utils-hoist/logger';
const AUTH_OPERATIONS_TO_INSTRUMENT = [
'reauthenticate',
diff --git a/packages/core/src/integrations/third-party-errors-filter.ts b/packages/core/src/integrations/third-party-errors-filter.ts
index 201119589958..b61e6ccffb45 100644
--- a/packages/core/src/integrations/third-party-errors-filter.ts
+++ b/packages/core/src/integrations/third-party-errors-filter.ts
@@ -1,7 +1,7 @@
import { defineIntegration } from '../integration';
import { addMetadataToStackFrames, stripMetadataFromStackFrames } from '../metadata';
-import type { Event } from '../types-hoist/event';
import type { EventItem } from '../types-hoist/envelope';
+import type { Event } from '../types-hoist/event';
import { forEachEnvelopeItem } from '../utils-hoist/envelope';
import { getFramesFromEvent } from '../utils-hoist/stacktrace';
diff --git a/packages/core/src/logs/console-integration.ts b/packages/core/src/logs/console-integration.ts
index 21512238caef..9d64439e1786 100644
--- a/packages/core/src/logs/console-integration.ts
+++ b/packages/core/src/logs/console-integration.ts
@@ -4,10 +4,10 @@ import { defineIntegration } from '../integration';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
import type { ConsoleLevel } from '../types-hoist/instrument';
import type { IntegrationFn } from '../types-hoist/integration';
-import { CONSOLE_LEVELS, logger } from '../utils-hoist/logger';
-import { GLOBAL_OBJ } from '../utils-hoist/worldwide';
import { addConsoleInstrumentationHandler } from '../utils-hoist/instrument/console';
+import { CONSOLE_LEVELS, logger } from '../utils-hoist/logger';
import { safeJoin } from '../utils-hoist/string';
+import { GLOBAL_OBJ } from '../utils-hoist/worldwide';
import { _INTERNAL_captureLog } from './exports';
interface CaptureConsoleOptions {
diff --git a/packages/core/src/logs/envelope.ts b/packages/core/src/logs/envelope.ts
index cc748a0bb545..49f2a445b150 100644
--- a/packages/core/src/logs/envelope.ts
+++ b/packages/core/src/logs/envelope.ts
@@ -1,7 +1,7 @@
import type { DsnComponents } from '../types-hoist/dsn';
-import type { SdkMetadata } from '../types-hoist/sdkmetadata';
-import type { SerializedOtelLog } from '../types-hoist/log';
import type { OtelLogEnvelope, OtelLogItem } from '../types-hoist/envelope';
+import type { SerializedOtelLog } from '../types-hoist/log';
+import type { SdkMetadata } from '../types-hoist/sdkmetadata';
import { dsnToString } from '../utils-hoist/dsn';
import { createEnvelope } from '../utils-hoist/envelope';
diff --git a/packages/core/src/logs/exports.ts b/packages/core/src/logs/exports.ts
index 17e1b10ba041..df5726a81256 100644
--- a/packages/core/src/logs/exports.ts
+++ b/packages/core/src/logs/exports.ts
@@ -2,13 +2,12 @@ import type { Client } from '../client';
import { _getTraceInfoFromScope } from '../client';
import { getClient, getCurrentScope } from '../currentScopes';
import { DEBUG_BUILD } from '../debug-build';
-import { SEVERITY_TEXT_TO_SEVERITY_NUMBER } from './constants';
-import type { SerializedLogAttribute, SerializedOtelLog } from '../types-hoist/log';
-import type { Log } from '../types-hoist/log';
+import type { Log, SerializedLogAttribute, SerializedOtelLog } from '../types-hoist/log';
import { _getSpanForScope } from '../utils/spanOnScope';
-import { createOtelLogEnvelope } from './envelope';
-import { logger } from '../utils-hoist/logger';
import { isParameterizedString } from '../utils-hoist/is';
+import { logger } from '../utils-hoist/logger';
+import { SEVERITY_TEXT_TO_SEVERITY_NUMBER } from './constants';
+import { createOtelLogEnvelope } from './envelope';
const MAX_LOG_BUFFER_SIZE = 100;
diff --git a/packages/core/src/profiling.ts b/packages/core/src/profiling.ts
index d3f2a2ed13de..8e7da5d8e946 100644
--- a/packages/core/src/profiling.ts
+++ b/packages/core/src/profiling.ts
@@ -1,7 +1,6 @@
-import type { Profiler, ProfilingIntegration } from './types-hoist/profiling';
-
import { getClient } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
+import type { Profiler, ProfilingIntegration } from './types-hoist/profiling';
import { logger } from './utils-hoist/logger';
function isProfilingIntegrationWithProfiler(
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
index 7c8893ec80cb..414f1e38a2df 100644
--- a/packages/core/src/scope.ts
+++ b/packages/core/src/scope.ts
@@ -9,20 +9,20 @@ import type { Event, EventHint } from './types-hoist/event';
import type { EventProcessor } from './types-hoist/eventprocessor';
import type { Extra, Extras } from './types-hoist/extra';
import type { Primitive } from './types-hoist/misc';
-import type { PropagationContext } from './types-hoist/tracing';
import type { RequestEventData } from './types-hoist/request';
import type { Session } from './types-hoist/session';
import type { SeverityLevel } from './types-hoist/severity';
import type { Span } from './types-hoist/span';
+import type { PropagationContext } from './types-hoist/tracing';
import type { User } from './types-hoist/user';
+import { merge } from './utils/merge';
+import { _getSpanForScope, _setSpanForScope } from './utils/spanOnScope';
import { isPlainObject } from './utils-hoist/is';
import { logger } from './utils-hoist/logger';
import { uuid4 } from './utils-hoist/misc';
import { generateTraceId } from './utils-hoist/propagationContext';
import { truncate } from './utils-hoist/string';
import { dateTimestampInSeconds } from './utils-hoist/time';
-import { merge } from './utils/merge';
-import { _getSpanForScope, _setSpanForScope } from './utils/spanOnScope';
/**
* Default value for maximum number of breadcrumbs added to an event.
diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts
index 8f19dc2e17af..aa5228d53a14 100644
--- a/packages/core/src/server-runtime-client.ts
+++ b/packages/core/src/server-runtime-client.ts
@@ -1,25 +1,23 @@
-import type { BaseTransportOptions } from './types-hoist/transport';
-import type { CheckIn, SerializedCheckIn } from './types-hoist/checkin';
-import type { ClientOptions } from './types-hoist/options';
-import type { Event, EventHint } from './types-hoist/event';
-import type { Log } from './types-hoist/log';
-import type { MonitorConfig } from './types-hoist/checkin';
-import type { ParameterizedString } from './types-hoist/parameterize';
-import type { Primitive } from './types-hoist/misc';
-import type { SeverityLevel } from './types-hoist/severity';
-
import { createCheckInEnvelope } from './checkin';
-import { Client, _getTraceInfoFromScope } from './client';
+import { _getTraceInfoFromScope, Client } from './client';
import { getIsolationScope } from './currentScopes';
import { DEBUG_BUILD } from './debug-build';
+import { _INTERNAL_flushLogsBuffer } from './logs/exports';
import type { Scope } from './scope';
import { registerSpanErrorInstrumentation } from './tracing';
+import type { CheckIn, MonitorConfig, SerializedCheckIn } from './types-hoist/checkin';
+import type { Event, EventHint } from './types-hoist/event';
+import type { Log } from './types-hoist/log';
+import type { Primitive } from './types-hoist/misc';
+import type { ClientOptions } from './types-hoist/options';
+import type { ParameterizedString } from './types-hoist/parameterize';
+import type { SeverityLevel } from './types-hoist/severity';
+import type { BaseTransportOptions } from './types-hoist/transport';
import { eventFromMessage, eventFromUnknownInput } from './utils-hoist/eventbuilder';
+import { isPrimitive } from './utils-hoist/is';
import { logger } from './utils-hoist/logger';
import { uuid4 } from './utils-hoist/misc';
import { resolvedSyncPromise } from './utils-hoist/syncpromise';
-import { _INTERNAL_flushLogsBuffer } from './logs/exports';
-import { isPrimitive } from './utils-hoist/is';
// TODO: Make this configurable
const DEFAULT_LOG_FLUSH_INTERVAL = 5000;
diff --git a/packages/core/src/tracing/dynamicSamplingContext.ts b/packages/core/src/tracing/dynamicSamplingContext.ts
index e120f2820039..ce2d9ad7eadd 100644
--- a/packages/core/src/tracing/dynamicSamplingContext.ts
+++ b/packages/core/src/tracing/dynamicSamplingContext.ts
@@ -5,13 +5,13 @@ import type { Scope } from '../scope';
import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
import type { DynamicSamplingContext } from '../types-hoist/envelope';
import type { Span } from '../types-hoist/span';
+import { hasSpansEnabled } from '../utils/hasSpansEnabled';
+import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
import {
baggageHeaderToDynamicSamplingContext,
dynamicSamplingContextToSentryBaggageHeader,
} from '../utils-hoist/baggage';
import { addNonEnumerableProperty } from '../utils-hoist/object';
-import { hasSpansEnabled } from '../utils/hasSpansEnabled';
-import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
import { getCapturedScopesOnSpan } from './utils';
/**
diff --git a/packages/core/src/tracing/errors.ts b/packages/core/src/tracing/errors.ts
index 6c7f894a60b6..34d2696da52d 100644
--- a/packages/core/src/tracing/errors.ts
+++ b/packages/core/src/tracing/errors.ts
@@ -1,8 +1,8 @@
import { DEBUG_BUILD } from '../debug-build';
+import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
import { addGlobalErrorInstrumentationHandler } from '../utils-hoist/instrument/globalError';
import { addGlobalUnhandledRejectionInstrumentationHandler } from '../utils-hoist/instrument/globalUnhandledRejection';
import { logger } from '../utils-hoist/logger';
-import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
import { SPAN_STATUS_ERROR } from './spanstatus';
let errorsInstrumented = false;
diff --git a/packages/core/src/tracing/idleSpan.ts b/packages/core/src/tracing/idleSpan.ts
index 041e67fc2bd8..e5667d27a5ec 100644
--- a/packages/core/src/tracing/idleSpan.ts
+++ b/packages/core/src/tracing/idleSpan.ts
@@ -1,12 +1,9 @@
import { getClient, getCurrentScope } from '../currentScopes';
+import { DEBUG_BUILD } from '../debug-build';
+import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes';
import type { DynamicSamplingContext } from '../types-hoist/envelope';
import type { Span } from '../types-hoist/span';
import type { StartSpanOptions } from '../types-hoist/startSpanOptions';
-
-import { DEBUG_BUILD } from '../debug-build';
-import { SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON } from '../semanticAttributes';
-import { logger } from '../utils-hoist/logger';
-import { timestampInSeconds } from '../utils-hoist/time';
import { hasSpansEnabled } from '../utils/hasSpansEnabled';
import { _setSpanForScope } from '../utils/spanOnScope';
import {
@@ -16,6 +13,8 @@ import {
spanTimeInputToSeconds,
spanToJSON,
} from '../utils/spanUtils';
+import { logger } from '../utils-hoist/logger';
+import { timestampInSeconds } from '../utils-hoist/time';
import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
import { SPAN_STATUS_ERROR } from './spanstatus';
diff --git a/packages/core/src/tracing/logSpans.ts b/packages/core/src/tracing/logSpans.ts
index 2bca01cbd702..c0bcb34266ae 100644
--- a/packages/core/src/tracing/logSpans.ts
+++ b/packages/core/src/tracing/logSpans.ts
@@ -1,7 +1,7 @@
import { DEBUG_BUILD } from '../debug-build';
import type { Span } from '../types-hoist/span';
-import { logger } from '../utils-hoist/logger';
import { getRootSpan, spanIsSampled, spanToJSON } from '../utils/spanUtils';
+import { logger } from '../utils-hoist/logger';
/**
* Print a log message for a started span.
diff --git a/packages/core/src/tracing/measurement.ts b/packages/core/src/tracing/measurement.ts
index ad4c94cf3789..b94cc6831009 100644
--- a/packages/core/src/tracing/measurement.ts
+++ b/packages/core/src/tracing/measurement.ts
@@ -3,10 +3,10 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
} from '../semanticAttributes';
-import type { MeasurementUnit, Measurements } from '../types-hoist/measurement';
+import type { Measurements, MeasurementUnit } from '../types-hoist/measurement';
import type { TimedEvent } from '../types-hoist/timedEvent';
-import { logger } from '../utils-hoist/logger';
import { getActiveSpan, getRootSpan } from '../utils/spanUtils';
+import { logger } from '../utils-hoist/logger';
/**
* Adds a measurement to the active transaction on the current global scope. You can optionally pass in a different span
diff --git a/packages/core/src/tracing/sampling.ts b/packages/core/src/tracing/sampling.ts
index ad6cd3692796..098a09baa4ad 100644
--- a/packages/core/src/tracing/sampling.ts
+++ b/packages/core/src/tracing/sampling.ts
@@ -1,10 +1,9 @@
+import { DEBUG_BUILD } from '../debug-build';
import type { Options } from '../types-hoist/options';
import type { SamplingContext } from '../types-hoist/samplingcontext';
-
-import { DEBUG_BUILD } from '../debug-build';
-import { logger } from '../utils-hoist/logger';
import { hasSpansEnabled } from '../utils/hasSpansEnabled';
import { parseSampleRate } from '../utils/parseSampleRate';
+import { logger } from '../utils-hoist/logger';
/**
* Makes a sampling decision for the given options.
diff --git a/packages/core/src/tracing/sentryNonRecordingSpan.ts b/packages/core/src/tracing/sentryNonRecordingSpan.ts
index 577948c67292..9ace30c4e70a 100644
--- a/packages/core/src/tracing/sentryNonRecordingSpan.ts
+++ b/packages/core/src/tracing/sentryNonRecordingSpan.ts
@@ -1,12 +1,14 @@
-import type { SentrySpanArguments } from '../types-hoist/span';
-import type { Span } from '../types-hoist/span';
-import type { SpanAttributeValue } from '../types-hoist/span';
-import type { SpanAttributes } from '../types-hoist/span';
-import type { SpanContextData } from '../types-hoist/span';
+import type {
+ SentrySpanArguments,
+ Span,
+ SpanAttributes,
+ SpanAttributeValue,
+ SpanContextData,
+ SpanTimeInput,
+} from '../types-hoist/span';
import type { SpanStatus } from '../types-hoist/spanStatus';
-import type { SpanTimeInput } from '../types-hoist/span';
-import { generateSpanId, generateTraceId } from '../utils-hoist/propagationContext';
import { TRACE_FLAG_NONE } from '../utils/spanUtils';
+import { generateSpanId, generateTraceId } from '../utils-hoist/propagationContext';
/**
* A Sentry Span that is non-recording, meaning it will not be sent to Sentry.
diff --git a/packages/core/src/tracing/sentrySpan.ts b/packages/core/src/tracing/sentrySpan.ts
index 729b5c68d40c..5f791a75e614 100644
--- a/packages/core/src/tracing/sentrySpan.ts
+++ b/packages/core/src/tracing/sentrySpan.ts
@@ -9,26 +9,23 @@ import {
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '../semanticAttributes';
-import type { SentrySpanArguments } from '../types-hoist/span';
-import type { Span } from '../types-hoist/span';
-import type { SpanAttributeValue } from '../types-hoist/span';
-import type { SpanAttributes } from '../types-hoist/span';
-import type { SpanContextData } from '../types-hoist/span';
import type { SpanEnvelope } from '../types-hoist/envelope';
-import type { SpanJSON } from '../types-hoist/span';
-import type { SpanOrigin } from '../types-hoist/span';
+import type { TransactionEvent } from '../types-hoist/event';
+import type { SpanLink } from '../types-hoist/link';
+import type {
+ SentrySpanArguments,
+ Span,
+ SpanAttributes,
+ SpanAttributeValue,
+ SpanContextData,
+ SpanJSON,
+ SpanOrigin,
+ SpanTimeInput,
+} from '../types-hoist/span';
import type { SpanStatus } from '../types-hoist/spanStatus';
-import type { SpanTimeInput } from '../types-hoist/span';
import type { TimedEvent } from '../types-hoist/timedEvent';
-import type { TransactionEvent } from '../types-hoist/event';
import type { TransactionSource } from '../types-hoist/transaction';
-import type { SpanLink } from '../types-hoist/link';
-import { logger } from '../utils-hoist/logger';
-import { generateSpanId, generateTraceId } from '../utils-hoist/propagationContext';
-import { timestampInSeconds } from '../utils-hoist/time';
import {
- TRACE_FLAG_NONE,
- TRACE_FLAG_SAMPLED,
convertSpanLinksForEnvelope,
getRootSpan,
getSpanDescendants,
@@ -36,7 +33,12 @@ import {
spanTimeInputToSeconds,
spanToJSON,
spanToTransactionTraceContext,
+ TRACE_FLAG_NONE,
+ TRACE_FLAG_SAMPLED,
} from '../utils/spanUtils';
+import { logger } from '../utils-hoist/logger';
+import { generateSpanId, generateTraceId } from '../utils-hoist/propagationContext';
+import { timestampInSeconds } from '../utils-hoist/time';
import { getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
import { logSpanEnd } from './logSpans';
import { timedEventsToMeasurements } from './measurement';
diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 379cb829107f..fb8a89f0f860 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -1,28 +1,24 @@
/* eslint-disable max-lines */
+import { getAsyncContextStrategy } from '../asyncContext';
import type { AsyncContextStrategy } from '../asyncContext/types';
import { getMainCarrier } from '../carrier';
-import type { ClientOptions } from '../types-hoist/options';
-import type { DynamicSamplingContext } from '../types-hoist/envelope';
-import type { SentrySpanArguments } from '../types-hoist/span';
-import type { Span } from '../types-hoist/span';
-import type { SpanTimeInput } from '../types-hoist/span';
-import type { StartSpanOptions } from '../types-hoist/startSpanOptions';
-
import { getClient, getCurrentScope, getIsolationScope, withScope } from '../currentScopes';
-
-import { getAsyncContextStrategy } from '../asyncContext';
import { DEBUG_BUILD } from '../debug-build';
import type { Scope } from '../scope';
import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../semanticAttributes';
-import { logger } from '../utils-hoist/logger';
-import { generateTraceId } from '../utils-hoist/propagationContext';
-import { propagationContextFromHeaders } from '../utils-hoist/tracing';
+import type { DynamicSamplingContext } from '../types-hoist/envelope';
+import type { ClientOptions } from '../types-hoist/options';
+import type { SentrySpanArguments, Span, SpanTimeInput } from '../types-hoist/span';
+import type { StartSpanOptions } from '../types-hoist/startSpanOptions';
import { handleCallbackErrors } from '../utils/handleCallbackErrors';
import { hasSpansEnabled } from '../utils/hasSpansEnabled';
import { parseSampleRate } from '../utils/parseSampleRate';
import { _getSpanForScope, _setSpanForScope } from '../utils/spanOnScope';
import { addChildSpanToSpan, getRootSpan, spanIsSampled, spanTimeInputToSeconds, spanToJSON } from '../utils/spanUtils';
+import { logger } from '../utils-hoist/logger';
+import { generateTraceId } from '../utils-hoist/propagationContext';
+import { propagationContextFromHeaders } from '../utils-hoist/tracing';
import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
import { logSpanStart } from './logSpans';
import { sampleSpan } from './sampling';
diff --git a/packages/core/src/transports/base.ts b/packages/core/src/transports/base.ts
index f661bc6e0e09..d5a4f83c1657 100644
--- a/packages/core/src/transports/base.ts
+++ b/packages/core/src/transports/base.ts
@@ -1,8 +1,12 @@
import { DEBUG_BUILD } from '../debug-build';
-import type { Envelope, EnvelopeItem } from '../types-hoist/envelope';
-import type { InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist/transport';
import type { EventDropReason } from '../types-hoist/clientreport';
-import type { TransportRequestExecutor } from '../types-hoist/transport';
+import type { Envelope, EnvelopeItem } from '../types-hoist/envelope';
+import type {
+ InternalBaseTransportOptions,
+ Transport,
+ TransportMakeRequestResponse,
+ TransportRequestExecutor,
+} from '../types-hoist/transport';
import {
createEnvelope,
envelopeItemTypeToDataCategory,
diff --git a/packages/core/src/transports/multiplexed.ts b/packages/core/src/transports/multiplexed.ts
index ed9e87a32a6b..8e93f5f81b53 100644
--- a/packages/core/src/transports/multiplexed.ts
+++ b/packages/core/src/transports/multiplexed.ts
@@ -1,8 +1,7 @@
+import { getEnvelopeEndpointWithUrlEncodedAuth } from '../api';
import type { Envelope, EnvelopeItemType, EventItem } from '../types-hoist/envelope';
-import type { Transport, TransportMakeRequestResponse, BaseTransportOptions } from '../types-hoist/transport';
import type { Event } from '../types-hoist/event';
-
-import { getEnvelopeEndpointWithUrlEncodedAuth } from '../api';
+import type { BaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist/transport';
import { dsnFromString } from '../utils-hoist/dsn';
import { createEnvelope, forEachEnvelopeItem } from '../utils-hoist/envelope';
diff --git a/packages/core/src/transports/offline.ts b/packages/core/src/transports/offline.ts
index 99966222113f..b5e584039d1a 100644
--- a/packages/core/src/transports/offline.ts
+++ b/packages/core/src/transports/offline.ts
@@ -1,7 +1,6 @@
+import { DEBUG_BUILD } from '../debug-build';
import type { Envelope } from '../types-hoist/envelope';
import type { InternalBaseTransportOptions, Transport, TransportMakeRequestResponse } from '../types-hoist/transport';
-
-import { DEBUG_BUILD } from '../debug-build';
import { envelopeContainsItemType } from '../utils-hoist/envelope';
import { logger } from '../utils-hoist/logger';
import { parseRetryAfterHeader } from '../utils-hoist/ratelimit';
diff --git a/packages/core/src/types-hoist/feedback/index.ts b/packages/core/src/types-hoist/feedback/index.ts
index b26cb66ed07d..38383fd3f918 100644
--- a/packages/core/src/types-hoist/feedback/index.ts
+++ b/packages/core/src/types-hoist/feedback/index.ts
@@ -6,10 +6,9 @@ import type {
FeedbackTextConfiguration,
FeedbackThemeConfiguration,
} from './config';
+import type { FeedbackEvent, SendFeedback, SendFeedbackParams, UserFeedback } from './sendFeedback';
export type { FeedbackFormData } from './form';
-
-import type { FeedbackEvent, SendFeedback, SendFeedbackParams, UserFeedback } from './sendFeedback';
export type { FeedbackEvent, UserFeedback, SendFeedback, SendFeedbackParams };
/**
diff --git a/packages/core/src/utils-hoist/aggregate-errors.ts b/packages/core/src/utils-hoist/aggregate-errors.ts
index f2eed76dcb79..f472e5b9968b 100644
--- a/packages/core/src/utils-hoist/aggregate-errors.ts
+++ b/packages/core/src/utils-hoist/aggregate-errors.ts
@@ -1,8 +1,7 @@
+import type { ExtendedError } from '../types-hoist/error';
import type { Event, EventHint } from '../types-hoist/event';
import type { Exception } from '../types-hoist/exception';
-import type { ExtendedError } from '../types-hoist/error';
import type { StackParser } from '../types-hoist/stacktrace';
-
import { isInstanceOf } from './is';
/**
diff --git a/packages/core/src/utils-hoist/baggage.ts b/packages/core/src/utils-hoist/baggage.ts
index efd038230213..9b97f0a92eea 100644
--- a/packages/core/src/utils-hoist/baggage.ts
+++ b/packages/core/src/utils-hoist/baggage.ts
@@ -1,5 +1,4 @@
import type { DynamicSamplingContext } from '../types-hoist/envelope';
-
import { DEBUG_BUILD } from './debug-build';
import { isString } from './is';
import { logger } from './logger';
diff --git a/packages/core/src/utils-hoist/clientreport.ts b/packages/core/src/utils-hoist/clientreport.ts
index 9671a3c1912b..9be11e9fae20 100644
--- a/packages/core/src/utils-hoist/clientreport.ts
+++ b/packages/core/src/utils-hoist/clientreport.ts
@@ -1,6 +1,5 @@
import type { ClientReport } from '../types-hoist/clientreport';
import type { ClientReportEnvelope, ClientReportItem } from '../types-hoist/envelope';
-
import { createEnvelope } from './envelope';
import { dateTimestampInSeconds } from './time';
diff --git a/packages/core/src/utils-hoist/dsn.ts b/packages/core/src/utils-hoist/dsn.ts
index 1c240fb3fc10..37801096dd22 100644
--- a/packages/core/src/utils-hoist/dsn.ts
+++ b/packages/core/src/utils-hoist/dsn.ts
@@ -1,5 +1,4 @@
import type { DsnComponents, DsnLike, DsnProtocol } from '../types-hoist/dsn';
-
import { DEBUG_BUILD } from './debug-build';
import { consoleSandbox, logger } from './logger';
diff --git a/packages/core/src/utils-hoist/envelope.ts b/packages/core/src/utils-hoist/envelope.ts
index 33f93511643f..0bb3d12f76b9 100644
--- a/packages/core/src/utils-hoist/envelope.ts
+++ b/packages/core/src/utils-hoist/envelope.ts
@@ -1,21 +1,20 @@
import { getSentryCarrier } from '../carrier';
import type { Attachment } from '../types-hoist/attachment';
+import type { DataCategory } from '../types-hoist/datacategory';
+import type { DsnComponents } from '../types-hoist/dsn';
import type {
+ AttachmentItem,
BaseEnvelopeHeaders,
BaseEnvelopeItemHeaders,
- EnvelopeItemType,
Envelope,
+ EnvelopeItemType,
EventEnvelopeHeaders,
- AttachmentItem,
SpanItem,
} from '../types-hoist/envelope';
-import type { DsnComponents } from '../types-hoist/dsn';
import type { Event } from '../types-hoist/event';
import type { SdkInfo } from '../types-hoist/sdkinfo';
import type { SdkMetadata } from '../types-hoist/sdkmetadata';
import type { SpanJSON } from '../types-hoist/span';
-import type { DataCategory } from '../types-hoist/datacategory';
-
import { dsnToString } from './dsn';
import { normalize } from './normalize';
import { GLOBAL_OBJ } from './worldwide';
diff --git a/packages/core/src/utils-hoist/instrument/console.ts b/packages/core/src/utils-hoist/instrument/console.ts
index 80d236a2143a..90fad9fbde43 100644
--- a/packages/core/src/utils-hoist/instrument/console.ts
+++ b/packages/core/src/utils-hoist/instrument/console.ts
@@ -1,7 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/ban-types */
import type { ConsoleLevel, HandlerDataConsole } from '../../types-hoist/instrument';
-
import { CONSOLE_LEVELS, originalConsoleMethods } from '../logger';
import { fill } from '../object';
import { GLOBAL_OBJ } from '../worldwide';
diff --git a/packages/core/src/utils-hoist/instrument/fetch.ts b/packages/core/src/utils-hoist/instrument/fetch.ts
index 2d86b42aafda..270219f80efb 100644
--- a/packages/core/src/utils-hoist/instrument/fetch.ts
+++ b/packages/core/src/utils-hoist/instrument/fetch.ts
@@ -1,7 +1,6 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import type { HandlerDataFetch } from '../../types-hoist/instrument';
import type { WebFetchHeaders } from '../../types-hoist/webfetchapi';
-
import { isError, isRequest } from '../is';
import { addNonEnumerableProperty, fill } from '../object';
import { supportsNativeFetch } from '../supports';
diff --git a/packages/core/src/utils-hoist/instrument/globalError.ts b/packages/core/src/utils-hoist/instrument/globalError.ts
index 97572a2be405..6f4f23cb65b7 100644
--- a/packages/core/src/utils-hoist/instrument/globalError.ts
+++ b/packages/core/src/utils-hoist/instrument/globalError.ts
@@ -1,5 +1,4 @@
import type { HandlerDataError } from '../../types-hoist/instrument';
-
import { GLOBAL_OBJ } from '../worldwide';
import { addHandler, maybeInstrument, triggerHandlers } from './handlers';
diff --git a/packages/core/src/utils-hoist/is.ts b/packages/core/src/utils-hoist/is.ts
index a1c7be2c235a..5fa8a3d1877b 100644
--- a/packages/core/src/utils-hoist/is.ts
+++ b/packages/core/src/utils-hoist/is.ts
@@ -1,8 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+import type { Primitive } from '../types-hoist/misc';
import type { ParameterizedString } from '../types-hoist/parameterize';
import type { PolymorphicEvent } from '../types-hoist/polymorphics';
-import type { Primitive } from '../types-hoist/misc';
// eslint-disable-next-line @typescript-eslint/unbound-method
const objectToString = Object.prototype.toString;
diff --git a/packages/core/src/utils-hoist/misc.ts b/packages/core/src/utils-hoist/misc.ts
index adc41acc8a40..78b8a9d6aa74 100644
--- a/packages/core/src/utils-hoist/misc.ts
+++ b/packages/core/src/utils-hoist/misc.ts
@@ -2,7 +2,6 @@ import type { Event } from '../types-hoist/event';
import type { Exception } from '../types-hoist/exception';
import type { Mechanism } from '../types-hoist/mechanism';
import type { StackFrame } from '../types-hoist/stackframe';
-
import { addNonEnumerableProperty } from './object';
import { snipLine } from './string';
import { GLOBAL_OBJ } from './worldwide';
diff --git a/packages/core/src/utils-hoist/normalize.ts b/packages/core/src/utils-hoist/normalize.ts
index 9cf0fd52362a..2aa5dae7fae7 100644
--- a/packages/core/src/utils-hoist/normalize.ts
+++ b/packages/core/src/utils-hoist/normalize.ts
@@ -1,5 +1,4 @@
import type { Primitive } from '../types-hoist/misc';
-
import { isSyntheticEvent, isVueViewModel } from './is';
import { convertToPlainObject } from './object';
import { getFunctionName } from './stacktrace';
diff --git a/packages/core/src/utils-hoist/object.ts b/packages/core/src/utils-hoist/object.ts
index bdcf12ba99b0..2710a2b42f9f 100644
--- a/packages/core/src/utils-hoist/object.ts
+++ b/packages/core/src/utils-hoist/object.ts
@@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import type { WrappedFunction } from '../types-hoist/wrappedfunction';
-
import { htmlTreeAsString } from './browser';
import { DEBUG_BUILD } from './debug-build';
import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
diff --git a/packages/core/src/utils-hoist/promisebuffer.ts b/packages/core/src/utils-hoist/promisebuffer.ts
index d7eb82443fda..2830e8897129 100644
--- a/packages/core/src/utils-hoist/promisebuffer.ts
+++ b/packages/core/src/utils-hoist/promisebuffer.ts
@@ -1,4 +1,4 @@
-import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from './syncpromise';
+import { rejectedSyncPromise, resolvedSyncPromise, SyncPromise } from './syncpromise';
export interface PromiseBuffer {
// exposes the internal array so tests can assert on the state of it.
diff --git a/packages/core/src/utils-hoist/tracing.ts b/packages/core/src/utils-hoist/tracing.ts
index 2f1be61a0ef5..a3add28426f7 100644
--- a/packages/core/src/utils-hoist/tracing.ts
+++ b/packages/core/src/utils-hoist/tracing.ts
@@ -2,7 +2,6 @@ import type { DynamicSamplingContext } from '../types-hoist/envelope';
import type { PropagationContext } from '../types-hoist/tracing';
import type { TraceparentData } from '../types-hoist/transaction';
import { parseSampleRate } from '../utils/parseSampleRate';
-
import { baggageHeaderToDynamicSamplingContext } from './baggage';
import { generateSpanId, generateTraceId } from './propagationContext';
diff --git a/packages/core/src/utils/ipAddress.ts b/packages/core/src/utils/ipAddress.ts
index 3499bdc3a055..c481cd866e81 100644
--- a/packages/core/src/utils/ipAddress.ts
+++ b/packages/core/src/utils/ipAddress.ts
@@ -1,5 +1,4 @@
-import type { Session } from '../types-hoist/session';
-import type { SessionAggregates } from '../types-hoist/session';
+import type { Session, SessionAggregates } from '../types-hoist/session';
import type { User } from '../types-hoist/user';
// By default, we want to infer the IP address, unless this is explicitly set to `null`
diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts
index a1330fa5a932..30ed787d4879 100644
--- a/packages/core/src/utils/prepareEvent.ts
+++ b/packages/core/src/utils/prepareEvent.ts
@@ -4,9 +4,8 @@ import { getGlobalScope } from '../currentScopes';
import { notifyEventProcessors } from '../eventProcessors';
import type { CaptureContext, ScopeContext } from '../scope';
import { Scope } from '../scope';
+import type { Event, EventHint } from '../types-hoist/event';
import type { ClientOptions } from '../types-hoist/options';
-import type { Event } from '../types-hoist/event';
-import type { EventHint } from '../types-hoist/event';
import type { StackParser } from '../types-hoist/stacktrace';
import { getFilenameToDebugIdMap } from '../utils-hoist/debug-ids';
import { addExceptionMechanism, uuid4 } from '../utils-hoist/misc';
diff --git a/packages/core/src/utils/spanUtils.ts b/packages/core/src/utils/spanUtils.ts
index 8d01c1f62609..ffdce534792e 100644
--- a/packages/core/src/utils/spanUtils.ts
+++ b/packages/core/src/utils/spanUtils.ts
@@ -10,10 +10,10 @@ import {
import type { SentrySpan } from '../tracing/sentrySpan';
import { SPAN_STATUS_OK, SPAN_STATUS_UNSET } from '../tracing/spanstatus';
import { getCapturedScopesOnSpan } from '../tracing/utils';
-import type { Span, SpanAttributes, SpanJSON, SpanOrigin, SpanTimeInput } from '../types-hoist/span';
-import type { SpanStatus } from '../types-hoist/spanStatus';
import type { TraceContext } from '../types-hoist/context';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
+import type { Span, SpanAttributes, SpanJSON, SpanOrigin, SpanTimeInput } from '../types-hoist/span';
+import type { SpanStatus } from '../types-hoist/spanStatus';
import { consoleSandbox } from '../utils-hoist/logger';
import { addNonEnumerableProperty } from '../utils-hoist/object';
import { generateSpanId } from '../utils-hoist/propagationContext';
diff --git a/packages/core/src/utils/traceData.ts b/packages/core/src/utils/traceData.ts
index a869186d0c3b..e9d284e5a2c5 100644
--- a/packages/core/src/utils/traceData.ts
+++ b/packages/core/src/utils/traceData.ts
@@ -4,11 +4,11 @@ import { getClient, getCurrentScope } from '../currentScopes';
import { isEnabled } from '../exports';
import type { Scope } from '../scope';
import { getDynamicSamplingContextFromScope, getDynamicSamplingContextFromSpan } from '../tracing';
-import type { SerializedTraceData } from '../types-hoist/tracing';
import type { Span } from '../types-hoist/span';
+import type { SerializedTraceData } from '../types-hoist/tracing';
import { dynamicSamplingContextToSentryBaggageHeader } from '../utils-hoist/baggage';
import { logger } from '../utils-hoist/logger';
-import { TRACEPARENT_REGEXP, generateSentryTraceHeader } from '../utils-hoist/tracing';
+import { generateSentryTraceHeader, TRACEPARENT_REGEXP } from '../utils-hoist/tracing';
import { getActiveSpan, spanToTraceHeader } from './spanUtils';
/**
diff --git a/packages/core/src/utils/transactionEvent.ts b/packages/core/src/utils/transactionEvent.ts
index c47362f42d42..c6b7a9c044b9 100644
--- a/packages/core/src/utils/transactionEvent.ts
+++ b/packages/core/src/utils/transactionEvent.ts
@@ -1,6 +1,6 @@
import { SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME, SEMANTIC_ATTRIBUTE_PROFILE_ID } from '../semanticAttributes';
-import type { SpanJSON } from '../types-hoist/span';
import type { TransactionEvent } from '../types-hoist/event';
+import type { SpanJSON } from '../types-hoist/span';
/**
* Converts a transaction event to a span JSON object.
diff --git a/packages/core/test/lib/attachments.test.ts b/packages/core/test/lib/attachments.test.ts
index 78ea620d9226..eab0927068fe 100644
--- a/packages/core/test/lib/attachments.test.ts
+++ b/packages/core/test/lib/attachments.test.ts
@@ -1,7 +1,7 @@
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import { createTransport } from '../../src/transports/base';
import { parseEnvelope } from '../../src/utils-hoist/envelope';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
describe('Attachments', () => {
beforeEach(() => {
diff --git a/packages/core/test/lib/checkin.test.ts b/packages/core/test/lib/checkin.test.ts
index f3b15ed31c36..ace9ada17ab4 100644
--- a/packages/core/test/lib/checkin.test.ts
+++ b/packages/core/test/lib/checkin.test.ts
@@ -1,8 +1,6 @@
-import type { SerializedCheckIn } from '../../src/types-hoist/checkin';
-
-import { createCheckInEnvelope } from '../../src/checkin';
-
import { describe, expect, test } from 'vitest';
+import { createCheckInEnvelope } from '../../src/checkin';
+import type { SerializedCheckIn } from '../../src/types-hoist/checkin';
describe('createCheckInEnvelope', () => {
test('creates a check in envelope header', () => {
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index 2731d5c30929..07ce87fca3e2 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -1,28 +1,26 @@
import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
import {
- Scope,
- SyncPromise,
addBreadcrumb,
dsnToString,
getCurrentScope,
getIsolationScope,
lastEventId,
makeSession,
+ Scope,
setCurrentClient,
+ SyncPromise,
withMonitor,
} from '../../src';
import type { BaseClient, Client } from '../../src/client';
import * as integrationModule from '../../src/integration';
import type { Envelope } from '../../src/types-hoist/envelope';
-import type { ErrorEvent } from '../../src/types-hoist/event';
-import type { Event } from '../../src/types-hoist/event';
+import type { ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist/event';
import type { SpanJSON } from '../../src/types-hoist/span';
-import type { TransactionEvent } from '../../src/types-hoist/event';
import * as loggerModule from '../../src/utils-hoist/logger';
import * as miscModule from '../../src/utils-hoist/misc';
import * as stringModule from '../../src/utils-hoist/string';
import * as timeModule from '../../src/utils-hoist/time';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
import { AdHocIntegration, TestIntegration } from '../mocks/integration';
import { makeFakeTransport } from '../mocks/transport';
import { clearGlobalScope } from './clear-global-scope';
diff --git a/packages/core/test/lib/envelope.test.ts b/packages/core/test/lib/envelope.test.ts
index fecd1951a443..d0882524dc67 100644
--- a/packages/core/test/lib/envelope.test.ts
+++ b/packages/core/test/lib/envelope.test.ts
@@ -1,18 +1,18 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { DsnComponents } from '../../build/types/types-hoist/dsn';
+import type { DynamicSamplingContext } from '../../build/types/types-hoist/envelope';
import type { Client } from '../../src';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- SentrySpan,
getCurrentScope,
getIsolationScope,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+ SentrySpan,
setAsyncContextStrategy,
setCurrentClient,
} from '../../src';
import { createEventEnvelope, createSpanEnvelope } from '../../src/envelope';
import type { Event } from '../../src/types-hoist/event';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
-import type { DsnComponents } from '../../build/types/types-hoist/dsn';
-import type { DynamicSamplingContext } from '../../build/types/types-hoist/envelope';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
const testDsn: DsnComponents = { protocol: 'https', projectId: 'abc', host: 'testry.io', publicKey: 'pubKey123' };
diff --git a/packages/core/test/lib/feedback.test.ts b/packages/core/test/lib/feedback.test.ts
index 1d2af6422275..306424853354 100644
--- a/packages/core/test/lib/feedback.test.ts
+++ b/packages/core/test/lib/feedback.test.ts
@@ -1,8 +1,8 @@
import { beforeEach, describe, expect, it, test, vi } from 'vitest';
import {
- Scope,
addBreadcrumb,
getCurrentScope,
+ Scope,
setCurrentClient,
startSpan,
withIsolationScope,
@@ -10,7 +10,7 @@ import {
} from '../../src';
import { captureFeedback } from '../../src/feedback';
import type { Span } from '../../src/types-hoist/span';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
describe('captureFeedback', () => {
beforeEach(() => {
diff --git a/packages/core/test/lib/hint.test.ts b/packages/core/test/lib/hint.test.ts
index 09e1cac8bc2c..ec6d1c03ea65 100644
--- a/packages/core/test/lib/hint.test.ts
+++ b/packages/core/test/lib/hint.test.ts
@@ -1,7 +1,7 @@
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
-import { GLOBAL_OBJ, captureEvent, getCurrentScope } from '../../src';
+import { captureEvent, getCurrentScope, GLOBAL_OBJ } from '../../src';
import { initAndBind } from '../../src/sdk';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
import { AddAttachmentTestIntegration } from '../mocks/integration';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/core/test/lib/integration.test.ts b/packages/core/test/lib/integration.test.ts
index 85ddcc5e40f5..27ca88049b2a 100644
--- a/packages/core/test/lib/integration.test.ts
+++ b/packages/core/test/lib/integration.test.ts
@@ -1,12 +1,11 @@
-import { getCurrentScope } from '../../src/currentScopes';
-
import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
+import { getCurrentScope } from '../../src/currentScopes';
import { addIntegration, getIntegrationsToSetup, installedIntegrations, setupIntegration } from '../../src/integration';
import { setCurrentClient } from '../../src/sdk';
-import { logger } from '../../src/utils-hoist/logger';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
import type { Integration } from '../../src/types-hoist/integration';
import type { Options } from '../../src/types-hoist/options';
+import { logger } from '../../src/utils-hoist/logger';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
function getTestClient(): TestClient {
return new TestClient(
diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts
index d4da66bf3788..8c4e1e55ccce 100644
--- a/packages/core/test/lib/integrations/captureconsole.test.ts
+++ b/packages/core/test/lib/integrations/captureconsole.test.ts
@@ -1,12 +1,12 @@
/* eslint-disable @typescript-eslint/unbound-method */
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest';
+import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { Client } from '../../../src';
import * as CurrentScopes from '../../../src/currentScopes';
import * as SentryCore from '../../../src/exports';
import { captureConsoleIntegration } from '../../../src/integrations/captureconsole';
import type { Event } from '../../../src/types-hoist/event';
-import type { ConsoleLevel } from '../../../src/types/types-hoist/instrument';
+import type { ConsoleLevel } from '../../../src/types-hoist/instrument';
import { addConsoleInstrumentationHandler } from '../../../src/utils-hoist/instrument/console';
import { resetInstrumentationHandlers } from '../../../src/utils-hoist/instrument/handlers';
import { CONSOLE_LEVELS, originalConsoleMethods } from '../../../src/utils-hoist/logger';
diff --git a/packages/core/test/lib/integrations/console.test.ts b/packages/core/test/lib/integrations/console.test.ts
index e760df8c5446..df43f62dfda8 100644
--- a/packages/core/test/lib/integrations/console.test.ts
+++ b/packages/core/test/lib/integrations/console.test.ts
@@ -1,6 +1,6 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { addConsoleBreadcrumb } from '../../../src/integrations/console';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { addBreadcrumb } from '../../../src/breadcrumbs';
+import { addConsoleBreadcrumb } from '../../../src/integrations/console';
vi.mock('../../../src/breadcrumbs', () => ({
addBreadcrumb: vi.fn(),
diff --git a/packages/core/test/lib/integrations/dedupe.test.ts b/packages/core/test/lib/integrations/dedupe.test.ts
index 722d9c3bb158..97567476a4da 100644
--- a/packages/core/test/lib/integrations/dedupe.test.ts
+++ b/packages/core/test/lib/integrations/dedupe.test.ts
@@ -1,9 +1,9 @@
+import { describe, expect, it } from 'vitest';
+import { _shouldDropEvent, dedupeIntegration } from '../../../src/integrations/dedupe';
import type { Event as SentryEvent } from '../../../src/types-hoist/event';
import type { Exception } from '../../../src/types-hoist/exception';
import type { StackFrame } from '../../../src/types-hoist/stackframe';
import type { Stacktrace } from '../../../src/types-hoist/stacktrace';
-import { _shouldDropEvent, dedupeIntegration } from '../../../src/integrations/dedupe';
-import { describe, expect, it } from 'vitest';
type EventWithException = SentryEvent & {
exception: {
diff --git a/packages/core/test/lib/integrations/eventFilters.test.ts b/packages/core/test/lib/integrations/eventFilters.test.ts
index f25984ee342b..d78b59ede112 100644
--- a/packages/core/test/lib/integrations/eventFilters.test.ts
+++ b/packages/core/test/lib/integrations/eventFilters.test.ts
@@ -1,11 +1,10 @@
+import { describe, expect, it } from 'vitest';
+import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
+import { eventFiltersIntegration, inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
import type { Event } from '../../../src/types-hoist/event';
import type { EventProcessor } from '../../../src/types-hoist/eventprocessor';
import type { Integration } from '../../../src/types-hoist/integration';
-import { describe, expect, it } from 'vitest';
-import type { EventFiltersOptions } from '../../../src/integrations/eventFilters';
-import { eventFiltersIntegration } from '../../../src/integrations/eventFilters';
-import { inboundFiltersIntegration } from '../../../src/integrations/eventFilters';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/core/test/lib/integrations/extraerrordata.test.ts b/packages/core/test/lib/integrations/extraerrordata.test.ts
index b0ece956e0cc..a6470c3f6b2c 100644
--- a/packages/core/test/lib/integrations/extraerrordata.test.ts
+++ b/packages/core/test/lib/integrations/extraerrordata.test.ts
@@ -1,8 +1,8 @@
-import type { Event } from '../../../src/types-hoist/event';
-import type { ExtendedError } from '../../../src/types-hoist/error';
-import { extraErrorDataIntegration } from '../../../src/integrations/extraerrordata';
import { beforeEach, describe, expect, it } from 'vitest';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { extraErrorDataIntegration } from '../../../src/integrations/extraerrordata';
+import type { ExtendedError } from '../../../src/types-hoist/error';
+import type { Event } from '../../../src/types-hoist/event';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const extraErrorData = extraErrorDataIntegration();
let event: Event;
diff --git a/packages/core/test/lib/integrations/functiontostring.test.ts b/packages/core/test/lib/integrations/functiontostring.test.ts
index 09d03c1893e8..7c40de8b06f2 100644
--- a/packages/core/test/lib/integrations/functiontostring.test.ts
+++ b/packages/core/test/lib/integrations/functiontostring.test.ts
@@ -1,7 +1,7 @@
import { afterAll, beforeEach, describe, expect, it } from 'vitest';
import { fill, getClient, getCurrentScope, setCurrentClient } from '../../../src';
import { functionToStringIntegration } from '../../../src/integrations/functiontostring';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
describe('FunctionToString', () => {
beforeEach(() => {
diff --git a/packages/core/test/lib/integrations/metadata.test.ts b/packages/core/test/lib/integrations/metadata.test.ts
index 06af1258ec6e..f541df6dd3bf 100644
--- a/packages/core/test/lib/integrations/metadata.test.ts
+++ b/packages/core/test/lib/integrations/metadata.test.ts
@@ -1,17 +1,16 @@
-import type { Event } from '../../../src/types-hoist/event';
-
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import {
- GLOBAL_OBJ,
captureException,
createStackParser,
createTransport,
+ GLOBAL_OBJ,
moduleMetadataIntegration,
nodeStackLineParser,
parseEnvelope,
setCurrentClient,
} from '../../../src';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import type { Event } from '../../../src/types-hoist/event';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const stackParser = createStackParser(nodeStackLineParser());
diff --git a/packages/core/test/lib/logs/envelope.test.ts b/packages/core/test/lib/logs/envelope.test.ts
index 9ce44370500d..5f98719bbb44 100644
--- a/packages/core/test/lib/logs/envelope.test.ts
+++ b/packages/core/test/lib/logs/envelope.test.ts
@@ -1,8 +1,8 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { createOtelLogEnvelope, createOtelLogEnvelopeItem } from '../../../src/logs/envelope';
import type { DsnComponents } from '../../../src/types-hoist/dsn';
-import type { SdkMetadata } from '../../../src/types-hoist/sdkmetadata';
import type { SerializedOtelLog } from '../../../src/types-hoist/log';
+import type { SdkMetadata } from '../../../src/types-hoist/sdkmetadata';
import * as utilsDsn from '../../../src/utils-hoist/dsn';
import * as utilsEnvelope from '../../../src/utils-hoist/envelope';
diff --git a/packages/core/test/lib/logs/exports.test.ts b/packages/core/test/lib/logs/exports.test.ts
index e71df274ec06..9c4795d8fc53 100644
--- a/packages/core/test/lib/logs/exports.test.ts
+++ b/packages/core/test/lib/logs/exports.test.ts
@@ -1,14 +1,14 @@
import { describe, expect, it, vi } from 'vitest';
+import { fmt, Scope } from '../../../src';
import {
+ _INTERNAL_captureLog,
_INTERNAL_flushLogsBuffer,
_INTERNAL_getLogBuffer,
- _INTERNAL_captureLog,
logAttributeToSerializedLogAttribute,
} from '../../../src/logs/exports';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
-import * as loggerModule from '../../../src/utils-hoist/logger';
-import { Scope, fmt } from '../../../src';
import type { Log } from '../../../src/types-hoist/log';
+import * as loggerModule from '../../../src/utils-hoist/logger';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/core/test/lib/metadata.test.ts b/packages/core/test/lib/metadata.test.ts
index 6c50d60f4cc4..87ffcc5284e0 100644
--- a/packages/core/test/lib/metadata.test.ts
+++ b/packages/core/test/lib/metadata.test.ts
@@ -1,6 +1,6 @@
-import type { Event } from '../../src/types-hoist/event';
import { beforeEach, describe, expect, it } from 'vitest';
import { addMetadataToStackFrames, getMetadataForUrl, stripMetadataFromStackFrames } from '../../src/metadata';
+import type { Event } from '../../src/types-hoist/event';
import { nodeStackLineParser } from '../../src/utils-hoist/node-stack-trace';
import { createStackParser } from '../../src/utils-hoist/stacktrace';
import { GLOBAL_OBJ } from '../../src/utils-hoist/worldwide';
diff --git a/packages/core/test/lib/prepareEvent.test.ts b/packages/core/test/lib/prepareEvent.test.ts
index 5d71bd38bad5..42279371dc30 100644
--- a/packages/core/test/lib/prepareEvent.test.ts
+++ b/packages/core/test/lib/prepareEvent.test.ts
@@ -1,12 +1,12 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { Client, ScopeContext } from '../../src';
-import { GLOBAL_OBJ, createStackParser, getGlobalScope, getIsolationScope } from '../../src';
+import { createStackParser, getGlobalScope, getIsolationScope, GLOBAL_OBJ } from '../../src';
import { Scope } from '../../src/scope';
+import type { Attachment } from '../../src/types-hoist/attachment';
+import type { Breadcrumb } from '../../src/types-hoist/breadcrumb';
import type { Event, EventHint } from '../../src/types-hoist/event';
import type { EventProcessor } from '../../src/types-hoist/eventprocessor';
-import type { Attachment } from '../../src/types/types-hoist/attachment';
-import type { Breadcrumb } from '../../src/types/types-hoist/breadcrumb';
-import type { ClientOptions } from '../../src/types/types-hoist/options';
+import type { ClientOptions } from '../../src/types-hoist/options';
import {
applyClientOptions,
applyDebugIds,
diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts
index 51e319fbb435..bac55994c199 100644
--- a/packages/core/test/lib/scope.test.ts
+++ b/packages/core/test/lib/scope.test.ts
@@ -1,6 +1,5 @@
import { beforeEach, describe, expect, it, test, vi } from 'vitest';
import type { Client } from '../../src/client';
-import { applyScopeDataToEvent } from '../../src/utils/applyScopeDataToEvent';
import {
getCurrentScope,
getGlobalScope,
@@ -11,7 +10,8 @@ import {
import { Scope } from '../../src/scope';
import type { Breadcrumb } from '../../src/types-hoist/breadcrumb';
import type { Event } from '../../src/types-hoist/event';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { applyScopeDataToEvent } from '../../src/utils/applyScopeDataToEvent';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
import { clearGlobalScope } from './clear-global-scope';
describe('Scope', () => {
diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts
index 658304fdc822..4aac159d7817 100644
--- a/packages/core/test/lib/sdk.test.ts
+++ b/packages/core/test/lib/sdk.test.ts
@@ -1,12 +1,11 @@
import { type Mock, beforeEach, describe, expect, it, test, vi } from 'vitest';
import type { Client } from '../../src/client';
-import { captureCheckIn } from '../../src/exports';
import { getCurrentScope } from '../../src/currentScopes';
-import { setCurrentClient } from '../../src/sdk';
+import { captureCheckIn } from '../../src/exports';
import { installedIntegrations } from '../../src/integration';
-import { initAndBind } from '../../src/sdk';
+import { initAndBind, setCurrentClient } from '../../src/sdk';
import type { Integration } from '../../src/types-hoist/integration';
-import { TestClient, getDefaultTestClientOptions } from '../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
// eslint-disable-next-line no-var
declare var global: any;
diff --git a/packages/core/test/lib/server-runtime-client.test.ts b/packages/core/test/lib/server-runtime-client.test.ts
index 2e527ae6888d..823757004814 100644
--- a/packages/core/test/lib/server-runtime-client.test.ts
+++ b/packages/core/test/lib/server-runtime-client.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, it, test, vi } from 'vitest';
-import { Scope, createTransport } from '../../src';
+import { createTransport, Scope } from '../../src';
import { _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '../../src/logs/exports';
import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client';
import { ServerRuntimeClient } from '../../src/server-runtime-client';
diff --git a/packages/core/test/lib/session.test.ts b/packages/core/test/lib/session.test.ts
index 72d54dd841cb..6744b2107e7b 100644
--- a/packages/core/test/lib/session.test.ts
+++ b/packages/core/test/lib/session.test.ts
@@ -1,7 +1,6 @@
-import type { SessionContext } from '../../src/types-hoist/session';
-
import { describe, expect, it, test } from 'vitest';
import { closeSession, makeSession, updateSession } from '../../src/session';
+import type { SessionContext } from '../../src/types-hoist/session';
import { timestampInSeconds } from '../../src/utils-hoist/time';
describe('Session', () => {
diff --git a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
index e4df2801284f..28ecab8bc8dc 100644
--- a/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
+++ b/packages/core/test/lib/tracing/dynamicSamplingContext.test.ts
@@ -1,15 +1,15 @@
import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
import {
+ getClient,
SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- getClient,
setCurrentClient,
} from '../../../src';
-import { SentrySpan, getDynamicSamplingContextFromSpan, startInactiveSpan } from '../../../src/tracing';
+import { getDynamicSamplingContextFromSpan, SentrySpan, startInactiveSpan } from '../../../src/tracing';
import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext';
import type { Span, SpanContextData } from '../../../src/types-hoist/span';
import type { TransactionSource } from '../../../src/types-hoist/transaction';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
describe('getDynamicSamplingContextFromSpan', () => {
beforeEach(() => {
diff --git a/packages/core/test/lib/tracing/errors.test.ts b/packages/core/test/lib/tracing/errors.test.ts
index 44af29433b9f..cadc8b79219b 100644
--- a/packages/core/test/lib/tracing/errors.test.ts
+++ b/packages/core/test/lib/tracing/errors.test.ts
@@ -4,7 +4,7 @@ import { _resetErrorsInstrumented, registerSpanErrorInstrumentation } from '../.
import type { HandlerDataError, HandlerDataUnhandledRejection } from '../../../src/types-hoist/instrument';
import * as globalErrorModule from '../../../src/utils-hoist/instrument/globalError';
import * as globalUnhandledRejectionModule from '../../../src/utils-hoist/instrument/globalUnhandledRejection';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
let mockErrorCallback: (data: HandlerDataError) => void = () => {};
let mockUnhandledRejectionCallback: (data: HandlerDataUnhandledRejection) => void = () => {};
diff --git a/packages/core/test/lib/tracing/idleSpan.test.ts b/packages/core/test/lib/tracing/idleSpan.test.ts
index 9cefebb76096..3eec7836a681 100644
--- a/packages/core/test/lib/tracing/idleSpan.test.ts
+++ b/packages/core/test/lib/tracing/idleSpan.test.ts
@@ -1,24 +1,24 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
- SentryNonRecordingSpan,
- SentrySpan,
getActiveSpan,
getClient,
getCurrentScope,
getDynamicSamplingContextFromSpan,
getGlobalScope,
getIsolationScope,
+ SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON,
+ SentryNonRecordingSpan,
+ SentrySpan,
setCurrentClient,
spanToJSON,
startInactiveSpan,
startSpan,
startSpanManual,
} from '../../../src';
-import { TRACING_DEFAULTS, startIdleSpan } from '../../../src/tracing/idleSpan';
+import { startIdleSpan, TRACING_DEFAULTS } from '../../../src/tracing/idleSpan';
import type { Event } from '../../../src/types-hoist/event';
import type { Span } from '../../../src/types-hoist/span';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const dsn = 'https://123@sentry.io/42';
diff --git a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts
index 5ca07bcd271e..25d8100518d3 100644
--- a/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts
+++ b/packages/core/test/lib/tracing/sentryNonRecordingSpan.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
import { SPAN_STATUS_ERROR } from '../../../src/tracing';
import { SentryNonRecordingSpan } from '../../../src/tracing/sentryNonRecordingSpan';
import type { Span } from '../../../src/types-hoist/span';
-import { TRACE_FLAG_NONE, spanIsSampled, spanToJSON } from '../../../src/utils/spanUtils';
+import { spanIsSampled, spanToJSON, TRACE_FLAG_NONE } from '../../../src/utils/spanUtils';
describe('SentryNonRecordingSpan', () => {
it('satisfies the Span interface', () => {
diff --git a/packages/core/test/lib/tracing/sentrySpan.test.ts b/packages/core/test/lib/tracing/sentrySpan.test.ts
index 9f3819dc644f..a63e161e5ada 100644
--- a/packages/core/test/lib/tracing/sentrySpan.test.ts
+++ b/packages/core/test/lib/tracing/sentrySpan.test.ts
@@ -1,13 +1,13 @@
import { describe, expect, it, test, vi } from 'vitest';
-import type { SpanJSON } from '../../../src/types-hoist/span';
import { getCurrentScope } from '../../../src/currentScopes';
import { setCurrentClient } from '../../../src/sdk';
-import { timestampInSeconds } from '../../../src/utils-hoist/time';
import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '../../../src/semanticAttributes';
import { SentrySpan } from '../../../src/tracing/sentrySpan';
import { SPAN_STATUS_ERROR } from '../../../src/tracing/spanstatus';
-import { TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED, spanToJSON } from '../../../src/utils/spanUtils';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import type { SpanJSON } from '../../../src/types-hoist/span';
+import { spanToJSON, TRACE_FLAG_NONE, TRACE_FLAG_SAMPLED } from '../../../src/utils/spanUtils';
+import { timestampInSeconds } from '../../../src/utils-hoist/time';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
describe('SentrySpan', () => {
describe('name', () => {
diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
index bc241086468c..0e0d16fb6ec4 100644
--- a/packages/core/test/lib/tracing/trace.test.ts
+++ b/packages/core/test/lib/tracing/trace.test.ts
@@ -1,12 +1,12 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- Scope,
getCurrentScope,
getGlobalScope,
getIsolationScope,
getMainCarrier,
+ Scope,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
setAsyncContextStrategy,
setCurrentClient,
spanToJSON,
@@ -14,10 +14,10 @@ import {
} from '../../../src';
import { getAsyncContextStrategy } from '../../../src/asyncContext';
import {
- SentrySpan,
continueTrace,
getDynamicSamplingContextFromSpan,
registerSpanErrorInstrumentation,
+ SentrySpan,
startInactiveSpan,
startSpan,
startSpanManual,
@@ -31,7 +31,7 @@ import type { Span } from '../../../src/types-hoist/span';
import type { StartSpanOptions } from '../../../src/types-hoist/startSpanOptions';
import { _setSpanForScope } from '../../../src/utils/spanOnScope';
import { getActiveSpan, getRootSpan, getSpanDescendants, spanIsSampled } from '../../../src/utils/spanUtils';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const enum Type {
Sync = 'sync',
diff --git a/packages/core/test/lib/transports/base.test.ts b/packages/core/test/lib/transports/base.test.ts
index e751914cde35..af3655d89972 100644
--- a/packages/core/test/lib/transports/base.test.ts
+++ b/packages/core/test/lib/transports/base.test.ts
@@ -1,8 +1,7 @@
-import type { AttachmentItem, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope';
-import type { TransportMakeRequestResponse } from '../../../src/types-hoist/transport';
-
import { describe, expect, it, vi } from 'vitest';
import { createTransport } from '../../../src/transports/base';
+import type { AttachmentItem, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope';
+import type { TransportMakeRequestResponse } from '../../../src/types-hoist/transport';
import { createEnvelope, serializeEnvelope } from '../../../src/utils-hoist/envelope';
import type { PromiseBuffer } from '../../../src/utils-hoist/promisebuffer';
import { resolvedSyncPromise } from '../../../src/utils-hoist/syncpromise';
diff --git a/packages/core/test/lib/transports/multiplexed.test.ts b/packages/core/test/lib/transports/multiplexed.test.ts
index 0395bb010232..f937f7e55ec4 100644
--- a/packages/core/test/lib/transports/multiplexed.test.ts
+++ b/packages/core/test/lib/transports/multiplexed.test.ts
@@ -1,8 +1,3 @@
-import type { BaseTransportOptions, Transport } from '../../../src/types-hoist/transport';
-import type { ClientReport } from '../../../src/types-hoist/clientreport';
-import type { Envelope, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope';
-import type { TransactionEvent } from '../../../src/types-hoist/event';
-
import { describe, expect, it, vi } from 'vitest';
import {
createClientReportEnvelope,
@@ -14,6 +9,10 @@ import {
parseEnvelope,
} from '../../../src';
import { eventFromEnvelope } from '../../../src/transports/multiplexed';
+import type { ClientReport } from '../../../src/types-hoist/clientreport';
+import type { Envelope, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope';
+import type { TransactionEvent } from '../../../src/types-hoist/event';
+import type { BaseTransportOptions, Transport } from '../../../src/types-hoist/transport';
const DSN1 = 'https://1234@5678.ingest.sentry.io/4321';
const DSN1_URL = getEnvelopeEndpointWithUrlEncodedAuth(dsnFromString(DSN1)!);
diff --git a/packages/core/test/lib/transports/offline.test.ts b/packages/core/test/lib/transports/offline.test.ts
index c1d7918e3d2e..3b491753c8bb 100644
--- a/packages/core/test/lib/transports/offline.test.ts
+++ b/packages/core/test/lib/transports/offline.test.ts
@@ -1,8 +1,3 @@
-import type { ClientReport } from '../../../src/types-hoist/clientreport';
-import type { Envelope, EventEnvelope, EventItem, ReplayEnvelope } from '../../../src/types-hoist/envelope';
-import type { ReplayEvent } from '../../../src/types-hoist/replay';
-import type { InternalBaseTransportOptions, TransportMakeRequestResponse } from '../../../src/types-hoist/transport';
-
import { describe, expect, it } from 'vitest';
import {
createClientReportEnvelope,
@@ -14,7 +9,11 @@ import {
parseEnvelope,
} from '../../../src';
import type { CreateOfflineStore, OfflineTransportOptions } from '../../../src/transports/offline';
-import { START_DELAY, makeOfflineTransport } from '../../../src/transports/offline';
+import { makeOfflineTransport, START_DELAY } from '../../../src/transports/offline';
+import type { ClientReport } from '../../../src/types-hoist/clientreport';
+import type { Envelope, EventEnvelope, EventItem, ReplayEnvelope } from '../../../src/types-hoist/envelope';
+import type { ReplayEvent } from '../../../src/types-hoist/replay';
+import type { InternalBaseTransportOptions, TransportMakeRequestResponse } from '../../../src/types-hoist/transport';
const ERROR_ENVELOPE = createEnvelope({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
[{ type: 'event' }, { event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2' }] as EventItem,
diff --git a/packages/core/test/lib/trpc.test.ts b/packages/core/test/lib/trpc.test.ts
index bb77dda8de17..9a27e62c38ae 100644
--- a/packages/core/test/lib/trpc.test.ts
+++ b/packages/core/test/lib/trpc.test.ts
@@ -1,8 +1,8 @@
-import { describe, test, expect, beforeEach, vi } from 'vitest';
-import { trpcMiddleware, setCurrentClient, type Client, type Span } from '../../src';
-import * as tracing from '../../src/tracing';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
+import { type Client, type Span, setCurrentClient, trpcMiddleware } from '../../src';
import * as currentScopes from '../../src/currentScopes';
import * as exports from '../../src/exports';
+import * as tracing from '../../src/tracing';
import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
describe('trpcMiddleware', () => {
diff --git a/packages/core/test/lib/utils/hasTracingEnabled.test.ts b/packages/core/test/lib/utils/hasTracingEnabled.test.ts
index ef6ff6f26624..f4c7a51307c2 100644
--- a/packages/core/test/lib/utils/hasTracingEnabled.test.ts
+++ b/packages/core/test/lib/utils/hasTracingEnabled.test.ts
@@ -1,6 +1,5 @@
import { describe, expect, it } from 'vitest';
-import { hasSpansEnabled } from '../../../src';
-import { hasTracingEnabled } from '../../../src';
+import { hasSpansEnabled, hasTracingEnabled } from '../../../src';
describe('hasSpansEnabled', () => {
const tracesSampler = () => 1;
diff --git a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts
index 7a07a6041293..195e93493e98 100644
--- a/packages/core/test/lib/utils/isSentryRequestUrl.test.ts
+++ b/packages/core/test/lib/utils/isSentryRequestUrl.test.ts
@@ -1,7 +1,6 @@
-import type { Client } from '../../../src/client';
-
import { describe, expect, it } from 'vitest';
import { isSentryRequestUrl } from '../../../src';
+import type { Client } from '../../../src/client';
describe('isSentryRequestUrl', () => {
it.each([
diff --git a/packages/core/test/lib/utils/merge.test.ts b/packages/core/test/lib/utils/merge.test.ts
index e89ff2e86561..8cd86121f199 100644
--- a/packages/core/test/lib/utils/merge.test.ts
+++ b/packages/core/test/lib/utils/merge.test.ts
@@ -1,6 +1,5 @@
-import { merge } from '../../../src/utils/merge';
-
import { describe, expect, it } from 'vitest';
+import { merge } from '../../../src/utils/merge';
describe('merge', () => {
it('works with empty objects', () => {
diff --git a/packages/core/test/lib/utils/spanUtils.test.ts b/packages/core/test/lib/utils/spanUtils.test.ts
index 46391ed75b6a..bca9a406dd50 100644
--- a/packages/core/test/lib/utils/spanUtils.test.ts
+++ b/packages/core/test/lib/utils/spanUtils.test.ts
@@ -1,35 +1,35 @@
import { beforeEach, describe, expect, it, test } from 'vitest';
import {
+ convertSpanLinksForEnvelope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+ SentrySpan,
+ setCurrentClient,
SPAN_STATUS_ERROR,
SPAN_STATUS_OK,
SPAN_STATUS_UNSET,
- SentrySpan,
- TRACEPARENT_REGEXP,
- convertSpanLinksForEnvelope,
- setCurrentClient,
spanToTraceHeader,
startInactiveSpan,
startSpan,
timestampInSeconds,
+ TRACEPARENT_REGEXP,
} from '../../../src';
import type { SpanLink } from '../../../src/types-hoist/link';
import type { Span, SpanAttributes, SpanTimeInput } from '../../../src/types-hoist/span';
import type { SpanStatus } from '../../../src/types-hoist/spanStatus';
import type { OpenTelemetrySdkTraceBaseSpan } from '../../../src/utils/spanUtils';
import {
- TRACE_FLAG_NONE,
- TRACE_FLAG_SAMPLED,
getRootSpan,
spanIsSampled,
spanTimeInputToSeconds,
spanToJSON,
spanToTraceContext,
+ TRACE_FLAG_NONE,
+ TRACE_FLAG_SAMPLED,
updateSpanName,
} from '../../../src/utils/spanUtils';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
function createMockedOtelSpan({
spanId,
diff --git a/packages/core/test/lib/utils/traceData.test.ts b/packages/core/test/lib/utils/traceData.test.ts
index f39b3b87851c..8d38bdb062d4 100644
--- a/packages/core/test/lib/utils/traceData.test.ts
+++ b/packages/core/test/lib/utils/traceData.test.ts
@@ -1,12 +1,12 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { Client } from '../../../src/';
import {
- SentrySpan,
getCurrentScope,
getGlobalScope,
getIsolationScope,
getMainCarrier,
getTraceData,
+ SentrySpan,
setAsyncContextStrategy,
setCurrentClient,
withActiveSpan,
@@ -15,7 +15,7 @@ import { getAsyncContextStrategy } from '../../../src/asyncContext';
import { freezeDscOnSpan } from '../../../src/tracing/dynamicSamplingContext';
import type { Span } from '../../../src/types-hoist/span';
import type { TestClientOptions } from '../../mocks/client';
-import { TestClient, getDefaultTestClientOptions } from '../../mocks/client';
+import { getDefaultTestClientOptions, TestClient } from '../../mocks/client';
const dsn = 'https://123@sentry.io/42';
diff --git a/packages/core/test/utils-hoist/aggregate-errors.test.ts b/packages/core/test/utils-hoist/aggregate-errors.test.ts
index 90c351ccc0fc..007d81678082 100644
--- a/packages/core/test/utils-hoist/aggregate-errors.test.ts
+++ b/packages/core/test/utils-hoist/aggregate-errors.test.ts
@@ -1,7 +1,7 @@
import { describe, expect, test } from 'vitest';
+import type { ExtendedError } from '../../src/types-hoist/error';
import type { Event, EventHint } from '../../src/types-hoist/event';
import type { Exception } from '../../src/types-hoist/exception';
-import type { ExtendedError } from '../../src/types-hoist/error';
import type { StackParser } from '../../src/types-hoist/stacktrace';
import { applyAggregateErrorsToEvent } from '../../src/utils-hoist/aggregate-errors';
import { createStackParser } from '../../src/utils-hoist/stacktrace';
diff --git a/packages/core/test/utils-hoist/browser.test.ts b/packages/core/test/utils-hoist/browser.test.ts
index 58b9a0a34ee5..d7fc8aab022c 100644
--- a/packages/core/test/utils-hoist/browser.test.ts
+++ b/packages/core/test/utils-hoist/browser.test.ts
@@ -1,5 +1,4 @@
import { JSDOM } from 'jsdom';
-
import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
import { htmlTreeAsString } from '../../src/utils-hoist/browser';
diff --git a/packages/core/test/utils-hoist/clientreport.test.ts b/packages/core/test/utils-hoist/clientreport.test.ts
index e7f163502d66..49f6a67b35cb 100644
--- a/packages/core/test/utils-hoist/clientreport.test.ts
+++ b/packages/core/test/utils-hoist/clientreport.test.ts
@@ -1,6 +1,5 @@
-import type { ClientReport } from '../../src/types-hoist/clientreport';
-
import { describe, expect, it } from 'vitest';
+import type { ClientReport } from '../../src/types-hoist/clientreport';
import { createClientReportEnvelope } from '../../src/utils-hoist/clientreport';
import { parseEnvelope, serializeEnvelope } from '../../src/utils-hoist/envelope';
diff --git a/packages/core/test/utils-hoist/envelope.test.ts b/packages/core/test/utils-hoist/envelope.test.ts
index 62907f2730e7..00a745807fcd 100644
--- a/packages/core/test/utils-hoist/envelope.test.ts
+++ b/packages/core/test/utils-hoist/envelope.test.ts
@@ -1,16 +1,15 @@
-import type { Event } from '../../src/types-hoist/event';
-import type { EventEnvelope } from '../../src/types-hoist/envelope';
-import type { SpanAttributes } from '../../src/types-hoist/span';
-
import {
SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
+ SentrySpan,
spanToJSON,
} from '@sentry/core';
-import { SentrySpan } from '@sentry/core';
-import { describe, expect, it, test, vi, afterEach } from 'vitest';
+import { afterEach, describe, expect, it, test, vi } from 'vitest';
import { getSentryCarrier } from '../../src/carrier';
+import type { EventEnvelope } from '../../src/types-hoist/envelope';
+import type { Event } from '../../src/types-hoist/event';
+import type { SpanAttributes } from '../../src/types-hoist/span';
import {
addItemToEnvelope,
createEnvelope,
diff --git a/packages/core/test/utils-hoist/misc.test.ts b/packages/core/test/utils-hoist/misc.test.ts
index dbf32b0d2db9..6aece21ecb81 100644
--- a/packages/core/test/utils-hoist/misc.test.ts
+++ b/packages/core/test/utils-hoist/misc.test.ts
@@ -1,8 +1,7 @@
+import { describe, expect, it, test } from 'vitest';
import type { Event } from '../../src/types-hoist/event';
import type { Mechanism } from '../../src/types-hoist/mechanism';
import type { StackFrame } from '../../src/types-hoist/stackframe';
-
-import { describe, expect, it, test } from 'vitest';
import {
addContextToFrame,
addExceptionMechanism,
diff --git a/packages/core/test/utils-hoist/object.test.ts b/packages/core/test/utils-hoist/object.test.ts
index a083b74e800d..c6c5d05b6af0 100644
--- a/packages/core/test/utils-hoist/object.test.ts
+++ b/packages/core/test/utils-hoist/object.test.ts
@@ -2,9 +2,8 @@
* @vitest-environment jsdom
*/
-import type { WrappedFunction } from '../../src/types-hoist/wrappedfunction';
-
import { describe, expect, it, test, vi } from 'vitest';
+import type { WrappedFunction } from '../../src/types-hoist/wrappedfunction';
import {
addNonEnumerableProperty,
dropUndefinedKeys,
diff --git a/packages/core/test/utils-hoist/supports.test.ts b/packages/core/test/utils-hoist/supports.test.ts
index b2b444ab9b99..fffc6be02e1e 100644
--- a/packages/core/test/utils-hoist/supports.test.ts
+++ b/packages/core/test/utils-hoist/supports.test.ts
@@ -1,6 +1,6 @@
import { afterEach } from 'node:test';
+import { describe, expect, it } from 'vitest';
import { supportsHistory } from '../../src/utils-hoist/supports';
-import { describe, it, expect } from 'vitest';
describe('supportsHistory', () => {
const originalHistory = globalThis.history;
diff --git a/packages/core/test/utils-hoist/syncpromise.test.ts b/packages/core/test/utils-hoist/syncpromise.test.ts
index 862f1e3c8a01..e332de2c2141 100644
--- a/packages/core/test/utils-hoist/syncpromise.test.ts
+++ b/packages/core/test/utils-hoist/syncpromise.test.ts
@@ -1,5 +1,5 @@
import { describe, expect, test, vi } from 'vitest';
-import { SyncPromise, rejectedSyncPromise, resolvedSyncPromise } from '../../src/utils-hoist/syncpromise';
+import { rejectedSyncPromise, resolvedSyncPromise, SyncPromise } from '../../src/utils-hoist/syncpromise';
describe('SyncPromise', () => {
test('simple', async () => {
diff --git a/packages/core/test/utils-hoist/url.test.ts b/packages/core/test/utils-hoist/url.test.ts
index 14af8c5c2403..7f1d1dae8b40 100644
--- a/packages/core/test/utils-hoist/url.test.ts
+++ b/packages/core/test/utils-hoist/url.test.ts
@@ -1,11 +1,11 @@
import { describe, expect, it } from 'vitest';
import {
getSanitizedUrlString,
+ getSanitizedUrlStringFromUrlObject,
+ isURLObjectRelative,
+ parseStringToURLObject,
parseUrl,
stripUrlQueryAndFragment,
- parseStringToURLObject,
- isURLObjectRelative,
- getSanitizedUrlStringFromUrlObject,
} from '../../src/utils-hoist/url';
describe('stripQueryStringAndFragment', () => {
diff --git a/packages/deno/src/client.ts b/packages/deno/src/client.ts
index 6f4e37f1ed74..b87cfcc6e163 100644
--- a/packages/deno/src/client.ts
+++ b/packages/deno/src/client.ts
@@ -1,6 +1,5 @@
import type { ServerRuntimeClientOptions } from '@sentry/core';
import { SDK_VERSION, ServerRuntimeClient } from '@sentry/core';
-
import type { DenoClientOptions } from './types';
function getHostName(): string | undefined {
diff --git a/packages/deno/src/integrations/context.ts b/packages/deno/src/integrations/context.ts
index d89c129d2f75..979ffff7d0e8 100644
--- a/packages/deno/src/integrations/context.ts
+++ b/packages/deno/src/integrations/context.ts
@@ -1,5 +1,5 @@
-import { defineIntegration } from '@sentry/core';
import type { Event, IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
const INTEGRATION_NAME = 'DenoContext';
diff --git a/packages/deno/src/integrations/contextlines.ts b/packages/deno/src/integrations/contextlines.ts
index d69782affe22..8b068a17f8cb 100644
--- a/packages/deno/src/integrations/contextlines.ts
+++ b/packages/deno/src/integrations/contextlines.ts
@@ -1,5 +1,5 @@
import type { Event, IntegrationFn, StackFrame } from '@sentry/core';
-import { LRUMap, addContextToFrame, defineIntegration } from '@sentry/core';
+import { addContextToFrame, defineIntegration, LRUMap } from '@sentry/core';
const INTEGRATION_NAME = 'ContextLines';
const FILE_CONTENT_CACHE = new LRUMap(100);
diff --git a/packages/deno/src/integrations/deno-cron.ts b/packages/deno/src/integrations/deno-cron.ts
index 25d4c9e7d854..ad856479aaee 100644
--- a/packages/deno/src/integrations/deno-cron.ts
+++ b/packages/deno/src/integrations/deno-cron.ts
@@ -1,5 +1,5 @@
-import { defineIntegration, getClient, withMonitor } from '@sentry/core';
import type { Client, IntegrationFn } from '@sentry/core';
+import { defineIntegration, getClient, withMonitor } from '@sentry/core';
import { parseScheduleToString } from './deno-cron-format';
type CronOptions = { backoffSchedule?: number[]; signal?: AbortSignal };
diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap
index 2142108a79f4..2ca89cf76f74 100644
--- a/packages/deno/test/__snapshots__/mod.test.ts.snap
+++ b/packages/deno/test/__snapshots__/mod.test.ts.snap
@@ -48,7 +48,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "?",
in_app: true,
- lineno: 44,
+ lineno: 42,
post_context: [
"",
" await delay(200);",
@@ -74,7 +74,7 @@ snapshot[`captureException 1`] = `
filename: "app:///test/mod.test.ts",
function: "something",
in_app: true,
- lineno: 41,
+ lineno: 39,
post_context: [
" }",
"",
diff --git a/packages/deno/test/mod.test.ts b/packages/deno/test/mod.test.ts
index ebbb3e560d49..0d40945951c4 100644
--- a/packages/deno/test/mod.test.ts
+++ b/packages/deno/test/mod.test.ts
@@ -1,10 +1,8 @@
-import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals.ts';
-import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts';
-
import type { Event } from '@sentry/core';
import { createStackParser, nodeStackLineParser } from '@sentry/core';
+import { assertEquals } from 'https://deno.land/std@0.202.0/assert/assert_equals.ts';
+import { assertSnapshot } from 'https://deno.land/std@0.202.0/testing/snapshot.ts';
import { DenoClient, getCurrentScope, getDefaultIntegrations } from '../build/esm/index.js';
-
import { getNormalizedEvent } from './normalize.ts';
import { makeTestTransport } from './transport.ts';
diff --git a/packages/ember/addon/index.ts b/packages/ember/addon/index.ts
index 9f1b536dc656..4a7a59566731 100644
--- a/packages/ember/addon/index.ts
+++ b/packages/ember/addon/index.ts
@@ -2,14 +2,17 @@ import { assert, warn } from '@ember/debug';
import type Route from '@ember/routing/route';
import { next } from '@ember/runloop';
import { getOwnConfig, isDevelopingApp, macroCondition } from '@embroider/macros';
-import { startSpan } from '@sentry/browser';
import type { BrowserOptions } from '@sentry/browser';
+import { startSpan } from '@sentry/browser';
import * as Sentry from '@sentry/browser';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, applySdkMetadata } from '@sentry/core';
-import { GLOBAL_OBJ } from '@sentry/core';
-import Ember from 'ember';
-
import type { Client, TransactionSource } from '@sentry/core';
+import {
+ applySdkMetadata,
+ GLOBAL_OBJ,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+} from '@sentry/core';
+import Ember from 'ember';
import type { EmberSentryConfig, GlobalConfig, OwnConfig } from './types';
function _getSentryInitConfig(): EmberSentryConfig['sentry'] {
diff --git a/packages/ember/addon/instance-initializers/sentry-performance.ts b/packages/ember/addon/instance-initializers/sentry-performance.ts
index 180bbe992ea3..666e9f245839 100644
--- a/packages/ember/addon/instance-initializers/sentry-performance.ts
+++ b/packages/ember/addon/instance-initializers/sentry-performance.ts
@@ -12,14 +12,14 @@ import type {
startBrowserTracingPageLoadSpan as startBrowserTracingPageLoadSpanType,
} from '@sentry/browser';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getClient,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
startInactiveSpan,
} from '@sentry/browser';
-import { GLOBAL_OBJ, addIntegration, browserPerformanceTimeOrigin, timestampInSeconds } from '@sentry/core';
import type { Span } from '@sentry/core';
+import { addIntegration, browserPerformanceTimeOrigin, GLOBAL_OBJ, timestampInSeconds } from '@sentry/core';
import type { ExtendedBackburner } from '@sentry/ember/runloop';
import type { EmberRouterMain, EmberSentryConfig, GlobalConfig, OwnConfig } from '../types';
diff --git a/packages/ember/tests/acceptance/sentry-errors-test.ts b/packages/ember/tests/acceptance/sentry-errors-test.ts
index 193f56e495cf..a1790b4b93f0 100644
--- a/packages/ember/tests/acceptance/sentry-errors-test.ts
+++ b/packages/ember/tests/acceptance/sentry-errors-test.ts
@@ -2,7 +2,6 @@ import { next } from '@ember/runloop';
import { click, visit } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';
-
import type { SentryTestContext } from '../helpers/setup-sentry';
import { setupSentryTest } from '../helpers/setup-sentry';
import { assertSentryErrorCount, assertSentryErrors } from '../helpers/utils';
diff --git a/packages/ember/tests/acceptance/sentry-performance-test.ts b/packages/ember/tests/acceptance/sentry-performance-test.ts
index 7ab6a2bf3dd3..424f4663484d 100644
--- a/packages/ember/tests/acceptance/sentry-performance-test.ts
+++ b/packages/ember/tests/acceptance/sentry-performance-test.ts
@@ -1,7 +1,6 @@
import { click, find, visit } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';
-
import { setupSentryTest } from '../helpers/setup-sentry';
import { assertSentryTransactionCount, assertSentryTransactions } from '../helpers/utils';
diff --git a/packages/ember/tests/acceptance/sentry-replay-test.ts b/packages/ember/tests/acceptance/sentry-replay-test.ts
index c807233cea25..87b8d849b799 100644
--- a/packages/ember/tests/acceptance/sentry-replay-test.ts
+++ b/packages/ember/tests/acceptance/sentry-replay-test.ts
@@ -1,9 +1,8 @@
import { visit } from '@ember/test-helpers';
-import * as Sentry from '@sentry/ember';
import type { BrowserClient, replayIntegration } from '@sentry/ember';
+import * as Sentry from '@sentry/ember';
import { setupApplicationTest } from 'ember-qunit';
import { module, test } from 'qunit';
-
import { setupSentryTest } from '../helpers/setup-sentry';
module('Acceptance | Sentry Session Replay', function (hooks) {
diff --git a/packages/ember/tests/dummy/app/app.ts b/packages/ember/tests/dummy/app/app.ts
index 2ff7875df400..6aacd6a729cc 100644
--- a/packages/ember/tests/dummy/app/app.ts
+++ b/packages/ember/tests/dummy/app/app.ts
@@ -2,7 +2,6 @@ import Application from '@ember/application';
import * as Sentry from '@sentry/ember';
import loadInitializers from 'ember-load-initializers';
import Resolver from 'ember-resolver';
-
import config from './config/environment';
Sentry.init({
diff --git a/packages/ember/tests/dummy/app/router.ts b/packages/ember/tests/dummy/app/router.ts
index fde2b0dba15e..3ae934046c3f 100644
--- a/packages/ember/tests/dummy/app/router.ts
+++ b/packages/ember/tests/dummy/app/router.ts
@@ -1,5 +1,4 @@
import EmberRouter from '@ember/routing/router';
-
import config from './config/environment';
export default class Router extends EmberRouter {
diff --git a/packages/ember/tests/dummy/app/routes/slow-loading-route.ts b/packages/ember/tests/dummy/app/routes/slow-loading-route.ts
index 96f57bd9cf2d..c0341dc2d13b 100644
--- a/packages/ember/tests/dummy/app/routes/slow-loading-route.ts
+++ b/packages/ember/tests/dummy/app/routes/slow-loading-route.ts
@@ -1,6 +1,5 @@
import Route from '@ember/routing/route';
import { instrumentRoutePerformance } from '@sentry/ember';
-
import timeout from '../helpers/utils';
const SLOW_TRANSITION_WAIT = 1500;
diff --git a/packages/ember/tests/dummy/app/routes/slow-loading-route/index.ts b/packages/ember/tests/dummy/app/routes/slow-loading-route/index.ts
index c810ca5e2505..e6de8a6b8e36 100644
--- a/packages/ember/tests/dummy/app/routes/slow-loading-route/index.ts
+++ b/packages/ember/tests/dummy/app/routes/slow-loading-route/index.ts
@@ -1,6 +1,5 @@
import Route from '@ember/routing/route';
import { instrumentRoutePerformance } from '@sentry/ember';
-
import timeout from '../../helpers/utils';
const SLOW_TRANSITION_WAIT = 1500;
diff --git a/packages/ember/tests/dummy/app/routes/with-loading/index.ts b/packages/ember/tests/dummy/app/routes/with-loading/index.ts
index b9cc53907855..6e3fb0eaf3fe 100644
--- a/packages/ember/tests/dummy/app/routes/with-loading/index.ts
+++ b/packages/ember/tests/dummy/app/routes/with-loading/index.ts
@@ -1,6 +1,5 @@
import Route from '@ember/routing/route';
import { instrumentRoutePerformance } from '@sentry/ember';
-
import timeout from '../../helpers/utils';
class WithLoadingIndexRoute extends Route {
diff --git a/packages/ember/tests/unit/instrument-route-performance-test.ts b/packages/ember/tests/unit/instrument-route-performance-test.ts
index 753bf9669548..962048f62357 100644
--- a/packages/ember/tests/unit/instrument-route-performance-test.ts
+++ b/packages/ember/tests/unit/instrument-route-performance-test.ts
@@ -3,7 +3,6 @@ import { instrumentRoutePerformance } from '@sentry/ember';
import { setupTest } from 'ember-qunit';
import { module, test } from 'qunit';
import sinon from 'sinon';
-
import type { SentryTestContext } from '../helpers/setup-sentry';
import { setupSentryTest } from '../helpers/setup-sentry';
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 5c30493ed794..d7202f854f44 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -30,7 +30,7 @@
"eslint-plugin-deprecation": "^1.5.0",
"eslint-plugin-import": "^2.22.0",
"eslint-plugin-jsdoc": "^30.0.3",
- "eslint-plugin-simple-import-sort": "^5.0.3"
+ "eslint-plugin-simple-import-sort": "^6.0.0"
},
"peerDependencies": {
"eslint": ">=5"
diff --git a/packages/eslint-config-sdk/src/import.js b/packages/eslint-config-sdk/src/import.js
index 2a0ab6ba2629..d0248e43572f 100644
--- a/packages/eslint-config-sdk/src/import.js
+++ b/packages/eslint-config-sdk/src/import.js
@@ -8,12 +8,7 @@ module.exports = {
extends: ['plugin:import/typescript'],
plugins: ['@typescript-eslint', 'jsdoc'],
parser: '@typescript-eslint/parser',
- rules: {
- // sort imports
- 'simple-import-sort/sort': 'error',
- 'sort-imports': 'off',
- 'import/order': 'off',
- },
+ rules: {},
},
{
// Configuration for files under src
@@ -28,8 +23,16 @@ module.exports = {
rules: {
// We shouldn't make assumptions about imports/exports being dereferenced.
'import/namespace': 'off',
-
- // imports should be ordered.
- 'import/order': ['error', { 'newlines-between': 'always' }],
+ // This is done by TS anyhow
+ 'import/no-unresolved': 'off',
+ // sort imports
+ 'sort-imports': 'off',
+ 'import/order': 'off',
+ // Avoid newlines between import groups
+ // See: https://github.com/lydell/eslint-plugin-simple-import-sort?tab=readme-ov-file#how-do-i-remove-all-blank-lines-between-imports
+ 'simple-import-sort/imports': ['error', { groups: [['^\\u0000', '^node:', '^@?\\w', '^', '^\\.']] }],
+ 'simple-import-sort/exports': 'off',
+ 'import/first': 'error',
+ 'import/newline-after-import': 'error',
},
};
diff --git a/packages/eslint-config-sdk/src/index.js b/packages/eslint-config-sdk/src/index.js
index 596aca5f8515..3cf17618f9a1 100644
--- a/packages/eslint-config-sdk/src/index.js
+++ b/packages/eslint-config-sdk/src/index.js
@@ -1,4 +1,4 @@
module.exports = {
root: true,
- extends: ['./base.js', './import.js', './prettier.js'],
+ extends: ['./base.js', './import.js'],
};
diff --git a/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts b/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts
index 08cfbf8f10e4..0c68676f14fa 100644
--- a/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts
+++ b/packages/eslint-plugin-sdk/test/lib/rules/no-eq-empty.test.ts
@@ -1,6 +1,5 @@
import { RuleTester } from 'eslint';
import { describe, test } from 'vitest';
-
// @ts-expect-error untyped module
import rule from '../../../src/rules/no-eq-empty';
diff --git a/packages/feedback/src/modal/components/Dialog.tsx b/packages/feedback/src/modal/components/Dialog.tsx
index 27fcc5991de0..11d8e2846932 100644
--- a/packages/feedback/src/modal/components/Dialog.tsx
+++ b/packages/feedback/src/modal/components/Dialog.tsx
@@ -1,11 +1,10 @@
import type { FeedbackFormData, FeedbackInternalOptions } from '@sentry/core';
-import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import type { VNode } from 'preact';
+import { Fragment, h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import { useCallback, useMemo, useState } from 'preact/hooks';
-
import { SUCCESS_MESSAGE_TIMEOUT } from '../../constants';
-import { DialogHeader } from './DialogHeader';
import type { Props as HeaderProps } from './DialogHeader';
+import { DialogHeader } from './DialogHeader';
import type { Props as FormProps } from './Form';
import { Form } from './Form';
import { SuccessIcon } from './SuccessIcon';
diff --git a/packages/feedback/src/modal/components/DialogHeader.tsx b/packages/feedback/src/modal/components/DialogHeader.tsx
index b282cc440ef6..8820b91d8a3a 100644
--- a/packages/feedback/src/modal/components/DialogHeader.tsx
+++ b/packages/feedback/src/modal/components/DialogHeader.tsx
@@ -1,6 +1,6 @@
import type { FeedbackInternalOptions } from '@sentry/core';
-import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import type { VNode } from 'preact';
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import { useMemo } from 'preact/hooks';
import { SentryLogo } from './SentryLogo';
diff --git a/packages/feedback/src/modal/components/Form.tsx b/packages/feedback/src/modal/components/Form.tsx
index 15b9b232591e..5cbf018b28cb 100644
--- a/packages/feedback/src/modal/components/Form.tsx
+++ b/packages/feedback/src/modal/components/Form.tsx
@@ -1,12 +1,12 @@
-import { logger } from '@sentry/core';
import type {
FeedbackFormData,
FeedbackInternalOptions,
FeedbackScreenshotIntegration,
SendFeedback,
} from '@sentry/core';
-import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { logger } from '@sentry/core';
import type { JSX, VNode } from 'preact';
+import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import { useCallback, useState } from 'preact/hooks';
import { FEEDBACK_WIDGET_SOURCE } from '../../constants';
import { DEBUG_BUILD } from '../../util/debug-build';
diff --git a/packages/feedback/src/modal/integration.tsx b/packages/feedback/src/modal/integration.tsx
index f4b228d814b6..7ee2bdb74963 100644
--- a/packages/feedback/src/modal/integration.tsx
+++ b/packages/feedback/src/modal/integration.tsx
@@ -1,5 +1,5 @@
-import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import type { FeedbackFormData, FeedbackModalIntegration, IntegrationFn, User } from '@sentry/core';
+import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { h, render } from 'preact';
import * as hooks from 'preact/hooks';
import { DOCUMENT } from '../constants';
diff --git a/packages/feedback/src/screenshot/components/IconClose.tsx b/packages/feedback/src/screenshot/components/IconClose.tsx
index dea383a61839..c8365e1280d5 100644
--- a/packages/feedback/src/screenshot/components/IconClose.tsx
+++ b/packages/feedback/src/screenshot/components/IconClose.tsx
@@ -1,4 +1,4 @@
-import type { VNode, h as hType } from 'preact';
+import type { h as hType, VNode } from 'preact';
interface FactoryParams {
h: typeof hType;
diff --git a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
index ef76eac7f42a..ae3d0f653dd8 100644
--- a/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
+++ b/packages/feedback/src/screenshot/components/ScreenshotEditor.tsx
@@ -1,5 +1,5 @@
import type { FeedbackInternalOptions, FeedbackModalIntegration } from '@sentry/core';
-import type { ComponentType, VNode, h as hType } from 'preact';
+import type { ComponentType, h as hType, VNode } from 'preact';
import { h } from 'preact'; // eslint-disable-line @typescript-eslint/no-unused-vars
import type * as Hooks from 'preact/hooks';
import { DOCUMENT, WINDOW } from '../../constants';
diff --git a/packages/feedback/src/screenshot/components/Toolbar.tsx b/packages/feedback/src/screenshot/components/Toolbar.tsx
index 1d85cb1392f6..864f834d9127 100644
--- a/packages/feedback/src/screenshot/components/Toolbar.tsx
+++ b/packages/feedback/src/screenshot/components/Toolbar.tsx
@@ -1,4 +1,4 @@
-import type { VNode, h as hType } from 'preact';
+import type { h as hType, VNode } from 'preact';
import type * as Hooks from 'preact/hooks';
interface FactoryParams {
diff --git a/packages/feedback/src/screenshot/integration.ts b/packages/feedback/src/screenshot/integration.ts
index 79cb7f9118ff..68c8c8535f8e 100644
--- a/packages/feedback/src/screenshot/integration.ts
+++ b/packages/feedback/src/screenshot/integration.ts
@@ -1,5 +1,4 @@
-import type { FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/core';
-import type { Attachment } from '@sentry/core';
+import type { Attachment, FeedbackScreenshotIntegration, IntegrationFn } from '@sentry/core';
import type { h as hType } from 'preact';
import type * as Hooks from 'preact/hooks';
import { DOCUMENT } from '../constants';
diff --git a/packages/feedback/test/core/components/Actor.test.ts b/packages/feedback/test/core/components/Actor.test.ts
index 06782f10393a..5afcc76bc1e1 100644
--- a/packages/feedback/test/core/components/Actor.test.ts
+++ b/packages/feedback/test/core/components/Actor.test.ts
@@ -1,8 +1,7 @@
/**
* @vitest-environment jsdom
*/
-import { vi, describe, it, expect } from 'vitest';
-
+import { describe, expect, it, vi } from 'vitest';
import { TRIGGER_LABEL } from '../../../src/constants';
import { getFeedback } from '../../../src/core/getFeedback';
import { buildFeedbackIntegration } from '../../../src/core/integration';
diff --git a/packages/feedback/test/core/getFeedback.test.ts b/packages/feedback/test/core/getFeedback.test.ts
index ce5ad0444755..0aea7bc8915d 100644
--- a/packages/feedback/test/core/getFeedback.test.ts
+++ b/packages/feedback/test/core/getFeedback.test.ts
@@ -1,6 +1,5 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
-
import { getCurrentScope } from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { getFeedback } from '../../src/core/getFeedback';
import { buildFeedbackIntegration } from '../../src/core/integration';
import { mockSdk } from './mockSdk';
diff --git a/packages/feedback/test/core/mockSdk.ts b/packages/feedback/test/core/mockSdk.ts
index 0846aa4a7c02..5e7a65b38212 100644
--- a/packages/feedback/test/core/mockSdk.ts
+++ b/packages/feedback/test/core/mockSdk.ts
@@ -1,7 +1,5 @@
-import { vi } from 'vitest';
-
import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core';
-
+import { vi } from 'vitest';
import type { TestClientOptions } from '../../src/core/TestClient';
import { getDefaultClientOptions, init } from '../../src/core/TestClient';
diff --git a/packages/feedback/test/core/sendFeedback.test.ts b/packages/feedback/test/core/sendFeedback.test.ts
index 37e552090782..d9bf4b80162a 100644
--- a/packages/feedback/test/core/sendFeedback.test.ts
+++ b/packages/feedback/test/core/sendFeedback.test.ts
@@ -1,8 +1,6 @@
/**
* @vitest-environment jsdom
*/
-import { vi, describe, it, expect, beforeEach, afterAll } from 'vitest';
-
import {
addBreadcrumb,
getClient,
@@ -12,11 +10,11 @@ import {
withIsolationScope,
withScope,
} from '@sentry/core';
-
-import { mockSdk } from './mockSdk';
+import { TextDecoder, TextEncoder } from 'util';
+import { afterAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { sendFeedback } from '../../src/core/sendFeedback';
+import { mockSdk } from './mockSdk';
-import { TextDecoder, TextEncoder } from 'util';
const patchedEncoder = (!global.window.TextEncoder && (global.window.TextEncoder = TextEncoder)) || true;
// @ts-expect-error patch the encoder on the window, else importing JSDOM fails (deleted in afterAll)
const patchedDecoder = (!global.window.TextDecoder && (global.window.TextDecoder = TextDecoder)) || true;
diff --git a/packages/feedback/vite.config.ts b/packages/feedback/vite.config.ts
index a5523c61f601..841ff483d7c4 100644
--- a/packages/feedback/vite.config.ts
+++ b/packages/feedback/vite.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/gatsby/src/sdk.ts b/packages/gatsby/src/sdk.ts
index ff2bea5b68fe..6fa7f2ac4b6f 100644
--- a/packages/gatsby/src/sdk.ts
+++ b/packages/gatsby/src/sdk.ts
@@ -1,7 +1,6 @@
+import type { Client } from '@sentry/core';
import { applySdkMetadata } from '@sentry/core';
import { init as reactInit } from '@sentry/react';
-
-import type { Client } from '@sentry/core';
import type { GatsbyOptions } from './utils/types';
/**
diff --git a/packages/gatsby/test/gatsby-node.test.ts b/packages/gatsby/test/gatsby-node.test.ts
index e9170e3a40ad..262ea4cec55b 100644
--- a/packages/gatsby/test/gatsby-node.test.ts
+++ b/packages/gatsby/test/gatsby-node.test.ts
@@ -1,4 +1,5 @@
-import { describe, afterAll, afterEach, beforeEach, beforeAll, vi, it, expect } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+import { onCreateWebpackConfig } from '../gatsby-node';
vi.hoisted(
() =>
@@ -21,8 +22,6 @@ async function mock(mockedUri: string, stub: any) {
};
}
-import { onCreateWebpackConfig } from '../gatsby-node';
-
describe('onCreateWebpackConfig', () => {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const { sentryWebpackPlugin } = require('@sentry/webpack-plugin');
diff --git a/packages/gatsby/test/index.test.ts b/packages/gatsby/test/index.test.ts
index c82f31c7f41d..6914b6f1391b 100644
--- a/packages/gatsby/test/index.test.ts
+++ b/packages/gatsby/test/index.test.ts
@@ -1,5 +1,4 @@
-import { describe, it, expect } from 'vitest';
-
+import { describe, expect, it } from 'vitest';
import * as GatsbyIntegration from '../src/index';
describe('package', () => {
diff --git a/packages/gatsby/test/sdk.test.ts b/packages/gatsby/test/sdk.test.ts
index 465a06a05c0b..15d9b76bb23d 100644
--- a/packages/gatsby/test/sdk.test.ts
+++ b/packages/gatsby/test/sdk.test.ts
@@ -1,8 +1,6 @@
+import { init, SDK_VERSION } from '@sentry/react';
import type { Mock } from 'vitest';
-import { describe, afterEach, expect, vi, test } from 'vitest';
-
-import { SDK_VERSION, init } from '@sentry/react';
-
+import { afterEach, describe, expect, test, vi } from 'vitest';
import { init as gatsbyInit } from '../src/sdk';
vi.mock('@sentry/react', async requiredActual => {
diff --git a/packages/gatsby/vite.config.ts b/packages/gatsby/vite.config.ts
index 43826c13a3bb..ae3a478c7e61 100644
--- a/packages/gatsby/vite.config.ts
+++ b/packages/gatsby/vite.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
index 8b4daf27c9b0..8e8bfca26d70 100644
--- a/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/cloud_events.ts
@@ -1,7 +1,10 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, handleCallbackErrors } from '@sentry/core';
-import { logger } from '@sentry/core';
+import {
+ handleCallbackErrors,
+ logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+} from '@sentry/core';
import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node';
-
import { DEBUG_BUILD } from '../debug-build';
import { domainify, markEventUnhandled, proxyFunction } from '../utils';
import type { CloudEventFunction, CloudEventFunctionWithCallback, WrapperOptions } from './general';
diff --git a/packages/google-cloud-serverless/src/gcpfunction/events.ts b/packages/google-cloud-serverless/src/gcpfunction/events.ts
index 319329ccf28f..674e9033d7c0 100644
--- a/packages/google-cloud-serverless/src/gcpfunction/events.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/events.ts
@@ -1,7 +1,10 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, handleCallbackErrors } from '@sentry/core';
-import { logger } from '@sentry/core';
+import {
+ handleCallbackErrors,
+ logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+} from '@sentry/core';
import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node';
-
import { DEBUG_BUILD } from '../debug-build';
import { domainify, markEventUnhandled, proxyFunction } from '../utils';
import type { EventFunction, EventFunctionWithCallback, WrapperOptions } from './general';
diff --git a/packages/google-cloud-serverless/src/gcpfunction/http.ts b/packages/google-cloud-serverless/src/gcpfunction/http.ts
index 3679ef61e173..18ad8e4cefd2 100644
--- a/packages/google-cloud-serverless/src/gcpfunction/http.ts
+++ b/packages/google-cloud-serverless/src/gcpfunction/http.ts
@@ -1,10 +1,10 @@
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
handleCallbackErrors,
httpRequestToRequestData,
isString,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setHttpStatus,
stripUrlQueryAndFragment,
} from '@sentry/core';
diff --git a/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
index 6261660b5f98..03e1ffca69b3 100644
--- a/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
+++ b/packages/google-cloud-serverless/src/integrations/google-cloud-grpc.ts
@@ -1,7 +1,7 @@
-import type { EventEmitter } from 'events';
import type { Client, IntegrationFn } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, fill, getClient } from '@sentry/core';
+import { defineIntegration, fill, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { startInactiveSpan } from '@sentry/node';
+import type { EventEmitter } from 'events';
export interface GrpcFunction extends CallableFunction {
(...args: unknown[]): EventEmitter;
diff --git a/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
index 44f943933049..ef3fc5383522 100644
--- a/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
+++ b/packages/google-cloud-serverless/src/integrations/google-cloud-http.ts
@@ -1,11 +1,11 @@
import type * as common from '@google-cloud/common';
import type { Client, IntegrationFn } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SentryNonRecordingSpan,
defineIntegration,
fill,
getClient,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SentryNonRecordingSpan,
} from '@sentry/core';
import { startInactiveSpan } from '@sentry/node';
diff --git a/packages/google-cloud-serverless/src/sdk.ts b/packages/google-cloud-serverless/src/sdk.ts
index c7d4d7c9c50f..2699eb4f9e2f 100644
--- a/packages/google-cloud-serverless/src/sdk.ts
+++ b/packages/google-cloud-serverless/src/sdk.ts
@@ -2,7 +2,6 @@ import type { Integration, Options } from '@sentry/core';
import { applySdkMetadata } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrationsWithoutPerformance, init as initNode } from '@sentry/node';
-
import { googleCloudGrpcIntegration } from './integrations/google-cloud-grpc';
import { googleCloudHttpIntegration } from './integrations/google-cloud-http';
diff --git a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
index 34aad6f13adb..758b37c0253b 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
@@ -1,6 +1,5 @@
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { describe, vi, beforeEach, test, expect } from 'vitest';
-
+import { beforeEach, describe, expect, test, vi } from 'vitest';
import { wrapCloudEventFunction } from '../../src/gcpfunction/cloud_events';
import type { CloudEventFunction, CloudEventFunctionWithCallback } from '../../src/gcpfunction/general';
diff --git a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
index 99274c714637..e3e8ed70897c 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
@@ -1,7 +1,6 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { describe, vi, beforeEach, test, expect } from 'vitest';
-
import type { Event } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
import { wrapEventFunction } from '../../src/gcpfunction/events';
import type { EventFunction, EventFunctionWithCallback } from '../../src/gcpfunction/general';
diff --git a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
index 914c1baffed0..ca7a3f4d6c60 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
@@ -1,9 +1,8 @@
import type { Integration } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { describe, vi, beforeEach, test, expect, type MockInstance } from 'vitest';
-
-import { wrapHttpFunction } from '../../src/gcpfunction/http';
+import { type MockInstance, beforeEach, describe, expect, test, vi } from 'vitest';
import type { HttpFunction, Request, Response } from '../../src/gcpfunction/general';
+import { wrapHttpFunction } from '../../src/gcpfunction/http';
import { init } from '../../src/sdk';
const mockStartSpanManual = vi.fn((...spanArgs) => ({ ...spanArgs }));
diff --git a/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
index af37bc71a7c5..1419f05b4323 100644
--- a/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
+++ b/packages/google-cloud-serverless/test/integrations/google-cloud-grpc.test.ts
@@ -1,9 +1,8 @@
-import { vi, describe, beforeEach, test, expect } from 'vitest';
+import { createTransport, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, setCurrentClient } from '@sentry/core';
import { NodeClient } from '@sentry/node';
-import { createTransport } from '@sentry/core';
-import { setCurrentClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { googleCloudGrpcIntegration, fillGrpcFunction } from '../../src/integrations/google-cloud-grpc';
-import type { GrpcFunctionObject, Stub, GrpcFunction } from '../../src/integrations/google-cloud-grpc';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
+import type { GrpcFunction, GrpcFunctionObject, Stub } from '../../src/integrations/google-cloud-grpc';
+import { fillGrpcFunction, googleCloudGrpcIntegration } from '../../src/integrations/google-cloud-grpc';
const mockSpanEnd = vi.fn();
const mockStartInactiveSpan = vi.fn();
diff --git a/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
index 164d1c10dfc2..72a96e0b8e86 100644
--- a/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
+++ b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
@@ -1,13 +1,12 @@
-import * as fs from 'fs';
-import * as path from 'path';
import { BigQuery } from '@google-cloud/bigquery';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { createTransport, NodeClient, setCurrentClient } from '@sentry/node';
+import * as fs from 'fs';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore ESM/CJS interop issue
import nock from 'nock';
-import { describe, vi, beforeEach, test, expect, afterAll } from 'vitest';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { NodeClient, createTransport, setCurrentClient } from '@sentry/node';
+import * as path from 'path';
+import { afterAll, beforeEach, describe, expect, test, vi } from 'vitest';
import { googleCloudHttpIntegration } from '../../src/integrations/google-cloud-http';
const mockSpanEnd = vi.fn();
diff --git a/packages/google-cloud-serverless/test/sdk.test.ts b/packages/google-cloud-serverless/test/sdk.test.ts
index 522915116e24..9759ac2a5a43 100644
--- a/packages/google-cloud-serverless/test/sdk.test.ts
+++ b/packages/google-cloud-serverless/test/sdk.test.ts
@@ -1,5 +1,4 @@
-import { vi, describe, beforeEach, test, expect } from 'vitest';
-
+import { beforeEach, describe, expect, test, vi } from 'vitest';
import { init } from '../src/sdk';
const mockInit = vi.fn();
diff --git a/packages/integration-shims/src/BrowserTracing.ts b/packages/integration-shims/src/BrowserTracing.ts
index 49f1c097a9e5..f92f3a63d6d8 100644
--- a/packages/integration-shims/src/BrowserTracing.ts
+++ b/packages/integration-shims/src/BrowserTracing.ts
@@ -1,5 +1,4 @@
-import { defineIntegration } from '@sentry/core';
-import { consoleSandbox } from '@sentry/core';
+import { consoleSandbox, defineIntegration } from '@sentry/core';
/**
* This is a shim for the BrowserTracing integration.
diff --git a/packages/integration-shims/src/Feedback.ts b/packages/integration-shims/src/Feedback.ts
index ca29e7cada8b..327b2d40401f 100644
--- a/packages/integration-shims/src/Feedback.ts
+++ b/packages/integration-shims/src/Feedback.ts
@@ -1,5 +1,5 @@
-import { consoleSandbox } from '@sentry/core';
import type { Integration } from '@sentry/core';
+import { consoleSandbox } from '@sentry/core';
import { FAKE_FUNCTION } from './common';
const FEEDBACK_INTEGRATION_METHODS = ['attachTo', 'createForm', 'createWidget', 'remove'] as const;
diff --git a/packages/integration-shims/src/Replay.ts b/packages/integration-shims/src/Replay.ts
index d71a41535937..6774b9308c23 100644
--- a/packages/integration-shims/src/Replay.ts
+++ b/packages/integration-shims/src/Replay.ts
@@ -1,5 +1,5 @@
-import { consoleSandbox } from '@sentry/core';
import type { Integration } from '@sentry/core';
+import { consoleSandbox } from '@sentry/core';
import { FAKE_FUNCTION } from './common';
const REPLAY_INTEGRATION_METHODS = ['start', 'stop', 'flush'] as const;
diff --git a/packages/nestjs/src/decorators.ts b/packages/nestjs/src/decorators.ts
index 69d54377332d..b11b69046c8c 100644
--- a/packages/nestjs/src/decorators.ts
+++ b/packages/nestjs/src/decorators.ts
@@ -1,5 +1,5 @@
-import { captureException } from '@sentry/core';
import type { MonitorConfig } from '@sentry/core';
+import { captureException } from '@sentry/core';
import * as Sentry from '@sentry/node';
import { startSpan } from '@sentry/node';
import { isExpectedError } from './helpers';
diff --git a/packages/nestjs/src/integrations/helpers.ts b/packages/nestjs/src/integrations/helpers.ts
index 7e5e63db43e5..31c4e265f8f2 100644
--- a/packages/nestjs/src/integrations/helpers.ts
+++ b/packages/nestjs/src/integrations/helpers.ts
@@ -1,8 +1,8 @@
import type { Span } from '@sentry/core';
import {
+ addNonEnumerableProperty,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- addNonEnumerableProperty,
withActiveSpan,
} from '@sentry/core';
import type { CatchTarget, InjectableTarget, NextFunction, Observable, Subscription } from './types';
diff --git a/packages/nestjs/src/integrations/sentry-nest-core-instrumentation.ts b/packages/nestjs/src/integrations/sentry-nest-core-instrumentation.ts
index a7fdb66558ba..aec664633342 100644
--- a/packages/nestjs/src/integrations/sentry-nest-core-instrumentation.ts
+++ b/packages/nestjs/src/integrations/sentry-nest-core-instrumentation.ts
@@ -31,7 +31,6 @@ import {
isWrapped,
} from '@opentelemetry/instrumentation';
import { ATTR_HTTP_REQUEST_METHOD, ATTR_HTTP_ROUTE, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
-
import { SDK_VERSION } from '@sentry/core';
const supportedVersions = ['>=4.0.0 <12'];
diff --git a/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts b/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts
index 0e3d077ddbb6..05e319e8d774 100644
--- a/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts
+++ b/packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts
@@ -5,7 +5,7 @@ import {
InstrumentationNodeModuleDefinition,
InstrumentationNodeModuleFile,
} from '@opentelemetry/instrumentation';
-import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
+import { captureException, SDK_VERSION, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
import type { OnEventTarget } from './types';
diff --git a/packages/nestjs/src/integrations/sentry-nest-instrumentation.ts b/packages/nestjs/src/integrations/sentry-nest-instrumentation.ts
index 58060f844888..b333e2157ed0 100644
--- a/packages/nestjs/src/integrations/sentry-nest-instrumentation.ts
+++ b/packages/nestjs/src/integrations/sentry-nest-instrumentation.ts
@@ -7,9 +7,9 @@ import {
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
- SDK_VERSION,
getActiveSpan,
isThenable,
+ SDK_VERSION,
startInactiveSpan,
startSpan,
startSpanManual,
diff --git a/packages/nestjs/src/sdk.ts b/packages/nestjs/src/sdk.ts
index d9c00369e8b3..733cb935003c 100644
--- a/packages/nestjs/src/sdk.ts
+++ b/packages/nestjs/src/sdk.ts
@@ -1,10 +1,10 @@
+import type { Integration } from '@sentry/core';
import {
+ applySdkMetadata,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- applySdkMetadata,
spanToJSON,
} from '@sentry/core';
-import type { Integration } from '@sentry/core';
import type { NodeClient, NodeOptions, Span } from '@sentry/node';
import { getDefaultIntegrations as getDefaultNodeIntegrations, init as nodeInit } from '@sentry/node';
import { nestIntegration } from './integrations/nest';
diff --git a/packages/nestjs/test/decorators.test.ts b/packages/nestjs/test/decorators.test.ts
index e3e99b700273..329f2fbe8fa4 100644
--- a/packages/nestjs/test/decorators.test.ts
+++ b/packages/nestjs/test/decorators.test.ts
@@ -1,8 +1,8 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { SentryCron, SentryExceptionCaptured, SentryTraced } from '../src/decorators';
+import 'reflect-metadata';
import * as core from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { SentryCron, SentryExceptionCaptured, SentryTraced } from '../src/decorators';
import * as helpers from '../src/helpers';
-import 'reflect-metadata';
describe('SentryTraced decorator', () => {
beforeEach(() => {
diff --git a/packages/nestjs/test/integrations/nest.test.ts b/packages/nestjs/test/integrations/nest.test.ts
index f4b60dde05df..58b004232449 100644
--- a/packages/nestjs/test/integrations/nest.test.ts
+++ b/packages/nestjs/test/integrations/nest.test.ts
@@ -1,6 +1,5 @@
-import { beforeEach, describe, expect, it, vi, afterEach } from 'vitest';
-
import * as core from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { isPatched } from '../../src/integrations/helpers';
import { SentryNestEventInstrumentation } from '../../src/integrations/sentry-nest-event-instrumentation';
import type { InjectableTarget, OnEventTarget } from '../../src/integrations/types';
diff --git a/packages/nestjs/test/sdk.test.ts b/packages/nestjs/test/sdk.test.ts
index 0f61ee249261..1692c9be6fdd 100644
--- a/packages/nestjs/test/sdk.test.ts
+++ b/packages/nestjs/test/sdk.test.ts
@@ -1,8 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { SDK_VERSION } from '@sentry/core';
import * as SentryNode from '@sentry/node';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { init as nestInit } from '../src/sdk';
const nodeInit = vi.spyOn(SentryNode, 'init');
diff --git a/packages/nestjs/test/sentry-global-filter.test.ts b/packages/nestjs/test/sentry-global-filter.test.ts
index f144e9fad8ec..fc8a3444aecd 100644
--- a/packages/nestjs/test/sentry-global-filter.test.ts
+++ b/packages/nestjs/test/sentry-global-filter.test.ts
@@ -1,10 +1,10 @@
/* eslint-disable @typescript-eslint/unbound-method */
-import { describe, it, expect, beforeEach, vi } from 'vitest';
import type { ArgumentsHost } from '@nestjs/common';
import { HttpException, HttpStatus, Logger } from '@nestjs/common';
-import { SentryGlobalFilter } from '../src/setup';
import * as SentryCore from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import * as Helpers from '../src/helpers';
+import { SentryGlobalFilter } from '../src/setup';
vi.mock('../src/helpers', () => ({
isExpectedError: vi.fn(),
diff --git a/packages/nextjs/.eslintrc.js b/packages/nextjs/.eslintrc.js
index 1525e502018f..d255f74ce829 100644
--- a/packages/nextjs/.eslintrc.js
+++ b/packages/nextjs/.eslintrc.js
@@ -14,5 +14,12 @@ module.exports = {
project: ['../../tsconfig.dev.json'],
},
},
+ {
+ files: ['src/config/templates/**/*.ts'],
+ rules: {
+ // This complains about importing from @sentry/nextjs, so we skip this for template files
+ 'import/no-extraneous-dependencies': 'off',
+ },
+ },
],
};
diff --git a/packages/nextjs/src/client/clientNormalizationIntegration.ts b/packages/nextjs/src/client/clientNormalizationIntegration.ts
index a7cd2c356f4e..1d80ac3736c4 100644
--- a/packages/nextjs/src/client/clientNormalizationIntegration.ts
+++ b/packages/nextjs/src/client/clientNormalizationIntegration.ts
@@ -1,5 +1,5 @@
-import { rewriteFramesIntegration } from '@sentry/browser';
import { defineIntegration } from '@sentry/core';
+import { rewriteFramesIntegration } from '@sentry/react';
export const nextjsClientStackFrameNormalizationIntegration = defineIntegration(
({
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index e8712a3dca65..e650c4e23a10 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -1,7 +1,5 @@
import type { Client, EventProcessor, Integration } from '@sentry/core';
-import { consoleSandbox } from '@sentry/core';
-import { getGlobalScope } from '@sentry/core';
-import { GLOBAL_OBJ, addEventProcessor, applySdkMetadata } from '@sentry/core';
+import { addEventProcessor, applySdkMetadata, consoleSandbox, getGlobalScope, GLOBAL_OBJ } from '@sentry/core';
import type { BrowserOptions } from '@sentry/react';
import { getDefaultIntegrations as getReactDefaultIntegrations, init as reactInit } from '@sentry/react';
import { devErrorSymbolicationEventProcessor } from '../common/devErrorSymbolicationEventProcessor';
diff --git a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
index 55ed7dccc847..a793a73a4488 100644
--- a/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/appRouterRoutingInstrumentation.ts
@@ -1,11 +1,12 @@
+import type { Client, Span } from '@sentry/core';
import {
+ browserPerformanceTimeOrigin,
+ GLOBAL_OBJ,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
-import { GLOBAL_OBJ, browserPerformanceTimeOrigin } from '@sentry/core';
-import type { Client, Span } from '@sentry/core';
-import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
+import { startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, WINDOW } from '@sentry/react';
export const INCOMPLETE_APP_ROUTER_INSTRUMENTATION_TRANSACTION_NAME = 'incomplete-app-router-transaction';
diff --git a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
index d37fd2de2276..72a15550172c 100644
--- a/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/nextRoutingInstrumentation.ts
@@ -1,6 +1,5 @@
import type { Client } from '@sentry/core';
import { WINDOW } from '@sentry/react';
-
import { appRouterInstrumentNavigation, appRouterInstrumentPageLoad } from './appRouterRoutingInstrumentation';
import { pagesRouterInstrumentNavigation, pagesRouterInstrumentPageLoad } from './pagesRouterRoutingInstrumentation';
diff --git a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
index 018868fb0679..75147930528b 100644
--- a/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
+++ b/packages/nextjs/src/client/routing/pagesRouterRoutingInstrumentation.ts
@@ -1,17 +1,18 @@
-import type { ParsedUrlQuery } from 'querystring';
import type { Client, TransactionSource } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
browserPerformanceTimeOrigin,
logger,
parseBaggageHeader,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
stripUrlQueryAndFragment,
} from '@sentry/core';
-import { WINDOW, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
+import { startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, WINDOW } from '@sentry/react';
import type { NEXT_DATA } from 'next/dist/shared/lib/utils';
import RouterImport from 'next/router';
+import type { ParsedUrlQuery } from 'querystring';
+import { DEBUG_BUILD } from '../../common/debug-build';
// next/router v10 is CJS
//
@@ -20,8 +21,6 @@ const Router: typeof RouterImport = RouterImport.events
? RouterImport
: (RouterImport as unknown as { default: typeof RouterImport }).default;
-import { DEBUG_BUILD } from '../../common/debug-build';
-
const globalObject = WINDOW as typeof WINDOW & {
__BUILD_MANIFEST?: {
sortedPages?: string[];
diff --git a/packages/nextjs/src/client/tunnelRoute.ts b/packages/nextjs/src/client/tunnelRoute.ts
index 7d9a79d1fca6..b9cd43c35b7d 100644
--- a/packages/nextjs/src/client/tunnelRoute.ts
+++ b/packages/nextjs/src/client/tunnelRoute.ts
@@ -1,6 +1,5 @@
-import { GLOBAL_OBJ, dsnFromString, logger } from '@sentry/core';
+import { dsnFromString, GLOBAL_OBJ, logger } from '@sentry/core';
import type { BrowserOptions } from '@sentry/react';
-
import { DEBUG_BUILD } from '../common/debug-build';
const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
diff --git a/packages/nextjs/src/common/captureRequestError.ts b/packages/nextjs/src/common/captureRequestError.ts
index c872d70f8334..fec9d46d0e65 100644
--- a/packages/nextjs/src/common/captureRequestError.ts
+++ b/packages/nextjs/src/common/captureRequestError.ts
@@ -1,6 +1,5 @@
import type { RequestEventData } from '@sentry/core';
-import { vercelWaitUntil } from '@sentry/core';
-import { captureException, headersToDict, withScope } from '@sentry/core';
+import { captureException, headersToDict, vercelWaitUntil, withScope } from '@sentry/core';
import { flushSafelyWithTimeout } from './utils/responseEnd';
type RequestInfo = {
diff --git a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
index a065e1f07eb5..aa190d88262d 100644
--- a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
+++ b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
@@ -1,7 +1,5 @@
import type { Event, EventHint } from '@sentry/core';
-import { parseSemver } from '@sentry/core';
-import { GLOBAL_OBJ, suppressTracing } from '@sentry/core';
-import { logger } from '@sentry/core';
+import { GLOBAL_OBJ, logger, parseSemver, suppressTracing } from '@sentry/core';
import type { StackFrame } from 'stacktrace-parser';
import * as stackTraceParser from 'stacktrace-parser';
import { DEBUG_BUILD } from './debug-build';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
index 856e80ee72f8..78de31b78e11 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
@@ -1,6 +1,4 @@
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
continueTrace,
getActiveSpan,
@@ -8,6 +6,8 @@ import {
isString,
logger,
objectify,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setHttpStatus,
startSpanManual,
vercelWaitUntil,
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentryVercelCrons.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentryVercelCrons.ts
index 9a89350289d4..c85bdc4f2ad3 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentryVercelCrons.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentryVercelCrons.ts
@@ -1,6 +1,5 @@
import { captureCheckIn } from '@sentry/core';
import type { NextApiRequest } from 'next';
-
import type { VercelCronsConfig } from '../types';
type EdgeRequest = {
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapAppGetInitialPropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapAppGetInitialPropsWithSentry.ts
index bc0f9ff170c6..02c54e76b3d6 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapAppGetInitialPropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapAppGetInitialPropsWithSentry.ts
@@ -1,5 +1,4 @@
import type App from 'next/app';
-
import { isBuild } from '../utils/isBuild';
import { withErrorInstrumentation, withTracedServerSideDataFetcher } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapDocumentGetInitialPropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapDocumentGetInitialPropsWithSentry.ts
index d7f69c621132..5e38acc4a55b 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapDocumentGetInitialPropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapDocumentGetInitialPropsWithSentry.ts
@@ -1,5 +1,4 @@
import type Document from 'next/document';
-
import { isBuild } from '../utils/isBuild';
import { withErrorInstrumentation, withTracedServerSideDataFetcher } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapErrorGetInitialPropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapErrorGetInitialPropsWithSentry.ts
index 0a0ee1e2867f..209ca486db15 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapErrorGetInitialPropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapErrorGetInitialPropsWithSentry.ts
@@ -1,6 +1,5 @@
import type { NextPageContext } from 'next';
import type { ErrorProps } from 'next/error';
-
import { isBuild } from '../utils/isBuild';
import { withErrorInstrumentation, withTracedServerSideDataFetcher } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetInitialPropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetInitialPropsWithSentry.ts
index 2ba9bbb3156d..f597692820b8 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetInitialPropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetInitialPropsWithSentry.ts
@@ -1,5 +1,4 @@
import type { NextPage } from 'next';
-
import { isBuild } from '../utils/isBuild';
import { withErrorInstrumentation, withTracedServerSideDataFetcher } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetServerSidePropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetServerSidePropsWithSentry.ts
index 328f35d8b350..5512c6204410 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetServerSidePropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetServerSidePropsWithSentry.ts
@@ -1,5 +1,4 @@
import type { GetServerSideProps } from 'next';
-
import { isBuild } from '../utils/isBuild';
import { withErrorInstrumentation, withTracedServerSideDataFetcher } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetStaticPropsWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetStaticPropsWithSentry.ts
index 5d083eb97ca8..5d127e9a6fc8 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapGetStaticPropsWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapGetStaticPropsWithSentry.ts
@@ -1,5 +1,4 @@
import type { GetStaticProps } from 'next';
-
import { isBuild } from '../utils/isBuild';
import { callDataFetcherTraced, withErrorInstrumentation } from '../utils/wrapperUtils';
diff --git a/packages/nextjs/src/common/utils/responseEnd.ts b/packages/nextjs/src/common/utils/responseEnd.ts
index b35fd9022427..9d81c54e040b 100644
--- a/packages/nextjs/src/common/utils/responseEnd.ts
+++ b/packages/nextjs/src/common/utils/responseEnd.ts
@@ -1,6 +1,6 @@
-import type { ServerResponse } from 'http';
import type { Span } from '@sentry/core';
import { fill, flush, logger, setHttpStatus } from '@sentry/core';
+import type { ServerResponse } from 'http';
import { DEBUG_BUILD } from '../debug-build';
import type { ResponseEndMethod, WrappedResponseEndMethod } from '../types';
diff --git a/packages/nextjs/src/common/utils/tracingUtils.ts b/packages/nextjs/src/common/utils/tracingUtils.ts
index 4f5e9c9fa5d3..65d031046423 100644
--- a/packages/nextjs/src/common/utils/tracingUtils.ts
+++ b/packages/nextjs/src/common/utils/tracingUtils.ts
@@ -1,5 +1,5 @@
import type { PropagationContext } from '@sentry/core';
-import { GLOBAL_OBJ, Scope, getActiveSpan, getRootSpan, logger, spanToJSON, startNewTrace } from '@sentry/core';
+import { getActiveSpan, getRootSpan, GLOBAL_OBJ, logger, Scope, spanToJSON, startNewTrace } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../span-attributes-with-logic-attached';
diff --git a/packages/nextjs/src/common/utils/wrapperUtils.ts b/packages/nextjs/src/common/utils/wrapperUtils.ts
index 202a0f2e9c37..529acab7f96e 100644
--- a/packages/nextjs/src/common/utils/wrapperUtils.ts
+++ b/packages/nextjs/src/common/utils/wrapperUtils.ts
@@ -1,4 +1,3 @@
-import type { IncomingMessage, ServerResponse } from 'http';
import {
captureException,
getActiveSpan,
@@ -8,6 +7,7 @@ import {
getTraceData,
httpRequestToRequestData,
} from '@sentry/core';
+import type { IncomingMessage, ServerResponse } from 'http';
import { TRANSACTION_ATTR_SENTRY_ROUTE_BACKFILL } from '../span-attributes-with-logic-attached';
/**
diff --git a/packages/nextjs/src/common/withServerActionInstrumentation.ts b/packages/nextjs/src/common/withServerActionInstrumentation.ts
index b04d94417204..20d9c6937b12 100644
--- a/packages/nextjs/src/common/withServerActionInstrumentation.ts
+++ b/packages/nextjs/src/common/withServerActionInstrumentation.ts
@@ -1,14 +1,14 @@
import type { RequestEventData } from '@sentry/core';
-import { getActiveSpan } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- SPAN_STATUS_ERROR,
captureException,
continueTrace,
+ getActiveSpan,
getClient,
getIsolationScope,
handleCallbackErrors,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
+ SPAN_STATUS_ERROR,
startSpan,
vercelWaitUntil,
withIsolationScope,
diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
index e3252600cc79..5e7cad749edb 100644
--- a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
+++ b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
@@ -1,10 +1,5 @@
import type { RequestEventData, WebFetchHeaders } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- SPAN_STATUS_ERROR,
- SPAN_STATUS_OK,
- Scope,
captureException,
getActiveSpan,
getCapturedScopesOnSpan,
@@ -12,7 +7,12 @@ import {
getRootSpan,
handleCallbackErrors,
propagationContextFromHeaders,
+ Scope,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
+ SPAN_STATUS_ERROR,
+ SPAN_STATUS_OK,
startSpanManual,
winterCGHeadersToDict,
withIsolationScope,
diff --git a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
index 660cf0bb3940..c0b9f246a00c 100644
--- a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
+++ b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
@@ -1,18 +1,18 @@
+import type { TransactionSource } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
getActiveSpan,
getCurrentScope,
getRootSpan,
handleCallbackErrors,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
startSpan,
vercelWaitUntil,
winterCGRequestToRequestData,
withIsolationScope,
} from '@sentry/core';
-import type { TransactionSource } from '@sentry/core';
import type { EdgeRouteHandler } from '../edge/types';
import { flushSafelyWithTimeout } from './utils/responseEnd';
diff --git a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
index 8cf3e59205b2..60dfe0e8b421 100644
--- a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
+++ b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
@@ -1,8 +1,5 @@
import type { RequestEventData } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- Scope,
captureException,
getActiveSpan,
getCapturedScopesOnSpan,
@@ -10,6 +7,9 @@ import {
getRootSpan,
handleCallbackErrors,
propagationContextFromHeaders,
+ Scope,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
setHttpStatus,
winterCGHeadersToDict,
diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
index 6fbc78011bea..95dd72d3d9e2 100644
--- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
+++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -1,17 +1,17 @@
import type { RequestEventData } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- SPAN_STATUS_ERROR,
- SPAN_STATUS_OK,
- Scope,
captureException,
getActiveSpan,
getCapturedScopesOnSpan,
getRootSpan,
handleCallbackErrors,
propagationContextFromHeaders,
+ Scope,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
+ SPAN_STATUS_ERROR,
+ SPAN_STATUS_OK,
startSpanManual,
vercelWaitUntil,
winterCGHeadersToDict,
diff --git a/packages/nextjs/src/config/loaders/prefixLoader.ts b/packages/nextjs/src/config/loaders/prefixLoader.ts
index 82185130ebb2..df011c945687 100644
--- a/packages/nextjs/src/config/loaders/prefixLoader.ts
+++ b/packages/nextjs/src/config/loaders/prefixLoader.ts
@@ -1,7 +1,6 @@
+import { escapeStringForRegex } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
-import { escapeStringForRegex } from '@sentry/core';
-
import type { LoaderThis } from './types';
type LoaderOptions = {
diff --git a/packages/nextjs/src/config/loaders/wrappingLoader.ts b/packages/nextjs/src/config/loaders/wrappingLoader.ts
index 422dbd1fd2aa..c60563ccd241 100644
--- a/packages/nextjs/src/config/loaders/wrappingLoader.ts
+++ b/packages/nextjs/src/config/loaders/wrappingLoader.ts
@@ -1,11 +1,10 @@
-import * as fs from 'fs';
-import * as path from 'path';
import commonjs from '@rollup/plugin-commonjs';
import { stringMatchesSomePattern } from '@sentry/core';
import * as chalk from 'chalk';
+import * as fs from 'fs';
+import * as path from 'path';
import type { RollupBuild, RollupError } from 'rollup';
import { rollup } from 'rollup';
-
import type { ServerComponentContext, VercelCronsConfig } from '../../common/types';
import type { LoaderThis } from './types';
diff --git a/packages/nextjs/src/config/templates/apiWrapperTemplate.ts b/packages/nextjs/src/config/templates/apiWrapperTemplate.ts
index da03a0c413d4..703a164acb07 100644
--- a/packages/nextjs/src/config/templates/apiWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/apiWrapperTemplate.ts
@@ -6,11 +6,10 @@
* this causes both TS and ESLint to complain, hence the pragma comments below.
*/
-import * as Sentry from '@sentry/nextjs';
// @ts-expect-error See above
import * as origModule from '__SENTRY_WRAPPING_TARGET_FILE__';
+import * as Sentry from '@sentry/nextjs';
import type { PageConfig } from 'next';
-
import type { NextApiHandler, VercelCronsConfig } from '../../common/types';
type NextApiModule = (
diff --git a/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts b/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
index 83468b3120d8..6d44af1275b5 100644
--- a/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
@@ -5,10 +5,9 @@
* this causes both TS and ESLint to complain, hence the pragma comments below.
*/
-import * as Sentry from '@sentry/nextjs';
// @ts-expect-error See above
import * as origModule from '__SENTRY_WRAPPING_TARGET_FILE__';
-
+import * as Sentry from '@sentry/nextjs';
import type { EdgeRouteHandler } from '../../edge/types';
type NextApiModule =
diff --git a/packages/nextjs/src/config/templates/pageWrapperTemplate.ts b/packages/nextjs/src/config/templates/pageWrapperTemplate.ts
index faedfdd7e8a6..a2acc25d42b2 100644
--- a/packages/nextjs/src/config/templates/pageWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/pageWrapperTemplate.ts
@@ -6,9 +6,9 @@
* this causes both TS and ESLint to complain, hence the pragma comments below.
*/
-import * as Sentry from '@sentry/nextjs';
// @ts-expect-error See above
import * as wrapee from '__SENTRY_WRAPPING_TARGET_FILE__';
+import * as Sentry from '@sentry/nextjs';
import type { GetServerSideProps, GetStaticProps, NextPage as NextPageComponent } from 'next';
type NextPageModule = {
diff --git a/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts b/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts
index 9e68fd453112..a2aed7543c39 100644
--- a/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/routeHandlerWrapperTemplate.ts
@@ -1,11 +1,10 @@
-import type { WebFetchHeaders } from '@sentry/core';
-import * as Sentry from '@sentry/nextjs';
// @ts-expect-error Because we cannot be sure if the RequestAsyncStorage module exists (it is not part of the Next.js public
// API) we use a shim if it doesn't exist. The logic for this is in the wrapping loader.
import * as origModule from '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__';
// @ts-expect-error See above
import * as routeModule from '__SENTRY_WRAPPING_TARGET_FILE__';
-
+import type { WebFetchHeaders } from '@sentry/core';
+import * as Sentry from '@sentry/nextjs';
import type { RequestAsyncStorage } from './requestAsyncStorageShim';
type NextAsyncStorageModule =
diff --git a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
index fd01c150ec36..11a18cdb5044 100644
--- a/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/serverComponentWrapperTemplate.ts
@@ -1,11 +1,10 @@
-import type { WebFetchHeaders } from '@sentry/core';
-import * as Sentry from '@sentry/nextjs';
// @ts-expect-error Because we cannot be sure if the RequestAsyncStorage module exists (it is not part of the Next.js public
// API) we use a shim if it doesn't exist. The logic for this is in the wrapping loader.
import * as origModule from '__SENTRY_NEXTJS_REQUEST_ASYNC_STORAGE_SHIM__';
// @ts-expect-error We use `__SENTRY_WRAPPING_TARGET_FILE__` as a placeholder for the path to the file being wrapped.
import * as serverComponentModule from '__SENTRY_WRAPPING_TARGET_FILE__';
-
+import type { WebFetchHeaders } from '@sentry/core';
+import * as Sentry from '@sentry/nextjs';
import type { RequestAsyncStorage } from './requestAsyncStorageShim';
type NextAsyncStorageModule =
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index af7e40f5b58c..322f2e320624 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -1,12 +1,11 @@
/* eslint-disable complexity */
/* eslint-disable max-lines */
-import * as fs from 'fs';
-import * as path from 'path';
import { escapeStringForRegex, loadModule, logger, parseSemver } from '@sentry/core';
import * as chalk from 'chalk';
+import * as fs from 'fs';
+import * as path from 'path';
import { sync as resolveSync } from 'resolve';
-
import type { VercelCronsConfig } from '../common/types';
// Note: If you need to import a type from Webpack, do it in `types.ts` and export it from there. Otherwise, our
// circular dependency check thinks this file is importing from itself. See https://github.com/pahen/madge/issues/306.
@@ -21,8 +20,8 @@ import type {
WebpackConfigObjectWithModuleRules,
WebpackEntryProperty,
} from './types';
-import { getWebpackPluginOptions } from './webpackPluginOptions';
import { getNextjsVersion } from './util';
+import { getWebpackPluginOptions } from './webpackPluginOptions';
// 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.
diff --git a/packages/nextjs/src/config/webpackPluginOptions.ts b/packages/nextjs/src/config/webpackPluginOptions.ts
index 530659b2a703..335c7bea8976 100644
--- a/packages/nextjs/src/config/webpackPluginOptions.ts
+++ b/packages/nextjs/src/config/webpackPluginOptions.ts
@@ -1,5 +1,5 @@
-import * as path from 'path';
import type { SentryWebpackPluginOptions } from '@sentry/webpack-plugin';
+import * as path from 'path';
import type { BuildContext, NextConfigObject, SentryBuildOptions } from './types';
/**
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
index 7dd86b600c15..7eedcc763e9b 100644
--- a/packages/nextjs/src/config/withSentryConfig.ts
+++ b/packages/nextjs/src/config/withSentryConfig.ts
@@ -1,20 +1,18 @@
/* eslint-disable max-lines */
/* eslint-disable complexity */
import { isThenable, parseSemver } from '@sentry/core';
-
-import * as childProcess from 'child_process';
import { getSentryRelease } from '@sentry/node';
-
+import * as childProcess from 'child_process';
+import * as fs from 'fs';
+import * as path from 'path';
import type {
ExportedNextConfig as NextConfig,
NextConfigFunction,
NextConfigObject,
SentryBuildOptions,
} from './types';
-import { constructWebpackConfigFunction } from './webpack';
import { getNextjsVersion } from './util';
-import * as fs from 'fs';
-import * as path from 'path';
+import { constructWebpackConfigFunction } from './webpack';
let showedExportModeTunnelWarning = false;
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index 82eb4f597ba6..7982667f0c3f 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -1,12 +1,12 @@
import {
- GLOBAL_OBJ,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
applySdkMetadata,
getGlobalScope,
getRootSpan,
+ GLOBAL_OBJ,
registerSpanErrorInstrumentation,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanToJSON,
stripUrlQueryAndFragment,
vercelWaitUntil,
diff --git a/packages/nextjs/src/edge/rewriteFramesIntegration.ts b/packages/nextjs/src/edge/rewriteFramesIntegration.ts
index db3aa26b7469..8681009ef1f8 100644
--- a/packages/nextjs/src/edge/rewriteFramesIntegration.ts
+++ b/packages/nextjs/src/edge/rewriteFramesIntegration.ts
@@ -1,8 +1,8 @@
import type { IntegrationFn, StackFrame } from '@sentry/core';
import {
- GLOBAL_OBJ,
defineIntegration,
escapeStringForRegex,
+ GLOBAL_OBJ,
rewriteFramesIntegration as originalRewriteFramesIntegration,
} from '@sentry/core';
diff --git a/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
index 90f03b547980..466eb19eb1d1 100644
--- a/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
+++ b/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
@@ -1,12 +1,12 @@
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureException,
getActiveSpan,
getCurrentScope,
getRootSpan,
handleCallbackErrors,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
startSpan,
vercelWaitUntil,
diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
index f1b24da081f0..c630d545061c 100644
--- a/packages/nextjs/src/index.types.ts
+++ b/packages/nextjs/src/index.types.ts
@@ -1,19 +1,19 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable import/export */
// We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
// which is not allowed, unless we redefine the colliding exports in this file - which we do below.
-export * from './config';
-export * from './client';
-export * from './server';
-export * from './edge';
-
import type { Client, Integration, Options, StackParser } from '@sentry/core';
-
import type * as clientSdk from './client';
import type { ServerComponentContext, VercelCronsConfig } from './common/types';
import type * as edgeSdk from './edge';
import type * as serverSdk from './server';
+export * from './config';
+export * from './client';
+export * from './server';
+export * from './edge';
+
/** Initializes Sentry Next.js SDK */
export declare function init(
options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions | edgeSdk.EdgeOptions,
diff --git a/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts b/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts
index 6941fb60f19f..dd4a3cdc7beb 100644
--- a/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts
+++ b/packages/nextjs/src/server/distDirRewriteFramesIntegration.ts
@@ -1,5 +1,5 @@
-import * as path from 'path';
import { defineIntegration, escapeStringForRegex, rewriteFramesIntegration } from '@sentry/core';
+import * as path from 'path';
export const distDirRewriteFramesIntegration = defineIntegration(({ distDirName }: { distDirName: string }) => {
// nextjs always puts the build directory at the project root level, which is also where you run `next start` from, so
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index da18f0fa459c..e4e437ebd691 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -6,22 +6,25 @@ import {
SEMATTRS_HTTP_METHOD,
SEMATTRS_HTTP_TARGET,
} from '@opentelemetry/semantic-conventions';
+import type { EventProcessor } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
applySdkMetadata,
+ extractTraceparentData,
getCapturedScopesOnSpan,
getClient,
getCurrentScope,
getGlobalScope,
getIsolationScope,
getRootSpan,
+ GLOBAL_OBJ,
+ logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCapturedScopesOnSpan,
spanToJSON,
+ stripUrlQueryAndFragment,
} from '@sentry/core';
-import { GLOBAL_OBJ, extractTraceparentData, logger, stripUrlQueryAndFragment } from '@sentry/core';
-import type { EventProcessor } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrations, httpIntegration, init as nodeInit } from '@sentry/node';
import { getScopesFromContext } from '@sentry/opentelemetry';
diff --git a/packages/nextjs/src/server/rewriteFramesIntegration.ts b/packages/nextjs/src/server/rewriteFramesIntegration.ts
index 56d56587eabb..9433920015c8 100644
--- a/packages/nextjs/src/server/rewriteFramesIntegration.ts
+++ b/packages/nextjs/src/server/rewriteFramesIntegration.ts
@@ -1,10 +1,10 @@
-import * as path from 'path';
import type { IntegrationFn, StackFrame } from '@sentry/core';
import {
defineIntegration,
escapeStringForRegex,
rewriteFramesIntegration as originalRewriteFramesIntegration,
} from '@sentry/core';
+import * as path from 'path';
const globalWithInjectedValues = global as typeof global & {
_sentryRewriteFramesDistDir?: string;
diff --git a/packages/nextjs/test/clientSdk.test.ts b/packages/nextjs/test/clientSdk.test.ts
index 08f3fc5ca2a9..b1e7884d5ad2 100644
--- a/packages/nextjs/test/clientSdk.test.ts
+++ b/packages/nextjs/test/clientSdk.test.ts
@@ -1,11 +1,9 @@
-import { getGlobalScope, getIsolationScope } from '@sentry/core';
-import { logger } from '@sentry/core';
import type { Integration } from '@sentry/core';
+import { getGlobalScope, getIsolationScope, logger } from '@sentry/core';
import * as SentryReact from '@sentry/react';
-import { WINDOW, getClient, getCurrentScope } from '@sentry/react';
+import { getClient, getCurrentScope, WINDOW } from '@sentry/react';
import { JSDOM } from 'jsdom';
-import { describe, vi, afterAll, afterEach, it, expect } from 'vitest';
-
+import { afterAll, afterEach, describe, expect, it, vi } from 'vitest';
import { breadcrumbsIntegration, browserTracingIntegration, init } from '../src/client';
const reactInit = vi.spyOn(SentryReact, 'init');
diff --git a/packages/nextjs/test/config/loaders.test.ts b/packages/nextjs/test/config/loaders.test.ts
index 62a128469f28..50d98a5cc440 100644
--- a/packages/nextjs/test/config/loaders.test.ts
+++ b/packages/nextjs/test/config/loaders.test.ts
@@ -1,9 +1,7 @@
// mock helper functions not tested directly in this file
import './mocks';
-
import * as fs from 'fs';
-import { describe, vi, it, expect } from 'vitest';
-
+import { describe, expect, it, vi } from 'vitest';
import type { ModuleRuleUseProperty, WebpackModuleRule } from '../../src/config/types';
import {
clientBuildContext,
diff --git a/packages/nextjs/test/config/mocks.ts b/packages/nextjs/test/config/mocks.ts
index 82c46841a6f4..2aa174877beb 100644
--- a/packages/nextjs/test/config/mocks.ts
+++ b/packages/nextjs/test/config/mocks.ts
@@ -4,13 +4,12 @@
import * as fs from 'fs';
import * as os from 'os';
import * as path from 'path';
-import { vi, afterAll, afterEach } from 'vitest';
+import { afterAll, afterEach, vi } from 'vitest';
+import { CLIENT_SDK_CONFIG_FILE, EDGE_SDK_CONFIG_FILE, SERVER_SDK_CONFIG_FILE } from './fixtures';
vi.mock('fs');
vi.mock('os');
-import { CLIENT_SDK_CONFIG_FILE, EDGE_SDK_CONFIG_FILE, SERVER_SDK_CONFIG_FILE } from './fixtures';
-
// We use `fs.existsSync()` in `getUserConfigFile()`. When we're not testing `getUserConfigFile()` specifically, all we
// need is for it to give us any valid answer, so make it always find what it's looking for. Since this is a core node
// built-in, though, which jest itself uses, otherwise let it do the normal thing. Storing the real version of the
diff --git a/packages/nextjs/test/config/valueInjectionLoader.test.ts b/packages/nextjs/test/config/valueInjectionLoader.test.ts
index e0091bd52c6c..d75d73071234 100644
--- a/packages/nextjs/test/config/valueInjectionLoader.test.ts
+++ b/packages/nextjs/test/config/valueInjectionLoader.test.ts
@@ -1,5 +1,4 @@
-import { describe, it, expect } from 'vitest';
-
+import { describe, expect, it } from 'vitest';
import type { LoaderThis } from '../../src/config/loaders/types';
import type { ValueInjectionLoaderOptions } from '../../src/config/loaders/valueInjectionLoader';
import valueInjectionLoader from '../../src/config/loaders/valueInjectionLoader';
diff --git a/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts b/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
index aaedb3d729df..3a8e86b94e29 100644
--- a/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
+++ b/packages/nextjs/test/config/webpack/constructWebpackConfig.test.ts
@@ -1,8 +1,7 @@
-import { describe, expect, it, vi } from 'vitest';
-
// mock helper functions not tested directly in this file
import '../mocks';
-
+import * as core from '@sentry/core';
+import { describe, expect, it, vi } from 'vitest';
import * as getWebpackPluginOptionsModule from '../../../src/config/webpackPluginOptions';
import {
CLIENT_SDK_CONFIG_FILE,
@@ -14,7 +13,6 @@ import {
userNextConfig,
} from '../fixtures';
import { materializeFinalNextConfig, materializeFinalWebpackConfig } from '../testUtils';
-import * as core from '@sentry/core';
describe('constructWebpackConfigFunction()', () => {
it('includes expected properties', async () => {
diff --git a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
index d2aad8fb19a0..1dd0cfa95d5b 100644
--- a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
+++ b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts
@@ -1,5 +1,4 @@
-import { describe, it, expect } from 'vitest';
-
+import { describe, expect, it } from 'vitest';
import type { BuildContext, NextConfigObject } from '../../../src/config/types';
import { getWebpackPluginOptions } from '../../../src/config/webpackPluginOptions';
diff --git a/packages/nextjs/test/config/withSentry.test.ts b/packages/nextjs/test/config/withSentry.test.ts
index 5ac222559e38..3ed6672393ea 100644
--- a/packages/nextjs/test/config/withSentry.test.ts
+++ b/packages/nextjs/test/config/withSentry.test.ts
@@ -1,8 +1,7 @@
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import type { NextApiRequest, NextApiResponse } from 'next';
-import { describe, vi, beforeEach, afterEach, it, expect } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { AugmentedNextApiResponse, NextApiHandler } from '../../src/common/types';
import { wrapApiHandlerWithSentry } from '../../src/server';
diff --git a/packages/nextjs/test/config/withSentryConfig.test.ts b/packages/nextjs/test/config/withSentryConfig.test.ts
index ab80526b3fcc..6ad9a83e6791 100644
--- a/packages/nextjs/test/config/withSentryConfig.test.ts
+++ b/packages/nextjs/test/config/withSentryConfig.test.ts
@@ -1,5 +1,4 @@
-import { describe, vi, it, expect } from 'vitest';
-
+import { describe, expect, it, vi } from 'vitest';
import { defaultRuntimePhase, defaultsObject, exportedNextConfig, userNextConfig } from './fixtures';
import { materializeFinalNextConfig } from './testUtils';
diff --git a/packages/nextjs/test/config/wrappers.test.ts b/packages/nextjs/test/config/wrappers.test.ts
index 332a1b89c4bd..70d032d2e7b2 100644
--- a/packages/nextjs/test/config/wrappers.test.ts
+++ b/packages/nextjs/test/config/wrappers.test.ts
@@ -1,8 +1,7 @@
-import type { IncomingMessage, ServerResponse } from 'http';
-import * as SentryCore from '@sentry/core';
import type { Client } from '@sentry/core';
-import { describe, vi, beforeEach, afterEach, test, expect } from 'vitest';
-
+import * as SentryCore from '@sentry/core';
+import type { IncomingMessage, ServerResponse } from 'http';
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import { wrapGetInitialPropsWithSentry, wrapGetServerSidePropsWithSentry } from '../../src/common';
const startSpanManualSpy = vi.spyOn(SentryCore, 'startSpanManual');
diff --git a/packages/nextjs/test/config/wrappingLoader.test.ts b/packages/nextjs/test/config/wrappingLoader.test.ts
index fc4d3018faa4..7f6e5f3a3c66 100644
--- a/packages/nextjs/test/config/wrappingLoader.test.ts
+++ b/packages/nextjs/test/config/wrappingLoader.test.ts
@@ -1,6 +1,8 @@
import * as fs from 'fs';
import * as path from 'path';
-import { describe, vi, it, expect } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
+import type { LoaderThis } from '../../src/config/loaders/types';
+import type { WrappingLoaderOptions } from '../../src/config/loaders/wrappingLoader';
vi.mock('fs', { spy: true });
@@ -52,8 +54,6 @@ vi.spyOn(fs, 'readFileSync').mockImplementation((filePath, options) => {
return originalReadfileSync(filePath, options);
});
-import type { LoaderThis } from '../../src/config/loaders/types';
-import type { WrappingLoaderOptions } from '../../src/config/loaders/wrappingLoader';
const { default: wrappingLoader } = await import('../../src/config/loaders/wrappingLoader');
const DEFAULT_PAGE_EXTENSION_REGEX = ['tsx', 'ts', 'jsx', 'js'].join('|');
diff --git a/packages/nextjs/test/edge/withSentryAPI.test.ts b/packages/nextjs/test/edge/withSentryAPI.test.ts
index d268e8419ec6..1e659cb699b3 100644
--- a/packages/nextjs/test/edge/withSentryAPI.test.ts
+++ b/packages/nextjs/test/edge/withSentryAPI.test.ts
@@ -1,5 +1,4 @@
-import { describe, vi, afterAll, afterEach, it } from 'vitest';
-
+import { afterAll, afterEach, describe, it, vi } from 'vitest';
import { wrapApiHandlerWithSentry } from '../../src/edge';
const origRequest = global.Request;
diff --git a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
index 846da0b3e83a..d189dc0a20c3 100644
--- a/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
+++ b/packages/nextjs/test/performance/pagesRouterInstrumentation.test.ts
@@ -3,8 +3,7 @@ import { WINDOW } from '@sentry/react';
import { JSDOM } from 'jsdom';
import type { NEXT_DATA } from 'next/dist/shared/lib/utils';
import Router from 'next/router';
-import { describe, vi, afterEach, it, expect } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import {
pagesRouterInstrumentNavigation,
pagesRouterInstrumentPageLoad,
diff --git a/packages/nextjs/test/serverSdk.test.ts b/packages/nextjs/test/serverSdk.test.ts
index f01cc55a1d17..8ea0b060155e 100644
--- a/packages/nextjs/test/serverSdk.test.ts
+++ b/packages/nextjs/test/serverSdk.test.ts
@@ -1,9 +1,8 @@
-import { GLOBAL_OBJ } from '@sentry/core';
import type { Integration } from '@sentry/core';
+import { GLOBAL_OBJ } from '@sentry/core';
import { getCurrentScope } from '@sentry/node';
import * as SentryNode from '@sentry/node';
-import { describe, vi, afterEach, it, expect } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../src/server';
// normally this is set as part of the build process, so mock it here
diff --git a/packages/nextjs/test/utils/tunnelRoute.test.ts b/packages/nextjs/test/utils/tunnelRoute.test.ts
index 24f8ae7ee92a..fb228375f1e0 100644
--- a/packages/nextjs/test/utils/tunnelRoute.test.ts
+++ b/packages/nextjs/test/utils/tunnelRoute.test.ts
@@ -1,6 +1,5 @@
import type { BrowserOptions } from '@sentry/react';
-import { describe, vi, beforeEach, it, expect } from 'vitest';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { applyTunnelRouteOption } from '../../src/client/tunnelRoute';
const globalWithInjectedValues = global as typeof global & {
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index 7a26a9fca089..03705bda89ba 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -1,3 +1,5 @@
+import * as logger from './logs/exports';
+
export { httpIntegration } from './integrations/http';
export { nativeNodeFetchIntegration } from './integrations/node-fetch';
export { fsIntegration } from './integrations/fs';
@@ -156,6 +158,4 @@ export type {
Span,
} from '@sentry/core';
-import * as logger from './logs/exports';
-
export { logger };
diff --git a/packages/node/src/integrations/anr/index.ts b/packages/node/src/integrations/anr/index.ts
index 7b25d851137a..5d5cc2daa5f6 100644
--- a/packages/node/src/integrations/anr/index.ts
+++ b/packages/node/src/integrations/anr/index.ts
@@ -2,13 +2,13 @@ import { types } from 'node:util';
import { Worker } from 'node:worker_threads';
import type { Contexts, Event, EventHint, Integration, IntegrationFn, ScopeData } from '@sentry/core';
import {
- GLOBAL_OBJ,
defineIntegration,
getClient,
getCurrentScope,
getFilenameToDebugIdMap,
getGlobalScope,
getIsolationScope,
+ GLOBAL_OBJ,
logger,
mergeScopeData,
} from '@sentry/core';
diff --git a/packages/node/src/integrations/anr/worker.ts b/packages/node/src/integrations/anr/worker.ts
index 2eebfe40309b..dae062b4df7c 100644
--- a/packages/node/src/integrations/anr/worker.ts
+++ b/packages/node/src/integrations/anr/worker.ts
@@ -1,12 +1,12 @@
import { Session as InspectorSession } from 'node:inspector';
import { parentPort, workerData } from 'node:worker_threads';
import type { DebugImage, Event, ScopeData, Session, StackFrame } from '@sentry/core';
-import { generateSpanId } from '@sentry/core';
import {
applyScopeDataToEvent,
callFrameToStackFrame,
createEventEnvelope,
createSessionEnvelope,
+ generateSpanId,
getEnvelopeEndpointWithUrlEncodedAuth,
makeSession,
normalizeUrlToBase,
@@ -15,7 +15,6 @@ import {
uuid4,
watchdogTimer,
} from '@sentry/core';
-
import { makeNodeTransport } from '../../transports';
import { createGetModuleFromFilename } from '../../utils/module';
import type { WorkerStartData } from './common';
diff --git a/packages/node/src/integrations/context.ts b/packages/node/src/integrations/context.ts
index ed3e265b952b..aa729cad8732 100644
--- a/packages/node/src/integrations/context.ts
+++ b/packages/node/src/integrations/context.ts
@@ -1,7 +1,7 @@
/* eslint-disable max-lines */
import { execFile } from 'node:child_process';
-import { readFile, readdir } from 'node:fs';
+import { readdir, readFile } from 'node:fs';
import * as os from 'node:os';
import { join } from 'node:path';
import { promisify } from 'node:util';
diff --git a/packages/node/src/integrations/contextlines.ts b/packages/node/src/integrations/contextlines.ts
index 127a04487acb..6667bed80e28 100644
--- a/packages/node/src/integrations/contextlines.ts
+++ b/packages/node/src/integrations/contextlines.ts
@@ -1,7 +1,7 @@
import { createReadStream } from 'node:fs';
import { createInterface } from 'node:readline';
import type { Event, IntegrationFn, StackFrame } from '@sentry/core';
-import { LRUMap, defineIntegration, logger, snipLine } from '@sentry/core';
+import { defineIntegration, logger, LRUMap, snipLine } from '@sentry/core';
import { DEBUG_BUILD } from '../debug-build';
const LRU_FILE_CONTENTS_CACHE = new LRUMap>(10);
diff --git a/packages/node/src/integrations/fs.ts b/packages/node/src/integrations/fs.ts
index 2288096dad43..5ceedd571283 100644
--- a/packages/node/src/integrations/fs.ts
+++ b/packages/node/src/integrations/fs.ts
@@ -1,5 +1,5 @@
import { FsInstrumentation } from '@opentelemetry/instrumentation-fs';
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce } from '../otel/instrument';
const INTEGRATION_NAME = 'FileSystem';
diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
index d9ef31fa579b..5dbdeae2f925 100644
--- a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
+++ b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
@@ -1,4 +1,8 @@
/* eslint-disable max-lines */
+import type * as http from 'node:http';
+import type { IncomingMessage, RequestOptions } from 'node:http';
+import type * as https from 'node:https';
+import type { EventEmitter } from 'node:stream';
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
@@ -18,10 +22,6 @@ import {
stripUrlQueryAndFragment,
withIsolationScope,
} from '@sentry/core';
-import type * as http from 'node:http';
-import type { IncomingMessage, RequestOptions } from 'node:http';
-import type * as https from 'node:https';
-import type { EventEmitter } from 'node:stream';
import { DEBUG_BUILD } from '../../debug-build';
import { getRequestUrl } from '../../utils/getRequestUrl';
import { stealthWrap } from './utils';
diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentationBeforeOtel.ts b/packages/node/src/integrations/http/SentryHttpInstrumentationBeforeOtel.ts
index 0599c03e633b..e17194669eb0 100644
--- a/packages/node/src/integrations/http/SentryHttpInstrumentationBeforeOtel.ts
+++ b/packages/node/src/integrations/http/SentryHttpInstrumentationBeforeOtel.ts
@@ -1,8 +1,8 @@
+import type * as http from 'node:http';
+import type * as https from 'node:https';
import { VERSION } from '@opentelemetry/core';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { flush, logger, vercelWaitUntil } from '@sentry/core';
-import type * as http from 'node:http';
-import type * as https from 'node:https';
import { DEBUG_BUILD } from '../../debug-build';
import { stealthWrap } from './utils';
diff --git a/packages/node/src/integrations/http/vendor/getRequestInfo.ts b/packages/node/src/integrations/http/vendor/getRequestInfo.ts
index cbe167caa455..4fbb78e46f17 100644
--- a/packages/node/src/integrations/http/vendor/getRequestInfo.ts
+++ b/packages/node/src/integrations/http/vendor/getRequestInfo.ts
@@ -20,8 +20,8 @@
* limitations under the License.
*/
import type { RequestOptions } from 'node:http';
-import * as url from 'url';
import type { DiagLogger } from '@opentelemetry/api';
+import * as url from 'url';
/**
* Makes sure options is an url object
diff --git a/packages/node/src/integrations/local-variables/local-variables-async.ts b/packages/node/src/integrations/local-variables/local-variables-async.ts
index c3dcb1d12450..6465760b5435 100644
--- a/packages/node/src/integrations/local-variables/local-variables-async.ts
+++ b/packages/node/src/integrations/local-variables/local-variables-async.ts
@@ -4,7 +4,7 @@ import { defineIntegration, logger } from '@sentry/core';
import type { NodeClient } from '../../sdk/client';
import { isDebuggerEnabled } from '../../utils/debug';
import type { FrameVariables, LocalVariablesIntegrationOptions, LocalVariablesWorkerArgs } from './common';
-import { LOCAL_VARIABLES_KEY, functionNamesMatch } from './common';
+import { functionNamesMatch, LOCAL_VARIABLES_KEY } from './common';
// This string is a placeholder that gets overwritten with the worker code.
export const base64WorkerScript = '###LocalVariablesWorkerScript###';
diff --git a/packages/node/src/integrations/local-variables/local-variables-sync.ts b/packages/node/src/integrations/local-variables/local-variables-sync.ts
index daddc44cad1f..495a0712eb80 100644
--- a/packages/node/src/integrations/local-variables/local-variables-sync.ts
+++ b/packages/node/src/integrations/local-variables/local-variables-sync.ts
@@ -1,6 +1,6 @@
import type { Debugger, InspectorNotification, Runtime, Session } from 'node:inspector';
import type { Event, Exception, IntegrationFn, StackFrame, StackParser } from '@sentry/core';
-import { LRUMap, defineIntegration, getClient, logger } from '@sentry/core';
+import { defineIntegration, getClient, logger, LRUMap } from '@sentry/core';
import { NODE_MAJOR } from '../../nodeVersion';
import type { NodeClient } from '../../sdk/client';
import { isDebuggerEnabled } from '../../utils/debug';
diff --git a/packages/node/src/integrations/local-variables/worker.ts b/packages/node/src/integrations/local-variables/worker.ts
index 564744c1d878..304c7d527ef7 100644
--- a/packages/node/src/integrations/local-variables/worker.ts
+++ b/packages/node/src/integrations/local-variables/worker.ts
@@ -3,8 +3,7 @@ import { Session } from 'node:inspector/promises';
import { workerData } from 'node:worker_threads';
import { consoleSandbox } from '@sentry/core';
import type { LocalVariablesWorkerArgs, PausedExceptionEvent, RateLimitIncrement, Variables } from './common';
-import { LOCAL_VARIABLES_KEY } from './common';
-import { createRateLimiter } from './common';
+import { createRateLimiter, LOCAL_VARIABLES_KEY } from './common';
const options: LocalVariablesWorkerArgs = workerData;
diff --git a/packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts b/packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts
index f7327b095359..2bbbaf047827 100644
--- a/packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts
+++ b/packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts
@@ -2,8 +2,15 @@ import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
-import { LRUMap, getClient, getTraceData } from '@sentry/core';
-import { addBreadcrumb, getBreadcrumbLogLevelFromHttpStatusCode, getSanitizedUrlString, parseUrl } from '@sentry/core';
+import {
+ addBreadcrumb,
+ getBreadcrumbLogLevelFromHttpStatusCode,
+ getClient,
+ getSanitizedUrlString,
+ getTraceData,
+ LRUMap,
+ parseUrl,
+} from '@sentry/core';
import { shouldPropagateTraceForUrl } from '@sentry/opentelemetry';
import * as diagch from 'diagnostics_channel';
import { NODE_MAJOR, NODE_MINOR } from '../../nodeVersion';
diff --git a/packages/node/src/integrations/node-fetch/index.ts b/packages/node/src/integrations/node-fetch/index.ts
index cfcc93f1881e..d62d1e7c88c2 100644
--- a/packages/node/src/integrations/node-fetch/index.ts
+++ b/packages/node/src/integrations/node-fetch/index.ts
@@ -1,7 +1,7 @@
import type { UndiciInstrumentationConfig } from '@opentelemetry/instrumentation-undici';
import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
import type { IntegrationFn } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, getClient } from '@sentry/core';
+import { defineIntegration, getClient, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
import type { NodeClient } from '../../sdk/client';
import type { NodeClientOptions } from '../../types';
diff --git a/packages/node/src/integrations/tracing/amqplib.ts b/packages/node/src/integrations/tracing/amqplib.ts
index f6320406edaf..78f5ab627081 100644
--- a/packages/node/src/integrations/tracing/amqplib.ts
+++ b/packages/node/src/integrations/tracing/amqplib.ts
@@ -1,5 +1,5 @@
import type { Span } from '@opentelemetry/api';
-import { AmqplibInstrumentation, type AmqplibInstrumentationConfig } from '@opentelemetry/instrumentation-amqplib';
+import { type AmqplibInstrumentationConfig, AmqplibInstrumentation } from '@opentelemetry/instrumentation-amqplib';
import type { IntegrationFn } from '@sentry/core';
import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
diff --git a/packages/node/src/integrations/tracing/connect.ts b/packages/node/src/integrations/tracing/connect.ts
index ae7958c7da83..80b31f8f1930 100644
--- a/packages/node/src/integrations/tracing/connect.ts
+++ b/packages/node/src/integrations/tracing/connect.ts
@@ -1,11 +1,11 @@
import { ConnectInstrumentation } from '@opentelemetry/instrumentation-connect';
import type { IntegrationFn, Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
captureException,
defineIntegration,
getClient,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
spanToJSON,
} from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
diff --git a/packages/node/src/integrations/tracing/dataloader.ts b/packages/node/src/integrations/tracing/dataloader.ts
index 3c887bb33fa5..f1420e74b1f7 100644
--- a/packages/node/src/integrations/tracing/dataloader.ts
+++ b/packages/node/src/integrations/tracing/dataloader.ts
@@ -1,12 +1,12 @@
import { DataloaderInstrumentation } from '@opentelemetry/instrumentation-dataloader';
+import type { IntegrationFn } from '@sentry/core';
import {
+ defineIntegration,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- defineIntegration,
spanToJSON,
} from '@sentry/core';
-import type { IntegrationFn } from '@sentry/core';
-import { instrumentWhenWrapped, generateInstrumentOnce } from '../../otel/instrument';
+import { generateInstrumentOnce, instrumentWhenWrapped } from '../../otel/instrument';
const INTEGRATION_NAME = 'Dataloader';
diff --git a/packages/node/src/integrations/tracing/express-v5/instrumentation.ts b/packages/node/src/integrations/tracing/express-v5/instrumentation.ts
index bf2acb26c67d..c6070550c996 100644
--- a/packages/node/src/integrations/tracing/express-v5/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/express-v5/instrumentation.ts
@@ -26,8 +26,8 @@
*/
import type { Attributes } from '@opentelemetry/api';
-import { SpanStatusCode, context, diag, trace } from '@opentelemetry/api';
-import { RPCType, getRPCMetadata } from '@opentelemetry/core';
+import { context, diag, SpanStatusCode, trace } from '@opentelemetry/api';
+import { getRPCMetadata, RPCType } from '@opentelemetry/core';
import {
InstrumentationBase,
InstrumentationNodeModuleDefinition,
diff --git a/packages/node/src/integrations/tracing/express.ts b/packages/node/src/integrations/tracing/express.ts
index 2c79b1bfb828..e13ce6212b79 100644
--- a/packages/node/src/integrations/tracing/express.ts
+++ b/packages/node/src/integrations/tracing/express.ts
@@ -4,13 +4,13 @@ import type { ExpressRequestInfo } from '@opentelemetry/instrumentation-express'
import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
import type { IntegrationFn } from '@sentry/core';
import {
- httpRequestToRequestData,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
captureException,
defineIntegration,
getDefaultIsolationScope,
getIsolationScope,
+ httpRequestToRequestData,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
spanToJSON,
} from '@sentry/core';
import { DEBUG_BUILD } from '../../debug-build';
diff --git a/packages/node/src/integrations/tracing/fastify.ts b/packages/node/src/integrations/tracing/fastify.ts
index 220428cf91d4..b74edeb8bcac 100644
--- a/packages/node/src/integrations/tracing/fastify.ts
+++ b/packages/node/src/integrations/tracing/fastify.ts
@@ -1,14 +1,14 @@
import { FastifyInstrumentation } from '@opentelemetry/instrumentation-fastify';
+import type { IntegrationFn, Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
captureException,
defineIntegration,
getClient,
getIsolationScope,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
spanToJSON,
} from '@sentry/core';
-import type { IntegrationFn, Span } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
import { ensureIsWrapped } from '../../utils/ensureIsWrapped';
diff --git a/packages/node/src/integrations/tracing/genericPool.ts b/packages/node/src/integrations/tracing/genericPool.ts
index d6f736c6f9a5..c5f31d385247 100644
--- a/packages/node/src/integrations/tracing/genericPool.ts
+++ b/packages/node/src/integrations/tracing/genericPool.ts
@@ -1,6 +1,6 @@
import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '../../otel/instrument';
const INTEGRATION_NAME = 'GenericPool';
diff --git a/packages/node/src/integrations/tracing/graphql.ts b/packages/node/src/integrations/tracing/graphql.ts
index ac9fc0e87c63..841baf46754d 100644
--- a/packages/node/src/integrations/tracing/graphql.ts
+++ b/packages/node/src/integrations/tracing/graphql.ts
@@ -1,11 +1,10 @@
+import type { AttributeValue } from '@opentelemetry/api';
import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
-import { defineIntegration, getRootSpan, spanToJSON } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, getRootSpan, spanToJSON } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '@sentry/opentelemetry';
import { generateInstrumentOnce } from '../../otel/instrument';
-
import { addOriginToSpan } from '../../utils/addOriginToSpan';
-import type { AttributeValue } from '@opentelemetry/api';
interface GraphqlOptions {
/**
diff --git a/packages/node/src/integrations/tracing/hapi/index.ts b/packages/node/src/integrations/tracing/hapi/index.ts
index 1b379c217314..8748840b83a3 100644
--- a/packages/node/src/integrations/tracing/hapi/index.ts
+++ b/packages/node/src/integrations/tracing/hapi/index.ts
@@ -1,15 +1,15 @@
import { HapiInstrumentation } from '@opentelemetry/instrumentation-hapi';
import type { IntegrationFn, Span } from '@sentry/core';
import {
- SDK_VERSION,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
captureException,
defineIntegration,
getClient,
getDefaultIsolationScope,
getIsolationScope,
logger,
+ SDK_VERSION,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
spanToJSON,
} from '@sentry/core';
import { DEBUG_BUILD } from '../../../debug-build';
diff --git a/packages/node/src/integrations/tracing/index.ts b/packages/node/src/integrations/tracing/index.ts
index 2873a2643617..e07a247d7d34 100644
--- a/packages/node/src/integrations/tracing/index.ts
+++ b/packages/node/src/integrations/tracing/index.ts
@@ -1,6 +1,5 @@
import type { Integration } from '@sentry/core';
import { instrumentOtelHttp } from '../http';
-
import { amqplibIntegration, instrumentAmqplib } from './amqplib';
import { connectIntegration, instrumentConnect } from './connect';
import { expressIntegration, instrumentExpress, instrumentExpressV5 } from './express';
diff --git a/packages/node/src/integrations/tracing/knex.ts b/packages/node/src/integrations/tracing/knex.ts
index da70d8b3c8b7..ce3b1e1a5a5f 100644
--- a/packages/node/src/integrations/tracing/knex.ts
+++ b/packages/node/src/integrations/tracing/knex.ts
@@ -1,6 +1,6 @@
import { KnexInstrumentation } from '@opentelemetry/instrumentation-knex';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '../../otel/instrument';
const INTEGRATION_NAME = 'Knex';
diff --git a/packages/node/src/integrations/tracing/koa.ts b/packages/node/src/integrations/tracing/koa.ts
index 527a53ee9007..e2a2a52264ae 100644
--- a/packages/node/src/integrations/tracing/koa.ts
+++ b/packages/node/src/integrations/tracing/koa.ts
@@ -2,13 +2,13 @@ import { KoaInstrumentation } from '@opentelemetry/instrumentation-koa';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
import type { IntegrationFn, Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
captureException,
defineIntegration,
getDefaultIsolationScope,
getIsolationScope,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
spanToJSON,
} from '@sentry/core';
import { DEBUG_BUILD } from '../../debug-build';
diff --git a/packages/node/src/integrations/tracing/lrumemoizer.ts b/packages/node/src/integrations/tracing/lrumemoizer.ts
index 9bd1477cc9c5..29c67299c101 100644
--- a/packages/node/src/integrations/tracing/lrumemoizer.ts
+++ b/packages/node/src/integrations/tracing/lrumemoizer.ts
@@ -1,7 +1,6 @@
import { LruMemoizerInstrumentation } from '@opentelemetry/instrumentation-lru-memoizer';
-
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
const INTEGRATION_NAME = 'LruMemoizer';
diff --git a/packages/node/src/integrations/tracing/mongo.ts b/packages/node/src/integrations/tracing/mongo.ts
index f145c772006f..7a1072dda187 100644
--- a/packages/node/src/integrations/tracing/mongo.ts
+++ b/packages/node/src/integrations/tracing/mongo.ts
@@ -1,8 +1,7 @@
import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb';
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
-
import { addOriginToSpan } from '../../utils/addOriginToSpan';
const INTEGRATION_NAME = 'Mongo';
diff --git a/packages/node/src/integrations/tracing/mongoose.ts b/packages/node/src/integrations/tracing/mongoose.ts
index baf3053ba638..e4ec855a79de 100644
--- a/packages/node/src/integrations/tracing/mongoose.ts
+++ b/packages/node/src/integrations/tracing/mongoose.ts
@@ -1,8 +1,7 @@
import { MongooseInstrumentation } from '@opentelemetry/instrumentation-mongoose';
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
-
import { addOriginToSpan } from '../../utils/addOriginToSpan';
const INTEGRATION_NAME = 'Mongoose';
diff --git a/packages/node/src/integrations/tracing/mysql.ts b/packages/node/src/integrations/tracing/mysql.ts
index 96ad15ad3de8..0c2354b3f94a 100644
--- a/packages/node/src/integrations/tracing/mysql.ts
+++ b/packages/node/src/integrations/tracing/mysql.ts
@@ -1,6 +1,6 @@
import { MySQLInstrumentation } from '@opentelemetry/instrumentation-mysql';
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
const INTEGRATION_NAME = 'Mysql';
diff --git a/packages/node/src/integrations/tracing/mysql2.ts b/packages/node/src/integrations/tracing/mysql2.ts
index 6e141339780f..ccf534402a54 100644
--- a/packages/node/src/integrations/tracing/mysql2.ts
+++ b/packages/node/src/integrations/tracing/mysql2.ts
@@ -1,8 +1,7 @@
import { MySQL2Instrumentation } from '@opentelemetry/instrumentation-mysql2';
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
-
import { addOriginToSpan } from '../../utils/addOriginToSpan';
const INTEGRATION_NAME = 'Mysql2';
diff --git a/packages/node/src/integrations/tracing/postgres.ts b/packages/node/src/integrations/tracing/postgres.ts
index d436b95b45d8..46c1c850a8b3 100644
--- a/packages/node/src/integrations/tracing/postgres.ts
+++ b/packages/node/src/integrations/tracing/postgres.ts
@@ -1,8 +1,7 @@
import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
-import { defineIntegration } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
-
import { addOriginToSpan } from '../../utils/addOriginToSpan';
const INTEGRATION_NAME = 'Postgres';
diff --git a/packages/node/src/integrations/tracing/prisma.ts b/packages/node/src/integrations/tracing/prisma.ts
index 06b75f0c707e..58c0a8019cd8 100644
--- a/packages/node/src/integrations/tracing/prisma.ts
+++ b/packages/node/src/integrations/tracing/prisma.ts
@@ -1,7 +1,7 @@
import type { Instrumentation } from '@opentelemetry/instrumentation';
// When importing CJS modules into an ESM module, we cannot import the named exports directly.
import * as prismaInstrumentation from '@prisma/instrumentation';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, consoleSandbox, defineIntegration, spanToJSON } from '@sentry/core';
+import { consoleSandbox, defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
import type { PrismaV5TracingHelper } from './prisma/vendor/v5-tracing-helper';
import type { PrismaV6TracingHelper } from './prisma/vendor/v6-tracing-helper';
diff --git a/packages/node/src/integrations/tracing/redis.ts b/packages/node/src/integrations/tracing/redis.ts
index 0a078243a35f..b6ec8a89ec60 100644
--- a/packages/node/src/integrations/tracing/redis.ts
+++ b/packages/node/src/integrations/tracing/redis.ts
@@ -4,19 +4,19 @@ import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
import { RedisInstrumentation } from '@opentelemetry/instrumentation-redis-4';
import type { IntegrationFn } from '@sentry/core';
import {
+ defineIntegration,
SEMANTIC_ATTRIBUTE_CACHE_HIT,
SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE,
SEMANTIC_ATTRIBUTE_CACHE_KEY,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- defineIntegration,
spanToJSON,
truncate,
} from '@sentry/core';
import { generateInstrumentOnce } from '../../otel/instrument';
import {
- GET_COMMANDS,
calculateCacheItemSize,
+ GET_COMMANDS,
getCacheKeySafely,
getCacheOperation,
isInCommands,
diff --git a/packages/node/src/integrations/tracing/tedious.ts b/packages/node/src/integrations/tracing/tedious.ts
index dd74c095a566..0585ec01a9c5 100644
--- a/packages/node/src/integrations/tracing/tedious.ts
+++ b/packages/node/src/integrations/tracing/tedious.ts
@@ -1,6 +1,6 @@
import { TediousInstrumentation } from '@opentelemetry/instrumentation-tedious';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration, spanToJSON } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce, instrumentWhenWrapped } from '../../otel/instrument';
const TEDIUS_INSTRUMENTED_METHODS = new Set([
diff --git a/packages/node/src/integrations/tracing/vercelai/index.ts b/packages/node/src/integrations/tracing/vercelai/index.ts
index 26bf57ed38b2..f68b95f0f815 100644
--- a/packages/node/src/integrations/tracing/vercelai/index.ts
+++ b/packages/node/src/integrations/tracing/vercelai/index.ts
@@ -1,6 +1,6 @@
/* eslint-disable complexity */
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, defineIntegration, spanToJSON } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_OP, spanToJSON } from '@sentry/core';
import { generateInstrumentOnce } from '../../../otel/instrument';
import { addOriginToSpan } from '../../../utils/addOriginToSpan';
import { SentryVercelAiInstrumentation } from './instrumentation';
diff --git a/packages/node/src/integrations/tracing/vercelai/instrumentation.ts b/packages/node/src/integrations/tracing/vercelai/instrumentation.ts
index 2cddd175c0d8..1b8a60db9aca 100644
--- a/packages/node/src/integrations/tracing/vercelai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/vercelai/instrumentation.ts
@@ -1,5 +1,5 @@
-import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { InstrumentationConfig, InstrumentationModuleDefinition } from '@opentelemetry/instrumentation';
+import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import { SDK_VERSION } from '@sentry/core';
import type { TelemetrySettings } from './types';
diff --git a/packages/node/src/logs/capture.ts b/packages/node/src/logs/capture.ts
index d4fdd11e99fb..17f94399f9bf 100644
--- a/packages/node/src/logs/capture.ts
+++ b/packages/node/src/logs/capture.ts
@@ -1,6 +1,5 @@
import { format } from 'node:util';
-
-import type { LogSeverityLevel, Log, ParameterizedString } from '@sentry/core';
+import type { Log, LogSeverityLevel, ParameterizedString } from '@sentry/core';
import { _INTERNAL_captureLog } from '@sentry/core';
export type CaptureLogArgs =
diff --git a/packages/node/src/logs/exports.ts b/packages/node/src/logs/exports.ts
index 7c9299dc2660..c18b69f6770a 100644
--- a/packages/node/src/logs/exports.ts
+++ b/packages/node/src/logs/exports.ts
@@ -1,4 +1,4 @@
-import { captureLog, type CaptureLogArgs } from './capture';
+import { type CaptureLogArgs, captureLog } from './capture';
/**
* @summary Capture a log with the `trace` level. Requires `_experiments.enableLogs` to be enabled.
diff --git a/packages/node/src/proxy/index.ts b/packages/node/src/proxy/index.ts
index 0b6f5b2c5196..788b302eeab3 100644
--- a/packages/node/src/proxy/index.ts
+++ b/packages/node/src/proxy/index.ts
@@ -33,8 +33,8 @@ import type { OutgoingHttpHeaders } from 'node:http';
import * as net from 'node:net';
import * as tls from 'node:tls';
import { logger } from '@sentry/core';
-import { Agent } from './base';
import type { AgentConnectOpts } from './base';
+import { Agent } from './base';
import { parseProxyResponse } from './parse-proxy-response';
function debug(...args: unknown[]): void {
diff --git a/packages/node/src/sdk/api.ts b/packages/node/src/sdk/api.ts
index b014a5f0b806..304d311e519e 100644
--- a/packages/node/src/sdk/api.ts
+++ b/packages/node/src/sdk/api.ts
@@ -1,7 +1,7 @@
// PUBLIC APIS
import type { StackParser } from '@sentry/core';
-import { GLOBAL_OBJ, createStackParser, nodeStackLineParser } from '@sentry/core';
+import { createStackParser, GLOBAL_OBJ, nodeStackLineParser } from '@sentry/core';
import { createGetModuleFromFilename } from '../utils/module';
/**
diff --git a/packages/node/src/sdk/client.ts b/packages/node/src/sdk/client.ts
index d7fcbc5f23d6..0e5718b30207 100644
--- a/packages/node/src/sdk/client.ts
+++ b/packages/node/src/sdk/client.ts
@@ -4,7 +4,7 @@ import { trace } from '@opentelemetry/api';
import { registerInstrumentations } from '@opentelemetry/instrumentation';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { DynamicSamplingContext, Scope, ServerRuntimeClientOptions, TraceContext } from '@sentry/core';
-import { _INTERNAL_flushLogsBuffer, SDK_VERSION, ServerRuntimeClient, applySdkMetadata, logger } from '@sentry/core';
+import { _INTERNAL_flushLogsBuffer, applySdkMetadata, logger, SDK_VERSION, ServerRuntimeClient } from '@sentry/core';
import { getTraceContextForScope } from '@sentry/opentelemetry';
import { isMainThread, threadId } from 'worker_threads';
import { DEBUG_BUILD } from '../debug-build';
diff --git a/packages/node/src/sdk/index.ts b/packages/node/src/sdk/index.ts
index 7df3696c3d58..1536242cfdcb 100644
--- a/packages/node/src/sdk/index.ts
+++ b/packages/node/src/sdk/index.ts
@@ -1,5 +1,6 @@
import type { Integration, Options } from '@sentry/core';
import {
+ consoleIntegration,
consoleSandbox,
functionToStringIntegration,
getCurrentScope,
@@ -11,7 +12,6 @@ import {
propagationContextFromHeaders,
requestDataIntegration,
stackParserFromStackParserOptions,
- consoleIntegration,
} from '@sentry/core';
import {
enhanceDscWithOpenTelemetryRootSpanName,
diff --git a/packages/node/src/sdk/initOtel.ts b/packages/node/src/sdk/initOtel.ts
index c95808d435d3..5f6d8ec2a999 100644
--- a/packages/node/src/sdk/initOtel.ts
+++ b/packages/node/src/sdk/initOtel.ts
@@ -1,5 +1,4 @@
-import moduleModule from 'module';
-import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
+import { context, diag, DiagLogLevel, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
@@ -8,9 +7,10 @@ import {
ATTR_SERVICE_VERSION,
SEMRESATTRS_SERVICE_NAMESPACE,
} from '@opentelemetry/semantic-conventions';
-import { GLOBAL_OBJ, SDK_VERSION, consoleSandbox, logger } from '@sentry/core';
+import { consoleSandbox, GLOBAL_OBJ, logger, SDK_VERSION } from '@sentry/core';
import { SentryPropagator, SentrySampler, SentrySpanProcessor } from '@sentry/opentelemetry';
import { createAddHookMessageChannel } from 'import-in-the-middle';
+import moduleModule from 'module';
import { DEBUG_BUILD } from '../debug-build';
import { getOpenTelemetryInstrumentationToPreload } from '../integrations/tracing';
import { SentryContextManager } from '../otel/contextManager';
diff --git a/packages/node/src/types.ts b/packages/node/src/types.ts
index 9223619522e6..b99235e78f05 100644
--- a/packages/node/src/types.ts
+++ b/packages/node/src/types.ts
@@ -2,7 +2,6 @@ import type { Span as WriteableSpan } from '@opentelemetry/api';
import type { Instrumentation } from '@opentelemetry/instrumentation';
import type { ReadableSpan, SpanProcessor } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options, SamplingContext, Scope, Span, TracePropagationTargets } from '@sentry/core';
-
import type { NodeTransportOptions } from './transports';
export interface BaseNodeOptions {
diff --git a/packages/node/src/utils/addOriginToSpan.ts b/packages/node/src/utils/addOriginToSpan.ts
index 22ed30ed37e0..2a23710fa7cf 100644
--- a/packages/node/src/utils/addOriginToSpan.ts
+++ b/packages/node/src/utils/addOriginToSpan.ts
@@ -1,6 +1,6 @@
import type { Span } from '@opentelemetry/api';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import type { SpanOrigin } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
/** Adds an origin to an OTEL Span. */
export function addOriginToSpan(span: Span, origin: SpanOrigin): void {
diff --git a/packages/node/src/utils/prepareEvent.ts b/packages/node/src/utils/prepareEvent.ts
index 11e3a9aff044..854fea91f45e 100644
--- a/packages/node/src/utils/prepareEvent.ts
+++ b/packages/node/src/utils/prepareEvent.ts
@@ -1,5 +1,5 @@
-import { Scope } from '@sentry/core';
import type { CaptureContext, EventHint, Scope as ScopeInterface, ScopeContext } from '@sentry/core';
+import { Scope } from '@sentry/core';
/**
* This type makes sure that we get either a CaptureContext, OR an EventHint.
diff --git a/packages/node/test/cron.test.ts b/packages/node/test/cron.test.ts
index 5ae016b43ac9..efa146b90f20 100644
--- a/packages/node/test/cron.test.ts
+++ b/packages/node/test/cron.test.ts
@@ -1,5 +1,4 @@
import * as SentryCore from '@sentry/core';
-
import { type MockInstance, afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import { cron } from '../src';
import type { CronJob, CronJobParams } from '../src/cron/cron';
diff --git a/packages/node/test/helpers/getDefaultNodeClientOptions.ts b/packages/node/test/helpers/getDefaultNodeClientOptions.ts
index a8479150c18a..8cff09d3c0ee 100644
--- a/packages/node/test/helpers/getDefaultNodeClientOptions.ts
+++ b/packages/node/test/helpers/getDefaultNodeClientOptions.ts
@@ -1,6 +1,4 @@
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
-
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
import type { NodeClientOptions } from '../../src/types';
export function getDefaultNodeClientOptions(options: Partial = {}): NodeClientOptions {
diff --git a/packages/node/test/helpers/mockSdkInit.ts b/packages/node/test/helpers/mockSdkInit.ts
index e482dac6ed08..29e19f50e0f8 100644
--- a/packages/node/test/helpers/mockSdkInit.ts
+++ b/packages/node/test/helpers/mockSdkInit.ts
@@ -1,8 +1,7 @@
-import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
+import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import type { NodeClient } from '../../src';
-
import { init } from '../../src/sdk';
import type { NodeClientOptions } from '../../src/types';
diff --git a/packages/node/test/integration/breadcrumbs.test.ts b/packages/node/test/integration/breadcrumbs.test.ts
index 20e19a8a4b55..f052d1ea66d9 100644
--- a/packages/node/test/integration/breadcrumbs.test.ts
+++ b/packages/node/test/integration/breadcrumbs.test.ts
@@ -1,9 +1,8 @@
import { addBreadcrumb, captureException, withIsolationScope, withScope } from '@sentry/core';
import { startSpan } from '@sentry/opentelemetry';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { getClient } from '../../src/';
import type { NodeClient } from '../../src/sdk/client';
-
-import { afterEach, describe, expect, it, vi } from 'vitest';
import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
describe('Integration | breadcrumbs', () => {
diff --git a/packages/node/test/integration/scope.test.ts b/packages/node/test/integration/scope.test.ts
index a3c8de869df5..43af4214980d 100644
--- a/packages/node/test/integration/scope.test.ts
+++ b/packages/node/test/integration/scope.test.ts
@@ -1,8 +1,7 @@
import { getCapturedScopesOnSpan, getCurrentScope } from '@sentry/core';
import { getClient } from '@sentry/opentelemetry';
-import { clearGlobalScope } from '../../../core/test/lib/clear-global-scope';
-
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { clearGlobalScope } from '../../../core/test/lib/clear-global-scope';
import * as Sentry from '../../src/';
import type { NodeClient } from '../../src/sdk/client';
import { cleanupOtel, mockSdkInit, resetGlobals } from '../helpers/mockSdkInit';
diff --git a/packages/node/test/integration/transactions.test.ts b/packages/node/test/integration/transactions.test.ts
index a7207d30cbac..db499cd368df 100644
--- a/packages/node/test/integration/transactions.test.ts
+++ b/packages/node/test/integration/transactions.test.ts
@@ -1,10 +1,8 @@
-import { TraceFlags, context, trace } from '@opentelemetry/api';
+import { context, trace, TraceFlags } from '@opentelemetry/api';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { logger } from '@sentry/core';
import type { TransactionEvent } from '@sentry/core';
+import { logger, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import { SentrySpanProcessor } from '@sentry/opentelemetry';
-
import { afterEach, describe, expect, it, vi } from 'vitest';
import * as Sentry from '../../src';
import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
diff --git a/packages/node/test/integrations/context.test.ts b/packages/node/test/integrations/context.test.ts
index cad71c5af728..a22bfcf6ec34 100644
--- a/packages/node/test/integrations/context.test.ts
+++ b/packages/node/test/integrations/context.test.ts
@@ -1,5 +1,4 @@
import * as os from 'node:os';
-
import { afterAll, describe, expect, it, vi } from 'vitest';
import { getAppContext, getDeviceContext } from '../../src/integrations/context';
import { conditionalTest } from '../helpers/conditional';
diff --git a/packages/node/test/integrations/contextlines.test.ts b/packages/node/test/integrations/contextlines.test.ts
index be074030b1a0..2965acded28f 100644
--- a/packages/node/test/integrations/contextlines.test.ts
+++ b/packages/node/test/integrations/contextlines.test.ts
@@ -1,12 +1,11 @@
import * as fs from 'node:fs';
-import { parseStackFrames } from '@sentry/core';
import type { StackFrame } from '@sentry/core';
-
+import { parseStackFrames } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
import {
+ _contextLinesIntegration,
MAX_CONTEXTLINES_COLNO,
MAX_CONTEXTLINES_LINENO,
- _contextLinesIntegration,
resetFileContentCache,
} from '../../src/integrations/contextlines';
import { defaultStackParser } from '../../src/sdk/api';
diff --git a/packages/node/test/integrations/request-session-tracking.test.ts b/packages/node/test/integrations/request-session-tracking.test.ts
index da4a6896a8ae..02446eee875d 100644
--- a/packages/node/test/integrations/request-session-tracking.test.ts
+++ b/packages/node/test/integrations/request-session-tracking.test.ts
@@ -1,6 +1,6 @@
-import { EventEmitter } from 'stream';
-import { Scope, ServerRuntimeClient, createTransport, withScope } from '@sentry/core';
import type { Client } from '@sentry/core';
+import { createTransport, Scope, ServerRuntimeClient, withScope } from '@sentry/core';
+import { EventEmitter } from 'stream';
import { describe, expect, it, vi } from 'vitest';
import { recordRequestSession } from '../../src/integrations/http/SentryHttpInstrumentation';
diff --git a/packages/node/test/integrations/spotlight.test.ts b/packages/node/test/integrations/spotlight.test.ts
index a26a36aced91..2bd10080fd31 100644
--- a/packages/node/test/integrations/spotlight.test.ts
+++ b/packages/node/test/integrations/spotlight.test.ts
@@ -1,7 +1,6 @@
import * as http from 'node:http';
-import { createEnvelope, logger } from '@sentry/core';
import type { Envelope, EventEnvelope } from '@sentry/core';
-
+import { createEnvelope, logger } from '@sentry/core';
import { afterEach, describe, expect, it, vi } from 'vitest';
import { spotlightIntegration } from '../../src/integrations/spotlight';
import { NodeClient } from '../../src/sdk/client';
diff --git a/packages/node/test/integrations/tracing/mongo.test.ts b/packages/node/test/integrations/tracing/mongo.test.ts
index c4944df08e16..34f3048713ff 100644
--- a/packages/node/test/integrations/tracing/mongo.test.ts
+++ b/packages/node/test/integrations/tracing/mongo.test.ts
@@ -1,5 +1,4 @@
import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb';
-
import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
import {
_defaultDbStatementSerializer,
diff --git a/packages/node/test/integrations/tracing/redis.test.ts b/packages/node/test/integrations/tracing/redis.test.ts
index a23d648b92d1..38a5b80eb759 100644
--- a/packages/node/test/integrations/tracing/redis.test.ts
+++ b/packages/node/test/integrations/tracing/redis.test.ts
@@ -1,9 +1,9 @@
import { describe, expect, it } from 'vitest';
import {
- GET_COMMANDS,
- SET_COMMANDS,
calculateCacheItemSize,
+ GET_COMMANDS,
getCacheKeySafely,
+ SET_COMMANDS,
shouldConsiderForCache,
} from '../../../src/utils/redisCache';
diff --git a/packages/node/test/logs/exports.test.ts b/packages/node/test/logs/exports.test.ts
index 7a7a67a1b777..9e1cc4900e29 100644
--- a/packages/node/test/logs/exports.test.ts
+++ b/packages/node/test/logs/exports.test.ts
@@ -1,5 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import * as sentryCore from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import * as nodeLogger from '../../src/logs/exports';
// Mock the core functions
diff --git a/packages/node/test/sdk/client.test.ts b/packages/node/test/sdk/client.test.ts
index 7b7178660511..5511f339e8e6 100644
--- a/packages/node/test/sdk/client.test.ts
+++ b/packages/node/test/sdk/client.test.ts
@@ -1,9 +1,9 @@
-import * as os from 'os';
import { ProxyTracer } from '@opentelemetry/api';
import * as opentelemetryInstrumentationPackage from '@opentelemetry/instrumentation';
import type { Event, EventHint, Log } from '@sentry/core';
-import { SDK_VERSION, Scope, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
+import { getCurrentScope, getGlobalScope, getIsolationScope, Scope, SDK_VERSION } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '@sentry/opentelemetry';
+import * as os from 'os';
import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
import { NodeClient } from '../../src';
import { getDefaultNodeClientOptions } from '../helpers/getDefaultNodeClientOptions';
diff --git a/packages/node/test/sdk/init.test.ts b/packages/node/test/sdk/init.test.ts
index 089d5c09b1da..71f0f12e9e30 100644
--- a/packages/node/test/sdk/init.test.ts
+++ b/packages/node/test/sdk/init.test.ts
@@ -1,6 +1,5 @@
-import { logger } from '@sentry/core';
import type { Integration } from '@sentry/core';
-
+import { logger } from '@sentry/core';
import * as SentryOpentelemetry from '@sentry/opentelemetry';
import { type Mock, type MockInstance, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { getClient } from '../../src/';
diff --git a/packages/node/test/transports/http.test.ts b/packages/node/test/transports/http.test.ts
index 4dcf31dd2661..0f01fdc5639a 100644
--- a/packages/node/test/transports/http.test.ts
+++ b/packages/node/test/transports/http.test.ts
@@ -1,10 +1,15 @@
-import * as http from 'http';
-import { createGunzip } from 'zlib';
-import { createTransport } from '@sentry/core';
-import { addItemToEnvelope, createAttachmentEnvelopeItem, createEnvelope, serializeEnvelope } from '@sentry/core';
import type { EventEnvelope, EventItem } from '@sentry/core';
-
+import {
+ addItemToEnvelope,
+ createAttachmentEnvelopeItem,
+ createEnvelope,
+ createTransport,
+ serializeEnvelope,
+} from '@sentry/core';
+import * as http from 'http';
import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { createGunzip } from 'zlib';
+import * as httpProxyAgent from '../../src/proxy';
import { makeNodeTransport } from '../../src/transports';
vi.mock('@sentry/core', async () => {
@@ -25,8 +30,6 @@ vi.mock('node:http', async () => {
};
});
-import * as httpProxyAgent from '../../src/proxy';
-
const SUCCESS = 200;
const RATE_LIMIT = 429;
const INVALID = 400;
diff --git a/packages/node/test/transports/https.test.ts b/packages/node/test/transports/https.test.ts
index b8a7d605b2f3..bb4147a20133 100644
--- a/packages/node/test/transports/https.test.ts
+++ b/packages/node/test/transports/https.test.ts
@@ -1,10 +1,9 @@
+import type { EventEnvelope, EventItem } from '@sentry/core';
+import { createEnvelope, createTransport, serializeEnvelope } from '@sentry/core';
import * as http from 'http';
import * as https from 'https';
-import { createTransport } from '@sentry/core';
-import { createEnvelope, serializeEnvelope } from '@sentry/core';
-import type { EventEnvelope, EventItem } from '@sentry/core';
-
import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import * as httpProxyAgent from '../../src/proxy';
import { makeNodeTransport } from '../../src/transports';
import type { HTTPModule, HTTPModuleRequestIncomingMessage } from '../../src/transports/http-module';
import testServerCerts from './test-server-certs';
@@ -18,8 +17,6 @@ vi.mock('@sentry/core', async () => {
};
});
-import * as httpProxyAgent from '../../src/proxy';
-
const SUCCESS = 200;
const RATE_LIMIT = 429;
const INVALID = 400;
diff --git a/packages/node/test/utils/getRequestUrl.test.ts b/packages/node/test/utils/getRequestUrl.test.ts
index 621896987390..a96514380481 100644
--- a/packages/node/test/utils/getRequestUrl.test.ts
+++ b/packages/node/test/utils/getRequestUrl.test.ts
@@ -1,5 +1,4 @@
import type { RequestOptions } from 'http';
-
import { describe, expect, it } from 'vitest';
import { getRequestUrl } from '../../src/utils/getRequestUrl';
diff --git a/packages/node/test/utils/instrument.test.ts b/packages/node/test/utils/instrument.test.ts
index 3cc7fedb4d22..0b9e1b6c727a 100644
--- a/packages/node/test/utils/instrument.test.ts
+++ b/packages/node/test/utils/instrument.test.ts
@@ -1,4 +1,4 @@
-import { describe, test, vi, expect } from 'vitest';
+import { describe, expect, test, vi } from 'vitest';
import { instrumentWhenWrapped } from '../../src/otel/instrument';
describe('instrumentWhenWrapped', () => {
diff --git a/packages/nuxt/src/client/sdk.ts b/packages/nuxt/src/client/sdk.ts
index 45c02583cbfc..5db856dae689 100644
--- a/packages/nuxt/src/client/sdk.ts
+++ b/packages/nuxt/src/client/sdk.ts
@@ -1,6 +1,6 @@
import { getDefaultIntegrations as getBrowserDefaultIntegrations, init as initBrowser } from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
import type { Client } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
import type { SentryNuxtClientOptions } from '../common/types';
/**
diff --git a/packages/nuxt/src/client/vueIntegration.ts b/packages/nuxt/src/client/vueIntegration.ts
index 971ec611b729..1d5cfff9c795 100644
--- a/packages/nuxt/src/client/vueIntegration.ts
+++ b/packages/nuxt/src/client/vueIntegration.ts
@@ -1,4 +1,4 @@
-import { GLOBAL_OBJ, defineIntegration } from '@sentry/core';
+import { defineIntegration, GLOBAL_OBJ } from '@sentry/core';
import type { VueIntegrationOptions } from '@sentry/vue';
type Options = Omit;
diff --git a/packages/nuxt/src/index.types.ts b/packages/nuxt/src/index.types.ts
index 24b21b8680ae..c6cdb01d280e 100644
--- a/packages/nuxt/src/index.types.ts
+++ b/packages/nuxt/src/index.types.ts
@@ -1,3 +1,5 @@
+/* eslint-disable import/export */
+
import type { Client, Integration, Options, StackParser } from '@sentry/core';
import type { SentryNuxtClientOptions, SentryNuxtServerOptions } from './common/types';
import type * as clientSdk from './index.client';
diff --git a/packages/nuxt/src/module.ts b/packages/nuxt/src/module.ts
index 275c558c6666..a7e81a49d045 100644
--- a/packages/nuxt/src/module.ts
+++ b/packages/nuxt/src/module.ts
@@ -1,6 +1,6 @@
-import * as path from 'path';
import { addPlugin, addPluginTemplate, addServerPlugin, createResolver, defineNuxtModule } from '@nuxt/kit';
import { consoleSandbox } from '@sentry/core';
+import * as path from 'path';
import type { SentryNuxtModuleOptions } from './common/types';
import { addDynamicImportEntryFileWrapper, addSentryTopImport, addServerConfigToBuild } from './vite/addServerConfig';
import { setupSourceMaps } from './vite/sourceMaps';
diff --git a/packages/nuxt/src/runtime/plugins/sentry.client.ts b/packages/nuxt/src/runtime/plugins/sentry.client.ts
index b15bff19f099..dc06b5786e1e 100644
--- a/packages/nuxt/src/runtime/plugins/sentry.client.ts
+++ b/packages/nuxt/src/runtime/plugins/sentry.client.ts
@@ -1,4 +1,4 @@
-import { GLOBAL_OBJ, getClient } from '@sentry/core';
+import { getClient, GLOBAL_OBJ } from '@sentry/core';
import { browserTracingIntegration, vueIntegration } from '@sentry/vue';
import { defineNuxtPlugin, isNuxtError } from 'nuxt/app';
import type { GlobalObjWithIntegrationOptions } from '../../client/vueIntegration';
diff --git a/packages/nuxt/src/runtime/plugins/sentry.server.ts b/packages/nuxt/src/runtime/plugins/sentry.server.ts
index f65ac64b9982..a785e8452fac 100644
--- a/packages/nuxt/src/runtime/plugins/sentry.server.ts
+++ b/packages/nuxt/src/runtime/plugins/sentry.server.ts
@@ -1,14 +1,16 @@
import {
- GLOBAL_OBJ,
flush,
getDefaultIsolationScope,
getIsolationScope,
+ GLOBAL_OBJ,
logger,
vercelWaitUntil,
withIsolationScope,
} from '@sentry/core';
import * as SentryNode from '@sentry/node';
+// eslint-disable-next-line import/no-extraneous-dependencies
import { type EventHandler, H3Error } from 'h3';
+// eslint-disable-next-line import/no-extraneous-dependencies
import { defineNitroPlugin } from 'nitropack/runtime';
import type { NuxtRenderHTMLContext } from 'nuxt/app';
import { addSentryTracingMetaTags, extractErrorContext } from '../utils';
diff --git a/packages/nuxt/src/runtime/utils.ts b/packages/nuxt/src/runtime/utils.ts
index fb247504f78a..07b4dccdffd9 100644
--- a/packages/nuxt/src/runtime/utils.ts
+++ b/packages/nuxt/src/runtime/utils.ts
@@ -1,6 +1,5 @@
import type { ClientOptions, Context } from '@sentry/core';
-import { logger } from '@sentry/core';
-import { captureException, getClient, getTraceMetaTags } from '@sentry/core';
+import { captureException, getClient, getTraceMetaTags, logger } from '@sentry/core';
import type { VueOptions } from '@sentry/vue/src/types';
import type { CapturedErrorContext } from 'nitropack';
import type { NuxtRenderHTMLContext } from 'nuxt/app';
diff --git a/packages/nuxt/src/vite/addServerConfig.ts b/packages/nuxt/src/vite/addServerConfig.ts
index 9495f4ac2f4a..771c534705cb 100644
--- a/packages/nuxt/src/vite/addServerConfig.ts
+++ b/packages/nuxt/src/vite/addServerConfig.ts
@@ -1,20 +1,20 @@
-import * as fs from 'fs';
+import { existsSync } from 'node:fs';
import { createResolver } from '@nuxt/kit';
import { logger } from '@sentry/core';
+import * as fs from 'fs';
import type { Nitro } from 'nitropack';
import type { InputPluginOption } from 'rollup';
import type { SentryNuxtModuleOptions } from '../common/types';
import {
- QUERY_END_INDICATOR,
- SENTRY_REEXPORTED_FUNCTIONS,
- SENTRY_WRAPPED_ENTRY,
- SENTRY_WRAPPED_FUNCTIONS,
constructFunctionReExport,
constructWrappedFunctionExportQuery,
getFilenameFromNodeStartCommand,
+ QUERY_END_INDICATOR,
removeSentryQueryFromPath,
+ SENTRY_REEXPORTED_FUNCTIONS,
+ SENTRY_WRAPPED_ENTRY,
+ SENTRY_WRAPPED_FUNCTIONS,
} from './utils';
-import { existsSync } from 'node:fs';
const SERVER_CONFIG_FILENAME = 'sentry.server.config';
diff --git a/packages/nuxt/src/vite/utils.ts b/packages/nuxt/src/vite/utils.ts
index c0df11485d5f..ea2db2bc21b8 100644
--- a/packages/nuxt/src/vite/utils.ts
+++ b/packages/nuxt/src/vite/utils.ts
@@ -1,6 +1,6 @@
+import { consoleSandbox } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
-import { consoleSandbox } from '@sentry/core';
/**
* Find the default SDK init file for the given type (client or server).
diff --git a/packages/nuxt/test/server/sdk.test.ts b/packages/nuxt/test/server/sdk.test.ts
index e5c1a58d15c3..7139b82e30ec 100644
--- a/packages/nuxt/test/server/sdk.test.ts
+++ b/packages/nuxt/test/server/sdk.test.ts
@@ -1,9 +1,7 @@
import type { EventProcessor } from '@sentry/core';
-import * as SentryNode from '@sentry/node';
import type { NodeClient } from '@sentry/node';
-import { Scope } from '@sentry/node';
-import { getGlobalScope } from '@sentry/node';
-import { SDK_VERSION } from '@sentry/node';
+import * as SentryNode from '@sentry/node';
+import { getGlobalScope, Scope, SDK_VERSION } from '@sentry/node';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { init } from '../../src/server';
import { clientSourceMapErrorFilter } from '../../src/server/sdk';
diff --git a/packages/nuxt/test/vite/sourceMaps.test.ts b/packages/nuxt/test/vite/sourceMaps.test.ts
index 259c402e4058..aaa7d2035655 100644
--- a/packages/nuxt/test/vite/sourceMaps.test.ts
+++ b/packages/nuxt/test/vite/sourceMaps.test.ts
@@ -1,11 +1,11 @@
import type { Nuxt } from '@nuxt/schema';
-import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { SentryNuxtModuleOptions } from '../../src/common/types';
import type { SourceMapSetting } from '../../src/vite/sourceMaps';
import {
changeNuxtSourceMapSettings,
- validateNitroSourceMapSettings,
getPluginOptions,
+ validateNitroSourceMapSettings,
} from '../../src/vite/sourceMaps';
vi.mock('@sentry/core', () => ({
diff --git a/packages/nuxt/test/vite/utils.test.ts b/packages/nuxt/test/vite/utils.test.ts
index 24e5a601535e..7ffd7654549e 100644
--- a/packages/nuxt/test/vite/utils.test.ts
+++ b/packages/nuxt/test/vite/utils.test.ts
@@ -1,16 +1,16 @@
import * as fs from 'fs';
import { afterEach, describe, expect, it, vi } from 'vitest';
import {
- QUERY_END_INDICATOR,
- SENTRY_REEXPORTED_FUNCTIONS,
- SENTRY_WRAPPED_ENTRY,
- SENTRY_WRAPPED_FUNCTIONS,
constructFunctionReExport,
constructWrappedFunctionExportQuery,
extractFunctionReexportQueryParameters,
findDefaultSdkInitFile,
getFilenameFromNodeStartCommand,
+ QUERY_END_INDICATOR,
removeSentryQueryFromPath,
+ SENTRY_REEXPORTED_FUNCTIONS,
+ SENTRY_WRAPPED_ENTRY,
+ SENTRY_WRAPPED_FUNCTIONS,
} from '../../src/vite/utils';
vi.mock('fs');
diff --git a/packages/opentelemetry/src/contextManager.ts b/packages/opentelemetry/src/contextManager.ts
index 95154c929319..e8632b095c02 100644
--- a/packages/opentelemetry/src/contextManager.ts
+++ b/packages/opentelemetry/src/contextManager.ts
@@ -1,7 +1,6 @@
import type { Context, ContextManager } from '@opentelemetry/api';
-import { getCurrentScope, getIsolationScope } from '@sentry/core';
import type { Scope } from '@sentry/core';
-
+import { getCurrentScope, getIsolationScope } from '@sentry/core';
import {
SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY,
SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY,
diff --git a/packages/opentelemetry/src/propagator.ts b/packages/opentelemetry/src/propagator.ts
index f92331d7739f..b5e493b31fd8 100644
--- a/packages/opentelemetry/src/propagator.ts
+++ b/packages/opentelemetry/src/propagator.ts
@@ -1,11 +1,9 @@
import type { Baggage, Context, Span, SpanContext, TextMapGetter, TextMapSetter } from '@opentelemetry/api';
-import { INVALID_TRACEID, TraceFlags, context, propagation, trace } from '@opentelemetry/api';
-import { W3CBaggagePropagator, isTracingSuppressed } from '@opentelemetry/core';
+import { context, INVALID_TRACEID, propagation, trace, TraceFlags } from '@opentelemetry/api';
+import { isTracingSuppressed, W3CBaggagePropagator } from '@opentelemetry/core';
import { ATTR_URL_FULL, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
-import type { DynamicSamplingContext, Options, continueTrace } from '@sentry/core';
+import type { continueTrace, DynamicSamplingContext, Options } from '@sentry/core';
import {
- LRUMap,
- SENTRY_BAGGAGE_KEY_PREFIX,
generateSentryTraceHeader,
getClient,
getCurrentScope,
@@ -13,8 +11,10 @@ import {
getDynamicSamplingContextFromSpan,
getIsolationScope,
logger,
+ LRUMap,
parseBaggageHeader,
propagationContextFromHeaders,
+ SENTRY_BAGGAGE_KEY_PREFIX,
spanToJSON,
stringMatchesSomePattern,
} from '@sentry/core';
diff --git a/packages/opentelemetry/src/sampler.ts b/packages/opentelemetry/src/sampler.ts
index 20a04f9cc9e7..73c568152b97 100644
--- a/packages/opentelemetry/src/sampler.ts
+++ b/packages/opentelemetry/src/sampler.ts
@@ -1,6 +1,6 @@
/* eslint-disable complexity */
import type { Context, Span, TraceState as TraceStateInterface } from '@opentelemetry/api';
-import { SpanKind, isSpanContextValid, trace } from '@opentelemetry/api';
+import { isSpanContextValid, SpanKind, 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';
@@ -11,14 +11,20 @@ import {
SEMATTRS_HTTP_URL,
} from '@opentelemetry/semantic-conventions';
import type { Client, SpanAttributes } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE } from '@sentry/core';
-import { baggageHeaderToDynamicSamplingContext } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, hasSpansEnabled, logger, parseSampleRate, sampleSpan } from '@sentry/core';
+import {
+ baggageHeaderToDynamicSamplingContext,
+ hasSpansEnabled,
+ logger,
+ parseSampleRate,
+ sampleSpan,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+} from '@sentry/core';
import {
SENTRY_TRACE_STATE_DSC,
- SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING,
SENTRY_TRACE_STATE_SAMPLE_RAND,
SENTRY_TRACE_STATE_SAMPLE_RATE,
+ SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING,
SENTRY_TRACE_STATE_URL,
} from './constants';
import { DEBUG_BUILD } from './debug-build';
diff --git a/packages/opentelemetry/src/spanExporter.ts b/packages/opentelemetry/src/spanExporter.ts
index 90a3d890a959..ca7d2823feee 100644
--- a/packages/opentelemetry/src/spanExporter.ts
+++ b/packages/opentelemetry/src/spanExporter.ts
@@ -11,18 +11,18 @@ import type {
TransactionEvent,
TransactionSource,
} from '@sentry/core';
-import { convertSpanLinksForEnvelope } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
captureEvent,
+ convertSpanLinksForEnvelope,
getCapturedScopesOnSpan,
getDynamicSamplingContextFromSpan,
getStatusMessage,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanTimeInputToSeconds,
timedEventsToMeasurements,
} from '@sentry/core';
diff --git a/packages/opentelemetry/src/trace.ts b/packages/opentelemetry/src/trace.ts
index 77f3cac6ddf0..e604d83bd4d8 100644
--- a/packages/opentelemetry/src/trace.ts
+++ b/packages/opentelemetry/src/trace.ts
@@ -1,17 +1,15 @@
import type { Context, Span, SpanContext, SpanOptions, Tracer } from '@opentelemetry/api';
-import { SpanStatusCode, TraceFlags, context, trace } from '@opentelemetry/api';
+import { context, SpanStatusCode, trace, TraceFlags } from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import type {
Client,
+ continueTrace as baseContinueTrace,
DynamicSamplingContext,
Scope,
Span as SentrySpan,
TraceContext,
- continueTrace as baseContinueTrace,
} from '@sentry/core';
import {
- SDK_VERSION,
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
getClient,
getCurrentScope,
getDynamicSamplingContextFromScope,
@@ -19,6 +17,8 @@ import {
getRootSpan,
getTraceContextFromScope,
handleCallbackErrors,
+ SDK_VERSION,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
spanToJSON,
spanToTraceContext,
} from '@sentry/core';
diff --git a/packages/opentelemetry/src/utils/addOriginToSpan.ts b/packages/opentelemetry/src/utils/addOriginToSpan.ts
index 22ed30ed37e0..2a23710fa7cf 100644
--- a/packages/opentelemetry/src/utils/addOriginToSpan.ts
+++ b/packages/opentelemetry/src/utils/addOriginToSpan.ts
@@ -1,6 +1,6 @@
import type { Span } from '@opentelemetry/api';
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import type { SpanOrigin } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
/** Adds an origin to an OTEL Span. */
export function addOriginToSpan(span: Span, origin: SpanOrigin): void {
diff --git a/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts b/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts
index 6384bd808dab..7fb080119d3b 100644
--- a/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts
+++ b/packages/opentelemetry/src/utils/enhanceDscWithOpenTelemetryRootSpanName.ts
@@ -1,5 +1,5 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, hasSpansEnabled, spanToJSON } from '@sentry/core';
import type { Client } from '@sentry/core';
+import { hasSpansEnabled, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core';
import { getSamplingDecision } from './getSamplingDecision';
import { parseSpanDescription } from './parseSpanDescription';
import { spanHasName } from './spanTypes';
diff --git a/packages/opentelemetry/src/utils/getRequestSpanData.ts b/packages/opentelemetry/src/utils/getRequestSpanData.ts
index cc27aadf7a78..083434e07559 100644
--- a/packages/opentelemetry/src/utils/getRequestSpanData.ts
+++ b/packages/opentelemetry/src/utils/getRequestSpanData.ts
@@ -6,9 +6,8 @@ import {
SEMATTRS_HTTP_METHOD,
SEMATTRS_HTTP_URL,
} from '@opentelemetry/semantic-conventions';
-import { getSanitizedUrlString, parseUrl } from '@sentry/core';
import type { SanitizedRequestData } from '@sentry/core';
-
+import { getSanitizedUrlString, parseUrl } from '@sentry/core';
import { spanHasAttributes } from './spanTypes';
/**
diff --git a/packages/opentelemetry/src/utils/getSpanKind.ts b/packages/opentelemetry/src/utils/getSpanKind.ts
index 72a7407049b9..de0e9b33e490 100644
--- a/packages/opentelemetry/src/utils/getSpanKind.ts
+++ b/packages/opentelemetry/src/utils/getSpanKind.ts
@@ -1,5 +1,4 @@
import { SpanKind } from '@opentelemetry/api';
-
import type { AbstractSpan } from '../types';
import { spanHasKind } from './spanTypes';
diff --git a/packages/opentelemetry/src/utils/getTraceData.ts b/packages/opentelemetry/src/utils/getTraceData.ts
index 1134a9e70f34..88ab5a349cdf 100644
--- a/packages/opentelemetry/src/utils/getTraceData.ts
+++ b/packages/opentelemetry/src/utils/getTraceData.ts
@@ -1,10 +1,10 @@
import * as api from '@opentelemetry/api';
+import type { SerializedTraceData, Span } from '@sentry/core';
import {
dynamicSamplingContextToSentryBaggageHeader,
generateSentryTraceHeader,
getCapturedScopesOnSpan,
} from '@sentry/core';
-import type { SerializedTraceData, Span } from '@sentry/core';
import { getInjectionData } from '../propagator';
import { getContextFromScope } from './contextData';
diff --git a/packages/opentelemetry/src/utils/isSentryRequest.ts b/packages/opentelemetry/src/utils/isSentryRequest.ts
index c910ec1607bb..d6b59880137b 100644
--- a/packages/opentelemetry/src/utils/isSentryRequest.ts
+++ b/packages/opentelemetry/src/utils/isSentryRequest.ts
@@ -1,6 +1,5 @@
import { ATTR_URL_FULL, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { getClient, isSentryRequestUrl } from '@sentry/core';
-
import type { AbstractSpan } from '../types';
import { spanHasAttributes } from './spanTypes';
diff --git a/packages/opentelemetry/src/utils/makeTraceState.ts b/packages/opentelemetry/src/utils/makeTraceState.ts
index c232c981bb41..5d7d6248de56 100644
--- a/packages/opentelemetry/src/utils/makeTraceState.ts
+++ b/packages/opentelemetry/src/utils/makeTraceState.ts
@@ -1,6 +1,6 @@
import { TraceState } from '@opentelemetry/core';
-import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/core';
import type { DynamicSamplingContext } from '@sentry/core';
+import { dynamicSamplingContextToSentryBaggageHeader } from '@sentry/core';
import { SENTRY_TRACE_STATE_DSC, SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING } from '../constants';
/**
diff --git a/packages/opentelemetry/src/utils/mapStatus.ts b/packages/opentelemetry/src/utils/mapStatus.ts
index c882852fcee8..742bffdb1551 100644
--- a/packages/opentelemetry/src/utils/mapStatus.ts
+++ b/packages/opentelemetry/src/utils/mapStatus.ts
@@ -4,9 +4,8 @@ import {
SEMATTRS_HTTP_STATUS_CODE,
SEMATTRS_RPC_GRPC_STATUS_CODE,
} from '@opentelemetry/semantic-conventions';
-import { SPAN_STATUS_ERROR, SPAN_STATUS_OK, getSpanStatusFromHttpCode } from '@sentry/core';
import type { SpanAttributes, SpanStatus } from '@sentry/core';
-
+import { getSpanStatusFromHttpCode, SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import type { AbstractSpan } from '../types';
import { spanHasAttributes, spanHasStatus } from './spanTypes';
diff --git a/packages/opentelemetry/src/utils/parseSpanDescription.ts b/packages/opentelemetry/src/utils/parseSpanDescription.ts
index 200c3b65b9c9..9328320e404f 100644
--- a/packages/opentelemetry/src/utils/parseSpanDescription.ts
+++ b/packages/opentelemetry/src/utils/parseSpanDescription.ts
@@ -1,4 +1,4 @@
-import type { AttributeValue, Attributes } from '@opentelemetry/api';
+import type { Attributes, AttributeValue } from '@opentelemetry/api';
import { SpanKind } from '@opentelemetry/api';
import {
ATTR_HTTP_REQUEST_METHOD,
@@ -15,12 +15,12 @@ import {
} from '@opentelemetry/semantic-conventions';
import type { SpanAttributes, TransactionSource } from '@sentry/core';
import {
+ getSanitizedUrlString,
+ parseUrl,
SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- getSanitizedUrlString,
- parseUrl,
stripUrlQueryAndFragment,
} from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_GRAPHQL_OPERATION } from '../semanticAttributes';
diff --git a/packages/opentelemetry/src/utils/spanTypes.ts b/packages/opentelemetry/src/utils/spanTypes.ts
index 39c62219d2ad..2009692177ac 100644
--- a/packages/opentelemetry/src/utils/spanTypes.ts
+++ b/packages/opentelemetry/src/utils/spanTypes.ts
@@ -1,6 +1,5 @@
import type { SpanKind, SpanStatus } from '@opentelemetry/api';
import type { ReadableSpan, TimedEvent } from '@opentelemetry/sdk-trace-base';
-
import type { AbstractSpan } from '../types';
/**
diff --git a/packages/opentelemetry/test/asyncContextStrategy.test.ts b/packages/opentelemetry/test/asyncContextStrategy.test.ts
index cdbb91774561..6541e8b9220c 100644
--- a/packages/opentelemetry/test/asyncContextStrategy.test.ts
+++ b/packages/opentelemetry/test/asyncContextStrategy.test.ts
@@ -1,19 +1,18 @@
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import type { Scope } from '@sentry/core';
import {
- Scope as ScopeClass,
getCurrentScope,
getIsolationScope,
+ Scope as ScopeClass,
setAsyncContextStrategy,
withIsolationScope,
withScope,
} from '@sentry/core';
-import { describe, beforeEach, afterEach, afterAll, test, expect, it } from 'vitest';
-
-import type { Scope } from '@sentry/core';
+import { afterAll, afterEach, beforeEach, describe, expect, it, test } from 'vitest';
import { setOpenTelemetryContextAsyncContextStrategy } from '../src/asyncContextStrategy';
-import { TestClient, getDefaultTestClientOptions } from './helpers/TestClient';
import { setupOtel } from './helpers/initOtel';
import { cleanupOtel } from './helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from './helpers/TestClient';
describe('asyncContextStrategy', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/custom/client.test.ts b/packages/opentelemetry/test/custom/client.test.ts
index 7be1313dea45..b39f45d4919e 100644
--- a/packages/opentelemetry/test/custom/client.test.ts
+++ b/packages/opentelemetry/test/custom/client.test.ts
@@ -1,7 +1,6 @@
import { ProxyTracer } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';
-
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('OpenTelemetryClient', () => {
it('exposes a tracer', () => {
diff --git a/packages/opentelemetry/test/helpers/TestClient.ts b/packages/opentelemetry/test/helpers/TestClient.ts
index 5089dd160768..7dc5a7f315a2 100644
--- a/packages/opentelemetry/test/helpers/TestClient.ts
+++ b/packages/opentelemetry/test/helpers/TestClient.ts
@@ -1,7 +1,5 @@
-import { Client, createTransport, getCurrentScope } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
import type { ClientOptions, Event, Options, SeverityLevel } from '@sentry/core';
-
+import { Client, createTransport, getCurrentScope, resolvedSyncPromise } from '@sentry/core';
import { wrapClientClass } from '../../src/custom/client';
import type { OpenTelemetryClient } from '../../src/types';
diff --git a/packages/opentelemetry/test/helpers/initOtel.ts b/packages/opentelemetry/test/helpers/initOtel.ts
index 121ca0181892..dd797f44ffb2 100644
--- a/packages/opentelemetry/test/helpers/initOtel.ts
+++ b/packages/opentelemetry/test/helpers/initOtel.ts
@@ -1,4 +1,4 @@
-import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
+import { context, diag, DiagLogLevel, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
@@ -7,9 +7,7 @@ import {
ATTR_SERVICE_VERSION,
SEMRESATTRS_SERVICE_NAMESPACE,
} from '@opentelemetry/semantic-conventions';
-import { SDK_VERSION, getClient } from '@sentry/core';
-import { logger } from '@sentry/core';
-
+import { getClient, logger, SDK_VERSION } from '@sentry/core';
import { wrapContextManagerClass } from '../../src/contextManager';
import { DEBUG_BUILD } from '../../src/debug-build';
import { SentryPropagator } from '../../src/propagator';
diff --git a/packages/opentelemetry/test/helpers/mockSdkInit.ts b/packages/opentelemetry/test/helpers/mockSdkInit.ts
index 0bcf1b101896..486397e32cef 100644
--- a/packages/opentelemetry/test/helpers/mockSdkInit.ts
+++ b/packages/opentelemetry/test/helpers/mockSdkInit.ts
@@ -1,14 +1,12 @@
-import { ProxyTracerProvider, context, propagation, trace } from '@opentelemetry/api';
+import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import type { ClientOptions, Options } from '@sentry/core';
-import { getClient } from '@sentry/core';
-
-import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sentry/core';
+import { flush, getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
+import type { OpenTelemetryClient } from '../../src/types';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
-import { init as initTestClient } from './TestClient';
import { initOtel } from './initOtel';
-import type { OpenTelemetryClient } from '../../src/types';
+import { init as initTestClient } from './TestClient';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/opentelemetry/test/integration/breadcrumbs.test.ts b/packages/opentelemetry/test/integration/breadcrumbs.test.ts
index 247cb55094b1..5375d3acbdf9 100644
--- a/packages/opentelemetry/test/integration/breadcrumbs.test.ts
+++ b/packages/opentelemetry/test/integration/breadcrumbs.test.ts
@@ -1,9 +1,8 @@
import { addBreadcrumb, captureException, getClient, withIsolationScope, withScope } from '@sentry/core';
-import { describe, afterEach, expect, it, vi } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { startSpan } from '../../src/trace';
-import type { TestClientInterface } from '../helpers/TestClient';
import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
+import type { TestClientInterface } from '../helpers/TestClient';
describe('Integration | breadcrumbs', () => {
const beforeSendTransaction = vi.fn(() => null);
diff --git a/packages/opentelemetry/test/integration/scope.test.ts b/packages/opentelemetry/test/integration/scope.test.ts
index f741c29804e0..56acffb7921e 100644
--- a/packages/opentelemetry/test/integration/scope.test.ts
+++ b/packages/opentelemetry/test/integration/scope.test.ts
@@ -8,11 +8,10 @@ import {
withIsolationScope,
withScope,
} from '@sentry/core';
-import { describe, afterEach, expect, it, vi } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { startSpan } from '../../src/trace';
-import type { TestClientInterface } from '../helpers/TestClient';
import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
+import type { TestClientInterface } from '../helpers/TestClient';
describe('Integration | Scope', () => {
afterEach(async () => {
diff --git a/packages/opentelemetry/test/integration/transactions.test.ts b/packages/opentelemetry/test/integration/transactions.test.ts
index a745b9187e57..97d075ef5071 100644
--- a/packages/opentelemetry/test/integration/transactions.test.ts
+++ b/packages/opentelemetry/test/integration/transactions.test.ts
@@ -1,27 +1,25 @@
import type { SpanContext } from '@opentelemetry/api';
-import { ROOT_CONTEXT } from '@opentelemetry/api';
-import { TraceFlags, context, trace } from '@opentelemetry/api';
+import { context, ROOT_CONTEXT, trace, TraceFlags } from '@opentelemetry/api';
+import { TraceState } from '@opentelemetry/core';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
+import type { Event, TransactionEvent } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
addBreadcrumb,
getClient,
+ logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setTag,
startSpanManual,
withIsolationScope,
} from '@sentry/core';
-import { logger } from '@sentry/core';
-import type { Event, TransactionEvent } from '@sentry/core';
-import { describe, afterEach, expect, it, vi } from 'vitest';
-
-import { TraceState } from '@opentelemetry/core';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { SENTRY_TRACE_STATE_DSC } from '../../src/constants';
import { SentrySpanProcessor } from '../../src/spanProcessor';
import { startInactiveSpan, startSpan } from '../../src/trace';
import { makeTraceState } from '../../src/utils/makeTraceState';
-import type { TestClientInterface } from '../helpers/TestClient';
import { cleanupOtel, getProvider, mockSdkInit } from '../helpers/mockSdkInit';
+import type { TestClientInterface } from '../helpers/TestClient';
describe('Integration | Transactions', () => {
afterEach(async () => {
diff --git a/packages/opentelemetry/test/propagator.test.ts b/packages/opentelemetry/test/propagator.test.ts
index 971cc610fb44..46d4be5d8275 100644
--- a/packages/opentelemetry/test/propagator.test.ts
+++ b/packages/opentelemetry/test/propagator.test.ts
@@ -1,16 +1,15 @@
import {
- ROOT_CONTEXT,
- TraceFlags,
context,
defaultTextMapGetter,
defaultTextMapSetter,
propagation,
+ ROOT_CONTEXT,
trace,
+ TraceFlags,
} from '@opentelemetry/api';
import { suppressTracing } from '@opentelemetry/core';
import { getCurrentScope, withScope } from '@sentry/core';
-import { describe, beforeEach, afterEach, expect, it } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { SENTRY_BAGGAGE_HEADER, SENTRY_SCOPES_CONTEXT_KEY, SENTRY_TRACE_HEADER } from '../src/constants';
import { SentryPropagator } from '../src/propagator';
import { getSamplingDecision } from '../src/utils/getSamplingDecision';
diff --git a/packages/opentelemetry/test/sampler.test.ts b/packages/opentelemetry/test/sampler.test.ts
index 984a65a50a04..6ae5c3d48308 100644
--- a/packages/opentelemetry/test/sampler.test.ts
+++ b/packages/opentelemetry/test/sampler.test.ts
@@ -1,14 +1,13 @@
-import { SpanKind, context, trace } from '@opentelemetry/api';
+import { context, SpanKind, trace } from '@opentelemetry/api';
import { TraceState } from '@opentelemetry/core';
import { SamplingDecision } from '@opentelemetry/sdk-trace-base';
import { ATTR_HTTP_REQUEST_METHOD } from '@opentelemetry/semantic-conventions';
import { generateSpanId, generateTraceId } from '@sentry/core';
-import { describe, afterEach, vi, expect, it } from 'vitest';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { SENTRY_TRACE_STATE_SAMPLED_NOT_RECORDING } from '../src/constants';
import { SentrySampler } from '../src/sampler';
-import { TestClient, getDefaultTestClientOptions } from './helpers/TestClient';
import { cleanupOtel } from './helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from './helpers/TestClient';
describe('SentrySampler', () => {
afterEach(async () => {
diff --git a/packages/opentelemetry/test/spanExporter.test.ts b/packages/opentelemetry/test/spanExporter.test.ts
index e192f77a5f41..1f233c65c055 100644
--- a/packages/opentelemetry/test/spanExporter.test.ts
+++ b/packages/opentelemetry/test/spanExporter.test.ts
@@ -1,7 +1,6 @@
import { ATTR_HTTP_RESPONSE_STATUS_CODE } from '@opentelemetry/semantic-conventions';
import { SDK_VERSION, SEMANTIC_ATTRIBUTE_SENTRY_OP, startInactiveSpan, startSpanManual } from '@sentry/core';
-import { describe, afterEach, beforeEach, expect, it } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { createTransactionForOtelSpan } from '../src/spanExporter';
import { cleanupOtel, mockSdkInit } from './helpers/mockSdkInit';
diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts
index a820e7502929..74b37809f4ae 100644
--- a/packages/opentelemetry/test/trace.test.ts
+++ b/packages/opentelemetry/test/trace.test.ts
@@ -1,29 +1,26 @@
/* eslint-disable deprecation/deprecation */
import type { Span, TimeInput } from '@opentelemetry/api';
-import { ROOT_CONTEXT } from '@opentelemetry/api';
-import { SpanKind } from '@opentelemetry/api';
-import { TraceFlags, context, trace } from '@opentelemetry/api';
+import { context, ROOT_CONTEXT, SpanKind, trace, TraceFlags } from '@opentelemetry/api';
import type { ReadableSpan } from '@opentelemetry/sdk-trace-base';
import { Span as SpanClass } from '@opentelemetry/sdk-trace-base';
+import { SEMATTRS_HTTP_METHOD } from '@opentelemetry/semantic-conventions';
+import type { Event, Scope } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getClient,
getCurrentScope,
getDynamicSamplingContextFromClient,
getDynamicSamplingContextFromSpan,
getRootSpan,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanIsSampled,
spanToJSON,
suppressTracing,
withScope,
} from '@sentry/core';
-import type { Event, Scope } from '@sentry/core';
-import { describe, afterEach, beforeEach, expect, it, vi } from 'vitest';
-
-import { SEMATTRS_HTTP_METHOD } from '@opentelemetry/semantic-conventions';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { continueTrace, startInactiveSpan, startSpan, startSpanManual } from '../src/trace';
import type { AbstractSpan } from '../src/types';
import { getActiveSpan } from '../src/utils/getActiveSpan';
diff --git a/packages/opentelemetry/test/utils/getActiveSpan.test.ts b/packages/opentelemetry/test/utils/getActiveSpan.test.ts
index 964c75bc4ed9..383f91d5d6af 100644
--- a/packages/opentelemetry/test/utils/getActiveSpan.test.ts
+++ b/packages/opentelemetry/test/utils/getActiveSpan.test.ts
@@ -1,12 +1,11 @@
import { trace } from '@opentelemetry/api';
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { getRootSpan } from '@sentry/core';
-import { describe, afterEach, beforeEach, expect, it } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getActiveSpan } from '../../src/utils/getActiveSpan';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('getActiveSpan', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts b/packages/opentelemetry/test/utils/getRequestSpanData.test.ts
index b2fba5b2f2f7..2f5484d916b9 100644
--- a/packages/opentelemetry/test/utils/getRequestSpanData.test.ts
+++ b/packages/opentelemetry/test/utils/getRequestSpanData.test.ts
@@ -5,9 +5,9 @@ import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL } from '@opentelemetry/semantic-conventions';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { getRequestSpanData } from '../../src/utils/getRequestSpanData';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('getRequestSpanData', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/utils/getSpanKind.test.ts b/packages/opentelemetry/test/utils/getSpanKind.test.ts
index 66dbd14d3866..1a90fbc23ede 100644
--- a/packages/opentelemetry/test/utils/getSpanKind.test.ts
+++ b/packages/opentelemetry/test/utils/getSpanKind.test.ts
@@ -1,7 +1,6 @@
import type { Span } from '@opentelemetry/api';
import { SpanKind } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';
-
import { getSpanKind } from '../../src/utils/getSpanKind';
describe('getSpanKind', () => {
diff --git a/packages/opentelemetry/test/utils/getTraceData.test.ts b/packages/opentelemetry/test/utils/getTraceData.test.ts
index 815354017701..a4fc5919e1b6 100644
--- a/packages/opentelemetry/test/utils/getTraceData.test.ts
+++ b/packages/opentelemetry/test/utils/getTraceData.test.ts
@@ -1,7 +1,6 @@
import { context, trace } from '@opentelemetry/api';
import { getCurrentScope, setAsyncContextStrategy } from '@sentry/core';
-import { describe, afterEach, beforeEach, expect, it, vi } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { getTraceData } from '../../src/utils/getTraceData';
import { makeTraceState } from '../../src/utils/makeTraceState';
import { cleanupOtel, mockSdkInit } from '../helpers/mockSdkInit';
diff --git a/packages/opentelemetry/test/utils/groupSpansWithParents.test.ts b/packages/opentelemetry/test/utils/groupSpansWithParents.test.ts
index c137748353bf..d8ccec93f3e2 100644
--- a/packages/opentelemetry/test/utils/groupSpansWithParents.test.ts
+++ b/packages/opentelemetry/test/utils/groupSpansWithParents.test.ts
@@ -4,9 +4,9 @@ import type { Span } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { withActiveSpan } from '../../src/trace';
import { groupSpansWithParents } from '../../src/utils/groupSpansWithParents';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('groupSpansWithParents', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/utils/mapStatus.test.ts b/packages/opentelemetry/test/utils/mapStatus.test.ts
index a6b5db847652..4147eeca2251 100644
--- a/packages/opentelemetry/test/utils/mapStatus.test.ts
+++ b/packages/opentelemetry/test/utils/mapStatus.test.ts
@@ -7,9 +7,9 @@ import type { SpanStatus } from '@sentry/core';
import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { mapStatus } from '../../src/utils/mapStatus';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('mapStatus', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/utils/parseSpanDescription.test.ts b/packages/opentelemetry/test/utils/parseSpanDescription.test.ts
index 61e7ba7aada9..1d717b1d7488 100644
--- a/packages/opentelemetry/test/utils/parseSpanDescription.test.ts
+++ b/packages/opentelemetry/test/utils/parseSpanDescription.test.ts
@@ -14,9 +14,8 @@ import {
SEMATTRS_MESSAGING_SYSTEM,
SEMATTRS_RPC_SERVICE,
} from '@opentelemetry/semantic-conventions';
-import { describe, expect, it } from 'vitest';
-
import { SEMANTIC_ATTRIBUTE_SENTRY_CUSTOM_SPAN_NAME, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { describe, expect, it } from 'vitest';
import {
descriptionForHttpMethod,
getSanitizedUrl,
diff --git a/packages/opentelemetry/test/utils/setupCheck.test.ts b/packages/opentelemetry/test/utils/setupCheck.test.ts
index 53d8437e119a..a2b204d063b6 100644
--- a/packages/opentelemetry/test/utils/setupCheck.test.ts
+++ b/packages/opentelemetry/test/utils/setupCheck.test.ts
@@ -1,12 +1,11 @@
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
-import { describe, afterEach, beforeEach, expect, it } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { SentrySampler } from '../../src/sampler';
import { SentrySpanProcessor } from '../../src/spanProcessor';
import { openTelemetrySetupCheck } from '../../src/utils/setupCheck';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('openTelemetrySetupCheck', () => {
let provider: BasicTracerProvider | undefined;
diff --git a/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts b/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
index 21f7279fd48d..a705b546e610 100644
--- a/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
+++ b/packages/opentelemetry/test/utils/setupEventContextTrace.test.ts
@@ -1,12 +1,11 @@
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import { captureException, setCurrentClient } from '@sentry/core';
-import { describe, afterEach, beforeEach, expect, it, vi, afterAll } from 'vitest';
-
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { setupEventContextTrace } from '../../src/setupEventContextTrace';
-import type { TestClientInterface } from '../helpers/TestClient';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import type { TestClientInterface } from '../helpers/TestClient';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/opentelemetry/test/utils/spanToJSON.test.ts b/packages/opentelemetry/test/utils/spanToJSON.test.ts
index 88da6550d1e0..19115a18e0f7 100644
--- a/packages/opentelemetry/test/utils/spanToJSON.test.ts
+++ b/packages/opentelemetry/test/utils/spanToJSON.test.ts
@@ -8,9 +8,9 @@ import {
spanToJSON,
} from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
-import { TestClient, getDefaultTestClientOptions } from '../helpers/TestClient';
import { setupOtel } from '../helpers/initOtel';
import { cleanupOtel } from '../helpers/mockSdkInit';
+import { getDefaultTestClientOptions, TestClient } from '../helpers/TestClient';
describe('spanToJSON', () => {
describe('OpenTelemetry Span', () => {
diff --git a/packages/opentelemetry/test/utils/spanTypes.test.ts b/packages/opentelemetry/test/utils/spanTypes.test.ts
index 1849f24ce412..88b1d1064e9d 100644
--- a/packages/opentelemetry/test/utils/spanTypes.test.ts
+++ b/packages/opentelemetry/test/utils/spanTypes.test.ts
@@ -1,6 +1,5 @@
import type { Span } from '@opentelemetry/api';
import { describe, expect, it } from 'vitest';
-
import { spanHasAttributes, spanHasEvents, spanHasKind, spanHasParentId } from '../../src/utils/spanTypes';
describe('spanTypes', () => {
diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts
index 4b384b244a17..fc94694c383e 100644
--- a/packages/profiling-node/src/integration.ts
+++ b/packages/profiling-node/src/integration.ts
@@ -1,8 +1,6 @@
/* eslint-disable max-lines */
-import { CpuProfilerBindings, ProfileFormat, type RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
import type { Event, IntegrationFn, Profile, ProfileChunk, ProfilingIntegration, Span } from '@sentry/core';
import {
- LRUMap,
consoleSandbox,
defineIntegration,
getCurrentScope,
@@ -10,21 +8,23 @@ import {
getIsolationScope,
getRootSpan,
logger,
+ LRUMap,
spanToJSON,
uuid4,
} from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
+import { type RawThreadCpuProfile, CpuProfilerBindings, ProfileFormat } from '@sentry-internal/node-cpu-profiler';
import { DEBUG_BUILD } from './debug-build';
import { NODE_MAJOR, NODE_VERSION } from './nodeVersion';
import { MAX_PROFILE_DURATION_MS, maybeProfileSpan, stopSpanProfile } from './spanProfileUtils';
import {
- PROFILER_THREAD_ID_STRING,
- PROFILER_THREAD_NAME,
addProfilesToEnvelope,
createProfilingChunkEvent,
createProfilingEvent,
findProfiledTransactionsFromEnvelope,
makeProfileChunkEnvelope,
+ PROFILER_THREAD_ID_STRING,
+ PROFILER_THREAD_NAME,
} from './utils';
const CHUNK_INTERVAL_MS = 1000 * 60;
diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts
index 4bd28f8e9531..3cde8acde52d 100644
--- a/packages/profiling-node/src/spanProfileUtils.ts
+++ b/packages/profiling-node/src/spanProfileUtils.ts
@@ -1,8 +1,8 @@
/* eslint-disable deprecation/deprecation */
-import { CpuProfilerBindings, type RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
import type { CustomSamplingContext, Span } from '@sentry/core';
import { logger, spanIsSampled, spanToJSON, uuid4 } from '@sentry/core';
import type { NodeClient } from '@sentry/node';
+import { type RawThreadCpuProfile, CpuProfilerBindings } from '@sentry-internal/node-cpu-profiler';
import { DEBUG_BUILD } from './debug-build';
import { isValidSampleRate } from './utils';
diff --git a/packages/profiling-node/src/utils.ts b/packages/profiling-node/src/utils.ts
index 2de8e54208db..e5b5fb9a8f6e 100644
--- a/packages/profiling-node/src/utils.ts
+++ b/packages/profiling-node/src/utils.ts
@@ -1,4 +1,3 @@
-import * as os from 'os';
import type {
Client,
ContinuousThreadCpuProfile,
@@ -23,11 +22,10 @@ import {
logger,
uuid4,
} from '@sentry/core';
-
+import type { RawChunkCpuProfile, RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
+import * as os from 'os';
import { env, versions } from 'process';
import { isMainThread, threadId } from 'worker_threads';
-
-import type { RawChunkCpuProfile, RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
import { DEBUG_BUILD } from './debug-build';
// We require the file because if we import it, it will be included in the bundle.
diff --git a/packages/profiling-node/test/integration.test.ts b/packages/profiling-node/test/integration.test.ts
index 304aa6a9766b..828d08f9fe44 100644
--- a/packages/profiling-node/test/integration.test.ts
+++ b/packages/profiling-node/test/integration.test.ts
@@ -1,12 +1,9 @@
+import type { ProfileChunk, ProfilingIntegration, Transport } from '@sentry/core';
+import { createEnvelope, getMainCarrier, GLOBAL_OBJ, logger } from '@sentry/core';
import * as Sentry from '@sentry/node';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { CpuProfilerBindings } from '@sentry-internal/node-cpu-profiler';
-import { getMainCarrier } from '@sentry/core';
-import { GLOBAL_OBJ, createEnvelope, logger } from '@sentry/core';
-import type { ProfilingIntegration } from '@sentry/core';
-import type { ProfileChunk, Transport } from '@sentry/core';
import type { NodeClientOptions } from '@sentry/node/build/types/types';
+import { CpuProfilerBindings } from '@sentry-internal/node-cpu-profiler';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { _nodeProfilingIntegration } from '../src/integration';
function makeLegacySpanProfilingClient(): [Sentry.NodeClient, Transport] {
diff --git a/packages/profiling-node/test/utils.test.ts b/packages/profiling-node/test/utils.test.ts
index 2fd925981e28..142131929c2c 100644
--- a/packages/profiling-node/test/utils.test.ts
+++ b/packages/profiling-node/test/utils.test.ts
@@ -1,8 +1,7 @@
-import { addItemToEnvelope, createEnvelope, uuid4 } from '@sentry/core';
import type { Event } from '@sentry/core';
-import { describe, expect, it } from 'vitest';
-
+import { addItemToEnvelope, createEnvelope, uuid4 } from '@sentry/core';
import type { RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
+import { describe, expect, it } from 'vitest';
import {
addProfilesToEnvelope,
findProfiledTransactionsFromEnvelope,
diff --git a/packages/react-router/src/index.types.ts b/packages/react-router/src/index.types.ts
index cf62bf717794..45f4fe10fa31 100644
--- a/packages/react-router/src/index.types.ts
+++ b/packages/react-router/src/index.types.ts
@@ -1,13 +1,14 @@
-// re-define colliding type exports below
-
-export * from './client';
-export * from './server';
-export * from './vite';
+/* eslint-disable import/export */
import type { Integration, Options, StackParser } from '@sentry/core';
import type * as clientSdk from './client';
import type * as serverSdk from './server';
+// re-define colliding type exports below
+export * from './client';
+export * from './server';
+export * from './vite';
+
/** Initializes Sentry React Router SDK */
export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): void;
diff --git a/packages/react-router/src/server/createSentryHandleRequest.tsx b/packages/react-router/src/server/createSentryHandleRequest.tsx
index 662d0b14a93a..052a51399cad 100644
--- a/packages/react-router/src/server/createSentryHandleRequest.tsx
+++ b/packages/react-router/src/server/createSentryHandleRequest.tsx
@@ -1,9 +1,9 @@
+import type { createReadableStreamFromReadable } from '@react-router/node';
+import type { ReactNode } from 'react';
import React from 'react';
import type { AppLoadContext, EntryContext, ServerRouter } from 'react-router';
-import type { ReactNode } from 'react';
-import { getMetaTagTransformer, wrapSentryHandleRequest } from './wrapSentryHandleRequest';
-import type { createReadableStreamFromReadable } from '@react-router/node';
import { PassThrough } from 'stream';
+import { getMetaTagTransformer, wrapSentryHandleRequest } from './wrapSentryHandleRequest';
type RenderToPipeableStreamOptions = {
[key: string]: unknown;
diff --git a/packages/react-router/src/server/wrapSentryHandleRequest.ts b/packages/react-router/src/server/wrapSentryHandleRequest.ts
index bc6cc93122bb..ab13ea30ff0b 100644
--- a/packages/react-router/src/server/wrapSentryHandleRequest.ts
+++ b/packages/react-router/src/server/wrapSentryHandleRequest.ts
@@ -1,7 +1,7 @@
import { context } from '@opentelemetry/api';
-import { RPCType, getRPCMetadata } from '@opentelemetry/core';
+import { getRPCMetadata, RPCType } from '@opentelemetry/core';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getActiveSpan, getRootSpan, getTraceMetaTags } from '@sentry/core';
+import { getActiveSpan, getRootSpan, getTraceMetaTags, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import type { AppLoadContext, EntryContext } from 'react-router';
import type { PassThrough } from 'stream';
import { Transform } from 'stream';
diff --git a/packages/react-router/test/client/sdk.test.ts b/packages/react-router/test/client/sdk.test.ts
index e63fe0cf51cf..118ddd775217 100644
--- a/packages/react-router/test/client/sdk.test.ts
+++ b/packages/react-router/test/client/sdk.test.ts
@@ -1,8 +1,6 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
import * as SentryBrowser from '@sentry/browser';
-import { SDK_VERSION, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/browser';
-
+import { getCurrentScope, getGlobalScope, getIsolationScope, SDK_VERSION } from '@sentry/browser';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init as reactRouterInit } from '../../src/client';
const browserInit = vi.spyOn(SentryBrowser, 'init');
diff --git a/packages/react-router/test/server/createSentryHandleRequest.test.ts b/packages/react-router/test/server/createSentryHandleRequest.test.ts
index 0db84d19ce16..2a7e22e8639e 100644
--- a/packages/react-router/test/server/createSentryHandleRequest.test.ts
+++ b/packages/react-router/test/server/createSentryHandleRequest.test.ts
@@ -1,9 +1,9 @@
/* eslint-disable no-console */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { EntryContext } from 'react-router';
import { PassThrough } from 'stream';
-import * as wrapSentryHandleRequestModule from '../../src/server/wrapSentryHandleRequest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { createSentryHandleRequest } from '../../src/server/createSentryHandleRequest';
-import type { EntryContext } from 'react-router';
+import * as wrapSentryHandleRequestModule from '../../src/server/wrapSentryHandleRequest';
vi.mock('../../src/server/wrapSentryHandleRequest', () => ({
wrapSentryHandleRequest: vi.fn(fn => fn),
diff --git a/packages/react-router/test/server/sdk.test.ts b/packages/react-router/test/server/sdk.test.ts
index 06ff871d07f9..55c12935fe66 100644
--- a/packages/react-router/test/server/sdk.test.ts
+++ b/packages/react-router/test/server/sdk.test.ts
@@ -1,9 +1,6 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
import * as SentryNode from '@sentry/node';
-
import { SDK_VERSION } from '@sentry/node';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init as reactRouterInit } from '../../src/server/sdk';
const nodeInit = vi.spyOn(SentryNode, 'init');
diff --git a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
index e29e97f14c57..ced113261709 100644
--- a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
+++ b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
@@ -1,9 +1,9 @@
-import { describe, test, expect, beforeEach, vi } from 'vitest';
import { RPCType } from '@opentelemetry/core';
import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getActiveSpan, getRootSpan, getTraceMetaTags } from '@sentry/core';
+import { getActiveSpan, getRootSpan, getTraceMetaTags, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import { PassThrough } from 'stream';
-import { wrapSentryHandleRequest, getMetaTagTransformer } from '../../src/server/wrapSentryHandleRequest';
+import { beforeEach, describe, expect, test, vi } from 'vitest';
+import { getMetaTagTransformer, wrapSentryHandleRequest } from '../../src/server/wrapSentryHandleRequest';
vi.mock('@opentelemetry/core', () => ({
RPCType: { HTTP: 'http' },
diff --git a/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts b/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
index ace8695ec209..2b53eb267b15 100644
--- a/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
+++ b/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
@@ -1,5 +1,5 @@
-import * as fs from 'fs';
import SentryCli from '@sentry/cli';
+import * as fs from 'fs';
import { glob } from 'glob';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { sentryOnBuildEnd } from '../../../src/vite/buildEnd/handleOnBuildEnd';
diff --git a/packages/react/src/error.ts b/packages/react/src/error.ts
index d92fd109af96..ca5ccd8b2698 100644
--- a/packages/react/src/error.ts
+++ b/packages/react/src/error.ts
@@ -1,7 +1,7 @@
import { captureException, withScope } from '@sentry/browser';
import { isError } from '@sentry/core';
-import { version } from 'react';
import type { ErrorInfo } from 'react';
+import { version } from 'react';
/**
* See if React major version is 17+ by parsing version string.
diff --git a/packages/react/src/errorboundary.tsx b/packages/react/src/errorboundary.tsx
index 97f89357f38d..4874e285224c 100644
--- a/packages/react/src/errorboundary.tsx
+++ b/packages/react/src/errorboundary.tsx
@@ -1,12 +1,11 @@
import type { ReportDialogOptions } from '@sentry/browser';
import { getClient, showReportDialog, withScope } from '@sentry/browser';
-import { logger } from '@sentry/core';
import type { Scope } from '@sentry/core';
+import { logger } from '@sentry/core';
import * as React from 'react';
-import { hoistNonReactStatics } from './hoist-non-react-statics';
-
import { DEBUG_BUILD } from './debug-build';
import { captureReactException } from './error';
+import { hoistNonReactStatics } from './hoist-non-react-statics';
export const UNKNOWN_COMPONENT = 'unknown';
diff --git a/packages/react/src/profiler.tsx b/packages/react/src/profiler.tsx
index d7478ce6fb33..41f6d233b93d 100644
--- a/packages/react/src/profiler.tsx
+++ b/packages/react/src/profiler.tsx
@@ -2,7 +2,6 @@ import { startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, spanToJSON, timestampInSeconds, withActiveSpan } from '@sentry/core';
import * as React from 'react';
-
import { REACT_MOUNT_OP, REACT_RENDER_OP, REACT_UPDATE_OP } from './constants';
import { hoistNonReactStatics } from './hoist-non-react-statics';
diff --git a/packages/react/src/reactrouter.tsx b/packages/react/src/reactrouter.tsx
index 2692659de6c4..73cc390e4645 100644
--- a/packages/react/src/reactrouter.tsx
+++ b/packages/react/src/reactrouter.tsx
@@ -1,23 +1,22 @@
import {
- WINDOW,
browserTracingIntegration,
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
+ WINDOW,
} from '@sentry/browser';
+import type { Client, Integration, Span, TransactionSource } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getCurrentScope,
getRootSpan,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanToJSON,
} from '@sentry/core';
-import type { Client, Integration, Span, TransactionSource } from '@sentry/core';
-import * as React from 'react';
import type { ReactElement } from 'react';
+import * as React from 'react';
import { hoistNonReactStatics } from './hoist-non-react-statics';
-
import type { Action, Location } from './types';
// We need to disable eslint no-explicit-any because any is required for the
diff --git a/packages/react/src/reactrouterv3.ts b/packages/react/src/reactrouterv3.ts
index dc1ff26ed38b..73058307353f 100644
--- a/packages/react/src/reactrouterv3.ts
+++ b/packages/react/src/reactrouterv3.ts
@@ -1,16 +1,15 @@
import {
- WINDOW,
browserTracingIntegration,
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
+ WINDOW,
} from '@sentry/browser';
+import type { Integration, TransactionSource } from '@sentry/core';
import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
-import type { Integration, TransactionSource } from '@sentry/core';
-
import type { Location } from './types';
// Many of the types below had to be mocked out to prevent typescript issues
diff --git a/packages/react/src/reactrouterv6-compat-utils.tsx b/packages/react/src/reactrouterv6-compat-utils.tsx
index 492cd6c97e14..97109e191fcf 100644
--- a/packages/react/src/reactrouterv6-compat-utils.tsx
+++ b/packages/react/src/reactrouterv6-compat-utils.tsx
@@ -3,25 +3,24 @@
// https://gist.github.com/wontondon/e8c4bdf2888875e4c755712e99279536
import {
- WINDOW,
browserTracingIntegration,
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
+ WINDOW,
} from '@sentry/browser';
import type { Client, Integration, Span, TransactionSource } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getClient,
getCurrentScope,
getRootSpan,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanToJSON,
} from '@sentry/core';
import * as React from 'react';
-
import { DEBUG_BUILD } from './debug-build';
import { hoistNonReactStatics } from './hoist-non-react-statics';
import type {
diff --git a/packages/react/src/sdk.ts b/packages/react/src/sdk.ts
index da63e6d9aa08..844bc30f1785 100644
--- a/packages/react/src/sdk.ts
+++ b/packages/react/src/sdk.ts
@@ -1,8 +1,7 @@
import type { BrowserOptions } from '@sentry/browser';
import { init as browserInit, setContext } from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
import type { Client } from '@sentry/core';
-
+import { applySdkMetadata } from '@sentry/core';
import { version } from 'react';
/**
diff --git a/packages/react/src/tanstackrouter.ts b/packages/react/src/tanstackrouter.ts
index 779528ec6d97..297c780cfce0 100644
--- a/packages/react/src/tanstackrouter.ts
+++ b/packages/react/src/tanstackrouter.ts
@@ -1,8 +1,8 @@
import {
- WINDOW,
browserTracingIntegration as originalBrowserTracingIntegration,
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
+ WINDOW,
} from '@sentry/browser';
import type { Integration } from '@sentry/core';
import {
diff --git a/packages/react/test/error.test.ts b/packages/react/test/error.test.ts
index 8fb3cb09160b..c9c8f28bcc33 100644
--- a/packages/react/test/error.test.ts
+++ b/packages/react/test/error.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, test } from 'vitest';
-
import { isAtLeastReact17 } from '../src/error';
describe('isAtLeastReact17', () => {
diff --git a/packages/react/test/errorboundary.test.tsx b/packages/react/test/errorboundary.test.tsx
index 30c7a9f66e66..275faa4e2079 100644
--- a/packages/react/test/errorboundary.test.tsx
+++ b/packages/react/test/errorboundary.test.tsx
@@ -1,14 +1,12 @@
/**
* @vitest-environment jsdom
*/
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
-import { Scope, getClient, setCurrentClient } from '@sentry/browser';
+import { getClient, Scope, setCurrentClient } from '@sentry/browser';
import type { Client } from '@sentry/core';
import { fireEvent, render, screen } from '@testing-library/react';
import * as React from 'react';
import { useState } from 'react';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import type { ErrorBoundaryProps, FallbackRender } from '../src/errorboundary';
import { ErrorBoundary, UNKNOWN_COMPONENT, withErrorBoundary } from '../src/errorboundary';
diff --git a/packages/react/test/profiler.test.tsx b/packages/react/test/profiler.test.tsx
index 554dbc421f7e..1e88479ffffe 100644
--- a/packages/react/test/profiler.test.tsx
+++ b/packages/react/test/profiler.test.tsx
@@ -1,14 +1,12 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { SentrySpan } from '@sentry/core';
import type { StartSpanOptions } from '@sentry/core';
+import { SentrySpan } from '@sentry/core';
import { render } from '@testing-library/react';
import { renderHook } from '@testing-library/react-hooks';
import * as React from 'react';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { REACT_MOUNT_OP, REACT_RENDER_OP, REACT_UPDATE_OP } from '../src/constants';
import { UNKNOWN_COMPONENT, useProfiler, withProfiler } from '../src/profiler';
diff --git a/packages/react/test/reactrouter-cross-usage.test.tsx b/packages/react/test/reactrouter-cross-usage.test.tsx
index d55ecfb7e632..57f9b4ce00cf 100644
--- a/packages/react/test/reactrouter-cross-usage.test.tsx
+++ b/packages/react/test/reactrouter-cross-usage.test.tsx
@@ -1,32 +1,30 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { render } from '@testing-library/react';
import * as React from 'react';
import {
+ createMemoryRouter,
+ createRoutesFromChildren,
+ matchRoutes,
MemoryRouter,
Navigate,
Route,
RouterProvider,
Routes,
- createMemoryRouter,
- createRoutesFromChildren,
- matchRoutes,
useLocation,
useNavigationType,
useRoutes,
} from 'react-router-6';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../src';
import {
reactRouterV6BrowserTracingIntegration,
diff --git a/packages/react/test/reactrouter-descendant-routes.test.tsx b/packages/react/test/reactrouter-descendant-routes.test.tsx
index ff89ae86f639..fe75bc81e858 100644
--- a/packages/react/test/reactrouter-descendant-routes.test.tsx
+++ b/packages/react/test/reactrouter-descendant-routes.test.tsx
@@ -1,31 +1,29 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { render } from '@testing-library/react';
import * as React from 'react';
import {
+ createRoutesFromChildren,
+ matchRoutes,
MemoryRouter,
Navigate,
Outlet,
Route,
Routes,
- createRoutesFromChildren,
- matchRoutes,
useLocation,
useNavigationType,
useRoutes,
} from 'react-router-6';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../src';
import {
reactRouterV6BrowserTracingIntegration,
diff --git a/packages/react/test/reactrouterv3.test.tsx b/packages/react/test/reactrouterv3.test.tsx
index c89158641e62..841cbf018647 100644
--- a/packages/react/test/reactrouterv3.test.tsx
+++ b/packages/react/test/reactrouterv3.test.tsx
@@ -1,20 +1,19 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { BrowserClient } from '@sentry/browser';
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { act, render } from '@testing-library/react';
import * as React from 'react';
-import { IndexRoute, Route, Router, createMemoryHistory, createRoutes, match } from 'react-router-3';
+import { createMemoryHistory, createRoutes, IndexRoute, match, Route, Router } from 'react-router-3';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { reactRouterV3BrowserTracingIntegration } from '../src/reactrouterv3';
const mockStartBrowserTracingPageLoadSpan = vi.fn();
diff --git a/packages/react/test/reactrouterv4.test.tsx b/packages/react/test/reactrouterv4.test.tsx
index 8d4098946221..4f9c29d4d1bd 100644
--- a/packages/react/test/reactrouterv4.test.tsx
+++ b/packages/react/test/reactrouterv4.test.tsx
@@ -1,21 +1,19 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { act, render } from '@testing-library/react';
import { createMemoryHistory } from 'history-4';
import * as React from 'react';
-import { Route, Router, Switch, matchPath } from 'react-router-4';
-
+import { matchPath, Route, Router, Switch } from 'react-router-4';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient, reactRouterV4BrowserTracingIntegration, withSentryRouting } from '../src';
import type { RouteConfig } from '../src/reactrouter';
diff --git a/packages/react/test/reactrouterv5.test.tsx b/packages/react/test/reactrouterv5.test.tsx
index d8fe00d8360b..ae8f85c881bc 100644
--- a/packages/react/test/reactrouterv5.test.tsx
+++ b/packages/react/test/reactrouterv5.test.tsx
@@ -1,21 +1,19 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { act, render } from '@testing-library/react';
import { createMemoryHistory } from 'history-4';
import * as React from 'react';
-import { Route, Router, Switch, matchPath } from 'react-router-5';
-
+import { matchPath, Route, Router, Switch } from 'react-router-5';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient, reactRouterV5BrowserTracingIntegration, withSentryRouting } from '../src';
import type { RouteConfig } from '../src/reactrouter';
diff --git a/packages/react/test/reactrouterv6-compat-utils.test.tsx b/packages/react/test/reactrouterv6-compat-utils.test.tsx
index ee07da4dafe1..193b4aaab223 100644
--- a/packages/react/test/reactrouterv6-compat-utils.test.tsx
+++ b/packages/react/test/reactrouterv6-compat-utils.test.tsx
@@ -1,5 +1,4 @@
import { describe, expect } from 'vitest';
-
import { getNumberOfUrlSegments } from '../src/reactrouterv6-compat-utils';
describe('getNumberOfUrlSegments', () => {
diff --git a/packages/react/test/reactrouterv6.test.tsx b/packages/react/test/reactrouterv6.test.tsx
index 77777e527a9b..61fefdff9b63 100644
--- a/packages/react/test/reactrouterv6.test.tsx
+++ b/packages/react/test/reactrouterv6.test.tsx
@@ -1,35 +1,32 @@
/**
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import { render } from '@testing-library/react';
import * as React from 'react';
+import type { RouteObject } from 'react-router-6';
import {
+ createMemoryRouter,
+ createRoutesFromChildren,
+ matchRoutes,
MemoryRouter,
Navigate,
Outlet,
Route,
RouterProvider,
Routes,
- createMemoryRouter,
- createRoutesFromChildren,
- matchRoutes,
useLocation,
useNavigationType,
useRoutes,
} from 'react-router-6';
-
-import type { RouteObject } from 'react-router-6';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../src';
import {
reactRouterV6BrowserTracingIntegration,
diff --git a/packages/react/test/redux.test.ts b/packages/react/test/redux.test.ts
index 3d4f8e624046..60411418ca6a 100644
--- a/packages/react/test/redux.test.ts
+++ b/packages/react/test/redux.test.ts
@@ -1,10 +1,8 @@
-import type { Mock } from 'vitest';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import * as Sentry from '@sentry/browser';
import * as SentryCore from '@sentry/core';
import * as Redux from 'redux';
-
+import type { Mock } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { createReduxEnhancer } from '../src/redux';
const mockSetContext = vi.fn();
diff --git a/packages/react/test/sdk.test.ts b/packages/react/test/sdk.test.ts
index fde2c71b2797..1fd3d6ade5d1 100644
--- a/packages/react/test/sdk.test.ts
+++ b/packages/react/test/sdk.test.ts
@@ -1,7 +1,6 @@
-import { describe, expect, it, vi } from 'vitest';
-
import * as SentryBrowser from '@sentry/browser';
import { version } from 'react';
+import { describe, expect, it, vi } from 'vitest';
import { init } from '../src/sdk';
describe('init', () => {
diff --git a/packages/react/vite.config.ts b/packages/react/vite.config.ts
index 199c74df98ce..bed5cda1dd0a 100644
--- a/packages/react/vite.config.ts
+++ b/packages/react/vite.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/remix/src/client/browserTracingIntegration.ts b/packages/remix/src/client/browserTracingIntegration.ts
index a52b3ac7e30b..d2e5a6b2cd9f 100644
--- a/packages/remix/src/client/browserTracingIntegration.ts
+++ b/packages/remix/src/client/browserTracingIntegration.ts
@@ -1,7 +1,7 @@
import type { Integration } from '@sentry/core';
import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react';
-import { setGlobals, startPageloadSpan } from './performance';
import type { RemixBrowserTracingIntegrationOptions } from './performance';
+import { setGlobals, startPageloadSpan } from './performance';
/**
* Creates a browser tracing integration for Remix applications.
* This integration will create pageload and navigation spans.
diff --git a/packages/remix/src/client/performance.tsx b/packages/remix/src/client/performance.tsx
index 8e55c9d683c3..66927deb4c9a 100644
--- a/packages/remix/src/client/performance.tsx
+++ b/packages/remix/src/client/performance.tsx
@@ -1,15 +1,15 @@
import type { Client, StartSpanOptions } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getCurrentScope,
getRootSpan,
isNodeEnv,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
import type { BrowserClient, browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/react';
-import { WINDOW, getClient, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '@sentry/react';
+import { getClient, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, WINDOW } from '@sentry/react';
import * as React from 'react';
import { DEBUG_BUILD } from '../utils/debug-build';
diff --git a/packages/remix/src/cloudflare/index.ts b/packages/remix/src/cloudflare/index.ts
index 958376f802a3..8ef997dc9e1c 100644
--- a/packages/remix/src/cloudflare/index.ts
+++ b/packages/remix/src/cloudflare/index.ts
@@ -1,13 +1,13 @@
-export * from '@sentry/react';
-
-export { captureRemixErrorBoundaryError } from '../client/errors';
-export { withSentry } from '../client/performance';
-
import {
instrumentBuild as instrumentRemixBuild,
makeWrappedCreateRequestHandler,
sentryHandleError,
} from '../server/instrumentServer';
+
+export * from '@sentry/react';
+
+export { captureRemixErrorBoundaryError } from '../client/errors';
+export { withSentry } from '../client/performance';
export { makeWrappedCreateRequestHandler, sentryHandleError };
/**
diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts
index 2d1ae40da8e5..697fc3813045 100644
--- a/packages/remix/src/index.types.ts
+++ b/packages/remix/src/index.types.ts
@@ -1,14 +1,15 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
// which is not allowed, unless we redefine the colliding exports in this file - which we do below.
-export * from './index.client';
-export * from './index.server';
-
import type { Client, Integration, Options, StackParser } from '@sentry/core';
-
import * as clientSdk from './index.client';
import * as serverSdk from './index.server';
import type { RemixOptions } from './utils/remixOptions';
+export * from './index.client';
+export * from './index.server';
+
/** Initializes Sentry Remix SDK */
export declare function init(options: RemixOptions): Client | undefined;
diff --git a/packages/remix/src/server/errors.ts b/packages/remix/src/server/errors.ts
index e14654415a2c..32e76a9db260 100644
--- a/packages/remix/src/server/errors.ts
+++ b/packages/remix/src/server/errors.ts
@@ -4,6 +4,7 @@ import type {
HandleDocumentRequestFunction,
LoaderFunctionArgs,
} from '@remix-run/node';
+import type { RequestEventData, Span } from '@sentry/core';
import {
addExceptionMechanism,
captureException,
@@ -13,7 +14,6 @@ import {
objectify,
winterCGRequestToRequestData,
} from '@sentry/core';
-import type { RequestEventData, Span } from '@sentry/core';
import { DEBUG_BUILD } from '../utils/debug-build';
import type { RemixOptions } from '../utils/remixOptions';
import { storeFormDataKeys } from '../utils/utils';
diff --git a/packages/remix/src/server/instrumentServer.ts b/packages/remix/src/server/instrumentServer.ts
index f4634805e1e1..b7719dcb3df6 100644
--- a/packages/remix/src/server/instrumentServer.ts
+++ b/packages/remix/src/server/instrumentServer.ts
@@ -1,9 +1,6 @@
/* eslint-disable max-lines */
import type { RequestEventData, Span, TransactionSource, WrappedFunction } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
continueTrace,
fill,
getActiveSpan,
@@ -14,6 +11,9 @@ import {
isNodeEnv,
loadModule,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setHttpStatus,
spanToJSON,
startSpan,
diff --git a/packages/remix/src/server/integrations/opentelemetry.ts b/packages/remix/src/server/integrations/opentelemetry.ts
index dac05ed89d33..42654201da18 100644
--- a/packages/remix/src/server/integrations/opentelemetry.ts
+++ b/packages/remix/src/server/integrations/opentelemetry.ts
@@ -1,8 +1,7 @@
-import { RemixInstrumentation } from 'opentelemetry-instrumentation-remix';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, defineIntegration } from '@sentry/core';
import type { Client, IntegrationFn, Span } from '@sentry/core';
+import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
import { generateInstrumentOnce, getClient, spanToJSON } from '@sentry/node';
+import { RemixInstrumentation } from 'opentelemetry-instrumentation-remix';
import type { RemixOptions } from '../../utils/remixOptions';
const INTEGRATION_NAME = 'Remix';
diff --git a/packages/remix/src/server/sdk.ts b/packages/remix/src/server/sdk.ts
index 65a19bebdd28..816e5083aa26 100644
--- a/packages/remix/src/server/sdk.ts
+++ b/packages/remix/src/server/sdk.ts
@@ -1,8 +1,7 @@
-import { applySdkMetadata, logger } from '@sentry/core';
import type { Integration } from '@sentry/core';
+import { applySdkMetadata, logger } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
import { getDefaultIntegrations as getDefaultNodeIntegrations, init as nodeInit, isInitialized } from '@sentry/node';
-
import { DEBUG_BUILD } from '../utils/debug-build';
import type { RemixOptions } from '../utils/remixOptions';
import { instrumentServer } from './instrumentServer';
diff --git a/packages/remix/src/utils/utils.ts b/packages/remix/src/utils/utils.ts
index 295e61673b8b..57b26e07ce56 100644
--- a/packages/remix/src/utils/utils.ts
+++ b/packages/remix/src/utils/utils.ts
@@ -1,6 +1,6 @@
import type { ActionFunctionArgs, LoaderFunctionArgs } from '@remix-run/node';
-import { logger } from '@sentry/core';
import type { Span, TransactionSource } from '@sentry/core';
+import { logger } from '@sentry/core';
import { DEBUG_BUILD } from './debug-build';
import { getRequestMatch, matchServerRoutes } from './vendor/response';
import type { ServerRoute, ServerRouteManifest } from './vendor/types';
diff --git a/packages/remix/src/utils/vendor/response.ts b/packages/remix/src/utils/vendor/response.ts
index c79b253adc7e..4b7197f65982 100644
--- a/packages/remix/src/utils/vendor/response.ts
+++ b/packages/remix/src/utils/vendor/response.ts
@@ -6,8 +6,8 @@
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-import { matchRoutes } from '@remix-run/router';
import type { AgnosticRouteMatch, AgnosticRouteObject } from '@remix-run/router';
+import { matchRoutes } from '@remix-run/router';
import type { DeferredData, ErrorResponse, ServerRoute } from './types';
/**
diff --git a/packages/remix/src/utils/vendor/types.ts b/packages/remix/src/utils/vendor/types.ts
index 4181a3d77334..015207bd94a2 100644
--- a/packages/remix/src/utils/vendor/types.ts
+++ b/packages/remix/src/utils/vendor/types.ts
@@ -1,4 +1,3 @@
-import type { Agent } from 'https';
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/ban-types */
// Types vendored from @remix-run/server-runtime@1.6.0:
@@ -11,6 +10,7 @@ import type { Agent } from 'https';
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import type * as Express from 'express';
+import type { Agent } from 'https';
import type { ComponentType } from 'react';
type Dev = {
diff --git a/packages/remix/test/index.client.test.ts b/packages/remix/test/index.client.test.ts
index cd26bc55fb55..2497ce281694 100644
--- a/packages/remix/test/index.client.test.ts
+++ b/packages/remix/test/index.client.test.ts
@@ -1,6 +1,5 @@
import * as SentryReact from '@sentry/react';
-import { describe, vi, it, expect, afterEach, type Mock } from 'vitest';
-
+import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../src/index.client';
vi.mock('@sentry/react', { spy: true });
diff --git a/packages/remix/test/index.server.test.ts b/packages/remix/test/index.server.test.ts
index 33dfbee862d8..8e61ebd77e06 100644
--- a/packages/remix/test/index.server.test.ts
+++ b/packages/remix/test/index.server.test.ts
@@ -1,6 +1,5 @@
import * as SentryNode from '@sentry/node';
-import { describe, vi, it, expect, afterEach, type Mock } from 'vitest';
-
+import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../src/index.server';
vi.mock('@sentry/node', { spy: true });
diff --git a/packages/remix/test/scripts/upload-sourcemaps.test.ts b/packages/remix/test/scripts/upload-sourcemaps.test.ts
index f03953c8dbb7..0634930bf00e 100644
--- a/packages/remix/test/scripts/upload-sourcemaps.test.ts
+++ b/packages/remix/test/scripts/upload-sourcemaps.test.ts
@@ -1,4 +1,4 @@
-import { vi, describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
const newMock = vi.fn();
const uploadSourceMapsMock = vi.fn();
diff --git a/packages/replay-canvas/src/canvas.ts b/packages/replay-canvas/src/canvas.ts
index 6809cdaf815f..968e6d586688 100644
--- a/packages/replay-canvas/src/canvas.ts
+++ b/packages/replay-canvas/src/canvas.ts
@@ -1,7 +1,7 @@
+import type { Integration, IntegrationFn } from '@sentry/core';
+import { defineIntegration } from '@sentry/core';
import type { CanvasManagerInterface, CanvasManagerOptions } from '@sentry-internal/replay';
import { CanvasManager } from '@sentry-internal/rrweb';
-import { defineIntegration } from '@sentry/core';
-import type { Integration, IntegrationFn } from '@sentry/core';
interface ReplayCanvasIntegration extends Integration {
snapshot: (canvasElement?: HTMLCanvasElement) => Promise;
diff --git a/packages/replay-canvas/test/canvas.test.ts b/packages/replay-canvas/test/canvas.test.ts
index 6f75321a5ab5..1acfeab69d21 100644
--- a/packages/replay-canvas/test/canvas.test.ts
+++ b/packages/replay-canvas/test/canvas.test.ts
@@ -2,9 +2,8 @@
* @vitest-environment jsdom
*/
-import { beforeEach, expect, it, vi } from 'vitest';
-
import { CanvasManager } from '@sentry-internal/rrweb';
+import { beforeEach, expect, it, vi } from 'vitest';
import { _replayCanvasIntegration, replayCanvasIntegration } from '../src/canvas';
vi.mock('@sentry-internal/rrweb');
diff --git a/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts b/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts
index 5ab7e4b69e95..827fc6f5b99b 100644
--- a/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/handleAfterSendEvent.ts
@@ -1,6 +1,5 @@
-import { setTimeout } from '@sentry-internal/browser-utils';
import type { ErrorEvent, Event, TransactionEvent, TransportMakeRequestResponse } from '@sentry/core';
-
+import { setTimeout } from '@sentry-internal/browser-utils';
import type { ReplayContainer } from '../types';
import { isErrorEvent, isTransactionEvent } from '../util/eventUtils';
diff --git a/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts b/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts
index 4d50066bc842..d529bf425ce7 100644
--- a/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/handleBeforeSendEvent.ts
@@ -1,6 +1,5 @@
-import { getLocationHref } from '@sentry/core';
import type { ErrorEvent, Event } from '@sentry/core';
-
+import { getLocationHref } from '@sentry/core';
import type { ReplayContainer } from '../types';
import { createBreadcrumb } from '../util/createBreadcrumb';
import { isErrorEvent } from '../util/eventUtils';
diff --git a/packages/replay-internal/src/coreHandlers/handleClick.ts b/packages/replay-internal/src/coreHandlers/handleClick.ts
index da9f51fa2179..71b52458cb5b 100644
--- a/packages/replay-internal/src/coreHandlers/handleClick.ts
+++ b/packages/replay-internal/src/coreHandlers/handleClick.ts
@@ -1,7 +1,6 @@
+import type { Breadcrumb } from '@sentry/core';
import { setTimeout } from '@sentry-internal/browser-utils';
import { IncrementalSource, MouseInteractions, record } from '@sentry-internal/rrweb';
-import type { Breadcrumb } from '@sentry/core';
-
import { WINDOW } from '../constants';
import type {
RecordingEvent,
diff --git a/packages/replay-internal/src/coreHandlers/handleDom.ts b/packages/replay-internal/src/coreHandlers/handleDom.ts
index 457568172a2c..f84a3938125c 100644
--- a/packages/replay-internal/src/coreHandlers/handleDom.ts
+++ b/packages/replay-internal/src/coreHandlers/handleDom.ts
@@ -1,9 +1,8 @@
+import type { Breadcrumb, HandlerDataDom } from '@sentry/core';
+import { htmlTreeAsString } from '@sentry/core';
import { record } from '@sentry-internal/rrweb';
import type { serializedElementNodeWithId, serializedNodeWithId } from '@sentry-internal/rrweb-snapshot';
import { NodeType } from '@sentry-internal/rrweb-snapshot';
-import { htmlTreeAsString } from '@sentry/core';
-import type { Breadcrumb, HandlerDataDom } from '@sentry/core';
-
import type { ReplayContainer } from '../types';
import { createBreadcrumb } from '../util/createBreadcrumb';
import { handleClick } from './handleClick';
diff --git a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
index 49853014c943..00f41903ac71 100644
--- a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
@@ -1,5 +1,4 @@
import type { Event, EventHint } from '@sentry/core';
-
import { DEBUG_BUILD } from '../debug-build';
import type { ReplayContainer } from '../types';
import { isErrorEvent, isFeedbackEvent, isReplayEvent, isTransactionEvent } from '../util/eventUtils';
diff --git a/packages/replay-internal/src/coreHandlers/handleHistory.ts b/packages/replay-internal/src/coreHandlers/handleHistory.ts
index b033e6e43eaf..e12c65745914 100644
--- a/packages/replay-internal/src/coreHandlers/handleHistory.ts
+++ b/packages/replay-internal/src/coreHandlers/handleHistory.ts
@@ -1,5 +1,4 @@
import type { HandlerDataHistory } from '@sentry/core';
-
import type { HistoryData, ReplayContainer, ReplayPerformanceEntry } from '../types';
import { createPerformanceSpans } from '../util/createPerformanceSpans';
diff --git a/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts b/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts
index 5c4485321b26..d2969b10a333 100644
--- a/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/handleKeyboardEvent.ts
@@ -1,6 +1,5 @@
-import { htmlTreeAsString } from '@sentry/core';
import type { Breadcrumb } from '@sentry/core';
-
+import { htmlTreeAsString } from '@sentry/core';
import type { ReplayContainer } from '../types';
import { createBreadcrumb } from '../util/createBreadcrumb';
import { getBaseDomBreadcrumb } from './handleDom';
diff --git a/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts b/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts
index e1f3a60bc254..eab911b8d3f4 100644
--- a/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts
+++ b/packages/replay-internal/src/coreHandlers/handleNetworkBreadcrumbs.ts
@@ -1,7 +1,6 @@
-import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
-import { getClient } from '@sentry/core';
import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbData, XhrBreadcrumbData } from '@sentry/core';
-
+import { getClient } from '@sentry/core';
+import type { FetchHint, XhrHint } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../debug-build';
import type { ReplayContainer, ReplayNetworkOptions } from '../types';
import { logger } from '../util/logger';
diff --git a/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts b/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts
index a88eb8cabdeb..739a703cae0e 100644
--- a/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/util/addBreadcrumbEvent.ts
@@ -1,7 +1,6 @@
-import { EventType } from '@sentry-internal/rrweb';
-import { normalize } from '@sentry/core';
import type { Breadcrumb } from '@sentry/core';
-
+import { normalize } from '@sentry/core';
+import { EventType } from '@sentry-internal/rrweb';
import type { ReplayContainer } from '../../types';
/**
diff --git a/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts b/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts
index 014a1a60686f..f3a2e284cefe 100644
--- a/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts
+++ b/packages/replay-internal/src/coreHandlers/util/addFeedbackBreadcrumb.ts
@@ -1,6 +1,5 @@
-import { EventType } from '@sentry-internal/rrweb';
import type { FeedbackEvent } from '@sentry/core';
-
+import { EventType } from '@sentry-internal/rrweb';
import type { ReplayBreadcrumbFrameEvent, ReplayContainer } from '../../types';
/**
diff --git a/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts b/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts
index e66bd9c26849..c28b3acd6dc9 100644
--- a/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts
+++ b/packages/replay-internal/src/coreHandlers/util/fetchUtils.ts
@@ -1,7 +1,6 @@
-import { getBodyString, getFetchRequestArgBody, setTimeout } from '@sentry-internal/browser-utils';
-import type { FetchHint, NetworkMetaWarning } from '@sentry-internal/browser-utils';
import type { Breadcrumb, FetchBreadcrumbData } from '@sentry/core';
-
+import type { FetchHint, NetworkMetaWarning } from '@sentry-internal/browser-utils';
+import { getBodyString, getFetchRequestArgBody, setTimeout } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../../debug-build';
import type {
ReplayContainer,
diff --git a/packages/replay-internal/src/coreHandlers/util/networkUtils.ts b/packages/replay-internal/src/coreHandlers/util/networkUtils.ts
index f65929a1ab64..7e89e0317667 100644
--- a/packages/replay-internal/src/coreHandlers/util/networkUtils.ts
+++ b/packages/replay-internal/src/coreHandlers/util/networkUtils.ts
@@ -1,7 +1,6 @@
-import { serializeFormData } from '@sentry-internal/browser-utils';
-import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
import { stringMatchesSomePattern } from '@sentry/core';
-
+import type { NetworkMetaWarning } from '@sentry-internal/browser-utils';
+import { serializeFormData } from '@sentry-internal/browser-utils';
import { NETWORK_BODY_MAX_SIZE, WINDOW } from '../../constants';
import type {
NetworkBody,
diff --git a/packages/replay-internal/src/coreHandlers/util/onWindowOpen.ts b/packages/replay-internal/src/coreHandlers/util/onWindowOpen.ts
index 4a305a53f501..f63e0b2ec1fa 100644
--- a/packages/replay-internal/src/coreHandlers/util/onWindowOpen.ts
+++ b/packages/replay-internal/src/coreHandlers/util/onWindowOpen.ts
@@ -1,5 +1,4 @@
import { fill } from '@sentry/core';
-
import { WINDOW } from '../../constants';
type WindowOpenHandler = () => void;
diff --git a/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts b/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts
index 4b46cee85963..3a7a8f423dba 100644
--- a/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/util/shouldSampleForBufferEvent.ts
@@ -1,5 +1,4 @@
import type { Event } from '@sentry/core';
-
import { UNABLE_TO_SEND_REPLAY } from '../../constants';
import type { ReplayContainer } from '../../types';
import { isSampled } from '../../util/isSampled';
diff --git a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts
index 6028a09232ba..703b88679215 100644
--- a/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts
+++ b/packages/replay-internal/src/coreHandlers/util/xhrUtils.ts
@@ -1,7 +1,6 @@
-import { SENTRY_XHR_DATA_KEY, getBodyString } from '@sentry-internal/browser-utils';
-import type { NetworkMetaWarning, XhrHint } from '@sentry-internal/browser-utils';
import type { Breadcrumb, XhrBreadcrumbData } from '@sentry/core';
-
+import type { NetworkMetaWarning, XhrHint } from '@sentry-internal/browser-utils';
+import { getBodyString, SENTRY_XHR_DATA_KEY } from '@sentry-internal/browser-utils';
import { DEBUG_BUILD } from '../../debug-build';
import type { ReplayContainer, ReplayNetworkOptions, ReplayNetworkRequestData } from '../../types';
import { logger } from '../../util/logger';
diff --git a/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts b/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts
index 5f7481671105..593484bc8a21 100644
--- a/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts
+++ b/packages/replay-internal/src/eventBuffer/EventBufferCompressionWorker.ts
@@ -1,12 +1,11 @@
import type { ReplayRecordingData } from '@sentry/core';
-
import { REPLAY_MAX_EVENT_BUFFER_SIZE } from '../constants';
import { DEBUG_BUILD } from '../debug-build';
import type { AddEventResult, EventBuffer, EventBufferType, RecordingEvent } from '../types';
import { logger } from '../util/logger';
import { timestampToMs } from '../util/timestamp';
-import { WorkerHandler } from './WorkerHandler';
import { EventBufferSizeExceededError } from './error';
+import { WorkerHandler } from './WorkerHandler';
/**
* Event buffer that uses a web worker to compress events.
diff --git a/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts b/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts
index 82a5c6a65d07..465235ef02f6 100644
--- a/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts
+++ b/packages/replay-internal/src/eventBuffer/EventBufferProxy.ts
@@ -1,5 +1,4 @@
import type { ReplayRecordingData } from '@sentry/core';
-
import { DEBUG_BUILD } from '../debug-build';
import type { AddEventResult, EventBuffer, EventBufferType, RecordingEvent } from '../types';
import { logger } from '../util/logger';
diff --git a/packages/replay-internal/src/eventBuffer/index.ts b/packages/replay-internal/src/eventBuffer/index.ts
index bc000da5db7e..3fc34330aead 100644
--- a/packages/replay-internal/src/eventBuffer/index.ts
+++ b/packages/replay-internal/src/eventBuffer/index.ts
@@ -1,5 +1,4 @@
import { getWorkerURL } from '@sentry-internal/replay-worker';
-
import { DEBUG_BUILD } from '../debug-build';
import type { EventBuffer } from '../types';
import { logger } from '../util/logger';
diff --git a/packages/replay-internal/src/replay.ts b/packages/replay-internal/src/replay.ts
index 89df655050e5..87fa1182aeeb 100644
--- a/packages/replay-internal/src/replay.ts
+++ b/packages/replay-internal/src/replay.ts
@@ -1,7 +1,7 @@
/* eslint-disable max-lines */ // TODO: We might want to split this file up
-import { EventType, record } from '@sentry-internal/rrweb';
import type { ReplayRecordingMode, Span } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, getActiveSpan, getClient, getRootSpan, spanToJSON } from '@sentry/core';
+import { getActiveSpan, getClient, getRootSpan, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON } from '@sentry/core';
+import { EventType, record } from '@sentry-internal/rrweb';
import {
BUFFER_CHECKOUT_TIME,
SESSION_IDLE_EXPIRE_DURATION,
@@ -56,7 +56,7 @@ import { resetReplayIdOnDynamicSamplingContext } from './util/resetReplayIdOnDyn
import { sendReplay } from './util/sendReplay';
import { RateLimitError } from './util/sendReplayRequest';
import type { SKIPPED } from './util/throttle';
-import { THROTTLED, throttle } from './util/throttle';
+import { throttle, THROTTLED } from './util/throttle';
/**
* The main replay container class, which holds all the state and methods for recording and sending replays.
diff --git a/packages/replay-internal/src/session/Session.ts b/packages/replay-internal/src/session/Session.ts
index 93c1a2edd764..554f625cc8e9 100644
--- a/packages/replay-internal/src/session/Session.ts
+++ b/packages/replay-internal/src/session/Session.ts
@@ -1,5 +1,4 @@
import { uuid4 } from '@sentry/core';
-
import type { Sampled, Session } from '../types';
/**
diff --git a/packages/replay-internal/src/session/createSession.ts b/packages/replay-internal/src/session/createSession.ts
index 1104ac33ba80..2cb9c0853b09 100644
--- a/packages/replay-internal/src/session/createSession.ts
+++ b/packages/replay-internal/src/session/createSession.ts
@@ -1,7 +1,7 @@
import type { Sampled, Session, SessionOptions } from '../types';
import { isSampled } from '../util/isSampled';
-import { makeSession } from './Session';
import { saveSession } from './saveSession';
+import { makeSession } from './Session';
/**
* Get the sampled status for a session based on sample rates & current sampled status.
diff --git a/packages/replay-internal/src/types/replay.ts b/packages/replay-internal/src/types/replay.ts
index cc8e6f1827ac..c5336dbe5d25 100644
--- a/packages/replay-internal/src/types/replay.ts
+++ b/packages/replay-internal/src/types/replay.ts
@@ -1,5 +1,4 @@
import type { Breadcrumb, ErrorEvent, ReplayRecordingData, ReplayRecordingMode, Span } from '@sentry/core';
-
import type { SKIPPED, THROTTLED } from '../util/throttle';
import type { AllPerformanceEntry, AllPerformanceEntryData, ReplayPerformanceEntry } from './performance';
import type { ReplayFrameEvent } from './replayFrame';
diff --git a/packages/replay-internal/src/types/replayFrame.ts b/packages/replay-internal/src/types/replayFrame.ts
index 7e887bb3c808..6eb1855b8f8a 100644
--- a/packages/replay-internal/src/types/replayFrame.ts
+++ b/packages/replay-internal/src/types/replayFrame.ts
@@ -1,5 +1,4 @@
import type { Breadcrumb } from '@sentry/core';
-
import type {
HistoryData,
MemoryData,
diff --git a/packages/replay-internal/src/util/addEvent.ts b/packages/replay-internal/src/util/addEvent.ts
index 5aa420bfff15..9a0b870c3f49 100644
--- a/packages/replay-internal/src/util/addEvent.ts
+++ b/packages/replay-internal/src/util/addEvent.ts
@@ -1,6 +1,5 @@
-import { EventType } from '@sentry-internal/rrweb';
import { getClient } from '@sentry/core';
-
+import { EventType } from '@sentry-internal/rrweb';
import { DEBUG_BUILD } from '../debug-build';
import { EventBufferSizeExceededError } from '../eventBuffer/error';
import type { AddEventResult, RecordingEvent, ReplayContainer, ReplayFrameEvent, ReplayPluginOptions } from '../types';
diff --git a/packages/replay-internal/src/util/addGlobalListeners.ts b/packages/replay-internal/src/util/addGlobalListeners.ts
index afa005669a46..530749c6e3f7 100644
--- a/packages/replay-internal/src/util/addGlobalListeners.ts
+++ b/packages/replay-internal/src/util/addGlobalListeners.ts
@@ -1,10 +1,9 @@
+import type { DynamicSamplingContext } from '@sentry/core';
+import { addEventProcessor, getClient } from '@sentry/core';
import {
addClickKeypressInstrumentationHandler,
addHistoryInstrumentationHandler,
} from '@sentry-internal/browser-utils';
-import { addEventProcessor, getClient } from '@sentry/core';
-import type { DynamicSamplingContext } from '@sentry/core';
-
import { handleAfterSendEvent } from '../coreHandlers/handleAfterSendEvent';
import { handleBeforeSendEvent } from '../coreHandlers/handleBeforeSendEvent';
import { handleBreadcrumbs } from '../coreHandlers/handleBreadcrumbs';
diff --git a/packages/replay-internal/src/util/createPerformanceEntries.ts b/packages/replay-internal/src/util/createPerformanceEntries.ts
index ea691467fc04..6df2343327fe 100644
--- a/packages/replay-internal/src/util/createPerformanceEntries.ts
+++ b/packages/replay-internal/src/util/createPerformanceEntries.ts
@@ -1,6 +1,5 @@
-import { record } from '@sentry-internal/rrweb';
import { browserPerformanceTimeOrigin } from '@sentry/core';
-
+import { record } from '@sentry-internal/rrweb';
import { WINDOW } from '../constants';
import type {
AllPerformanceEntry,
diff --git a/packages/replay-internal/src/util/createPerformanceSpans.ts b/packages/replay-internal/src/util/createPerformanceSpans.ts
index 86de4eb9f958..7e7e56e78eff 100644
--- a/packages/replay-internal/src/util/createPerformanceSpans.ts
+++ b/packages/replay-internal/src/util/createPerformanceSpans.ts
@@ -1,5 +1,4 @@
import { EventType } from '@sentry-internal/rrweb';
-
import type { AddEventResult, AllEntryData, ReplayContainer, ReplayPerformanceEntry } from '../types';
/**
diff --git a/packages/replay-internal/src/util/createReplayEnvelope.ts b/packages/replay-internal/src/util/createReplayEnvelope.ts
index e1215c1904d4..aadd62a7b810 100644
--- a/packages/replay-internal/src/util/createReplayEnvelope.ts
+++ b/packages/replay-internal/src/util/createReplayEnvelope.ts
@@ -1,5 +1,5 @@
-import { createEnvelope, createEventEnvelopeHeaders, getSdkMetadataForEnvelopeHeader } from '@sentry/core';
import type { DsnComponents, ReplayEnvelope, ReplayEvent, ReplayRecordingData } from '@sentry/core';
+import { createEnvelope, createEventEnvelopeHeaders, getSdkMetadataForEnvelopeHeader } from '@sentry/core';
/**
* Create a replay envelope ready to be sent.
diff --git a/packages/replay-internal/src/util/handleRecordingEmit.ts b/packages/replay-internal/src/util/handleRecordingEmit.ts
index f3c5e1a45d1e..cd0d379bb0fe 100644
--- a/packages/replay-internal/src/util/handleRecordingEmit.ts
+++ b/packages/replay-internal/src/util/handleRecordingEmit.ts
@@ -1,5 +1,4 @@
import { EventType } from '@sentry-internal/rrweb';
-
import { updateClickDetectorForRecordingEvent } from '../coreHandlers/handleClick';
import { DEBUG_BUILD } from '../debug-build';
import { saveSession } from '../session/saveSession';
diff --git a/packages/replay-internal/src/util/prepareReplayEvent.ts b/packages/replay-internal/src/util/prepareReplayEvent.ts
index 9f74c2c8a685..7de2cff212c0 100644
--- a/packages/replay-internal/src/util/prepareReplayEvent.ts
+++ b/packages/replay-internal/src/util/prepareReplayEvent.ts
@@ -1,5 +1,5 @@
-import { getIsolationScope, prepareEvent } from '@sentry/core';
import type { Client, EventHint, ReplayEvent, Scope } from '@sentry/core';
+import { getIsolationScope, prepareEvent } from '@sentry/core';
/**
* Prepare a replay event & enrich it with the SDK metadata.
diff --git a/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts b/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts
index 7e264811ce3a..7d3139aa447d 100644
--- a/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts
+++ b/packages/replay-internal/src/util/resetReplayIdOnDynamicSamplingContext.ts
@@ -1,5 +1,5 @@
-import { getActiveSpan, getCurrentScope, getDynamicSamplingContextFromSpan } from '@sentry/core';
import type { DynamicSamplingContext } from '@sentry/core';
+import { getActiveSpan, getCurrentScope, getDynamicSamplingContextFromSpan } from '@sentry/core';
/**
* Reset the `replay_id` field on the DSC.
diff --git a/packages/replay-internal/src/util/sendReplay.ts b/packages/replay-internal/src/util/sendReplay.ts
index c0c6483502b9..9ce1350462cf 100644
--- a/packages/replay-internal/src/util/sendReplay.ts
+++ b/packages/replay-internal/src/util/sendReplay.ts
@@ -1,9 +1,8 @@
-import { setTimeout } from '@sentry-internal/browser-utils';
import { setContext } from '@sentry/core';
-
+import { setTimeout } from '@sentry-internal/browser-utils';
import { RETRY_BASE_INTERVAL, RETRY_MAX_COUNT, UNABLE_TO_SEND_REPLAY } from '../constants';
import type { SendReplayData } from '../types';
-import { RateLimitError, TransportStatusCodeError, sendReplayRequest } from './sendReplayRequest';
+import { RateLimitError, sendReplayRequest, TransportStatusCodeError } from './sendReplayRequest';
/**
* Finalize and send the current replay event to Sentry
diff --git a/packages/replay-internal/src/util/shouldFilterRequest.ts b/packages/replay-internal/src/util/shouldFilterRequest.ts
index 71a268be8d64..26c0ddf64760 100644
--- a/packages/replay-internal/src/util/shouldFilterRequest.ts
+++ b/packages/replay-internal/src/util/shouldFilterRequest.ts
@@ -1,5 +1,4 @@
import { getClient, isSentryRequestUrl } from '@sentry/core';
-
import { DEBUG_BUILD } from '../debug-build';
import type { ReplayContainer } from '../types';
diff --git a/packages/replay-internal/test.setup.ts b/packages/replay-internal/test.setup.ts
index 55c5bc1704e2..acee6fb8f3de 100644
--- a/packages/replay-internal/test.setup.ts
+++ b/packages/replay-internal/test.setup.ts
@@ -1,12 +1,11 @@
-import { printDiffOrStringify } from 'jest-matcher-utils';
-import { vi, expect } from 'vitest';
-import type { Mocked, MockedFunction } from 'vitest';
-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+import type { ReplayRecordingData, Transport } from '@sentry/core';
import { getClient } from '@sentry/core';
import * as SentryUtils from '@sentry/core';
-import type { ReplayRecordingData, Transport } from '@sentry/core';
-
+import { printDiffOrStringify } from 'jest-matcher-utils';
+import type { Mocked, MockedFunction } from 'vitest';
+import { expect, vi } from 'vitest';
import type { ReplayContainer, Session } from './src/types';
type MockTransport = MockedFunction;
diff --git a/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts b/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts
index b753d38c3fd6..310d9c96793e 100644
--- a/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts
+++ b/packages/replay-internal/test/integration/beforeAddRecordingEvent.test.ts
@@ -3,13 +3,11 @@
*/
import '../utils/mock-internal-setTimeout';
-import type { MockInstance, MockedFunction } from 'vitest';
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
-import * as SentryCore from '@sentry/core';
import type { Transport } from '@sentry/core';
-
+import * as SentryCore from '@sentry/core';
+import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
+import type { MockedFunction, MockInstance } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import type { Replay } from '../../src/integration';
import type { ReplayContainer } from '../../src/replay';
import { clearSession } from '../../src/session/clearSession';
diff --git a/packages/replay-internal/test/integration/events.test.ts b/packages/replay-internal/test/integration/events.test.ts
index 5d103ff66534..bcce110c4d61 100644
--- a/packages/replay-internal/test/integration/events.test.ts
+++ b/packages/replay-internal/test/integration/events.test.ts
@@ -6,9 +6,6 @@ import '../utils/mock-internal-setTimeout';
import { getClient } from '@sentry/core';
import type { MockInstance } from 'vitest';
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { getClient } from '@sentry/core';
-
import { WINDOW } from '../../src/constants';
import type { ReplayContainer } from '../../src/replay';
import { clearSession } from '../../src/session/clearSession';
diff --git a/packages/replay-internal/test/integration/flush.test.ts b/packages/replay-internal/test/integration/flush.test.ts
index d918f6d50bc8..f3a1f4e34f52 100644
--- a/packages/replay-internal/test/integration/flush.test.ts
+++ b/packages/replay-internal/test/integration/flush.test.ts
@@ -3,12 +3,10 @@
*/
import '../utils/mock-internal-setTimeout';
+import * as SentryUtils from '@sentry/core';
+import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
import type { MockedFunction } from 'vitest';
import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
-import * as SentryUtils from '@sentry/core';
-
import { DEFAULT_FLUSH_MIN_DELAY, MAX_REPLAY_DURATION, WINDOW } from '../../src/constants';
import type { Replay } from '../../src/integration';
import type { ReplayContainer } from '../../src/replay';
diff --git a/packages/replay-internal/test/integration/integrationSettings.test.ts b/packages/replay-internal/test/integration/integrationSettings.test.ts
index 8f7f39fdcf1a..d9c4d7a5b1c0 100644
--- a/packages/replay-internal/test/integration/integrationSettings.test.ts
+++ b/packages/replay-internal/test/integration/integrationSettings.test.ts
@@ -2,10 +2,8 @@
* @vitest-environment jsdom
*/
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import type { MockInstance } from 'vitest';
-
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { mockSdk } from '../index';
describe('Integration | integrationSettings', () => {
diff --git a/packages/replay-internal/test/integration/sendReplayEvent.test.ts b/packages/replay-internal/test/integration/sendReplayEvent.test.ts
index 957e3cfbfd14..ef7e6e2b63f6 100644
--- a/packages/replay-internal/test/integration/sendReplayEvent.test.ts
+++ b/packages/replay-internal/test/integration/sendReplayEvent.test.ts
@@ -3,12 +3,11 @@
*/
import '../utils/mock-internal-setTimeout';
-
-import type { MockInstance, MockedFunction } from 'vitest';
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
-import * as SentryCore from '@sentry/core';
import type { Transport } from '@sentry/core';
+import * as SentryCore from '@sentry/core';
+import * as SentryBrowserUtils from '@sentry-internal/browser-utils';
+import type { MockedFunction, MockInstance } from 'vitest';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { DEFAULT_FLUSH_MIN_DELAY, WINDOW } from '../../src/constants';
import type { ReplayContainer } from '../../src/replay';
import { clearSession } from '../../src/session/clearSession';
diff --git a/packages/replay-internal/test/integration/shouldFilterRequest.test.ts b/packages/replay-internal/test/integration/shouldFilterRequest.test.ts
index ee44c3886775..355afe80060b 100644
--- a/packages/replay-internal/test/integration/shouldFilterRequest.test.ts
+++ b/packages/replay-internal/test/integration/shouldFilterRequest.test.ts
@@ -3,7 +3,6 @@
*/
import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { shouldFilterRequest } from '../../src/util/shouldFilterRequest';
import { mockSdk } from '../index';
diff --git a/packages/replay-internal/test/mocks/mockRrweb.ts b/packages/replay-internal/test/mocks/mockRrweb.ts
index bdffef9b7c32..14cccfce81fb 100644
--- a/packages/replay-internal/test/mocks/mockRrweb.ts
+++ b/packages/replay-internal/test/mocks/mockRrweb.ts
@@ -1,8 +1,6 @@
-import { vi } from 'vitest';
-import type { Mock, MockedFunction } from 'vitest';
-
import { record } from '@sentry-internal/rrweb';
-
+import type { Mock, MockedFunction } from 'vitest';
+import { vi } from 'vitest';
import type { RecordingEvent, ReplayEventWithTime } from '../../src/types';
import { ReplayEventTypeFullSnapshot, ReplayEventTypeIncrementalSnapshot } from '../../src/types';
diff --git a/packages/replay-internal/test/mocks/mockSdk.ts b/packages/replay-internal/test/mocks/mockSdk.ts
index 2c3a257b42ca..9ec20553529b 100644
--- a/packages/replay-internal/test/mocks/mockSdk.ts
+++ b/packages/replay-internal/test/mocks/mockSdk.ts
@@ -1,6 +1,5 @@
import type { Envelope, Transport, TransportMakeRequestResponse } from '@sentry/core';
import { vi } from 'vitest';
-
import type { Replay as ReplayIntegration } from '../../src/integration';
import type { ReplayContainer } from '../../src/replay';
import type { ReplayConfiguration } from '../../src/types';
diff --git a/packages/replay-internal/test/mocks/resetSdkMock.ts b/packages/replay-internal/test/mocks/resetSdkMock.ts
index 95e8d15375f2..52138c729b12 100644
--- a/packages/replay-internal/test/mocks/resetSdkMock.ts
+++ b/packages/replay-internal/test/mocks/resetSdkMock.ts
@@ -1,6 +1,5 @@
import { resetInstrumentationHandlers } from '@sentry/core';
import { vi } from 'vitest';
-
import type { Replay as ReplayIntegration } from '../../src/integration';
import type { ReplayContainer } from '../../src/replay';
import type { RecordMock } from './../index';
diff --git a/packages/replay-internal/test/unit/coreHandlers/handleBreadcrumbs.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleBreadcrumbs.test.ts
index f8c54341fa41..5ac831f7fb20 100644
--- a/packages/replay-internal/test/unit/coreHandlers/handleBreadcrumbs.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/handleBreadcrumbs.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { CONSOLE_ARG_MAX_SIZE } from '../../../src/constants';
import { normalizeBreadcrumb, normalizeConsoleBreadcrumb } from '../../../src/coreHandlers/handleBreadcrumbs';
diff --git a/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts
index 8d5453c31f2c..1512f3481de9 100644
--- a/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/handleDom.test.ts
@@ -2,10 +2,8 @@
* @vitest-environment jsdom
*/
-import { describe, expect, test } from 'vitest';
-
import type { HandlerDataDom } from '@sentry/core';
-
+import { describe, expect, test } from 'vitest';
import { handleDom } from '../../../src/coreHandlers/handleDom';
describe('Unit | coreHandlers | handleDom', () => {
diff --git a/packages/replay-internal/test/unit/coreHandlers/handleKeyboardEvent.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleKeyboardEvent.test.ts
index be7764eaa327..f228eb52b11e 100644
--- a/packages/replay-internal/test/unit/coreHandlers/handleKeyboardEvent.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/handleKeyboardEvent.test.ts
@@ -3,7 +3,6 @@
*/
import { describe, expect, it } from 'vitest';
-
import { getKeyboardBreadcrumb } from '../../../src/coreHandlers/handleKeyboardEvent';
describe('Unit | coreHandlers | handleKeyboardEvent', () => {
diff --git a/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts b/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
index ca102b7af721..9894b928c1b8 100644
--- a/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/handleNetworkBreadcrumbs.test.ts
@@ -16,8 +16,8 @@ import { NETWORK_BODY_MAX_SIZE } from '../../../src/constants';
import { beforeAddNetworkBreadcrumb } from '../../../src/coreHandlers/handleNetworkBreadcrumbs';
import type { EventBufferArray } from '../../../src/eventBuffer/EventBufferArray';
import type { ReplayContainer, ReplayNetworkOptions } from '../../../src/types';
-import { setupReplayContainer } from '../../utils/setupReplayContainer';
import { BASE_TIMESTAMP } from '../..';
+import { setupReplayContainer } from '../../utils/setupReplayContainer';
async function waitForReplayEventBuffer() {
// Need one Promise.resolve() per await in the util functions
diff --git a/packages/replay-internal/test/unit/coreHandlers/util/addBreadcrumbEvent.test.ts b/packages/replay-internal/test/unit/coreHandlers/util/addBreadcrumbEvent.test.ts
index 48ce5d20d0d7..a1b7bd1bd3dc 100644
--- a/packages/replay-internal/test/unit/coreHandlers/util/addBreadcrumbEvent.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/util/addBreadcrumbEvent.test.ts
@@ -6,8 +6,8 @@ import '../../../utils/mock-internal-setTimeout';
import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { addBreadcrumbEvent } from '../../../../src/coreHandlers/util/addBreadcrumbEvent';
import type { EventBufferArray } from '../../../../src/eventBuffer/EventBufferArray';
-import { setupReplayContainer } from '../../../utils/setupReplayContainer';
import { BASE_TIMESTAMP } from '../../..';
+import { setupReplayContainer } from '../../../utils/setupReplayContainer';
describe('Unit | coreHandlers | util | addBreadcrumbEvent', function () {
beforeAll(() => {
diff --git a/packages/replay-internal/test/unit/coreHandlers/util/getAttributesToRecord.test.ts b/packages/replay-internal/test/unit/coreHandlers/util/getAttributesToRecord.test.ts
index 6181b480597b..8124d828c52c 100644
--- a/packages/replay-internal/test/unit/coreHandlers/util/getAttributesToRecord.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/util/getAttributesToRecord.test.ts
@@ -1,5 +1,4 @@
import { expect, it } from 'vitest';
-
import { getAttributesToRecord } from '../../../../src/coreHandlers/util/getAttributesToRecord';
it('records only included attributes', function () {
diff --git a/packages/replay-internal/test/unit/coreHandlers/util/xhrUtils.test.ts b/packages/replay-internal/test/unit/coreHandlers/util/xhrUtils.test.ts
index e6a64dfe7285..9954c7309191 100644
--- a/packages/replay-internal/test/unit/coreHandlers/util/xhrUtils.test.ts
+++ b/packages/replay-internal/test/unit/coreHandlers/util/xhrUtils.test.ts
@@ -3,7 +3,6 @@
*/
import { describe, expect, it } from 'vitest';
-
import { _parseXhrResponse } from '../../../../src/coreHandlers/util/xhrUtils';
describe('Unit | coreHandlers | util | xhrUtils', () => {
diff --git a/packages/replay-internal/test/unit/eventBuffer/EventBufferArray.test.ts b/packages/replay-internal/test/unit/eventBuffer/EventBufferArray.test.ts
index 05055fe62763..d9b73c2b9def 100644
--- a/packages/replay-internal/test/unit/eventBuffer/EventBufferArray.test.ts
+++ b/packages/replay-internal/test/unit/eventBuffer/EventBufferArray.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { REPLAY_MAX_EVENT_BUFFER_SIZE } from '../../../src/constants';
import { createEventBuffer } from '../../../src/eventBuffer';
import { EventBufferSizeExceededError } from '../../../src/eventBuffer/error';
diff --git a/packages/replay-internal/test/unit/eventBuffer/EventBufferCompressionWorker.test.ts b/packages/replay-internal/test/unit/eventBuffer/EventBufferCompressionWorker.test.ts
index 4369a8b930c8..694c59aa067f 100644
--- a/packages/replay-internal/test/unit/eventBuffer/EventBufferCompressionWorker.test.ts
+++ b/packages/replay-internal/test/unit/eventBuffer/EventBufferCompressionWorker.test.ts
@@ -3,14 +3,12 @@
*/
import 'jsdom-worker';
-
import { describe, expect, it, vi } from 'vitest';
-
-import { BASE_TIMESTAMP } from '../..';
import { REPLAY_MAX_EVENT_BUFFER_SIZE } from '../../../src/constants';
import { createEventBuffer } from '../../../src/eventBuffer';
-import { EventBufferProxy } from '../../../src/eventBuffer/EventBufferProxy';
import { EventBufferSizeExceededError } from '../../../src/eventBuffer/error';
+import { EventBufferProxy } from '../../../src/eventBuffer/EventBufferProxy';
+import { BASE_TIMESTAMP } from '../..';
import { decompress } from '../../utils/compression';
import { getTestEventIncremental } from '../../utils/getTestEvent';
diff --git a/packages/replay-internal/test/unit/eventBuffer/EventBufferProxy.test.ts b/packages/replay-internal/test/unit/eventBuffer/EventBufferProxy.test.ts
index 3bcc073a023c..b602c0b4b009 100644
--- a/packages/replay-internal/test/unit/eventBuffer/EventBufferProxy.test.ts
+++ b/packages/replay-internal/test/unit/eventBuffer/EventBufferProxy.test.ts
@@ -3,12 +3,10 @@
*/
import 'jsdom-worker';
-
import type { MockInstance } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { BASE_TIMESTAMP } from '../..';
import { EventBufferProxy } from '../../../src/eventBuffer/EventBufferProxy';
+import { BASE_TIMESTAMP } from '../..';
import { decompress } from '../../utils/compression';
import { getTestEventIncremental } from '../../utils/getTestEvent';
import { createEventBuffer } from './../../../src/eventBuffer';
diff --git a/packages/replay-internal/test/unit/multipleInstances.test.ts b/packages/replay-internal/test/unit/multipleInstances.test.ts
index dacd936e0018..e5612dc010b6 100644
--- a/packages/replay-internal/test/unit/multipleInstances.test.ts
+++ b/packages/replay-internal/test/unit/multipleInstances.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { replayIntegration } from '../../src/integration';
describe('Unit | multipleInstances', () => {
diff --git a/packages/replay-internal/test/unit/session/createSession.test.ts b/packages/replay-internal/test/unit/session/createSession.test.ts
index 05db8c2fd96e..53fbbbdb59e5 100644
--- a/packages/replay-internal/test/unit/session/createSession.test.ts
+++ b/packages/replay-internal/test/unit/session/createSession.test.ts
@@ -2,10 +2,8 @@
* @vitest-environment jsdom
*/
-import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
-
import type * as Sentry from '@sentry/core';
-
+import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
import { WINDOW } from '../../../src/constants';
import { createSession } from '../../../src/session/createSession';
import { saveSession } from '../../../src/session/saveSession';
diff --git a/packages/replay-internal/test/unit/session/fetchSession.test.ts b/packages/replay-internal/test/unit/session/fetchSession.test.ts
index 15bd4e02e958..46f0f05f5c9a 100644
--- a/packages/replay-internal/test/unit/session/fetchSession.test.ts
+++ b/packages/replay-internal/test/unit/session/fetchSession.test.ts
@@ -3,7 +3,6 @@
*/
import { afterEach, beforeAll, describe, expect, it } from 'vitest';
-
import { REPLAY_SESSION_KEY, WINDOW } from '../../../src/constants';
import { fetchSession } from '../../../src/session/fetchSession';
diff --git a/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts b/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
index 41d76ad2d83c..b59c14aa4e4d 100644
--- a/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
+++ b/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
@@ -4,13 +4,12 @@
import type { MockedFunction } from 'vitest';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
-
import { MAX_REPLAY_DURATION, SESSION_IDLE_EXPIRE_DURATION, WINDOW } from '../../../src/constants';
-import { makeSession } from '../../../src/session/Session';
import * as CreateSession from '../../../src/session/createSession';
import * as FetchSession from '../../../src/session/fetchSession';
import { loadOrCreateSession } from '../../../src/session/loadOrCreateSession';
import { saveSession } from '../../../src/session/saveSession';
+import { makeSession } from '../../../src/session/Session';
import type { SessionOptions } from '../../../src/types';
vi.mock('@sentry/core', async () => {
diff --git a/packages/replay-internal/test/unit/session/saveSession.test.ts b/packages/replay-internal/test/unit/session/saveSession.test.ts
index 83584d73a08c..319687fdef96 100644
--- a/packages/replay-internal/test/unit/session/saveSession.test.ts
+++ b/packages/replay-internal/test/unit/session/saveSession.test.ts
@@ -3,10 +3,9 @@
*/
import { afterEach, beforeAll, describe, expect, it } from 'vitest';
-
import { REPLAY_SESSION_KEY, WINDOW } from '../../../src/constants';
-import { makeSession } from '../../../src/session/Session';
import { saveSession } from '../../../src/session/saveSession';
+import { makeSession } from '../../../src/session/Session';
describe('Unit | session | saveSession', () => {
beforeAll(() => {
diff --git a/packages/replay-internal/test/unit/session/sessionSampling.test.ts b/packages/replay-internal/test/unit/session/sessionSampling.test.ts
index e6cba28efdf7..bda4114aeaeb 100644
--- a/packages/replay-internal/test/unit/session/sessionSampling.test.ts
+++ b/packages/replay-internal/test/unit/session/sessionSampling.test.ts
@@ -1,7 +1,6 @@
import { describe, expect, it } from 'vitest';
-
-import { makeSession } from '../../../src/session/Session';
import { getSessionSampleType } from '../../../src/session/createSession';
+import { makeSession } from '../../../src/session/Session';
describe('Unit | session | sessionSampling', () => {
it('does not sample', function () {
diff --git a/packages/replay-internal/test/unit/util/addEvent.test.ts b/packages/replay-internal/test/unit/util/addEvent.test.ts
index bd2aa0d6a035..47528df5ba7c 100644
--- a/packages/replay-internal/test/unit/util/addEvent.test.ts
+++ b/packages/replay-internal/test/unit/util/addEvent.test.ts
@@ -8,9 +8,9 @@ import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { MAX_REPLAY_DURATION, REPLAY_MAX_EVENT_BUFFER_SIZE, SESSION_IDLE_PAUSE_DURATION } from '../../../src/constants';
import type { EventBufferProxy } from '../../../src/eventBuffer/EventBufferProxy';
import { addEvent, shouldAddEvent } from '../../../src/util/addEvent';
+import { BASE_TIMESTAMP } from '../..';
import { getTestEventIncremental } from '../../utils/getTestEvent';
import { setupReplayContainer } from '../../utils/setupReplayContainer';
-import { BASE_TIMESTAMP } from '../..';
describe('Unit | util | addEvent', () => {
beforeAll(() => {
diff --git a/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts b/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts
index 9971c3e57b3f..2fac7ae0e13e 100644
--- a/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts
+++ b/packages/replay-internal/test/unit/util/createReplayEnvelope.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it } from 'vitest';
-
-import { makeDsn } from '@sentry/core';
import type { ReplayEvent } from '@sentry/core';
-
+import { makeDsn } from '@sentry/core';
+import { describe, expect, it } from 'vitest';
import { createReplayEnvelope } from '../../../src/util/createReplayEnvelope';
describe('Unit | util | createReplayEnvelope', () => {
diff --git a/packages/replay-internal/test/unit/util/getPrivacyOptions.test.ts b/packages/replay-internal/test/unit/util/getPrivacyOptions.test.ts
index 3123e3efaa7c..13450acdbf12 100644
--- a/packages/replay-internal/test/unit/util/getPrivacyOptions.test.ts
+++ b/packages/replay-internal/test/unit/util/getPrivacyOptions.test.ts
@@ -1,5 +1,4 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import { getPrivacyOptions } from '../../../src/util/getPrivacyOptions';
describe('Unit | util | getPrivacyOptions', () => {
diff --git a/packages/replay-internal/test/unit/util/getReplay.test.ts b/packages/replay-internal/test/unit/util/getReplay.test.ts
index 350688a4e881..11b23ff3d0a9 100644
--- a/packages/replay-internal/test/unit/util/getReplay.test.ts
+++ b/packages/replay-internal/test/unit/util/getReplay.test.ts
@@ -1,6 +1,5 @@
-import { beforeEach, describe, expect, it } from 'vitest';
-
import { getCurrentScope } from '@sentry/core';
+import { beforeEach, describe, expect, it } from 'vitest';
import { replayIntegration } from '../../../src/integration';
import { getReplay } from '../../../src/util/getReplay';
import { getDefaultClientOptions, init } from '../../utils/TestClient';
diff --git a/packages/replay-internal/test/unit/util/handleRecordingEmit.test.ts b/packages/replay-internal/test/unit/util/handleRecordingEmit.test.ts
index 53ade39f6fd9..41188cd5f1f1 100644
--- a/packages/replay-internal/test/unit/util/handleRecordingEmit.test.ts
+++ b/packages/replay-internal/test/unit/util/handleRecordingEmit.test.ts
@@ -9,8 +9,8 @@ import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vite
import type { ReplayOptionFrameEvent } from '../../../src/types';
import * as SentryAddEvent from '../../../src/util/addEvent';
import { createOptionsEvent, getHandleRecordingEmit } from '../../../src/util/handleRecordingEmit';
-import { setupReplayContainer } from '../../utils/setupReplayContainer';
import { BASE_TIMESTAMP } from '../..';
+import { setupReplayContainer } from '../../utils/setupReplayContainer';
let optionsEvent: ReplayOptionFrameEvent;
diff --git a/packages/replay-internal/test/unit/util/isExpired.test.ts b/packages/replay-internal/test/unit/util/isExpired.test.ts
index 199b10d59b1a..e36ede56dc0c 100644
--- a/packages/replay-internal/test/unit/util/isExpired.test.ts
+++ b/packages/replay-internal/test/unit/util/isExpired.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { isExpired } from '../../../src/util/isExpired';
describe('Unit | util | isExpired', () => {
diff --git a/packages/replay-internal/test/unit/util/isSampled.test.ts b/packages/replay-internal/test/unit/util/isSampled.test.ts
index 3914ffb2487e..dfc8bbf44a45 100644
--- a/packages/replay-internal/test/unit/util/isSampled.test.ts
+++ b/packages/replay-internal/test/unit/util/isSampled.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, test, vi } from 'vitest';
-
import { isSampled } from '../../../src/util/isSampled';
// Note Math.random generates a value from 0 (inclusive) to <1 (1 exclusive).
diff --git a/packages/replay-internal/test/unit/util/isSessionExpired.test.ts b/packages/replay-internal/test/unit/util/isSessionExpired.test.ts
index 329cc209840d..1501647e10da 100644
--- a/packages/replay-internal/test/unit/util/isSessionExpired.test.ts
+++ b/packages/replay-internal/test/unit/util/isSessionExpired.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { MAX_REPLAY_DURATION } from '../../../src/constants';
import { makeSession } from '../../../src/session/Session';
import { isSessionExpired } from '../../../src/util/isSessionExpired';
diff --git a/packages/replay-internal/test/unit/util/logger.test.ts b/packages/replay-internal/test/unit/util/logger.test.ts
index 2334ad1d83e6..7d44ee34381b 100644
--- a/packages/replay-internal/test/unit/util/logger.test.ts
+++ b/packages/replay-internal/test/unit/util/logger.test.ts
@@ -1,7 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import * as SentryCore from '@sentry/core';
import { logger as coreLogger } from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { logger } from '../../../src/util/logger';
const mockCaptureException = vi.spyOn(SentryCore, 'captureException');
diff --git a/packages/replay-internal/test/unit/util/maskAttribute.test.ts b/packages/replay-internal/test/unit/util/maskAttribute.test.ts
index 4a7e5fe4ba7c..4819e5411e11 100644
--- a/packages/replay-internal/test/unit/util/maskAttribute.test.ts
+++ b/packages/replay-internal/test/unit/util/maskAttribute.test.ts
@@ -3,7 +3,6 @@
*/
import { describe, expect, test } from 'vitest';
-
import { maskAttribute } from '../../../src/util/maskAttribute';
describe('maskAttribute', () => {
diff --git a/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts b/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts
index 0808481b21ed..576c1acbba2e 100644
--- a/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts
+++ b/packages/replay-internal/test/unit/util/prepareReplayEvent.test.ts
@@ -1,11 +1,9 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { getClient, getCurrentScope, setCurrentClient } from '@sentry/core';
import type { ReplayEvent } from '@sentry/core';
-
+import { getClient, getCurrentScope, setCurrentClient } from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { REPLAY_EVENT_NAME } from '../../../src/constants';
import { prepareReplayEvent } from '../../../src/util/prepareReplayEvent';
-import { TestClient, getDefaultClientOptions } from '../../utils/TestClient';
+import { getDefaultClientOptions, TestClient } from '../../utils/TestClient';
describe('Unit | util | prepareReplayEvent', () => {
beforeEach(() => {
diff --git a/packages/replay-internal/test/utils/TestClient.ts b/packages/replay-internal/test/utils/TestClient.ts
index 03f092adaba1..75655650d9ba 100644
--- a/packages/replay-internal/test/utils/TestClient.ts
+++ b/packages/replay-internal/test/utils/TestClient.ts
@@ -1,5 +1,3 @@
-import { Client, createTransport, initAndBind } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
import type {
BrowserClientReplayOptions,
ClientOptions,
@@ -7,6 +5,7 @@ import type {
ParameterizedString,
SeverityLevel,
} from '@sentry/core';
+import { Client, createTransport, initAndBind, resolvedSyncPromise } from '@sentry/core';
export interface TestClientOptions extends ClientOptions, BrowserClientReplayOptions {}
diff --git a/packages/replay-internal/vitest.config.ts b/packages/replay-internal/vitest.config.ts
index 3aa37d27166c..93cf567e3ace 100644
--- a/packages/replay-internal/vitest.config.ts
+++ b/packages/replay-internal/vitest.config.ts
@@ -1,5 +1,4 @@
import { defineConfig } from 'vitest/config';
-
import baseConfig from '../../vite/vite.config';
export default defineConfig({
diff --git a/packages/replay-worker/.eslintrc.js b/packages/replay-worker/.eslintrc.js
index 47c60ffff072..2436a338dfcd 100644
--- a/packages/replay-worker/.eslintrc.js
+++ b/packages/replay-worker/.eslintrc.js
@@ -13,5 +13,14 @@ module.exports = {
'prefer-template': 'off',
},
},
+ {
+ // these somehow fail with rollup.examples.config.mjs
+ files: ['*.mjs'],
+ rules: {
+ 'import/default': 'off',
+ 'import/no-named-as-default': 'off',
+ 'import/no-named-as-default-member': 'off',
+ },
+ },
],
};
diff --git a/packages/replay-worker/rollup.examples.config.mjs b/packages/replay-worker/rollup.examples.config.mjs
index b1977602bb84..cbaacbfcb245 100644
--- a/packages/replay-worker/rollup.examples.config.mjs
+++ b/packages/replay-worker/rollup.examples.config.mjs
@@ -3,7 +3,6 @@ import resolve from '@rollup/plugin-node-resolve';
import terser from '@rollup/plugin-terser';
import typescript from '@rollup/plugin-typescript';
import { defineConfig } from 'rollup';
-
import { makeLicensePlugin } from '../../dev-packages/rollup-utils/plugins/index.mjs';
const licensePlugin = makeLicensePlugin('Sentry Replay Worker');
diff --git a/packages/replay-worker/src/Compressor.ts b/packages/replay-worker/src/Compressor.ts
index 712481aa62d7..233a63df90dc 100644
--- a/packages/replay-worker/src/Compressor.ts
+++ b/packages/replay-worker/src/Compressor.ts
@@ -1,4 +1,4 @@
-import { EncodeUTF8, Zlib, compressSync, strToU8 } from 'fflate';
+import { compressSync, EncodeUTF8, strToU8, Zlib } from 'fflate';
/**
* A stateful compressor that can be used to batch compress events.
diff --git a/packages/replay-worker/src/handleMessage.ts b/packages/replay-worker/src/handleMessage.ts
index 79eed0345ccd..2edeb71c1c22 100644
--- a/packages/replay-worker/src/handleMessage.ts
+++ b/packages/replay-worker/src/handleMessage.ts
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { Compressor, compress } from './Compressor';
+import { compress, Compressor } from './Compressor';
const compressor = new Compressor();
diff --git a/packages/replay-worker/test/unit/Compressor.test.ts b/packages/replay-worker/test/unit/Compressor.test.ts
index dcce14edce70..74f01ef42168 100644
--- a/packages/replay-worker/test/unit/Compressor.test.ts
+++ b/packages/replay-worker/test/unit/Compressor.test.ts
@@ -1,7 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
import { decompressSync, strFromU8 } from 'fflate';
-
+import { describe, expect, it } from 'vitest';
import { Compressor } from '../../src/Compressor';
describe('Compressor', () => {
diff --git a/packages/solid/src/sdk.ts b/packages/solid/src/sdk.ts
index b17a42051474..9968b0ace8f0 100644
--- a/packages/solid/src/sdk.ts
+++ b/packages/solid/src/sdk.ts
@@ -1,7 +1,7 @@
import type { BrowserOptions } from '@sentry/browser';
import { init as browserInit } from '@sentry/browser';
-import { applySdkMetadata } from '@sentry/core';
import type { Client } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
/**
* Initializes the Solid SDK
diff --git a/packages/solid/src/solidrouter.ts b/packages/solid/src/solidrouter.ts
index aa0a75854d4d..40af69caa2bc 100644
--- a/packages/solid/src/solidrouter.ts
+++ b/packages/solid/src/solidrouter.ts
@@ -5,24 +5,24 @@ import {
spanToJSON,
startBrowserTracingNavigationSpan,
} from '@sentry/browser';
+import type { Client, Integration, Span } from '@sentry/core';
import {
+ getClient,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- getClient,
} from '@sentry/core';
-import type { Client, Integration, Span } from '@sentry/core';
import type {
BeforeLeaveEventArgs,
HashRouter,
MemoryRouter,
- RouteSectionProps,
Router as BaseRouter,
+ RouteSectionProps,
StaticRouter,
} from '@solidjs/router';
import { useBeforeLeave, useLocation } from '@solidjs/router';
-import { createEffect, mergeProps, splitProps } from 'solid-js';
import type { Component, JSX, ParentProps } from 'solid-js';
+import { createEffect, mergeProps, splitProps } from 'solid-js';
import { createComponent } from 'solid-js/web';
const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet();
diff --git a/packages/solid/test/errorboundary.test.tsx b/packages/solid/test/errorboundary.test.tsx
index 1ccfe3acccff..0ba1a2602bfe 100644
--- a/packages/solid/test/errorboundary.test.tsx
+++ b/packages/solid/test/errorboundary.test.tsx
@@ -1,12 +1,10 @@
/* eslint-disable @typescript-eslint/unbound-method */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import type * as SentryBrowser from '@sentry/browser';
import { createTransport, getCurrentScope, setCurrentClient } from '@sentry/core';
import { render } from '@solidjs/testing-library';
import userEvent from '@testing-library/user-event';
-
import { ErrorBoundary } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient, withSentryErrorBoundary } from '../src';
const mockCaptureException = vi.fn();
diff --git a/packages/solid/test/sdk.test.ts b/packages/solid/test/sdk.test.ts
index 7177dd8c2a64..dec8220668a8 100644
--- a/packages/solid/test/sdk.test.ts
+++ b/packages/solid/test/sdk.test.ts
@@ -1,8 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { SDK_VERSION } from '@sentry/browser';
import * as SentryBrowser from '@sentry/browser';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { init as solidInit } from '../src/sdk';
const browserInit = vi.spyOn(SentryBrowser, 'init');
diff --git a/packages/solid/test/solidrouter.test.tsx b/packages/solid/test/solidrouter.test.tsx
index 33267e1c849f..5a5ab77e9f2c 100644
--- a/packages/solid/test/solidrouter.test.tsx
+++ b/packages/solid/test/solidrouter.test.tsx
@@ -1,18 +1,16 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { spanToJSON } from '@sentry/browser';
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import type { MemoryHistory } from '@solidjs/router';
-import { MemoryRouter, Navigate, Route, createMemoryHistory } from '@solidjs/router';
+import { createMemoryHistory, MemoryRouter, Navigate, Route } from '@solidjs/router';
import { render } from '@solidjs/testing-library';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../src';
import { solidRouterBrowserTracingIntegration, withSentryRouterRouting } from '../src/solidrouter';
diff --git a/packages/solidstart/src/client/sdk.ts b/packages/solidstart/src/client/sdk.ts
index e656fdcba921..06ee8f092094 100644
--- a/packages/solidstart/src/client/sdk.ts
+++ b/packages/solidstart/src/client/sdk.ts
@@ -1,5 +1,5 @@
-import { applySdkMetadata } from '@sentry/core';
import type { Client, Integration } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
import type { BrowserOptions } from '@sentry/solid';
import {
browserTracingIntegration,
diff --git a/packages/solidstart/src/config/addInstrumentation.ts b/packages/solidstart/src/config/addInstrumentation.ts
index 22494710a97c..fe141f92c2ea 100644
--- a/packages/solidstart/src/config/addInstrumentation.ts
+++ b/packages/solidstart/src/config/addInstrumentation.ts
@@ -1,7 +1,7 @@
-import * as fs from 'fs';
-import * as path from 'path';
import { consoleSandbox } from '@sentry/core';
+import * as fs from 'fs';
import type { Nitro } from 'nitropack';
+import * as path from 'path';
import type { SentrySolidStartPluginOptions } from '../vite/types';
import type { RollupConfig } from './types';
import { wrapServerEntryWithDynamicImport } from './wrapServerEntryWithDynamicImport';
diff --git a/packages/solidstart/src/index.types.ts b/packages/solidstart/src/index.types.ts
index d243bd371241..e4cd974ed00e 100644
--- a/packages/solidstart/src/index.types.ts
+++ b/packages/solidstart/src/index.types.ts
@@ -1,15 +1,16 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part.
// Some of the exports collide, which is not allowed, unless we redefine the colliding
// exports in this file - which we do below.
-export * from './client';
-export * from './server';
-export * from './config';
-
import type { Client, Integration, Options, StackParser } from '@sentry/core';
-
import type * as clientSdk from './client';
import type * as serverSdk from './server';
+export * from './client';
+export * from './server';
+export * from './config';
+
/** Initializes Sentry Solid Start SDK */
export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): Client | undefined;
diff --git a/packages/solidstart/src/server/middleware.ts b/packages/solidstart/src/server/middleware.ts
index 05377363bd71..6419171cc1b8 100644
--- a/packages/solidstart/src/server/middleware.ts
+++ b/packages/solidstart/src/server/middleware.ts
@@ -1,5 +1,4 @@
-import { getTraceMetaTags } from '@sentry/core';
-import { addNonEnumerableProperty } from '@sentry/core';
+import { addNonEnumerableProperty, getTraceMetaTags } from '@sentry/core';
import type { ResponseMiddleware } from '@solidjs/start/middleware';
import type { FetchEvent } from '@solidjs/start/server';
diff --git a/packages/solidstart/src/server/solidrouter.ts b/packages/solidstart/src/server/solidrouter.ts
index e3ef7b4307ef..976d87efb8a8 100644
--- a/packages/solidstart/src/server/solidrouter.ts
+++ b/packages/solidstart/src/server/solidrouter.ts
@@ -1,6 +1,8 @@
-import type { HashRouter, MemoryRouter, RouteSectionProps, Router as BaseRouter, StaticRouter } from '@solidjs/router';
-import { mergeProps, splitProps } from 'solid-js';
+import type { HashRouter, MemoryRouter, Router as BaseRouter, RouteSectionProps, StaticRouter } from '@solidjs/router';
import type { Component, JSX, ParentProps } from 'solid-js';
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { mergeProps, splitProps } from 'solid-js';
+// eslint-disable-next-line import/no-extraneous-dependencies
import { createComponent } from 'solid-js/web';
// We use @sentry/solid/solidrouter on the client.
diff --git a/packages/solidstart/src/server/utils.ts b/packages/solidstart/src/server/utils.ts
index cd2c4c12ab96..956a0a3c4653 100644
--- a/packages/solidstart/src/server/utils.ts
+++ b/packages/solidstart/src/server/utils.ts
@@ -1,5 +1,5 @@
-import { logger } from '@sentry/core';
import type { EventProcessor, Options } from '@sentry/core';
+import { logger } from '@sentry/core';
import { flush, getGlobalScope } from '@sentry/node';
import { DEBUG_BUILD } from '../common/debug-build';
diff --git a/packages/solidstart/src/server/withServerActionInstrumentation.ts b/packages/solidstart/src/server/withServerActionInstrumentation.ts
index 4e976322c6e4..a894837c3947 100644
--- a/packages/solidstart/src/server/withServerActionInstrumentation.ts
+++ b/packages/solidstart/src/server/withServerActionInstrumentation.ts
@@ -1,5 +1,5 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, handleCallbackErrors } from '@sentry/core';
-import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, captureException, getActiveSpan, spanToJSON, startSpan } from '@sentry/node';
+import { handleCallbackErrors, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR } from '@sentry/core';
+import { captureException, getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, spanToJSON, startSpan } from '@sentry/node';
import { flushIfServerless, isRedirect } from './utils';
/**
diff --git a/packages/solidstart/src/solidrouter.ts b/packages/solidstart/src/solidrouter.ts
index f1539b9e3c81..91b7f296750b 100644
--- a/packages/solidstart/src/solidrouter.ts
+++ b/packages/solidstart/src/solidrouter.ts
@@ -1,10 +1,12 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part.
// Some of the exports collide, which is not allowed, unless we redefine the colliding
// exports in this file - which we do below.
+import type { RouterType } from './server/solidrouter';
+
export * from './client/solidrouter';
export * from './server/solidrouter';
-import type { RouterType } from './server/solidrouter';
-
export declare function withSentryRouterRouting(Router: RouterType): RouterType;
diff --git a/packages/solidstart/src/vite/buildInstrumentationFile.ts b/packages/solidstart/src/vite/buildInstrumentationFile.ts
index 81bcef7a5bf7..a5cd6488ca83 100644
--- a/packages/solidstart/src/vite/buildInstrumentationFile.ts
+++ b/packages/solidstart/src/vite/buildInstrumentationFile.ts
@@ -1,6 +1,6 @@
+import { consoleSandbox } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
-import { consoleSandbox } from '@sentry/core';
import type { Plugin, UserConfig } from 'vite';
import type { SentrySolidStartPluginOptions } from './types';
diff --git a/packages/solidstart/test/client/errorboundary.test.tsx b/packages/solidstart/test/client/errorboundary.test.tsx
index 1b7b0c27e69c..f1fc2c943ac1 100644
--- a/packages/solidstart/test/client/errorboundary.test.tsx
+++ b/packages/solidstart/test/client/errorboundary.test.tsx
@@ -3,9 +3,8 @@ import type * as SentryBrowser from '@sentry/browser';
import { createTransport, getCurrentScope, setCurrentClient } from '@sentry/core';
import { render } from '@solidjs/testing-library';
import userEvent from '@testing-library/user-event';
-import { vi, describe, beforeEach, afterEach, it, expect } from 'vitest';
-
import { ErrorBoundary } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient, withSentryErrorBoundary } from '../../src/client';
const mockCaptureException = vi.fn();
diff --git a/packages/solidstart/test/client/sdk.test.ts b/packages/solidstart/test/client/sdk.test.ts
index fccd95eba741..73bb412d1909 100644
--- a/packages/solidstart/test/client/sdk.test.ts
+++ b/packages/solidstart/test/client/sdk.test.ts
@@ -1,7 +1,6 @@
import { SDK_VERSION } from '@sentry/solid';
import * as SentrySolid from '@sentry/solid';
-
-import { vi, describe, beforeEach, it, expect } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { init as solidStartInit } from '../../src/client';
import { solidRouterBrowserTracingIntegration } from '../../src/client/solidrouter';
diff --git a/packages/solidstart/test/client/solidrouter.test.tsx b/packages/solidstart/test/client/solidrouter.test.tsx
index bbb510186938..143a7340456e 100644
--- a/packages/solidstart/test/client/solidrouter.test.tsx
+++ b/packages/solidstart/test/client/solidrouter.test.tsx
@@ -1,17 +1,16 @@
import { spanToJSON } from '@sentry/browser';
import {
+ createTransport,
+ getCurrentScope,
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- createTransport,
- getCurrentScope,
setCurrentClient,
} from '@sentry/core';
import type { MemoryHistory } from '@solidjs/router';
-import { MemoryRouter, Navigate, Route, createMemoryHistory } from '@solidjs/router';
+import { createMemoryHistory, MemoryRouter, Navigate, Route } from '@solidjs/router';
import { render } from '@solidjs/testing-library';
-import { vi, describe, it, beforeEach, expect } from 'vitest';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { BrowserClient } from '../../src/client';
import { solidRouterBrowserTracingIntegration, withSentryRouterRouting } from '../../src/client/solidrouter';
diff --git a/packages/solidstart/test/server/errorboundary.test.tsx b/packages/solidstart/test/server/errorboundary.test.tsx
index 8e03a590db2d..afa2d44e98d7 100644
--- a/packages/solidstart/test/server/errorboundary.test.tsx
+++ b/packages/solidstart/test/server/errorboundary.test.tsx
@@ -3,9 +3,8 @@ import type * as SentryCore from '@sentry/core';
import { createTransport, getCurrentScope, setCurrentClient } from '@sentry/core';
import { render } from '@solidjs/testing-library';
import userEvent from '@testing-library/user-event';
-import { vi, describe, beforeEach, it, expect, afterEach } from 'vitest';
-
import { ErrorBoundary } from 'solid-js';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { NodeClient, withSentryErrorBoundary } from '../../src/server';
const mockCaptureException = vi.fn();
diff --git a/packages/solidstart/test/server/middleware.test.ts b/packages/solidstart/test/server/middleware.test.ts
index 079aa799659d..a24dc73ec1c0 100644
--- a/packages/solidstart/test/server/middleware.test.ts
+++ b/packages/solidstart/test/server/middleware.test.ts
@@ -1,7 +1,7 @@
import * as SentryCore from '@sentry/core';
-import { beforeEach, describe, it, vi, expect } from 'vitest';
-import { sentryBeforeResponseMiddleware } from '../../src/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { ResponseMiddlewareResponse } from '../../src/server';
+import { sentryBeforeResponseMiddleware } from '../../src/server';
describe('middleware', () => {
describe('sentryBeforeResponseMiddleware', () => {
diff --git a/packages/solidstart/test/server/solidrouter.test.tsx b/packages/solidstart/test/server/solidrouter.test.tsx
index c28373bdabbc..617a24fdf588 100644
--- a/packages/solidstart/test/server/solidrouter.test.tsx
+++ b/packages/solidstart/test/server/solidrouter.test.tsx
@@ -1,8 +1,7 @@
import type { MemoryHistory } from '@solidjs/router';
-import { MemoryRouter, Route, createMemoryHistory } from '@solidjs/router';
+import { createMemoryHistory, MemoryRouter, Route } from '@solidjs/router';
import { render } from '@solidjs/testing-library';
-import { vi, describe, expect, it } from 'vitest';
-
+import { describe, expect, it, vi } from 'vitest';
import { withSentryRouterRouting as withSentryClientRouterRouting } from '../../src/client/solidrouter';
import { withSentryRouterRouting as withSentryServerRouterRouting } from '../../src/server/solidrouter';
diff --git a/packages/solidstart/test/server/withServerActionInstrumentation.test.ts b/packages/solidstart/test/server/withServerActionInstrumentation.test.ts
index 7e1686e2ccb1..76acc1e46b12 100644
--- a/packages/solidstart/test/server/withServerActionInstrumentation.test.ts
+++ b/packages/solidstart/test/server/withServerActionInstrumentation.test.ts
@@ -1,17 +1,19 @@
+import { SentrySpan } from '@sentry/core';
import * as SentryNode from '@sentry/node';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_OP,
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
createTransport,
getCurrentScope,
getIsolationScope,
+ NodeClient,
+ SEMANTIC_ATTRIBUTE_SENTRY_OP,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setCurrentClient,
spanToJSON,
} from '@sentry/node';
-import { NodeClient } from '@sentry/node';
import { redirect } from '@solidjs/router';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { withServerActionInstrumentation } from '../../src/server';
const mockCaptureException = vi.spyOn(SentryNode, 'captureException').mockImplementation(() => '');
const mockFlush = vi.spyOn(SentryNode, 'flush').mockImplementation(async () => true);
@@ -26,9 +28,6 @@ vi.mock('solid-js/web', async () => {
};
});
-import { SentrySpan } from '@sentry/core';
-import { withServerActionInstrumentation } from '../../src/server';
-
describe('withServerActionInstrumentation', () => {
function createMockNodeClient(): NodeClient {
return new NodeClient({
diff --git a/packages/solidstart/test/vite/buildInstrumentation.test.ts b/packages/solidstart/test/vite/buildInstrumentation.test.ts
index f6692479ec74..e0a3cbd41a02 100644
--- a/packages/solidstart/test/vite/buildInstrumentation.test.ts
+++ b/packages/solidstart/test/vite/buildInstrumentation.test.ts
@@ -1,5 +1,5 @@
import type { UserConfig } from 'vite';
-import { describe, expect, it, vi, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { makeBuildInstrumentationFilePlugin } from '../../src/vite/buildInstrumentationFile';
const fsAccessMock = vi.fn();
diff --git a/packages/svelte/src/config.ts b/packages/svelte/src/config.ts
index 4bd11e0f659e..47a45ba0d9a4 100644
--- a/packages/svelte/src/config.ts
+++ b/packages/svelte/src/config.ts
@@ -1,5 +1,4 @@
import type { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
-
import { componentTrackingPreprocessor, defaultComponentTrackingOptions } from './preprocessors';
import type { SentryPreprocessorGroup, SentrySvelteConfigOptions, SvelteConfig } from './types';
diff --git a/packages/svelte/src/performance.ts b/packages/svelte/src/performance.ts
index 05f33fe1cfdf..297e36027a8a 100644
--- a/packages/svelte/src/performance.ts
+++ b/packages/svelte/src/performance.ts
@@ -1,8 +1,7 @@
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/browser';
import type { Span } from '@sentry/core';
-import { afterUpdate, beforeUpdate, onMount } from 'svelte';
-
import { logger, startInactiveSpan } from '@sentry/core';
+import { afterUpdate, beforeUpdate, onMount } from 'svelte';
import type { TrackComponentOptions } from './types';
const defaultTrackComponentOptions: {
diff --git a/packages/svelte/src/preprocessors.ts b/packages/svelte/src/preprocessors.ts
index 67936be39858..b13b20ec59f6 100644
--- a/packages/svelte/src/preprocessors.ts
+++ b/packages/svelte/src/preprocessors.ts
@@ -1,6 +1,5 @@
import MagicString from 'magic-string';
import type { PreprocessorGroup } from 'svelte/types/compiler/preprocess';
-
import type { ComponentTrackingInitOptions, SentryPreprocessorGroup, TrackComponentOptions } from './types';
export const defaultComponentTrackingOptions: Required = {
diff --git a/packages/svelte/test/config.test.ts b/packages/svelte/test/config.test.ts
index 21f51dc66518..d8b802795110 100644
--- a/packages/svelte/test/config.test.ts
+++ b/packages/svelte/test/config.test.ts
@@ -1,7 +1,6 @@
import { describe, expect, it } from 'vitest';
-
import { withSentryConfig } from '../src/config';
-import { FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID, componentTrackingPreprocessor } from '../src/preprocessors';
+import { componentTrackingPreprocessor, FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID } from '../src/preprocessors';
import type { SentryPreprocessorGroup, SentrySvelteConfigOptions, SvelteConfig } from '../src/types';
describe('withSentryConfig', () => {
diff --git a/packages/svelte/test/performance.test.ts b/packages/svelte/test/performance.test.ts
index 64e38599cdda..9d439b6275ba 100644
--- a/packages/svelte/test/performance.test.ts
+++ b/packages/svelte/test/performance.test.ts
@@ -2,13 +2,10 @@
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
+import type { TransactionEvent } from '@sentry/core';
import { act, render } from '@testing-library/svelte';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { getClient, getCurrentScope, getIsolationScope, init, startSpan } from '../src';
-
-import type { TransactionEvent } from '@sentry/core';
-
import DummyComponent from './components/Dummy.svelte';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/svelte/test/preprocessors.test.ts b/packages/svelte/test/preprocessors.test.ts
index b4d607e35a40..547f58b366ab 100644
--- a/packages/svelte/test/preprocessors.test.ts
+++ b/packages/svelte/test/preprocessors.test.ts
@@ -1,11 +1,9 @@
-import { describe, expect, it } from 'vitest';
-
import * as svelteCompiler from 'svelte/compiler';
-
+import { describe, expect, it } from 'vitest';
import {
- FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
componentTrackingPreprocessor,
defaultComponentTrackingOptions,
+ FIRST_PASS_COMPONENT_TRACKING_PREPROC_ID,
} from '../src/preprocessors';
import type { SentryPreprocessorGroup } from '../src/types';
diff --git a/packages/svelte/test/sdk.test.ts b/packages/svelte/test/sdk.test.ts
index 6cc2ac922d45..725d9bc66898 100644
--- a/packages/svelte/test/sdk.test.ts
+++ b/packages/svelte/test/sdk.test.ts
@@ -2,11 +2,9 @@
* @vitest-environment jsdom
*/
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { SDK_VERSION } from '@sentry/browser';
import * as SentryBrowser from '@sentry/browser';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { init as svelteInit } from '../src/sdk';
const browserInit = vi.spyOn(SentryBrowser, 'init');
diff --git a/packages/sveltekit/src/client/browserTracingIntegration.ts b/packages/sveltekit/src/client/browserTracingIntegration.ts
index 5e005ecb4507..a9ed0040be20 100644
--- a/packages/sveltekit/src/client/browserTracingIntegration.ts
+++ b/packages/sveltekit/src/client/browserTracingIntegration.ts
@@ -1,14 +1,14 @@
-import { navigating, page } from '$app/stores';
import type { Client, Integration, Span } from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import {
- WINDOW,
browserTracingIntegration as originalBrowserTracingIntegration,
getCurrentScope,
startBrowserTracingNavigationSpan,
startBrowserTracingPageLoadSpan,
startInactiveSpan,
+ WINDOW,
} from '@sentry/svelte';
+import { navigating, page } from '$app/stores';
/**
* A custom `BrowserTracing` integration for SvelteKit.
diff --git a/packages/sveltekit/src/client/load.ts b/packages/sveltekit/src/client/load.ts
index 185495ae412f..bf8cf7cb058e 100644
--- a/packages/sveltekit/src/client/load.ts
+++ b/packages/sveltekit/src/client/load.ts
@@ -1,13 +1,13 @@
import {
+ addNonEnumerableProperty,
+ handleCallbackErrors,
+ objectify,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- handleCallbackErrors,
startSpan,
} from '@sentry/core';
-import { addNonEnumerableProperty, objectify } from '@sentry/core';
import { captureException } from '@sentry/svelte';
import type { LoadEvent } from '@sveltejs/kit';
-
import type { SentryWrappedFlag } from '../common/utils';
import { isHttpError, isRedirect } from '../common/utils';
diff --git a/packages/sveltekit/src/client/sdk.ts b/packages/sveltekit/src/client/sdk.ts
index 35ef46118edc..5c3f482cb7d0 100644
--- a/packages/sveltekit/src/client/sdk.ts
+++ b/packages/sveltekit/src/client/sdk.ts
@@ -1,9 +1,7 @@
-import { applySdkMetadata } from '@sentry/core';
import type { Client, Integration } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
import type { BrowserOptions } from '@sentry/svelte';
-import { getDefaultIntegrations as getDefaultSvelteIntegrations } from '@sentry/svelte';
-import { WINDOW, init as initSvelteSdk } from '@sentry/svelte';
-
+import { getDefaultIntegrations as getDefaultSvelteIntegrations, init as initSvelteSdk, WINDOW } from '@sentry/svelte';
import { browserTracingIntegration as svelteKitBrowserTracingIntegration } from './browserTracingIntegration';
type WindowWithSentryFetchProxy = typeof WINDOW & {
diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts
index 161e7098de11..03c63041e726 100644
--- a/packages/sveltekit/src/index.types.ts
+++ b/packages/sveltekit/src/index.types.ts
@@ -1,6 +1,13 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part.
// Some of the exports collide, which is not allowed, unless we redefine the colliding
// exports in this file - which we do below.
+import type { Client, Integration, Options, StackParser } from '@sentry/core';
+import type { HandleClientError, HandleServerError } from '@sveltejs/kit';
+import type * as clientSdk from './client';
+import type * as serverSdk from './server';
+
export * from './client';
export * from './vite';
export * from './server';
@@ -11,12 +18,6 @@ export { sentryHandle } from './server';
// Use the ./worker version of some functions that are also exported from ./server
export { initCloudflareSentryHandle } from './worker';
-import type { Client, Integration, Options, StackParser } from '@sentry/core';
-import type { HandleClientError, HandleServerError } from '@sveltejs/kit';
-
-import type * as clientSdk from './client';
-import type * as serverSdk from './server';
-
/** Initializes Sentry SvelteKit SDK */
export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): Client | undefined;
diff --git a/packages/sveltekit/src/server-common/handle.ts b/packages/sveltekit/src/server-common/handle.ts
index 5f69feb9fbad..24ab005500de 100644
--- a/packages/sveltekit/src/server-common/handle.ts
+++ b/packages/sveltekit/src/server-common/handle.ts
@@ -1,20 +1,19 @@
import type { Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
continueTrace,
getCurrentScope,
getDefaultIsolationScope,
getIsolationScope,
getTraceMetaTags,
logger,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
setHttpStatus,
startSpan,
winterCGRequestToRequestData,
withIsolationScope,
} from '@sentry/core';
import type { Handle, ResolveOptions } from '@sveltejs/kit';
-
import { DEBUG_BUILD } from '../common/debug-build';
import { flushIfServerless, getTracePropagationData, sendErrorToSentry } from './utils';
diff --git a/packages/sveltekit/src/server-common/handleError.ts b/packages/sveltekit/src/server-common/handleError.ts
index 0f9782282e48..4e7a1f29ecd5 100644
--- a/packages/sveltekit/src/server-common/handleError.ts
+++ b/packages/sveltekit/src/server-common/handleError.ts
@@ -1,6 +1,5 @@
import { captureException, consoleSandbox } from '@sentry/core';
import type { HandleServerError } from '@sveltejs/kit';
-
import { flushIfServerless } from '../server-common/utils';
// The SvelteKit default error handler just logs the error's stack trace to the console
diff --git a/packages/sveltekit/src/server-common/load.ts b/packages/sveltekit/src/server-common/load.ts
index 49160a65b4a5..ede0991d29c4 100644
--- a/packages/sveltekit/src/server-common/load.ts
+++ b/packages/sveltekit/src/server-common/load.ts
@@ -1,11 +1,10 @@
import {
+ addNonEnumerableProperty,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- addNonEnumerableProperty,
startSpan,
} from '@sentry/core';
import type { LoadEvent, ServerLoadEvent } from '@sveltejs/kit';
-
import type { SentryWrappedFlag } from '../common/utils';
import { flushIfServerless, sendErrorToSentry } from './utils';
diff --git a/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts b/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts
index d5928f8974b0..412dd6f98815 100644
--- a/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts
+++ b/packages/sveltekit/src/server-common/rewriteFramesIntegration.ts
@@ -1,9 +1,9 @@
import type { IntegrationFn, StackFrame } from '@sentry/core';
import {
- GLOBAL_OBJ,
basename,
defineIntegration,
escapeStringForRegex,
+ GLOBAL_OBJ,
join,
rewriteFramesIntegration as originalRewriteFramesIntegration,
} from '@sentry/core';
diff --git a/packages/sveltekit/src/server-common/serverRoute.ts b/packages/sveltekit/src/server-common/serverRoute.ts
index 1b2169c58b8c..72607318ecb3 100644
--- a/packages/sveltekit/src/server-common/serverRoute.ts
+++ b/packages/sveltekit/src/server-common/serverRoute.ts
@@ -1,7 +1,7 @@
import {
+ addNonEnumerableProperty,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
- addNonEnumerableProperty,
startSpan,
} from '@sentry/core';
import type { RequestEvent } from '@sveltejs/kit';
diff --git a/packages/sveltekit/src/server-common/utils.ts b/packages/sveltekit/src/server-common/utils.ts
index d79a88030ca9..6f83615541f8 100644
--- a/packages/sveltekit/src/server-common/utils.ts
+++ b/packages/sveltekit/src/server-common/utils.ts
@@ -1,6 +1,5 @@
import { captureException, flush, logger, objectify } from '@sentry/core';
import type { RequestEvent } from '@sveltejs/kit';
-
import { DEBUG_BUILD } from '../common/debug-build';
import { isHttpError, isRedirect } from '../common/utils';
diff --git a/packages/sveltekit/src/server/sdk.ts b/packages/sveltekit/src/server/sdk.ts
index 66362e96a729..19a0a8f9f5ad 100644
--- a/packages/sveltekit/src/server/sdk.ts
+++ b/packages/sveltekit/src/server/sdk.ts
@@ -1,8 +1,6 @@
import { applySdkMetadata } from '@sentry/core';
import type { NodeClient, NodeOptions } from '@sentry/node';
-import { getDefaultIntegrations as getDefaultNodeIntegrations } from '@sentry/node';
-import { init as initNodeSdk } from '@sentry/node';
-
+import { getDefaultIntegrations as getDefaultNodeIntegrations, init as initNodeSdk } from '@sentry/node';
import { rewriteFramesIntegration } from '../server-common/rewriteFramesIntegration';
/**
diff --git a/packages/sveltekit/src/vite/autoInstrument.ts b/packages/sveltekit/src/vite/autoInstrument.ts
index 48e72db9ba0a..63f4888257de 100644
--- a/packages/sveltekit/src/vite/autoInstrument.ts
+++ b/packages/sveltekit/src/vite/autoInstrument.ts
@@ -1,10 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import * as recast from 'recast';
-import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';
+import t = recast.types.namedTypes;
export type AutoInstrumentSelection = {
/**
diff --git a/packages/sveltekit/src/vite/detectAdapter.ts b/packages/sveltekit/src/vite/detectAdapter.ts
index 85b794575c93..f2b061fbbf84 100644
--- a/packages/sveltekit/src/vite/detectAdapter.ts
+++ b/packages/sveltekit/src/vite/detectAdapter.ts
@@ -1,6 +1,6 @@
+import type { Package } from '@sentry/core';
import * as fs from 'fs';
import * as path from 'path';
-import type { Package } from '@sentry/core';
/**
* Supported @sveltejs/adapters-[adapter] SvelteKit adapters
diff --git a/packages/sveltekit/src/vite/sourceMaps.ts b/packages/sveltekit/src/vite/sourceMaps.ts
index 69fa4f1b2121..721587371425 100644
--- a/packages/sveltekit/src/vite/sourceMaps.ts
+++ b/packages/sveltekit/src/vite/sourceMaps.ts
@@ -1,17 +1,16 @@
/* eslint-disable max-lines */
-import * as child_process from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
import { consoleSandbox, escapeStringForRegex, uuid4 } from '@sentry/core';
import { getSentryRelease } from '@sentry/node';
import type { SentryVitePluginOptions } from '@sentry/vite-plugin';
import { sentryVitePlugin } from '@sentry/vite-plugin';
-import type { Plugin, UserConfig } from 'vite';
-
+import * as child_process from 'child_process';
+import * as fs from 'fs';
import MagicString from 'magic-string';
+import * as path from 'path';
+import type { Plugin, UserConfig } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import type { GlobalSentryValues } from './injectGlobalValues';
-import { VIRTUAL_GLOBAL_VALUES_FILE, getGlobalValueInjectionCode } from './injectGlobalValues';
+import { getGlobalValueInjectionCode, VIRTUAL_GLOBAL_VALUES_FILE } from './injectGlobalValues';
import { getAdapterOutputDir, getHooksFileName, loadSvelteConfig } from './svelteConfig';
import type { CustomSentryVitePluginOptions } from './types';
diff --git a/packages/sveltekit/src/vite/svelteConfig.ts b/packages/sveltekit/src/vite/svelteConfig.ts
index 274da0e5215d..5e88a310726e 100644
--- a/packages/sveltekit/src/vite/svelteConfig.ts
+++ b/packages/sveltekit/src/vite/svelteConfig.ts
@@ -1,8 +1,7 @@
+import type { Builder, Config } from '@sveltejs/kit';
import * as fs from 'fs';
import * as path from 'path';
import * as url from 'url';
-import type { Builder, Config } from '@sveltejs/kit';
-
import type { SupportedSvelteKitAdapters } from './detectAdapter';
/**
diff --git a/packages/sveltekit/src/worker/cloudflare.ts b/packages/sveltekit/src/worker/cloudflare.ts
index 618c6503af36..9508c331369e 100644
--- a/packages/sveltekit/src/worker/cloudflare.ts
+++ b/packages/sveltekit/src/worker/cloudflare.ts
@@ -1,12 +1,11 @@
import {
type CloudflareOptions,
- wrapRequestHandler,
+ getDefaultIntegrations as getDefaultCloudflareIntegrations,
setAsyncLocalStorageAsyncContextStrategy,
+ wrapRequestHandler,
} from '@sentry/cloudflare';
-import { getDefaultIntegrations as getDefaultCloudflareIntegrations } from '@sentry/cloudflare';
-import type { Handle } from '@sveltejs/kit';
-
import { addNonEnumerableProperty } from '@sentry/core';
+import type { Handle } from '@sveltejs/kit';
import { rewriteFramesIntegration } from '../server-common/rewriteFramesIntegration';
/**
diff --git a/packages/sveltekit/test/client/browserTracingIntegration.test.ts b/packages/sveltekit/test/client/browserTracingIntegration.test.ts
index a70b46abbcbb..7546bbb5f789 100644
--- a/packages/sveltekit/test/client/browserTracingIntegration.test.ts
+++ b/packages/sveltekit/test/client/browserTracingIntegration.test.ts
@@ -3,18 +3,14 @@
*/
/* eslint-disable @typescript-eslint/unbound-method */
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import type { Span } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import * as SentrySvelte from '@sentry/svelte';
import { writable } from 'svelte/store';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { navigating, page } from '$app/stores';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import { browserTracingIntegration } from '../../src/client';
-import * as SentrySvelte from '@sentry/svelte';
-
// we have to overwrite the global mock from `vitest.setup.ts` here to reset the
// `navigating` store for each test.
vi.mock('$app/stores', async () => {
diff --git a/packages/sveltekit/test/client/fetch.test.ts b/packages/sveltekit/test/client/fetch.test.ts
index b2020fdb0c9e..2819fbbbdeb1 100644
--- a/packages/sveltekit/test/client/fetch.test.ts
+++ b/packages/sveltekit/test/client/fetch.test.ts
@@ -3,7 +3,6 @@
*/
import { beforeEach, describe, expect, it } from 'vitest';
-
import { init } from '../../src/client/index';
describe('instruments fetch', () => {
diff --git a/packages/sveltekit/test/client/handleError.test.ts b/packages/sveltekit/test/client/handleError.test.ts
index 077872db90ab..520f98fec56d 100644
--- a/packages/sveltekit/test/client/handleError.test.ts
+++ b/packages/sveltekit/test/client/handleError.test.ts
@@ -1,8 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import * as SentrySvelte from '@sentry/svelte';
import type { HandleClientError, NavigationEvent } from '@sveltejs/kit';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { handleErrorWithSentry } from '../../src/client/handleError';
const mockCaptureException = vi.spyOn(SentrySvelte, 'captureException').mockImplementation(() => 'xx');
diff --git a/packages/sveltekit/test/client/load.test.ts b/packages/sveltekit/test/client/load.test.ts
index 81454bc62d60..465167265d49 100644
--- a/packages/sveltekit/test/client/load.test.ts
+++ b/packages/sveltekit/test/client/load.test.ts
@@ -1,10 +1,8 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
import * as SentrySvelte from '@sentry/svelte';
import type { Load } from '@sveltejs/kit';
import { redirect } from '@sveltejs/kit';
-
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { wrapLoadWithSentry } from '../../src/client/load';
const mockCaptureException = vi.spyOn(SentrySvelte, 'captureException').mockImplementation(() => 'xx');
diff --git a/packages/sveltekit/test/client/sdk.test.ts b/packages/sveltekit/test/client/sdk.test.ts
index d0d563c44a4b..1bbd2e2bc81f 100644
--- a/packages/sveltekit/test/client/sdk.test.ts
+++ b/packages/sveltekit/test/client/sdk.test.ts
@@ -1,9 +1,7 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
import type { BrowserClient } from '@sentry/svelte';
import * as SentrySvelte from '@sentry/svelte';
-import { SDK_VERSION, getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/svelte';
-
+import { getClient, getCurrentScope, getGlobalScope, getIsolationScope, SDK_VERSION } from '@sentry/svelte';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../../src/client';
const svelteInit = vi.spyOn(SentrySvelte, 'init');
diff --git a/packages/sveltekit/test/common/utils.test.ts b/packages/sveltekit/test/common/utils.test.ts
index 32181a746e07..f56bd845ec86 100644
--- a/packages/sveltekit/test/common/utils.test.ts
+++ b/packages/sveltekit/test/common/utils.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { isHttpError, isRedirect } from '../../src/common/utils';
describe('isRedirect', () => {
diff --git a/packages/sveltekit/test/index.test.ts b/packages/sveltekit/test/index.test.ts
index c70524327d31..81d0a857eb0b 100644
--- a/packages/sveltekit/test/index.test.ts
+++ b/packages/sveltekit/test/index.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import * as SentryClient from '../src/client';
import * as SentryServer from '../src/server';
diff --git a/packages/sveltekit/test/server-common/handle.test.ts b/packages/sveltekit/test/server-common/handle.test.ts
index 9c6e2b71d330..98c483996f11 100644
--- a/packages/sveltekit/test/server-common/handle.test.ts
+++ b/packages/sveltekit/test/server-common/handle.test.ts
@@ -1,21 +1,22 @@
-import { beforeEach, describe, expect, it } from 'vitest';
-
+import type { EventEnvelopeHeaders, Span } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getRootSpan,
getSpanDescendants,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanIsSampled,
spanToJSON,
} from '@sentry/core';
-import type { EventEnvelopeHeaders, Span } from '@sentry/core';
import * as SentryCore from '@sentry/core';
import { NodeClient, setCurrentClient } from '@sentry/node';
import type { Handle } from '@sveltejs/kit';
import { redirect } from '@sveltejs/kit';
-import { vi } from 'vitest';
-
-import { FETCH_PROXY_SCRIPT, addSentryCodeToPage, isFetchProxyRequired } from '../../src/server-common/handle';
-import { sentryHandle } from '../../src/server-common/handle';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+ addSentryCodeToPage,
+ FETCH_PROXY_SCRIPT,
+ isFetchProxyRequired,
+ sentryHandle,
+} from '../../src/server-common/handle';
import { getDefaultNodeClientOptions } from '../utils';
const mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockImplementation(() => 'xx');
diff --git a/packages/sveltekit/test/server-common/handleError.test.ts b/packages/sveltekit/test/server-common/handleError.test.ts
index d8c36733211d..b24c1c78b747 100644
--- a/packages/sveltekit/test/server-common/handleError.test.ts
+++ b/packages/sveltekit/test/server-common/handleError.test.ts
@@ -1,8 +1,6 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import * as SentryCore from '@sentry/core';
import type { HandleServerError, RequestEvent } from '@sveltejs/kit';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { handleErrorWithSentry } from '../../src/server-common/handleError';
const mockCaptureException = vi.spyOn(SentryCore, 'captureException').mockImplementation(() => 'xx');
diff --git a/packages/sveltekit/test/server-common/load.test.ts b/packages/sveltekit/test/server-common/load.test.ts
index 8530208347a4..c3200d9a7927 100644
--- a/packages/sveltekit/test/server-common/load.test.ts
+++ b/packages/sveltekit/test/server-common/load.test.ts
@@ -1,16 +1,14 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
+import type { Event } from '@sentry/core';
import {
SEMANTIC_ATTRIBUTE_SENTRY_OP,
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
} from '@sentry/core';
-import type { Event } from '@sentry/core';
import * as SentryCore from '@sentry/core';
-import { NodeClient, getCurrentScope, getIsolationScope, setCurrentClient } from '@sentry/node';
+import { getCurrentScope, getIsolationScope, NodeClient, setCurrentClient } from '@sentry/node';
import type { Load, ServerLoad } from '@sveltejs/kit';
import { error, redirect } from '@sveltejs/kit';
-
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { wrapLoadWithSentry, wrapServerLoadWithSentry } from '../../src/server-common/load';
import { getDefaultNodeClientOptions } from '../utils';
diff --git a/packages/sveltekit/test/server-common/rewriteFramesIntegration.test.ts b/packages/sveltekit/test/server-common/rewriteFramesIntegration.test.ts
index dafae17c318e..20f9c52a8e27 100644
--- a/packages/sveltekit/test/server-common/rewriteFramesIntegration.test.ts
+++ b/packages/sveltekit/test/server-common/rewriteFramesIntegration.test.ts
@@ -1,8 +1,7 @@
import { rewriteFramesIntegration } from '@sentry/browser';
-import { basename } from '@sentry/core';
import type { Event, StackFrame } from '@sentry/core';
+import { basename } from '@sentry/core';
import { describe, expect, it } from 'vitest';
-
import { rewriteFramesIteratee } from '../../src/server-common/rewriteFramesIntegration';
import type { GlobalWithSentryValues } from '../../src/vite/injectGlobalValues';
diff --git a/packages/sveltekit/test/server-common/sdk.test.ts b/packages/sveltekit/test/server-common/sdk.test.ts
index 4c6c9917c572..714828304d35 100644
--- a/packages/sveltekit/test/server-common/sdk.test.ts
+++ b/packages/sveltekit/test/server-common/sdk.test.ts
@@ -1,9 +1,7 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
-import * as SentryNode from '@sentry/node';
import type { NodeClient } from '@sentry/node';
-import { SDK_VERSION, getClient } from '@sentry/node';
-
+import * as SentryNode from '@sentry/node';
+import { getClient, SDK_VERSION } from '@sentry/node';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { init } from '../../src/server/sdk';
const nodeInit = vi.spyOn(SentryNode, 'init');
diff --git a/packages/sveltekit/test/server-common/utils.test.ts b/packages/sveltekit/test/server-common/utils.test.ts
index 53e588d683ec..df0858ed4654 100644
--- a/packages/sveltekit/test/server-common/utils.test.ts
+++ b/packages/sveltekit/test/server-common/utils.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { getTracePropagationData } from '../../src/server-common/utils';
const MOCK_REQUEST_EVENT: any = {
diff --git a/packages/sveltekit/test/server/handle.test.ts b/packages/sveltekit/test/server/handle.test.ts
index f29a9d840bc3..8b53196bb14e 100644
--- a/packages/sveltekit/test/server/handle.test.ts
+++ b/packages/sveltekit/test/server/handle.test.ts
@@ -1,8 +1,6 @@
-import { describe, expect, it, vi } from 'vitest';
-
-import { sentryHandle, initCloudflareSentryHandle } from '../../src/server';
-
import * as NodeSDK from '@sentry/node';
+import { describe, expect, it, vi } from 'vitest';
+import { initCloudflareSentryHandle, sentryHandle } from '../../src/server';
describe('Node handle hooks', () => {
// dumb test to ensure we continue exporting the request handlers
diff --git a/packages/sveltekit/test/utils.ts b/packages/sveltekit/test/utils.ts
index ec15e0d24c03..8b420d8bab5c 100644
--- a/packages/sveltekit/test/utils.ts
+++ b/packages/sveltekit/test/utils.ts
@@ -1,6 +1,5 @@
-import { createTransport } from '@sentry/core';
-import { resolvedSyncPromise } from '@sentry/core';
import type { ClientOptions } from '@sentry/core';
+import { createTransport, resolvedSyncPromise } from '@sentry/core';
export function getDefaultNodeClientOptions(options: Partial = {}): ClientOptions {
return {
diff --git a/packages/sveltekit/test/vite/autoInstrument.test.ts b/packages/sveltekit/test/vite/autoInstrument.test.ts
index 6451c603d47e..364680e31bf3 100644
--- a/packages/sveltekit/test/vite/autoInstrument.test.ts
+++ b/packages/sveltekit/test/vite/autoInstrument.test.ts
@@ -1,5 +1,4 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import { canWrapLoad, makeAutoInstrumentationPlugin } from '../../src/vite/autoInstrument';
const DEFAULT_CONTENT = `
diff --git a/packages/sveltekit/test/vite/detectAdapter.test.ts b/packages/sveltekit/test/vite/detectAdapter.test.ts
index 52364e3012e4..a1fc8aab2591 100644
--- a/packages/sveltekit/test/vite/detectAdapter.test.ts
+++ b/packages/sveltekit/test/vite/detectAdapter.test.ts
@@ -1,5 +1,4 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import { detectAdapter } from '../../src/vite/detectAdapter';
let existsFile = true;
diff --git a/packages/sveltekit/test/vite/injectGlobalValues.test.ts b/packages/sveltekit/test/vite/injectGlobalValues.test.ts
index 67003f73aedc..3e07bf7e26a7 100644
--- a/packages/sveltekit/test/vite/injectGlobalValues.test.ts
+++ b/packages/sveltekit/test/vite/injectGlobalValues.test.ts
@@ -1,5 +1,4 @@
import { describe, expect, it } from 'vitest';
-
import { getGlobalValueInjectionCode } from '../../src/vite/injectGlobalValues';
describe('getGlobalValueInjectionCode', () => {
diff --git a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
index 14977f6978d1..36c79afffb06 100644
--- a/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
+++ b/packages/sveltekit/test/vite/sentrySvelteKitPlugins.test.ts
@@ -1,6 +1,5 @@
-import { describe, expect, it, vi } from 'vitest';
-
import type { Plugin } from 'vite';
+import { describe, expect, it, vi } from 'vitest';
import * as autoInstrument from '../../src/vite/autoInstrument';
import { generateVitePluginOptions, sentrySvelteKit } from '../../src/vite/sentryVitePlugins';
import * as sourceMaps from '../../src/vite/sourceMaps';
diff --git a/packages/sveltekit/test/vite/sourceMaps.test.ts b/packages/sveltekit/test/vite/sourceMaps.test.ts
index 1410e9b992f0..b85d4e4db2cb 100644
--- a/packages/sveltekit/test/vite/sourceMaps.test.ts
+++ b/packages/sveltekit/test/vite/sourceMaps.test.ts
@@ -1,9 +1,7 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { getUpdatedSourceMapSetting, makeCustomSentryVitePlugins } from '../../src/vite/sourceMaps';
-
import type { Plugin } from 'vite';
-
import * as vite from 'vite';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getUpdatedSourceMapSetting, makeCustomSentryVitePlugins } from '../../src/vite/sourceMaps';
const mockedViteDebugIdUploadPlugin = {
name: 'sentry-vite-debug-id-upload-plugin',
diff --git a/packages/sveltekit/test/vite/svelteConfig.test.ts b/packages/sveltekit/test/vite/svelteConfig.test.ts
index a567407b6623..d2b62e2e0def 100644
--- a/packages/sveltekit/test/vite/svelteConfig.test.ts
+++ b/packages/sveltekit/test/vite/svelteConfig.test.ts
@@ -1,5 +1,4 @@
import { beforeEach, describe, expect, it, vi } from 'vitest';
-
import type { SupportedSvelteKitAdapters } from '../../src/vite/detectAdapter';
import { getAdapterOutputDir, getHooksFileName, loadSvelteConfig } from '../../src/vite/svelteConfig';
diff --git a/packages/sveltekit/test/worker/cloudflare.test.ts b/packages/sveltekit/test/worker/cloudflare.test.ts
index c36356cabb5c..1ad0e8795a86 100644
--- a/packages/sveltekit/test/worker/cloudflare.test.ts
+++ b/packages/sveltekit/test/worker/cloudflare.test.ts
@@ -1,9 +1,8 @@
-import { describe, expect, it, vi } from 'vitest';
-import { initCloudflareSentryHandle } from '../../src/worker';
-
-import * as SentryCloudflare from '@sentry/cloudflare';
import { beforeEach } from 'node:test';
+import * as SentryCloudflare from '@sentry/cloudflare';
import type { Carrier, GLOBAL_OBJ } from '@sentry/core';
+import { describe, expect, it, vi } from 'vitest';
+import { initCloudflareSentryHandle } from '../../src/worker';
const globalWithSentry = globalThis as typeof GLOBAL_OBJ & Carrier;
diff --git a/packages/sveltekit/vite.config.ts b/packages/sveltekit/vite.config.ts
index 4f8ead0177f9..2b4e927808e7 100644
--- a/packages/sveltekit/vite.config.ts
+++ b/packages/sveltekit/vite.config.ts
@@ -1,6 +1,5 @@
import { dirname, resolve } from 'path';
import { fileURLToPath } from 'url';
-
import baseConfig from '../../vite/vite.config';
export default {
diff --git a/packages/tanstackstart-react/src/index.client.ts b/packages/tanstackstart-react/src/index.client.ts
index 478066d2ce1e..481d8d7cd384 100644
--- a/packages/tanstackstart-react/src/index.client.ts
+++ b/packages/tanstackstart-react/src/index.client.ts
@@ -1,2 +1,6 @@
+/* eslint-disable import/export */
+
+// TODO: For now these are empty re-exports, but we may add actual implementations here
+// so we keep this to be future proof
export * from './client';
export * from './common';
diff --git a/packages/tanstackstart-react/src/index.types.ts b/packages/tanstackstart-react/src/index.types.ts
index 0e3bbca37bf9..85bbe9df63fd 100644
--- a/packages/tanstackstart-react/src/index.types.ts
+++ b/packages/tanstackstart-react/src/index.types.ts
@@ -1,15 +1,16 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
// which is not allowed, unless we redefine the colliding exports in this file - which we do below.
+import type { Client, Integration, Options, StackParser } from '@sentry/core';
+import type * as clientSdk from './client';
+import type * as serverSdk from './server';
+
export * from './config';
export * from './client';
export * from './server';
export * from './common';
-import type { Client, Integration, Options, StackParser } from '@sentry/core';
-
-import type * as clientSdk from './client';
-import type * as serverSdk from './server';
-
/** Initializes Sentry TanStack Start SDK */
export declare function init(options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions): Client | undefined;
diff --git a/packages/tanstackstart-react/test/temp.test.ts b/packages/tanstackstart-react/test/temp.test.ts
index 28874b0d1c84..dc8614cad037 100644
--- a/packages/tanstackstart-react/test/temp.test.ts
+++ b/packages/tanstackstart-react/test/temp.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
describe('Basic test suite', () => {
it('should pass', () => {
diff --git a/packages/tanstackstart/src/index.client.ts b/packages/tanstackstart/src/index.client.ts
index 478066d2ce1e..481d8d7cd384 100644
--- a/packages/tanstackstart/src/index.client.ts
+++ b/packages/tanstackstart/src/index.client.ts
@@ -1,2 +1,6 @@
+/* eslint-disable import/export */
+
+// TODO: For now these are empty re-exports, but we may add actual implementations here
+// so we keep this to be future proof
export * from './client';
export * from './common';
diff --git a/packages/tanstackstart/src/index.server.ts b/packages/tanstackstart/src/index.server.ts
index 3295df71604b..a3606fe34592 100644
--- a/packages/tanstackstart/src/index.server.ts
+++ b/packages/tanstackstart/src/index.server.ts
@@ -1,3 +1,7 @@
+/* eslint-disable import/export */
+
+// TODO: For now these are empty re-exports, but we may add actual implementations here
+// so we keep this to be future proof
export * from './config';
export * from './server';
export * from './common';
diff --git a/packages/tanstackstart/src/index.types.ts b/packages/tanstackstart/src/index.types.ts
index 13fa9080e92a..730fac2ff284 100644
--- a/packages/tanstackstart/src/index.types.ts
+++ b/packages/tanstackstart/src/index.types.ts
@@ -1,3 +1,5 @@
+/* eslint-disable import/export */
+
// We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
// which is not allowed, unless we redefine the colliding exports in this file - which we do below.
export * from './config';
diff --git a/packages/tanstackstart/test/temp.test.ts b/packages/tanstackstart/test/temp.test.ts
index 28874b0d1c84..dc8614cad037 100644
--- a/packages/tanstackstart/test/temp.test.ts
+++ b/packages/tanstackstart/test/temp.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
describe('Basic test suite', () => {
it('should pass', () => {
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 91950b2c8b38..e4a2f5935439 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -73,13 +73,13 @@ import type {
HandlerDataUnhandledRejection as HandlerDataUnhandledRejection_imported,
HandlerDataXhr as HandlerDataXhr_imported,
HttpHeaderValue as HttpHeaderValue_imported,
- InProgressCheckIn as InProgressCheckIn_imported,
InformationUnit as InformationUnit_imported,
+ InProgressCheckIn as InProgressCheckIn_imported,
Integration as Integration_imported,
IntegrationFn as IntegrationFn_imported,
InternalBaseTransportOptions as InternalBaseTransportOptions_imported,
- MeasurementUnit as MeasurementUnit_imported,
Measurements as Measurements_imported,
+ MeasurementUnit as MeasurementUnit_imported,
Mechanism as Mechanism_imported,
MissingInstrumentationContext as MissingInstrumentationContext_imported,
MonitorConfig as MonitorConfig_imported,
@@ -130,8 +130,8 @@ import type {
SessionStatus as SessionStatus_imported,
SeverityLevel as SeverityLevel_imported,
Span as Span_imported,
- SpanAttributeValue as SpanAttributeValue_imported,
SpanAttributes as SpanAttributes_imported,
+ SpanAttributeValue as SpanAttributeValue_imported,
SpanContextData as SpanContextData_imported,
SpanEnvelope as SpanEnvelope_imported,
SpanItem as SpanItem_imported,
@@ -155,8 +155,8 @@ import type {
TimedEvent as TimedEvent_imported,
TraceContext as TraceContext_imported,
TraceFlag as TraceFlag_imported,
- TracePropagationTargets as TracePropagationTargets_imported,
TraceparentData as TraceparentData_imported,
+ TracePropagationTargets as TracePropagationTargets_imported,
TransactionEvent as TransactionEvent_imported,
TransactionSource as TransactionSource_imported,
Transport as Transport_imported,
diff --git a/packages/vercel-edge/src/client.ts b/packages/vercel-edge/src/client.ts
index 09987eacd030..bdf8512be933 100644
--- a/packages/vercel-edge/src/client.ts
+++ b/packages/vercel-edge/src/client.ts
@@ -1,8 +1,6 @@
-import type { ServerRuntimeClientOptions } from '@sentry/core';
-import { applySdkMetadata } from '@sentry/core';
-import { ServerRuntimeClient } from '@sentry/core';
-
import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import type { ServerRuntimeClientOptions } from '@sentry/core';
+import { applySdkMetadata, ServerRuntimeClient } from '@sentry/core';
import type { VercelEdgeClientOptions } from './types';
declare const process: {
diff --git a/packages/vercel-edge/src/integrations/wintercg-fetch.ts b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
index 0940afecb6f2..e200caef8e44 100644
--- a/packages/vercel-edge/src/integrations/wintercg-fetch.ts
+++ b/packages/vercel-edge/src/integrations/wintercg-fetch.ts
@@ -7,7 +7,6 @@ import type {
Span,
} from '@sentry/core';
import {
- LRUMap,
addBreadcrumb,
addFetchInstrumentationHandler,
defineIntegration,
@@ -15,6 +14,7 @@ import {
getClient,
instrumentFetchRequest,
isSentryRequestUrl,
+ LRUMap,
stringMatchesSomePattern,
} from '@sentry/core';
diff --git a/packages/vercel-edge/src/sdk.ts b/packages/vercel-edge/src/sdk.ts
index 1a09b16496a9..0ade5d42e635 100644
--- a/packages/vercel-edge/src/sdk.ts
+++ b/packages/vercel-edge/src/sdk.ts
@@ -1,4 +1,4 @@
-import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
+import { context, diag, DiagLogLevel, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
@@ -8,28 +8,28 @@ import {
} from '@opentelemetry/semantic-conventions';
import type { Client, Integration, Options } from '@sentry/core';
import {
- GLOBAL_OBJ,
- SDK_VERSION,
+ consoleIntegration,
createStackParser,
dedupeIntegration,
functionToStringIntegration,
getCurrentScope,
getIntegrationsToSetup,
+ GLOBAL_OBJ,
hasSpansEnabled,
inboundFiltersIntegration,
linkedErrorsIntegration,
logger,
nodeStackLineParser,
requestDataIntegration,
+ SDK_VERSION,
stackParserFromStackParserOptions,
- consoleIntegration,
} from '@sentry/core';
import {
+ enhanceDscWithOpenTelemetryRootSpanName,
+ openTelemetrySetupCheck,
SentryPropagator,
SentrySampler,
SentrySpanProcessor,
- enhanceDscWithOpenTelemetryRootSpanName,
- openTelemetrySetupCheck,
setOpenTelemetryContextAsyncContextStrategy,
setupEventContextTrace,
wrapContextManagerClass,
diff --git a/packages/vercel-edge/src/transports/index.ts b/packages/vercel-edge/src/transports/index.ts
index e1ce24c501c7..bb8ea807764c 100644
--- a/packages/vercel-edge/src/transports/index.ts
+++ b/packages/vercel-edge/src/transports/index.ts
@@ -1,5 +1,5 @@
import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
-import { SENTRY_BUFFER_FULL_ERROR, createTransport, suppressTracing } from '@sentry/core';
+import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';
export interface VercelEdgeTransportOptions extends BaseTransportOptions {
/** Fetch API init parameters. */
diff --git a/packages/vercel-edge/src/types.ts b/packages/vercel-edge/src/types.ts
index 2128f23b35a8..b0cceb755636 100644
--- a/packages/vercel-edge/src/types.ts
+++ b/packages/vercel-edge/src/types.ts
@@ -1,5 +1,4 @@
import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
-
import type { VercelEdgeClient } from './client';
import type { VercelEdgeTransportOptions } from './transports';
diff --git a/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts b/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
index 883e9e43cf54..72373afdebdf 100644
--- a/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
+++ b/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
@@ -31,8 +31,8 @@
/* eslint-disable @typescript-eslint/unbound-method */
/* eslint-disable @typescript-eslint/no-this-alias */
-import type { EventEmitter } from 'events';
import type { Context, ContextManager } from '@opentelemetry/api';
+import type { EventEmitter } from 'events';
type Func = (...args: unknown[]) => T;
diff --git a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
index 8d8a1e6dd171..a6a5328565f5 100644
--- a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
+++ b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
@@ -27,7 +27,6 @@
import type { Context } from '@opentelemetry/api';
import { ROOT_CONTEXT } from '@opentelemetry/api';
-
import { GLOBAL_OBJ, logger } from '@sentry/core';
import type { AsyncLocalStorage } from 'async_hooks';
import { DEBUG_BUILD } from '../debug-build';
diff --git a/packages/vercel-edge/test/async.test.ts b/packages/vercel-edge/test/async.test.ts
index 82affdc49639..2112a6b5b2e3 100644
--- a/packages/vercel-edge/test/async.test.ts
+++ b/packages/vercel-edge/test/async.test.ts
@@ -1,5 +1,12 @@
-import { Scope, getCurrentScope, getGlobalScope, getIsolationScope, withIsolationScope, withScope } from '@sentry/core';
-import { GLOBAL_OBJ } from '@sentry/core';
+import {
+ getCurrentScope,
+ getGlobalScope,
+ getIsolationScope,
+ GLOBAL_OBJ,
+ Scope,
+ withIsolationScope,
+ withScope,
+} from '@sentry/core';
import { setOpenTelemetryContextAsyncContextStrategy } from '@sentry/opentelemetry';
import { AsyncLocalStorage } from 'async_hooks';
import { beforeAll, beforeEach, describe, expect, it } from 'vitest';
diff --git a/packages/vercel-edge/test/transports/index.test.ts b/packages/vercel-edge/test/transports/index.test.ts
index a7e6bd342fb5..669420d0b8f9 100644
--- a/packages/vercel-edge/test/transports/index.test.ts
+++ b/packages/vercel-edge/test/transports/index.test.ts
@@ -1,8 +1,6 @@
-import { afterAll, describe, expect, it, vi } from 'vitest';
-
-import { SENTRY_BUFFER_FULL_ERROR, createEnvelope, serializeEnvelope } from '@sentry/core';
import type { EventEnvelope, EventItem } from '@sentry/core';
-
+import { createEnvelope, SENTRY_BUFFER_FULL_ERROR, serializeEnvelope } from '@sentry/core';
+import { afterAll, describe, expect, it, vi } from 'vitest';
import type { VercelEdgeTransportOptions } from '../../src/transports';
import { IsolatedPromiseBuffer, makeEdgeTransport } from '../../src/transports';
diff --git a/packages/vercel-edge/test/wintercg-fetch.test.ts b/packages/vercel-edge/test/wintercg-fetch.test.ts
index b695f84415f6..c1605568de2e 100644
--- a/packages/vercel-edge/test/wintercg-fetch.test.ts
+++ b/packages/vercel-edge/test/wintercg-fetch.test.ts
@@ -1,10 +1,8 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
+import type { HandlerDataFetch, Integration } from '@sentry/core';
import * as sentryCore from '@sentry/core';
import * as sentryUtils from '@sentry/core';
import { createStackParser } from '@sentry/core';
-import type { HandlerDataFetch, Integration } from '@sentry/core';
-
+import { beforeEach, describe, expect, it, vi } from 'vitest';
import { VercelEdgeClient } from '../src/index';
import { winterCGFetchIntegration } from '../src/integrations/wintercg-fetch';
diff --git a/packages/vue/src/integration.ts b/packages/vue/src/integration.ts
index 63fc5a5786de..5b46cee4f633 100644
--- a/packages/vue/src/integration.ts
+++ b/packages/vue/src/integration.ts
@@ -1,4 +1,4 @@
-import { GLOBAL_OBJ, consoleSandbox, defineIntegration, hasSpansEnabled } from '@sentry/core';
+import { consoleSandbox, defineIntegration, GLOBAL_OBJ, hasSpansEnabled } from '@sentry/core';
import { DEFAULT_HOOKS } from './constants';
import { DEBUG_BUILD } from './debug-build';
import { attachErrorHandler } from './errorhandler';
diff --git a/packages/vue/src/router.ts b/packages/vue/src/router.ts
index 2c1bc457e6ea..0b588c7919d7 100644
--- a/packages/vue/src/router.ts
+++ b/packages/vue/src/router.ts
@@ -1,13 +1,13 @@
import { captureException } from '@sentry/browser';
+import type { Span, SpanAttributes, StartSpanOptions, TransactionSource } from '@sentry/core';
import {
- SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
- SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
getActiveSpan,
getCurrentScope,
getRootSpan,
+ SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+ SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
spanToJSON,
} from '@sentry/core';
-import type { Span, SpanAttributes, StartSpanOptions, TransactionSource } from '@sentry/core';
// The following type is an intersection of the Route type from VueRouter v2, v3, and v4.
// This is not great, but kinda necessary to make it work with all versions at the same time.
diff --git a/packages/vue/src/tracing.ts b/packages/vue/src/tracing.ts
index 65053bddc5c6..e4e2fdb70f4e 100644
--- a/packages/vue/src/tracing.ts
+++ b/packages/vue/src/tracing.ts
@@ -1,7 +1,6 @@
-import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, getActiveSpan, startInactiveSpan } from '@sentry/browser';
-import { logger, timestampInSeconds } from '@sentry/core';
+import { getActiveSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, startInactiveSpan } from '@sentry/browser';
import type { Span } from '@sentry/core';
-
+import { logger, timestampInSeconds } from '@sentry/core';
import { DEFAULT_HOOKS } from './constants';
import { DEBUG_BUILD } from './debug-build';
import type { Hook, Operation, TracingOptions, ViewModel, Vue } from './types';
diff --git a/packages/vue/test/errorHandler.test.ts b/packages/vue/test/errorHandler.test.ts
index 4f44fc4275d3..9e8e7572ba54 100644
--- a/packages/vue/test/errorHandler.test.ts
+++ b/packages/vue/test/errorHandler.test.ts
@@ -1,7 +1,5 @@
-import { afterEach, describe, expect, it, test, vi } from 'vitest';
-
import { setCurrentClient } from '@sentry/browser';
-
+import { afterEach, describe, expect, it, test, vi } from 'vitest';
import { attachErrorHandler } from '../src/errorhandler';
import type { Operation, Options, ViewModel, Vue } from '../src/types';
diff --git a/packages/vue/test/integration/VueIntegration.test.ts b/packages/vue/test/integration/VueIntegration.test.ts
index 964d358b2ec6..200ec42dfaf4 100644
--- a/packages/vue/test/integration/VueIntegration.test.ts
+++ b/packages/vue/test/integration/VueIntegration.test.ts
@@ -2,12 +2,10 @@
* @vitest-environment jsdom
*/
-import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { logger } from '@sentry/core';
import type { Client } from '@sentry/core';
+import { logger } from '@sentry/core';
+import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import { createApp } from 'vue';
-
import * as Sentry from '../../src';
const PUBLIC_DSN = 'https://username@domain/123';
diff --git a/packages/vue/test/integration/init.test.ts b/packages/vue/test/integration/init.test.ts
index 4b2e8fbea826..ea9342c8da9c 100644
--- a/packages/vue/test/integration/init.test.ts
+++ b/packages/vue/test/integration/init.test.ts
@@ -2,11 +2,9 @@
* @vitest-environment jsdom
*/
+import type { Client } from '@sentry/core';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
import { createApp } from 'vue';
-
-import type { Client } from '@sentry/core';
import type { Options } from '../../src/types';
import * as Sentry from './../../src';
diff --git a/packages/vue/test/router.test.ts b/packages/vue/test/router.test.ts
index e21f7cc52e3f..8cb789fc9d27 100644
--- a/packages/vue/test/router.test.ts
+++ b/packages/vue/test/router.test.ts
@@ -1,10 +1,8 @@
-import { afterEach, describe, expect, it, vi } from 'vitest';
-
import * as SentryBrowser from '@sentry/browser';
+import type { Span, SpanAttributes } from '@sentry/core';
import * as SentryCore from '@sentry/core';
import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import type { Span, SpanAttributes } from '@sentry/core';
-
+import { afterEach, describe, expect, it, vi } from 'vitest';
import type { Route } from '../src/router';
import { instrumentVueRouter } from '../src/router';
diff --git a/packages/vue/test/vendor/components.test.ts b/packages/vue/test/vendor/components.test.ts
index 5a210a0a2fb5..a35e49fbb4e8 100644
--- a/packages/vue/test/vendor/components.test.ts
+++ b/packages/vue/test/vendor/components.test.ts
@@ -1,5 +1,4 @@
import { beforeEach, describe, expect, it } from 'vitest';
-
import { formatComponentName } from '../../src/vendor/components';
describe('formatComponentName', () => {
diff --git a/packages/wasm/src/index.ts b/packages/wasm/src/index.ts
index b7ed1bf0860b..5aa3888f1e4c 100644
--- a/packages/wasm/src/index.ts
+++ b/packages/wasm/src/index.ts
@@ -1,6 +1,5 @@
-import { defineIntegration } from '@sentry/core';
import type { Event, IntegrationFn, StackFrame } from '@sentry/core';
-
+import { defineIntegration } from '@sentry/core';
import { patchWebAssembly } from './patchWebAssembly';
import { getImage, getImages } from './registry';
diff --git a/packages/wasm/test/stacktrace-parsing.test.ts b/packages/wasm/test/stacktrace-parsing.test.ts
index 14f0d6965825..f1f03c247fa8 100644
--- a/packages/wasm/test/stacktrace-parsing.test.ts
+++ b/packages/wasm/test/stacktrace-parsing.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
import { patchFrames } from '../src/index';
describe('patchFrames()', () => {
diff --git a/yarn.lock b/yarn.lock
index 1dc296fdb9c5..20454807390f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15059,10 +15059,10 @@ eslint-plugin-react@^7.20.5, eslint-plugin-react@^7.31.11:
semver "^6.3.0"
string.prototype.matchall "^4.0.8"
-eslint-plugin-simple-import-sort@^5.0.3:
- version "5.0.3"
- resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-5.0.3.tgz#9ae258ddada6efffc55e47a134afbd279eb31fc6"
- integrity sha512-1rf3AWiHeWNCQdAq0iXNnlccnH1UDnelGgrPbjBBHE8d2hXVtOudcmy0vTF4hri3iJ0MKz8jBhmH6lJ0ZWZLHQ==
+eslint-plugin-simple-import-sort@^6.0.0:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-6.0.1.tgz#24a3af3b745dcd389c060db28e22d0f5e3edf86e"
+ integrity sha512-RfFnoi7fQtv7z9sZNJidIcZgWc0ZJe8uOPC3ldmatai4Igr5iDpzTmSUDEZKYm4TnrR01N0X32kfKvax7bivHQ==
eslint-scope@5.1.1, eslint-scope@^5.1.1:
version "5.1.1"
@@ -27080,7 +27080,6 @@ stylus@0.59.0, stylus@^0.59.0:
sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
version "3.36.0"
- uid fd682f6129e507c00bb4e6319cc5d6b767e36061
resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
dependencies:
"@jridgewell/gen-mapping" "^0.3.2"