fix: filter out middleware requests in logging

huozhi · huozhi · commit ec5537c8cbb4 · 2024-04-16T11:05:09.000+02:00
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -1117,12 +1117,14 @@ export default class NextNodeServer extends BaseServer<
         const { originalResponse } = normalizedRes
 
         const reqStart = Date.now()
+        const isMiddlewareRequest = req.headers['x-middleware-invoke']
 
         const reqCallback = () => {
           // we don't log for non-route requests
-          const isRouteRequest = getRequestMeta(req).match
+          const routeMatch = getRequestMeta(req).match
+
           const isRSC = isRSCRequestCheck(normalizedReq)
-          if (!isRouteRequest || isRSC) return
+          if (!routeMatch || isRSC || isMiddlewareRequest) return
 
           const reqEnd = Date.now()
           const fetchMetrics = normalizedReq.fetchMetrics || []
diff --git a/test/e2e/app-dir/logging/app/page.js b/test/e2e/app-dir/logging/app/page.js
@@ -1,3 +1,9 @@
+import Link from 'next/link'
+
 export default function Page() {
-  return 'hello world'
+  return (
+    <>
+      <Link href={'/link'}>/link</Link>
+    </>
+  )
 }
diff --git a/test/e2e/app-dir/logging/fetch-logging.test.ts b/test/e2e/app-dir/logging/fetch-logging.test.ts
@@ -4,7 +4,7 @@ import stripAnsi from 'strip-ansi'
 import { retry } from 'next-test-utils'
 import { nextTestSetup } from 'e2e-utils'
 
-const cahceReasonRe = /Cache (missed|skipped) reason: /
+const cacheReasonRegex = /Cache (missed|skipped) reason: /
 
 interface ParsedLog {
   method: string
@@ -17,13 +17,13 @@ interface ParsedLog {
 function parseLogsFromCli(cliOutput: string) {
   const logs = stripAnsi(cliOutput)
     .split('\n')
-    .filter((log) => cahceReasonRe.test(log) || log.includes('GET'))
+    .filter((log) => cacheReasonRegex.test(log) || log.includes('GET'))
 
   return logs.reduce<ParsedLog[]>((parsedLogs, log) => {
-    if (cahceReasonRe.test(log)) {
+    if (cacheReasonRegex.test(log)) {
       // cache miss/skip reason
       // Example of `log`: "│ │ Cache skipped reason: (cache: no-cache)"
-      const reasonSegment = log.split(cahceReasonRe, 3)[2].trim()
+      const reasonSegment = log.split(cacheReasonRegex, 3)[2].trim()
       const reason = reasonSegment.slice(1, -1)
       parsedLogs[parsedLogs.length - 1].cache = reason
     } else {
@@ -162,8 +162,10 @@ describe('app-dir - logging', () => {
           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')
+          expect(logs).not.toContain('/_next/static')
+          expect(logs).not.toContain('?_rsc')
+          // Only show `GET /` once
+          expect(logs.split('GET /').length).toBe(2)
         })
       }
     } else {
