@onlineapps/conn-orch-orchestrator 1.0.46 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/conn-orch-orchestrator",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "Workflow orchestration connector for OA Drive - handles message routing and workflow execution",
   "main": "src/index.js",
   "scripts": {

package/src/WorkflowOrchestrator.js

@@ -253,34 +253,6 @@ class WorkflowOrchestrator {
         // Ignore - use default 0
       }
 
-      // IMPORTANT: Publish progress event for FAILED step (so it appears in trace)
-      // This ensures every cookbook step is visible in monitoring, even failed ones
-      const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
-      try {
-        await publishToMonitoringWorkflow(this.mqClient, {
-          event_type: 'progress',
-          workflow_id: workflow_id,
-          service_name: serviceName,
-          step_index: failedStepIndex,
-          step_id: current_step,
-          cookbook: cookbookDef,
-          context: context,
-          output: null,
-          error: {
-            message: error.message,
-            attempt: attemptNumber
-          },
-          status: 'failed',
-          timestamp: new Date().toISOString()
-        }, this.logger, { workflow_id, step_id: current_step });
-      } catch (monitoringError) {
-        // Don't fail workflow if monitoring publish fails
-        this.logger.warn('Failed to publish failed step progress to monitoring', {
-          workflow_id,
-          error: monitoringError.message
-        });
-      }
-
       // Add attempt to DLQ history
       const attemptRecord = {
         step_id: current_step,
@@ -305,6 +277,32 @@ class WorkflowOrchestrator {
         attempt: attemptNumber
       });
 
+      // Publish progress event for EACH retry attempt (granular tracking)
+      const { publishToMonitoringWorkflow } = require('@onlineapps/mq-client-core').monitoring;
+      try {
+        await publishToMonitoringWorkflow(this.mqClient, {
+          event_type: 'progress',
+          workflow_id: workflow_id,
+          service_name: serviceName,
+          step_index: failedStepIndex,
+          step_id: current_step,
+          cookbook: cookbookDef,
+          context: updatedContext,  // Context with updated _dlq_history
+          output: null,
+          error: { message: error.message },
+          status: 'retry',  // Mark as retry attempt
+          attempt: attemptNumber,
+          max_attempts: this.retryConfig.maxAttempts,
+          timestamp: new Date().toISOString()
+        }, this.logger, { workflow_id, step_id: current_step });
+      } catch (monitoringError) {
+        // Don't fail if monitoring publish fails
+        this.logger.warn('Failed to publish retry progress to monitoring', {
+          workflow_id,
+          error: monitoringError.message
+        });
+      }
+
       // Check if we should retry
       if (attemptNumber < this.retryConfig.maxAttempts) {
         // Calculate delay with exponential backoff