@autofleet/rabbit 3.0.1-alpha8 → 3.0.1-beta

package/dist/index.js

@@ -321,7 +321,7 @@ class RabbitMq {
     async consumeFromRabbit(queue, callback, options) {
         const optionsWithDefaults = { ...consts_1.DEFAULT_OPTIONS, ...options };
         RabbitMq.validateName('queue', queue);
-        const { limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, } = optionsWithDefaults;
+        const { limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace, } = optionsWithDefaults;
         if (useConsumeWithLock) {
             if (!this.redisLock) {
                 throw new Error('Usage of consumeWithLock requires RedisInstance');
@@ -338,12 +338,20 @@ class RabbitMq {
                 }
                 const traceId = msg.properties.headers[consts_1.TRACING_HEADER];
                 const userId = msg.properties.headers[consts_1.USER_TRACING_HEADER];
+                logger_1.default.info('rabbit: consume', { traceId, userId, enableRabbitTrace });
                 if (traceId) {
                     const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
                 }
-                else if (userId && auditContext) {
-                    await zehut_1.setRabbitTrace(userId);
+                else if (userId && enableRabbitTrace) {
+                    try {
+                        await zehut_1.setRabbitTrace(userId);
+                    }
+                    catch (e) {
+                        logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
+                    }
+                }
+                if (auditContext) {
                     auditContext(queue);
                 }
                 const parsedMessage = RabbitMq.parseMsg(msg);

package/dist/lib/consts.d.ts

@@ -13,4 +13,5 @@ export declare const DEFAULT_OPTIONS: {
     lockTimeout: number;
     useConsumeWithLock: boolean;
     auditContext: null;
+    enableRabbitTrace: boolean;
 };

package/dist/lib/consts.js

@@ -16,4 +16,5 @@ exports.DEFAULT_OPTIONS = {
     lockTimeout: exports.DEFAULT_LOCK_TIMEOUT,
     useConsumeWithLock: exports.DEFAULT_USE_CONSUME_WITH_LOCK,
     auditContext: null,
+    enableRabbitTrace: false,
 };

package/dist/lib/types.d.ts

@@ -18,6 +18,7 @@ export interface ConsumeOptions {
     lockTimeout?: number;
     useConsumeWithLock?: boolean;
     auditContext?: any;
+    enableRabbitTrace?: boolean;
 }
 export declare type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>;
 export declare type newChannelOpts = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-alpha8",
+  "version": "3.0.1-beta",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.1-alpha3",
+    "@autofleet/zehut": "^3.0.1-beta",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",

package/src/index.ts

@@ -461,7 +461,7 @@ class RabbitMq implements IAfRabbitMq {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
     RabbitMq.validateName('queue', queue);
     const {
-      limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext,
+      limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace,
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
@@ -482,11 +482,19 @@ class RabbitMq implements IAfRabbitMq {
 
           const traceId = msg.properties.headers[TRACING_HEADER];
           const userId = msg.properties.headers[USER_TRACING_HEADER];
+          logger.info('rabbit: consume', { traceId, userId, enableRabbitTrace });
           if (traceId) {
             const trace = newTrace(traceTypes.RABBIT);
             (trace as any)?.context?.set(TRACING_HEADER, traceId);
-          } else if (userId && auditContext) {
-            await setRabbitTrace(userId);
+          } else if (userId && enableRabbitTrace) {
+            try {
+              await setRabbitTrace(userId);
+            } catch (e) {
+              logger.error('rabbit: failed to setRabbitTrace', { userId, e });
+            }
+          }
+
+          if (auditContext) {
             auditContext(queue);
           }
 

package/src/lib/consts.ts

@@ -13,4 +13,5 @@ export const DEFAULT_OPTIONS = {
   lockTimeout: DEFAULT_LOCK_TIMEOUT,
   useConsumeWithLock: DEFAULT_USE_CONSUME_WITH_LOCK,
   auditContext: null,
+  enableRabbitTrace: false,
 };

package/src/lib/types.ts

@@ -22,6 +22,7 @@ export interface ConsumeOptions {
   lockTimeout?: number;
   useConsumeWithLock?: boolean;
   auditContext?: any;
+  enableRabbitTrace?: boolean;
 }
 
 export type CallbackFunction = (msg: ConsumeMessage, ack: any, nack: any) => Promise<any>