Hide internal fetches OTel traces in dev mode and assert duplicate OTel spans are present only in dev mode

packages/next/src/server/api-utils/node.ts

@@ -529,6 +529,7 @@ export async function apiResolver(
       res.once('pipe', () => (wasPiped = true))
     }
 
+    getTracer().getRootSpanAttributes()?.set('next.route', page)
     // Call API route method
     const apiRouteResult = await getTracer().trace(
       NodeSpan.runHandler,

packages/next/src/server/app-render/app-render.tsx

@@ -1226,6 +1226,7 @@ export async function renderToHTMLOrFlight(
       )
     }
 
+    getTracer().getRootSpanAttributes()?.set('next.route', pathname)
     const bodyResult = getTracer().wrap(
       AppRenderSpan.getBodyResult,
       {

packages/next/src/server/base-server.ts

@@ -543,6 +543,8 @@ export default abstract class Server<ServerOptions extends Options = Options> {
           'http.method': method,
           'http.target': req.url,
         },
+        // We will fire this from the renderer worker
+        hideSpan: this.serverOptions.dev && this.isRouterWorker,
       },
       async (span) =>
         this.handleRequestImpl(req, res, parsedUrl).finally(() => {
@@ -568,11 +570,13 @@ export default abstract class Server<ServerOptions extends Options = Options> {
 
           const route = rootSpanAttributes.get('next.route')
           if (route) {
+            const newName = `${method} ${route}`
             span.setAttributes({
               'next.route': route,
               'http.route': route,
+              'next.span_name': newName,
             })
-            span.updateName(`${method} ${route}`)
+            span.updateName(newName)
           }
         })
     )

packages/next/src/server/dev/next-dev-server.ts

@@ -136,7 +136,7 @@ export default class DevServer extends Server {
   private edgeFunctions?: RoutingItem[]
   private verifyingTypeScript?: boolean
   private usingTypeScript?: boolean
-  private originalFetch?: typeof fetch
+  private originalFetch: typeof fetch
   private staticPathsCache: LRUCache<
     string,
     UnwrapPromise<ReturnType<DevServer['getStaticPaths']>>
@@ -187,7 +187,7 @@ export default class DevServer extends Server {
       Error.stackTraceLimit = 50
     } catch {}
     super({ ...options, dev: true })
-    this.persistPatchedGlobals()
+    this.originalFetch = global.fetch
     this.renderOpts.dev = true
     this.renderOpts.appDirDevErrorLogger = (err: any) =>
       this.logErrorWithOriginalStack(err, 'app-dir')
@@ -1257,7 +1257,7 @@ export default class DevServer extends Server {
   private async invokeIpcMethod(method: string, args: any[]): Promise<any> {
     const ipcPort = process.env.__NEXT_PRIVATE_ROUTER_IPC_PORT
     if (ipcPort) {
-      const res = await fetch(
+      const res = await this.originalFetch(
         `http://${this.hostname}:${ipcPort}?method=${
           method as string
         }&args=${encodeURIComponent(JSON.stringify(args))}`
@@ -1703,12 +1703,8 @@ export default class DevServer extends Server {
     return nextInvoke as NonNullable<typeof result>
   }
 
-  private persistPatchedGlobals(): void {
-    this.originalFetch = global.fetch
-  }
-
   private restorePatchedGlobals(): void {
-    global.fetch = this.originalFetch!
+    global.fetch = this.originalFetch
   }
 
   protected async ensurePage(opts: {

packages/next/src/server/future/route-modules/app-route/module.ts

@@ -320,13 +320,13 @@ export class AppRouteRouteModule extends RouteModule<
               }
             )
 
+            const route = getPathnameFromAbsolutePath(this.resolvedPagePath)
+            getTracer().getRootSpanAttributes()?.set('next.route', route)
             return getTracer().trace(
               AppRouteRouteHandlersSpan.runHandler,
               {
                 // TODO: propagate this pathname from route matcher
-                spanName: `executing api route (app) ${getPathnameFromAbsolutePath(
-                  this.resolvedPagePath
-                )}`,
+                spanName: `executing api route (app) ${route}`,
               },
               () =>
                 handler(wrappedRequest, {

packages/next/src/server/lib/trace/tracer.ts

@@ -41,6 +41,7 @@ type TracerSpanOptions = Omit<SpanOptions, 'attributes'> & {
   parentSpan?: Span
   spanName?: string
   attributes?: Partial<Record<AttributeNames, AttributeValue | undefined>>
+  hideSpan?: boolean
 }
 
 interface NextTracer {
@@ -201,8 +202,9 @@ class NextTracerImpl implements NextTracer {
           }
 
     if (
-      !NextVanillaSpanAllowlist.includes(type) &&
-      process.env.NEXT_OTEL_VERBOSE !== '1'
+      (!NextVanillaSpanAllowlist.includes(type) &&
+        process.env.NEXT_OTEL_VERBOSE !== '1') ||
+      options.hideSpan
     ) {
       return fn()
     }

packages/next/src/server/next-server.ts

@@ -1054,13 +1054,18 @@ export default class NextNodeServer extends BaseServer {
     params: Params | null
     isAppPath: boolean
   }): Promise<FindComponentsResult | null> {
-    getTracer().getRootSpanAttributes()?.set('next.route', pathname)
+    let route = pathname
+    if (isAppPath) {
+      // When in App we get page instead of route
+      route = pathname.replace(/\/[^/]*$/, '')
+    }
+
     return getTracer().trace(
       NextNodeServerSpan.findPageComponents,
       {
         spanName: `resolving page into components`,
         attributes: {
-          'next.route': pathname,
+          'next.route': route,
         },
       },
       () => this.findPageComponentsImpl({ pathname, query, params, isAppPath })

packages/next/src/server/render.tsx

@@ -1361,6 +1361,7 @@ export async function renderToHTML(
     }
   }
 
+  getTracer().getRootSpanAttributes()?.set('next.route', renderOpts.pathname)
   const documentResult = await getTracer().trace(
     RenderSpan.renderDocument,
     {

test/e2e/opentelemetry/instrumentation-node-test.ts

@@ -1,11 +1,11 @@
 import { Resource } from '@opentelemetry/resources'
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 import {
-  NodeTracerProvider,
   SimpleSpanProcessor,
   SpanExporter,
   ReadableSpan,
-} from '@opentelemetry/sdk-trace-node'
+} from '@opentelemetry/sdk-trace-base'
 import {
   ExportResult,
   ExportResultCode,

test/e2e/opentelemetry/instrumentation-node.ts

@@ -1,9 +1,7 @@
 import { Resource } from '@opentelemetry/resources'
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'
-import {
-  NodeTracerProvider,
-  SimpleSpanProcessor,
-} from '@opentelemetry/sdk-trace-node'
+import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'
+import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 
 // You can use gRPC exporter instead
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'