Merge remote-tracking branch 'origin/main' into use-otel-in-runtime

package.json

@@ -60,7 +60,7 @@
  "@netlify/edge-functions": "^2.17.1",
  "@netlify/edge-functions-bootstrap": "^2.14.0",
  "@netlify/eslint-config-node": "^7.0.1",
- "@netlify/functions": "^4.2.7",
+ "@netlify/functions": "^4.3.0",
  "@netlify/otel": "^4.3.0",
  "@netlify/serverless-functions-api": "^2.5.0",
  "@netlify/zip-it-and-ship-it": "^14.1.8",

src/build/skew-protection.ts

@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from 'node:fs/promises'
 import { dirname } from 'node:path'
 
 import type { Span } from '@opentelemetry/api'
 
 import type { PluginContext } from './plugin-context.js'
 
@@ -87,10 +87,10 @@
  }
 }
 
-export const setSkewProtection = async (ctx: PluginContext, span: Span) => {
+export const setSkewProtection = async (ctx: PluginContext, span?: Span) => {
  const { enabled, enabledOrDisabledReason } = shouldEnableSkewProtection(ctx)
 
- span.setAttribute('skewProtection', enabledOrDisabledReason)
+ span?.setAttribute('skewProtection', enabledOrDisabledReason)
 
  if (!enabled) {
  if (enabledOrDisabledReason === EnabledOrDisabledReason.OPT_OUT_NO_VALID_DEPLOY_ID_ENV_VAR) {

src/index.ts

@@ -49,7 +49,7 @@ export const onPreBuild = async (options: NetlifyPluginOptions) => {
  return
  }
 
- await withActiveSpan(tracer, 'onPreBuild', async () => {
+ await withActiveSpan(tracer, 'onPreBuild', async (span) => {
  // Enable Next.js standalone mode at build time
  process.env.NEXT_PRIVATE_STANDALONE = 'true'
  const ctx = new PluginContext(options)

src/run/handlers/cache.cts

@@ -25,7 +25,13 @@ import {
 } from '../storage/storage.cjs'
 
 import { getLogger, getRequestContext } from './request-context.cjs'
-import { isAnyTagStale, markTagsAsStaleAndPurgeEdgeCache, purgeEdgeCache } from './tags-handler.cjs'
+import {
+ isAnyTagStaleOrExpired,
+ markTagsAsStaleAndPurgeEdgeCache,
+ purgeEdgeCache,
+ type RevalidateTagDurations,
+ type TagStaleOrExpiredStatus,
+} from './tags-handler.cjs'
 import { getTracer, recordWarning, withActiveSpan } from './tracer.cjs'
 
 let memoizedPrerenderManifest: PrerenderManifest
@@ -296,15 +302,15 @@ export class NetlifyCacheHandler implements CacheHandlerForMultipleVersions {
  context.softTags,
  )
 
- if (staleByTags) {
- span?.addEvent('Stale', { staleByTags, key, ttl })
+ if (expiredByTags) {
+ span?.addEvent('Expired', { expiredByTags, key, ttl })
  return null
  }
 
  this.captureResponseCacheLastModified(blob, key, span)
 
  if (staleByTags) {
- span.addEvent('Stale', { staleByTags, key, ttl })
+ span?.addEvent('Stale', { staleByTags, key, ttl })
  // note that we modify this after we capture last modified to ensure that Age is correct
  // but we still let Next.js know that entry is stale
  blob.lastModified = -1 // indicate that the entry is stale