fix: respect SUPPRESS_TRACING flag

Author: isaacs

packages/core/src/integrations/http/client-subscriptions.ts

@@ -20,6 +20,7 @@ import {
   SPAN_STATUS_ERROR,
   SPAN_STATUS_UNSET,
   startInactiveSpan,
+  SUPPRESS_TRACING_KEY,
   withActiveSpan,
 } from '../../tracing';
 import { debug } from '../../utils/debug-logger';
@@ -31,7 +32,7 @@ import type { HttpInstrumentationOptions, HttpClientRequest } from './types';
 import { DEBUG_BUILD } from '../../debug-build';
 import { LOG_PREFIX, HTTP_ON_CLIENT_REQUEST } from './constants';
 import type { ClientSubscriptionName } from './constants';
-import { getClient } from '../../currentScopes';
+import { getClient, getCurrentScope } from '../../currentScopes';
 import { hasSpansEnabled } from '../../utils/hasSpansEnabled';
 
 type ChannelListener = (message: unknown, name: string | symbol) => void;
@@ -53,6 +54,11 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
   const onHttpClientRequestCreated: ChannelListener = (data: unknown): void => {
     const { request } = data as { request: HttpClientRequest };
 
+    // Skip if tracing is suppressed (e.g., inside Sentry.suppressTracing())
+    if (getCurrentScope().getScopeData().sdkProcessingMetadata[SUPPRESS_TRACING_KEY] === true) {
+      return;
+    }
+
     // check if request is ignored anyway
     if (options.ignoreOutgoingRequests?.(getRequestUrl(request), request)) {
       return;

packages/core/src/tracing/index.ts

@@ -13,6 +13,7 @@ export {
   withActiveSpan,
   suppressTracing,
   startNewTrace,
+  SUPPRESS_TRACING_KEY,
 } from './trace';
 export {
   getDynamicSamplingContextFromClient,

packages/core/src/tracing/trace.ts

@@ -36,7 +36,7 @@ import { SPAN_STATUS_ERROR } from './spanstatus';
 import { setCapturedScopesOnSpan } from './utils';
 import type { Client } from '../client';
 
-const SUPPRESS_TRACING_KEY = '__SENTRY_SUPPRESS_TRACING__';
+export const SUPPRESS_TRACING_KEY = '__SENTRY_SUPPRESS_TRACING__';
 
 /**
  * Wraps a function with a transaction/span and finishes the span after the function is done.

packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts

@@ -214,17 +214,13 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
       return moduleExports;
     };
 
-    // On Node < 22.12, trace propagation via diagnostics channel is not available,
-    // so we fall back to monkey-patching without injecting trace headers.
-    const legacyPatchOptions = { ...patchOptions, propagateTrace: false };
-
     const wrapHttp = FULLY_SUPPORTS_HTTP_DIAGNOSTICS_CHANNEL
       ? sub
-      : (moduleExports: HttpModuleExport) => patchHttpModuleClient(moduleExports, legacyPatchOptions);
+      : (moduleExports: HttpModuleExport) => patchHttpModuleClient(moduleExports, patchOptions);
 
     const wrapHttps = FULLY_SUPPORTS_HTTP_DIAGNOSTICS_CHANNEL
       ? sub
-      : (moduleExports: HttpModuleExport) => patchHttpsModuleClient(moduleExports, legacyPatchOptions);
+      : (moduleExports: HttpModuleExport) => patchHttpsModuleClient(moduleExports, patchOptions);
 
     /**
      * You may be wondering why we register these diagnostics-channel listeners

packages/node-core/src/light/asyncLocalStorageStrategy.ts

@@ -1,6 +1,11 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import type { Scope } from '@sentry/core';
-import { getDefaultCurrentScope, getDefaultIsolationScope, setAsyncContextStrategy } from '@sentry/core';
+import {
+  getDefaultCurrentScope,
+  getDefaultIsolationScope,
+  setAsyncContextStrategy,
+  SUPPRESS_TRACING_KEY,
+} from '@sentry/core';
 
 /**
  * Sets the async context strategy to use AsyncLocalStorage.
@@ -62,7 +67,7 @@ export function setAsyncLocalStorageAsyncContextStrategy(): void {
   // In contrast to the browser, we can rely on async context isolation here
   function suppressTracing<T>(callback: () => T): T {
     return withScope(scope => {
-      scope.setSDKProcessingMetadata({ __SENTRY_SUPPRESS_TRACING__: true });
+      scope.setSDKProcessingMetadata({ [SUPPRESS_TRACING_KEY]: true });
       return callback();
     });
   }