From 46d70994adaea525f664847531ef1bc40205d3d4 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 8 Jul 2025 13:36:58 +0200 Subject: [PATCH 1/4] works --- packages/vercel-edge/package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index cb327c4fcfce..63c84ad55ce8 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -40,15 +40,15 @@ }, "dependencies": { "@opentelemetry/api": "^1.9.0", - "@sentry/core": "9.36.0" + "@opentelemetry/resources": "^1.30.1", + "@opentelemetry/semantic-conventions": "^1.34.0", + "@sentry/core": "9.36.0", + "@sentry/opentelemetry": "9.36.0" }, "devDependencies": { "@edge-runtime/types": "3.0.1", "@opentelemetry/core": "^1.30.1", - "@opentelemetry/resources": "^1.30.1", - "@opentelemetry/sdk-trace-base": "^1.30.1", - "@opentelemetry/semantic-conventions": "^1.34.0", - "@sentry/opentelemetry": "9.36.0" + "@opentelemetry/sdk-trace-base": "^1.30.1" }, "scripts": { "build": "run-p build:transpile build:types", From cd6750561c6f3761d225d071d2d1a0fae2bf5f17 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 8 Jul 2025 13:55:54 +0200 Subject: [PATCH 2/4] feat(vercel-edge): Ensure dependencies are correct --- .../nextjs-app-dir/instrumentation.ts | 19 ++++++------------- .../nextjs-app-dir/sentry.edge.config.ts | 13 +++++++++++++ .../nextjs-app-dir/sentry.server.config.ts | 13 +++++++++++++ packages/vercel-edge/package.json | 4 ++-- yarn.lock | 1 - 5 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts index a95bb9ee95ee..c500eaa86935 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts @@ -1,18 +1,11 @@ import * as Sentry from '@sentry/nextjs'; -export function register() { - if (process.env.NEXT_RUNTIME === 'nodejs' || process.env.NEXT_RUNTIME === 'edge') { - Sentry.init({ - environment: 'qa', // dynamic sampling bias to keep transactions - dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, - tunnel: `http://localhost:3031/`, // proxy server - tracesSampleRate: 1.0, - sendDefaultPii: true, - transportOptions: { - // We are doing a lot of events at once in this test - bufferSize: 1000, - }, - }); +export async function register() { + if (process.env.NEXT_RUNTIME === 'nodejs') { + await import('./sentry.server.config'); + } + if (process.env.NEXT_RUNTIME === 'edge') { + await import('./sentry.edge.config'); } } diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts new file mode 100644 index 000000000000..067d2ead0b8b --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts @@ -0,0 +1,13 @@ +import * as Sentry from '@sentry/nextjs'; + +Sentry.init({ + environment: 'qa', // dynamic sampling bias to keep transactions + dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, + tunnel: `http://localhost:3031/`, // proxy server + tracesSampleRate: 1.0, + sendDefaultPii: true, + transportOptions: { + // We are doing a lot of events at once in this test + bufferSize: 1000, + }, +}); diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts new file mode 100644 index 000000000000..067d2ead0b8b --- /dev/null +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts @@ -0,0 +1,13 @@ +import * as Sentry from '@sentry/nextjs'; + +Sentry.init({ + environment: 'qa', // dynamic sampling bias to keep transactions + dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, + tunnel: `http://localhost:3031/`, // proxy server + tracesSampleRate: 1.0, + sendDefaultPii: true, + transportOptions: { + // We are doing a lot of events at once in this test + bufferSize: 1000, + }, +}); diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index 63c84ad55ce8..5dcacd634e96 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -41,14 +41,14 @@ "dependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/resources": "^1.30.1", + "@opentelemetry/sdk-trace-base": "^1.30.1", "@opentelemetry/semantic-conventions": "^1.34.0", "@sentry/core": "9.36.0", "@sentry/opentelemetry": "9.36.0" }, "devDependencies": { "@edge-runtime/types": "3.0.1", - "@opentelemetry/core": "^1.30.1", - "@opentelemetry/sdk-trace-base": "^1.30.1" + "@opentelemetry/core": "^1.30.1" }, "scripts": { "build": "run-p build:transpile build:types", diff --git a/yarn.lock b/yarn.lock index f461fa573525..becf5d941f72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27468,7 +27468,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" From 43e8e6a7f48b67d07d2aa2798369cd039a1ab532 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 8 Jul 2025 14:29:01 +0200 Subject: [PATCH 3/4] only internalize sdk-trace-base --- packages/vercel-edge/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json index 5dcacd634e96..63c84ad55ce8 100644 --- a/packages/vercel-edge/package.json +++ b/packages/vercel-edge/package.json @@ -41,14 +41,14 @@ "dependencies": { "@opentelemetry/api": "^1.9.0", "@opentelemetry/resources": "^1.30.1", - "@opentelemetry/sdk-trace-base": "^1.30.1", "@opentelemetry/semantic-conventions": "^1.34.0", "@sentry/core": "9.36.0", "@sentry/opentelemetry": "9.36.0" }, "devDependencies": { "@edge-runtime/types": "3.0.1", - "@opentelemetry/core": "^1.30.1" + "@opentelemetry/core": "^1.30.1", + "@opentelemetry/sdk-trace-base": "^1.30.1" }, "scripts": { "build": "run-p build:transpile build:types", From f121a5d4d1cfef31c903a862b9ea46990d2256bc Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 8 Jul 2025 16:38:21 +0200 Subject: [PATCH 4/4] Revert "feat(vercel-edge): Ensure dependencies are correct" This reverts commit 2cc301161b034eb51eab41749be341d3a5f8a545. --- .../nextjs-app-dir/instrumentation.ts | 19 +++++++++++++------ .../nextjs-app-dir/sentry.edge.config.ts | 13 ------------- .../nextjs-app-dir/sentry.server.config.ts | 13 ------------- yarn.lock | 1 + 4 files changed, 14 insertions(+), 32 deletions(-) delete mode 100644 dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts delete mode 100644 dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts index c500eaa86935..a95bb9ee95ee 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/instrumentation.ts @@ -1,11 +1,18 @@ import * as Sentry from '@sentry/nextjs'; -export async function register() { - if (process.env.NEXT_RUNTIME === 'nodejs') { - await import('./sentry.server.config'); - } - if (process.env.NEXT_RUNTIME === 'edge') { - await import('./sentry.edge.config'); +export function register() { + if (process.env.NEXT_RUNTIME === 'nodejs' || process.env.NEXT_RUNTIME === 'edge') { + Sentry.init({ + environment: 'qa', // dynamic sampling bias to keep transactions + dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, + tunnel: `http://localhost:3031/`, // proxy server + tracesSampleRate: 1.0, + sendDefaultPii: true, + transportOptions: { + // We are doing a lot of events at once in this test + bufferSize: 1000, + }, + }); } } diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts deleted file mode 100644 index 067d2ead0b8b..000000000000 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.edge.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import * as Sentry from '@sentry/nextjs'; - -Sentry.init({ - environment: 'qa', // dynamic sampling bias to keep transactions - dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, - tunnel: `http://localhost:3031/`, // proxy server - tracesSampleRate: 1.0, - sendDefaultPii: true, - transportOptions: { - // We are doing a lot of events at once in this test - bufferSize: 1000, - }, -}); diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts deleted file mode 100644 index 067d2ead0b8b..000000000000 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/sentry.server.config.ts +++ /dev/null @@ -1,13 +0,0 @@ -import * as Sentry from '@sentry/nextjs'; - -Sentry.init({ - environment: 'qa', // dynamic sampling bias to keep transactions - dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN, - tunnel: `http://localhost:3031/`, // proxy server - tracesSampleRate: 1.0, - sendDefaultPii: true, - transportOptions: { - // We are doing a lot of events at once in this test - bufferSize: 1000, - }, -}); diff --git a/yarn.lock b/yarn.lock index becf5d941f72..f461fa573525 100644 --- a/yarn.lock +++ b/yarn.lock @@ -27468,6 +27468,7 @@ 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"