@btravstack/observability 0.8.0 → 0.10.0

package/README.md

@@ -51,17 +51,15 @@ import {
 import { Module, Provider } from "@btravstack/di";
 
 // The application depends on the port, like any other service.
-const placeOrder = Provider(PlaceOrder)(
-  { orders: OrderRepository, logger: Logger },
-  {
-    sync: ({ orders, logger }) => ({
-      execute: (id, quantity) =>
-        orders
-          .save({ id, quantity })
-          .tap(() => logger.info("order placed", { id, quantity })),
-    }),
-  },
-);
+const placeOrder = Provider(PlaceOrder)({
+  inject: { orders: OrderRepository, logger: Logger },
+  sync: ({ orders, logger }) => ({
+    execute: (id, quantity) =>
+      orders
+        .save({ id, quantity })
+        .tap(() => logger.info("order placed", { id, quantity })),
+  }),
+});
 
 // The starter provides it. `LOG_LEVEL` is read inside the graph and validated
 // once — `verbose` is a startup failure naming the variable, not a silent

package/dist/index.cjs

@@ -150,8 +150,29 @@ var LoggerConfig = class extends (0, _btravstack_di.Port)("LoggerConfig") {};
 */
 const observability = (options = {}) => (0, _btravstack_di.Module)("Observability")({
 	needs: [_btravstack_config.Env],
-	provides: [_btravstack_config.Config.provider(LoggerConfig)(loggerSchema(options.level)), (0, _btravstack_di.Provider)(_btravstack_core.Logger)({ config: LoggerConfig }, { sync: ({ config }) => createLogger(options.sink ?? jsonSink(), config.level) })],
-	exports: [_btravstack_core.Logger, LoggerConfig]
+	provides: [
+		_btravstack_config.Config.provider(LoggerConfig)(loggerSchema(options.level)),
+		(0, _btravstack_di.Provider)(_btravstack_core.Logger)({
+			inject: { config: LoggerConfig },
+			sync: ({ config }) => createLogger(options.sink ?? jsonSink(), config.level)
+		}),
+		_btravstack_di.Provider.member(_btravstack_core.Observers)({
+			inject: { logger: _btravstack_core.Logger },
+			sync: ({ logger }) => ({ component, name, attributes, details }) => ({ outcome, attributes: settled, cause }) => {
+				if (outcome !== "error") return;
+				logger.error(`${component}.${name} failed`, {
+					...attributes,
+					...details,
+					...settled
+				}, cause);
+			}
+		})
+	],
+	exports: [
+		_btravstack_core.Logger,
+		LoggerConfig,
+		_btravstack_core.Observers
+	]
 });
 /**
 * The kernel's nine lifecycle events, as log lines on `logger` — the adapter

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import { n as Sink, r as createLogger, t as Line } from "./logger-B1-_76ej.cjs";
 import { ConfigField, ConfigInvalid, Env } from "@btravstack/config";
-import { EventSink, Level, Logger, LoggerService } from "@btravstack/core";
+import { EventSink, Level, Logger, LoggerService, Observers } from "@btravstack/core";
 import { Module } from "@btravstack/di";
 //#region src/config.d.ts
 /**
@@ -63,7 +63,7 @@ type ObservabilityOptions = {
  * `currentUnit()` per call — so a request's lines are attributable with no
  * argument threaded through the call stack.
  */
-declare const observability: (options?: ObservabilityOptions) => Module<Logger | LoggerConfig, ConfigInvalid, Env>;
+declare const observability: (options?: ObservabilityOptions) => Module<Logger | LoggerConfig | Observers, ConfigInvalid, Env>;
 /**
  * The kernel's nine lifecycle events, as log lines on `logger` — the adapter
  * between `StartOptions.onEvent` and an application's own stream.

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { n as Sink, r as createLogger, t as Line } from "./logger-B1-_76ej.mjs";
 import { ConfigField, ConfigInvalid, Env } from "@btravstack/config";
-import { EventSink, Level, Logger, LoggerService } from "@btravstack/core";
+import { EventSink, Level, Logger, LoggerService, Observers } from "@btravstack/core";
 import { Module } from "@btravstack/di";
 //#region src/config.d.ts
 /**
@@ -63,7 +63,7 @@ type ObservabilityOptions = {
  * `currentUnit()` per call — so a request's lines are attributable with no
  * argument threaded through the call stack.
  */
-declare const observability: (options?: ObservabilityOptions) => Module<Logger | LoggerConfig, ConfigInvalid, Env>;
+declare const observability: (options?: ObservabilityOptions) => Module<Logger | LoggerConfig | Observers, ConfigInvalid, Env>;
 /**
  * The kernel's nine lifecycle events, as log lines on `logger` — the adapter
  * between `StartOptions.onEvent` and an application's own stream.

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { Config, ConfigFieldInvalid, Env } from "@btravstack/config";
-import { LEVELS, Logger, currentUnit } from "@btravstack/core";
+import { LEVELS, Logger, Observers, currentUnit } from "@btravstack/core";
 import { Module, Port, Provider } from "@btravstack/di";
 //#region src/config.ts
 const isLevel = (value) => LEVELS.includes(value);
@@ -149,8 +149,29 @@ var LoggerConfig = class extends Port("LoggerConfig") {};
 */
 const observability = (options = {}) => Module("Observability")({
 	needs: [Env],
-	provides: [Config.provider(LoggerConfig)(loggerSchema(options.level)), Provider(Logger)({ config: LoggerConfig }, { sync: ({ config }) => createLogger(options.sink ?? jsonSink(), config.level) })],
-	exports: [Logger, LoggerConfig]
+	provides: [
+		Config.provider(LoggerConfig)(loggerSchema(options.level)),
+		Provider(Logger)({
+			inject: { config: LoggerConfig },
+			sync: ({ config }) => createLogger(options.sink ?? jsonSink(), config.level)
+		}),
+		Provider.member(Observers)({
+			inject: { logger: Logger },
+			sync: ({ logger }) => ({ component, name, attributes, details }) => ({ outcome, attributes: settled, cause }) => {
+				if (outcome !== "error") return;
+				logger.error(`${component}.${name} failed`, {
+					...attributes,
+					...details,
+					...settled
+				}, cause);
+			}
+		})
+	],
+	exports: [
+		Logger,
+		LoggerConfig,
+		Observers
+	]
 });
 /**
 * The kernel's nine lifecycle events, as log lines on `logger` — the adapter

package/dist/otel.cjs

@@ -35,8 +35,52 @@ var OtelSdk = class extends (0, _btravstack_di.Port)("OtelSdk") {};
 */
 const otel = (options) => (0, _btravstack_di.Module)("Otel")({
 	provides: [
-		_btravstack_di.Provider.member(_btravstack_core.Instrumentations)({ value: () => Promise.resolve(void 0) }),
-		(0, _btravstack_di.Provider)(OtelSdk)({ offered: _btravstack_core.Instrumentations }, {
+		_btravstack_di.Provider.member(_btravstack_core.Instrumentations)({
+			inject: {},
+			value: () => Promise.resolve(void 0)
+		}),
+		_btravstack_di.Provider.member(_btravstack_core.Observers)({
+			inject: {},
+			sync: () => {
+				const tracer = _opentelemetry_api.trace.getTracer("@btravstack/observability");
+				const counters = /* @__PURE__ */ new Map();
+				const durations = /* @__PURE__ */ new Map();
+				const instrument = (cache, key, make) => {
+					const existing = cache.get(key);
+					if (existing !== void 0) return existing;
+					const minted = make();
+					cache.set(key, minted);
+					return minted;
+				};
+				return ({ component, name, attributes, details, traced }) => {
+					const meter = _opentelemetry_api.metrics.getMeter("@btravstack/observability");
+					const span = traced === false ? void 0 : tracer.startSpan(`${component}.${name}`);
+					span?.setAttributes({
+						...attributes,
+						...details
+					});
+					const startedAt = performance.now();
+					const operations = instrument(counters, component, () => meter.createCounter(`btravstack.${component}.operations`, { description: `${component} operations, by operation and outcome` }));
+					const duration = instrument(durations, component, () => meter.createHistogram(`btravstack.${component}.duration`, {
+						description: `${component} operation duration`,
+						unit: "ms"
+					}));
+					return ({ outcome, attributes: settled }) => {
+						const all = {
+							...attributes,
+							...settled,
+							outcome
+						};
+						operations.add(1, all);
+						duration.record(performance.now() - startedAt, all);
+						if (outcome === "error") span?.setStatus({ code: _btravstack_core.SPAN_STATUS.error });
+						span?.end();
+					};
+				};
+			}
+		}),
+		(0, _btravstack_di.Provider)(OtelSdk)({
+			inject: { offered: _btravstack_core.Instrumentations },
 			acquire: ({ offered }) => (0, unthrown.fromSafePromise)(Promise.all(offered.map((load) => load())).then((loaded) => {
 				const sdk = new _opentelemetry_sdk_node.NodeSDK({
 					...options,
@@ -47,13 +91,23 @@ const otel = (options) => (0, _btravstack_di.Module)("Otel")({
 			})),
 			release: (sdk) => sdk.shutdown()
 		}),
-		(0, _btravstack_di.Provider)(_btravstack_core.Tracer)({ sdk: OtelSdk }, { sync: () => {
-			const tracer = _opentelemetry_api.trace.getTracer("@btravstack/observability");
-			return { startSpan: (name) => tracer.startSpan(name) };
-		} }),
-		(0, _btravstack_di.Provider)(_btravstack_core.Meter)({ sdk: OtelSdk }, { sync: () => _opentelemetry_api.metrics.getMeter("@btravstack/observability") })
+		(0, _btravstack_di.Provider)(_btravstack_core.Tracer)({
+			inject: { sdk: OtelSdk },
+			sync: () => {
+				const tracer = _opentelemetry_api.trace.getTracer("@btravstack/observability");
+				return { startSpan: (name) => tracer.startSpan(name) };
+			}
+		}),
+		(0, _btravstack_di.Provider)(_btravstack_core.Meter)({
+			inject: { sdk: OtelSdk },
+			sync: () => _opentelemetry_api.metrics.getMeter("@btravstack/observability")
+		})
 	],
-	exports: [_btravstack_core.Tracer, _btravstack_core.Meter]
+	exports: [
+		_btravstack_core.Tracer,
+		_btravstack_core.Meter,
+		_btravstack_core.Observers
+	]
 });
 /** The span a unit rides, ended when the unit's fork closes. */
 var UnitSpan = class extends (0, _btravstack_di.Port)("UnitSpan") {};
@@ -72,7 +126,8 @@ var UnitSpan = class extends (0, _btravstack_di.Port)("UnitSpan") {};
 */
 const UnitSpanModule = (0, _btravstack_di.Module)("UnitSpan")({
 	needs: [_btravstack_core.Tracer],
-	provides: [(0, _btravstack_di.Provider)(UnitSpan)({ tracer: _btravstack_core.Tracer }, {
+	provides: [(0, _btravstack_di.Provider)(UnitSpan)({
+		inject: { tracer: _btravstack_core.Tracer },
 		sync: ({ tracer }) => {
 			const unit = (0, _btravstack_core.currentUnit)();
 			const span = tracer.startSpan("unit");

package/dist/otel.d.cts

@@ -1,4 +1,4 @@
-import { Meter, Span, Tracer } from "@btravstack/core";
+import { Meter, Observers, Span, Tracer } from "@btravstack/core";
 import { Module, Scope } from "@btravstack/di";
 import { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
 //#region src/otel.d.ts
@@ -29,7 +29,7 @@ import { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
  * plan time and in `Needs`. Guice's `newSetBinder` declares the empty set for
  * the same reason.
  */
-declare const otel: (options?: Partial<NodeSDKConfiguration>) => Module<Tracer | Meter, never, Scope>;
+declare const otel: (options?: Partial<NodeSDKConfiguration>) => Module<Tracer | Meter | Observers, never, Scope>;
 declare const UnitSpan_base: import("@btravstack/di").PortClass<"UnitSpan">;
 /** The span a unit rides, ended when the unit's fork closes. */
 declare class UnitSpan extends UnitSpan_base<Span> {}

package/dist/otel.d.mts

@@ -1,4 +1,4 @@
-import { Meter, Span, Tracer } from "@btravstack/core";
+import { Meter, Observers, Span, Tracer } from "@btravstack/core";
 import { Module, Scope } from "@btravstack/di";
 import { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
 //#region src/otel.d.ts
@@ -29,7 +29,7 @@ import { NodeSDKConfiguration } from "@opentelemetry/sdk-node";
  * plan time and in `Needs`. Guice's `newSetBinder` declares the empty set for
  * the same reason.
  */
-declare const otel: (options?: Partial<NodeSDKConfiguration>) => Module<Tracer | Meter, never, Scope>;
+declare const otel: (options?: Partial<NodeSDKConfiguration>) => Module<Tracer | Meter | Observers, never, Scope>;
 declare const UnitSpan_base: import("@btravstack/di").PortClass<"UnitSpan">;
 /** The span a unit rides, ended when the unit's fork closes. */
 declare class UnitSpan extends UnitSpan_base<Span> {}

package/dist/otel.mjs

@@ -1,4 +1,4 @@
-import { Instrumentations, Meter, Tracer, currentUnit } from "@btravstack/core";
+import { Instrumentations, Meter, Observers, SPAN_STATUS, Tracer, currentUnit } from "@btravstack/core";
 import { Module, Port, Provider } from "@btravstack/di";
 import { metrics, trace } from "@opentelemetry/api";
 import { NodeSDK } from "@opentelemetry/sdk-node";
@@ -34,8 +34,52 @@ var OtelSdk = class extends Port("OtelSdk") {};
 */
 const otel = (options) => Module("Otel")({
 	provides: [
-		Provider.member(Instrumentations)({ value: () => Promise.resolve(void 0) }),
-		Provider(OtelSdk)({ offered: Instrumentations }, {
+		Provider.member(Instrumentations)({
+			inject: {},
+			value: () => Promise.resolve(void 0)
+		}),
+		Provider.member(Observers)({
+			inject: {},
+			sync: () => {
+				const tracer = trace.getTracer("@btravstack/observability");
+				const counters = /* @__PURE__ */ new Map();
+				const durations = /* @__PURE__ */ new Map();
+				const instrument = (cache, key, make) => {
+					const existing = cache.get(key);
+					if (existing !== void 0) return existing;
+					const minted = make();
+					cache.set(key, minted);
+					return minted;
+				};
+				return ({ component, name, attributes, details, traced }) => {
+					const meter = metrics.getMeter("@btravstack/observability");
+					const span = traced === false ? void 0 : tracer.startSpan(`${component}.${name}`);
+					span?.setAttributes({
+						...attributes,
+						...details
+					});
+					const startedAt = performance.now();
+					const operations = instrument(counters, component, () => meter.createCounter(`btravstack.${component}.operations`, { description: `${component} operations, by operation and outcome` }));
+					const duration = instrument(durations, component, () => meter.createHistogram(`btravstack.${component}.duration`, {
+						description: `${component} operation duration`,
+						unit: "ms"
+					}));
+					return ({ outcome, attributes: settled }) => {
+						const all = {
+							...attributes,
+							...settled,
+							outcome
+						};
+						operations.add(1, all);
+						duration.record(performance.now() - startedAt, all);
+						if (outcome === "error") span?.setStatus({ code: SPAN_STATUS.error });
+						span?.end();
+					};
+				};
+			}
+		}),
+		Provider(OtelSdk)({
+			inject: { offered: Instrumentations },
 			acquire: ({ offered }) => fromSafePromise(Promise.all(offered.map((load) => load())).then((loaded) => {
 				const sdk = new NodeSDK({
 					...options,
@@ -46,13 +90,23 @@ const otel = (options) => Module("Otel")({
 			})),
 			release: (sdk) => sdk.shutdown()
 		}),
-		Provider(Tracer)({ sdk: OtelSdk }, { sync: () => {
-			const tracer = trace.getTracer("@btravstack/observability");
-			return { startSpan: (name) => tracer.startSpan(name) };
-		} }),
-		Provider(Meter)({ sdk: OtelSdk }, { sync: () => metrics.getMeter("@btravstack/observability") })
+		Provider(Tracer)({
+			inject: { sdk: OtelSdk },
+			sync: () => {
+				const tracer = trace.getTracer("@btravstack/observability");
+				return { startSpan: (name) => tracer.startSpan(name) };
+			}
+		}),
+		Provider(Meter)({
+			inject: { sdk: OtelSdk },
+			sync: () => metrics.getMeter("@btravstack/observability")
+		})
 	],
-	exports: [Tracer, Meter]
+	exports: [
+		Tracer,
+		Meter,
+		Observers
+	]
 });
 /** The span a unit rides, ended when the unit's fork closes. */
 var UnitSpan = class extends Port("UnitSpan") {};
@@ -71,7 +125,8 @@ var UnitSpan = class extends Port("UnitSpan") {};
 */
 const UnitSpanModule = Module("UnitSpan")({
 	needs: [Tracer],
-	provides: [Provider(UnitSpan)({ tracer: Tracer }, {
+	provides: [Provider(UnitSpan)({
+		inject: { tracer: Tracer },
 		sync: ({ tracer }) => {
 			const unit = currentUnit();
 			const span = tracer.startSpan("unit");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btravstack/observability",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Observability for @btravstack/core: a strict Logger port correlated with the kernel's units, a dependency-free JSON sink, and the lifecycle events as log lines",
   "keywords": [
     "dependency-injection",
@@ -77,19 +77,19 @@
     "typescript": "7.0.2",
     "unthrown": "5.7.0",
     "vitest": "4.1.11",
-    "@btravstack/config": "0.8.0",
-    "@btravstack/core": "0.8.0",
-    "@btravstack/di": "0.8.0",
-    "@btravstack/testing": "0.8.0"
+    "@btravstack/config": "0.10.0",
+    "@btravstack/core": "0.10.0",
+    "@btravstack/di": "0.10.0",
+    "@btravstack/testing": "0.10.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/sdk-node": "^0.221.0",
     "pino": "^10",
     "unthrown": "^5.0.0",
-    "@btravstack/config": "^0.8.0",
-    "@btravstack/core": "^0.8.0",
-    "@btravstack/di": "^0.8.0"
+    "@btravstack/config": "^0.10.0",
+    "@btravstack/core": "^0.10.0",
+    "@btravstack/di": "^0.10.0"
   },
   "peerDependenciesMeta": {
     "@opentelemetry/api": {