Open-source manufacturing ERP, MES and QMS. Quoting, MRP, inventory, shop floor, quality and lot/serial traceability on one Postgres schema, with a REST API and MCP server. Self-host or use Carbon Cloud.
TypeScript ai-agentsbill-of-materialserpinventory-managementleanmanufacturingmanufacturing-execution-systemmcp-servermesmrpopen-source-erppostgresqlproduction-planningqmsquality-management-systemreact-routerself-hostedsupabasetraceabilitytypescript
feat(logger): OpenTelemetry tracing for ERP and MES (#1798)
Sid0240bb6846b9
diff --git a/.claude/rules/environment-configuration.md b/.claude/rules/environment-configuration.mdindex 243e114f32..7f361ab34e 100644--- a/.claude/rules/environment-configuration.md+++ b/.claude/rules/environment-configuration.md@@ -122,6 +122,13 @@ vars through `ci/src/deploy.ts` → `sst.config.ts` → the ERP service only.`CarbonEdition`), `CONTROLLED_ENVIRONMENT` (ITAR flag), `DEFAULT_LANGUAGE`(default `en`), `GTM_URL`, `GTM_EVENTS_API_SECRET_KEY`.+**Tracing (all optional)** — the standard OpenTelemetry variables, read raw by+the OTel SDK (not `@carbon/env`): `OTEL_EXPORTER_OTLP_ENDPOINT` (or+`OTEL_EXPORTER_OTLP_TRACES_ENDPOINT`) turns server tracing on,+`OTEL_EXPORTER_OTLP_HEADERS` carries the backend's auth, and+`OTEL_SERVICE_NAME` / `OTEL_TRACES_SAMPLER` / `OTEL_TRACES_SAMPLER_ARG` tune it.+Unset = no tracing. See `packages/logger/AGENTS.md` → Tracing.+**Deployment** — `VERCEL_URL` (required at module load; value unused off-Vercel,set to `production` in prod compose), `VERCEL_ENV`, `NODE_ENV`. `ERP_URL` /`MES_URL` drive `getAppUrl()` / `getMESUrl()`.diff --git a/.env.example b/.env.exampleindex 141b26c07e..9f2766b874 100644--- a/.env.example+++ b/.env.example@@ -12,6 +12,12 @@ CARBON_EDITION="community" # "community" | "cloud" | "enterprise"SESSION_SECRET="************************"RATE_LIMIT="5"# LOG_LEVEL="debug" # trace|debug|info|warning|error|fatal — optional; default dev=debug, prod=info, browser prod=warning+# Server tracing (OpenTelemetry) — optional; off unless an OTLP endpoint is set. Any OTLP backend works; Axiom shown.+# OTEL_EXPORTER_OTLP_ENDPOINT="https://api.axiom.co"+# OTEL_EXPORTER_OTLP_HEADERS="Authorization=Bearer%20<api-token>,X-Axiom-Dataset=<dataset>"+# OTEL_RESOURCE_ATTRIBUTES="deployment.environment.name=production"+# OTEL_TRACES_SAMPLER="parentbased_traceidratio"+# OTEL_TRACES_SAMPLER_ARG="0.1"# Supabase OAuth (client IDs/secrets from your provider; redirect URIs come from .env.local)SUPABASE_AUTH_EXTERNAL_GOOGLE_CLIENT_ID="************.apps.googleusercontent.com"diff --git a/apps/erp/app/entry.server.tsx b/apps/erp/app/entry.server.tsxindex 11b416ff89..0ac8430b3a 100644--- a/apps/erp/app/entry.server.tsx+++ b/apps/erp/app/entry.server.tsx@@ -10,12 +10,20 @@ import {import { getLogger } from "@carbon/logger";import { ensureLoggingConfigured } from "@carbon/logger/config.server";import { getRequestId } from "@carbon/logger/middleware.server";+import { createTracing } from "@carbon/logger/tracing.server";+import { waitUntil } from "@vercel/functions";import { handleRequest as vercelHandleRequest } from "@vercel/react-router/entry.server";import type { EntryContext, RouterContextProvider } from "react-router";import { isRouteErrorResponse } from "react-router";import { scheduleInngestSelfSync } from "./utils/inngest-self-sync.server";ensureLoggingConfigured();++export const instrumentations = createTracing({+ serviceName: "carbon-erp",+ // Vercel can suspend the instance once the response is sent.+ afterRequest: process.env.VERCEL ? (flush) => waitUntil(flush()) : undefined+});scheduleInngestSelfSync();const log = getLogger("erp");diff --git a/apps/erp/app/services/database.server.ts b/apps/erp/app/services/database.server.tsindex 8cee0946c4..db59f773fc 100644--- a/apps/erp/app/services/database.server.ts+++ b/apps/erp/app/services/database.server.ts@@ -12,12 +12,13 @@ import {getPostgresClient,getPostgresConnectionPool} from "@carbon/database/client";+import { queryLog } from "@carbon/logger/tracing.server";import { PostgresDriver } from "kysely";const init = () => {const pool = getPostgresConnectionPool(10);// We use the PostgresDriver from Kysely here as this code only runs in Node environment- return getPostgresClient(pool, PostgresDriver);+ return getPostgresClient(pool, PostgresDriver, queryLog);};type ClientSingleton = ReturnType<typeof init>;diff --git a/apps/erp/package.json b/apps/erp/package.jsonindex 9c1bf9dd0f..29243766ce 100644--- a/apps/erp/package.json+++ b/apps/erp/package.json@@ -62,6 +62,7 @@"@tiptap/react": "catalog:","@upstash/ratelimit": "2.0.8","@vercel/analytics": "catalog:",+ "@vercel/functions": "catalog:","@vercel/react-router": "catalog:","@visx/responsive": "2.17.0","@xyflow/react": "12.10.2",diff --git a/apps/mes/app/entry.server.tsx b/apps/mes/app/entry.server.tsxindex 5e94bb204d..a4b9cc1e45 100644--- a/apps/mes/app/entry.server.tsx+++ b/apps/mes/app/entry.server.tsx@@ -10,12 +10,20 @@ import {import { getLogger } from "@carbon/logger";import { ensureLoggingConfigured } from "@carbon/logger/config.server";import { getRequestId } from "@carbon/logger/middleware.server";+import { createTracing } from "@carbon/logger/tracing.server";+import { waitUntil } from "@vercel/functions";import { handleRequest as vercelHandleRequest } from "@vercel/react-router/entry.server";import type { EntryContext, RouterContextProvider } from "react-router";import { isRouteErrorResponse } from "react-router";ensureLoggingConfigured();+export const instrumentations = createTracing({+ serviceName: "carbon-mes",+ // Vercel can suspend the instance once the response is sent.+ afterRequest: process.env.VERCEL ? (flush) => waitUntil(flush()) : undefined+});+const log = getLogger("mes");// Process-level safety net: errors that escape the request lifecycle entirelydiff --git a/apps/mes/app/services/database.server.ts b/apps/mes/app/services/database.server.tsindex 8cee0946c4..db59f773fc 100644--- a/apps/mes/app/services/database.server.ts+++ b/apps/mes/app/services/database.server.ts@@ -12,12 +12,13 @@ import {getPostgresClient,getPostgresConnectionPool} from "@carbon/database/client";+import { queryLog } from "@carbon/logger/tracing.server";import { PostgresDriver } from "kysely";const init = () => {const pool = getPostgresConnectionPool(10);// We use the PostgresDriver from Kysely here as this code only runs in Node environment- return getPostgresClient(pool, PostgresDriver);+ return getPostgresClient(pool, PostgresDriver, queryLog);};type ClientSingleton = ReturnType<typeof init>;diff --git a/apps/mes/package.json b/apps/mes/package.jsonindex 2be5db2117..37833fb86e 100644--- a/apps/mes/package.json+++ b/apps/mes/package.json@@ -56,6 +56,7 @@"@tiptap/react": "catalog:","@tiptap/starter-kit": "catalog:","@vercel/analytics": "catalog:",+ "@vercel/functions": "catalog:","@vercel/react-router": "catalog:","@xyflow/react": "12.10.2","class-variance-authority": "catalog:",diff --git a/packages/database/supabase/functions/lib/postgres/index.ts b/packages/database/supabase/functions/lib/postgres/index.tsindex 3beb0104b8..515d26cf2b 100644--- a/packages/database/supabase/functions/lib/postgres/index.ts+++ b/packages/database/supabase/functions/lib/postgres/index.ts@@ -5,6 +5,7 @@import {Driver,Kysely,+ KyselyConfig,PostgresAdapter,PostgresDialectConfig,PostgresIntrospector,@@ -214,7 +215,8 @@ interface PgDriverConstructor {export function getPostgresClient<D = KyselyDatabase>(pool: Pool,- driver: PgDriverConstructor+ driver: PgDriverConstructor,+ log?: KyselyConfig["log"]): Kysely<D> {const runtime = getRuntime();@@ -222,6 +224,7 @@ export function getPostgresClient<D = KyselyDatabase>(case "node":case "deno": {return new Kysely<D>({+ log,dialect: {createAdapter() {return new PostgresAdapter();diff --git a/packages/jobs/src/db.ts b/packages/jobs/src/db.tsindex 4420610cd3..10ffbf20d5 100644--- a/packages/jobs/src/db.ts+++ b/packages/jobs/src/db.ts@@ -7,6 +7,7 @@ import {getPostgresConnectionPool,type KyselyDatabase} from "@carbon/database/client";+import { queryLog } from "@carbon/logger/tracing.server";import { type Kysely, PostgresDriver } from "kysely";/** Cached per pool size, like the pool itself. The engine, matcher and queue@@ -43,7 +44,8 @@ export function getJobDatabaseClient(size = 1) {const pool = getPostgresConnectionPool(size);const client = getPostgresClient(pool,- PostgresDriver+ PostgresDriver,+ queryLog) as unknown as Kysely<KyselyDatabase>;clientCache.set(size, { client, pool });return client;diff --git a/packages/logger/AGENTS.md b/packages/logger/AGENTS.mdindex a4dbad0f72..ae3390b9a3 100644--- a/packages/logger/AGENTS.md+++ b/packages/logger/AGENTS.md@@ -50,7 +50,8 @@ categories, env-driven levels, and cloud-agnostic request-id correlation.- Changing the sink/formatter setup in `config.server.ts` / `config.client.ts`(affects every log line's shape — dev ANSI vs prod JSONL + field redaction).- Changing the category root or the `LOG_LEVEL` default derivation.-- Adding a new sink target (file, OTEL, Sentry) — these change deploy shape.+- Adding a new log sink target (file, OTEL logs, Sentry) or a new trace exporter —+ these change deploy shape.## Never@@ -81,16 +82,75 @@ pnpm --filter @carbon/logger test| `./config.server` | `ensureLoggingConfigured()` (ANSI dev / JSONL+redacted prod, ALS) || `./config.client` | `ensureLoggingConfigured()` (plain console sink, no ALS) || `./middleware.server` | `requestIdMiddleware`, `requestIdContext`, `getRequestId`, `REQUEST_ID_HEADER`, plus the request-context API re-exported from `context.server`: `requestContextMiddleware`, `getRouterContext`, `getRequestContext`, `oncePerRequest`, `oncePerRead` |+| `./tracing.server` | `createTracing({ serviceName, afterRequest })` — React Router `instrumentations` (OpenTelemetry); `annotateRequestSpan(attributes)`; `queryLog` — Kysely `log` hook, `undefined` when tracing is off || `./inngest` | `createInngestLogger()` — adapter passed to `new Inngest({ logger })` |## Wiring (per app)- `entry.server.tsx`: `import { ensureLoggingConfigured } from "@carbon/logger/config.server"; ensureLoggingConfigured();` at top.- `entry.client.tsx`: same from `@carbon/logger/config.client`.+- `entry.server.tsx` also exports+ `instrumentations = createTracing({ serviceName: "carbon-erp", afterRequest })`.- `root.tsx`: `export const middleware = [requestContextMiddleware, requestIdMiddleware, flashMiddleware]`(request context FIRST so every downstream middleware and handler runs insidethe AsyncLocalStorage scope, then request id so downstream logs carry it).+## Tracing (OpenTelemetry)++`src/tracing.server.ts`. **Off unless enabled**: with no+`OTEL_EXPORTER_OTLP_ENDPOINT` (or `OTEL_EXPORTER_OTLP_TRACES_ENDPOINT`),+`createTracing` returns `[]`, no provider or fetch+instrumentation is registered, `queryLog` is `undefined` so Kysely installs no+hook, and `annotateRequestSpan` returns immediately. The library code is loaded+but nothing in it runs.++Nothing here is specific to a vendor or host. Configuration is the standard OTel+variables, read by the exporter and SDK themselves, so any OTLP backend works:++```bash+# Axiom — the host is your Axiom edge domain (api.axiom.co is the US default)+OTEL_EXPORTER_OTLP_ENDPOINT="https://api.axiom.co"+OTEL_EXPORTER_OTLP_HEADERS="Authorization=Bearer%20<api-token>,X-Axiom-Dataset=<dataset>"+# optional+OTEL_SERVICE_NAME="carbon-erp" # default: the app's serviceName+OTEL_RESOURCE_ATTRIBUTES="deployment.environment.name=production,service.version=<sha>"+OTEL_TRACES_SAMPLER="parentbased_traceidratio" # default: every request+OTEL_TRACES_SAMPLER_ARG="0.1"+```++One trace per request:++- **Request span** (`SERVER`) — named by method until a route handler reports the+ matched pattern, then `GET /x/part/:itemId/details`. Carries `http.route`,+ `url.path`, and — set by `requestIdMiddleware` through `annotateRequestSpan` —+ `http.response.status_code` and `carbon.request_id` (the id on every log line+ of that request). React Router 7.18's request instrumentation reports neither+ the status nor the pattern, which is why they arrive from those two places.+- **`middleware|loader|action <routeId>`** spans, one per route handler.+- **Fetch spans** from `@opentelemetry/instrumentation-undici`, only for fetches+ made inside a request (`requireParentforSpans`). A PostgREST call is named by+ its table or function (`GET /rest/v1/methodMaterial`); anything else by host,+ because other paths carry ids. `url.full` and `url.query` get the access log's+ `redactSearch` masking.++- **Query spans** for Kysely, from `queryLog` passed as Kysely's `log` hook at+ the three places a client is built (`apps/{erp,mes}/app/services/database.server.ts`,+ `packages/jobs/src/db.ts`, through `getPostgresClient`'s third argument). Named+ `SELECT item` / `INSERT jobMaterial` — the verb and the first quoted table —+ with the SQL in `db.query.text`. Bound parameter values are never recorded.+ Kysely reports a query after it ran, so the span is back-dated by the measured+ duration, which covers the query but not the wait for a pooled connection, and+ `BEGIN`/`COMMIT` are not reported at all.++Not traced: Redis, and anything that talks HTTP through Node's `http` module+rather than `fetch`. That time shows up inside the enclosing loader or action span.++The batch is exported on a timer (every 5 s by default, `OTEL_BSP_*` to tune).+A host that suspends the process once a response is sent would strand it, so+`createTracing` takes an optional `afterRequest(flush)`; the apps pass one only+when `VERCEL` is set, handing the flush to `waitUntil` from `@vercel/functions`.+That host-specific line lives in each app's `entry.server.tsx`, not here.+## Cross-References- `packages/lib/src/inngest/client.ts` — consumes `createInngestLogger()`.diff --git a/packages/logger/package.json b/packages/logger/package.jsonindex 7fd3c006c8..5e58cdaf86 100644--- a/packages/logger/package.json+++ b/packages/logger/package.json@@ -3,6 +3,13 @@"dependencies": {"@logtape/logtape": "catalog:","@logtape/redaction": "catalog:",+ "@opentelemetry/api": "catalog:",+ "@opentelemetry/exporter-trace-otlp-proto": "catalog:",+ "@opentelemetry/instrumentation": "catalog:",+ "@opentelemetry/instrumentation-undici": "catalog:",+ "@opentelemetry/resources": "catalog:",+ "@opentelemetry/sdk-trace-node": "catalog:",+ "@opentelemetry/semantic-conventions": "catalog:","@paralleldrive/cuid2": "catalog:"},"peerDependencies": {@@ -27,6 +34,7 @@"./config.server": "./src/config.server.ts","./config.client": "./src/config.client.ts","./middleware.server": "./src/middleware.server.ts",+ "./tracing.server": "./src/tracing.server.ts","./inngest": "./src/inngest.ts"},"private": true,diff --git a/packages/logger/src/middleware.server.ts b/packages/logger/src/middleware.server.tsindex 2a0c6a5a2b..7ec9f5c5d1 100644--- a/packages/logger/src/middleware.server.ts+++ b/packages/logger/src/middleware.server.ts@@ -10,7 +10,8 @@ import {type RouterContextProvider} from "react-router";import { getRequestContext } from "./context.server";-import { isSensitiveKey, REDACTED } from "./redaction";+import { isSensitiveKey, REDACTED, redactSearch } from "./redaction";+import { annotateRequestSpan } from "./tracing.server";// Re-exported from the existing entry point rather than adding a new package// export subpath: Vite resolves a package's `exports` map once at dev-server@@ -49,23 +50,6 @@ const BODY_LOG_METHODS = new Set(["POST", "PUT", "PATCH", "DELETE"]);*/const BODY_LOG_MAX_BYTES = 8 * 1024;-/**- * Mask sensitive query-param values (`?code=…`, `?token=…`, …) while keeping the- * rest of the query string readable. Returns "" for a bodyless query.- */-function redactSearch(search: string): string {- if (!search || search === "?") return "";- const params = new URLSearchParams(search);- let changed = false;- for (const key of params.keys()) {- if (isSensitiveKey(key)) {- params.set(key, REDACTED);- changed = true;- }- }- return changed ? `?${params.toString()}` : search;-}-/*** Recursively mask values whose key matches a sensitive-field pattern (the same* `REDACT_FIELD_PATTERNS` the prod sink's `redactByField` uses: password/token/@@ -175,6 +159,10 @@ export const requestIdMiddleware: MiddlewareFunction<Response> = async (const response = await withContext({ requestId }, async () => {const res = await next();+ annotateRequestSpan({+ "http.response.status_code": res.status,+ "carbon.request_id": requestId+ });// Debug-level so it is visible in dev but filtered by the prod `info`// default — the pipeline is observable with zero migrated call sites.// Rendered as a Morgan "dev"-style colored line in dev (seediff --git a/packages/logger/src/redaction.ts b/packages/logger/src/redaction.tsindex 0a62c0ea89..ea8ba70bd5 100644--- a/packages/logger/src/redaction.ts+++ b/packages/logger/src/redaction.ts@@ -39,3 +39,20 @@ export function isSensitiveKey(key: string): boolean {: pattern.test(key));}++/**+ * Mask sensitive query-param values (`?code=…`, `?token=…`, …) while keeping the+ * rest of the query string readable. Returns "" for a bodyless query.+ */+export function redactSearch(search: string): string {+ if (!search || search === "?") return "";+ const params = new URLSearchParams(search);+ let changed = false;+ for (const key of params.keys()) {+ if (isSensitiveKey(key)) {+ params.set(key, REDACTED);+ changed = true;+ }+ }+ return changed ? `?${params.toString()}` : search;+}diff --git a/packages/logger/src/tracing.server.ts b/packages/logger/src/tracing.server.tsnew file mode 100644index 0000000000..da7e3c2611--- /dev/null+++ b/packages/logger/src/tracing.server.ts@@ -0,0 +1,233 @@+// SPDX-License-Identifier: AGPL-3.0-only+// Carbon (github.com/crbnos/carbon). Modified or adapted versions of this file,+// including ports, remain AGPLv3; serving them over a network requires releasing their source.++import {+ type Attributes,+ context,+ createContextKey,+ type Span,+ SpanKind,+ SpanStatusCode,+ type Tracer,+ trace+} from "@opentelemetry/api";+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-proto";+import { registerInstrumentations } from "@opentelemetry/instrumentation";+import { UndiciInstrumentation } from "@opentelemetry/instrumentation-undici";+import {+ defaultResource,+ detectResources,+ envDetector,+ resourceFromAttributes+} from "@opentelemetry/resources";+import {+ BatchSpanProcessor,+ NodeTracerProvider+} from "@opentelemetry/sdk-trace-node";+import {+ ATTR_HTTP_REQUEST_METHOD,+ ATTR_HTTP_ROUTE,+ ATTR_SERVICE_NAME,+ ATTR_URL_FULL,+ ATTR_URL_PATH,+ ATTR_URL_QUERY+} from "@opentelemetry/semantic-conventions";+import type { ServerInstrumentation } from "react-router";+import { redactSearch } from "./redaction";++const REQUEST_SPAN = createContextKey("carbon.request-span");+const PROVIDER = Symbol.for("carbon.tracing.provider");++// Everything below is inert unless an OTLP endpoint is configured.+const enabled = Boolean(+ process.env.OTEL_EXPORTER_OTLP_ENDPOINT ||+ process.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT+);++export type TracingOptions = {+ serviceName: string;+ /**+ * For hosts that suspend the process once a response is sent: called after+ * each request with a flush to keep alive. Elsewhere the batch timer exports.+ */+ afterRequest?: (flush: () => Promise<void>) => void;+};++export function createTracing({+ serviceName,+ afterRequest+}: TracingOptions): ServerInstrumentation[] {+ if (!enabled) return [];++ const provider = ensureProvider(serviceName);+ const flush = () => provider.forceFlush().catch(() => undefined);+ return [+ routerInstrumentation(+ trace.getTracer("carbon"),+ afterRequest && (() => afterRequest(flush))+ )+ ];+}++// On `globalThis` because Vite re-evaluates this module in dev.+function ensureProvider(serviceName: string): NodeTracerProvider {+ const g = globalThis as Record<PropertyKey, unknown>;+ const existing = g[PROVIDER] as NodeTracerProvider | undefined;+ if (existing) return existing;++ const provider = new NodeTracerProvider({+ // OTEL_SERVICE_NAME and OTEL_RESOURCE_ATTRIBUTES override the default.+ resource: defaultResource()+ .merge(resourceFromAttributes({ [ATTR_SERVICE_NAME]: serviceName }))+ .merge(detectResources({ detectors: [envDetector] })),+ spanProcessors: [new BatchSpanProcessor(new OTLPTraceExporter())]+ });+ provider.register();++ registerInstrumentations({+ tracerProvider: provider,+ instrumentations: [+ new UndiciInstrumentation({+ requireParentforSpans: true,+ startSpanHook: ({ origin, path }) => redactedUrl(origin, path),+ requestHook: (span, { method, origin, path }) => {+ span.updateName(fetchSpanName(method, origin, path));+ }+ })+ ]+ });++ g[PROVIDER] = provider;+ return provider;+}++/** PostgREST calls by table or function; anything else by host, since other paths carry ids. */+export function fetchSpanName(method: string, origin: string, path: string) {+ const pathname = path.split("?")[0] ?? "";+ if (pathname.startsWith("/rest/v1/")) return `${method} ${pathname}`;+ return `${method} ${origin.replace(/^https?:\/\//, "")}`;+}++/** The instrumentation records the query string in both attributes. */+export function redactedUrl(origin: string, path: string) {+ const queryStart = path.indexOf("?");+ const pathname = queryStart === -1 ? path : path.slice(0, queryStart);+ const query = queryStart === -1 ? "" : redactSearch(path.slice(queryStart));+ return {+ [ATTR_URL_FULL]: `${origin}${pathname}${query}`,+ [ATTR_URL_QUERY]: query+ };+}++/** `SELECT item`: the verb and the first table named. */+export function querySpanName(sql: string) {+ const operation =+ sql.trimStart().split(/\s+/, 1)[0]?.toUpperCase() || "QUERY";+ const table = sql.match(/\b(?:from|into|update)\s+(?:"\w+"\.)?"(\w+)"/i)?.[1];+ return table ? `${operation} ${table}` : operation;+}++/** Kysely `log` hook. Kysely reports a query after it ran, so the span is back-dated. */+function traceQuery(event: {+ level: "query" | "error";+ query: { sql: string };+ queryDurationMillis: number;+ error?: unknown;+}) {+ const endTime = Date.now();+ const span = trace+ .getTracer("carbon")+ .startSpan(querySpanName(event.query.sql), {+ kind: SpanKind.CLIENT,+ startTime: endTime - event.queryDurationMillis,+ attributes: {+ "db.system.name": "postgresql",+ "db.query.text": event.query.sql+ }+ });+ if (event.level === "error") {+ const error =+ event.error instanceof Error+ ? event.error+ : new Error(String(event.error));+ span.recordException(error);+ span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });+ }+ span.end(endTime);+}++/** Pass as Kysely's `log`; undefined when tracing is off, so Kysely installs no hook. */+export const queryLog = enabled ? traceQuery : undefined;++/** No-op when tracing is off or outside a request. */+export function annotateRequestSpan(attributes: Attributes) {+ if (!enabled) return;+ (context.active().getValue(REQUEST_SPAN) as Span | undefined)?.setAttributes(+ attributes+ );+}++function end(span: Span, error: Error | undefined) {+ if (error) {+ span.recordException(error);+ span.setStatus({ code: SpanStatusCode.ERROR, message: error.message });+ }+ span.end();+}++export function routerInstrumentation(+ tracer: Tracer,+ onRequestEnd?: () => void+): ServerInstrumentation {+ return {+ handler({ instrument }) {+ instrument({+ request(handleRequest, { request }) {+ // Renamed once a route handler reports the matched pattern.+ const span = tracer.startSpan(request.method, {+ kind: SpanKind.SERVER,+ attributes: {+ [ATTR_HTTP_REQUEST_METHOD]: request.method,+ [ATTR_URL_PATH]: new URL(request.url).pathname+ }+ });+ const requestContext = trace+ .setSpan(context.active(), span)+ .setValue(REQUEST_SPAN, span);++ return context.with(requestContext, async () => {+ const { error } = await handleRequest();+ end(span, error);+ onRequestEnd?.();+ });+ }+ });+ },+ route({ id, instrument }) {+ const traced =+ (kind: string) =>+ (+ call: () => Promise<{ error?: Error }>,+ { request, pattern }: { request: { method: string }; pattern: string }+ ) => {+ // React Router's pattern has no leading slash.+ const route = pattern.startsWith("/") ? pattern : `/${pattern}`;+ (context.active().getValue(REQUEST_SPAN) as Span | undefined)+ ?.updateName(`${request.method} ${route}`)+ .setAttribute(ATTR_HTTP_ROUTE, route);++ return tracer.startActiveSpan(`${kind} ${id}`, async (span) => {+ const { error } = await call();+ end(span, error);+ });+ };++ instrument({+ middleware: traced("middleware"),+ loader: traced("loader"),+ action: traced("action")+ });+ }+ };+}diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 6ffded8411..5d0fb635b1 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -63,6 +63,27 @@ catalogs:'@nanostores/react':specifier: 0.7.3version: 0.7.3+ '@opentelemetry/api':+ specifier: 1.9.0+ version: 1.9.0+ '@opentelemetry/exporter-trace-otlp-proto':+ specifier: 0.217.0+ version: 0.217.0+ '@opentelemetry/instrumentation':+ specifier: 0.217.0+ version: 0.217.0+ '@opentelemetry/instrumentation-undici':+ specifier: 0.27.0+ version: 0.27.0+ '@opentelemetry/resources':+ specifier: 2.7.1+ version: 2.7.1+ '@opentelemetry/sdk-trace-node':+ specifier: 2.7.1+ version: 2.7.1+ '@opentelemetry/semantic-conventions':+ specifier: 1.40.0+ version: 1.40.0'@orpc/client':specifier: 1.15.0version: 1.15.0@@ -177,6 +198,9 @@ catalogs:'@vercel/analytics':specifier: 1.6.1version: 1.6.1+ '@vercel/functions':+ specifier: 3.9.9+ version: 3.9.9'@vercel/react-router':specifier: 1.2.6version: 1.2.6@@ -810,6 +834,9 @@ importers:'@vercel/analytics':specifier: 'catalog:'version: 1.6.1([email protected](@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])+ '@vercel/functions':+ specifier: 'catalog:'+ version: 3.9.9(@aws-sdk/[email protected])([email protected])'@vercel/react-router':specifier: 'catalog:'version: 1.2.6(patch_hash=fdc988df95f5639f888c552079014d0e615cb4c762f8c25a16d43e4498e21a6a)(@react-router/[email protected](patch_hash=10eab9c1af1b5cc376e67a81f64216bb5d6fcd8a94fc807eb46ecf1982b2cde4)(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected]([email protected]([email protected]))([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))([email protected]))(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected])@@ -1285,6 +1312,9 @@ importers:'@vercel/analytics':specifier: 'catalog:'version: 1.6.1([email protected](@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected]))([email protected])+ '@vercel/functions':+ specifier: 'catalog:'+ version: 3.9.9(@aws-sdk/[email protected])([email protected])'@vercel/react-router':specifier: 'catalog:'version: 1.2.6(patch_hash=fdc988df95f5639f888c552079014d0e615cb4c762f8c25a16d43e4498e21a6a)(@react-router/[email protected](patch_hash=10eab9c1af1b5cc376e67a81f64216bb5d6fcd8a94fc807eb46ecf1982b2cde4)(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected]([email protected]([email protected]))([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))([email protected]))(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected])@@ -3001,6 +3031,27 @@ importers:'@logtape/redaction':specifier: 'catalog:'version: 2.2.3(@logtape/[email protected])+ '@opentelemetry/api':+ specifier: 'catalog:'+ version: 1.9.0+ '@opentelemetry/exporter-trace-otlp-proto':+ specifier: 'catalog:'+ version: 0.217.0(@opentelemetry/[email protected])+ '@opentelemetry/instrumentation':+ specifier: 'catalog:'+ version: 0.217.0(@opentelemetry/[email protected])+ '@opentelemetry/instrumentation-undici':+ specifier: 'catalog:'+ version: 0.27.0(@opentelemetry/[email protected])+ '@opentelemetry/resources':+ specifier: 'catalog:'+ version: 2.7.1(@opentelemetry/[email protected])+ '@opentelemetry/sdk-trace-node':+ specifier: 'catalog:'+ version: 2.7.1(@opentelemetry/[email protected])+ '@opentelemetry/semantic-conventions':+ specifier: 'catalog:'+ version: 1.40.0'@paralleldrive/cuid2':specifier: 'catalog:'version: 2.2.2@@ -10508,10 +10559,33 @@ packages:vue-router:optional: true+ '@vercel/[email protected]':+ resolution: {integrity: sha512-kQLt5Pm8wKd7/imzDY9/9u0tf8OuRkAuXI+s7j057FSUrXapAmumJSKwDqnR4ZZqdWoUcNLlFAgVIAdiwcGTcw==}++ '@vercel/[email protected]':+ resolution: {integrity: sha512-g9XerViJ/paZujufXYcu5XYI2vU2rtB4sgdpjUHde5RnOkdmpu0ngH46LCFGHoPXO/C+qDPSczIHIRN+8Q2YKQ==}+ engines: {node: '>= 18'}++ '@vercel/[email protected]':+ resolution: {integrity: sha512-ocN/BNsIswReoyqfU1huilNyBM9tvY9kFXgYj0LlyPRATC1dt35gj2jN5hs9+Nag/CRyVQOX58L2FEhvL+0sSA==}+ engines: {node: '>= 20'}+ peerDependencies:+ '@aws-sdk/credential-provider-web-identity': '*'+ ws: 8.21.0+ peerDependenciesMeta:+ '@aws-sdk/credential-provider-web-identity':+ optional: true+ ws:+ optional: true+'@vercel/[email protected]':resolution: {integrity: sha512-UycprH3T6n3jH0k44NHMa7pnFHGu/N05MjojYr+Mc6I7obkoLIJujSWwin1pCvdy/eOxrI/l3uDLQsmcrOb4ug==}engines: {node: '>= 20'}+ '@vercel/[email protected]':+ resolution: {integrity: sha512-TcbdH3YtGS2KU98T99dN4sbf+E4vbJZsJTRN97wKQ7QWQ0BR7U02QX3KN4+5GHxBtKTj1c5CnvTTitc2ZRad0A==}+ engines: {node: '>= 20'}+'@vercel/[email protected]':resolution: {integrity: sha512-8+n/roFtLhpkq6dMAXXSWf4N5Uypckh2E8Uxduh+tdE+Z9AG4KXfFzGyHoyFYZqoUh6jgwsiFkDokSAymm4NHg==}peerDependencies:@@ -12119,6 +12193,10 @@ packages:resolution: {integrity: sha512-CRT1WTyuQoD771GW56XEZFQ/ZoSfWid1alKGDYMmkt2yl8UXrVR4pspqWNEcqKvVIzg6PAltWjxcSSPrboA4iA==}engines: {node: '>=18.0.0'}+ resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}+ engines: {node: '>=10'}+resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}engines: {node: '>=16.17'}@@ -12550,6 +12628,10 @@ packages:resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}engines: {node: '>= 0.4'}+ resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}+ engines: {node: '>=10'}+resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}engines: {node: '>=16'}@@ -12739,6 +12821,10 @@ packages:resolution: {integrity: sha512-/MVmHp58WkOypgFhCLk4fzpPcFQvTJ/e6LBI7irpIO2HfxUbpmYoHF+KzipzJpxxzJu7aJNWQ0xojJ/dzV2G5g==}engines: {node: '>= 20'}+ resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}+ engines: {node: '>=10.17.0'}+resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}engines: {node: '>=16.17.0'}@@ -13174,6 +13260,9 @@ packages:resolution: {integrity: sha512-1vUQX+IdDMVPj4k8kOxgUqlcK518yluMuGZwqlr44FS1ppZB/5GWh4rZG89erpOBOJjU/OBsnCVFfapsRz6nEA==}+ resolution: {integrity: sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==}+resolution: {integrity: sha512-KUXdbctm1uHVL8BYhnyHkgp3zDX5KW8ZhAKVFEfUbU2P8Alpzjb+48hHvjOdQIyPshoblhzsuqOwEEAbtHVirA==}@@ -14199,6 +14288,10 @@ packages:engines: {node: '>= 4'}hasBin: true+ resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}+ engines: {node: '>=8'}+resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}@@ -14393,6 +14486,10 @@ packages:resolution: {integrity: sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==}+ resolution: {integrity: sha512-wrAwOeXp1RRMFfQY8Sy7VaGVmPocaLwSFOYCGKSyo8qmJ+/yaafCl5BCA1IQZWqFSRBrKDYFeR9d/VyQzfH/jg==}+ engines: {node: '>= 6.0'}+resolution: {integrity: sha512-3dlJgJCaVeXH0/eZjYVJvQiLVVrPO4U1ZGqlATtx6QGO3b5eNM6+JgUKa7oStBTdYuGTk7gVoABCW6Tp+dhRdw==}@@ -15801,6 +15898,10 @@ packages:resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}engines: {node: '>=4'}+ resolution: {integrity: sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==}+ engines: {node: '>=6'}+resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}engines: {node: '>=12'}@@ -16658,10 +16759,18 @@ packages:utf-8-validate:optional: true+ resolution: {integrity: sha512-hI3flOB4PLZIy5prbtTpirobtPE2ZtZ52szO+2mM9Efp6ErM398La+C1lIpNWDfNoQk+6Lsi6nMcCwVB7pxeMQ==}+ engines: {node: '>= 6.0'}+resolution: {integrity: sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==}engines: {node: '>=12'}+ resolution: {integrity: sha512-sqMMuL1rc0FmMBOzCpd0yuy9trqF2yTTVe+E9ogwCSWQCdDEtQUwrZPT6AxqtsFGRNxycgncbP/xmOOSPw5ZUw==}+ engines: {node: '>= 6.0'}+resolution: {integrity: sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==}engines: {node: '>=0.4.0'}@@ -16747,6 +16856,9 @@ packages:resolution: {integrity: sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==}+ resolution: {integrity: sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg==}+resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}@@ -18824,7 +18936,7 @@ snapshots:'@opentelemetry/resource-detector-azure': 0.25.0(@opentelemetry/[email protected])'@opentelemetry/resource-detector-container': 0.8.12(@opentelemetry/[email protected])'@opentelemetry/resource-detector-gcp': 0.52.0(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/sdk-node': 0.217.0(@opentelemetry/[email protected])transitivePeerDependencies:- supports-color@@ -18990,7 +19102,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19008,7 +19120,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19034,7 +19146,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0'@types/connect': 3.4.38@@ -19066,7 +19178,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19075,7 +19187,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])transitivePeerDependencies:- supports-color@@ -19105,7 +19217,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19149,7 +19261,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19182,7 +19294,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19243,7 +19355,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0'@opentelemetry/sql-common': 0.41.2(@opentelemetry/[email protected])@@ -19256,7 +19368,7 @@ snapshots:dependencies:'@opentelemetry/api': 1.9.0'@opentelemetry/api-logs': 0.217.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])transitivePeerDependencies:- supports-color@@ -19273,7 +19385,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19313,7 +19425,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.217.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0transitivePeerDependencies:@@ -19428,34 +19540,34 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])- '@opentelemetry/resources': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])+ '@opentelemetry/resources': 2.7.1(@opentelemetry/[email protected])gcp-metadata: 8.1.2transitivePeerDependencies:- supports-color@@ -19583,7 +19695,7 @@ snapshots:'@opentelemetry/[email protected](@opentelemetry/[email protected])':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@orpc/[email protected](@opentelemetry/[email protected])':dependencies:@@ -24093,7 +24205,7 @@ snapshots:'@traceloop/[email protected]':dependencies:'@opentelemetry/api': 1.9.0- '@opentelemetry/core': 2.6.1(@opentelemetry/[email protected])+ '@opentelemetry/core': 2.9.0(@opentelemetry/[email protected])'@opentelemetry/instrumentation': 0.203.0(@opentelemetry/[email protected])'@opentelemetry/semantic-conventions': 1.40.0'@traceloop/ai-semantic-conventions': 0.20.0@@ -24672,8 +24784,30 @@ snapshots:next: 15.5.21(@babel/[email protected])(@opentelemetry/[email protected])([email protected])([email protected]([email protected]))([email protected])react: 18.3.1+ '@vercel/[email protected]':+ dependencies:+ xdg-app-paths: 5.5.1+ zod: 4.1.11++ '@vercel/[email protected]':+ dependencies:+ execa: 5.1.1++ dependencies:+ '@vercel/oidc': 3.8.9+ optionalDependencies:+ '@aws-sdk/credential-provider-web-identity': 3.972.38+ ws: 8.21.0+'@vercel/[email protected]': {}+ '@vercel/[email protected]':+ dependencies:+ '@vercel/cli-config': 0.3.0+ '@vercel/cli-exec': 1.0.1+ jose: 5.10.0+'@vercel/[email protected](patch_hash=fdc988df95f5639f888c552079014d0e615cb4c762f8c25a16d43e4498e21a6a)(@react-router/[email protected](patch_hash=10eab9c1af1b5cc376e67a81f64216bb5d6fcd8a94fc807eb46ecf1982b2cde4)(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected]([email protected]([email protected]))([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))([email protected]))(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))([email protected])([email protected]([email protected]))([email protected])':dependencies:'@react-router/dev': 7.18.0(patch_hash=10eab9c1af1b5cc376e67a81f64216bb5d6fcd8a94fc807eb46ecf1982b2cde4)(@react-router/[email protected]([email protected]([email protected]([email protected]))([email protected]))([email protected]))(@types/[email protected])([email protected])([email protected])([email protected])([email protected]([email protected]([email protected]))([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))([email protected])@@ -26589,6 +26723,18 @@ snapshots:dependencies:eventsource-parser: 3.0.6+ dependencies:+ cross-spawn: 7.0.6+ get-stream: 6.0.1+ human-signals: 2.1.0+ is-stream: 2.0.1+ merge-stream: 2.0.0+ npm-run-path: 4.0.1+ onetime: 5.1.2+ signal-exit: 3.0.7+ strip-final-newline: 2.0.0+dependencies:cross-spawn: 7.0.6@@ -27088,6 +27234,8 @@ snapshots:dunder-proto: 1.0.1es-object-atoms: 1.1.1+ [email protected]: {}+@@ -27365,6 +27513,8 @@ snapshots:transitivePeerDependencies:- supports-color+ [email protected]: {}+@@ -27832,6 +27982,8 @@ snapshots:+ [email protected]: {}+@@ -29047,6 +29199,10 @@ snapshots:shell-quote: 1.9.0string.prototype.padend: 3.1.6+ dependencies:+ path-key: 3.1.1+dependencies:path-key: 4.0.0@@ -29180,6 +29336,8 @@ snapshots:+ [email protected]: {}+dependencies:'@daybrush/utils': 1.13.0@@ -31000,6 +31158,8 @@ snapshots:+ [email protected]: {}+@@ -32316,8 +32476,17 @@ snapshots:+ dependencies:+ os-paths: 4.4.0+ xdg-portable: 7.3.0++ dependencies:+ os-paths: 4.4.0+@@ -32397,6 +32566,8 @@ snapshots:+ [email protected]: {}+diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yamlindex 111a8bd553..3f79d97e75 100644--- a/pnpm-workspace.yaml+++ b/pnpm-workspace.yaml@@ -78,6 +78,13 @@ catalog:'@orpc/openapi': 1.15.0'@orpc/openapi-client': 1.15.0'@orpc/server': 1.15.0+ '@opentelemetry/api': 1.9.0+ '@opentelemetry/exporter-trace-otlp-proto': 0.217.0+ '@opentelemetry/instrumentation': 0.217.0+ '@opentelemetry/instrumentation-undici': 0.27.0+ '@opentelemetry/resources': 2.7.1+ '@opentelemetry/sdk-trace-node': 2.7.1+ '@opentelemetry/semantic-conventions': 1.40.0'@paralleldrive/cuid2': 2.2.2'@react-aria/i18n': 3.12.16'@react-email/components': 0.3.3@@ -114,6 +121,7 @@ catalog:'@types/react-dom': 18.3.7'@types/node': '24''@vercel/analytics': 1.6.1+ '@vercel/functions': 3.9.9'@vercel/react-router': 1.2.6ai: 7.0.116axios: 1.16.0