fix(node): Fix virtual parent span ID handling & update create-next-app E2E test

dev-packages/e2e-tests/package.json

@@ -14,7 +14,7 @@
     "test:prepare": "ts-node prepare.ts",
     "test:validate": "run-s test:validate-configuration test:validate-test-app-setups",
     "clean": "rimraf tmp node_modules pnpm-lock.yaml && yarn clean:test-applications",
-    "clean:test-applications": "rimraf test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml} .last-run.json"
+    "clean:test-applications": "rimraf test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml} .last-run.json && pnpm store prune"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",

dev-packages/e2e-tests/test-applications/create-next-app/globals.d.ts

@@ -1,4 +0,0 @@
-interface Window {
-  recordedTransactions?: string[];
-  capturedExceptionId?: string;
-}

dev-packages/e2e-tests/test-applications/create-next-app/instrumentation.ts

@@ -1,33 +1,13 @@
 import * as Sentry from '@sentry/nextjs';
 
-declare global {
-  namespace globalThis {
-    var transactionIds: string[];
-  }
-}
-
 export function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
     Sentry.init({
       environment: 'qa', // dynamic sampling bias to keep transactions
       dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
       // Adjust this value in production, or use tracesSampler for greater control
       tracesSampleRate: 1.0,
-      integrations: [Sentry.localVariablesIntegration()],
-    });
-
-    Sentry.addEventProcessor(event => {
-      global.transactionIds = global.transactionIds || [];
-
-      if (event.type === 'transaction') {
-        const eventId = event.event_id;
-
-        if (eventId) {
-          global.transactionIds.push(eventId);
-        }
-      }
-
-      return event;
+      tunnel: 'http://localhost:3031',
     });
   }
 }

dev-packages/e2e-tests/test-applications/create-next-app/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "next build",
-    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml .next",
     "test:prod": "TEST_ENV=prod playwright test",
     "test:dev": "TEST_ENV=dev playwright test",
     "test:build": "pnpm install && npx playwright install && pnpm build",
@@ -23,7 +23,8 @@
     "typescript": "4.9.5"
   },
   "devDependencies": {
-    "@playwright/test": "^1.44.1"
+    "@playwright/test": "^1.44.1",
+    "@sentry-internal/test-utils": "link:../../../test-utils"
   },
   "volta": {
     "extends": "../../package.json"

dev-packages/e2e-tests/test-applications/create-next-app/pages/api/error.ts

@@ -1,11 +1,6 @@
-import * as Sentry from '@sentry/nextjs';
 // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
 import type { NextApiRequest, NextApiResponse } from 'next';
 
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const exceptionId = Sentry.captureException(new Error('This is an error'));
-
-  await Sentry.flush(2000);
-
-  res.status(200).json({ exceptionId });
+  throw new Error('I am a server error!');
 }

dev-packages/e2e-tests/test-applications/create-next-app/pages/api/success.ts

@@ -3,11 +3,9 @@ import * as Sentry from '@sentry/nextjs';
 import type { NextApiRequest, NextApiResponse } from 'next';
 
 export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  Sentry.startSpan({ name: 'test-span' }, span => undefined);
+  Sentry.startSpan({ name: 'test-span' }, () => undefined);
 
   Sentry.flush().then(() => {
-    res.status(200).json({
-      transactionIds: global.transactionIds,
-    });
+    res.status(200).json({});
   });
 }

dev-packages/e2e-tests/test-applications/create-next-app/pages/index.tsx

@@ -1,4 +1,3 @@
-import * as Sentry from '@sentry/nextjs';
 import Head from 'next/head';
 import Link from 'next/link';
 
@@ -17,8 +16,7 @@ export default function Home() {
           value="Capture Exception"
           id="exception-button"
           onClick={() => {
-            const eventId = Sentry.captureException(new Error('I am an error!'));
-            window.capturedExceptionId = eventId;
+            throw new Error('I am an error!');
           }}
         />
         <Link href="/user/5" id="navigation">

dev-packages/e2e-tests/test-applications/create-next-app/playwright.config.mjs

@@ -0,0 +1,13 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const config = getPlaywrightConfig({
+  startCommand: testEnv === 'development' ? `pnpm next dev -p 3030` : `pnpm next start -p 3030`,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/create-next-app/sentry.client.config.ts

@@ -7,26 +7,6 @@ import * as Sentry from '@sentry/nextjs';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-  // Adjust this value in production, or use tracesSampler for greater control
   tracesSampleRate: 1.0,
-
-  // ...
-  // Note: if you want to override the automatic release value, do not set a
-  // `release` value here - use the environment variable `SENTRY_RELEASE`, so
-  // that it will also get attached to your source maps
-});
-
-Sentry.addEventProcessor(event => {
-  if (
-    event.type === 'transaction' &&
-    (event.contexts?.trace?.op === 'pageload' || event.contexts?.trace?.op === 'navigation')
-  ) {
-    const eventId = event.event_id;
-    if (eventId) {
-      window.recordedTransactions = window.recordedTransactions || [];
-      window.recordedTransactions.push(eventId);
-    }
-  }
-
-  return event;
+  tunnel: 'http://localhost:3031',
 });

dev-packages/e2e-tests/test-applications/create-next-app/start-event-proxy.mjs

@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'create-next-app',
+});