Merge remote-tracking branch 'origin' into jp/sync-master

Author: JPeer264

.agents/skills/write-tests/SKILL.md

@@ -465,6 +465,22 @@ test('captures transactions for all routes', async ({ baseURL }) => {
 });
 ```
 
+### SSR hydration timing
+
+In SSR apps (Nuxt, SvelteKit, Next.js), elements are visible before framework event handlers attach.
+Playwright's actionability checks pass on server-rendered HTML, so `.click()` can fire before
+hydration, making it a no-op and timing out `waitForError`. Wait for the Sentry SDK before
+interacting:
+
+```typescript
+await page.goto(`/test-param/1234`);
+await page.waitForFunction(() => typeof window.__SENTRY__ === 'object');
+await page.locator('#errorBtn').click();
+```
+
+Don't use `networkidle`. Playwright discourages it. Use `waitForFunction` with a condition that
+directly proves readiness.
+
 ### Common pitfalls
 
 - **Proxy name mismatch:** `APP_NAME` must match `proxyServerName` in `start-event-proxy.mjs`.

dev-packages/e2e-tests/test-applications/nitro-3/package.json

@@ -19,7 +19,7 @@
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@sentry/core": "latest || *",
-    "nitro": "^3.0.260429-beta",
+    "nitro": "^3.0.260522-beta",
     "rolldown": "latest",
     "vite": "latest"
   },

dev-packages/e2e-tests/test-applications/nitro-3/tests/errors.test.ts

@@ -10,22 +10,16 @@ test('Sends an error event to Sentry', async ({ request }) => {
 
   const errorEvent = await errorEventPromise;
 
-  // Nitro wraps thrown errors in an HTTPError with .cause, producing a chained exception
-  expect(errorEvent.exception?.values).toHaveLength(2);
+  expect(errorEvent.exception?.values).toHaveLength(1);
 
-  // The innermost exception (values[0]) is the original thrown error
   expect(errorEvent.exception?.values?.[0]?.type).toBe('Error');
   expect(errorEvent.exception?.values?.[0]?.value).toBe('This is a test error');
   expect(errorEvent.exception?.values?.[0]?.mechanism).toEqual(
     expect.objectContaining({
       handled: false,
-      type: 'auto.function.nitro.captureErrorHook',
+      type: 'auto.http.nitro.onTraceError',
     }),
   );
-
-  // The outermost exception (values[1]) is the HTTPError wrapper
-  expect(errorEvent.exception?.values?.[1]?.type).toBe('HTTPError');
-  expect(errorEvent.exception?.values?.[1]?.value).toBe('This is a test error');
 });
 
 test('Does not send 404 errors to Sentry', async ({ request }) => {

dev-packages/e2e-tests/test-applications/nitro-3/tests/span-nesting.test.ts

@@ -33,17 +33,17 @@ test('Span nesting: h3 middleware spans are children of the srvx request span',
   expect(srvxSpan).toBeDefined();
 
   // All h3 middleware spans should be children of the srvx span
-  const h3Spans = event.spans?.filter(span => span.origin === 'auto.http.nitro.h3');
-  expect(h3Spans?.length).toBeGreaterThanOrEqual(1);
+  const h3MiddlewareSpans = event.spans?.filter(
+    span => span.origin === 'auto.http.nitro.h3' && span.op === 'middleware.nitro',
+  );
+  expect(h3MiddlewareSpans?.length).toBeGreaterThanOrEqual(1);
 
-  for (const span of h3Spans ?? []) {
+  for (const span of h3MiddlewareSpans ?? []) {
     expect(span.parent_span_id).toBe(srvxSpan!.span_id);
   }
 });
 
-test('Span nesting: manual startSpan calls inside route handler are children of the srvx request span', async ({
-  request,
-}) => {
+test('Span nesting: h3 route handler span is a child of the srvx request span', async ({ request }) => {
   const transactionEventPromise = waitForTransaction('nitro-3', event => {
     return event?.transaction === 'GET /api/test-nesting';
   });
@@ -52,23 +52,38 @@ test('Span nesting: manual startSpan calls inside route handler are children of
 
   const event = await transactionEventPromise;
 
-  // Find the srvx request span — this is the parent of all h3 and manual spans
   const srvxSpan = event.spans?.find(span => span.origin === 'auto.http.nitro.srvx' && span.op === 'http.server');
   expect(srvxSpan).toBeDefined();
-  const srvxSpanId = srvxSpan!.span_id;
+
+  const h3HandlerSpan = event.spans?.find(span => span.origin === 'auto.http.nitro.h3' && span.op === 'http.server');
+  expect(h3HandlerSpan).toBeDefined();
+  expect(h3HandlerSpan!.parent_span_id).toBe(srvxSpan!.span_id);
+});
+
+test('Span nesting: manual startSpan calls inside route handler are children of the h3 route handler span', async ({
+  request,
+}) => {
+  const transactionEventPromise = waitForTransaction('nitro-3', event => {
+    return event?.transaction === 'GET /api/test-nesting';
+  });
+
+  await request.get('/api/test-nesting');
+
+  const event = await transactionEventPromise;
+
+  // Find the h3 route handler span
+  const h3HandlerSpan = event.spans?.find(span => span.origin === 'auto.http.nitro.h3' && span.op === 'http.server');
+  expect(h3HandlerSpan).toBeDefined();
 
   // Find the manually created db spans
   const dbSelectSpan = event.spans?.find(span => span.op === 'db' && span.description === 'db.select');
   const dbInsertSpan = event.spans?.find(span => span.op === 'db' && span.description === 'db.insert');
   expect(dbSelectSpan).toBeDefined();
   expect(dbInsertSpan).toBeDefined();
 
-  // FIXME: Once nitro's h3 tracing plugin emits a separate span for route handlers (type: "route"),
-  // the db spans should be children of the h3 route handler span, not the srvx span directly.
-  // Currently nitro bypasses h3's ~routes for file-based routing, so h3 only emits middleware spans.
-  // Both db spans should be children of the srvx request span
-  expect(dbSelectSpan!.parent_span_id).toBe(srvxSpanId);
-  expect(dbInsertSpan!.parent_span_id).toBe(srvxSpanId);
+  // Both db spans should be children of the h3 route handler span
+  expect(dbSelectSpan!.parent_span_id).toBe(h3HandlerSpan!.span_id);
+  expect(dbInsertSpan!.parent_span_id).toBe(h3HandlerSpan!.span_id);
 
   // Both db spans should be siblings (same parent)
   expect(dbSelectSpan!.parent_span_id).toBe(dbInsertSpan!.parent_span_id);
@@ -79,49 +94,6 @@ test('Span nesting: manual startSpan calls inside route handler are children of
   expect(serializeSpan!.parent_span_id).toBe(dbInsertSpan!.span_id);
 });
 
-// FIXME: Nitro's file-based routing bypasses h3's ~routes, so h3's tracing plugin never wraps
-// route handlers with type: "route". Once this is fixed upstream or we add our own wrapping,
-// uncomment these tests to verify the h3 route handler span exists and is the parent of manual spans.
-//
-// test('Span nesting: h3 route handler span is a child of the srvx request span', async ({ request }) => {
-//   const transactionEventPromise = waitForTransaction('nitro-3', event => {
-//     return event?.transaction === 'GET /api/test-nesting';
-//   });
-//
-//   await request.get('/api/test-nesting');
-//
-//   const event = await transactionEventPromise;
-//
-//   const srvxSpan = event.spans?.find(span => span.origin === 'auto.http.nitro.srvx' && span.op === 'http.server');
-//   expect(srvxSpan).toBeDefined();
-//
-//   const h3HandlerSpan = event.spans?.find(
-//     span => span.origin === 'auto.http.nitro.h3' && span.op === 'http.server',
-//   );
-//   expect(h3HandlerSpan).toBeDefined();
-//   expect(h3HandlerSpan!.parent_span_id).toBe(srvxSpan!.span_id);
-// });
-//
-// test('Span nesting: manual startSpan calls are children of the h3 route handler span', async ({ request }) => {
-//   const transactionEventPromise = waitForTransaction('nitro-3', event => {
-//     return event?.transaction === 'GET /api/test-nesting';
-//   });
-//
-//   await request.get('/api/test-nesting');
-//
-//   const event = await transactionEventPromise;
-//
-//   const h3HandlerSpan = event.spans?.find(
-//     span => span.origin === 'auto.http.nitro.h3' && span.op === 'http.server',
-//   );
-//   expect(h3HandlerSpan).toBeDefined();
-//
-//   const dbSelectSpan = event.spans?.find(span => span.op === 'db' && span.description === 'db.select');
-//   const dbInsertSpan = event.spans?.find(span => span.op === 'db' && span.description === 'db.insert');
-//   expect(dbSelectSpan!.parent_span_id).toBe(h3HandlerSpan!.span_id);
-//   expect(dbInsertSpan!.parent_span_id).toBe(h3HandlerSpan!.span_id);
-// });
-
 test('Span nesting: middleware spans start before manual spans in the span tree', async ({ request }) => {
   const transactionEventPromise = waitForTransaction('nitro-3', event => {
     return event?.transaction === 'GET /api/test-nesting';

dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/errors.client.test.ts

@@ -35,6 +35,7 @@ test.describe('client-side errors', async () => {
     });
 
     await page.goto(`/test-param/1234`);
+    await page.waitForFunction(() => typeof window.__SENTRY__ === 'object');
     await page.locator('#errorBtn').click();
 
     const error = await errorPromise;

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

@@ -20,7 +20,7 @@
   "devDependencies": {
     "@playwright/test": "~1.56.0",
     "@sveltejs/adapter-cloudflare": "^5.0.3",
-    "@sveltejs/kit": "2.52.2",
+    "@sveltejs/kit": "2.60.1",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
     "svelte": "^5.20.2",
     "svelte-check": "^4.1.4",

packages/elysia/src/withElysia.ts

@@ -16,7 +16,7 @@ import {
   winterCGRequestToRequestData,
   withIsolationScope,
 } from '@sentry/core';
-import type { Elysia, ErrorContext, TraceHandler, TraceListener } from 'elysia';
+import type { AnyElysia, Elysia, ErrorContext, TraceHandler, TraceListener } from 'elysia';
 
 interface ElysiaHandlerOptions {
   shouldHandleError?: (context: ErrorContext) => boolean;
@@ -161,7 +161,12 @@ function instrumentLifecyclePhase(phaseName: string, listener: TraceListener, ro
  *   .listen(3000);
  * ```
  */
