@event-driven-io/emmett-postgresql 0.43.0-beta.27 → 0.43.0-beta.29

package/dist/index.d.cts

@@ -380,6 +380,7 @@ type AppendToStreamBeforeCommitHook = (messages: RecordedMessage[], context: {
 }) => Promise<void>;
 declare const appendToStream: (connection: PgConnection, streamName: string, streamType: string, messages: Message[], options?: AppendToStreamOptions & {
   partition?: string;
+  messageIdGenerator?: () => string;
   beforeCommitHook?: AppendToStreamBeforeCommitHook;
 }) => Promise<AppendToStreamResult>;
 type AppendToStreamSqlResult = {

package/dist/index.d.ts

@@ -380,6 +380,7 @@ type AppendToStreamBeforeCommitHook = (messages: RecordedMessage[], context: {
 }) => Promise<void>;
 declare const appendToStream: (connection: PgConnection, streamName: string, streamType: string, messages: Message[], options?: AppendToStreamOptions & {
   partition?: string;
+  messageIdGenerator?: () => string;
   beforeCommitHook?: AppendToStreamBeforeCommitHook;
 }) => Promise<AppendToStreamResult>;
 type AppendToStreamSqlResult = {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { AssertionError, ConsumerStartPositions, EmmettError, ExpectedVersionConflictError, JSONSerializer, NO_CONCURRENCY_CHECK, STREAM_DOES_NOT_EXIST, STREAM_EXISTS, assertDeepEqual, assertEqual, assertExpectedVersionMatchesCurrent, assertFails, assertIsNotNull, assertIsNull, assertThatArray, assertTrue, asyncAwaiter, asyncRetry, bigInt, bigIntProcessorCheckpoint, defaultProcessorPartition, defaultProcessorVersion, downcastRecordedMessages, getCheckpoint, getProcessorInstanceId, getProjectorId, getWorkflowId, hashText, inMemoryCheckpointer, isBigint, isErrorConstructor, mergeObservability, noopScope, projection, projector, reactor, reduceAsync, unknownTag, upcastRecordedMessage, workflowProcessor } from "@event-driven-io/emmett";
+import { AssertionError, ConsumerStartPositions, EmmettError, ExpectedVersionConflictError, JSONSerializer, NO_CONCURRENCY_CHECK, STREAM_DOES_NOT_EXIST, STREAM_EXISTS, assertDeepEqual, assertEqual, assertExpectedVersionMatchesCurrent, assertFails, assertIsNotNull, assertIsNull, assertThatArray, assertTrue, asyncAwaiter, asyncRetry, bigInt, bigIntProcessorCheckpoint, defaultProcessorPartition, defaultProcessorVersion, downcastRecordedMessages, eventStoreCollector, eventStoreObservability, getCheckpoint, getProcessorInstanceId, getProjectorId, getWorkflowId, hashText, inMemoryCheckpointer, isBigint, isErrorConstructor, mergeObservability, noopScope, projection, projector, reactor, reduceAsync, unknownTag, upcastRecordedMessage, withOperationScope, workflowProcessor } from "@event-driven-io/emmett";
 import { DumboError, JSONSerializer as JSONSerializer$1, SQL, UniqueConstraintError, dumbo, fromDatabaseDriverType, getFormatter, mapRows, runSQLMigrations, single, singleOrNull, sqlMigration } from "@event-driven-io/dumbo";
 import { pongoClient } from "@event-driven-io/pongo";
 import { pgDriver } from "@event-driven-io/pongo/pg";
@@ -766,6 +766,8 @@ const getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOp
 	let migrateSchema = void 0;
 	const autoGenerateSchema = options.schema?.autoMigration === void 0 || options.schema?.autoMigration !== "None";
 	const inlineProjections = (options.projections ?? []).filter(({ type }) => type === "inline").map(({ projection }) => projection);
+	const observability = eventStoreObservability(options);
+	const collector = eventStoreCollector(observability);
 	const migrate = async (migrationOptions) => {
 		if (!migrateSchema) {
 			migrateSchema = createEventStoreSchema(connectionString, pool, {
@@ -799,11 +801,19 @@ const getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOp
 		if (!autoGenerateSchema) return Promise.resolve();
 		return migrate();
 	};
-	const beforeCommitHook = inlineProjections.length > 0 ? async (events, { transaction }) => handleProjections({
+	const readStreamFromPostgreSQL = (streamName, readOptions) => collector.instrumentRead(streamName, async () => {
+		await ensureSchemaExists();
+		return readStream(pool.execute, streamName, {
+			...readOptions,
+			serialization: options.serialization ?? readOptions?.serialization
+		});
+	}, readOptions?.observability);
+	const beforeCommitHook = (streamName, appendScope) => inlineProjections.length > 0 ? async (events, { transaction }) => collector.instrumentInlineProjection(streamName, appendScope, async (observabilityScope) => handleProjections({
 		projections: inlineProjections,
 		events,
-		...await transactionToPostgreSQLProjectionHandlerContext(connectionString, pool, transaction)
-	}) : void 0;
+		...await transactionToPostgreSQLProjectionHandlerContext(connectionString, pool, transaction),
+		observabilityScope
+	})) : void 0;
 	return {
 		schema: {
 			sql: () => SQL.describe(schemaSQL, getFormatter(fromDatabaseDriverType(pool.driverType).databaseType)),
@@ -822,36 +832,36 @@ const getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOp
 			}) }
 		},
 		async aggregateStream(streamName, options) {
-			const { evolve, initialState, read } = options;
-			const expectedStreamVersion = read?.expectedStreamVersion;
-			let state = initialState();
-			const result = await this.readStream(streamName, read);
-			const currentStreamVersion = result.currentStreamVersion;
-			assertExpectedVersionMatchesCurrent(currentStreamVersion, expectedStreamVersion, PostgreSQLEventStoreDefaultStreamVersion);
-			for (const event of result.events) {
-				if (!event) continue;
-				state = evolve(state, event);
-			}
-			return {
-				currentStreamVersion,
-				state,
-				streamExists: result.streamExists
-			};
-		},
-		readStream: async (streamName, readOptions) => {
-			await ensureSchemaExists();
-			return readStream(pool.execute, streamName, {
-				...readOptions,
-				serialization: options.serialization ?? readOptions?.serialization
-			});
+			return collector.instrumentAggregate(streamName, async (scope) => {
+				const { evolve, initialState, read } = options;
+				const expectedStreamVersion = read?.expectedStreamVersion;
+				let state = initialState();
+				const result = await readStreamFromPostgreSQL(streamName, {
+					...read ?? {},
+					observability: withOperationScope(scope, read?.observability)
+				});
+				const currentStreamVersion = result.currentStreamVersion;
+				assertExpectedVersionMatchesCurrent(currentStreamVersion, expectedStreamVersion, PostgreSQLEventStoreDefaultStreamVersion);
+				for (const event of result.events) {
+					if (!event) continue;
+					state = evolve(state, event);
+				}
+				return {
+					currentStreamVersion,
+					state,
+					streamExists: result.streamExists
+				};
+			}, options.observability);
 		},
-		appendToStream: async (streamName, events, appendOptions) => {
+		readStream: async (streamName, readOptions) => readStreamFromPostgreSQL(streamName, readOptions),
+		appendToStream: async (streamName, events, appendOptions) => collector.instrumentAppend(streamName, events, async (scope) => {
 			await ensureSchemaExists();
 			const [firstPart, ...rest] = streamName.split("-");
 			const streamType = firstPart && rest.length > 0 ? firstPart : unknownTag;
 			const appendResult = await pool.withConnection(async (connection) => appendToStream(connection, streamName, streamType, downcastRecordedMessages(events, appendOptions?.schema?.versioning), {
 				...appendOptions,
-				beforeCommitHook
+				messageIdGenerator: () => observability.contextGenerator.generateMessageId(),
+				beforeCommitHook: beforeCommitHook(streamName, scope)
 			}));
 			if (!appendResult.success) throw new ExpectedVersionConflictError(-1n, appendOptions?.expectedStreamVersion ?? NO_CONCURRENCY_CHECK);
 			return {
@@ -859,7 +869,7 @@ const getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOp
 				lastEventGlobalPosition: PostgreSQLEventStoreCheckpoint.toProcessorCheckpoint(appendResult.checkpoints[appendResult.checkpoints.length - 1]),
 				createdNewStream: appendResult.nextStreamPosition >= BigInt(events.length)
 			};
-		},
+		}, appendOptions?.observability),
 		streamExists: async (streamName, options) => {
 			await ensureSchemaExists();
 			return streamExists(pool.execute, streamName, options);
@@ -1040,7 +1050,7 @@ const handleProjections = async (options) => {
 				transaction
 			},
 			execute: transaction.execute,
-			observabilityScope: noopScope
+			observabilityScope: options.observabilityScope
 		});
 	}
 };
@@ -1276,7 +1286,7 @@ const appendToStream = (connection, streamName, streamType, messages, options) =
 			...e,
 			kind: e.kind ?? "Event",
 			metadata: {
-				messageId: v4(),
+				messageId: options?.messageIdGenerator?.() ?? v4(),
 				..."metadata" in e ? e.metadata ?? {} : {}
 			}
 		}));