Skip to content

Commit 37649af

Browse files
committed
change nextjs version in e2e test
1 parent 72f38c8 commit 37649af

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/node": "18.11.17",
2121
"@types/react": "18.0.26",
2222
"@types/react-dom": "18.0.9",
23-
"next": "14.0.2",
23+
"next": "14.0.0",
2424
"react": "18.2.0",
2525
"react-dom": "18.2.0",
2626
"typescript": "4.9.5",

packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ import { flushQueue } from './utils/responseEnd';
2121

2222
/** As our own HTTP integration is disabled (src/server/index.ts) the rootSpan comes from Next.js.
2323
* In case there is not root span, we start a new span. */
24-
function startOrUpdateSpan(
25-
spanName: string,
26-
handleResponseErrors: (rootSpan: Span) => Promise<Response>,
27-
): Promise<Response> {
24+
function startOrUpdateSpan(spanName: string, cb: (rootSpan: Span) => Promise<Response>): Promise<Response> {
2825
const activeSpan = getActiveSpan();
2926
const rootSpan = activeSpan && getRootSpan(activeSpan);
3027

@@ -34,7 +31,7 @@ function startOrUpdateSpan(
3431
rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'http.server');
3532
rootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.function.nextjs');
3633

37-
return handleResponseErrors(rootSpan);
34+
return cb(rootSpan);
3835
} else {
3936
return startSpan(
4037
{
@@ -47,7 +44,7 @@ function startOrUpdateSpan(
4744
},
4845
},
4946
(span: Span) => {
50-
return handleResponseErrors(span);
47+
return cb(span);
5148
},
5249
);
5350
}

packages/nextjs/src/server/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { onUncaughtExceptionIntegration } from './onUncaughtExceptionIntegration
1212

1313
export * from '@sentry/node';
1414
import type { EventProcessor } from '@sentry/types';
15-
import { requestIsolationScopeIntegration } from './requestIsolationScopeIntegration';
1615

1716
export { captureUnderscoreErrorException } from '../common/_error';
1817
export { onUncaughtExceptionIntegration } from './onUncaughtExceptionIntegration';
@@ -82,7 +81,7 @@ export function init(options: NodeOptions): void {
8281
integration.name !== 'Http',
8382
),
8483
onUncaughtExceptionIntegration(),
85-
requestIsolationScopeIntegration(),
84+
// requestIsolationScopeIntegration(),
8685
];
8786

8887
// This value is injected at build time, based on the output directory specified in the build config. Though a default

0 commit comments

Comments
 (0)