Client instrumentation: onRouterTransitionStart

packages/next/src/client/app-index.tsx

@@ -159,41 +159,11 @@ const initialServerResponse = createFromReadableStream<InitialRSCPayload>(
   { callServer, findSourceMapURL }
 )
 
-// React overrides `.then` and doesn't return a new promise chain,
-// so we wrap the action queue in a promise to ensure that its value
-// is defined when the promise resolves.
-// https://github.com/facebook/react/blob/163365a07872337e04826c4f501565d43dbd2fd4/packages/react-client/src/ReactFlightClient.js#L189-L190
-const pendingActionQueue: Promise<AppRouterActionQueue> = new Promise(
-  (resolve, reject) => {
-    initialServerResponse.then(
-      (initialRSCPayload) => {
-        // setAppBuildId should be called only once, during JS initialization
-        // and before any components have hydrated.
-        setAppBuildId(initialRSCPayload.b)
-
-        const initialTimestamp = Date.now()
-
-        resolve(
-          createMutableActionQueue(
-            createInitialRouterState({
-              navigatedAt: initialTimestamp,
-              initialFlightData: initialRSCPayload.f,
-              initialCanonicalUrlParts: initialRSCPayload.c,
-              initialParallelRoutes: new Map(),
-              location: window.location,
-              couldBeIntercepted: initialRSCPayload.i,
-              postponed: initialRSCPayload.s,
-              prerendered: initialRSCPayload.S,
-            })
-          )
-        )
-      },
-      (err: Error) => reject(err)
-    )
-  }
-)
-
-function ServerRoot(): React.ReactNode {
+function ServerRoot({
+  pendingActionQueue,
+}: {
+  pendingActionQueue: Promise<AppRouterActionQueue>
+}): React.ReactNode {
   const initialRSCPayload = use(initialServerResponse)
   const actionQueue = use<AppRouterActionQueue>(pendingActionQueue)
 
@@ -241,12 +211,56 @@ const reactRootOptions: ReactDOMClient.RootOptions = {
   onUncaughtError,
 }
 
-export function hydrate() {
+export type ClientInstrumentationHooks = {
+  onRouterTransitionStart?: (
+    url: string,
+    navigationType: 'push' | 'replace' | 'traverse'
+  ) => void
+}
+
+export function hydrate(
+  instrumentationHooks: ClientInstrumentationHooks | null
+) {
+  // React overrides `.then` and doesn't return a new promise chain,
+  // so we wrap the action queue in a promise to ensure that its value
+  // is defined when the promise resolves.
+  // https://github.com/facebook/react/blob/163365a07872337e04826c4f501565d43dbd2fd4/packages/react-client/src/ReactFlightClient.js#L189-L190
+  const pendingActionQueue: Promise<AppRouterActionQueue> = new Promise(
+    (resolve, reject) => {
+      initialServerResponse.then(
+        (initialRSCPayload) => {
+          // setAppBuildId should be called only once, during JS initialization
+          // and before any components have hydrated.
+          setAppBuildId(initialRSCPayload.b)
+
+          const initialTimestamp = Date.now()
+
+          resolve(
+            createMutableActionQueue(
+              createInitialRouterState({
+                navigatedAt: initialTimestamp,
+                initialFlightData: initialRSCPayload.f,
+                initialCanonicalUrlParts: initialRSCPayload.c,
+                initialParallelRoutes: new Map(),
+                location: window.location,
+                couldBeIntercepted: initialRSCPayload.i,
+                postponed: initialRSCPayload.s,
+                prerendered: initialRSCPayload.S,
+              }),
+              instrumentationHooks
+            )
+          )
+        },
+        (err: Error) => reject(err)
+      )
+    }
+  )
+
   const reactEl = (
     <StrictModeIfEnabled>
       <HeadManagerContext.Provider value={{ appDir: true }}>
         <Root>
-          <ServerRoot />
+          <ServerRoot pendingActionQueue={pendingActionQueue} />
         </Root>
       </HeadManagerContext.Provider>
     </StrictModeIfEnabled>

packages/next/src/client/app-next-dev.ts

@@ -1,12 +1,14 @@
 // TODO-APP: hydration warning
 
 import './app-webpack'
-import '../lib/require-instrumentation-client'
+
 import { appBootstrap } from './app-bootstrap'
 import { initializeDevBuildIndicatorForAppRouter } from './dev/dev-build-indicator/initialize-for-app-router'
 
+const instrumentationHooks = require('../lib/require-instrumentation-client')
+
 appBootstrap(() => {
   const { hydrate } = require('./app-index')
-  hydrate()
+  hydrate(instrumentationHooks)
   initializeDevBuildIndicatorForAppRouter()
 })

packages/next/src/client/app-next-turbopack.ts

@@ -1,14 +1,15 @@
 // TODO-APP: hydration warning
 
-import '../lib/require-instrumentation-client'
 import { appBootstrap } from './app-bootstrap'
 
 window.next.version += '-turbo'
 ;(self as any).__webpack_hash__ = ''
 
+const instrumentationHooks = require('../lib/require-instrumentation-client')
+
 appBootstrap(() => {
   const { hydrate } = require('./app-index')
-  hydrate()
+  hydrate(instrumentationHooks)
 
   if (process.env.NODE_ENV !== 'production') {
     const { initializeDevBuildIndicatorForAppRouter } =

packages/next/src/client/app-next.ts

@@ -1,13 +1,14 @@
 // This import must go first because it needs to patch webpack chunk loading
 // before React patches chunk loading.
 import './app-webpack'
-import '../lib/require-instrumentation-client'
 import { appBootstrap } from './app-bootstrap'
 
+const instrumentationHooks = require('../lib/require-instrumentation-client')
+
 appBootstrap(() => {
   const { hydrate } = require('./app-index')
   // Include app-router and layout-router in the main chunk
   require('next/dist/client/components/app-router')
   require('next/dist/client/components/layout-router')
-  hydrate()
+  hydrate(instrumentationHooks)
 })

packages/next/src/client/components/app-router-instance.ts

@@ -25,13 +25,20 @@ import type {
   PrefetchOptions,
 } from '../../shared/lib/app-router-context.shared-runtime'
 import { setLinkForCurrentNavigation, type LinkInstance } from './links'
+import type { FlightRouterState } from '../../server/app-render/types'
+import type { ClientInstrumentationHooks } from '../app-index'
 
 export type DispatchStatePromise = React.Dispatch<ReducerState>
 
 export type AppRouterActionQueue = {
   state: AppRouterState
   dispatch: (payload: ReducerActions, setState: DispatchStatePromise) => void
   action: (state: AppRouterState, action: ReducerActions) => ReducerState
+
+  onRouterTransitionStart:
+    | ((url: string, type: 'push' | 'replace' | 'traverse') => void)
+    | null
+
   pending: ActionQueueNode | null
   needsRefresh?: boolean
   last: ActionQueueNode | null
@@ -193,7 +200,8 @@ function dispatchAction(
 let globalActionQueue: AppRouterActionQueue | null = null
 
 export function createMutableActionQueue(
-  initialState: AppRouterState
+  initialState: AppRouterState,
+  instrumentationHooks: ClientInstrumentationHooks | null
 ): AppRouterActionQueue {
   const actionQueue: AppRouterActionQueue = {
     state: initialState,
@@ -205,6 +213,12 @@ export function createMutableActionQueue(
     },
     pending: null,
     last: null,
+    onRouterTransitionStart:
+      instrumentationHooks !== null &&
+      typeof instrumentationHooks.onRouterTransitionStart === 'function'
+        ? // This profiling hook will be called at the start of every navigation.
+          instrumentationHooks.onRouterTransitionStart
+        : null,
   }
 
   if (typeof window !== 'undefined') {
@@ -236,6 +250,13 @@ function getAppRouterActionQueue(): AppRouterActionQueue {
   return globalActionQueue
 }
 
+function getProfilingHookForOnNavigationStart() {
+  if (globalActionQueue !== null) {
+    return globalActionQueue.onRouterTransitionStart
+  }
+  return null
+}
+
 export function dispatchNavigateAction(
   href: string,
   navigateType: NavigateAction['navigateType'],
@@ -251,6 +272,11 @@ export function dispatchNavigateAction(
 
   setLinkForCurrentNavigation(linkInstanceRef)
 
+  const onRouterTransitionStart = getProfilingHookForOnNavigationStart()
+  if (onRouterTransitionStart !== null) {
+    onRouterTransitionStart(href, navigateType)
+  }
+
   dispatchAppRouterAction({
     type: ACTION_NAVIGATE,
     url,
@@ -262,6 +288,21 @@ export function dispatchNavigateAction(
   })
 }
 
+export function dispatchTraverseAction(
+  href: string,
+  tree: FlightRouterState | undefined
+) {
+  const onRouterTransitionStart = getProfilingHookForOnNavigationStart()
+  if (onRouterTransitionStart !== null) {
+    onRouterTransitionStart(href, 'traverse')
+  }
+  dispatchAppRouterAction({
+    type: ACTION_RESTORE,
+    url: new URL(href),
+    tree,
+  })
+}
+
 /**
  * The app router that is exposed through `useRouter`. These are public API
  * methods. Internal Next.js code should call the lower level methods directly

packages/next/src/client/components/app-router.tsx

@@ -40,6 +40,7 @@ import { getSelectedParams } from './router-reducer/compute-changed-path'
 import type { FlightRouterState } from '../../server/app-render/types'
 import { useNavFailureHandler } from './nav-failure-handler'
 import {
+  dispatchTraverseAction,
   publicAppRouterInstance,
   type AppRouterActionQueue,
 } from './app-router-instance'
@@ -418,11 +419,10 @@ function Router({
       // TODO-APP: Ideally the back button should not use startTransition as it should apply the updates synchronously
       // Without startTransition works if the cache is there for this path
       startTransition(() => {
-        dispatchAppRouterAction({
-          type: ACTION_RESTORE,
-          url: new URL(window.location.href),
-          tree: event.state.__PRIVATE_NEXTJS_INTERNALS_TREE,
-        })
+        dispatchTraverseAction(
+          window.location.href,
+          event.state.__PRIVATE_NEXTJS_INTERNALS_TREE
+        )
       })
     }
 

packages/next/src/lib/require-instrumentation-client.ts

@@ -7,7 +7,7 @@
 if (process.env.NODE_ENV === 'development') {
   const measureName = 'Client Instrumentation Hook'
   const startTime = performance.now()
-  require('private-next-instrumentation-client')
+  module.exports = require('private-next-instrumentation-client')
   const endTime = performance.now()
 
   const duration = endTime - startTime
@@ -27,5 +27,5 @@ if (process.env.NODE_ENV === 'development') {
     )
   }
 } else {
-  require('private-next-instrumentation-client')
+  module.exports = require('private-next-instrumentation-client')
 }

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

@@ -1092,7 +1092,7 @@ function App<T>({
     prerendered: response.S,
   })
 
-  const actionQueue = createMutableActionQueue(initialState)
+  const actionQueue = createMutableActionQueue(initialState, null)
 
   const { HeadManagerContext } =
     require('../../shared/lib/head-manager-context.shared-runtime') as typeof import('../../shared/lib/head-manager-context.shared-runtime')
@@ -1159,7 +1159,7 @@ function ErrorApp<T>({
     prerendered: response.S,
   })
 
-  const actionQueue = createMutableActionQueue(initialState)
+  const actionQueue = createMutableActionQueue(initialState, null)
 
   return (
     <ServerInsertedMetadataProvider>

test/e2e/instrumentation-client-hook/app-router/app/layout.tsx

@@ -1,9 +1,19 @@
-import React from 'react'
+import Link from 'next/link'
 
 export default function RootLayout({ children }) {
   return (
     <html>
-      <body>{children}</body>
+      <body>
+        <ul>
+          <li>
+            <Link href="/">Home</Link>
+          </li>
+          <li>
+            <Link href="/some-page">Some Page</Link>
+          </li>
+        </ul>
+        {children}
+      </body>
     </html>
   )
 }

test/e2e/instrumentation-client-hook/app-router/app/page.tsx

@@ -1,5 +1,3 @@
-import React from 'react'
-
 export default function Page() {
-  return <h1>App</h1>
+  return <h1 id="home">Home</h1>
 }

test/e2e/instrumentation-client-hook/app-router/app/some-page/page.tsx

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <h1 id="some-page">Some page</h1>
+}

test/e2e/instrumentation-client-hook/app-router/instrumentation-client.ts

@@ -4,3 +4,8 @@ const start = performance.now()
 while (performance.now() - start < 20) {
   // Intentionally block for 20ms to test instrumentation timing
 }
+
+export function onRouterTransitionStart(href: string, navigateType: string) {
+  const pathname = new URL(href, window.location.href).pathname
+  console.log(`[Router Transition Start] [${navigateType}] ${pathname}`)
+}