Revert "change nextjs version in e2e test"

This reverts commit 37649af.

Author: mydea

dev-packages/e2e-tests/test-applications/nextjs-app-dir/package.json

@@ -20,7 +20,7 @@
     "@types/node": "18.11.17",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "14.0.0",
+    "next": "14.0.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "4.9.5",

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

@@ -21,7 +21,10 @@ import { flushQueue } from './utils/responseEnd';
 
 /** As our own HTTP integration is disabled (src/server/index.ts) the rootSpan comes from Next.js.
  * In case there is not root span, we start a new span. */
-function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Response>): Promise<Response> {
+function startOrUpdateSpan(
+  spanName: string,
+  handleResponseErrors: (rootSpan: Span) => Promise<Response>,
+): Promise<Response> {
   const activeSpan = getActiveSpan();
   const rootSpan = activeSpan && getRootSpan(activeSpan);
 
@@ -31,7 +34,7 @@ function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Res
     rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server');
     rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.function.nextjs');
 
-    return cb(rootSpan);
+    return handleResponseErrors(rootSpan);
   } else {
     return startSpan(
       {
@@ -44,7 +47,7 @@ function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Res
         },
       },
       (span: Span) => {
-        return cb(span);
+        return handleResponseErrors(span);
       },
     );
   }

packages/nextjs/src/server/index.ts

@@ -12,6 +12,7 @@ import { onUncaughtExceptionIntegration } from './onUncaughtExceptionIntegration
 
 export * from '@sentry/node';
 import type { EventProcessor } from '@sentry/types';
+import { requestIsolationScopeIntegration } from './requestIsolationScopeIntegration';
 
 export { captureUnderscoreErrorException } from '../common/_error';
 export { onUncaughtExceptionIntegration } from './onUncaughtExceptionIntegration';
@@ -81,7 +82,7 @@ export function init(options: NodeOptions): void {
         integration.name !== 'Http',
     ),
     onUncaughtExceptionIntegration(),
-    // requestIsolationScopeIntegration(),
+    requestIsolationScopeIntegration(),
   ];
 
   // This value is injected at build time, based on the output directory specified in the build config. Though a default