@diia-inhouse/workflow 3.4.23 → 3.4.25

package/dist/cli/determinism/replayOptions.js

@@ -1,5 +1,7 @@
 import { getDataConverter } from "../../encryption/dataConverter.js";
 import "../../encryption/index.js";
+import { workflowInterceptorModules } from "../../interceptors/workflowModules.js";
+import { EnvService } from "@diia-inhouse/env";
 import path from "node:path";
 //#region src/cli/determinism/replayOptions.ts
 function resolveWorkflowsPath(workflowsPath) {
@@ -9,7 +11,11 @@ function resolveWorkflowsPath(workflowsPath) {
 	return fullPath;
 }
 async function buildReplayOptions(workflowsPath, encryption, envService) {
-	const options = { workflowsPath: resolveWorkflowsPath(workflowsPath) };
+	const fullPath = resolveWorkflowsPath(workflowsPath);
+	const options = {
+		workflowsPath: fullPath,
+		interceptors: { workflowModules: workflowInterceptorModules(fullPath, EnvService.getVar("TRACING_ENABLED", "boolean", false)) }
+	};
 	if (encryption.enabled && envService) options.dataConverter = await getDataConverter(encryption.keyId, envService);
 	return options;
 }

package/dist/interceptors/workflowModules.js

@@ -0,0 +1,10 @@
+import path from "node:path";
+//#region src/interceptors/workflowModules.ts
+const traceLogAttributesModulePath = path.resolve(import.meta.dirname, "traceLogAttributes");
+/** Workflow interceptor modules the worker loads. Replay uses the same list. */
+function workflowInterceptorModules(workflowsPath, tracingEnabled) {
+	const modules = workflowsPath ? [workflowsPath] : [];
+	return tracingEnabled ? [...modules, traceLogAttributesModulePath] : modules;
+}
+//#endregion
+export { workflowInterceptorModules };

package/dist/services/worker.js

@@ -3,13 +3,13 @@ import "../encryption/index.js";
 import { traceExporter } from "../instrumentation.js";
 import { ActivityTraceLogAttributesInterceptor } from "../interceptors/activityTraceLogAttributes.js";
 import { AsyncLocalStorageBridgeInterceptor } from "../interceptors/asyncLocalStorageBridge.js";
+import { workflowInterceptorModules } from "../interceptors/workflowModules.js";
 import { buildWorkerIdentity } from "./worker/identity.js";
 import { deriveWorkflowTypes, registerWorkerInfo } from "./worker/info.js";
 import { toTemporalRuntimeLogger } from "./worker/runtimeLogger.js";
 import { WorkerHealthService } from "./workerHealth.js";
 import { EnvService } from "@diia-inhouse/env";
 import { NativeConnection, Runtime, Worker } from "@temporalio/worker";
-import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { Resource } from "@opentelemetry/resources";
 import { ATTR_SERVICE_NAME } from "@opentelemetry/semantic-conventions";
@@ -63,7 +63,6 @@ function toWorkflowsPath(input) {
 *
 * Order matters: the first factory is the outermost, so the ones after it see an open span.
 */
-const traceLogAttributesModulePath = path.resolve(import.meta.dirname, "../interceptors/traceLogAttributes");
 function traceLogAttributesInterceptor() {
 	const interceptor = new ActivityTraceLogAttributesInterceptor();
 	return {
@@ -72,27 +71,23 @@ function traceLogAttributesInterceptor() {
 	};
 }
 function buildWorkerInterceptors(tracingEnabled, asyncLocalStorage, logger, workflowsPath) {
-	if (tracingEnabled) {
-		const workflowModules = [traceLogAttributesModulePath];
-		if (workflowsPath) workflowModules.unshift(workflowsPath);
-		return {
-			activity: [
-				(ctx) => ({
-					inbound: new OpenTelemetryActivityInboundInterceptor(ctx),
-					outbound: new OpenTelemetryActivityOutboundInterceptor(ctx)
-				}),
-				traceLogAttributesInterceptor,
-				...asyncLocalStorage && logger ? [(ctx) => ({ inbound: new AsyncLocalStorageBridgeInterceptor(ctx, asyncLocalStorage, logger) })] : []
-			],
-			workflowModules
-		};
-	}
+	if (tracingEnabled) return {
+		activity: [
+			(ctx) => ({
+				inbound: new OpenTelemetryActivityInboundInterceptor(ctx),
+				outbound: new OpenTelemetryActivityOutboundInterceptor(ctx)
+			}),
+			traceLogAttributesInterceptor,
+			...asyncLocalStorage && logger ? [(ctx) => ({ inbound: new AsyncLocalStorageBridgeInterceptor(ctx, asyncLocalStorage, logger) })] : []
+		],
+		workflowModules: workflowInterceptorModules(workflowsPath, true)
+	};
 	if (asyncLocalStorage && logger) return {
 		activity: [(ctx) => ({
 			inbound: new AsyncLocalStorageBridgeInterceptor(ctx, asyncLocalStorage, logger),
 			outbound: new OpenTelemetryActivityOutboundInterceptor(ctx)
 		}), traceLogAttributesInterceptor],
-		workflowModules: workflowsPath ? [workflowsPath] : []
+		workflowModules: workflowInterceptorModules(workflowsPath, false)
 	};
 }
 /**
@@ -257,7 +252,7 @@ async function runWorker(app, options) {
 	});
 	const healthCheck = tryResolve(app.container, "healthCheck");
 	if (healthCheck) {
-		const workerHealthService = new WorkerHealthService();
+		const workerHealthService = new WorkerHealthService(Object.keys(instantiatedActivities).length > 0);
 		workerHealthService.setStatusProvider(() => worker.getStatus());
 		healthCheck.addHealthCheckable(workerHealthService);
 	}

package/dist/services/workerHealth.d.ts

@@ -7,7 +7,9 @@ interface WorkerHealthDetails {
   worker: WorkerStatus | "NOT_INITIALIZED";
 }
 declare class WorkerHealthService implements OnHealthCheck {
+  private readonly hasActivities;
   private statusProvider?;
+  constructor(hasActivities?: boolean);
   setStatusProvider(provider: WorkerStatusProvider): void;
   onHealthCheck(): Promise<HealthCheckResult<WorkerHealthDetails>>;
 }

package/dist/services/workerHealth.js

@@ -3,14 +3,18 @@ import { HttpStatusCode } from "@diia-inhouse/types";
 function isPollerHealthy(state) {
 	return state === "POLLING";
 }
-function isWorkerHealthy(status) {
+function isWorkerHealthy(status, hasActivities) {
 	const { runState, workflowPollerState, activityPollerState } = status;
 	if (runState !== "RUNNING") return false;
-	if (!isPollerHealthy(workflowPollerState) || !isPollerHealthy(activityPollerState)) return false;
-	return true;
+	if (!isPollerHealthy(workflowPollerState)) return false;
+	return !hasActivities || isPollerHealthy(activityPollerState);
 }
 var WorkerHealthService = class {
+	hasActivities;
 	statusProvider;
+	constructor(hasActivities = true) {
+		this.hasActivities = hasActivities;
+	}
 	setStatusProvider(provider) {
 		this.statusProvider = provider;
 	}
@@ -21,7 +25,7 @@ var WorkerHealthService = class {
 		};
 		const workerStatus = this.statusProvider();
 		return {
-			status: isWorkerHealthy(workerStatus) ? HttpStatusCode.OK : HttpStatusCode.SERVICE_UNAVAILABLE,
+			status: isWorkerHealthy(workerStatus, this.hasActivities) ? HttpStatusCode.OK : HttpStatusCode.SERVICE_UNAVAILABLE,
 			details: { worker: workerStatus }
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/workflow",
-    "version": "3.4.23",
+    "version": "3.4.25",
     "description": "Workflow",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",