@event-driven-io/emmett 0.43.0-beta.22 → 0.43.0-beta.24

package/dist/index.cjs

@@ -619,6 +619,11 @@ const bigIntReplacer = (_key, value) => {
 const dateReplacer = (_key, value) => {
 	return value instanceof Date ? value.toISOString() : value;
 };
+const errorReplacer = (_key, value) => value instanceof Error ? {
+	type: value.constructor.name || "error",
+	message: value.message,
+	stack: value.stack
+} : value;
 const isFirstLetterNumeric = (str) => {
 	const c = str.charCodeAt(0);
 	return c >= 48 && c <= 57;
@@ -660,11 +665,12 @@ const composeJSONRevivers = (...revivers) => {
 	if (filteredRevivers.length === 0) return void 0;
 	return (key, value, context) => filteredRevivers.reduce((accValue, reviver) => reviver(key, accValue, context), value);
 };
-const JSONReplacer = (opts) => composeJSONReplacers(opts?.replacer, opts?.failOnBigIntSerialization !== true ? JSONReplacers.bigInt : void 0, opts?.useDefaultDateSerialization !== true ? JSONReplacers.date : void 0);
+const JSONReplacer = (opts) => composeJSONReplacers(opts?.replacer, opts?.failOnBigIntSerialization !== true ? JSONReplacers.bigInt : void 0, opts?.useDefaultDateSerialization !== true ? JSONReplacers.date : void 0, opts?.skipErrorSerialization !== true ? JSONReplacers.error : void 0);
 const JSONReviver = (opts) => composeJSONRevivers(opts?.reviver, opts?.parseBigInts === true ? JSONRevivers.bigInt : void 0, opts?.parseDates === true ? JSONRevivers.date : void 0);
 const JSONReplacers = {
 	bigInt: bigIntReplacer,
-	date: dateReplacer
+	date: dateReplacer,
+	error: errorReplacer
 };
 const JSONRevivers = {
 	bigInt: bigIntReviver,
@@ -673,8 +679,19 @@ const JSONRevivers = {
 const jsonSerializer = (options) => {
 	const defaultReplacer = JSONReplacer(options);
 	const defaultReviver = JSONReviver(options);
+	const defaultFormat = options?.format ?? "compact";
+	const defaultSafe = options?.safe ?? false;
 	return {
-		serialize: (object, serializerOptions) => JSON.stringify(object, serializerOptions ? JSONReplacer(serializerOptions) : defaultReplacer),
+		serialize: (object, serializerOptions) => {
+			const replacer = serializerOptions ? JSONReplacer(serializerOptions) : defaultReplacer;
+			const indent = (serializerOptions?.format ?? defaultFormat) === "pretty" ? 2 : void 0;
+			if (serializerOptions?.safe ?? defaultSafe) try {
+				return JSON.stringify(object, replacer, indent);
+			} catch (e) {
+				return `{"__serializationError":${JSON.stringify(String(e))}}`;
+			}
+			return JSON.stringify(object, replacer, indent);
+		},
 		deserialize: (payload, deserializerOptions) => JSON.parse(payload, deserializerOptions ? JSONReviver(deserializerOptions) : defaultReviver)
 	};
 };
@@ -978,6 +995,15 @@ const getInMemoryDatabase = () => {
 	} };
 };
 
+//#endregion
+//#region src/processors/checkpoints.ts
+const ProcessorCheckpoint = (checkpoint) => checkpoint;
+const bigIntProcessorCheckpoint = (value) => bigInt.toNormalizedString(value);
+const parseBigIntProcessorCheckpoint = (value) => BigInt(value);
+const getCheckpoint = (message) => {
+	return message.metadata.checkpoint;
+};
+
 //#endregion
 //#region src/observability/attributes.ts
 const EmmettAttributes = {
@@ -1065,281 +1091,21 @@ const MessagingSystemName = "emmett";
 
 //#endregion
 //#region src/observability/options.ts
-const resolveConsumerObservability = (options, parent) => ({
-	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
-	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
-	pollTracing: options?.observability?.pollTracing ?? parent?.observability?.pollTracing ?? "off",
-	attributeTarget: options?.observability?.attributeTarget ?? parent?.observability?.attributeTarget ?? "both"
-});
-const resolveWorkflowObservability = (options, parent) => ({
-	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
-	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
-	propagation: options?.observability?.propagation ?? parent?.observability?.propagation ?? "links",
-	attributeTarget: options?.observability?.attributeTarget ?? parent?.observability?.attributeTarget ?? "both",
-	includeMessagePayloads: options?.observability?.includeMessagePayloads ?? parent?.observability?.includeMessagePayloads ?? false
-});
-
-//#endregion
-//#region src/observability/tracer.ts
-const tracer = () => {};
-const LogLevel = {
-	DISABLED: "DISABLED",
-	INFO: "INFO",
-	LOG: "LOG",
-	WARN: "WARN",
-	ERROR: "ERROR"
-};
-const LogStyle = {
-	RAW: "RAW",
-	PRETTY: "PRETTY"
-};
-const getEnvVariable = (name) => {
-	try {
-		if (typeof process !== "undefined" && process.env) return process.env[name];
-		return;
-	} catch {
-		return;
-	}
-};
-const shouldLog = (logLevel) => {
-	const definedLogLevel = getEnvVariable("DUMBO_LOG_LEVEL") ?? LogLevel.ERROR;
-	if (definedLogLevel === LogLevel.ERROR && logLevel === LogLevel.ERROR) return true;
-	if (definedLogLevel === LogLevel.WARN && [LogLevel.ERROR, LogLevel.WARN].includes(logLevel)) return true;
-	if (definedLogLevel === LogLevel.LOG && [
-		LogLevel.ERROR,
-		LogLevel.WARN,
-		LogLevel.LOG
-	].includes(logLevel)) return true;
-	if (definedLogLevel === LogLevel.INFO && [
-		LogLevel.ERROR,
-		LogLevel.WARN,
-		LogLevel.LOG,
-		LogLevel.INFO
-	].includes(logLevel)) return true;
-	return false;
-};
-const nulloTraceEventRecorder = () => {};
-const getTraceEventFormatter = (logStyle, serializer) => (event) => {
-	serializer = serializer ?? JSONSerializer.from();
-	switch (logStyle) {
-		case "RAW": return serializer.serialize(event);
-		case "PRETTY": return serializer.serialize(event);
-	}
-};
-const getTraceEventRecorder = (logLevel, logStyle) => {
-	const format = getTraceEventFormatter(logStyle);
-	switch (logLevel) {
-		case "DISABLED": return nulloTraceEventRecorder;
-		case "INFO": return (event) => console.info(format(event));
-		case "LOG": return (event) => console.log(format(event));
-		case "WARN": return (event) => console.warn(format(event));
-		case "ERROR": return (event) => console.error(format(event));
-	}
-};
-const recordTraceEvent = (logLevel, eventName, attributes) => {
-	if (!shouldLog(LogLevel.LOG)) return;
-	const event = {
-		name: eventName,
-		timestamp: (/* @__PURE__ */ new Date()).getTime(),
-		...attributes
+const mergeObservabilityOptions = (options, defaults) => {
+	const observability = defaults === void 0 ? options.observability : options.observability === void 0 ? defaults : {
+		...defaults,
+		...options.observability
 	};
-	getTraceEventRecorder(logLevel, getEnvVariable("DUMBO_LOG_STYLE") ?? "RAW")(event);
-};
-tracer.info = (eventName, attributes) => recordTraceEvent(LogLevel.INFO, eventName, attributes);
-tracer.warn = (eventName, attributes) => recordTraceEvent(LogLevel.WARN, eventName, attributes);
-tracer.log = (eventName, attributes) => recordTraceEvent(LogLevel.LOG, eventName, attributes);
-tracer.error = (eventName, attributes) => recordTraceEvent(LogLevel.ERROR, eventName, attributes);
-
-//#endregion
-//#region src/eventStore/observability/eventStoreCollector.ts
-const resolveEventStoreObservability = (options, parent) => ({
-	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
-	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
-	attributeTarget: options?.observability?.attributeTarget ?? parent?.observability?.attributeTarget ?? "both"
-});
-const eventStoreCollector = (observability) => {
-	const A = EmmettAttributes;
-	const M = _event_driven_io_almanac.MessagingAttributes;
-	const streamReadingDuration = observability.meter.histogram(EmmettMetrics.stream.readingDuration);
-	const streamReadingSize = observability.meter.histogram(EmmettMetrics.stream.readingSize);
-	const eventReadingCount = observability.meter.counter(EmmettMetrics.event.readingCount);
-	const streamAppendingDuration = observability.meter.histogram(EmmettMetrics.stream.appendingDuration);
-	const streamAppendingSize = observability.meter.histogram(EmmettMetrics.stream.appendingSize);
-	const eventAppendingCount = observability.meter.counter(EmmettMetrics.event.appendingCount);
+	if (observability === options.observability) return options;
 	return {
-		instrumentRead: (streamName, fn) => {
-			const start = Date.now();
-			return observability.tracer.startSpan("eventStore.readStream", async (span) => {
-				span.setAttributes({
-					[A.eventStore.operation]: "readStream",
-					[A.stream.name]: streamName,
-					[M.operation.type]: "receive",
-					[M.destination.name]: streamName,
-					[M.system]: MessagingSystemName
-				});
-				let status = "success";
-				try {
-					const result = await fn();
-					const events = result.events;
-					span.setAttributes({
-						[A.eventStore.read.status]: status,
-						[A.eventStore.read.eventCount]: events.length,
-						[A.eventStore.read.eventTypes]: [...new Set(events.map((e) => e.type))]
-					});
-					streamReadingSize.record(events.length, { [A.eventStore.read.status]: status });
-					for (const event of events) eventReadingCount.add(1, { [A.event.type]: event.type });
-					return result;
-				} catch (err) {
-					status = "failure";
-					span.setAttributes({ [A.eventStore.read.status]: status });
-					throw err;
-				} finally {
-					streamReadingDuration.record(Date.now() - start, { [A.eventStore.read.status]: status });
-				}
-			});
-		},
-		instrumentAppend: (streamName, events, fn) => {
-			const start = Date.now();
-			return observability.tracer.startSpan("eventStore.appendToStream", async (span) => {
-				span.setAttributes({
-					[A.eventStore.operation]: "appendToStream",
-					[A.stream.name]: streamName,
-					[A.eventStore.append.batchSize]: events.length,
-					[M.operation.type]: "send",
-					[M.batch.messageCount]: events.length,
-					[M.destination.name]: streamName,
-					[M.system]: MessagingSystemName
-				});
-				let status = "success";
-				try {
-					const result = await fn();
-					span.setAttributes({
-						[A.eventStore.append.status]: status,
-						[A.stream.versionAfter]: Number(result.nextExpectedStreamVersion)
-					});
-					streamAppendingSize.record(events.length, { [A.eventStore.append.status]: status });
-					for (const event of events) eventAppendingCount.add(1, { [A.event.type]: event.type });
-					return result;
-				} catch (err) {
-					status = "failure";
-					span.setAttributes({ [A.eventStore.append.status]: status });
-					throw err;
-				} finally {
-					streamAppendingDuration.record(Date.now() - start, { [A.eventStore.append.status]: status });
-				}
-			});
-		}
-	};
-};
-
-//#endregion
-//#region src/observability/collectors/consumerCollector.ts
-const consumerCollector = (observability) => {
-	const { startScope } = (0, _event_driven_io_almanac.ObservabilityScope)({
-		...observability,
-		attributePrefix: "emmett"
-	});
-	const A = EmmettAttributes;
-	const M = _event_driven_io_almanac.MessagingAttributes;
-	const pollDuration = observability.meter.histogram(EmmettMetrics.consumer.pollDuration);
-	const deliveryDuration = observability.meter.histogram(EmmettMetrics.consumer.deliveryDuration);
-	return {
-		tracePoll: (context, fn) => {
-			if (observability.pollTracing === "off" || observability.pollTracing === "active" && context.batchSize === 0) return fn(_event_driven_io_almanac.noopScope);
-			return startScope("consumer.poll", async (scope) => {
-				scope.setAttributes({
-					[A.scope.type]: ScopeTypes.consumer,
-					[A.consumer.batchSize]: context.batchSize,
-					[A.consumer.processorCount]: context.processorCount,
-					[M.system]: MessagingSystemName,
-					[M.operation.type]: "receive",
-					...context.empty ? { "emmett.consumer.poll.empty": true } : {},
-					...context.waitMs != null ? { "emmett.consumer.poll.wait_ms": context.waitMs } : {}
-				});
-				return fn(scope);
-			});
-		},
-		recordPollMetrics: (durationMs, attrs) => {
-			pollDuration.record(durationMs, attrs);
-		},
-		traceDelivery: (scope, processorId, fn) => {
-			const start = Date.now();
-			return scope.scope(`consumer.deliver.${processorId}`, async (child) => {
-				try {
-					return await fn();
-				} catch (error) {
-					if (error instanceof Error) child.recordException(error);
-					throw error;
-				} finally {
-					deliveryDuration.record(Date.now() - start, { [A.consumer.delivery.processorId]: processorId });
-				}
-			}, { attributes: { [A.consumer.delivery.processorId]: processorId } });
-		}
-	};
-};
-
-//#endregion
-//#region src/observability/collectors/workflowCollector.ts
-const workflowCollector = (observability) => {
-	const { startScope } = (0, _event_driven_io_almanac.ObservabilityScope)({
-		...observability,
-		attributePrefix: "emmett"
-	});
-	const A = EmmettAttributes;
-	const M = _event_driven_io_almanac.MessagingAttributes;
-	const processingDuration = observability.meter.histogram(EmmettMetrics.workflow.processingDuration);
-	return {
-		startScope: (context, fn) => {
-			const start = Date.now();
-			return startScope("workflow.handle", async (scope) => {
-				scope.setAttributes({
-					[A.scope.type]: ScopeTypes.workflow,
-					[A.workflow.id]: context.workflowId,
-					[A.workflow.type]: context.workflowType,
-					[A.workflow.inputType]: context.inputType,
-					[M.system]: MessagingSystemName
-				});
-				let status = "success";
-				try {
-					return await fn(scope);
-				} catch (err) {
-					status = "failure";
-					throw err;
-				} finally {
-					processingDuration.record(Date.now() - start, {
-						[A.workflow.type]: context.workflowType,
-						status
-					});
-				}
-			}, { attributes: {
-				[A.scope.type]: ScopeTypes.workflow,
-				[A.workflow.type]: context.workflowType
-			} });
-		},
-		recordOutputs: (scope, outputs) => {
-			scope.setAttributes({
-				[A.workflow.outputs]: outputs.map((o) => o.type),
-				[A.workflow.outputsCount]: outputs.length
-			});
-		},
-		recordStateRebuild: (scope, eventCount) => {
-			scope.setAttributes({ [A.workflow.stateRebuildEventCount]: eventCount });
-		}
+		...options,
+		observability
 	};
 };
 
-//#endregion
-//#region src/processors/checkpoints.ts
-const ProcessorCheckpoint = (checkpoint) => checkpoint;
-const bigIntProcessorCheckpoint = (value) => bigInt.toNormalizedString(value);
-const parseBigIntProcessorCheckpoint = (value) => BigInt(value);
-const getCheckpoint = (message) => {
-	return message.metadata.checkpoint;
-};
-
 //#endregion
 //#region src/processors/observability/processorCollector.ts
-const resolveProcessorObservability = (options, parent) => ({
+const processorObservability = (options, parent) => ({
 	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
 	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
 	propagation: options?.observability?.propagation ?? parent?.observability?.propagation ?? "links",
@@ -1447,9 +1213,10 @@ const defaultProcessorVersion = 1;
 const defaultProcessorPartition = defaultTag;
 const getProcessorInstanceId = (processorId) => `${processorId}:${(0, uuid.v7)()}`;
 const getProjectorId = (options) => `emt:processor:projector:${options.projectionName}`;
+const { info, error } = _event_driven_io_almanac.LogEvent;
 const reactor = (options) => {
 	const { checkpoints, processorId, processorInstanceId: instanceId = getProcessorInstanceId(processorId), type = MessageProcessorType.REACTOR, version = 1, partition = defaultProcessorPartition, hooks = {}, processingScope = defaultProcessingMessageProcessingScope, startFrom, canHandle, stopAfter } = options;
-	const collector = processorCollector(resolveProcessorObservability(options));
+	const collector = processorCollector(processorObservability(options));
 	const isCustomBatch = "eachBatch" in options && !!options.eachBatch;
 	const eachBatch = isCustomBatch ? options.eachBatch : async (messages, context) => {
 		const batchCtx = context.observabilityScope.spanContext();
@@ -1531,25 +1298,27 @@ const reactor = (options) => {
 				...partialOptions,
 				observabilityScope: ("observabilityScope" in partialOptions ? partialOptions.observabilityScope ?? _event_driven_io_almanac.noopScope : _event_driven_io_almanac.noopScope) ?? _event_driven_io_almanac.noopScope
 			};
+			const log = startOptions.observabilityScope.log;
 			if (isActive) {
-				console.log(`Processor ${processorId} with instance id ${instanceId} is already active. Start request ignored.`);
+				log(info(`Processor ${processorId} with instance id ${instanceId} is already active. Start request ignored.`));
 				return;
 			}
-			console.log(`Starting processor ${processorId} with instance id ${instanceId}`);
+			log(info(`Starting processor ${processorId} with instance id ${instanceId}`));
 			await init(startOptions);
 			isActive = true;
 			closeSignal = onShutdown(() => close(startOptions));
 			if (lastCheckpoint !== null) {
-				console.log(`Processor ${processorId} started with instance id ${instanceId}, checkpoint: ${JSONSerializer.serialize(lastCheckpoint)}`);
+				log(info(`Processor ${processorId} started with instance id ${instanceId}, checkpoint: ${JSONSerializer.serialize(lastCheckpoint)}`));
 				return { lastCheckpoint };
 			}
 			return await processingScope(async (context) => {
+				const log = context.observabilityScope.log;
 				if (hooks.onStart) {
-					console.log(`Executing onStart hook for processor ${processorId} with instance id ${instanceId}`);
+					log(info(`Executing onStart hook for processor ${processorId} with instance id ${instanceId}`));
 					await hooks.onStart(context);
 				}
 				if (startFrom && startFrom !== "CURRENT") {
-					console.log(`Processor ${processorId} with instance id ${instanceId} starting from: ${JSONSerializer.serialize(startFrom)}`);
+					log(info(`Processor ${processorId} with instance id ${instanceId} starting from: ${JSONSerializer.serialize(startFrom)}`));
 					return startFrom;
 				}
 				if (checkpoints) lastCheckpoint = (await checkpoints?.read({
@@ -1560,10 +1329,10 @@ const reactor = (options) => {
 					...context
 				})).lastCheckpoint;
 				if (lastCheckpoint === null) {
-					console.log(`Processor ${processorId} with instance id ${instanceId} starting from: BEGINNING`);
+					log(info(`Processor ${processorId} with instance id ${instanceId} starting from: BEGINNING`));
 					return "BEGINNING";
 				}
-				console.log(`Checkpoint read for processor ${processorId} with instance id ${instanceId}: ${JSONSerializer.serialize(lastCheckpoint)}`);
+				log(info(`Checkpoint read for processor ${processorId} with instance id ${instanceId}: ${JSONSerializer.serialize(lastCheckpoint)}`));
 				return { lastCheckpoint };
 			}, startOptions);
 		},
@@ -1620,12 +1389,12 @@ const reactor = (options) => {
 						...partialContext,
 						observabilityScope: scope
 					});
-				} catch (error) {
-					console.log(`Error during message processing for processor ${processorId} with instance id ${instanceId}. Stopping the processor.`, error);
+				} catch (err) {
+					scope.log(error({ err }, `Error during message processing for processor ${processorId} with instance id ${instanceId}. Stopping the processor.`));
 					isActive = false;
 					return {
 						type: "STOP",
-						error,
+						error: err,
 						reason: "Error during message processing"
 					};
 				}
@@ -1995,6 +1764,7 @@ const assertThatArray = (array) => {
 
 //#endregion
 //#region src/testing/deciderSpecification.ts
+const isPromiseLike = (value) => value !== null && (typeof value === "object" || typeof value === "function") && typeof value.then === "function";
 const DeciderSpecification = { for: deciderSpecificationFor };
 function deciderSpecificationFor(decider) {
 	return (givenEvents) => {
@@ -2004,16 +1774,14 @@ function deciderSpecificationFor(decider) {
 				return decider.decide(command, currentState);
 			};
 			return {
-				then: (expectedEvents) => {
+				then: (expectedEventsOrAssert) => {
 					const resultEvents = handle();
-					if (resultEvents instanceof Promise) return resultEvents.then((events) => {
-						thenHandler$1(events, expectedEvents);
-					});
-					thenHandler$1(resultEvents, expectedEvents);
+					if (isPromiseLike(resultEvents)) return Promise.resolve(resultEvents).then((events) => thenHandler$1(events, expectedEventsOrAssert));
+					return thenHandler$1(resultEvents, expectedEventsOrAssert);
 				},
 				thenNothingHappened: () => {
 					const resultEvents = handle();
-					if (resultEvents instanceof Promise) return resultEvents.then((events) => {
+					if (isPromiseLike(resultEvents)) return Promise.resolve(resultEvents).then((events) => {
 						thenNothingHappensHandler$1(events);
 					});
 					thenNothingHappensHandler$1(resultEvents);
@@ -2021,7 +1789,7 @@ function deciderSpecificationFor(decider) {
 				thenThrows: (...args) => {
 					try {
 						const result = handle();
-						if (result instanceof Promise) return result.then(() => {
+						if (isPromiseLike(result)) return Promise.resolve(result).then(() => {
 							throw new AssertionError("Handler did not fail as expected");
 						}).catch((error) => {
 							thenThrowsErrorHandler$1(error, args);
@@ -2035,11 +1803,26 @@ function deciderSpecificationFor(decider) {
 		} };
 	};
 }
-function thenHandler$1(events, expectedEvents) {
+function thenHandler$1(events, expectedEventsOrAssert) {
 	const resultEventsArray = Array.isArray(events) ? events : [events];
-	const expectedEventsArray = Array.isArray(expectedEvents) ? expectedEvents : [expectedEvents];
+	if (typeof expectedEventsOrAssert === "function") return runThenAssert(resultEventsArray, expectedEventsOrAssert);
+	const expectedEventsArray = Array.isArray(expectedEventsOrAssert) ? expectedEventsOrAssert : [expectedEventsOrAssert];
 	assertThatArray(resultEventsArray).containsOnlyElementsMatching(expectedEventsArray);
 }
+/**
+* Runs the client-provided assertion. The test fails (throws) when the callback
+* throws, returns an `Error`, or returns a Promise that rejects or resolves to
+* an `Error`. A thrown error is propagated as-is so the client's assertion
+* library (node:assert, Vitest `expect`, ...) keeps its own message and diff.
+*/
+function runThenAssert(events, assert) {
+	const outcome = assert(events);
+	if (isPromiseLike(outcome)) return Promise.resolve(outcome).then(failIfError);
+	failIfError(outcome);
+}
+function failIfError(outcome) {
+	if (outcome instanceof Error) throw outcome;
+}
 function thenNothingHappensHandler$1(events) {
 	assertThatArray(Array.isArray(events) ? events : [events]).isEmpty();
 }
@@ -2184,7 +1967,7 @@ const InMemoryProjectionSpec = { for: (options) => {
 							return Promise.resolve(false);
 						}
 					},
-					observability: resolveEventStoreObservability(void 0)
+					observability: eventStoreObservability(void 0)
 				});
 			};
 			return {
@@ -2289,6 +2072,88 @@ const upcastRecordedMessages = (recordedMessages, options) => {
 	return recordedMessages.map((recordedMessage) => upcastRecordedMessage(recordedMessage, options));
 };
 
+//#endregion
+//#region src/eventStore/observability/eventStoreCollector.ts
+const eventStoreObservability = (options, parent) => ({
+	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
+	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
+	attributeTarget: options?.observability?.attributeTarget ?? parent?.observability?.attributeTarget ?? "both"
+});
+const eventStoreCollector = (observability) => {
+	const A = EmmettAttributes;
+	const M = _event_driven_io_almanac.MessagingAttributes;
+	const streamReadingDuration = observability.meter.histogram(EmmettMetrics.stream.readingDuration);
+	const streamReadingSize = observability.meter.histogram(EmmettMetrics.stream.readingSize);
+	const eventReadingCount = observability.meter.counter(EmmettMetrics.event.readingCount);
+	const streamAppendingDuration = observability.meter.histogram(EmmettMetrics.stream.appendingDuration);
+	const streamAppendingSize = observability.meter.histogram(EmmettMetrics.stream.appendingSize);
+	const eventAppendingCount = observability.meter.counter(EmmettMetrics.event.appendingCount);
+	return {
+		instrumentRead: (streamName, fn) => {
+			const start = Date.now();
+			return observability.tracer.startSpan("eventStore.readStream", async (span) => {
+				span.setAttributes({
+					[A.eventStore.operation]: "readStream",
+					[A.stream.name]: streamName,
+					[M.operation.type]: "receive",
+					[M.destination.name]: streamName,
+					[M.system]: MessagingSystemName
+				});
+				let status = "success";
+				try {
+					const result = await fn();
+					const events = result.events;
+					span.setAttributes({
+						[A.eventStore.read.status]: status,
+						[A.eventStore.read.eventCount]: events.length,
+						[A.eventStore.read.eventTypes]: [...new Set(events.map((e) => e.type))]
+					});
+					streamReadingSize.record(events.length, { [A.eventStore.read.status]: status });
+					for (const event of events) eventReadingCount.add(1, { [A.event.type]: event.type });
+					return result;
+				} catch (err) {
+					status = "failure";
+					span.setAttributes({ [A.eventStore.read.status]: status });
+					throw err;
+				} finally {
+					streamReadingDuration.record(Date.now() - start, { [A.eventStore.read.status]: status });
+				}
+			});
+		},
+		instrumentAppend: (streamName, events, fn) => {
+			const start = Date.now();
+			return observability.tracer.startSpan("eventStore.appendToStream", async (span) => {
+				span.setAttributes({
+					[A.eventStore.operation]: "appendToStream",
+					[A.stream.name]: streamName,
+					[A.eventStore.append.batchSize]: events.length,
+					[M.operation.type]: "send",
+					[M.batch.messageCount]: events.length,
+					[M.destination.name]: streamName,
+					[M.system]: MessagingSystemName
+				});
+				let status = "success";
+				try {
+					const result = await fn();
+					span.setAttributes({
+						[A.eventStore.append.status]: status,
+						[A.stream.versionAfter]: Number(result.nextExpectedStreamVersion)
+					});
+					streamAppendingSize.record(events.length, { [A.eventStore.append.status]: status });
+					for (const event of events) eventAppendingCount.add(1, { [A.event.type]: event.type });
+					return result;
+				} catch (err) {
+					status = "failure";
+					span.setAttributes({ [A.eventStore.append.status]: status });
+					throw err;
+				} finally {
+					streamAppendingDuration.record(Date.now() - start, { [A.eventStore.append.status]: status });
+				}
+			});
+		}
+	};
+};
+
 //#endregion
 //#region src/eventStore/inMemoryEventStore.ts
 const InMemoryEventStoreDefaultStreamVersion = 0n;
@@ -2299,7 +2164,7 @@ const getInMemoryEventStore = (eventStoreOptions) => {
 	};
 	const database = eventStoreOptions?.database || getInMemoryDatabase();
 	const inlineProjections = (eventStoreOptions?.projections ?? []).filter(({ type }) => type === "inline").map(({ projection }) => projection);
-	const observability = resolveEventStoreObservability(eventStoreOptions);
+	const observability = eventStoreObservability(eventStoreOptions);
 	const collector = eventStoreCollector(observability);
 	const eventStore = {
 		database,
@@ -2381,7 +2246,7 @@ const getInMemoryEventStore = (eventStoreOptions) => {
 
 //#endregion
 //#region src/commandHandling/observability/commandHandlerCollector.ts
-const resolveCommandObservability = (options, parent) => ({
+const commandObservability = (options, parent) => ({
 	tracer: options?.observability?.tracer ?? parent?.observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
 	meter: options?.observability?.meter ?? parent?.observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
 	attributeTarget: options?.observability?.attributeTarget ?? parent?.observability?.attributeTarget ?? "both",
@@ -2425,7 +2290,7 @@ const commandHandlerCollector = (observability) => {
 						"exception.message": err instanceof Error ? err.message : String(err),
 						"exception.type": err instanceof Error ? err.constructor.name : "unknown"
 					});
-					scope.recordException(err instanceof Error ? err : new Error(String(err)));
+					scope.log(_event_driven_io_almanac.LogEvent.error(err instanceof Error ? err : new Error(String(err))));
 					throw err;
 				} finally {
 					commandHandlingDuration.record(Date.now() - start, {
@@ -2474,7 +2339,7 @@ const CommandHandlerStreamVersionConflictRetryOptions = {
 	shouldRetryError: isExpectedVersionConflictError
 };
 const CommandHandler = (options) => async (store, id, handle, handleOptions) => {
-	const collector = commandHandlerCollector(resolveCommandObservability(options));
+	const collector = commandHandlerCollector(commandObservability(options));
 	const streamName = (options.mapToStreamId ?? ((id) => id))(id);
 	const commandType = handleOptions?.commandType ?? options.commandType ?? options.name ?? handlerNames(handle);
 	const correlationId = handleOptions?.observability?.correlationId ?? (0, uuid.v7)();
@@ -2573,6 +2438,61 @@ const DeciderCommandHandler = (options) => async (eventStore, id, commands, hand
 	});
 };
 
+//#endregion
+//#region src/consumers/observability/consumerCollector.ts
+const consumerObservability = (options, parent) => {
+	const observability = mergeObservabilityOptions({ observability: options?.observability }, parent?.observability).observability;
+	return {
+		tracer: observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
+		meter: observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
+		pollTracing: observability?.pollTracing ?? "off",
+		attributeTarget: observability?.attributeTarget ?? "both"
+	};
+};
+const consumerCollector = (observability) => {
+	const { startScope } = (0, _event_driven_io_almanac.ObservabilityScope)({
+		...observability,
+		attributePrefix: "emmett"
+	});
+	const A = EmmettAttributes;
+	const M = _event_driven_io_almanac.MessagingAttributes;
+	const pollDuration = observability.meter.histogram(EmmettMetrics.consumer.pollDuration);
+	const deliveryDuration = observability.meter.histogram(EmmettMetrics.consumer.deliveryDuration);
+	return {
+		tracePoll: (context, fn) => {
+			if (observability.pollTracing === "off" || observability.pollTracing === "active" && context.batchSize === 0) return fn(_event_driven_io_almanac.noopScope);
+			return startScope("consumer.poll", async (scope) => {
+				scope.setAttributes({
+					[A.scope.type]: ScopeTypes.consumer,
+					[A.consumer.batchSize]: context.batchSize,
+					[A.consumer.processorCount]: context.processorCount,
+					[M.system]: MessagingSystemName,
+					[M.operation.type]: "receive",
+					...context.empty ? { "emmett.consumer.poll.empty": true } : {},
+					...context.waitMs != null ? { "emmett.consumer.poll.wait_ms": context.waitMs } : {}
+				});
+				return fn(scope);
+			});
+		},
+		recordPollMetrics: (durationMs, attrs) => {
+			pollDuration.record(durationMs, attrs);
+		},
+		traceDelivery: (scope, processorId, fn) => {
+			const start = Date.now();
+			return scope.scope(`consumer.deliver.${processorId}`, async (child) => {
+				try {
+					return await fn();
+				} catch (error) {
+					if (error instanceof Error) child.log(_event_driven_io_almanac.LogEvent.error(error));
+					throw error;
+				} finally {
+					deliveryDuration.record(Date.now() - start, { [A.consumer.delivery.processorId]: processorId });
+				}
+			}, { attributes: { [A.consumer.delivery.processorId]: processorId } });
+		}
+	};
+};
+
 //#endregion
 //#region src/messageBus/index.ts
 const getInMemoryMessageBus = () => {
@@ -2639,6 +2559,66 @@ const projections = {
 	async: asyncProjections
 };
 
+//#endregion
+//#region src/workflows/observability/workflowCollector.ts
+const workflowObservability = (options, parent) => {
+	const observability = mergeObservabilityOptions({ observability: options?.observability }, parent?.observability).observability;
+	return {
+		tracer: observability?.tracer ?? (0, _event_driven_io_almanac.noopTracer)(),
+		meter: observability?.meter ?? (0, _event_driven_io_almanac.noopMeter)(),
+		propagation: observability?.propagation ?? "links",
+		attributeTarget: observability?.attributeTarget ?? "both",
+		includeMessagePayloads: observability?.includeMessagePayloads ?? false
+	};
+};
+const workflowCollector = (observability) => {
+	const { startScope } = (0, _event_driven_io_almanac.ObservabilityScope)({
+		...observability,
+		attributePrefix: "emmett"
+	});
+	const A = EmmettAttributes;
+	const M = _event_driven_io_almanac.MessagingAttributes;
+	const processingDuration = observability.meter.histogram(EmmettMetrics.workflow.processingDuration);
+	return {
+		startScope: (context, fn) => {
+			const start = Date.now();
+			return startScope("workflow.handle", async (scope) => {
+				scope.setAttributes({
+					[A.scope.type]: ScopeTypes.workflow,
+					[A.workflow.id]: context.workflowId,
+					[A.workflow.type]: context.workflowType,
+					[A.workflow.inputType]: context.inputType,
+					[M.system]: MessagingSystemName
+				});
+				let status = "success";
+				try {
+					return await fn(scope);
+				} catch (err) {
+					status = "failure";
+					throw err;
+				} finally {
+					processingDuration.record(Date.now() - start, {
+						[A.workflow.type]: context.workflowType,
+						status
+					});
+				}
+			}, { attributes: {
+				[A.scope.type]: ScopeTypes.workflow,
+				[A.workflow.type]: context.workflowType
+			} });
+		},
+		recordOutputs: (scope, outputs) => {
+			scope.setAttributes({
+				[A.workflow.outputs]: outputs.map((o) => o.type),
+				[A.workflow.outputsCount]: outputs.length
+			});
+		},
+		recordStateRebuild: (scope, eventCount) => {
+			scope.setAttributes({ [A.workflow.stateRebuildEventCount]: eventCount });
+		}
+	};
+};
+
 //#endregion
 //#region src/workflows/handleWorkflow.ts
 const WorkflowHandlerStreamVersionConflictRetryOptions = {
@@ -2708,7 +2688,7 @@ const createWrappedEvolve = (evolve, workflowName, separateInputInboxFromProcess
 };
 const workflowStreamName = ({ workflowName, workflowId }) => `emt:workflow:${workflowName}:${workflowId}`;
 const WorkflowHandler = (options) => async (store, message, handleOptions) => {
-	const collector = workflowCollector(resolveWorkflowObservability(options));
+	const collector = workflowCollector(workflowObservability(options));
 	const workflowType = options.workflow.name;
 	const inputType = message.type;
 	const workflowId = options.getWorkflowId(message) ?? "";
@@ -2894,8 +2874,6 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	JSONReviver: () => JSONReviver,
 	JSONRevivers: () => JSONRevivers,
 	JSONSerializer: () => JSONSerializer,
-	LogLevel: () => LogLevel,
-	LogStyle: () => LogStyle,
 	MessageProcessor: () => MessageProcessor,
 	MessageProcessorType: () => MessageProcessorType,
 	MessagingSystemName: () => MessagingSystemName,
@@ -2951,6 +2929,7 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	composeJSONReplacers: () => composeJSONReplacers,
 	composeJSONRevivers: () => composeJSONRevivers,
 	consumerCollector: () => consumerCollector,
+	consumerObservability: () => consumerObservability,
 	deepEquals: () => deepEquals,
 	defaultProcessingMessageProcessingScope: () => defaultProcessingMessageProcessingScope,
 	defaultProcessorPartition: () => defaultProcessorPartition,
@@ -2961,9 +2940,11 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	downcastRecordedMessage: () => downcastRecordedMessage,
 	downcastRecordedMessages: () => downcastRecordedMessages,
 	emmettPrefix: () => "emt",
+	errorReplacer: () => errorReplacer,
 	event: () => event,
 	eventInStream: () => eventInStream,
 	eventStoreCollector: () => eventStoreCollector,
+	eventStoreObservability: () => eventStoreObservability,
 	eventsInStream: () => eventsInStream,
 	expectInMemoryDocuments: () => expectInMemoryDocuments,
 	filterProjections: () => filterProjections,
@@ -3005,6 +2986,7 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	jsonSerializer: () => jsonSerializer,
 	matchesExpectedVersion: () => matchesExpectedVersion,
 	merge: () => merge,
+	mergeObservabilityOptions: () => mergeObservabilityOptions,
 	message: () => message,
 	newEventsInStream: () => newEventsInStream,
 	nulloSessionFactory: () => nulloSessionFactory,
@@ -3012,18 +2994,14 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	parseBigIntProcessorCheckpoint: () => parseBigIntProcessorCheckpoint,
 	parseDateFromUtcYYYYMMDD: () => require_plugins.parseDateFromUtcYYYYMMDD,
 	processorCollector: () => processorCollector,
+	processorObservability: () => processorObservability,
 	projection: () => projection,
 	projections: () => projections,
 	projector: () => projector,
 	reactor: () => reactor,
 	reduceAsync: () => reduceAsync,
-	resolveConsumerObservability: () => resolveConsumerObservability,
-	resolveEventStoreObservability: () => resolveEventStoreObservability,
-	resolveProcessorObservability: () => resolveProcessorObservability,
-	resolveWorkflowObservability: () => resolveWorkflowObservability,
 	sum: () => sum,
 	toNormalizedString: () => toNormalizedString,
-	tracer: () => tracer,
 	tryPublishMessagesAfterCommit: () => tryPublishMessagesAfterCommit,
 	unknownTag: () => unknownTag,
 	upcastRecordedMessage: () => upcastRecordedMessage,
@@ -3031,6 +3009,7 @@ var src_exports = /* @__PURE__ */ require_plugins.__exportAll({
 	verifyThat: () => verifyThat,
 	wasMessageHandled: () => wasMessageHandled,
 	workflowCollector: () => workflowCollector,
+	workflowObservability: () => workflowObservability,
 	workflowOutputHandler: () => workflowOutputHandler,
 	workflowProcessor: () => workflowProcessor,
 	workflowStreamName: () => workflowStreamName
@@ -3060,8 +3039,6 @@ exports.JSONReplacers = JSONReplacers;
 exports.JSONReviver = JSONReviver;
 exports.JSONRevivers = JSONRevivers;
 exports.JSONSerializer = JSONSerializer;
-exports.LogLevel = LogLevel;
-exports.LogStyle = LogStyle;
 exports.MessageProcessor = MessageProcessor;
 exports.MessageProcessorType = MessageProcessorType;
 exports.MessagingSystemName = MessagingSystemName;
@@ -3117,6 +3094,7 @@ exports.command = command;
 exports.composeJSONReplacers = composeJSONReplacers;
 exports.composeJSONRevivers = composeJSONRevivers;
 exports.consumerCollector = consumerCollector;
+exports.consumerObservability = consumerObservability;
 exports.deepEquals = deepEquals;
 exports.defaultProcessingMessageProcessingScope = defaultProcessingMessageProcessingScope;
 exports.defaultProcessorPartition = defaultProcessorPartition;
@@ -3127,9 +3105,11 @@ exports.documentExists = documentExists;
 exports.downcastRecordedMessage = downcastRecordedMessage;
 exports.downcastRecordedMessages = downcastRecordedMessages;
 exports.emmettPrefix = emmettPrefix;
+exports.errorReplacer = errorReplacer;
 exports.event = event;
 exports.eventInStream = eventInStream;
 exports.eventStoreCollector = eventStoreCollector;
+exports.eventStoreObservability = eventStoreObservability;
 exports.eventsInStream = eventsInStream;
 exports.expectInMemoryDocuments = expectInMemoryDocuments;
 exports.filterProjections = filterProjections;
@@ -3171,6 +3151,7 @@ exports.isValidYYYYMMDD = require_plugins.isValidYYYYMMDD;
 exports.jsonSerializer = jsonSerializer;
 exports.matchesExpectedVersion = matchesExpectedVersion;
 exports.merge = merge;
+exports.mergeObservabilityOptions = mergeObservabilityOptions;
 exports.message = message;
 exports.newEventsInStream = newEventsInStream;
 exports.nulloSessionFactory = nulloSessionFactory;
@@ -3178,18 +3159,14 @@ exports.onShutdown = onShutdown;
 exports.parseBigIntProcessorCheckpoint = parseBigIntProcessorCheckpoint;
 exports.parseDateFromUtcYYYYMMDD = require_plugins.parseDateFromUtcYYYYMMDD;
 exports.processorCollector = processorCollector;
+exports.processorObservability = processorObservability;
 exports.projection = projection;
 exports.projections = projections;
 exports.projector = projector;
 exports.reactor = reactor;
 exports.reduceAsync = reduceAsync;
-exports.resolveConsumerObservability = resolveConsumerObservability;
-exports.resolveEventStoreObservability = resolveEventStoreObservability;
-exports.resolveProcessorObservability = resolveProcessorObservability;
-exports.resolveWorkflowObservability = resolveWorkflowObservability;
 exports.sum = sum;
 exports.toNormalizedString = toNormalizedString;
-exports.tracer = tracer;
 exports.tryPublishMessagesAfterCommit = tryPublishMessagesAfterCommit;
 exports.unknownTag = unknownTag;
 exports.upcastRecordedMessage = upcastRecordedMessage;
@@ -3197,6 +3174,7 @@ exports.upcastRecordedMessages = upcastRecordedMessages;
 exports.verifyThat = verifyThat;
 exports.wasMessageHandled = wasMessageHandled;
 exports.workflowCollector = workflowCollector;
+exports.workflowObservability = workflowObservability;
 exports.workflowOutputHandler = workflowOutputHandler;
 exports.workflowProcessor = workflowProcessor;
 exports.workflowStreamName = workflowStreamName;