feat(nextjs): Use spans generated by Next.js for App Router

dev-packages/e2e-tests/test-applications/nextjs-14/app/propagation/test-outgoing-fetch-external-disallowed/route.ts

@@ -3,8 +3,8 @@ import { NextResponse } from 'next/server';
 export const dynamic = 'force-dynamic';
 
 export async function GET() {
-  const data = await fetch(`http://localhost:3030/propagation/test-outgoing-fetch-external-disallowed/check`).then(
-    res => res.json(),
-  );
+  const data = await fetch(`http://localhost:3030/propagation/test-outgoing-fetch-external-disallowed/check`, {
+    cache: 'no-store',
+  }).then(res => res.json());
   return NextResponse.json(data);
 }

dev-packages/e2e-tests/test-applications/nextjs-14/app/propagation/test-outgoing-fetch/route.ts

@@ -3,6 +3,8 @@ import { NextResponse } from 'next/server';
 export const dynamic = 'force-dynamic';
 
 export async function GET() {
-  const data = await fetch(`http://localhost:3030/propagation/test-outgoing-fetch/check`).then(res => res.json());
+  const data = await fetch(`http://localhost:3030/propagation/test-outgoing-fetch/check`, { cache: 'no-store' }).then(
+    res => res.json(),
+  );
   return NextResponse.json(data);
 }

dev-packages/e2e-tests/test-applications/nextjs-14/tests/generation-functions.test.ts

@@ -1,19 +1,29 @@
 import { expect, test } from '@playwright/test';
 import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
-test('Should send a transaction event for a generateMetadata() function invokation', async ({ page }) => {
-  const testTitle = 'foobarasdf';
+test('Should emit a span for a generateMetadata() function invokation', async ({ page }) => {
+  const testTitle = 'should-emit-span';
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] === `/generation-functions?metadataTitle=${testTitle}`
     );
   });
 
   await page.goto(`/generation-functions?metadataTitle=${testTitle}`);
 
-  expect(await transactionPromise).toBeDefined();
+  const transaction = await transactionPromise;
+
+  expect(transaction.spans).toContainEqual(
+    expect.objectContaining({
+      description: 'generateMetadata /generation-functions/page',
+      origin: 'manual',
+      parent_span_id: expect.any(String),
+      span_id: expect.any(String),
+      status: 'ok',
+      trace_id: expect.any(String),
+    }),
+  );
 
   const pageTitle = await page.title();
   expect(pageTitle).toBe(testTitle);
@@ -22,12 +32,12 @@ test('Should send a transaction event for a generateMetadata() function invokati
 test('Should send a transaction and an error event for a faulty generateMetadata() function invokation', async ({
   page,
 }) => {
-  const testTitle = 'foobarbaz';
+  const testTitle = 'should-emit-error';
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent.transaction === 'Page.generateMetadata (/generation-functions)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] ===
+      `/generation-functions?metadataTitle=${testTitle}&shouldThrowInGenerateMetadata=1`
     );
   });
 
@@ -54,14 +64,23 @@ test('Should send a transaction event for a generateViewport() function invokati
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateViewport (/generation-functions)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.viewportThemeColor === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] ===
+      `/generation-functions?viewportThemeColor=${testTitle}`
     );
   });
 
   await page.goto(`/generation-functions?viewportThemeColor=${testTitle}`);
 
-  expect(await transactionPromise).toBeDefined();
+  expect((await transactionPromise).spans).toContainEqual(
+    expect.objectContaining({
+      description: 'generateViewport /generation-functions/page',
+      origin: 'manual',
+      parent_span_id: expect.any(String),
+      span_id: expect.any(String),
+      status: 'ok',
+      trace_id: expect.any(String),
+    }),
+  );
 });
 
 test('Should send a transaction and an error event for a faulty generateViewport() function invokation', async ({
@@ -71,8 +90,8 @@ test('Should send a transaction and an error event for a faulty generateViewport
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateViewport (/generation-functions)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.viewportThemeColor === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] ===
+      `/generation-functions?viewportThemeColor=${testTitle}&shouldThrowInGenerateViewport=1`
     );
   });
 
@@ -97,8 +116,8 @@ test('Should send a transaction event with correct status for a generateMetadata
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions/with-redirect)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] ===
+      `/generation-functions/with-redirect?metadataTitle=${testTitle}`
     );
   });
 
