@fougere/observability 0.9.2-alpha.0 → 0.10.0-alpha.0

package/dist/logs/LogsOptions.d.ts

@@ -0,0 +1,13 @@
+export interface LogsOptions {
+    /** Which service these lines belong to. */
+    service: string;
+    /** Collector endpoint. Default: the OTLP/HTTP convention on localhost. */
+    url?: string;
+    /** How often a batch leaves. Default: every second. */
+    flushMs?: number;
+    /** Told when a batch could not be sent. Default: silence. */
+    onError?: (err: unknown) => void;
+    /** Drop anything below this level before it leaves the process. */
+    minimum?: 'debug' | 'info' | 'warn' | 'error';
+}
+//# sourceMappingURL=LogsOptions.d.ts.map

package/dist/logs/LogsOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogsOptions.d.ts","sourceRoot":"","sources":["../../src/logs/LogsOptions.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IAC1B,2CAA2C;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uDAAuD;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjC,mEAAmE;IACnE,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CAC/C"}

package/dist/logs/LogsOptions.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=LogsOptions.js.map

package/dist/logs/LogsOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"LogsOptions.js","sourceRoot":"","sources":["../../src/logs/LogsOptions.ts"],"names":[],"mappings":""}

package/dist/metrics/Bucketed.d.ts

@@ -0,0 +1,16 @@
+export interface Bucketed {
+    frond: string | undefined;
+    entity: string;
+    operation: string;
+    error: string | undefined;
+    count: number;
+    sum: number;
+    /** One more than the bounds: the last holds everything above the highest bound. */
+    buckets: number[];
+    /** The same measurement over `selfMs` — what the op did rather than what it waited for. */
+    selfSum: number;
+    selfBuckets: number[];
+    /** Every statement these calls ran. Against `count`, it is statements per call. */
+    statements: number;
+}
+//# sourceMappingURL=Bucketed.d.ts.map

package/dist/metrics/Bucketed.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bucketed.d.ts","sourceRoot":"","sources":["../../src/metrics/Bucketed.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,mFAAmF;IACnF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,2FAA2F;IAC3F,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,mFAAmF;IACnF,UAAU,EAAE,MAAM,CAAC;CACpB"}

package/dist/metrics/Bucketed.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Bucketed.js.map

package/dist/metrics/Bucketed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Bucketed.js","sourceRoot":"","sources":["../../src/metrics/Bucketed.ts"],"names":[],"mappings":""}

package/dist/metrics/Metrics.d.ts

@@ -0,0 +1,42 @@
+import { type App } from '@fougere/core';
+import { type SpanSink } from '../index.js';
+import type { MetricsSnapshot } from './MetricsSnapshot.js';
+export interface Metrics {
+    /** Hand to `onSpan` — it reads the same span the tracer reads. */
+    sink: SpanSink;
+    /** What to publish now. */
+    snapshot(): MetricsSnapshot;
+}
+/**
+ * `app` is optional and only feeds the topology: what fronds this process found, and which of them
+ * run elsewhere.
+ */
+export declare function metrics(app?: App, bounds?: readonly number[]): Metrics;
+/**
+ * Serve the topology on `rpc.topology` — read from inside the process it describes.
+ *
+ * The declared half is read at every call rather than once here: `reloadFougere()` builds the app
+ * again, and a config read at boot would keep answering for the app that was released.
+ */
+export declare function serveTopology(app: App, measured: Metrics): void;
+/** One snapshot, as OTLP/JSON spells metrics. Cumulative, which is what Prometheus reads. */
+export declare function metricsPayload(service: string, snapshot: MetricsSnapshot): {
+    resourceMetrics: {
+        resource: {
+            attributes: {
+                key: string;
+                value: {
+                    stringValue: string;
+                };
+            }[];
+        };
+        scopeMetrics: {
+            scope: {
+                name: string;
+            };
+            /** Only what has points. */
+            metrics: Record<string, any>[];
+        }[];
+    }[];
+};
+//# sourceMappingURL=Metrics.d.ts.map

package/dist/metrics/Metrics.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.d.ts","sourceRoot":"","sources":["../../src/metrics/Metrics.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,KAAK,GAAG,EAAuD,MAAM,eAAe,CAAC;AAClH,OAAO,EAAkC,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAkB5D,MAAM,WAAW,OAAO;IACtB,kEAAkE;IAClE,IAAI,EAAE,QAAQ,CAAC;IACf,2BAA2B;IAC3B,QAAQ,IAAI,eAAe,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,MAAM,GAAE,SAAS,MAAM,EAAW,GAAG,OAAO,CA2D9E;AA0CD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CAM/D;AAED,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe;;;YAgBrD,UAAU;;;oBAbkC,WAAW;;;;;;gBAgBtD,IAAI;;YACb,4BAA4B;;;;EA8HvC"}

