early return in tunnel requests

Author: chargome

packages/nextjs/rollup.npm.config.mjs

@@ -17,7 +17,7 @@ export default [
       // prevent this internal nextjs code from ending up in our built package (this doesn't happen automatically because
       // the name doesn't match an SDK dependency)
       packageSpecificConfig: {
-        external: ['next/router', 'next/constants', 'next/headers', 'stacktrace-parser'],
+        external: ['next/router', 'next/constants', 'next/headers', 'next/server', 'stacktrace-parser'],
 
         // Next.js and our users are more happy when our client code has the "use client" directive
         plugins: [

packages/nextjs/src/common/wrapMiddlewareWithSentry.ts

@@ -13,6 +13,7 @@ import {
   winterCGRequestToRequestData,
   withIsolationScope,
 } from '@sentry/core';
+import { NextResponse } from 'next/server';
 import type { EdgeRouteHandler } from '../edge/types';
 import { flushSafelyWithTimeout } from './utils/responseEnd';
 
@@ -27,6 +28,23 @@ export function wrapMiddlewareWithSentry<H extends EdgeRouteHandler>(
 ): (...params: Parameters<H>) => Promise<ReturnType<H>> {
   return new Proxy(middleware, {
     apply: async (wrappingTarget, thisArg, args: Parameters<H>) => {
+      const tunnelRoute =
+        '_sentryRewritesTunnelPath' in globalThis
+          ? (globalThis as Record<string, unknown>)._sentryRewritesTunnelPath
+          : undefined;
+
+      if (tunnelRoute && typeof tunnelRoute === 'string') {
+        const req: unknown = args[0];
+        // Check if the current request matches the tunnel route
+        if (req instanceof Request) {
+          const url = new URL(req.url);
+          const isTunnelRequest = url.pathname.startsWith(tunnelRoute);
+
+          if (isTunnelRequest) {
+            return NextResponse.next() as ReturnType<H>;
+          }
+        }
+      }
       // TODO: We still should add central isolation scope creation for when our build-time instrumentation does not work anymore with turbopack.
       return withIsolationScope(isolationScope => {
         const req: unknown = args[0];

packages/nextjs/src/config/withSentryConfig.ts

@@ -107,17 +107,17 @@ function getFinalConfigObject(
         showedExportModeTunnelWarning = true;
         // eslint-disable-next-line no-console
         console.warn(
-          '[@sentry/nextjs] The Sentry Next.js SDK `tunnelRoute` option will not work in combination with Next.js static exports. The `tunnelRoute` option uses serverside features that cannot be accessed in export mode. If you still want to tunnel Sentry events, set up your own tunnel: https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option',
+          '[@sentry/nextjs] The Sentry Next.js SDK `tunnelRoute` option will not work in combination with Next.js static exports. The `tunnelRoute` option uses server-side features that cannot be accessed in export mode. If you still want to tunnel Sentry events, set up your own tunnel: https://docs.sentry.io/platforms/javascript/troubleshooting/#using-the-tunnel-option',
         );
       }
     } else {
       const resolvedTunnelRoute =
-        typeof userSentryOptions.tunnelRoute === 'boolean'
+        typeof userSentryOptions.tunnelRoute === 'boolean' && userSentryOptions.tunnelRoute === true
           ? generateRandomTunnelRoute()
           : userSentryOptions.tunnelRoute;
 
       // Update the global options object to use the resolved value everywhere
-      userSentryOptions.tunnelRoute = resolvedTunnelRoute;
+      userSentryOptions.tunnelRoute = resolvedTunnelRoute || undefined;
       setUpTunnelRewriteRules(incomingUserNextConfigObject, resolvedTunnelRoute);
     }
   }