use event processor instead, bandaid!

Author: mydea

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts

@@ -172,9 +172,9 @@ test.describe('Edge runtime', () => {
     expect(edgerouteTransaction2.spans?.length).toBe(1);
     expect(edgerouteTransaction3.spans?.length).toBe(1);
 
-    expect(edgerouteTransaction1.spans?.[0].description).toBe('GET https://github.com');
-    expect(edgerouteTransaction2.spans?.[0].description).toBe('GET https://github.com');
-    expect(edgerouteTransaction3.spans?.[0].description).toBe('GET https://github.com');
+    expect(edgerouteTransaction1.spans?.[0].description).toBe('GET https://github.com/');
+    expect(edgerouteTransaction2.spans?.[0].description).toBe('GET https://github.com/');
+    expect(edgerouteTransaction3.spans?.[0].description).toBe('GET https://github.com/');
   });
 });
 

packages/nextjs/src/server/index.ts

@@ -6,7 +6,7 @@ import {
   SEMATTRS_HTTP_METHOD,
   SEMATTRS_HTTP_TARGET,
 } from '@opentelemetry/semantic-conventions';
-import type { EventProcessor } from '@sentry/core';
+import { EventProcessor, isSentryRequestUrl } from '@sentry/core';
 import {
   applySdkMetadata,
   extractTraceparentData,
@@ -203,7 +203,7 @@ export function init(options: NodeOptions): NodeClient | undefined {
     }
   });
 
-  getGlobalScope().addEventProcessor(
+  client?.addEventProcessor(
     Object.assign(
       (event => {
         if (event.type === 'transaction') {
@@ -260,6 +260,16 @@ export function init(options: NodeOptions): NodeClient | undefined {
             }
           }
 
+          // On Edge Runtime, fetch requests can leak to the Node runtime fetch instrumentation
+          // and end up being sent as transactions to Sentry.
+          // We filter them here based on URL
+          if (event.contexts?.trace?.data?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] === 'http.client') {
+            const url = event.contexts?.trace?.data?.['url'];
+            if (url && isSentryRequestUrl(url, client)) {
+              return null;
+            }
+          }
+
           return event;
         } else {
           return event;
@@ -269,7 +279,7 @@ export function init(options: NodeOptions): NodeClient | undefined {
     ),
   );
 
-  getGlobalScope().addEventProcessor(
+  client?.addEventProcessor(
     Object.assign(
       ((event, hint) => {
         if (event.type !== undefined) {
@@ -364,7 +374,7 @@ export function init(options: NodeOptions): NodeClient | undefined {
   });
 
   if (process.env.NODE_ENV === 'development') {
-    getGlobalScope().addEventProcessor(devErrorSymbolicationEventProcessor);
+    client?.addEventProcessor(devErrorSymbolicationEventProcessor);
   }
 
   try {

packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

@@ -2,16 +2,16 @@ import { context } from '@opentelemetry/api';
 import { isTracingSuppressed, VERSION } from '@opentelemetry/core';
 import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import { InstrumentationBase } from '@opentelemetry/instrumentation';
-import { isSentryRequestUrl, SanitizedRequestData } from '@sentry/core';
-import {
-  addBreadcrumb,
+import type {
+SanitizedRequestData ,
+} from '@sentry/core';
+import {   addBreadcrumb,
   getBreadcrumbLogLevelFromHttpStatusCode,
   getClient,
   getSanitizedUrlString,
   getTraceData,
   LRUMap,
-  parseUrl,
-} from '@sentry/core';
+  parseUrl} from '@sentry/core';
 import { shouldPropagateTraceForUrl } from '@sentry/opentelemetry';
 import * as diagch from 'diagnostics_channel';
 import { NODE_MAJOR, NODE_MINOR } from '../../nodeVersion';
@@ -246,13 +246,6 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
     const url = getAbsoluteUrl(request.origin, request.path);
     const ignoreOutgoingRequests = this.getConfig().ignoreOutgoingRequests;
 
-    // Normally, we should not need this, because `suppressTracing` should take care of this
-    // However, in Next.js Edge Runtime in dev, there is a bug where the edge is simulated but still uses Node under the hood, leading to problems
-    // So we make sure to ignore outgoing requests to Sentry endpoints
-    if (isSentryRequestUrl(url, getClient())) {
-      return true;
-    }
-
     if (typeof ignoreOutgoingRequests !== 'function' || !url) {
       return false;
     }

packages/node/src/integrations/node-fetch/index.ts

@@ -1,12 +1,11 @@
 import type { UndiciInstrumentationConfig } from '@opentelemetry/instrumentation-undici';
 import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
-import { IntegrationFn, isSentryRequestUrl } from '@sentry/core';
+import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration, getClient, hasSpansEnabled, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { generateInstrumentOnce } from '../../otel/instrument';
 import type { NodeClient } from '../../sdk/client';
 import type { NodeClientOptions } from '../../types';
 import { SentryNodeFetchInstrumentation } from './SentryNodeFetchInstrumentation';
-import { isNextEdgeRuntime } from '../../utils/isNextEdgeRuntime';
 
 const INTEGRATION_NAME = 'NodeFetch';
 
@@ -101,13 +100,6 @@ function getConfigWithDefaults(options: Partial<NodeFetchOptions> = {}): UndiciI
       const _ignoreOutgoingRequests = options.ignoreOutgoingRequests;
       const shouldIgnore = _ignoreOutgoingRequests && url && _ignoreOutgoingRequests(url);
 
-      // Normally, we should not need this, because `suppressTracing` should take care of this
-      // However, in Next.js Edge Runtime in dev, there is a bug where the edge is simulated but still uses Node under the hood, leading to problems
-      // So we make sure to ignore outgoing requests to Sentry endpoints
-      if (isSentryRequestUrl(url, getClient())) {
-        return true;
-      }
-
       return !!shouldIgnore;
     },
     startSpanHook: () => {