wip test

Author: Lms24

dev-packages/e2e-tests/test-applications/sveltekit/package.json

@@ -14,7 +14,9 @@
     "test:assert": "pnpm test:prod"
   },
   "dependencies": {
-    "@sentry/sveltekit": "latest || *"
+    "@sentry/sveltekit": "latest || *",
+    "@sentry/node": "latest || *",
+    "@sentry/core": "latest || *"
   },
   "devDependencies": {
     "@playwright/test": "^1.41.1",

dev-packages/e2e-tests/test-applications/sveltekit/src/hooks.server.ts

@@ -1,17 +1,25 @@
 import { env } from '$env/dynamic/private';
 import * as Sentry from '@sentry/sveltekit';
+import { sequence } from '@sveltejs/kit/hooks';
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: env.E2E_TEST_DSN,
   debug: true,
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
+  beforeSendTransaction: txn => {
+    // console.log('beforeSendTransaction', txn);
+    return txn;
+  },
 });
 
 // not logging anything to console to avoid noise in the test output
 const myErrorHandler = ({ error, event }: any) => {};
 
 export const handleError = Sentry.handleErrorWithSentry(myErrorHandler);
 
-export const handle = Sentry.sentryHandle();
+export const handle = sequence(async ({ event, resolve }) => {
+  console.log('XX event issub', event.isSubRequest, Sentry.getActiveSpan());
+  return resolve(event);
+}, Sentry.sentryHandle());

dev-packages/e2e-tests/test-applications/sveltekit/src/routes/+page.svelte

@@ -23,4 +23,6 @@
   <li>
     <a href="/universal-load-fetch">Route with fetch in universal load</a>
   </li>
+  <li>
+    <a href="/server-load-fetch">Route with nested fetch in server load</a>
 </ul>

dev-packages/e2e-tests/test-applications/sveltekit/src/routes/server-load-fetch/+page.svelte

@@ -0,0 +1,8 @@
+<script lang="ts">
+  export let data;
+</script>
+
+<main>
+  <h1>Server Load Fetch</h1>
+  <p>{JSON.stringify(data, null, 2)}</p>
+</main>

dev-packages/e2e-tests/test-applications/sveltekit/src/routes/server-load-fetch/+page.ts

@@ -0,0 +1,5 @@
+export const load = async ({ fetch }) => {
+  const res = await fetch('/api/users');
+  const data = await res.json();
+  return { data };
+};

dev-packages/e2e-tests/test-applications/sveltekit/test/performance.server.test.ts

@@ -0,0 +1,31 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '../event-proxy-server';
+
+test('server pageload request span has nested request span', async ({ page }) => {
+  const serverTxnEventPromise = waitForTransaction('sveltekit', txnEvent => {
+    console.log('txnEvent', txnEvent);
+    return txnEvent?.transaction === 'GET /server-load-fetch';
+  });
+
+  await page.goto('/server-load-fetch');
+
+  const serverTxnEvent = await serverTxnEventPromise;
+  const spans = serverTxnEvent.spans;
+
+  expect(serverTxnEvent).toMatchObject({
+    transaction: 'GET /server-load-fetch',
+    tags: { runtime: 'node' },
+    transaction_info: { source: 'route' },
+    type: 'transaction',
+    contexts: {
+      trace: {
+        op: 'http.server',
+        origin: 'auto.http.sveltekit',
+      },
+    },
+  });
+
+  console.log(JSON.stringify(spans, null, 2));
+
+  expect(spans).toHaveLength(3);
+});

packages/core/src/tracing/trace.ts

@@ -56,6 +56,8 @@ export function startSpan<T>(context: StartSpanOptions, callback: (span: Span) =
     // eslint-disable-next-line deprecation/deprecation
     const parentSpan = scope.getSpan() as SentrySpan | undefined;
 
+    console.log(`xx startSpan ${context.op} ${context.name} parentSpan`, parentSpan);
+
     const shouldSkipSpan = context.onlyIfParent && !parentSpan;
     const activeSpan = shouldSkipSpan
       ? new SentryNonRecordingSpan()
@@ -250,6 +252,8 @@ function createChildSpanOrTransaction(
     // eslint-disable-next-line deprecation/deprecation
     span = parentSpan.startChild(spanContext);
     addChildSpanToSpan(parentSpan, span);
+
+    console.log('starting child span', spanContext.op);
   } else if (parentSpan) {
     // If we forced a transaction but have a parent span, make sure to continue from the parent span, not the scope
     const dsc = getDynamicSamplingContextFromSpan(parentSpan);
@@ -267,6 +271,7 @@ function createChildSpanOrTransaction(
         ...spanContext.metadata,
       },
     });
+    console.log('starting txn (forced)', spanContext.op);
   } else {
     const { traceId, dsc, parentSpanId, sampled } = {
       ...isolationScope.getPropagationContext(),
@@ -284,6 +289,7 @@ function createChildSpanOrTransaction(
         ...spanContext.metadata,
       },
     });
+    console.log('starting txn', spanContext.op);
   }
 
   // TODO v8: Technically `startTransaction` can return undefined, which is not reflected by the types