braincells--

Author: Luca Forstner

dev-packages/e2e-tests/test-applications/nextjs-app-dir/next-env.d.ts

@@ -3,4 +3,4 @@
 /// <reference types="next/navigation-types/compat/navigation" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

dev-packages/e2e-tests/test-applications/nextjs-app-dir/pages/api/async-context-edge-endpoint.ts

@@ -11,13 +11,18 @@ export default async function handler() {
     return new Promise<void>(resolve => setTimeout(resolve, 300));
   });
 
-  setTimeout(() => {
-    return Sentry.startSpan({ name: 'inner-span' }, () => {
-      return new Promise<void>(resolve => setTimeout(resolve, 100));
-    });
-  }, 100);
+  const innerSpanPromise = new Promise<void>(resolve => {
+    setTimeout(() => {
+      Sentry.startSpan({ name: 'inner-span' }, () => {
+        return new Promise<void>(resolve => setTimeout(resolve, 100));
+      }).then(() => {
+        resolve();
+      });
+    }, 100);
+  });
 
   await outerSpanPromise;
+  await innerSpanPromise;
 
   return new Response('ok', { status: 200 });
 }

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/async-context-edge.test.ts

@@ -16,6 +16,5 @@ test('Should allow for async context isolation in the edge SDK', async ({ reques
   const outerSpan = asyncContextEdgerouteTransaction.spans?.find(span => span.description === 'outer-span');
   const innerSpan = asyncContextEdgerouteTransaction.spans?.find(span => span.description === 'inner-span');
 
-  expect(outerSpan?.parent_span_id).toStrictEqual(asyncContextEdgerouteTransaction.contexts?.trace?.span_id);
-  expect(innerSpan?.parent_span_id).toStrictEqual(asyncContextEdgerouteTransaction.contexts?.trace?.span_id);
+  expect(outerSpan?.parent_span_id).toStrictEqual(innerSpan?.parent_span_id);
 });