@onlineapps/mq-client-core 1.0.46 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onlineapps/mq-client-core",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "Core MQ client library for RabbitMQ - shared by infrastructure services and connectors",
   "main": "src/index.js",
   "scripts": {
@@ -22,7 +22,8 @@
   "dependencies": {
     "amqplib": "^0.10.3",
     "ajv": "^8.12.0",
-    "lodash.merge": "^4.6.2"
+    "lodash.merge": "^4.6.2",
+    "@onlineapps/infrastructure-tools": "^1.0.23"
   },
   "devDependencies": {
     "jest": "^29.7.0"

package/src/config/queueConfig.js

@@ -336,6 +336,7 @@ module.exports = {
            queueName.startsWith('infrastructure.') ||
            queueName.startsWith('validation.') ||
            queueName.startsWith('monitoring.') ||
+           queueName.startsWith('telemetry.') ||
            queueName.startsWith('delivery.');
   },
 
@@ -436,7 +437,7 @@ module.exports = {
 
   /**
    * Get monitoring queue configuration
-   * @param {string} queueName - Queue name (e.g., 'monitoring.workflow.completed')
+   * @param {string} queueName - Queue name (e.g., 'monitoring.workflow')
    * @returns {Object} Queue configuration
    */
   getMonitoringQueueConfig(queueName) {
@@ -449,7 +450,7 @@ module.exports = {
 
   /**
    * Get infrastructure queue configuration by queue name (auto-detect type)
-   * @param {string} queueName - Full queue name (e.g., 'workflow.init', 'registry.register', 'infrastructure.health.checks', 'monitoring.workflow.completed')
+   * @param {string} queueName - Full queue name (e.g., 'workflow.init', 'registry.register', 'infrastructure.health.checks', 'monitoring.workflow')
    * @returns {Object} Queue configuration
    */
   getInfrastructureQueueConfig(queueName) {

package/src/transports/rabbitmqClient.js

@@ -17,6 +17,7 @@ const {
 const PublishLayer = require('../layers/PublishLayer');
 const RecoveryWorker = require('../workers/RecoveryWorker');
 const PublishMonitor = require('../monitoring/PublishMonitor');
+const { createInfraLogger } = require('@onlineapps/infrastructure-tools');
 
 class RabbitMQClient extends EventEmitter {
   /**
@@ -101,6 +102,9 @@ class RabbitMQClient extends EventEmitter {
     this._criticalHealthShutdownDelay = this._config.criticalHealthShutdownDelay || 60000; // Default: 60s delay before shutdown
     this._criticalHealthStartTime = null; // Track when critical health started
 
+    // Create structured logger for infrastructure logging
+    this._log = createInfraLogger('mq-client-core', 'transport');
+    
     // Publish layer (retry + buffer)
     this._publishLayer = new PublishLayer({
       client: this,
@@ -1067,13 +1071,26 @@ class RabbitMQClient extends EventEmitter {
     // Track operation for debugging
     this._trackChannelOperation(this._channel, `publish to ${queue}`);
     
-    // Log publish attempt for debugging
-    console.log(`[RabbitMQClient] [mq-client-core] [PUBLISH] Attempting to publish to queue "${queue}"`);
-
     const exchange = this._config.exchange || '';
     const routingKey = options.routingKey || queue;
     const persistent = options.persistent !== undefined ? options.persistent : this._config.durable;
     const headers = options.headers || {};
+    
+    // Structured log: extract workflow_id from headers for traceability
+    const workflowId = headers.workflowId || headers.workflow_id || 'unknown';
+    const msgSize = buffer ? buffer.length : 0;
+    this._log.input(workflowId, 'PUBLISH_START', {
+      handler: 'publish',
+      function: 'RabbitMQClient._publishOnce',
+      input: {
+        queue,
+        size: msgSize,
+        exchange: exchange || '(default)',
+        routing_key: routingKey,
+        persistent
+      }
+    });
+
 
     try {
       // Ensure queue exists if publishing directly to queue and using default exchange
@@ -1221,7 +1238,14 @@ class RabbitMQClient extends EventEmitter {
                   reject(err);
                 }
               } else {
-                console.log(`[RabbitMQClient] [mq-client-core] [PUBLISH] ✓ Message confirmed for queue "${queue}"`);
+                // Structured log: publish confirmed
+                const wfId = headers.workflowId || headers.workflow_id || 'unknown';
+                this._log.output(wfId, 'PUBLISH_CONFIRMED', {
+                  handler: 'publish',
+                  function: 'RabbitMQClient._publishOnce',
+                  input: { queue, size: buffer ? buffer.length : 0 },
+                  output: { status: 'confirmed', queue }
+                });
                 resolve();
               }
             });
@@ -1453,6 +1477,20 @@ class RabbitMQClient extends EventEmitter {
           return; // Consumer cancellation
         }
         
+        // Structured log: message received
+        const msgHeaders = msg.properties?.headers || {};
+        const wfId = msgHeaders.workflowId || msgHeaders.workflow_id || 'unknown';
+        const msgSize = msg.content ? msg.content.length : 0;
+        this._log.input(wfId, 'MSG_RECEIVED', {
+          handler: 'consume',
+          function: 'RabbitMQClient.consume',
+          input: {
+            queue,
+            size: msgSize,
+            consumer_tag: msg.fields?.consumerTag || null
+          }
+        });
+        
         // Track in-flight message (increment)
         const tracking = this._prefetchTracking.get(queue);
         if (tracking) {
@@ -1466,6 +1504,14 @@ class RabbitMQClient extends EventEmitter {
           // Acknowledge message after successful processing
           if (!noAck) {
             this._consumerChannel.ack(msg);
+            // Structured log: message acknowledged
+            this._log.output(wfId, 'MSG_ACKED', {
+              handler: 'consume',
+              function: 'RabbitMQClient.consume',
+              input: { queue },
+              output: { status: 'acknowledged', queue }
+            });
+
             // Track ack (decrement in-flight)
             if (tracking) {
               tracking.inFlight = Math.max(0, tracking.inFlight - 1);