Merge branch 'develop' into fix/fetch-not-release

Author: Lei-k

dev-packages/e2e-tests/test-applications/astro-4/package.json

@@ -13,12 +13,12 @@
   },
   "dependencies": {
     "@astrojs/check": "0.9.2",
-    "@astrojs/node": "8.3.2",
+    "@astrojs/node": "8.3.4",
     "@playwright/test": "^1.46.0",
     "@sentry/astro": "* || latest",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@spotlightjs/astro": "2.1.6",
-    "astro": "4.13.3",
+    "astro": "4.16.18",
     "typescript": "^5.5.4"
   },
   "devDependencies": {

dev-packages/e2e-tests/test-applications/astro-4/src/env.d.ts

@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />

dev-packages/e2e-tests/test-applications/astro-5/package.json

@@ -17,5 +17,10 @@
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@sentry/astro": "^8.42.0",
     "astro": "^5.0.3"
+  },
+  "pnpm": {
+    "overrides": {
+      "esbuild": "0.24.0"
+    }
   }
 }

dev-packages/e2e-tests/test-applications/react-router-7-spa/package.json

@@ -56,5 +56,10 @@
         "label": "react-router-7-spa (TS 3.8)"
       }
     ]
+  },
+  "pnpm": {
+    "overrides": {
+      "esbuild": "0.24.0"
+    }
   }
 }

packages/astro/src/index.types.ts

@@ -26,8 +26,6 @@ export declare function flush(timeout?: number | undefined): PromiseLike<boolean
 
 // eslint-disable-next-line deprecation/deprecation
 export declare const getCurrentHub: typeof clientSdk.getCurrentHub;
-export declare const getClient: typeof clientSdk.getClient;
-export declare const continueTrace: typeof clientSdk.continueTrace;
 
 export declare const Span: clientSdk.Span;
 

packages/core/src/asyncContext/types.ts

@@ -1,6 +1,7 @@
 import type { Scope } from '../scope';
 import type { getTraceData } from '../utils/traceData';
 import type {
+  continueTrace,
   startInactiveSpan,
   startSpan,
   startSpanManual,
@@ -68,4 +69,11 @@ export interface AsyncContextStrategy {
 
   /** Get trace data as serialized string values for propagation via `sentry-trace` and `baggage`. */
   getTraceData?: typeof getTraceData;
+
+  /**
+   * Continue a trace from `sentry-trace` and `baggage` values.
+   * These values can be obtained from incoming request headers, or in the browser from `<meta name="sentry-trace">`
+   * and `<meta name="baggage">` HTML tags.
+   */
+  continueTrace?: typeof continueTrace;
 }

packages/core/src/tracing/trace.ts

@@ -192,15 +192,20 @@ export function startInactiveSpan(options: StartSpanOptions): Span {
  * be attached to the incoming trace.
  */
 export const continueTrace = <V>(
-  {
-    sentryTrace,
-    baggage,
-  }: {
+  options: {
     sentryTrace: Parameters<typeof propagationContextFromHeaders>[0];
     baggage: Parameters<typeof propagationContextFromHeaders>[1];
   },
   callback: () => V,
 ): V => {
+  const carrier = getMainCarrier();
+  const acs = getAsyncContextStrategy(carrier);
+  if (acs.continueTrace) {
+    return acs.continueTrace(options, callback);
+  }
+
+  const { sentryTrace, baggage } = options;
+
   return withScope(scope => {
     const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
     scope.setPropagationContext(propagationContext);

packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts

@@ -3,6 +3,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   captureException,
   continueTrace,
+  getActiveSpan,
   httpRequestToRequestData,
   isString,
   logger,
@@ -59,7 +60,13 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
         req.__withSentry_applied__ = true;
 
         return withIsolationScope(isolationScope => {
-          return continueTrace(
+          // Normally, there is an active span here (from Next.js OTEL) and we just use that as parent
+          // Else, we manually continueTrace from the incoming headers
+          const continueTraceIfNoActiveSpan = getActiveSpan()
+            ? <T>(_opts: unknown, callback: () => T) => callback()
+            : continueTrace;
+
+          return continueTraceIfNoActiveSpan(
             {
               sentryTrace:
                 req.headers && isString(req.headers['sentry-trace']) ? req.headers['sentry-trace'] : undefined,

packages/nextjs/src/common/withServerActionInstrumentation.ts

@@ -1,4 +1,5 @@
 import type { RequestEventData } from '@sentry/core';
+import { getActiveSpan } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SPAN_STATUS_ERROR,
@@ -95,7 +96,13 @@ async function withServerActionInstrumentationImplementation<A extends (...args:
       } satisfies RequestEventData,
     });
 
-    return continueTrace(
+    // Normally, there is an active span here (from Next.js OTEL) and we just use that as parent
+    // Else, we manually continueTrace from the incoming headers
+    const continueTraceIfNoActiveSpan = getActiveSpan()
+      ? <T>(_opts: unknown, callback: () => T) => callback()
+      : continueTrace;
+
+    return continueTraceIfNoActiveSpan(
       {
         sentryTrace: sentryTraceHeader,
         baggage: baggageHeader,

packages/nextjs/src/index.types.ts

@@ -19,10 +19,6 @@ export declare function init(
   options: Options | clientSdk.BrowserOptions | serverSdk.NodeOptions | edgeSdk.EdgeOptions,
 ): Client | undefined;
 
-export declare const getClient: typeof clientSdk.getClient;
-export declare const getRootSpan: typeof serverSdk.getRootSpan;
-export declare const continueTrace: typeof clientSdk.continueTrace;
-
 export declare const linkedErrorsIntegration: typeof clientSdk.linkedErrorsIntegration;
 export declare const contextLinesIntegration: typeof clientSdk.contextLinesIntegration;