@autofleet/rabbit 3.0.1-alpha7 → 3.0.1-alpha9

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');
@@ -342,11 +342,8 @@ class RabbitMq {
                     const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
                 }
-                else if (userId) {
-                    const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
-                    trace?.context?.set(consts_1.USER_OBJECT, {
-                        id: userId,
-                    });
+                else if (userId && enableRabbitTrace) {
+                    await zehut_1.setRabbitTrace(userId);
                 }
                 if (auditContext) {
                     auditContext(queue);

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-alpha7",
+  "version": "3.0.1-alpha9",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.1",
+    "@autofleet/zehut": "^3.0.1-alpha3",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",

package/src/index.ts

@@ -8,7 +8,9 @@ import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-
 import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
 } from 'amqplib';
-import { getCurrentPayload, newTrace, traceTypes } from '@autofleet/zehut';
+import {
+  getCurrentPayload, newTrace, traceTypes, setRabbitTrace,
+} from '@autofleet/zehut';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
 import getRedisInstance, { RedisConfig } from './lib/redis';
@@ -459,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) {
@@ -483,11 +485,8 @@ class RabbitMq implements IAfRabbitMq {
           if (traceId) {
             const trace = newTrace(traceTypes.RABBIT);
             (trace as any)?.context?.set(TRACING_HEADER, traceId);
-          } else if (userId) {
-            const trace = newTrace(traceTypes.RABBIT);
-            (trace as any)?.context?.set(USER_OBJECT, {
-              id: userId,
-            });
+          } else if (userId && enableRabbitTrace) {
+            await setRabbitTrace(userId);
           }
 
           if (auditContext) {

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>