From 38b8ea35c07df0c41cd87b2ac2f0aa8e02561926 Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 5 Feb 2024 18:11:54 +0000 Subject: [PATCH 1/2] fix typo --- .../tests/client-app-routing-instrumentation.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts index 9c6dd31496a8..d52cd4f18893 100644 --- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts +++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts @@ -37,7 +37,7 @@ test('Creates a navigation transaction for app router routes', async ({ page }) ); }); - const servercomponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => { + const serverComponentTransactionPromise = waitForTransaction('nextjs-13-app-dir', async transactionEvent => { return ( transactionEvent?.transaction === 'Page Server Component (/server-component/parameter/[...parameters])' && (await clientNavigationTransactionPromise).contexts?.trace?.trace_id === @@ -48,5 +48,5 @@ test('Creates a navigation transaction for app router routes', async ({ page }) await page.getByText('/server-component/parameter/foo/bar/baz').click(); expect(await clientNavigationTransactionPromise).toBeDefined(); - expect(await servercomponentTransactionPromise).toBeDefined(); + expect(await serverComponentTransactionPromise).toBeDefined(); }); From 8c32f471f928c4a7e04692ba2258ba4d85b061ac Mon Sep 17 00:00:00 2001 From: Luca Forstner Date: Mon, 5 Feb 2024 18:41:49 +0000 Subject: [PATCH 2/2] fix --- packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts | 2 ++ packages/nextjs/src/common/wrapServerComponentWithSentry.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts index 276cbec81d35..d1dbecbaec63 100644 --- a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts +++ b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts @@ -3,6 +3,7 @@ import { addTracingExtensions, captureException, getClient, + getCurrentScope, handleCallbackErrors, startSpanManual, withIsolationScope, @@ -59,6 +60,7 @@ export function wrapGenerationFunctionWithSentry a const propagationContext = commonObjectToPropagationContext(headers, incomingPropagationContext); isolationScope.setPropagationContext(propagationContext); + getCurrentScope().setPropagationContext(propagationContext); return startSpanManual( { diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts index 6d6e7758bbf9..de0c1da9c1f9 100644 --- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts +++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts @@ -2,6 +2,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, addTracingExtensions, captureException, + getCurrentScope, handleCallbackErrors, startSpanManual, withIsolationScope, @@ -51,6 +52,7 @@ export function wrapServerComponentWithSentry any> const propagationContext = commonObjectToPropagationContext(context.headers, incomingPropagationContext); isolationScope.setPropagationContext(propagationContext); + getCurrentScope().setPropagationContext(propagationContext); return startSpanManual( {