@@ -114,8 +133,8 @@ test('Should send a transaction event with correct status for a generateMetadata
 
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'Page.generateMetadata (/generation-functions/with-notfound)' &&
-      (transactionEvent.extra?.route_data as any)?.searchParams?.metadataTitle === testTitle
+      transactionEvent.contexts?.trace?.data?.['http.target'] ===
+      `/generation-functions/with-notfound?metadataTitle=${testTitle}`
     );
   });
 

dev-packages/e2e-tests/test-applications/nextjs-14/tests/request-instrumentation.test.ts

@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Should send a transaction with a fetch span', async ({ page }) => {
   const transactionPromise = waitForTransaction('nextjs-14', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/request-instrumentation)';
+    return transactionEvent?.transaction === 'GET /request-instrumentation';
   });
 
   await page.goto(`/request-instrumentation`);

dev-packages/e2e-tests/test-applications/nextjs-15/tests/pageload-tracing.test.ts

@@ -2,16 +2,8 @@ import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('all server component transactions should be attached to the pageload request span', async ({ page }) => {
-  const pageServerComponentTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/pageload-tracing)';
-  });
-
-  const layoutServerComponentTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Layout Server Component (/pageload-tracing)';
-  });
-
-  const metadataTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page.generateMetadata (/pageload-tracing)';
+  const serverTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
+    return transactionEvent?.transaction === 'GET /pageload-tracing';
   });
 
   const pageloadTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
@@ -20,18 +12,13 @@ test('all server component transactions should be attached to the pageload reque
 
   await page.goto(`/pageload-tracing`);
 
-  const [pageServerComponentTransaction, layoutServerComponentTransaction, metadataTransaction, pageloadTransaction] =
-    await Promise.all([
-      pageServerComponentTransactionPromise,
-      layoutServerComponentTransactionPromise,
-      metadataTransactionPromise,
-      pageloadTransactionPromise,
-    ]);
+  const [serverTransaction, pageloadTransaction] = await Promise.all([
+    serverTransactionPromise,
+    pageloadTransactionPromise,
+  ]);
 
   const pageloadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
 
   expect(pageloadTraceId).toBeTruthy();
-  expect(pageServerComponentTransaction.contexts?.trace?.trace_id).toBe(pageloadTraceId);
-  expect(layoutServerComponentTransaction.contexts?.trace?.trace_id).toBe(pageloadTraceId);
-  expect(metadataTransaction.contexts?.trace?.trace_id).toBe(pageloadTraceId);
+  expect(serverTransaction.contexts?.trace?.trace_id).toBe(pageloadTraceId);
 });

dev-packages/e2e-tests/test-applications/nextjs-15/tests/ppr-error.test.ts

@@ -3,18 +3,21 @@ import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('should not capture React-internal errors for PPR rendering', async ({ page }) => {
   const pageServerComponentTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/ppr-error/[param])';
+    return transactionEvent?.transaction === 'GET /ppr-error/[param]';
   });
 
   let errorEventReceived = false;
-  waitForError('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/ppr-error/[param])';
+  waitForError('nextjs-15', async errorEvent => {
+    return errorEvent?.transaction === 'Page Server Component (/ppr-error/[param])';
   }).then(() => {
     errorEventReceived = true;
   });
 
   await page.goto(`/ppr-error/foobar?id=1`);
 
+  // Just to be a little bit more sure
+  await page.waitForTimeout(5000);
+
   const pageServerComponentTransaction = await pageServerComponentTransactionPromise;
   expect(pageServerComponentTransaction).toBeDefined();
 

dev-packages/e2e-tests/test-applications/nextjs-15/tests/suspense-error.test.ts

@@ -3,18 +3,19 @@ import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
 
 test('should not capture serverside suspense errors', async ({ page }) => {
   const pageServerComponentTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/suspense-error)';
+    return transactionEvent?.transaction === 'GET /suspense-error';
   });
 
   let errorEvent;
