@netlify/plugin-nextjs 5.3.0 → 5.4.0-canary-perf-debug.0

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -1,3 +1,4 @@
+import { enableModuleImportTracing } from '{{cwd}}/.netlify/dist/run/handlers/import-time-debug.cjs'
 import {
   createRequestContext,
   runWithRequestContext,
@@ -10,12 +11,16 @@ process.chdir('{{cwd}}')
 // Set feature flag for regional blobs
 process.env.USE_REGIONAL_BLOBS = '{{useRegionalBlobs}}'
 
+if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL || process.env.NETLIFY_NEXT_PERF_DEBUG) {
+  tracing.start()
+}
+
+if (process.env.NETLIFY_NEXT_PERF_DEBUG) {
+  enableModuleImportTracing()
+}
+
 let cachedHandler
 export default async function (req, context) {
-  if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
-    tracing.start()
-  }
-
   const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 

package/dist/build/templates/handler.tmpl.js

@@ -1,3 +1,4 @@
+import { enableModuleImportTracing } from './.netlify/dist/run/handlers/import-time-debug.cjs'
 import {
   createRequestContext,
   runWithRequestContext,
@@ -9,10 +10,15 @@ import tracing from './.netlify/dist/run/handlers/tracing.js'
 // Set feature flag for regional blobs
 process.env.USE_REGIONAL_BLOBS = '{{useRegionalBlobs}}'
 
+if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL || process.env.NETLIFY_NEXT_PERF_DEBUG) {
+  tracing.start()
+}
+
+if (process.env.NETLIFY_NEXT_PERF_DEBUG) {
+  enableModuleImportTracing()
+}
+
 export default async function handler(req, context) {
-  if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
-    tracing.start()
-  }
   const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 

package/dist/build/verification.js

@@ -65,13 +65,6 @@ function verifyNextVersion(ctx, nextVersion) {
     );
   }
 }
