From 1d2514ea0e63ae7bd12b13940760f5f8d1ea7add Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Thu, 18 Sep 2025 17:57:05 +0200 Subject: [PATCH 1/2] fix otel fetch disabling --- packages/nextjs/src/server/index.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts index 82d475a719c6..79bbb5f11b8e 100644 --- a/packages/nextjs/src/server/index.ts +++ b/packages/nextjs/src/server/index.ts @@ -18,6 +18,7 @@ import { getIsolationScope, getRootSpan, GLOBAL_OBJ, + hasSpansEnabled, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, @@ -106,9 +107,12 @@ export function init(options: NodeOptions): NodeClient | undefined { }), ); - // Turn off Next.js' own fetch instrumentation + // Turn off Next.js' own fetch instrumentation (only when Sentry spans are enabled, and we manage OTEL) // https://github.com/lforst/nextjs-fork/blob/1994fd186defda77ad971c36dc3163db263c993f/packages/next/src/server/lib/patch-fetch.ts#L245 - process.env.NEXT_OTEL_FETCH_DISABLED = '1'; + // Enable with custom OTel setup: https://github.com/getsentry/sentry-javascript/issues/17581 + if (hasSpansEnabled(options) && !options.skipOpenTelemetrySetup) { + process.env.NEXT_OTEL_FETCH_DISABLED = '1'; + } // This value is injected at build time, based on the output directory specified in the build config. Though a default // is set there, we set it here as well, just in case something has gone wrong with the injection. From 4426427be57602e05aa32e6ad99f7df72e121b68 Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Fri, 19 Sep 2025 09:39:38 +0200 Subject: [PATCH 2/2] don't check hasSpansEnabled --- packages/nextjs/src/server/index.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts index 79bbb5f11b8e..5866f014ec69 100644 --- a/packages/nextjs/src/server/index.ts +++ b/packages/nextjs/src/server/index.ts @@ -18,7 +18,6 @@ import { getIsolationScope, getRootSpan, GLOBAL_OBJ, - hasSpansEnabled, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, @@ -107,10 +106,10 @@ export function init(options: NodeOptions): NodeClient | undefined { }), ); - // Turn off Next.js' own fetch instrumentation (only when Sentry spans are enabled, and we manage OTEL) + // Turn off Next.js' own fetch instrumentation (only when we manage OTEL) // https://github.com/lforst/nextjs-fork/blob/1994fd186defda77ad971c36dc3163db263c993f/packages/next/src/server/lib/patch-fetch.ts#L245 // Enable with custom OTel setup: https://github.com/getsentry/sentry-javascript/issues/17581 - if (hasSpansEnabled(options) && !options.skipOpenTelemetrySetup) { + if (!options.skipOpenTelemetrySetup) { process.env.NEXT_OTEL_FETCH_DISABLED = '1'; }