meta(changelog): Update changelog for 9.25.1

CHANGELOG.md

@@ -1,14 +1,8 @@
 # Changelog
 
-<!-- prettier-ignore-start -->
-> [!IMPORTANT]
-> If you are upgrading to the `9.x` versions of the SDK from `8.x` or below, make sure you follow our
-> [migration guide](https://docs.sentry.io/platforms/javascript/migration/) first.
-<!-- prettier-ignore-end -->
+## 9.25.1
 
-## Unreleased
-
-- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+- fix(otel): Don't ignore child spans after the root is sent ([#16416](https://github.com/getsentry/sentry-javascript/pull/16416))
 
 ## 9.25.0
 

dev-packages/e2e-tests/test-applications/nextjs-14/playwright.config.ts

@@ -5,15 +5,9 @@ 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',
-    port: 3030,
-  },
-  {
-    // This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
-    workers: '100%',
-  },
-);
+const config = getPlaywrightConfig({
+  startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
+  port: 3030,
+});
 
 export default config;

dev-packages/e2e-tests/test-applications/nextjs-app-dir/playwright.config.mjs

@@ -5,15 +5,9 @@ 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',
-    port: 3030,
-  },
-  {
-    // This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
-    workers: '100%',
-  },
-);
+const config = getPlaywrightConfig({
+  startCommand: testEnv === 'development' ? 'pnpm next dev -p 3030' : 'pnpm next start -p 3030',
+  port: 3030,
+});
 
 export default config;

dev-packages/e2e-tests/test-applications/nextjs-orpc/.gitignore

@@ -0,0 +1,45 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+!*.d.ts
+
+# Sentry
+.sentryclirc
+
+.vscode
+
+test-results

dev-packages/e2e-tests/test-applications/nextjs-orpc/.npmrc

@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873

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

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.

dev-packages/e2e-tests/test-applications/nextjs-orpc/next.config.js

@@ -0,0 +1,8 @@
+/** @type {import("next").NextConfig} */
+const config = {};
+
+import { withSentryConfig } from '@sentry/nextjs';
+
+export default withSentryConfig(config, {
+  disableLogger: true,
+});

dev-packages/e2e-tests/test-applications/nextjs-orpc/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "next-orpc",
+  "version": "0.1.0",
+  "private": true,
+  "type": "module",
+  "scripts": {
+    "build": "next build",
+    "dev": "next dev -p 3030",
+    "start": "next start -p 3030",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:dev": "TEST_ENV=development playwright test",
+    "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm install && pnpm add next@canary && pnpm add react@beta && pnpm add react-dom@beta && pnpm build",
+    "test:build-latest": "pnpm install && pnpm add next@rc && pnpm add react@beta && pnpm add react-dom@beta && pnpm build",
+    "test:assert": "pnpm test:prod && pnpm test:dev"
+  },
+  "dependencies": {
+    "@sentry/nextjs": "latest || *",
+    "@orpc/server": "latest",
+    "@orpc/client": "latest",
+    "next": "14.2.29",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
+    "server-only": "^0.0.1"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.50.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@types/eslint": "^8.56.10",
+    "@types/node": "^18.19.1",
+    "@types/react": "18.3.1",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.1.0",
+    "@typescript-eslint/parser": "^8.1.0",
+    "eslint": "^8.57.0",
+    "eslint-config-next": "^14.2.4",
+    "postcss": "^8.4.39",
+    "prettier": "^3.3.2",
+    "typescript": "^5.5.3"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "optional": true
+  }
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/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',
+  port: 3030,
+});
+
+export default config;

dev-packages/e2e-tests/test-applications/nextjs-orpc/sentry.edge.config.ts

@@ -0,0 +1,13 @@
+// This file configures the initialization of Sentry for edge features (middleware, edge routes, and so on).
+// The config you add here will be used whenever one of the edge features is loaded.
+// Note that this config is unrelated to the Vercel Edge Runtime and is also required when running locally.
+// https://docs.sentry.io/platforms/javascript/guides/nextjs/
+
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1.0,
+});

dev-packages/e2e-tests/test-applications/nextjs-orpc/sentry.server.config.ts

@@ -0,0 +1,8 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1.0,
+});

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/client-error/page.tsx