package/dist/{metrics.js → metrics/Metrics.js}

@@ -1,14 +1,24 @@
-import { activeCalls } from './index.js';
+import { declaredTopologyOf } from '@fougere/core';
+import { activeCalls } from '../index.js';
 /**
- * Bucket bounds in SECONDS, the OpenTelemetry recommendation for request durations.
- * Dense under 100 ms because that is where a healthy op lives, and open above 10 s.
+ * Bucket bounds in SECONDS, and the operator's to choose — this is the default, not the rule.
+ *
+ * The OpenTelemetry recommendation for request durations: dense under 100 ms because that is
+ * where a healthy op lives, and open above 10 s. A system whose ops all cross two processes has
+ * its floor elsewhere and wastes half these buckets.
+ *
+ * Deliberately NOT derived per operation, though `reach` could: an explicit-bucket histogram only
+ * aggregates across series that share its bounds, so a panel asking for the p95 of the whole
+ * service — which sums over every op — would stop meaning anything, silently. One list per
+ * process is what keeps that reading honest. The number that IS per-op is the load threshold,
+ * where nothing aggregates.
  */
 const BOUNDS = [0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10];
 /**
  * `app` is optional and only feeds the topology: what fronds this process found, and which of them
  * run elsewhere.
  */
-export function metrics(app) {
+export function metrics(app, bounds = BOUNDS) {
     const since = Date.now();
     const series = new Map();
     /** Every frond this process has actually CALLED — the other half of the topology. */
@@ -17,6 +27,11 @@ export function metrics(app) {
     const edges = new Map();
     return {
         sink: (span) => {
+            // The one reader that has to choose: a statement is a step, not a call this process
+            // answered. Counted here it would publish `select.post` as an operation nothing
+            // serves, and every topology and saturation figure would count it too.
+            if (span.kind !== 'operation')
+                return;
             const key = `${span.entity}\0${span.operation}\0${span.error ?? ''}`;
             let row = series.get(key);
             if (!row) {
@@ -27,7 +42,10 @@ export function metrics(app) {
                     error: span.error,
                     count: 0,
                     sum: 0,
-                    buckets: new Array(BOUNDS.length + 1).fill(0),
+                    buckets: new Array(bounds.length + 1).fill(0),
+                    selfSum: 0,
+                    selfBuckets: new Array(bounds.length + 1).fill(0),
+                    statements: 0,
                 };
                 series.set(key, row);
             }
@@ -44,13 +62,17 @@ export function metrics(app) {
             const seconds = span.ms / 1000;
             row.count += 1;
             row.sum += seconds;
-            row.buckets[bucketOf(seconds)] += 1;
+            row.buckets[bucketOf(seconds, bounds)] += 1;
+            const self = span.selfMs / 1000;
+            row.selfSum += self;
+            row.selfBuckets[bucketOf(self, bounds)] += 1;
+            row.statements += span.statements;
         },
         snapshot: () => ({
             since,
             series: [...series.values()],
             active: activeCalls(),
-            bounds: BOUNDS,
+            bounds: [...bounds],
             topology: topologyOf(app, seen),
             edges: [...edges.values()],
         }),
@@ -63,34 +85,45 @@ export function metrics(app) {
 function topologyOf(app, seen) {
     // What the app SERVES: a frond an extension brought is instrumentation, and reporting it
     // would describe this package to itself.
+    //
+    // A frond named in `remotes:` is scanned when its code sits in the same project, and stays
+    // in `app.fronds` — the boot says `declared remote — not hosted locally` and keeps it. This
+    // half reports what RUNS here, so it is not one of them: it used to answer `local` for a
+    // frond every call reached over HTTP. Not a config-derived node either — it is named below
+    // only once it has answered, like any other remote.
     const local = new Map((app?.fronds ?? [])
-        .filter((frond) => !frond.brought)
+        .filter((frond) => !frond.brought && !app?.remotes[frond.name])
         .map((frond) => [frond.name, frond]));
     const here = [...local.values()].map((frond) => ({
         frond: frond.name,
         placement: 'local',
         entities: frond.entities.length,
-        doors: frond.handlers.length,
+        facades: frond.handlers.length,
     }));
     // A frond we called but never scanned is hosted elsewhere. Its shape is not ours to
     // report — it is published by the process that owns it, under its own service name.
     const elsewhere = [...seen]
         .filter((name) => !local.has(name))
-        .map((name) => ({ frond: name, placement: 'remote', entities: 0, doors: 0 }));
+        .map((name) => ({ frond: name, placement: 'remote', entities: 0, facades: 0 }));
     return [...here, ...elsewhere];
 }
 /** The first bound this duration does not exceed, or the overflow bucket. */
-function bucketOf(seconds) {
-    for (let i = 0; i < BOUNDS.length; i++)
-        if (seconds <= BOUNDS[i])
+function bucketOf(seconds, bounds) {
+    for (let i = 0; i < bounds.length; i++)
+        if (seconds <= bounds[i])
             return i;
-    return BOUNDS.length;
+    return bounds.length;
 }
-/** Serve the topology on `rpc.topology` — read from inside the process it describes. */
+/**
+ * Serve the topology on `rpc.topology` — read from inside the process it describes.
+ *
+ * The declared half is read at every call rather than once here: `reloadFougere()` builds the app
+ * again, and a config read at boot would keep answering for the app that was released.
+ */
 export function serveTopology(app, measured) {
     app.serveRpc('topology', () => {
         const { since, active, topology, edges } = measured.snapshot();
-        return { since, active, fronds: topology, edges };
+        return { since, active, fronds: topology, edges, declared: declaredTopologyOf(app) };
     });
 }
 /** One snapshot, as OTLP/JSON spells metrics. Cumulative, which is what Prometheus reads. */
@@ -98,6 +131,14 @@ export function metricsPayload(service, snapshot) {
     const since = `${snapshot.since * 1e6}`;
     const now = `${Date.now() * 1e6}`;
     const attr = (key, value) => ({ key, value: { stringValue: value } });
+    /** What an operation's three series are all sliced by — said once, so they stay comparable. */
+    const dimensions = (row) => [
+        ...(row.frond ? [attr('fougere.frond', row.frond)] : []),
+        attr('fougere.entity', row.entity),
+        attr('fougere.operation', row.operation),
+        attr('fougere.outcome', row.error ? 'error' : 'ok'),
+        ...(row.error ? [attr('fougere.error.code', row.error)] : []),
+    ];
     return {
         resourceMetrics: [
             {
@@ -116,13 +157,7 @@ export function metricsPayload(service, snapshot) {
                                     // only temporality Prometheus reads without a collector in between.
                                     aggregationTemporality: 2,
                                     dataPoints: snapshot.series.map((row) => ({
-                                        attributes: [
-                                            ...(row.frond ? [attr('fougere.frond', row.frond)] : []),
-                                            attr('fougere.entity', row.entity),
-                                            attr('fougere.operation', row.operation),
-                                            attr('fougere.outcome', row.error ? 'error' : 'ok'),
-                                            ...(row.error ? [attr('fougere.error.code', row.error)] : []),
-                                        ],
+                                        attributes: dimensions(row),
                                         startTimeUnixNano: since,
                                         timeUnixNano: now,
                                         count: `${row.count}`,
@@ -132,6 +167,40 @@ export function metricsPayload(service, snapshot) {
                                     })),
                                 },
                             },
+                            {
+                                name: 'fougere.operation.self',
+                                description: 'How long an operation took on its own, with what it waited for taken out.',
+                                unit: 's',
+                                histogram: {
+                                    aggregationTemporality: 2,
+                                    dataPoints: snapshot.series.map((row) => ({
+                                        attributes: dimensions(row),
+                                        startTimeUnixNano: since,
+                                        timeUnixNano: now,
+                                        count: `${row.count}`,
+                                        sum: row.selfSum,
+                                        bucketCounts: row.selfBuckets.map((n) => `${n}`),
+                                        explicitBounds: snapshot.bounds,
+                                    })),
+                                },
+                            },
+                            {
+                                name: 'fougere.operation.statements',
+                                description: 'Statements run under an operation. Against its count, statements per call.',
+                                unit: '{statement}',
+                                sum: {
+                                    aggregationTemporality: 2,
+                                    isMonotonic: true,
+                                    dataPoints: snapshot.series
+                                        .filter((row) => row.statements > 0)
+                                        .map((row) => ({
+                                        attributes: dimensions(row),
+                                        startTimeUnixNano: since,
+                                        timeUnixNano: now,
+                                        asInt: `${row.statements}`,
+                                    })),
+                                },
+                            },
                             {
                                 name: 'fougere.operations.active',
                                 description: 'Operations running right now — the saturation signal.',
@@ -184,13 +253,13 @@ export function metricsPayload(service, snapshot) {
                                 },
                             },
                             {
-                                name: 'fougere.frond.doors',
-                                description: 'How many doors a frond serves — its surface, as scanned.',
-                                unit: '{door}',
+                                name: 'fougere.frond.facades',
+                                description: 'How many facades a frond serves — its surface, as scanned.',
+                                unit: '{facade}',
                                 gauge: {
                                     dataPoints: snapshot.topology.map((f) => ({
                                         attributes: [attr('fougere.frond', f.frond)],
-                                        asInt: `${f.doors}`,
+                                        asInt: `${f.facades}`,
                                         timeUnixNano: now,
                                     })),
                                 },
@@ -202,4 +271,4 @@ export function metricsPayload(service, snapshot) {
         ],
     };
 }
-//# sourceMappingURL=metrics.js.map
+//# sourceMappingURL=Metrics.js.map

package/dist/metrics/Metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Metrics.js","sourceRoot":"","sources":["../../src/metrics/Metrics.ts"],"names":[],"mappings":"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"}

package/dist/metrics/MetricsSnapshot.d.ts

@@ -0,0 +1,14 @@
+import type { Bucketed } from './Bucketed.js';
+import { type Edge, type FrondPlacement } from '@fougere/core';
+export interface MetricsSnapshot {
+    /** When this process started counting — cumulative metrics are read against it. */
+    since: number;
+    series: Bucketed[];
+    active: number;
+    bounds: number[];
+    /** The shape of the system as this process discovered it — declared nowhere. */
+    topology: FrondPlacement[];
+    /** Who calls whom, as observed here. Bounded by fronds², so it is a safe dimension. */
+    edges: Edge[];
+}
+//# sourceMappingURL=MetricsSnapshot.d.ts.map

package/dist/metrics/MetricsSnapshot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"MetricsSnapshot.d.ts","sourceRoot":"","sources":["../../src/metrics/MetricsSnapshot.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,KAAK,IAAI,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,WAAW,eAAe;IAC9B,mFAAmF;IACnF,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,QAAQ,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,gFAAgF;IAChF,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,uFAAuF;IACvF,KAAK,EAAE,IAAI,EAAE,CAAC;CACf"}

package/dist/metrics/MetricsSnapshot.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=MetricsSnapshot.js.map

package/dist/metrics/MetricsSnapshot.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MetricsSnapshot.js","sourceRoot":"","sources":["../../src/metrics/MetricsSnapshot.ts"],"names":[],"mappings":""}

package/dist/otlp/OtlpExporter.d.ts

@@ -0,0 +1,12 @@
+import type { SpanSink } from '../index.js';
+import type { OtlpOptions } from './OtlpOptions.js';
+export interface OtlpExporter {
+    /** Hand to `onSpan`. */
+    sink: SpanSink;
+    /** Send what is buffered now — a process about to exit has to call this. */
+    flush(): Promise<void>;
+    /** Stop the timer and send what is left. */
+    stop(): Promise<void>;
+}
+export declare function otlp(options: OtlpOptions): OtlpExporter;
+//# sourceMappingURL=OtlpExporter.d.ts.map

package/dist/otlp/OtlpExporter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtlpExporter.d.ts","sourceRoot":"","sources":["../../src/otlp/OtlpExporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAgB,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,MAAM,WAAW,YAAY;IAC3B,wBAAwB;IACxB,IAAI,EAAE,QAAQ,CAAC;IACf,4EAA4E;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,4CAA4C;IAC5C,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAYD,wBAAgB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,YAAY,CA2BvD"}

package/dist/otlp/OtlpExporter.js

@@ -0,0 +1,64 @@
+import { Beat } from '../Beat.js';
+import { Endpoint } from '../Endpoint.js';
+import { metricsPayload } from '../metrics/Metrics.js';
+/** OTLP status codes: 0 unset, 1 ok, 2 error. */
+const OK = 1;
+const ERROR = 2;
+/** OTLP span kinds, of the six only these two are ours. */
+const INTERNAL = 1;
+const CLIENT = 3;
+export function otlp(options) {
+    const url = options.url ?? 'http://localhost:4318/v1/traces';
+    const traces = Endpoint.at(url, options.onError);
+    const metrics = Endpoint.at(options.metricsUrl ?? url.replace(/\/v1\/traces$/, '/v1/metrics'), options.onError);
+    let buffer = [];
+    async function flush() {
+        const batch = buffer;
+        buffer = [];
+        // Metrics go on every beat even when no span finished: a gauge that stops being
+        // published reads as "gone", not as "idle".
+        await Promise.all([
+            batch.length > 0 ? traces.post(payload(options.service, batch)) : Promise.resolve(),
+            options.metrics ? metrics.post(metricsPayload(options.service, options.metrics.snapshot())) : Promise.resolve(),
+        ]);
+    }
+    const beat = Beat.every(options.flushMs, flush);
+    return {
+        sink: (span) => { buffer.push(span); },
+        flush,
+        stop: () => beat.stop(),
+    };
+}
+/** One batch, as OTLP/JSON spells it — trace and span ids stay hex, times are nanos. */
+function payload(service, spans) {
+    return {
+        resourceSpans: [
+            {
+                resource: { attributes: [{ key: 'service.name', value: { stringValue: service } }] },
+                scopeSpans: [
+                    {
+                        scope: { name: '@fougere/observability' },
+                        spans: spans.map((span) => ({
+                            traceId: span.traceId,
+                            spanId: span.spanId,
+                            ...(span.parentId ? { parentSpanId: span.parentId } : {}),
+                            name: `${span.entity}.${span.operation}`,
+                            // 1 INTERNAL, 3 CLIENT: a statement left this process for an engine, and a
+                            // viewer draws the two differently. `selfMs` is NOT sent — a collector
+                            // derives it from the tree it already holds.
+                            kind: span.kind === 'statement' ? CLIENT : INTERNAL,
+                            startTimeUnixNano: nanos(span.startedAt),
+                            endTimeUnixNano: nanos(span.startedAt + span.ms),
+                            status: span.error ? { code: ERROR, message: span.error } : { code: OK },
+                        })),
+                    },
+                ],
+            },
+        ],
+    };
+}
+/** Epoch milliseconds → the int64 nanoseconds OTLP wants, as a string. */
+function nanos(ms) {
+    return `${Math.round(ms * 1e6)}`;
+}
+//# sourceMappingURL=OtlpExporter.js.map

package/dist/otlp/OtlpExporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtlpExporter.js","sourceRoot":"","sources":["../../src/otlp/OtlpExporter.ts"],"names":[],"mappings":"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"}

package/dist/otlp/OtlpOptions.d.ts

@@ -0,0 +1,16 @@
+import { type Metrics } from '../metrics/Metrics.js';
+export interface OtlpOptions {
+    /** Which service these spans belong to — what a dashboard groups by. */
+    service: string;
+    /** Collector endpoint. Default: the OTLP/HTTP convention on localhost. */
+    url?: string;
+    /** How often a full batch leaves. Default: every second. */
+    flushMs?: number;
+    /** Told when a batch could not be sent. Default: silence — a trace must never break a call. */
+    onError?: (err: unknown) => void;
+    /** Publish these metrics on the same beat. */
+    metrics?: Metrics;
+    /** Where metrics go when it is not the same collector as traces. */
+    metricsUrl?: string;
+}
+//# sourceMappingURL=OtlpOptions.d.ts.map

package/dist/otlp/OtlpOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtlpOptions.d.ts","sourceRoot":"","sources":["../../src/otlp/OtlpOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,wEAAwE;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,0EAA0E;IAC1E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IACjC,8CAA8C;IAC9C,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,oEAAoE;IACpE,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}

package/dist/otlp/OtlpOptions.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=OtlpOptions.js.map

package/dist/otlp/OtlpOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OtlpOptions.js","sourceRoot":"","sources":["../../src/otlp/OtlpOptions.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/observability",
-  "version": "0.9.2-alpha.0",
+  "version": "0.10.0-alpha.0",
   "description": "Optional observability for Fougere: one span per operation, W3C Trace Context across any transport.",
   "keywords": [
     "fougere",
@@ -31,15 +31,17 @@
     "src"
   ],
   "peerDependencies": {
-    "@fougere/core": "^0.9.2-alpha.0"
+    "@fougere/adapter-sql": "^0.10.0-alpha.0",
+    "@fougere/core": "^0.10.0-alpha.0"
   },
   "devDependencies": {
     "vitest": "^4.1.0",
-    "@fougere/container": "0.9.2-alpha.0",
-    "@fougere/core": "0.9.2-alpha.0",
-    "@fougere/schema": "0.9.2-alpha.0",
-    "@fougere/transport-http": "0.9.2-alpha.0",
-    "@fougere/compiler": "0.9.2-alpha.0"
+    "@fougere/adapter-sql": "0.10.0-alpha.0",
+    "@fougere/schema": "0.10.0-alpha.0",
+    "@fougere/compiler": "0.10.0-alpha.0",
+    "@fougere/core": "0.10.0-alpha.0",
+    "@fougere/container": "0.10.0-alpha.0",
+    "@fougere/transport-http": "0.10.0-alpha.0"
   },
   "publishConfig": {
     "access": "public"
@@ -51,6 +53,11 @@
       "default": "./dist/context/als.js"
     }
   },
+  "peerDependenciesMeta": {
+    "@fougere/adapter-sql": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "rm -rf dist && tsc",
     "test": "vitest run",

package/src/{otlp.ts → OtlpExporter.ts}

@@ -1,23 +1,8 @@
-/** OTLP export — the spans this process finished, in the one shape every collector reads. */
 import { Beat } from './Beat.js';
 import { Endpoint } from './Endpoint.js';
 import type { FinishedSpan, SpanSink } from './index.js';
-import { metricsPayload, type Metrics } from './metrics.js';
-
-export interface OtlpOptions {
-  /** Which service these spans belong to — what a dashboard groups by. */
-  service: string;
-  /** Collector endpoint. Default: the OTLP/HTTP convention on localhost. */
-  url?: string;
-  /** How often a full batch leaves. Default: every second. */
-  flushMs?: number;
-  /** Told when a batch could not be sent. Default: silence — a trace must never break a call. */
-  onError?: (err: unknown) => void;
-  /** Publish these metrics on the same beat. */
-  metrics?: Metrics;
-  /** Where metrics go when it is not the same collector as traces. */
-  metricsUrl?: string;
-}
+import { metricsPayload } from './metrics/Metrics.js';
+import type { OtlpOptions } from './OtlpOptions.js';
 
 export interface OtlpExporter {
   /** Hand to `onSpan`. */
@@ -30,8 +15,14 @@ export interface OtlpExporter {
 
 /** OTLP status codes: 0 unset, 1 ok, 2 error. */
 const OK = 1;
+
 const ERROR = 2;
 
+/** OTLP span kinds, of the six only these two are ours. */
+const INTERNAL = 1;
+
+const CLIENT = 3;
+
 export function otlp(options: OtlpOptions): OtlpExporter {
   const url = options.url ?? 'http://localhost:4318/v1/traces';
   const traces = Endpoint.at(url, options.onError);
@@ -75,7 +66,10 @@ function payload(service: string, spans: FinishedSpan[]) {
               spanId: span.spanId,
               ...(span.parentId ? { parentSpanId: span.parentId } : {}),
               name: `${span.entity}.${span.operation}`,
-              kind: 1,
+              // 1 INTERNAL, 3 CLIENT: a statement left this process for an engine, and a
+              // viewer draws the two differently. `selfMs` is NOT sent — a collector
+              // derives it from the tree it already holds.
+              kind: span.kind === 'statement' ? CLIENT : INTERNAL,
               startTimeUnixNano: nanos(span.startedAt),
               endTimeUnixNano: nanos(span.startedAt + span.ms),
               status: span.error ? { code: ERROR, message: span.error } : { code: OK },

package/src/OtlpOptions.ts

@@ -0,0 +1,16 @@
+import { type Metrics } from './metrics/Metrics.js';
+
+export interface OtlpOptions {
+  /** Which service these spans belong to — what a dashboard groups by. */
+  service: string;
+  /** Collector endpoint. Default: the OTLP/HTTP convention on localhost. */
+  url?: string;
+  /** How often a full batch leaves. Default: every second. */
+  flushMs?: number;
+  /** Told when a batch could not be sent. Default: silence — a trace must never break a call. */
+  onError?: (err: unknown) => void;
+  /** Publish these metrics on the same beat. */
+  metrics?: Metrics;
+  /** Where metrics go when it is not the same collector as traces. */
+  metricsUrl?: string;
+}