Unverified Commit 3ac27117 authored by mknichel's avatar mknichel Committed by GitHub

[.next/trace] Record start-dev-server trace span (#58469)

This PR makes sure that the `start-dev-server` trace span is recorded to the `.next/trace` file and uploaded to the telemetry endpoint when opted in. 

Before this PR, the `start-dev-server` span was recorded in `next-dev` in the CLI. However, this would never be written to the `.next/trace` file since it happens in a different process (not the child process for next server). After this PR, the trace span happens in the next-server child process and will be recorded in the `.next/trace` file along with the other events produced by the dev server.
parent 97ba9109
...@@ -27,7 +27,6 @@ import { createSelfSignedCertificate } from '../lib/mkcert' ...@@ -27,7 +27,6 @@ import { createSelfSignedCertificate } from '../lib/mkcert'
import type { SelfSignedCertificate } from '../lib/mkcert' import type { SelfSignedCertificate } from '../lib/mkcert'
import uploadTrace from '../trace/upload-trace' import uploadTrace from '../trace/upload-trace'
import { initialEnv } from '@next/env' import { initialEnv } from '@next/env'
import { trace } from '../trace'
import { fork } from 'child_process' import { fork } from 'child_process'
import { import {
getReservedPortExplanation, getReservedPortExplanation,
...@@ -318,9 +317,7 @@ const nextDev: CliCommand = async (args) => { ...@@ -318,9 +317,7 @@ const nextDev: CliCommand = async (args) => {
} }
} }
await trace('start-dev-server').traceAsyncFn(async (_) => {
await runDevServer(false) await runDevServer(false)
})
} }
function cleanup() { function cleanup() {
......
...@@ -22,6 +22,7 @@ import { initialize } from './router-server' ...@@ -22,6 +22,7 @@ import { initialize } from './router-server'
import { CONFIG_FILES } from '../../shared/lib/constants' import { CONFIG_FILES } from '../../shared/lib/constants'
import { getStartServerInfo, logStartInfo } from './app-info-log' import { getStartServerInfo, logStartInfo } from './app-info-log'
import { validateTurboNextConfig } from '../../lib/turbopack-warning' import { validateTurboNextConfig } from '../../lib/turbopack-warning'
import { trace } from '../../trace'
import { isPostpone } from './router-utils/is-postpone' import { isPostpone } from './router-utils/is-postpone'
const debug = setupDebug('next:start-server') const debug = setupDebug('next:start-server')
...@@ -361,7 +362,9 @@ export async function startServer( ...@@ -361,7 +362,9 @@ export async function startServer(
if (process.env.NEXT_PRIVATE_WORKER && process.send) { if (process.env.NEXT_PRIVATE_WORKER && process.send) {
process.addListener('message', async (msg: any) => { process.addListener('message', async (msg: any) => {
if (msg && typeof msg && msg.nextWorkerOptions && process.send) { if (msg && typeof msg && msg.nextWorkerOptions && process.send) {
await startServer(msg.nextWorkerOptions) await trace('start-dev-server').traceAsyncFn(() =>
startServer(msg.nextWorkerOptions)
)
process.send({ nextServerReady: true }) process.send({ nextServerReady: true })
} }
}) })
......
...@@ -18,6 +18,7 @@ const EVENT_FILTER = new Set([ ...@@ -18,6 +18,7 @@ const EVENT_FILTER = new Set([
'webpack-invalid-client', 'webpack-invalid-client',
'webpack-invalidated-server', 'webpack-invalidated-server',
'navigation-to-hydration', 'navigation-to-hydration',
'start-dev-server',
]) ])
const { const {
......
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