@netlify/plugin-nextjs 5.14.1 → 5.14.3

package/dist/run/handlers/use-cache-handler.js

@@ -1385,7 +1385,7 @@ import {
   isAnyTagStaleOrExpired,
   markTagsAsStaleAndPurgeEdgeCache
 } from "./tags-handler.cjs";
-import { getTracer } from "./tracer.cjs";
+import { getTracer, withActiveSpan } from "./tracer.cjs";
 var LRU_CACHE_GLOBAL_KEY = Symbol.for("nf-use-cache-handler-lru-cache");
 var PENDING_SETS_GLOBAL_KEY = Symbol.for("nf-use-cache-handler-pending-sets");
 var cacheHandlersSymbol = Symbol.for("@next/cache-handlers");
@@ -1415,11 +1415,12 @@ var tmpResolvePendingBeforeCreatingAPromise = () => {
 };
 var NetlifyDefaultUseCacheHandler = {
   get(cacheKey) {
-    return getTracer().withActiveSpan(
+    return withActiveSpan(
+      getTracer(),
       "DefaultUseCacheHandler.get",
       async (span) => {
         getLogger().withFields({ cacheKey }).debug(`[NetlifyDefaultUseCacheHandler] get`);
-        span.setAttributes({
+        span?.setAttributes({
           cacheKey
         });
         const pendingPromise = getPendingSets().get(cacheKey);
@@ -1429,7 +1430,7 @@ var NetlifyDefaultUseCacheHandler = {
         const privateEntry = getLRUCache().get(cacheKey);
         if (!privateEntry) {
           getLogger().withFields({ cacheKey, status: "MISS" }).debug(`[NetlifyDefaultUseCacheHandler] get result`);
-          span.setAttributes({
+          span?.setAttributes({
             cacheStatus: "miss"
           });
           return void 0;
@@ -1438,7 +1439,7 @@ var NetlifyDefaultUseCacheHandler = {
         const ttl = (entry.timestamp + entry.revalidate * 1e3 - Date.now()) / 1e3;
         if (ttl < 0) {
           getLogger().withFields({ cacheKey, ttl, status: "STALE" }).debug(`[NetlifyDefaultUseCacheHandler] get result`);
-          span.setAttributes({
+          span?.setAttributes({
             cacheStatus: "expired, discarded",
             ttl
           });
@@ -1447,7 +1448,7 @@ var NetlifyDefaultUseCacheHandler = {
         const { stale, expired } = await isAnyTagStaleOrExpired(entry.tags, entry.timestamp);
         if (expired) {
           getLogger().withFields({ cacheKey, ttl, status: "EXPIRED BY TAG" }).debug(`[NetlifyDefaultUseCacheHandler] get result`);
-          span.setAttributes({
+          span?.setAttributes({
             cacheStatus: "expired tag, discarded",
             ttl
           });
@@ -1460,7 +1461,7 @@ var NetlifyDefaultUseCacheHandler = {
         const [returnStream, newSaved] = value.tee();
         entry.value = newSaved;
         getLogger().withFields({ cacheKey, ttl, status: stale ? "STALE" : "HIT" }).debug(`[NetlifyDefaultUseCacheHandler] get result`);
-        span.setAttributes({
+        span?.setAttributes({
           cacheStatus: stale ? "stale" : "hit",
           ttl
         });
@@ -1473,11 +1474,12 @@ var NetlifyDefaultUseCacheHandler = {
     );
   },
   set(cacheKey, pendingEntry) {
-    return getTracer().withActiveSpan(
+    return withActiveSpan(
+      getTracer(),
       "DefaultUseCacheHandler.set",
       async (span) => {
         getLogger().withFields({ cacheKey }).debug(`[NetlifyDefaultUseCacheHandler]: set`);
-        span.setAttributes({
+        span?.setAttributes({
           cacheKey
         });
         let resolvePending = tmpResolvePendingBeforeCreatingAPromise;
@@ -1487,7 +1489,7 @@ var NetlifyDefaultUseCacheHandler = {
         const pendingSets = getPendingSets();
         pendingSets.set(cacheKey, pendingPromise);
         const entry = await pendingEntry;
-        span.setAttributes({
+        span?.setAttributes({
           cacheKey
         });
         let size = 0;
@@ -1498,7 +1500,7 @@ var NetlifyDefaultUseCacheHandler = {
           for (let chunk; !(chunk = await reader.read()).done; ) {
             size += Buffer.from(chunk.value).byteLength;
           }
-          span.setAttributes({
+          span?.setAttributes({
             tags: entry.tags,
             timestamp: entry.timestamp,
             revalidate: entry.revalidate,
@@ -1520,16 +1522,17 @@ var NetlifyDefaultUseCacheHandler = {
   async refreshTags() {
   },
   getExpiration: function(...notNormalizedTags) {
-    return getTracer().withActiveSpan(
+    return withActiveSpan(
+      getTracer(),
       "DefaultUseCacheHandler.getExpiration",
       async (span) => {
         const tags = notNormalizedTags.flat();
-        span.setAttributes({
+        span?.setAttributes({
           tags
         });
         const expiration = await getMostRecentTagExpirationTimestamp(tags);
         getLogger().withFields({ tags, expiration }).debug(`[NetlifyDefaultUseCacheHandler] getExpiration`);
-        span.setAttributes({
+        span?.setAttributes({
           expiration
         });
         return expiration;
@@ -1538,11 +1541,12 @@ var NetlifyDefaultUseCacheHandler = {
   },
   // this is for CacheHandlerV2
   expireTags(...tags) {
-    return getTracer().withActiveSpan(
+    return withActiveSpan(
+      getTracer(),
       "DefaultUseCacheHandler.expireTags",
       async (span) => {
         getLogger().withFields({ tags }).debug(`[NetlifyDefaultUseCacheHandler] expireTags`);
-        span.setAttributes({
+        span?.setAttributes({
           tags
         });
         await markTagsAsStaleAndPurgeEdgeCache(tags);
@@ -1551,11 +1555,12 @@ var NetlifyDefaultUseCacheHandler = {
   },
   // this is for CacheHandlerV3 / Next 16
   updateTags(tags, durations) {
-    return getTracer().withActiveSpan(
+    return withActiveSpan(
+      getTracer(),
       "DefaultUseCacheHandler.updateTags",
       async (span) => {
         getLogger().withFields({ tags, durations }).debug(`[NetlifyDefaultUseCacheHandler] updateTags`);
-        span.setAttributes({
+        span?.setAttributes({
           tags,
           durations: JSON.stringify(durations)
         });

package/dist/run/next.cjs

@@ -545,8 +545,7 @@ ResponseCache.prototype.get = function get(...getArgs) {
 async function getMockedRequestHandler(nextConfig, ...args) {
   const initContext = { initializingServer: true };
   const initAsyncLocalStorage = new import_node_async_hooks.AsyncLocalStorage();
-  const tracer = (0, import_tracer.getTracer)();
-  return tracer.withActiveSpan("mocked request handler", async () => {
+  return (0, import_tracer.withActiveSpan)((0, import_tracer.getTracer)(), "mocked request handler", async () => {
     const ofs = { ...import_promises.default };
     async function readFileFallbackBlobStore(...fsargs) {
       const [path, options] = fsargs;

package/dist/run/storage/storage.cjs

@@ -55,11 +55,11 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
         return memoizedValue;
       }
       const blobKey = await encodeBlobKey(key);
-      const getPromise = tracer.withActiveSpan(otelSpanTitle, async (span) => {
-        span.setAttributes({ key, blobKey });
+      const getPromise = (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
+        span?.setAttributes({ key, blobKey });
         const blob = await store.get(blobKey, { type: "json" });
         inMemoryCache.set(key, blob);
-        span.addEvent(blob ? "Hit" : "Miss");
+        span?.addEvent(blob ? "Hit" : "Miss");
         return blob;
       });
       inMemoryCache.set(key, getPromise);
@@ -69,8 +69,8 @@ var getMemoizedKeyValueStoreBackedByRegionalBlobStore = (...args) => {
       const inMemoryCache = (0, import_request_scoped_in_memory_cache.getRequestScopedInMemoryCache)();
       inMemoryCache.set(key, value);
       const blobKey = await encodeBlobKey(key);
-      return tracer.withActiveSpan(otelSpanTitle, async (span) => {
-        span.setAttributes({ key, blobKey });
+      return (0, import_tracer.withActiveSpan)(tracer, otelSpanTitle, async (span) => {
+        span?.setAttributes({ key, blobKey });
         return await store.setJSON(blobKey, value);
       });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.14.1",
+  "version": "5.14.3",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",