Fix telemetry event race condition in webpack worker for @vercel/og detection (vercel#86145)

gaojude · Moroshima · commit 018472d69d1f · 2025-11-15T06:58:01.000+08:00
diff --git a/packages/next/src/build/webpack-build/impl.ts b/packages/next/src/build/webpack-build/impl.ts
@@ -414,5 +414,7 @@ export async function workerMain(workerData: {
     result.buildTraceContext!.chunksTrace!.entryNameFilesMap = entryNameFilesMap
   }
   NextBuildContext.nextBuildSpan.stop()
+  await telemetry.flush()
+
   return { ...result, debugTraceEvents: getTraceEvents() }
 }
diff --git a/test/integration/telemetry/test/config.test.ts b/test/integration/telemetry/test/config.test.ts
@@ -441,6 +441,7 @@ describe('config telemetry', () => {
       ;(process.env.IS_TURBOPACK_TEST ? it.skip : it)(
         'emits telemetry for usage of @vercel/og',
         async () => {
+          // Test vercelImageGeneration telemetry tracking
           const { stderr } = await nextBuild(appDir, [], {
             stderr: true,
             env: { NEXT_TELEMETRY_DEBUG: '1' },

Original file line number	Diff line number	Diff line change
`@@ -414,5 +414,7 @@ export async function workerMain(workerData: {`
`414`	`414`	`result.buildTraceContext!.chunksTrace!.entryNameFilesMap = entryNameFilesMap`
`415`	`415`	`}`
`416`	`416`	`NextBuildContext.nextBuildSpan.stop()`
	`417`	`+ await telemetry.flush()`
	`418`	`+`
`417`	`419`	`return { ...result, debugTraceEvents: getTraceEvents() }`
`418`	`420`	`}`