File size: 2,547 Bytes
4514571 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | diff --git a/packages/next/src/server/lib/trace/tracer.ts b/packages/next/src/server/lib/trace/tracer.ts
index 8866835fd7..c6289289fd 100644
--- a/packages/next/src/server/lib/trace/tracer.ts
+++ b/packages/next/src/server/lib/trace/tracer.ts
@@ -242,6 +242,19 @@ class NextTracerImpl implements NextTracer {
return trace.getSpan(context?.active())
}
+ /**
+ * Run `fn` with the active span cleared, so spans created inside become new
+ * roots (or parent to incoming propagated context). Used for in-process
+ * Node.js middleware so its span is a sibling of the request span, matching
+ * edge middleware which runs in a detached sandbox.
+ */
+ public runWithDetachedContext<T>(fn: () => T): T {
+ if (!NEXT_OTEL_PERFORMANCE_PREFIX && !this.isTracingEnabled()) {
+ return fn()
+ }
+ return context.with(ROOT_CONTEXT, fn)
+ }
+
public withPropagatedContext<T, C>(
carrier: C,
fn: () => T,
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
index 4b9eb7cb47..4ab6b5c088 100644
--- a/packages/next/src/server/next-server.ts
+++ b/packages/next/src/server/next-server.ts
@@ -1730,19 +1730,25 @@ export default class NextNodeServer extends BaseServer<
Boolean(requestData.body)
try {
- result = await adapterFn({
- handler:
- middlewareModule.proxy ||
- middlewareModule.middleware ||
- middlewareModule,
- request: {
- ...requestData,
- body: hasRequestBody
- ? requestData.body.cloneBodyStream()
- : undefined,
- },
- page: 'middleware',
- })
+ // Node.js middleware runs in-process, inside the active
+ // `handleRequest` span. Detach that span so the middleware span
+ // becomes a sibling root (or parents to an incoming traceparent),
+ // matching edge middleware which runs in a detached sandbox.
+ result = await getTracer().runWithDetachedContext(() =>
+ adapterFn({
+ handler:
+ middlewareModule.proxy ||
+ middlewareModule.middleware ||
+ middlewareModule,
+ request: {
+ ...requestData,
+ body: hasRequestBody
+ ? requestData.body.cloneBodyStream()
+ : undefined,
+ },
+ page: 'middleware',
+ })
+ )
} finally {
if (hasRequestBody) {
await requestData.body.finalize()
|