cloud/local/examples: thread per-user ScopeStack through HTTP + MCP

- cloud: resolves userId from the authenticated session and builds a [userOrgScope, orgScope] stack via createScopedExecutor(userId, orgId, orgName). userId threaded through execution-stack, mcp-session, and MCP dispatch init. - cloud env refactor: deletes the lazy Proxy apps/cloud/src/env.ts in favor of cloudflare:workers env imported at call sites; adds env-augment.d.ts to type secrets not present in generated wrangler types. - cloud/server.ts: env-guarded OTEL wiring (skips instrument() when AXIOM_TOKEN absent); captures rawFetch before instrument() mutates it so dev requests still land on the Hono app. - cloud/services/db.ts: prefers DATABASE_URL over the hyperdrive proxy so local dev works without the tunnel. - vite.config.ts: devCrashGuard plugin that prints uncaught Worker errors with a stable exit. - hosts/mcp: optional debug flag surfaces verbose session logging, wired up from cloud mcp-session. - local/examples/marketing: migrated to scopes: [scope].

Rhys Sullivan committed 6 months ago

Commit d4e311e1 parent 427699c25 files · +320 −174Browse files

Showing the changes to apps/cloud/src/server.ts (1 of 25 files). Show all

Unified · Split

apps/cloud/src/server.ts+33−16

 import { instrument, type TraceConfig } from "@microlabs/otel-cf-workers";
 import { McpSessionDO as McpSessionDOBase } from "./mcp-session";
-import { server } from "./env";
 // ---------------------------------------------------------------------------
 // OTEL config for the main fetch handler — `otel-cf-workers` owns the global
 // DOMException "Illegal invocation".
 // ---------------------------------------------------------------------------
-const parseSampleRatio = (value: string): number => {
+const parseSampleRatio = (value: string | undefined): number => {
   const n = Number(value);
   if (!Number.isFinite(n)) return 1;
   return Math.min(1, Math.max(0, n));
 };
-const otelConfig: TraceConfig = {
+const otelConfig = (env: Env): TraceConfig => ({
   service: { name: "executor-cloud", version: "1.0.0" },
   exporter: {
-    url: server.AXIOM_TRACES_URL,
+    url: env.AXIOM_TRACES_URL ?? "https://api.axiom.co/v1/traces",
     headers: {
-      Authorization: `Bearer ${server.AXIOM_TOKEN}`,
+      Authorization: `Bearer ${env.AXIOM_TOKEN ?? ""}`,
-      "X-Axiom-Dataset": server.AXIOM_DATASET,
+      "X-Axiom-Dataset": env.AXIOM_DATASET ?? "executor-cloud",
     },
   },
   sampling: {
     headSampler: {
       // Keep remote parent decisions and make local sampling policy explicit.
       acceptRemote: true,
-      ratio: parseSampleRatio(server.AXIOM_TRACES_SAMPLE_RATIO),
+      ratio: parseSampleRatio(env.AXIOM_TRACES_SAMPLE_RATIO),
     },
   },
-};
+});
 // otel-cf-workers owns the global TracerProvider. Sentry's OTEL compat shim
 // registers a ProxyTracerProvider of its own, which prevents otel-cf-workers
 // from finding its WorkerTracer and breaks the whole request path with
 // "global tracer is not of type WorkerTracer".
-//
+const sentryOptions = (env: Env) => ({
-// The `_env` parameter is unused — `server` from `./env` already gives us
+  dsn: env.SENTRY_DSN,
-// typed access to every secret. It's only in the signature so Sentry's
-// generics infer the DO's `Env` type correctly.
-const sentryOptions = (_env: Env) => ({
-  dsn: server.SENTRY_DSN,
   tracesSampleRate: 0,
   enableLogs: true,
   sendDefaultPii: true,
 // Worker fetch handler
 // ---------------------------------------------------------------------------
-const instrumentedHandler = instrument({ fetch: handler.fetch }, otelConfig);
+// Skip OTLP wiring when no Axiom token is configured (dev without secrets).
+// Otherwise the exporter ships every span with `Bearer ` (empty), which
+// returns 401 on every batch and eventually drops the keep-alive socket —
+// the Node http agent's unhandled `'error'` then crashes the process with
+// ECONNRESET. It also registers otel-cf-workers' `WorkerTracer` as the
+// global tracer; spans started outside its config ALS then die with
+// "Config is undefined". Matches the gate in `DoTelemetryLive`.
+// `instrument()` mutates the handler it's given (replaces `.fetch` with the
+// proxied version), so capture the raw fetch first and then build the
+// instrumented handler from a separate object.
+const rawFetch = handler.fetch;
+const instrumentedHandler = instrument({ fetch: rawFetch }, otelConfig);
+const dispatchHandler = {
+  fetch: (request: Request, env: Env, ctx: unknown) => {
+    const fn = env.AXIOM_TOKEN ? instrumentedHandler.fetch! : rawFetch;
+    return (fn as (req: Request, env: Env, ctx: unknown) => Response | Promise<Response>)(
+      request,
+      env,
+      ctx,
+    );
+  },
+};
-export default Sentry.withSentry(sentryOptions, instrumentedHandler);
+export default Sentry.withSentry(sentryOptions, dispatchHandler);