@@ -0,0 +1,9 @@
+import { FindPlanet } from '~/components/FindPlanet';
+
+export default async function ClientErrorPage() {
+  return (
+    <main>
+      <FindPlanet withError />
+    </main>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/client/page.tsx

@@ -0,0 +1,9 @@
+import { FindPlanet } from '~/components/FindPlanet';
+
+export default async function ClientPage() {
+  return (
+    <main>
+      <FindPlanet />
+    </main>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/global-error.tsx

@@ -0,0 +1,27 @@
+'use client';
+
+import * as Sentry from '@sentry/nextjs';
+import NextError from 'next/error';
+import { useEffect } from 'react';
+
+export default function GlobalError({
+  error,
+}: {
+  error: Error & { digest?: string };
+}) {
+  useEffect(() => {
+    Sentry.captureException(error);
+  }, [error]);
+
+  return (
+    <html>
+      <body>
+        {/* `NextError` is the default Next.js error page component. Its type
+        definition requires a `statusCode` prop. However, since the App Router
+        does not expose status codes for errors, we simply pass 0 to render a
+        generic error message. */}
+        <NextError statusCode={0} />
+      </body>
+    </html>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/layout.tsx

@@ -0,0 +1,20 @@
+import '../orpc/server';
+import * as Sentry from '@sentry/nextjs';
+
+import { type Metadata } from 'next';
+
+export function generateMetadata(): Metadata {
+  return {
+    other: {
+      ...Sentry.getTraceData(),
+    },
+  };
+}
+
+export default function RootLayout({ children }: Readonly<{ children: React.ReactNode }>) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/page.tsx

@@ -0,0 +1,19 @@
+import Link from 'next/link';
+import { client } from '~/orpc/client';
+
+export default async function Home() {
+  const planets = await client.planet.list({ limit: 10 });
+
+  return (
+    <main>
+      <h1>Planets</h1>
+      <ul>
+        {planets.map(planet => (
+          <li key={planet.id}>{planet.name}</li>
+        ))}
+      </ul>
+      <Link href={'/client'}>Client</Link>
+      <Link href={'/client-error'}>Error</Link>
+    </main>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/app/rpc/[[...rest]]/route.ts

@@ -0,0 +1,22 @@
+import { RPCHandler } from '@orpc/server/fetch';
+import { router } from '~/orpc/router';
+
+const handler = new RPCHandler(router);
+
+async function handleRequest(request: Request) {
+  const { response } = await handler.handle(request, {
+    prefix: '/rpc',
+    context: {
+      headers: Object.fromEntries(request.headers.entries()),
+    },
+  });
+
+  return response ?? new Response('Not found', { status: 404 });
+}
+
+export const HEAD = handleRequest;
+export const GET = handleRequest;
+export const POST = handleRequest;
+export const PUT = handleRequest;
+export const PATCH = handleRequest;
+export const DELETE = handleRequest;

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/components/FindPlanet.tsx

@@ -0,0 +1,42 @@
+'use client';
+
+import { client } from '~/orpc/client';
+import { useEffect, useState } from 'react';
+
+type Planet = {
+  id: number;
+  name: string;
+  description?: string;
+};
+
+export function FindPlanet({ withError = false }: { withError?: boolean }) {
+  const [planet, setPlanet] = useState<Planet>();
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState<string | null>(null);
+
+  useEffect(() => {
+    async function fetchPlanet() {
+      const data = withError ? await client.planet.findWithError({ id: 1 }) : await client.planet.find({ id: 1 });
+      setPlanet(data);
+    }
+
+    setLoading(true);
+    fetchPlanet();
+    setLoading(false);
+  }, []);
+
+  if (loading) {
+    return <div>Loading planet...</div>;
+  }
+
+  if (error) {
+    return <div>Error: {error}</div>;
+  }
+
+  return (
+    <div>
+      <h1>Planet</h1>
+      <div>{planet?.name}</div>
+    </div>
+  );
+}

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/instrumentation-client.ts

@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+  debug: false,
+});
+
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

dev-packages/e2e-tests/test-applications/nextjs-orpc/src/instrumentation.ts

@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/nextjs';
+
+export async function register() {
+  if (process.env.NEXT_RUNTIME === 'nodejs') {
+    await import('../sentry.server.config');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    await import('../sentry.edge.config');
+  }
+}
+
+export const onRequestError = Sentry.captureRequestError;