@remit/account-worker 0.0.13 → 0.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remit/account-worker",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/handlers/account-fanout.ts

@@ -1,5 +1,11 @@
 import { SendMessageCommand, type SQSClient } from "@aws-sdk/client-sqs";
-import { createLogger, type Logger, withTelemetry } from "@remit/logger-lambda";
+import {
+	createLogger,
+	type Logger,
+	queueNameFromEventSource,
+	recordQueueEvent,
+	withTelemetry,
+} from "@remit/logger-lambda";
 import type { SQSBatchResponse, SQSEvent, SQSHandler } from "aws-lambda";
 import type { CascadeServices } from "../cascade.js";
 import { enumerateCascadeEntities } from "../cascade.js";
@@ -157,6 +163,7 @@ export const handler: SQSHandler = withTelemetry(
 				"Processing account fanout event",
 			);
 
+			const start = Date.now();
 			const failed = await processAccountFanout(fanoutEvent, log)
 				.then(() => false)
 				.catch((error) => {
@@ -167,6 +174,13 @@ export const handler: SQSHandler = withTelemetry(
 					return true;
 				});
 
+			recordQueueEvent({
+				queue: queueNameFromEventSource(record.eventSourceARN),
+				eventType: fanoutEvent.type,
+				outcome: failed ? "failure" : "success",
+				durationMs: Date.now() - start,
+			});
+
 			if (failed) {
 				batchItemFailures.push({ itemIdentifier: record.messageId });
 			}

package/src/handlers/account-finalize.ts

@@ -1,5 +1,11 @@
 import { inspect } from "node:util";
-import { createLogger, type Logger, withTelemetry } from "@remit/logger-lambda";
+import {
+	createLogger,
+	type Logger,
+	queueNameFromEventSource,
+	recordQueueEvent,
+	withTelemetry,
+} from "@remit/logger-lambda";
 import type { SQSEvent, SQSHandler } from "aws-lambda";
 import {
 	type CascadeEntity,
@@ -285,6 +291,7 @@ export const handler: SQSHandler = withTelemetry(async (event: SQSEvent) => {
 			"Processing account finalize event",
 		);
 
+		const start = Date.now();
 		const work =
 			finalizeEvent.type === "FinalizeAccountDataPurge"
 				? processAccountDataPurgeFinalize(finalizeEvent, log)
@@ -300,6 +307,13 @@ export const handler: SQSHandler = withTelemetry(async (event: SQSEvent) => {
 				return true;
 			});
 
+		recordQueueEvent({
+			queue: queueNameFromEventSource(record.eventSourceARN),
+			eventType: finalizeEvent.type,
+			outcome: failed ? "failure" : "success",
+			durationMs: Date.now() - start,
+		});
+
 		if (failed) {
 			batchItemFailures.push({ itemIdentifier: record.messageId });
 		}

package/src/handlers/organize-job.ts

@@ -39,14 +39,19 @@ export const processOrganizeJob = async (
 
 	try {
 		const predicate = predicateFromJob(job);
+		const matchDeps = buildOrganizeMatchDeps(client);
 		const { messageIds, semanticUnavailable } = await matchOrganize(
-			buildOrganizeMatchDeps(client),
+			matchDeps,
 			accountConfigId,
 			predicate,
 			ORGANIZE_MATCH_LIMIT,
 		);
 		const { applied, failed } = await applyOrganize(
-			{ client, moveService: buildOrganizeMoveService(client) },
+			{
+				client,
+				moveService: buildOrganizeMoveService(client),
+				match: matchDeps,
+			},
 			accountConfigId,
 			messageIds,
 			predicate,

package/src/poller.ts

@@ -1,4 +1,4 @@
-import { createLogger } from "@remit/logger-lambda";
+import { createLogger, startMetricsServer } from "@remit/logger-lambda";
 import { runQueuePoller } from "@remit/sqs-client/poller";
 import { env } from "expect-env";
 import { fanoutHandler, finalizeHandler } from "./index.js";
@@ -20,6 +20,11 @@ import { fanoutHandler, finalizeHandler } from "./index.js";
  */
 const log = createLogger();
 
+// /metrics and nothing else, on the compose network (standalone-observability
+// D2). No health route on it: worker liveness is a heartbeat file, which keeps
+// answering when this server does not.
+startMetricsServer();
+
 await runQueuePoller({
 	log,
 	targets: [