-  waitForError('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'Page Server Component (/suspense-error)';
+  waitForError('nextjs-15', async errorEvent => {
+    return errorEvent?.transaction === 'Page Server Component (/suspense-error)';
   }).then(event => {
     errorEvent = event;
   });
 
   await page.goto(`/suspense-error`);
 
+  // Just to be a little bit more sure
   await page.waitForTimeout(5000);
 
   const pageServerComponentTransaction = await pageServerComponentTransactionPromise;

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/client-app-routing-instrumentation.test.ts

@@ -28,7 +28,7 @@ test('Creates a navigation transaction for app router routes', async ({ page })
 
   await page.goto(`/server-component/parameter/${randomRoute}`);
   await clientPageloadTransactionPromise;
-  await page.getByText('Page (/server-component/parameter/[parameter])').isVisible();
+  await page.getByText('Page (/server-component/[parameter])').isVisible();
 
   const clientNavigationTransactionPromise = waitForTransaction('nextjs-app-dir', transactionEvent => {
     return (
@@ -38,8 +38,13 @@ test('Creates a navigation transaction for app router routes', async ({ page })
   });
 
   const serverComponentTransactionPromise = waitForTransaction('nextjs-app-dir', async transactionEvent => {
+    console.log({
+      t: transactionEvent.transaction,
+      tid: transactionEvent.contexts?.trace?.trace_id,
+      ctid: (await clientNavigationTransactionPromise).contexts?.trace?.trace_id,
+    });
     return (
-      transactionEvent?.transaction === 'Page Server Component (/server-component/parameter/[...parameters])' &&
+      transactionEvent?.transaction === 'GET /server-component/parameter/foo/bar/baz' &&
       (await clientNavigationTransactionPromise).contexts?.trace?.trace_id ===
         transactionEvent.contexts?.trace?.trace_id
     );

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/connected-servercomponent-trace.test.ts

@@ -1,50 +1,21 @@
 import { expect, test } from '@playwright/test';
 import { waitForTransaction } from '@sentry-internal/test-utils';
 
-test('Will capture a connected trace for all server components and generation functions when visiting a page', async ({
+test('Will create a transaction with spans for every server component and metadata generation functions when visiting a page', async ({
   page,
 }) => {
-  const someConnectedEvent = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    return (
-      transactionEvent?.transaction === 'Layout Server Component (/(nested-layout)/nested-layout)' ||
-      transactionEvent?.transaction === 'Layout Server Component (/(nested-layout))' ||
-      transactionEvent?.transaction === 'Page Server Component (/(nested-layout)/nested-layout)' ||
-      transactionEvent?.transaction === 'Page.generateMetadata (/(nested-layout)/nested-layout)'
-    );
+  const serverTransactionEventPromise = waitForTransaction('nextjs-app-dir', async transactionEvent => {
+    return transactionEvent?.transaction === 'GET /nested-layout';
   });
 
-  const layout1Transaction = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    return (
-      transactionEvent?.transaction === 'Layout Server Component (/(nested-layout)/nested-layout)' &&
-      (await someConnectedEvent).contexts?.trace?.trace_id === transactionEvent.contexts?.trace?.trace_id
-    );
-  });
-
-  const layout2Transaction = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    return (
-      transactionEvent?.transaction === 'Layout Server Component (/(nested-layout))' &&
-      (await someConnectedEvent).contexts?.trace?.trace_id === transactionEvent.contexts?.trace?.trace_id
-    );
-  });
-
-  const pageTransaction = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    return (
-      transactionEvent?.transaction === 'Page Server Component (/(nested-layout)/nested-layout)' &&
-      (await someConnectedEvent).contexts?.trace?.trace_id === transactionEvent.contexts?.trace?.trace_id
-    );
-  });
+  await page.goto('/nested-layout');
 
-  const generateMetadataTransaction = waitForTransaction('nextjs-app-dir', async transactionEvent => {
-    return (
-      transactionEvent?.transaction === 'Page.generateMetadata (/(nested-layout)/nested-layout)' &&
-      (await someConnectedEvent).contexts?.trace?.trace_id === transactionEvent.contexts?.trace?.trace_id
-    );
+  const spanDescriptions = (await serverTransactionEventPromise).spans?.map(span => {
+    return span.description;
   });
 
-  await page.goto('/nested-layout');
-
-  expect(await layout1Transaction).toBeDefined();
-  expect(await layout2Transaction).toBeDefined();
-  expect(await pageTransaction).toBeDefined();
-  expect(await generateMetadataTransaction).toBeDefined();
+  expect(spanDescriptions).toContainEqual('Layout Server Component (/(nested-layout)/nested-layout)');
+  expect(spanDescriptions).toContainEqual('Layout Server Component (/(nested-layout))');
+  expect(spanDescriptions).toContainEqual('Page Server Component (/(nested-layout)/nested-layout)');
+  expect(spanDescriptions).toContainEqual('Page.generateMetadata (/(nested-layout)/nested-layout)');
 });