-function verifyBuildConfig(ctx) {
-  if (ctx.buildConfig.experimental.ppr) {
-    console.log(
-      `Partial prerendering is not yet fully supported on Netlify, see https://ntl.fyi/nextjs-ppr for details`
-    );
-  }
-}
 async function verifyNoAdvancedAPIRoutes(ctx) {
   const apiRoutesConfigs = await getAPIRoutesConfigs(ctx);
   const unsupportedAPIRoutes = apiRoutesConfigs.filter((apiRouteConfig) => {
@@ -87,7 +80,6 @@ Refer to https://ntl.fyi/next-scheduled-bg-function-migration as migration examp
   }
 }
 export {
-  verifyBuildConfig,
   verifyNextVersion,
   verifyNoAdvancedAPIRoutes,
   verifyPublishDir

package/dist/esm-chunks/{package-HC2KHZCZ.js → package-NQYUR3EH.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.3.0";
+var version = "5.4.0-canary-perf-debug.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,13 +58,13 @@ var homepage = "https://github.com/netlify/next-runtime-minimal#readme";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.3.0",
-  "@netlify/build": "^29.41.5",
+  "@netlify/build": "^29.42.2",
   "@netlify/edge-bundler": "^12.0.1",
-  "@netlify/edge-functions": "^2.8.0",
+  "@netlify/edge-functions": "^2.8.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.7.0",
-  "@netlify/serverless-functions-api": "^1.18.1",
-  "@netlify/zip-it-and-ship-it": "^9.32.2",
+  "@netlify/serverless-functions-api": "^1.18.2",
+  "@netlify/zip-it-and-ship-it": "^9.33.0",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",

package/dist/index.js

@@ -29,11 +29,7 @@ import { createEdgeHandlers } from "./build/functions/edge.js";
 import { createServerHandler } from "./build/functions/server.js";
 import { setImageConfig } from "./build/image-cdn.js";
 import { PluginContext } from "./build/plugin-context.js";
-import {
-  verifyBuildConfig,
-  verifyNoAdvancedAPIRoutes,
-  verifyPublishDir
-} from "./build/verification.js";
+import { verifyNoAdvancedAPIRoutes, verifyPublishDir } from "./build/verification.js";
 var tracer = wrapTracer(trace.getTracer("Next.js runtime"));
 var onPreDev = async (options) => {
   await tracer.withActiveSpan("onPreDev", async () => {
@@ -53,7 +49,6 @@ var onBuild = async (options) => {
   await tracer.withActiveSpan("onBuild", async (span) => {
     const ctx = new PluginContext(options);
     verifyPublishDir(ctx);
-    verifyBuildConfig(ctx);
     span.setAttribute("next.buildConfig", JSON.stringify(ctx.buildConfig));
     if (!options.constants.IS_LOCAL) {
       await saveBuildCache(ctx);

package/dist/run/handlers/cache.cjs

@@ -170,6 +170,10 @@ var NetlifyCacheHandler = class {
         span.addEvent("Cache miss", { key, blobKey });
         return null;
       }
+      if (process.env.NETLIFY_NEXT_PERF_DEBUG) {
+        const blobSize = JSON.stringify(blob).length;
+        span.addEvent(`Blob size ${blobSize}`);
+      }
       const staleByTags = await this.checkCacheEntryStaleByTags(blob, ctx.tags, ctx.softTags);
       if (staleByTags) {
         span.addEvent("Stale", { staleByTags });

package/dist/run/handlers/import-time-debug.cjs

@@ -0,0 +1,53 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/run/handlers/import-time-debug.cts
+var import_time_debug_exports = {};
+__export(import_time_debug_exports, {
+  enableModuleImportTracing: () => enableModuleImportTracing
+});
+module.exports = __toCommonJS(import_time_debug_exports);
+var import_path = require("path");
+var import_tracer = require("./tracer.cjs");
+function enableModuleImportTracing() {
+  const cwd = process.cwd();
+  const extension = ".js";
+  const original = require.extensions[extension];
+  if (!original) {
+    return;
+  }
+  require.extensions[extension] = function patchedExtensions(module2, filename) {
+    const startTime = Date.now();
+    const ret = original(module2, filename);
+    const durationMS = Date.now() - startTime;
+    if (durationMS > 50) {
+      (0, import_tracer.getTracer)().withActiveSpan(
+        `module import ${(0, import_path.relative)(cwd, module2.filename)}`,
+        { startTime },
+        () => {
+        }
+      );
+    }
+    return ret;
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  enableModuleImportTracing
+});

package/dist/run/handlers/server.js

@@ -3122,6 +3122,7 @@ var disableFaultyTransferEncodingHandling = (res) => {
 };
 var server_default = async (request, context) => {
   const tracer = getTracer();
+  const withPerfDebugSpan = process.env.NETLIFY_NEXT_PERF_DEBUG ? tracer.withActiveSpan.bind(tracer) : (_name, fn) => fn();
   if (!nextHandler) {
     await tracer.withActiveSpan("initialize next server", async (span) => {
       const { getRunConfig, setRunConfig } = await import("../config.js");
@@ -3187,9 +3188,13 @@ var server_default = async (request, context) => {
     }
     const keepOpenUntilNextFullyRendered = new TransformStream({
       async flush() {
-        await nextHandlerPromise;
+        await withPerfDebugSpan("awaiting next handler", async () => {
+          await nextHandlerPromise;
+        });
         if (!context.waitUntil) {
-          await requestContext.backgroundWorkPromise;
+          await withPerfDebugSpan("awaiting background work", async () => {
+            await requestContext.backgroundWorkPromise;
+          });
         }
       }
     });

package/dist/run/handlers/tracing.js

@@ -67215,10 +67215,10 @@ var require_sdk = __commonJS({
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             new sdk_trace_base_1.BatchSpanProcessor(configuration.traceExporter)
           );
-          const spanProcessors = (_e = configuration.spanProcessors) !== null && _e !== void 0 ? _e : [spanProcessor];
+          const spanProcessors2 = (_e = configuration.spanProcessors) !== null && _e !== void 0 ? _e : [spanProcessor];
           this._tracerProviderConfig = {
             tracerConfig: tracerProviderConfig,
-            spanProcessors,
+            spanProcessors: spanProcessors2,
             contextManager: configuration.contextManager,
             textMapPropagator: configuration.textMapPropagator
           };
@@ -67368,17 +67368,57 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { logger } from "../systemlog.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-HC2KHZCZ.js");
+} = await import("../../esm-chunks/package-NQYUR3EH.js");
+var spanProcessors = [];
+if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
+  spanProcessors.push(
+    new import_sdk_trace_node.SimpleSpanProcessor(
+      new import_exporter_trace_otlp_http.OTLPTraceExporter({
+        url: process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL
+      })
+    )
+  );
+}
+if (process.env.NETLIFY_NEXT_PERF_DEBUG) {
+  class CompactConsoleExporter {
+    export(spans, resultCallback) {
+      return this._sendSpans(spans, resultCallback);
+    }
+    shutdown() {
+      this._sendSpans([]);
+      return this.forceFlush();
+    }
+    forceFlush() {
+      return Promise.resolve();
+    }
+    _sendSpans(spans, done) {
+      for (const span of spans) {
+        const startDate = new Date(span.startTime[0] * 10 ** 3 + span.startTime[1] / 10 ** 6);
+        const durationS = span.duration[0] + span.duration[1] / 10 ** 9;
+        console.log(
+          `[Trace ${span.spanContext().traceId}] ${`"${span.name}"`.padEnd(
+            60,
+            " "
+          )} start=${startDate.toISOString()} dur=${durationS.toFixed(3)}s${span.events.length === 0 ? "" : ` events=[${span.events.map(
+            (event) => `{ name="${event.name}", time=${new Date(
+              event.time[0] * 10 ** 3 + event.time[1] / 10 ** 6
+            ).toISOString()}}`
+          ).join(", ")}]`}`
+        );
+      }
+      if (done) {
+        return done({ code: 0 });
+      }
+    }
+  }
+  spanProcessors.push(new import_sdk_trace_node.SimpleSpanProcessor(new CompactConsoleExporter()));
+}
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,
     [import_semantic_conventions.SEMRESATTRS_SERVICE_VERSION]: version
   }),
-  spanProcessor: new import_sdk_trace_node.SimpleSpanProcessor(
-    new import_exporter_trace_otlp_http.OTLPTraceExporter({
-      url: process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL
-    })
-  )
+  spanProcessors
 });
 var tracing_default = sdk;
 process.on("SIGTERM", () => {

package/dist/run/next.cjs

@@ -553,7 +553,9 @@ async function getMockedRequestHandlers(...args) {
         if (typeof path === "string" && path.endsWith(".html")) {
           const store = (0, import_regional_blob_store.getRegionalBlobStore)();
           const relPath = (0, import_path.relative)((0, import_path.resolve)(".next/server/pages"), path);
-          const file = await store.get(await encodeBlobKey(relPath));
+          const file = await (0, import_tracer.getTracer)().withActiveSpan(`blob readFile ${relPath}`, async () => {
+            return await store.get(await encodeBlobKey(relPath));
+          });
           if (file !== null) {
             const requestContext = (0, import_request_context.getRequestContext)();
             if (requestContext) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.3.0",
+  "version": "5.4.0-canary-perf-debug.0",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",