@cedarjs/internal 6.0.0-canary.2615 → 6.0.0-canary.2620

package/dist/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAsBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8HD,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAuBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAuID,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/build/api.js

@@ -13,6 +13,7 @@ import {
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
 import { cedarApiGraphqlPlugin } from "./esbuild-plugin-api-graphql.js";
+import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 let BUILD_CTX = null;
 const buildApi = async () => {
@@ -37,14 +38,12 @@ const cleanApiBuild = async () => {
 const runCedarBabelTransformsPlugin = {
   name: "cedar-esbuild-babel-transform",
   setup(build2) {
-    const cedarConfig = getConfig();
     build2.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
       const fileContents = await fs.promises.readFile(args.path, "utf-8");
       const transformedCode = await transformWithBabel(
         fileContents,
         args.path,
         getApiSideBabelPlugins({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: projectSideIsEsm("api")
         })
       );
@@ -59,6 +58,9 @@ const runCedarBabelTransformsPlugin = {
             projectIsEsm: isEsm
           }) ?? code;
         }
+        if (normalizedPath.startsWith(normalizePath(cedarPaths.api.src) + "/")) {
+          code = applyOtelWrapping(code, args.path, cedarPaths.api.src) ?? code;
+        }
         return {
           contents: code,
           loader: "js"
@@ -95,13 +97,15 @@ function createCedarViteApiPlugin() {
         sourceCode,
         id,
         getApiSideBabelPlugins({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: isEsm
         }),
         true
       );
       if (transformedCode?.code) {
         let code2 = transformedCode.code;
+        if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+          code2 = applyOtelWrapping(code2, id, cedarPaths.api.src) ?? code2;
+        }
         const functionsDir = normalizePath(cedarPaths.api.functions);
         if (normalizedId.startsWith(functionsDir + "/")) {
           code2 = applyHandlerAlsWrapping(code2, {

package/dist/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAc1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAmDzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAe1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA0DzB,CAAA"}

package/dist/build/esbuild-plugin-api-graphql.js

@@ -3,11 +3,12 @@ import {
   getApiSideBabelPlugins,
   transformWithBabel
 } from "@cedarjs/babel-config";
-import { getConfig, projectSideIsEsm } from "@cedarjs/project-config";
+import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import {
   applyGqlormInject,
   applyGraphqlOptionsExtract
 } from "./api-graphql-transforms.js";
+import { applyOtelWrapping } from "./esbuild-plugin-cedar-otel-wrapping.js";
 import { applyHandlerAlsWrapping } from "./esbuild-plugin-handler-als-wrapping.js";
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
@@ -21,7 +22,6 @@ const cedarApiGraphqlPlugin = {
         fileContents,
         args.path,
         getApiSideBabelPlugins({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: projectSideIsEsm("api")
         })
       );
@@ -29,6 +29,9 @@ const cedarApiGraphqlPlugin = {
         throw new Error(`Could not transform file: ${args.path}`);
       }
       let code = transformedCode.code;
+      if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+        code = applyOtelWrapping(code, args.path, getPaths().api.src) ?? code;
+      }
       code = applyHandlerAlsWrapping(code, {
         projectIsEsm: projectSideIsEsm("api")
       }) ?? code;

package/dist/build/esbuild-plugin-cedar-otel-wrapping.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Standalone esbuild equivalent of the Vite cedarOtelWrappingPlugin. Applied
+ * inline in the esbuild API build and the standalone-Vite API build so neither
+ * path depends on a Babel OTel plugin.
+ *
+ * For each `export const fn = (async?) (...) => {...}` in an API file, this
+ * wraps it with an OpenTelemetry span.
+ *
+ * Keep this in sync with
+ * packages/vite/src/plugins/vite-plugin-cedar-otel-wrapping.ts.
+ */
+export declare function applyOtelWrapping(code: string, filename: string, apiSrc: string): string | null;
+//# sourceMappingURL=esbuild-plugin-cedar-otel-wrapping.d.ts.map

package/dist/build/esbuild-plugin-cedar-otel-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-cedar-otel-wrapping.d.ts","sourceRoot":"","sources":["../../src/build/esbuild-plugin-cedar-otel-wrapping.ts"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AAEH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAmFf"}

package/dist/build/esbuild-plugin-cedar-otel-wrapping.js

@@ -0,0 +1,180 @@
+import path from "node:path";
+import { parseSync } from "oxc-parser";
+function applyOtelWrapping(code, filename, apiSrc) {
+  const relative = path.relative(apiSrc, filename);
+  const apiFolder = relative.split(path.sep)[0] ?? "?";
+  const parseResult = parseSync(filename, code, { sourceType: "module" });
+  const replacements = [];
+  for (const node of parseResult.program.body) {
+    if (node.type !== "ExportNamedDeclaration") {
+      continue;
+    }
+    const decl = node.declaration;
+    if (decl?.type !== "VariableDeclaration") {
+      continue;
+    }
+    const declarator = decl.declarations[0];
+    if (!declarator) {
+      continue;
+    }
+    const fn = declarator.init;
+    if (fn?.type !== "ArrowFunctionExpression") {
+      continue;
+    }
+    if (declarator.id.type !== "Identifier") {
+      continue;
+    }
+    const fnName = declarator.id.name;
+    const innerArgs = buildInnerArgs(fn.params);
+    if (innerArgs === null) {
+      continue;
+    }
+    const fnHeader = code.slice(fn.start, fn.body.start);
+    const originalFnSrc = code.slice(fn.start, fn.end);
+    const isAsync = fn.async;
+    const awaitKw = isAsync ? "await " : "";
+    const asyncKw = isAsync ? "async " : "";
+    replacements.push({
+      start: node.start,
+      end: node.end,
+      src: buildWrappedExport(
+        fnName,
+        fnHeader,
+        originalFnSrc,
+        innerArgs,
+        awaitKw,
+        asyncKw,
+        apiFolder,
+        filename
+      )
+    });
+  }
+  if (replacements.length === 0) {
+    return null;
+  }
+  let output = code;
+  for (let i = replacements.length - 1; i >= 0; i--) {
+    const r = replacements[i];
+    output = output.slice(0, r.start) + r.src + output.slice(r.end);
+  }
+  return `import { trace as OTEL_TRACE } from '@opentelemetry/api'
+` + output;
+}
+function buildInnerArgs(params) {
+  const args = [];
+  for (const param of params) {
+    if (param.type === "RestElement" || param.type === "ArrayPattern" || param.type === "TSParameterProperty") {
+      return null;
+    }
+    if (param.type === "Identifier") {
+      args.push(param.name);
+      continue;
+    }
+    if (param.type === "ObjectPattern") {
+      for (const prop of param.properties) {
+        if (prop.type === "RestElement") {
+          return null;
+        }
+        if (prop.key.type !== "Identifier") {
+          return null;
+        }
+        const value = prop.value;
+        if (value.type !== "Identifier" && value.type !== "AssignmentPattern" && value.type !== "ObjectPattern") {
+          return null;
+        }
+        if (value.type === "AssignmentPattern") {
+          if (value.left.type !== "Identifier" && value.left.type !== "ObjectPattern") {
+            return null;
+          }
+        }
+      }
+      const obj = buildObjectCallArg(param);
+      if (obj === null) {
+        return null;
+      }
+      args.push(obj);
+      continue;
+    }
+    if (param.type === "AssignmentPattern") {
+      const ap = param;
+      if (ap.left.type === "Identifier") {
+        args.push(ap.left.name);
+      } else if (ap.left.type === "ObjectPattern") {
+        const obj = buildObjectCallArg(ap.left);
+        if (obj === null) {
+          return null;
+        }
+        args.push(obj);
+      } else {
+        return null;
+      }
+      continue;
+    }
+    return null;
+  }
+  return args.join(", ");
+}
+function buildObjectCallArg(pattern) {
+  const keys = [];
+  for (const prop of pattern.properties) {
+    if (prop.type === "RestElement") {
+      return null;
+    }
+    if (prop.key.type !== "Identifier") {
+      return null;
+    }
+    const keyName = prop.key.name;
+    let valueName = null;
+    if (prop.value.type === "Identifier") {
+      valueName = prop.value.name;
+    } else if (prop.value.type === "AssignmentPattern") {
+      if (prop.value.left.type === "Identifier") {
+        valueName = prop.value.left.name;
+      } else {
+        return null;
+      }
+    } else {
+      return null;
+    }
+    if (valueName !== keyName) {
+      keys.push(`${keyName}: ${valueName}`);
+    } else {
+      keys.push(keyName);
+    }
+  }
+  return `{ ${keys.join(", ")} }`;
+}
+function buildWrappedExport(fnName, fnHeader, originalFnSrc, innerArgs, awaitKw, asyncKw, apiFolder, filename) {
+  const privateName = `__${fnName}`;
+  const spanName = `redwoodjs:api:${apiFolder}:${fnName}`;
+  return `export const ${fnName} = ${fnHeader}{
+  const ${privateName} = ${originalFnSrc}
+  const OTEL_TRACER = OTEL_TRACE.getTracer('redwoodjs')
+  const OTEL_RESULT = ${awaitKw}OTEL_TRACER.startActiveSpan(
+    '${spanName}',
+    ${asyncKw}(span) => {
+      span.setAttribute('code.function', '${fnName}')
+      span.setAttribute('code.filepath', ${JSON.stringify(filename)})
+      try {
+        const OTEL_INNER_RESULT = ${awaitKw}${privateName}(${innerArgs})
+        span.end()
+        return OTEL_INNER_RESULT
+      } catch (error) {
+        span.recordException(error)
+        span.setStatus({
+          code: 2,
+          message:
+            error?.message?.split('\\n')[0] ??
+            error?.toString()?.split('\\n')[0],
+        })
+        span.end()
+        throw error
+      }
+    }
+  )
+  return OTEL_RESULT
+}`;
+}
+export {
+  applyOtelWrapping
+};

package/dist/build/esbuild-plugin-handler-als-wrapping.js

@@ -7,25 +7,25 @@ function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
   const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);
   const after = code.slice(handlerStart);
-  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const renamed = after.replace(handlerRe, "const __cedar_handler =");
   const wrappedHandler = `
-export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+export const handler = ${isAsync ? "async " : ""}(__cedar_event, __cedar_context) => {
   // The store will be undefined if no context isolation has been performed yet
-  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
-  if (__rw_contextStore === undefined) {
-    return __rw_getAsyncStoreInstance().run(
+  const __cedar_contextStore = __cedar_getAsyncStoreInstance().getStore()
+  if (__cedar_contextStore === undefined) {
+    return __cedar_getAsyncStoreInstance().run(
       new Map(),
-      __rw_handler,
-      __rw_event,
-      __rw__context
+      __cedar_handler,
+      __cedar_event,
+      __cedar_context
     )
   }
-  return __rw_handler(__rw_event, __rw__context)
+  return __cedar_handler(__cedar_event, __cedar_context)
 }
 `;
   return before + importStatement + renamed + wrappedHandler;

package/dist/cjs/build/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAsBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AA8HD,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/build/api.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAgB,YAAY,EAAe,MAAM,SAAS,CAAA;AAuBtE,eAAO,MAAM,QAAQ,4DAIpB,CAAA;AAED,eAAO,MAAM,UAAU,4DAStB,CAAA;AAED,eAAO,MAAM,aAAa,qBAGzB,CAAA;AAuID,eAAO,MAAM,gBAAgB,iHAqD5B,CAAA;AAcD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CAoDf"}

package/dist/cjs/build/api.js

@@ -44,6 +44,7 @@ var import_project_config = require("@cedarjs/project-config");
 var import_files = require("../files.js");
 var import_api_graphql_transforms = require("./api-graphql-transforms.js");
 var import_esbuild_plugin_api_graphql = require("./esbuild-plugin-api-graphql.js");
+var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 let BUILD_CTX = null;
 const buildApi = async () => {
@@ -68,14 +69,12 @@ const cleanApiBuild = async () => {
 const runCedarBabelTransformsPlugin = {
   name: "cedar-esbuild-babel-transform",
   setup(build2) {
-    const cedarConfig = (0, import_project_config.getConfig)();
     build2.onLoad({ filter: /\.(js|ts|tsx|jsx)$/ }, async (args) => {
       const fileContents = await import_node_fs.default.promises.readFile(args.path, "utf-8");
       const transformedCode = await (0, import_babel_config.transformWithBabel)(
         fileContents,
         args.path,
         (0, import_babel_config.getApiSideBabelPlugins)({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
         })
       );
@@ -90,6 +89,9 @@ const runCedarBabelTransformsPlugin = {
             projectIsEsm: isEsm
           }) ?? code;
         }
+        if (normalizedPath.startsWith((0, import_vite.normalizePath)(cedarPaths.api.src) + "/")) {
+          code = (0, import_esbuild_plugin_cedar_otel_wrapping.applyOtelWrapping)(code, args.path, cedarPaths.api.src) ?? code;
+        }
         return {
           contents: code,
           loader: "js"
@@ -126,13 +128,15 @@ function createCedarViteApiPlugin() {
         sourceCode,
         id,
         (0, import_babel_config.getApiSideBabelPlugins)({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: isEsm
         }),
         true
       );
       if (transformedCode?.code) {
         let code2 = transformedCode.code;
+        if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+          code2 = (0, import_esbuild_plugin_cedar_otel_wrapping.applyOtelWrapping)(code2, id, cedarPaths.api.src) ?? code2;
+        }
         const functionsDir = (0, import_vite.normalizePath)(cedarPaths.api.functions);
         if (normalizedId.startsWith(functionsDir + "/")) {
           code2 = (0, import_esbuild_plugin_handler_als_wrapping.applyHandlerAlsWrapping)(code2, {

package/dist/cjs/build/esbuild-plugin-api-graphql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAc1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CAmDzB,CAAA"}
+{"version":3,"file":"esbuild-plugin-api-graphql.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-api-graphql.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAe1C,eAAO,MAAM,qBAAqB;;iBAEnB,WAAW;CA0DzB,CAAA"}

package/dist/cjs/build/esbuild-plugin-api-graphql.js

@@ -35,6 +35,7 @@ var import_node_fs = __toESM(require("node:fs"), 1);
 var import_babel_config = require("@cedarjs/babel-config");
 var import_project_config = require("@cedarjs/project-config");
 var import_api_graphql_transforms = require("./api-graphql-transforms.js");
+var import_esbuild_plugin_cedar_otel_wrapping = require("./esbuild-plugin-cedar-otel-wrapping.js");
 var import_esbuild_plugin_handler_als_wrapping = require("./esbuild-plugin-handler-als-wrapping.js");
 const cedarApiGraphqlPlugin = {
   name: "cedar-api-graphql",
@@ -48,7 +49,6 @@ const cedarApiGraphqlPlugin = {
         fileContents,
         args.path,
         (0, import_babel_config.getApiSideBabelPlugins)({
-          openTelemetry: cedarConfig.experimental.opentelemetry.enabled && cedarConfig.experimental.opentelemetry.wrapApi,
           projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
         })
       );
@@ -56,6 +56,9 @@ const cedarApiGraphqlPlugin = {
         throw new Error(`Could not transform file: ${args.path}`);
       }
       let code = transformedCode.code;
+      if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+        code = (0, import_esbuild_plugin_cedar_otel_wrapping.applyOtelWrapping)(code, args.path, (0, import_project_config.getPaths)().api.src) ?? code;
+      }
       code = (0, import_esbuild_plugin_handler_als_wrapping.applyHandlerAlsWrapping)(code, {
         projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
       }) ?? code;

package/dist/cjs/build/esbuild-plugin-cedar-otel-wrapping.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Standalone esbuild equivalent of the Vite cedarOtelWrappingPlugin. Applied
+ * inline in the esbuild API build and the standalone-Vite API build so neither
+ * path depends on a Babel OTel plugin.
+ *
+ * For each `export const fn = (async?) (...) => {...}` in an API file, this
+ * wraps it with an OpenTelemetry span.
+ *
+ * Keep this in sync with
+ * packages/vite/src/plugins/vite-plugin-cedar-otel-wrapping.ts.
+ */
+export declare function applyOtelWrapping(code: string, filename: string, apiSrc: string): string | null;
+//# sourceMappingURL=esbuild-plugin-cedar-otel-wrapping.d.ts.map

package/dist/cjs/build/esbuild-plugin-cedar-otel-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"esbuild-plugin-cedar-otel-wrapping.d.ts","sourceRoot":"","sources":["../../../src/build/esbuild-plugin-cedar-otel-wrapping.ts"],"names":[],"mappings":"AASA;;;;;;;;;;GAUG;AAEH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,MAAM,GAAG,IAAI,CAmFf"}

package/dist/cjs/build/esbuild-plugin-cedar-otel-wrapping.js

@@ -0,0 +1,214 @@
+"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var esbuild_plugin_cedar_otel_wrapping_exports = {};
+__export(esbuild_plugin_cedar_otel_wrapping_exports, {
+  applyOtelWrapping: () => applyOtelWrapping
+});
+module.exports = __toCommonJS(esbuild_plugin_cedar_otel_wrapping_exports);
+var import_node_path = __toESM(require("node:path"), 1);
+var import_oxc_parser = require("oxc-parser");
+function applyOtelWrapping(code, filename, apiSrc) {
+  const relative = import_node_path.default.relative(apiSrc, filename);
+  const apiFolder = relative.split(import_node_path.default.sep)[0] ?? "?";
+  const parseResult = (0, import_oxc_parser.parseSync)(filename, code, { sourceType: "module" });
+  const replacements = [];
+  for (const node of parseResult.program.body) {
+    if (node.type !== "ExportNamedDeclaration") {
+      continue;
+    }
+    const decl = node.declaration;
+    if (decl?.type !== "VariableDeclaration") {
+      continue;
+    }
+    const declarator = decl.declarations[0];
+    if (!declarator) {
+      continue;
+    }
+    const fn = declarator.init;
+    if (fn?.type !== "ArrowFunctionExpression") {
+      continue;
+    }
+    if (declarator.id.type !== "Identifier") {
+      continue;
+    }
+    const fnName = declarator.id.name;
+    const innerArgs = buildInnerArgs(fn.params);
+    if (innerArgs === null) {
+      continue;
+    }
+    const fnHeader = code.slice(fn.start, fn.body.start);
+    const originalFnSrc = code.slice(fn.start, fn.end);
+    const isAsync = fn.async;
+    const awaitKw = isAsync ? "await " : "";
+    const asyncKw = isAsync ? "async " : "";
+    replacements.push({
+      start: node.start,
+      end: node.end,
+      src: buildWrappedExport(
+        fnName,
+        fnHeader,
+        originalFnSrc,
+        innerArgs,
+        awaitKw,
+        asyncKw,
+        apiFolder,
+        filename
+      )
+    });
+  }
+  if (replacements.length === 0) {
+    return null;
+  }
+  let output = code;
+  for (let i = replacements.length - 1; i >= 0; i--) {
+    const r = replacements[i];
+    output = output.slice(0, r.start) + r.src + output.slice(r.end);
+  }
+  return `import { trace as OTEL_TRACE } from '@opentelemetry/api'
+` + output;
+}
+function buildInnerArgs(params) {
+  const args = [];
+  for (const param of params) {
+    if (param.type === "RestElement" || param.type === "ArrayPattern" || param.type === "TSParameterProperty") {
+      return null;
+    }
+    if (param.type === "Identifier") {
+      args.push(param.name);
+      continue;
+    }
+    if (param.type === "ObjectPattern") {
+      for (const prop of param.properties) {
+        if (prop.type === "RestElement") {
+          return null;
+        }
+        if (prop.key.type !== "Identifier") {
+          return null;
+        }
+        const value = prop.value;
+        if (value.type !== "Identifier" && value.type !== "AssignmentPattern" && value.type !== "ObjectPattern") {
+          return null;
+        }
+        if (value.type === "AssignmentPattern") {
+          if (value.left.type !== "Identifier" && value.left.type !== "ObjectPattern") {
+            return null;
+          }
+        }
+      }
+      const obj = buildObjectCallArg(param);
+      if (obj === null) {
+        return null;
+      }
+      args.push(obj);
+      continue;
+    }
+    if (param.type === "AssignmentPattern") {
+      const ap = param;
+      if (ap.left.type === "Identifier") {
+        args.push(ap.left.name);
+      } else if (ap.left.type === "ObjectPattern") {
+        const obj = buildObjectCallArg(ap.left);
+        if (obj === null) {
+          return null;
+        }
+        args.push(obj);
+      } else {
+        return null;
+      }
+      continue;
+    }
+    return null;
+  }
+  return args.join(", ");
+}
+function buildObjectCallArg(pattern) {
+  const keys = [];
+  for (const prop of pattern.properties) {
+    if (prop.type === "RestElement") {
+      return null;
+    }
+    if (prop.key.type !== "Identifier") {
+      return null;
+    }
+    const keyName = prop.key.name;
+    let valueName = null;
+    if (prop.value.type === "Identifier") {
+      valueName = prop.value.name;
+    } else if (prop.value.type === "AssignmentPattern") {
+      if (prop.value.left.type === "Identifier") {
+        valueName = prop.value.left.name;
+      } else {
+        return null;
+      }
+    } else {
+      return null;
+    }
+    if (valueName !== keyName) {
+      keys.push(`${keyName}: ${valueName}`);
+    } else {
+      keys.push(keyName);
+    }
+  }
+  return `{ ${keys.join(", ")} }`;
+}
+function buildWrappedExport(fnName, fnHeader, originalFnSrc, innerArgs, awaitKw, asyncKw, apiFolder, filename) {
+  const privateName = `__${fnName}`;
+  const spanName = `redwoodjs:api:${apiFolder}:${fnName}`;
+  return `export const ${fnName} = ${fnHeader}{
+  const ${privateName} = ${originalFnSrc}
+  const OTEL_TRACER = OTEL_TRACE.getTracer('redwoodjs')
+  const OTEL_RESULT = ${awaitKw}OTEL_TRACER.startActiveSpan(
+    '${spanName}',
+    ${asyncKw}(span) => {
+      span.setAttribute('code.function', '${fnName}')
+      span.setAttribute('code.filepath', ${JSON.stringify(filename)})
+      try {
+        const OTEL_INNER_RESULT = ${awaitKw}${privateName}(${innerArgs})
+        span.end()
+        return OTEL_INNER_RESULT
+      } catch (error) {
+        span.recordException(error)
+        span.setStatus({
+          code: 2,
+          message:
+            error?.message?.split('\\n')[0] ??
+            error?.toString()?.split('\\n')[0],
+        })
+        span.end()
+        throw error
+      }
+    }
+  )
+  return OTEL_RESULT
+}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  applyOtelWrapping
+});

package/dist/cjs/build/esbuild-plugin-handler-als-wrapping.js

@@ -30,25 +30,25 @@ function applyHandlerAlsWrapping(code, { projectIsEsm = false } = {}) {
   const afterEquals = code.slice(handlerMatch.index + handlerMatch[0].length).trimStart();
   const isAsync = /^async(?:\s*[\(\*]|\s+function)/.test(afterEquals);
   const storePath = projectIsEsm ? "@cedarjs/context/dist/store.js" : "@cedarjs/context/dist/store";
-  const importStatement = `import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '${storePath}'
+  const importStatement = `import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '${storePath}'
 `;
   const handlerStart = handlerMatch.index;
   const before = code.slice(0, handlerStart);
   const after = code.slice(handlerStart);
-  const renamed = after.replace(handlerRe, "const __rw_handler =");
+  const renamed = after.replace(handlerRe, "const __cedar_handler =");
   const wrappedHandler = `
-export const handler = ${isAsync ? "async " : ""}(__rw_event, __rw__context) => {
+export const handler = ${isAsync ? "async " : ""}(__cedar_event, __cedar_context) => {
   // The store will be undefined if no context isolation has been performed yet
-  const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
-  if (__rw_contextStore === undefined) {
-    return __rw_getAsyncStoreInstance().run(
+  const __cedar_contextStore = __cedar_getAsyncStoreInstance().getStore()
+  if (__cedar_contextStore === undefined) {
+    return __cedar_getAsyncStoreInstance().run(
       new Map(),
-      __rw_handler,
-      __rw_event,
-      __rw__context
+      __cedar_handler,
+      __cedar_event,
+      __cedar_context
     )
   }
-  return __rw_handler(__rw_event, __rw__context)
+  return __cedar_handler(__cedar_event, __cedar_context)
 }
 `;
   return before + importStatement + renamed + wrappedHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cedarjs/internal",
-  "version": "6.0.0-canary.2615",
+  "version": "6.0.0-canary.2620",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/cedarjs/cedar.git",
@@ -169,13 +169,13 @@
     "@babel/plugin-transform-react-jsx": "7.29.7",
     "@babel/plugin-transform-typescript": "^7.26.8",
     "@babel/traverse": "7.29.7",
-    "@cedarjs/babel-config": "6.0.0-canary.2615",
-    "@cedarjs/cli-helpers": "6.0.0-canary.2615",
-    "@cedarjs/graphql-server": "6.0.0-canary.2615",
-    "@cedarjs/project-config": "6.0.0-canary.2615",
-    "@cedarjs/router": "6.0.0-canary.2615",
-    "@cedarjs/structure": "6.0.0-canary.2615",
-    "@cedarjs/utils": "6.0.0-canary.2615",
+    "@cedarjs/babel-config": "6.0.0-canary.2620",
+    "@cedarjs/cli-helpers": "6.0.0-canary.2620",
+    "@cedarjs/graphql-server": "6.0.0-canary.2620",
+    "@cedarjs/project-config": "6.0.0-canary.2620",
+    "@cedarjs/router": "6.0.0-canary.2620",
+    "@cedarjs/structure": "6.0.0-canary.2620",
+    "@cedarjs/utils": "6.0.0-canary.2620",
     "@graphql-codegen/add": "6.0.1",
     "@graphql-codegen/cli": "6.3.1",
     "@graphql-codegen/client-preset": "5.3.0",
@@ -217,7 +217,7 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/framework-tools": "6.0.0-canary.2615",
+    "@cedarjs/framework-tools": "6.0.0-canary.2620",
     "concurrently": "9.2.1",
     "graphql-tag": "2.12.6",
     "publint": "0.3.21",