Unverified Commit 7b48a1e2 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

fetching logging on edge (#56108)

Support fetching logging working with edge runtime. When you enable edge runtime and experimental logging config in `next.config.js` you should be able to see the data fetching logs like edge runtime

```
 GET /default-cache 200 in 4304ms
 │ GET https://next-data-api-endpoint.vercel.app/api/random?no-cache 200 in 373ms (cache: SKIP)
 │  │  Cache missed reason: (cache: no-cache)
 │  │ GET https://next-data-api-endpoint.vercel.app/api/random?force-cache 200 in 163ms (cache: SKIP)
 │  │  │  Cache missed reason: (cache-control: no-cache (hard refresh))
 │  │ GET https://next-data-api-endpoint.vercel.app/api/random?revalidate-0 200 in 196ms (cache: SKIP)
 ```

Closes #55495
Closes NEXT-1661
parent 2ff2c0b4
...@@ -148,7 +148,11 @@ export function getRender({ ...@@ -148,7 +148,11 @@ export function getRender({
const extendedRes = new WebNextResponse() const extendedRes = new WebNextResponse()
handler(extendedReq, extendedRes) handler(extendedReq, extendedRes)
const result = await extendedRes.toResponse()
return await extendedRes.toResponse() // fetchMetrics is attached to the web request that going through the server,
// wait for the handler result is ready and attach it back to the original request.
;(request as any).fetchMetrics = extendedReq.fetchMetrics
return result
} }
} }
import type { AsyncLocalStorage } from 'async_hooks' import type { AsyncLocalStorage } from 'async_hooks'
import type { IncrementalCache } from '../../server/lib/incremental-cache' import type { IncrementalCache } from '../../server/lib/incremental-cache'
import type { DynamicServerError } from './hooks-server-context' import type { DynamicServerError } from './hooks-server-context'
import type { FetchMetrics } from '../../server/base-http'
import { createAsyncLocalStorage } from './async-local-storage' import { createAsyncLocalStorage } from './async-local-storage'
export interface StaticGenerationStore { export interface StaticGenerationStore {
...@@ -36,16 +37,7 @@ export interface StaticGenerationStore { ...@@ -36,16 +37,7 @@ export interface StaticGenerationStore {
tags?: string[] tags?: string[]
revalidatedTags?: string[] revalidatedTags?: string[]
fetchMetrics?: Array<{ fetchMetrics?: FetchMetrics
url: string
idx: number
end: number
start: number
method: string
status: number
cacheReason: string
cacheStatus: 'hit' | 'miss' | 'skip'
}>
isDraftMode?: boolean isDraftMode?: boolean
} }
......
...@@ -267,6 +267,7 @@ export const renderToHTMLOrFlight: AppPageRender = ( ...@@ -267,6 +267,7 @@ export const renderToHTMLOrFlight: AppPageRender = (
`Invariant: Render expects to have staticGenerationAsyncStorage, none found` `Invariant: Render expects to have staticGenerationAsyncStorage, none found`
) )
} }
staticGenerationStore.fetchMetrics = [] staticGenerationStore.fetchMetrics = []
extraRenderResultMeta.fetchMetrics = staticGenerationStore.fetchMetrics extraRenderResultMeta.fetchMetrics = staticGenerationStore.fetchMetrics
......
...@@ -11,6 +11,17 @@ export interface BaseNextRequestConfig { ...@@ -11,6 +11,17 @@ export interface BaseNextRequestConfig {
trailingSlash?: boolean | undefined trailingSlash?: boolean | undefined
} }
export type FetchMetrics = Array<{
url: string
idx: number
end: number
start: number
method: string
status: number
cacheReason: string
cacheStatus: 'hit' | 'miss' | 'skip'
}>
export abstract class BaseNextRequest<Body = any> { export abstract class BaseNextRequest<Body = any> {
protected _cookies: NextApiRequestCookies | undefined protected _cookies: NextApiRequestCookies | undefined
public abstract headers: IncomingHttpHeaders public abstract headers: IncomingHttpHeaders
......
import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http' import type { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http'
import type { FetchMetrics } from './index'
import { toNodeOutgoingHttpHeaders } from '../web/utils' import { toNodeOutgoingHttpHeaders } from '../web/utils'
import { BaseNextRequest, BaseNextResponse } from './index' import { BaseNextRequest, BaseNextResponse } from './index'
export class WebNextRequest extends BaseNextRequest<ReadableStream | null> { export class WebNextRequest extends BaseNextRequest<ReadableStream | null> {
public request: Request public request: Request
public headers: IncomingHttpHeaders public headers: IncomingHttpHeaders
public fetchMetrics?: FetchMetrics
constructor(request: Request) { constructor(request: Request) {
const url = new URL(request.url) const url = new URL(request.url)
......
...@@ -1845,6 +1845,10 @@ export default class NextNodeServer extends BaseServer { ...@@ -1845,6 +1845,10 @@ export default class NextNodeServer extends BaseServer {
getRequestMeta(params.req, '_nextIncrementalCache'), getRequestMeta(params.req, '_nextIncrementalCache'),
}) })
if (result.fetchMetrics) {
;(params.req as any).fetchMetrics = result.fetchMetrics
}
if (!params.res.statusCode || params.res.statusCode < 400) { if (!params.res.statusCode || params.res.statusCode < 400) {
params.res.statusCode = result.response.status params.res.statusCode = result.response.status
params.res.statusMessage = result.response.statusText params.res.statusMessage = result.response.statusText
......
...@@ -23,6 +23,7 @@ import { PrerenderManifest } from '../../build' ...@@ -23,6 +23,7 @@ import { PrerenderManifest } from '../../build'
class NextRequestHint extends NextRequest { class NextRequestHint extends NextRequest {
sourcePage: string sourcePage: string
fetchMetrics?: FetchEventResult['fetchMetrics']
constructor(params: { constructor(params: {
init: RequestInit init: RequestInit
...@@ -329,5 +330,6 @@ export async function adapter( ...@@ -329,5 +330,6 @@ export async function adapter(
return { return {
response: finalResponse, response: finalResponse,
waitUntil: Promise.all(event[waitUntilSymbol]), waitUntil: Promise.all(event[waitUntilSymbol]),
fetchMetrics: request.fetchMetrics,
} }
} }
...@@ -4,6 +4,7 @@ import type { NextFetchEvent } from './spec-extension/fetch-event' ...@@ -4,6 +4,7 @@ import type { NextFetchEvent } from './spec-extension/fetch-event'
import type { NextResponse } from './spec-extension/response' import type { NextResponse } from './spec-extension/response'
import type { CloneableBody } from '../body-streams' import type { CloneableBody } from '../body-streams'
import type { OutgoingHttpHeaders } from 'http' import type { OutgoingHttpHeaders } from 'http'
import type { FetchMetrics } from '../base-http'
export interface RequestData { export interface RequestData {
geo?: { geo?: {
...@@ -37,6 +38,7 @@ export type NodejsRequestData = Omit<RequestData, 'body'> & { ...@@ -37,6 +38,7 @@ export type NodejsRequestData = Omit<RequestData, 'body'> & {
export interface FetchEventResult { export interface FetchEventResult {
response: Response response: Response
waitUntil: Promise<any> waitUntil: Promise<any>
fetchMetrics?: FetchMetrics
} }
export type NextMiddlewareResult = export type NextMiddlewareResult =
......
...@@ -49,7 +49,8 @@ createNextDescribe( ...@@ -49,7 +49,8 @@ createNextDescribe(
}, },
}, },
({ next, isNextDev }) => { ({ next, isNextDev }) => {
describe('with verbose logging', () => { function runTests({ hasLogging }: { hasLogging: boolean }) {
if (hasLogging) {
it('should only log requests in dev mode', async () => { it('should only log requests in dev mode', async () => {
const outputIndex = next.cliOutput.length const outputIndex = next.cliOutput.length
await next.fetch('/default-cache') await next.fetch('/default-cache')
...@@ -117,21 +118,15 @@ createNextDescribe( ...@@ -117,21 +118,15 @@ createNextDescribe(
log.url.includes('api/random?auto-cache') log.url.includes('api/random?auto-cache')
) )
if (logEntry?.cache === 'cache-control: no-cache (hard refresh)') { if (
logEntry?.cache === 'cache-control: no-cache (hard refresh)'
) {
return 'success' return 'success'
} }
}, 'success') }, 'success')
}) })
} }
}) } else {
describe('with default logging', () => {
beforeAll(async () => {
await next.stop()
await next.deleteFile('next.config.js')
await next.start()
})
it('should not log fetch requests at all', async () => { it('should not log fetch requests at all', async () => {
const outputIndex = next.cliOutput.length const outputIndex = next.cliOutput.length
await next.fetch('/default-cache') await next.fetch('/default-cache')
...@@ -145,6 +140,35 @@ createNextDescribe( ...@@ -145,6 +140,35 @@ createNextDescribe(
return 'success' return 'success'
}, 'success') }, 'success')
}) })
}
}
describe('with verbose logging', () => {
runTests({ hasLogging: true })
})
describe('with verbose logging for edge runtime', () => {
beforeAll(async () => {
await next.stop()
const layoutContent = await next.readFile('app/layout.js')
await next.patchFile(
'app/layout.js',
layoutContent + `\nexport const runtime = 'edge'`
)
await next.start()
})
runTests({ hasLogging: false })
})
describe('with default logging', () => {
beforeAll(async () => {
await next.stop()
await next.deleteFile('next.config.js')
await next.start()
})
runTests({ hasLogging: false })
}) })
} }
) )
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment