qef: use env for tests instead

Author: logaretm

dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/next.config.ts

@@ -6,5 +6,4 @@ const nextConfig: NextConfig = {};
 export default withSentryConfig(nextConfig, {
   silent: true,
   tunnelRoute: true,
-  _tunnelRouteDestinationOverride: 'http://localhost:3031/',
 });

dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json

@@ -3,16 +3,16 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev",
-    "build": "next build > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
+    "dev": " next dev",
+    "build": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next build > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
     "clean": "npx rimraf node_modules pnpm-lock.yaml .tmp_dev_server_logs",
-    "dev:webpack": "next dev --webpack",
-    "build-webpack": "next build --webpack > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
-    "start": "next start",
+    "dev:webpack": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next dev --webpack",
+    "build-webpack": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next build --webpack > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
+    "start": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next start",
     "lint": "eslint",
     "test:prod": "TEST_ENV=production playwright test",
-    "test:dev": "TEST_ENV=development playwright test",
-    "test:dev-webpack": "TEST_ENV=development-webpack playwright test",
+    "test:dev": "TEST_ENV=development _SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ playwright test",
+    "test:dev-webpack": "TEST_ENV=development-webpack _SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ playwright test",
     "test:build": "pnpm install && pnpm build",
     "test:build-webpack": "pnpm install && pnpm build-webpack",
     "test:build-canary": "pnpm install && pnpm add next@canary && pnpm build",

packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts

@@ -1,4 +1,4 @@
-import { ATTR_URL_QUERY, SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
+import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
 import { type Span, type SpanAttributes, GLOBAL_OBJ, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { isSentryRequestSpan } from '@sentry/opentelemetry';
 import { ATTR_NEXT_SPAN_TYPE } from '../nextSpanAttributes';
@@ -49,7 +49,7 @@ function isTunnelRouteSpan(spanAttributes: Record<string, unknown>): boolean {
 
   // Check both http.target (older) and url.query (newer) attributes
   // eslint-disable-next-line deprecation/deprecation
-  const httpTarget = spanAttributes[SEMATTRS_HTTP_TARGET] || spanAttributes[ATTR_URL_QUERY];
+  const httpTarget = spanAttributes[SEMATTRS_HTTP_TARGET];
 
   if (typeof httpTarget === 'string') {
     // Extract pathname from the target (e.g., "/tunnel?o=123&p=456" -> "/tunnel")

packages/nextjs/src/config/types.ts

@@ -437,12 +437,6 @@ export type SentryBuildOptions = {
    */
   tunnelRoute?: string | boolean;
 
-  /**
-   * @internal
-   * Override the destination URL for tunnel rewrites (for E2E testing only)
-   */
-  _tunnelRouteDestinationOverride?: string;
-
   /**
    * Tree shakes Sentry SDK logger statements from the bundle.
    */

packages/nextjs/src/config/withSentryConfig.ts

@@ -125,11 +125,7 @@ function getFinalConfigObject(
       const resolvedTunnelRoute = resolveTunnelRoute(userSentryOptions.tunnelRoute);
       userSentryOptions.tunnelRoute = resolvedTunnelRoute || undefined;
 
-      setUpTunnelRewriteRules(
-        incomingUserNextConfigObject,
-        resolvedTunnelRoute,
-        userSentryOptions._tunnelRouteDestinationOverride,
-      );
+      setUpTunnelRewriteRules(incomingUserNextConfigObject, resolvedTunnelRoute);
     }
   }
 
@@ -393,12 +389,15 @@ function getFinalConfigObject(
  *
  * See https://nextjs.org/docs/api-reference/next.config.js/rewrites.
  */
-function setUpTunnelRewriteRules(
-  userNextConfig: NextConfigObject,
-  tunnelPath: string,
-  destinationOverride?: string,
-): void {
+function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: string): void {
   const originalRewrites = userNextConfig.rewrites;
+  // Allow overriding the tunnel destination for E2E tests via environment variable
+  const destinationOverride = process.env._SENTRY_TUNNEL_DESTINATION_OVERRIDE;
+
+  // Make sure destinations are statically defined at build time
+  const destination = destinationOverride || 'https://o:orgid.ingest.sentry.io/api/:projectid/envelope/?hsts=0';
+  const destinationWithRegion =
+    destinationOverride || 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0';
 
   // This function doesn't take any arguments at the time of writing but we future-proof
   // here in case Next.js ever decides to pass some
@@ -419,7 +418,7 @@ function setUpTunnelRewriteRules(
           value: '(?<projectid>\\d*)',
         },
       ],
-      destination: destinationOverride || 'https://o:orgid.ingest.sentry.io/api/:projectid/envelope/?hsts=0',
+      destination,
     };
 
     const tunnelRouteRewriteWithRegion = {
@@ -443,7 +442,7 @@ function setUpTunnelRewriteRules(
           value: '(?<region>[a-z]{2})',
         },
       ],
-      destination: destinationOverride || 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0',
+      destination: destinationWithRegion,
     };
 
     // Order of these is important, they get applied first to last.