@autofleet/rabbit 3.0.1-alpha7 → 3.0.1-alpha8

package/dist/index.js

@@ -342,13 +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,
-                    });
-                }
-                if (auditContext) {
+                else if (userId && auditContext) {
+                    await zehut_1.setRabbitTrace(userId);
                     auditContext(queue);
                 }
                 const parsedMessage = RabbitMq.parseMsg(msg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-alpha7",
+  "version": "3.0.1-alpha8",
   "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';
@@ -483,14 +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,
-            });
-          }
-
-          if (auditContext) {
+          } else if (userId && auditContext) {
+            await setRabbitTrace(userId);
             auditContext(queue);
           }