fix(log): skip logging non-route requests (#63973)

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

@@ -35,7 +35,7 @@ import type { NodeNextRequest, NodeNextResponse } from './base-http/node'
 import type { WebNextRequest, WebNextResponse } from './base-http/web'
 import type { PagesAPIRouteMatch } from './future/route-matches/pages-api-route-match'
 import type { AppRouteRouteHandlerContext } from './future/route-modules/app-route/module'
-import type { Server as HTTPServer } from 'http'
+import type { Server as HTTPServer, IncomingMessage } from 'http'
 import type { MiddlewareMatcher } from '../build/analysis/get-page-static-info'
 import type { TLSSocket } from 'tls'
 import type { PathnameNormalizer } from './future/normalizers/request/pathname-normalizer'
@@ -3489,7 +3489,9 @@ export default abstract class Server<ServerOptions extends Options = Options> {
   }
 }
 
-function isRSCRequestCheck(req: BaseNextRequest): boolean {
+export function isRSCRequestCheck(
+  req: IncomingMessage | BaseNextRequest
+): boolean {
   return (
     req.headers[RSC_HEADER.toLowerCase()] === '1' ||
     Boolean(getRequestMeta(req, 'isRSCRequest'))

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

@@ -62,7 +62,7 @@ import type {
   RouteHandler,
   NextEnabledDirectories,
 } from './base-server'
-import BaseServer, { NoFallbackError } from './base-server'
+import BaseServer, { NoFallbackError, isRSCRequestCheck } from './base-server'
 import { getMaybePagePath, getPagePath, requireFontManifest } from './require'
 import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path'
 import { normalizePagePath } from '../shared/lib/page-path/normalize-page-path'
@@ -1097,24 +1097,18 @@ export default class NextNodeServer extends BaseServer {
       if (this.renderOpts.dev) {
         const { blue, green, yellow, red, gray, white } =
           require('../lib/picocolors') as typeof import('../lib/picocolors')
-        const _req = req as NodeNextRequest | IncomingMessage
         const _res = res as NodeNextResponse | ServerResponse
-        const origReq = 'originalRequest' in _req ? _req.originalRequest : _req
         const origRes =
           'originalResponse' in _res ? _res.originalResponse : _res
 
         const reqStart = Date.now()
 
         const reqCallback = () => {
-          // if we already logged in a render worker
-          // don't log again in the router worker.
-          // we also don't log for middleware alone
-          if (
-            (normalizedReq as any).didInvokePath ||
-            origReq.headers['x-middleware-invoke']
-          ) {
-            return
-          }
+          // we don't log for non-route requests
+          const isRouteRequest = getRequestMeta(req).match
+          const isRSC = isRSCRequestCheck(req)
+          if (!isRouteRequest || isRSC) return
+
           const reqEnd = Date.now()
           const fetchMetrics = normalizedReq.fetchMetrics || []
           const reqDuration = reqEnd - reqStart

test/e2e/app-dir/logging/app/link/page.js

@@ -0,0 +1,5 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return <Link href="/foo">Trigger RSC request</Link>
+}

test/e2e/app-dir/logging/fetch-logging.test.ts

@@ -154,6 +154,17 @@ describe('app-dir - logging', () => {
             expect(output).toContain('Cache skipped reason: (cache: no-store)')
           })
         })
+
+        it('should exlucde Middleware invoked and _rsc requests', async () => {
+          const outputIndex = next.cliOutput.length
+          await next.fetch('/')
+          const browser = await next.browser('/link')
+          await browser.elementByCss('a').click()
+          await browser.waitForElementByCss('h2')
+          const logs = stripAnsi(next.cliOutput.slice(outputIndex))
+          expect(logs).not.toContain('GET /_next/static')
+          expect(logs).not.toContain('GET /foo?_rsc')
+        })
       }
     } else {
       // No fetches logging enabled

test/e2e/app-dir/logging/middleware.js

@@ -0,0 +1,2 @@
+// used to test that if Middleware is present, non-route requests are still not logged
+export function middleware() {}