-export function withElysia<T extends Elysia>(app: T, options: ElysiaHandlerOptions = {}): T {
+// Using the AnyElysia type here to allow users to pass in the full set of Elysia
+// options without type errors. The `T extends Elysia` type is too narrow to allow
+// users to pass in dynamic options like `prefix` without breaking the type system.
+// See Elysia type definition and its usage of `const in out` which forces the string
+// template literals to be fully consistent for e.g. `prefix`.
+export function withElysia<T extends AnyElysia>(app: T, options: ElysiaHandlerOptions = {}): T {
   if (instrumentedApps.has(app)) {
     return app;
   }
@@ -275,7 +280,14 @@ export function withElysia<T extends Elysia>(app: T, options: ElysiaHandlerOptio
     });
   });
 
-  app.onAfterHandle({ as: 'global' }, function sentryOnAfterHandle(context) {
+  // Cast from AnyElysia to Elysia so that onAfterHandle/onError callback
+  // parameters resolve to typed contexts (e.g. ErrorContext for shouldHandleError).
+  // `AnyElysia` is needed on the user-facing `app` type to accept user instances with
+  // arbitrary generic args.
+  // The cast is safe because AnyElysia IS Elysia<any, any, ...>.
+  const elysiaApp = app as unknown as Elysia;
+
+  elysiaApp.onAfterHandle({ as: 'global' }, function sentryOnAfterHandle(context) {
     if (context.route) {
       updateRouteTransactionName(context.request, context.request.method, context.route);
     }
@@ -289,7 +301,7 @@ export function withElysia<T extends Elysia>(app: T, options: ElysiaHandlerOptio
     }
   });
 
-  app.onError({ as: 'global' }, function sentryOnError(context) {
+  elysiaApp.onError({ as: 'global' }, function sentryOnError(context) {
     if (context.route) {
       updateRouteTransactionName(context.request, context.request.method, context.route);
     }

packages/react-router/package.json

@@ -50,7 +50,7 @@
     "@opentelemetry/instrumentation": "^0.214.0",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@sentry/browser": "10.54.0",
-    "@sentry/cli": "^2.58.5",
+    "@sentry/cli": "^2.58.6",
     "@sentry/core": "10.54.0",
     "@sentry/node": "10.54.0",
     "@sentry/react": "10.54.0",

packages/remix/package.json

@@ -68,7 +68,7 @@
     "@opentelemetry/instrumentation": "^0.214.0",
     "@opentelemetry/semantic-conventions": "^1.40.0",
     "@remix-run/router": "^1.23.2",
-    "@sentry/cli": "^2.58.5",
+    "@sentry/cli": "^2.58.6",
     "@sentry/core": "10.54.0",
     "@sentry/node": "10.54.0",
     "@sentry/react": "10.54.0",

packages/tanstackstart-react/src/client/sdk.ts

@@ -18,5 +18,16 @@ export function init(options: ReactBrowserOptions): Client | undefined {
   applyTunnelRouteOption(sentryOptions);
   applySdkMetadata(sentryOptions, 'tanstackstart-react', ['tanstackstart-react', 'react']);
 
+  sentryOptions.ignoreSpans = [
+    ...(sentryOptions.ignoreSpans || []),
+    /\/node_modules\//,
+    /\/favicon\.ico/,
+    /\/@id\//,
+    /\/@react-refresh/,
+    /\/@tanstack-start\//,
+    /\/@fs\//,
+    /\/@vite\//,
+  ];
+
   return initReactSDK(sentryOptions);
 }