@cedarjs/vite 6.0.0-canary.2615 → 6.0.0-canary.2619

package/dist/apiDevMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA6BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CA+FlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}
+{"version":3,"file":"apiDevMiddleware.d.ts","sourceRoot":"","sources":["../src/apiDevMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAc,aAAa,EAAE,MAAM,MAAM,CAAA;AA8BrD,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,aAAa,iBAe/D;AA+GD,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,CAsGlE;AA0BD,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,aAAa,GAAG,IAAI,CA0EhE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,KAIrB,SAAS,OAAO,KAAG,OAAO,CAAC,QAAQ,CAAC,CAoFnD;AAED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC;IACrD,UAAU,EAAE,aAAa,CAAA;IACzB,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1B,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAA;CACjD,CAAC,CAcD"}

package/dist/apiDevMiddleware.js

@@ -14,6 +14,7 @@ import { applyGqlormInject } from "@cedarjs/internal/dist/build/api-graphql-tran
 import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { applyGraphqlOptionsExtract } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { applyOtelWrapping } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 const LAMBDA_FUNCTIONS = {};
 let graphqlYoga = null;
 let loadApiFunctionsInFlight = null;
@@ -120,7 +121,6 @@ async function createApiViteServer() {
   const isEsm = projectSideIsEsm("api");
   const normalizedBase = normalizePath(cedarPaths.base);
   const babelPlugins = getApiSideBabelPlugins({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -161,6 +161,13 @@ async function createApiViteServer() {
               sourceCode = applyGraphqlOptionsExtract(sourceCode) ?? sourceCode;
               sourceCode = applyGqlormInject(sourceCode, id) ?? sourceCode;
             }
+            if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+              const relativePath = normalizePath(id).slice(
+                normalizedBase.length + "/api/src/".length
+              );
+              const apiFolder = relativePath.split("/")[0] ?? "?";
+              sourceCode = applyOtelWrapping(sourceCode, id, apiFolder) ?? sourceCode;
+            }
             const result = await transformWithBabel(
               sourceCode,
               id,

package/dist/buildApp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAiCA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBAgV3B"}
+{"version":3,"file":"buildApp.d.ts","sourceRoot":"","sources":["../src/buildApp.ts"],"names":[],"mappings":"AAkCA,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;IACpB,EAAE,CAAC,EAAE,OAAO,CAAA;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CAAC,EAClC,OAAe,EACf,SAA0B,EAC1B,EAAU,GACX,GAAE,oBAAyB,iBA8U3B"}

package/dist/buildApp.js

@@ -12,6 +12,7 @@ import { getConfig, getPaths, projectSideIsEsm } from "@cedarjs/project-config";
 import { getWorkspacePackageAliases } from "./lib/workspacePackageAliases.js";
 import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
 import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
+import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
 import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
 function resolveWithExtensions(id) {
   if (fs.existsSync(id)) {
@@ -102,7 +103,6 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? getApiSideBabelPlugins({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: projectSideIsEsm("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -228,6 +228,7 @@ async function buildCedarApp({
   if (workspace.includes("api")) {
     plugins.push(cedarGraphqlOptionsExtractPlugin());
     plugins.push(cedarGqlormInjectPlugin());
+    plugins.push(cedarOtelWrappingPlugin());
     plugins.push(
       handlerAlsWrappingPlugin({ projectIsEsm: projectSideIsEsm("api") })
     );

package/dist/cjs/apiDevMiddleware.js

@@ -48,6 +48,7 @@ var import_api_graphql_transforms = require("@cedarjs/internal/dist/build/api-gr
 var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 const LAMBDA_FUNCTIONS = {};
 let graphqlYoga = null;
 let loadApiFunctionsInFlight = null;
@@ -154,7 +155,6 @@ async function createApiViteServer() {
   const isEsm = (0, import_project_config.projectSideIsEsm)("api");
   const normalizedBase = (0, import_vite.normalizePath)(cedarPaths.base);
   const babelPlugins = (0, import_babel_config.getApiSideBabelPlugins)({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: isEsm
   });
   const workspacePkgSourceMap = Object.fromEntries(
@@ -195,6 +195,13 @@ async function createApiViteServer() {
               sourceCode = (0, import_vite_plugin_cedar_graphql_options_extract.applyGraphqlOptionsExtract)(sourceCode) ?? sourceCode;
               sourceCode = (0, import_api_graphql_transforms.applyGqlormInject)(sourceCode, id) ?? sourceCode;
             }
+            if (cedarConfig.experimental?.opentelemetry?.enabled && cedarConfig.experimental?.opentelemetry?.wrapApi) {
+              const relativePath = (0, import_vite.normalizePath)(id).slice(
+                normalizedBase.length + "/api/src/".length
+              );
+              const apiFolder = relativePath.split("/")[0] ?? "?";
+              sourceCode = (0, import_vite_plugin_cedar_otel_wrapping.applyOtelWrapping)(sourceCode, id, apiFolder) ?? sourceCode;
+            }
             const result = await (0, import_babel_config.transformWithBabel)(
               sourceCode,
               id,

package/dist/cjs/buildApp.js

@@ -42,6 +42,7 @@ var import_project_config = require("@cedarjs/project-config");
 var import_workspacePackageAliases = require("./lib/workspacePackageAliases.js");
 var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 var import_vite_plugin_handler_als_wrapping = require("./plugins/vite-plugin-handler-als-wrapping.js");
 function resolveWithExtensions(id) {
   if (import_node_fs.default.existsSync(id)) {
@@ -132,7 +133,6 @@ async function buildCedarApp({
     }
   }
   const babelPlugins = workspace.includes("api") ? (0, import_babel_config.getApiSideBabelPlugins)({
-    openTelemetry: (cedarConfig.experimental?.opentelemetry?.enabled ?? false) && (cedarConfig.experimental?.opentelemetry?.wrapApi ?? false),
     projectIsEsm: (0, import_project_config.projectSideIsEsm)("api")
   }) : null;
   const workspacePkgSourceMap = workspace.includes("api") ? Object.fromEntries(
@@ -258,6 +258,7 @@ async function buildCedarApp({
   if (workspace.includes("api")) {
     plugins.push((0, import_vite_plugin_cedar_graphql_options_extract.cedarGraphqlOptionsExtractPlugin)());
     plugins.push((0, import_vite_plugin_cedar_gqlorm_inject.cedarGqlormInjectPlugin)());
+    plugins.push((0, import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin)());
     plugins.push(
       (0, import_vite_plugin_handler_als_wrapping.handlerAlsWrappingPlugin)({ projectIsEsm: (0, import_project_config.projectSideIsEsm)("api") })
     );

package/dist/cjs/index.js

@@ -28,7 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var index_exports = {};
 __export(index_exports, {
-  applyHandlerAlsWrapping: () => import_vite_plugin_handler_als_wrapping2.applyHandlerAlsWrapping,
+  applyHandlerAlsWrapping: () => import_vite_plugin_handler_als_wrapping.applyHandlerAlsWrapping,
   cedar: () => cedar,
   cedarAutoImportsPlugin: () => import_vite_plugin_cedar_auto_import.cedarAutoImportsPlugin,
   cedarCellTransform: () => import_vite_plugin_cedar_cell2.cedarCellTransform,
@@ -40,6 +40,7 @@ __export(index_exports, {
   cedarHtmlEnvPlugin: () => import_vite_plugin_cedar_html_env2.cedarHtmlEnvPlugin,
   cedarImportDirPlugin: () => import_vite_plugin_cedar_import_dir.cedarImportDirPlugin,
   cedarMergedConfig: () => import_vite_plugin_merged_config2.cedarMergedConfig,
+  cedarOtelWrappingPlugin: () => import_vite_plugin_cedar_otel_wrapping.cedarOtelWrappingPlugin,
   cedarRemoveDevFatalErrorPage: () => import_vite_plugin_cedar_remove_dev_fatal_error_page2.cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle: () => import_vite_plugin_cedar_remove_from_bundle2.cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin: () => import_vite_plugin_cedar_routes_auto_loader2.cedarRoutesAutoLoaderPlugin,
@@ -74,8 +75,8 @@ var import_vite_plugin_cedar_cjs_compat = require("./plugins/vite-plugin-cedar-c
 var import_vite_plugin_cedar_cell2 = require("./plugins/vite-plugin-cedar-cell.js");
 var import_vite_plugin_cedar_gqlorm_inject = require("./plugins/vite-plugin-cedar-gqlorm-inject.js");
 var import_vite_plugin_cedar_graphql_options_extract = require("./plugins/vite-plugin-cedar-graphql-options-extract.js");
+var import_vite_plugin_cedar_otel_wrapping = require("./plugins/vite-plugin-cedar-otel-wrapping.js");
 var import_vite_plugin_handler_als_wrapping = require("./plugins/vite-plugin-handler-als-wrapping.js");
-var import_vite_plugin_handler_als_wrapping2 = require("./plugins/vite-plugin-handler-als-wrapping.js");
 var import_vite_plugin_cedar_entry_injection2 = require("./plugins/vite-plugin-cedar-entry-injection.js");
 var import_vite_plugin_cedar_html_env2 = require("./plugins/vite-plugin-cedar-html-env.js");
 var import_vite_plugin_cedar_import_dir = require("./plugins/vite-plugin-cedar-import-dir.js");
@@ -134,6 +135,7 @@ var index_default = cedar;
   cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
   cedarMergedConfig,
+  cedarOtelWrappingPlugin,
   cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin,

package/dist/cjs/plugins/vite-plugin-cedar-otel-wrapping.js

@@ -0,0 +1,225 @@
+"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);
+var vite_plugin_cedar_otel_wrapping_exports = {};
+__export(vite_plugin_cedar_otel_wrapping_exports, {
+  applyOtelWrapping: () => applyOtelWrapping,
+  cedarOtelWrappingPlugin: () => cedarOtelWrappingPlugin
+});
+module.exports = __toCommonJS(vite_plugin_cedar_otel_wrapping_exports);
+var import_oxc_parser = require("oxc-parser");
+var import_vite = require("vite");
+var import_project_config = require("@cedarjs/project-config");
+function cedarOtelWrappingPlugin() {
+  return {
+    name: "cedar-otel-wrapping",
+    transform(code, id) {
+      let apiSrc;
+      try {
+        apiSrc = (0, import_vite.normalizePath)((0, import_project_config.getPaths)().api.src);
+      } catch {
+        return null;
+      }
+      if (!(0, import_vite.normalizePath)(id).startsWith(apiSrc + "/")) {
+        return null;
+      }
+      const relativePath = (0, import_vite.normalizePath)(id).slice(apiSrc.length + 1);
+      const apiFolder = relativePath.split("/")[0] ?? "?";
+      const result = applyOtelWrapping(code, id, apiFolder);
+      return result ? { code: result, map: null } : null;
+    }
+  };
+}
+function applyOtelWrapping(code, filename, apiFolder) {
+  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,
+  cedarOtelWrappingPlugin
+});

package/dist/cjs/plugins/vite-plugin-handler-als-wrapping.js

@@ -65,25 +65,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/index.d.ts

@@ -4,8 +4,8 @@ export { cedarCjsCompatPlugin } from './plugins/vite-plugin-cedar-cjs-compat.js'
 export { cedarCellTransform } from './plugins/vite-plugin-cedar-cell.js';
 export { cedarGqlormInjectPlugin } from './plugins/vite-plugin-cedar-gqlorm-inject.js';
 export { cedarGraphqlOptionsExtractPlugin } from './plugins/vite-plugin-cedar-graphql-options-extract.js';
-export { handlerAlsWrappingPlugin } from './plugins/vite-plugin-handler-als-wrapping.js';
-export { applyHandlerAlsWrapping } from './plugins/vite-plugin-handler-als-wrapping.js';
+export { cedarOtelWrappingPlugin } from './plugins/vite-plugin-cedar-otel-wrapping.js';
+export { applyHandlerAlsWrapping, handlerAlsWrappingPlugin, } from './plugins/vite-plugin-handler-als-wrapping.js';
 export { cedarEntryInjectionPlugin } from './plugins/vite-plugin-cedar-entry-injection.js';
 export { cedarHtmlEnvPlugin } from './plugins/vite-plugin-cedar-html-env.js';
 export { cedarImportDirPlugin } from './plugins/vite-plugin-cedar-import-dir.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAuBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAA;AACzG,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAA;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAuBxC,OAAO,EAAE,sBAAsB,EAAE,MAAM,4CAA4C,CAAA;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAA;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,wDAAwD,CAAA;AACzG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAA;AACtF,OAAO,EACL,uBAAuB,EACvB,wBAAwB,GACzB,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gDAAgD,CAAA;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAA;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAA;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAA;AAC/E,OAAO,EAAE,4BAA4B,EAAE,MAAM,4DAA4D,CAAA;AACzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAA;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,mDAAmD,CAAA;AACzF,OAAO,EAAE,qCAAqC,EAAE,MAAM,8DAA8D,CAAA;AACpH,OAAO,EAAE,4BAA4B,EAAE,MAAM,oDAAoD,CAAA;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAA;AACvF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAA;AAC5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAA;AAE1F,KAAK,aAAa,GAAG;IACnB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,wBAAgB,KAAK,CAAC,EAAE,IAAI,EAAE,GAAE,aAAkB,GAAG,YAAY,EAAE,CAgClE;AAED,8DAA8D;AAC9D,eAAe,KAAK,CAAA"}

package/dist/index.js

@@ -23,8 +23,11 @@ import { cedarCjsCompatPlugin } from "./plugins/vite-plugin-cedar-cjs-compat.js"
 import { cedarCellTransform as cedarCellTransform2 } from "./plugins/vite-plugin-cedar-cell.js";
 import { cedarGqlormInjectPlugin } from "./plugins/vite-plugin-cedar-gqlorm-inject.js";
 import { cedarGraphqlOptionsExtractPlugin } from "./plugins/vite-plugin-cedar-graphql-options-extract.js";
-import { handlerAlsWrappingPlugin } from "./plugins/vite-plugin-handler-als-wrapping.js";
-import { applyHandlerAlsWrapping } from "./plugins/vite-plugin-handler-als-wrapping.js";
+import { cedarOtelWrappingPlugin } from "./plugins/vite-plugin-cedar-otel-wrapping.js";
+import {
+  applyHandlerAlsWrapping,
+  handlerAlsWrappingPlugin
+} from "./plugins/vite-plugin-handler-als-wrapping.js";
 import { cedarEntryInjectionPlugin as cedarEntryInjectionPlugin2 } from "./plugins/vite-plugin-cedar-entry-injection.js";
 import { cedarHtmlEnvPlugin as cedarHtmlEnvPlugin2 } from "./plugins/vite-plugin-cedar-html-env.js";
 import { cedarImportDirPlugin } from "./plugins/vite-plugin-cedar-import-dir.js";
@@ -82,6 +85,7 @@ export {
   cedarHtmlEnvPlugin2 as cedarHtmlEnvPlugin,
   cedarImportDirPlugin,
   cedarMergedConfig2 as cedarMergedConfig,
+  cedarOtelWrappingPlugin,
   cedarRemoveDevFatalErrorPage2 as cedarRemoveDevFatalErrorPage,
   cedarRemoveFromBundle2 as cedarRemoveFromBundle,
   cedarRoutesAutoLoaderPlugin2 as cedarRoutesAutoLoaderPlugin,

package/dist/plugins/vite-plugin-cedar-otel-wrapping.d.ts

@@ -0,0 +1,39 @@
+import type { Plugin } from 'vite';
+/**
+ * Vite plugin that wraps exported API functions with OpenTelemetry spans to
+ * provide automatic tracing in your Cedar API.
+ *
+ * For each `export const fn = (async?) (...) => {...}` declaration in an API
+ * file this plugin:
+ *
+ * 1. Adds an import at the top of the file:
+ *      import { trace as OTEL_TRACE } from '@opentelemetry/api'
+ *
+ * 2. Wraps the original export with an OTel span:
+ *      export const fn = (async?) (...params) => {
+ *        const __fn = (async?) (...params) => { ...original body... }
+ *        const OTEL_TRACER = OTEL_TRACE.getTracer('redwoodjs')
+ *        const OTEL_RESULT = (await?) OTEL_TRACER.startActiveSpan(
+ *          'redwoodjs:api:<folder>:<fnName>',
+ *          (async?) (span) => { ... }
+ *        )
+ *        return OTEL_RESULT
+ *      }
+ *
+ * This replaces `babel-plugin-redwood-otel-wrapping` for all Vite and esbuild
+ * builds. The previous Babel plugin has been removed entirely; Jest transforms
+ * through the Vite SSR pipeline.
+ *
+ * NOTE: Known limitation. Spans will close before a Promise settles if a
+ * synchronous function returns a Promise. To trace async work correctly, mark
+ * the function as `async` if it returns or awaits Promises.
+ */
+export declare function cedarOtelWrappingPlugin(): Plugin;
+/**
+ * Applies OpenTelemetry span wrapping to API source files.
+ *
+ * Exported as a standalone function so it can be tested without a Vite context.
+ * Returns the transformed code string, or `null` if nothing was changed.
+ */
+export declare function applyOtelWrapping(code: string, filename: string, apiFolder: string): string | null;
+//# sourceMappingURL=vite-plugin-cedar-otel-wrapping.d.ts.map

package/dist/plugins/vite-plugin-cedar-otel-wrapping.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vite-plugin-cedar-otel-wrapping.d.ts","sourceRoot":"","sources":["../../src/plugins/vite-plugin-cedar-otel-wrapping.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAKlC;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,CAwBhD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA+Ef"}

package/dist/plugins/vite-plugin-cedar-otel-wrapping.js

@@ -0,0 +1,200 @@
+import { parseSync } from "oxc-parser";
+import { normalizePath } from "vite";
+import { getPaths } from "@cedarjs/project-config";
+function cedarOtelWrappingPlugin() {
+  return {
+    name: "cedar-otel-wrapping",
+    transform(code, id) {
+      let apiSrc;
+      try {
+        apiSrc = normalizePath(getPaths().api.src);
+      } catch {
+        return null;
+      }
+      if (!normalizePath(id).startsWith(apiSrc + "/")) {
+        return null;
+      }
+      const relativePath = normalizePath(id).slice(apiSrc.length + 1);
+      const apiFolder = relativePath.split("/")[0] ?? "?";
+      const result = applyOtelWrapping(code, id, apiFolder);
+      return result ? { code: result, map: null } : null;
+    }
+  };
+}
+function applyOtelWrapping(code, filename, apiFolder) {
+  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,
+  cedarOtelWrappingPlugin
+};

package/dist/plugins/vite-plugin-handler-als-wrapping.d.ts

@@ -8,18 +8,18 @@ import type { Plugin } from 'vite';
  * For each file in `api/src/functions/` that exports a `handler`, this plugin:
  *
  * 1. Adds an import at the top of the file:
- *      import { getAsyncStoreInstance as __rw_getAsyncStoreInstance } from '@cedarjs/context/dist/store'
+ *      import { getAsyncStoreInstance as __cedar_getAsyncStoreInstance } from '@cedarjs/context/dist/store'
  *
  * 2. Renames the original handler:
- *      const __rw_handler = <original handler value>
+ *      const __cedar_handler = <original handler value>
  *
  * 3. Replaces the handler export with a wrapper that checks context isolation:
- *      export const handler = (__rw_event, __rw__context) => {
- *        const __rw_contextStore = __rw_getAsyncStoreInstance().getStore()
- *        if (__rw_contextStore === undefined) {
- *          return __rw_getAsyncStoreInstance().run(new Map(), __rw_handler, __rw_event, __rw__context)
+ *      export const handler = (__cedar_event, __cedar_context) => {
+ *        const __cedar_contextStore = __cedar_getAsyncStoreInstance().getStore()
+ *        if (__cedar_contextStore === undefined) {
+ *          return __cedar_getAsyncStoreInstance().run(new Map(), __cedar_handler, __cedar_event, __cedar_context)
  *        }
- *        return __rw_handler(__rw_event, __rw__context)
+ *        return __cedar_handler(__cedar_event, __cedar_context)
  *      }
  *
  * This replaces `babel-plugin-handler-als-wrapping` for Vite builds.

package/dist/plugins/vite-plugin-handler-als-wrapping.js

@@ -31,25 +31,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/vite",
-  "version": "6.0.0-canary.2615",
+  "version": "6.0.0-canary.2619",
   "description": "Vite configuration package for CedarJS",
   "repository": {
     "type": "git",
@@ -63,15 +63,15 @@
     "@babel/parser": "7.29.7",
     "@babel/traverse": "7.29.7",
     "@babel/types": "7.29.7",
-    "@cedarjs/api": "6.0.0-canary.2615",
-    "@cedarjs/babel-config": "6.0.0-canary.2615",
-    "@cedarjs/context": "6.0.0-canary.2615",
-    "@cedarjs/cookie-jar": "6.0.0-canary.2615",
-    "@cedarjs/graphql-server": "6.0.0-canary.2615",
-    "@cedarjs/internal": "6.0.0-canary.2615",
-    "@cedarjs/project-config": "6.0.0-canary.2615",
-    "@cedarjs/server-store": "6.0.0-canary.2615",
-    "@cedarjs/testing": "6.0.0-canary.2615",
+    "@cedarjs/api": "6.0.0-canary.2619",
+    "@cedarjs/babel-config": "6.0.0-canary.2619",
+    "@cedarjs/context": "6.0.0-canary.2619",
+    "@cedarjs/cookie-jar": "6.0.0-canary.2619",
+    "@cedarjs/graphql-server": "6.0.0-canary.2619",
+    "@cedarjs/internal": "6.0.0-canary.2619",
+    "@cedarjs/project-config": "6.0.0-canary.2619",
+    "@cedarjs/server-store": "6.0.0-canary.2619",
+    "@cedarjs/testing": "6.0.0-canary.2619",
     "@fastify/url-data": "6.0.3",
     "@swc/core": "1.15.41",
     "@universal-deploy/store": "^0.2.1",
@@ -104,9 +104,9 @@
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.4",
-    "@cedarjs/auth": "6.0.0-canary.2615",
-    "@cedarjs/router": "6.0.0-canary.2615",
-    "@cedarjs/web": "6.0.0-canary.2615",
+    "@cedarjs/auth": "6.0.0-canary.2619",
+    "@cedarjs/router": "6.0.0-canary.2619",
+    "@cedarjs/web": "6.0.0-canary.2619",
     "@hyrious/esbuild-plugin-commonjs": "0.2.6",
     "@jridgewell/trace-mapping": "0.3.31",
     "@types/aws-lambda": "8.10.162",