@decocms/start 0.42.3 → 0.43.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "0.42.3",
+  "version": "0.43.0",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",
@@ -27,6 +27,7 @@
     "./sdk/crypto": "./src/sdk/crypto.ts",
     "./sdk/invoke": "./src/sdk/invoke.ts",
     "./sdk/instrumentedFetch": "./src/sdk/instrumentedFetch.ts",
+    "./sdk/otel": "./src/sdk/otel.ts",
     "./sdk/workerEntry": "./src/sdk/workerEntry.ts",
     "./sdk/redirects": "./src/sdk/redirects.ts",
     "./sdk/sitemap": "./src/sdk/sitemap.ts",
@@ -87,14 +88,26 @@
     "tsx": "^4.19.0"
   },
   "peerDependencies": {
+    "@microlabs/otel-cf-workers": ">=1.0.0-rc.0",
+    "@opentelemetry/api": ">=1.9.0",
     "@tanstack/react-start": ">=1.0.0",
     "@tanstack/store": ">=0.7.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "vite": ">=6.0.0 || >=7.0.0 || >=8.0.0"
   },
+  "peerDependenciesMeta": {
+    "@microlabs/otel-cf-workers": {
+      "optional": true
+    },
+    "@opentelemetry/api": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@biomejs/biome": "^2.4.6",
+    "@microlabs/otel-cf-workers": "^1.0.0-rc.52",
+    "@opentelemetry/api": "^1.9.1",
     "@semantic-release/exec": "^7.1.0",
     "@semantic-release/git": "^10.0.1",
     "@tanstack/store": "^0.9.1",

package/src/sdk/otel.ts

@@ -0,0 +1,104 @@
+/**
+ * OpenTelemetry integration for Cloudflare Workers via @microlabs/otel-cf-workers.
+ *
+ * Opt-in module that wraps a Worker handler with auto-instrumentation and
+ * wires traces into @decocms/start's pluggable TracerAdapter.
+ *
+ * Requires peer dependencies:
+ * - `@microlabs/otel-cf-workers`
+ * - `@opentelemetry/api`
+ *
+ * @example
+ * ```ts
+ * import { createDecoWorkerEntry } from "@decocms/start/sdk/workerEntry";
+ * import { instrumentWorker } from "@decocms/start/sdk/otel";
+ *
+ * const handler = createDecoWorkerEntry(serverEntry, options);
+ *
+ * export default instrumentWorker(handler, { serviceName: "my-store" });
+ * ```
+ *
+ * Environment variables (read from `env` at request time):
+ * - `OTEL_EXPORTER_OTLP_ENDPOINT` — OTLP endpoint (e.g. `https://in-otel.hyperdx.io`)
+ * - `OTEL_EXPORTER_OTLP_HEADERS` — comma-separated `key=value` auth headers
+ */
+
+import { instrument, type ResolveConfigFn } from "@microlabs/otel-cf-workers";
+import { trace } from "@opentelemetry/api";
+import { configureTracer } from "../middleware/observability";
+
+export interface OtelOptions {
+  serviceName: string;
+  /** OTLP endpoint. Defaults to env.OTEL_EXPORTER_OTLP_ENDPOINT. */
+  endpoint?: string;
+  /** OTLP auth headers. Defaults to env.OTEL_EXPORTER_OTLP_HEADERS parsed. */
+  headers?: Record<string, string>;
+}
+
+/** Minimal Cloudflare Worker execution context. */
+interface WorkerExecutionContext {
+  waitUntil(promise: Promise<unknown>): void;
+  passThroughOnException(): void;
+}
+
+/** Handler shape returned by createDecoWorkerEntry. */
+interface WorkerHandler {
+  fetch(
+    request: Request,
+    env: Record<string, unknown>,
+    ctx: WorkerExecutionContext,
+  ): Promise<Response>;
+}
+
+/**
+ * Wraps a Cloudflare Worker handler with OpenTelemetry auto-instrumentation
+ * (fetch, KV, D1, waitUntil) and connects to @decocms/start's TracerAdapter
+ * so that `withTracing()` / `createInstrumentedFetch()` emit real OTel spans.
+ */
+export function instrumentWorker(
+  handler: WorkerHandler,
+  options: OtelOptions | ((env: Record<string, unknown>) => OtelOptions),
+) {
+  // Bridge @decocms/start TracerAdapter → @opentelemetry/api
+  configureTracer({
+    startSpan: (name, attrs) => {
+      const span = trace.getTracer("deco").startSpan(name, { attributes: attrs });
+      return {
+        end: () => span.end(),
+        setError: (error) => {
+          if (error instanceof Error) span.recordException(error);
+        },
+        setAttribute: (k, v) => span.setAttribute(k, v),
+      };
+    },
+  });
+
+  const resolveConfig: ResolveConfigFn = (env, _trigger) => {
+    const opts = typeof options === "function" ? options(env as Record<string, unknown>) : options;
+    const endpoint = opts.endpoint || (env.OTEL_EXPORTER_OTLP_ENDPOINT as string);
+    const headers = opts.headers || parseHeaders(env.OTEL_EXPORTER_OTLP_HEADERS as string | undefined);
+
+    return {
+      exporter: { url: endpoint, headers },
+      service: { name: opts.serviceName },
+    };
+  };
+
+  // Cast through `any` — @microlabs/otel-cf-workers expects Cloudflare's
+  // ExportedHandler type, but we avoid depending on @cloudflare/workers-types.
+  // deno-lint-ignore no-explicit-any
+  return instrument(handler as any, resolveConfig);
+}
+
+function parseHeaders(str?: string): Record<string, string> {
+  if (!str) return {};
+  return Object.fromEntries(
+    str
+      .split(",")
+      .map((kv) => {
+        const [k, ...v] = kv.split("=");
+        return [k.trim(), v.join("=").trim()] as const;
+      })
+      .filter(([k]) => k.length > 0),
+  );
+}

package/src/sdk/workerEntry.ts

@@ -256,6 +256,7 @@ export interface DecoWorkerEntryOptions {
    * ```
    */
   cacheVersionEnv?: string | false;
+
 }
 
 // ---------------------------------------------------------------------------
@@ -652,7 +653,7 @@ export function createDecoWorkerEntry(
 
   // -- Main fetch handler -----------------------------------------------------
 
-  return {
+  const handler = {
     async fetch(
       request: Request,
       env: Record<string, unknown>,
@@ -673,6 +674,8 @@ export function createDecoWorkerEntry(
     },
   };
 
+  return handler;
+
   async function handleRequest(
     request: Request,
     env: Record<string, unknown>,