drop conds, refactor tests

vercel · Jul 16, 2024 · a6fbf3a · a6fbf3a
1 parent 14982bb
commit a6fbf3a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/packages/next/src/server/dev/next-dev-server.ts b/packages/next/src/server/dev/next-dev-server.ts
@@ -290,9 +290,6 @@ export default class DevServer extends Server {
     const telemetry = new Telemetry({ distDir: this.distDir })
 
     await super.prepareImpl()
-    await this.startServerSpan
-      .traceChild('run-instrumentation-hook')
-      .traceAsyncFn(() => this.runInstrumentationHookIfAvailable())
     await this.matchers.reload()
 
     // Store globals again to preserve changes made by the instrumentation hook.
@@ -623,10 +620,10 @@ export default class DevServer extends Server {
     return instrumentationModule
   }
 
-  private async runInstrumentationHookIfAvailable() {
-    if (this.instrumentation) {
-      await this.instrumentation.register?.()
-    }
+  protected async runInstrumentationHookIfAvailable() {
+    await this.startServerSpan
+      .traceChild('run-instrumentation-hook')
+      .traceAsyncFn(() => this.instrumentation?.register?.())
   }
 
   protected async ensureEdgeFunction({

diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -306,15 +306,11 @@ export default class NextNodeServer extends BaseServer<
     // development.
   }
 
-  private isProductionInstrumentationEnabled = () => {
-    return (
+  protected async loadInstrumentationModule() {
+    if (
       !this.serverOptions.dev &&
       !!this.nextConfig.experimental.instrumentationHook
-    )
-  }
-
-  protected async loadInstrumentationModule() {
-    if (this.isProductionInstrumentationEnabled()) {
+    ) {
       try {
         this.instrumentation = await dynamicRequire(
           resolve(
@@ -336,10 +332,11 @@ export default class NextNodeServer extends BaseServer<
 
   protected async prepareImpl() {
     await super.prepareImpl()
+    await this.runInstrumentationHookIfAvailable()
+  }
 
-    if (this.isProductionInstrumentationEnabled()) {
-      await this.instrumentation?.register?.()
-    }
+  protected async runInstrumentationHookIfAvailable() {
+    await this.instrumentation?.register?.()
   }
 
   protected loadEnvConfig({

diff --git a/test/e2e/instrumentation-hook/register-once/register-once.test.ts b/test/e2e/instrumentation-hook/register-once/register-once.test.ts
@@ -12,6 +12,6 @@ describe('instrumentation-hook - register-once', () => {
 
   it('should only register once', async () => {
     await next.fetch('/foo')
-    expect(next.cliOutput.split('register-log').length).toBe(2)
+    expect(next.cliOutput).toIncludeRepeated('register-log', 1)
   })
 })