@autofleet/rabbit 3.0.1-alpha6 → 3.0.1-alpha8

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { ConfirmChannel, ConsumeMessage, Options, Replies } from 'amqplib';
 import { RedisConfig } from './lib/redis';
-import { TRACING_HEADER } from './lib/consts';
+import { TRACING_HEADER, USER_TRACING_HEADER } from './lib/consts';
 import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
@@ -44,6 +44,7 @@ declare class RabbitMq implements IAfRabbitMq {
     static getPublishOptions(customHeaders?: CustomMessageHeaders): {
         timestamp: number;
         headers: {
+            "x-af-user-id": any;
             "x-trace-id": any;
             redisTimestampValidationKey?: string | undefined;
             creationTimestamp: number;

package/dist/index.js

@@ -125,16 +125,13 @@ class RabbitMq {
     }
     static getPublishOptions(customHeaders = {}) {
         const trace = zehut_1.getCurrentPayload();
-        logger_1.default.info('getPublishOptions', {
-            trace,
-            context1: trace?.context?.get(consts_1.TRACING_HEADER),
-            context2: trace?.context?.get('userObject'),
-        });
+        const user = trace?.context?.get(consts_1.USER_OBJECT);
         return {
             timestamp: moment_1.default().unix(),
             headers: {
                 creationTimestamp: moment_1.default().valueOf(),
                 ...customHeaders,
+                [consts_1.USER_TRACING_HEADER]: user?.id,
                 [consts_1.TRACING_HEADER]: trace?.context?.get(consts_1.TRACING_HEADER),
             },
         };
@@ -340,14 +337,13 @@ class RabbitMq {
                     return null;
                 }
                 const traceId = msg.properties.headers[consts_1.TRACING_HEADER];
+                const userId = msg.properties.headers[consts_1.USER_TRACING_HEADER];
                 if (traceId) {
                     const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
-                    logger_1.default.info(`rabbit: [consume] received message with traceId ${traceId}`, {
-                        trace,
-                    });
                 }
-                if (auditContext) {
+                else if (userId && auditContext) {
+                    await zehut_1.setRabbitTrace(userId);
                     auditContext(queue);
                 }
                 const parsedMessage = RabbitMq.parseMsg(msg);

package/dist/lib/consts.d.ts

@@ -2,6 +2,8 @@ export declare const DEFAULT_DEAD_TTL_TWO_DAYS: number;
 export declare const DEFAULT_LOCK_TIMEOUT: number;
 export declare const RETRY_HEADER = "x-retry-count";
 export declare const TRACING_HEADER = "x-trace-id";
+export declare const USER_TRACING_HEADER = "x-af-user-id";
+export declare const USER_OBJECT = "userObject";
 export declare const DEFAULT_USE_CONSUME_WITH_LOCK = false;
 export declare const CONNECTION_CREATED_CONST = "connectionCreated";
 export declare const DEFAULT_OPTIONS: {

package/dist/lib/consts.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_OPTIONS = exports.CONNECTION_CREATED_CONST = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
+exports.DEFAULT_OPTIONS = exports.CONNECTION_CREATED_CONST = exports.DEFAULT_USE_CONSUME_WITH_LOCK = exports.USER_OBJECT = exports.USER_TRACING_HEADER = exports.TRACING_HEADER = exports.RETRY_HEADER = exports.DEFAULT_LOCK_TIMEOUT = exports.DEFAULT_DEAD_TTL_TWO_DAYS = void 0;
 exports.DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 12;
 exports.DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 exports.RETRY_HEADER = 'x-retry-count';
 exports.TRACING_HEADER = 'x-trace-id';
+exports.USER_TRACING_HEADER = 'x-af-user-id';
+exports.USER_OBJECT = 'userObject';
 exports.DEFAULT_USE_CONSUME_WITH_LOCK = false;
 exports.CONNECTION_CREATED_CONST = 'connectionCreated';
 exports.DEFAULT_OPTIONS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-alpha6",
+  "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';
@@ -19,6 +21,8 @@ import {
   DEFAULT_OPTIONS,
   RETRY_HEADER,
   TRACING_HEADER,
+  USER_OBJECT,
+  USER_TRACING_HEADER,
 } from './lib/consts';
 import {
   CallbackFunction,
@@ -109,16 +113,13 @@ class RabbitMq implements IAfRabbitMq {
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
     const trace = getCurrentPayload();
-    logger.info('getPublishOptions', {
-      trace,
-      context1: trace?.context?.get(TRACING_HEADER),
-      context2: trace?.context?.get('userObject'),
-    });
+    const user = trace?.context?.get(USER_OBJECT);
     return {
       timestamp: moment().unix(),
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
+        [USER_TRACING_HEADER]: user?.id,
         [TRACING_HEADER]: trace?.context?.get(TRACING_HEADER),
       },
     };
@@ -480,15 +481,12 @@ class RabbitMq implements IAfRabbitMq {
           }
 
           const traceId = msg.properties.headers[TRACING_HEADER];
+          const userId = msg.properties.headers[USER_TRACING_HEADER];
           if (traceId) {
             const trace = newTrace(traceTypes.RABBIT);
             (trace as any)?.context?.set(TRACING_HEADER, traceId);
-            logger.info(`rabbit: [consume] received message with traceId ${traceId}`, {
-              trace,
-            });
-          }
-
-          if (auditContext) {
+          } else if (userId && auditContext) {
+            await setRabbitTrace(userId);
             auditContext(queue);
           }
 

package/src/lib/consts.ts

@@ -2,6 +2,8 @@ export const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 12;
 export const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 export const RETRY_HEADER = 'x-retry-count';
 export const TRACING_HEADER = 'x-trace-id';
+export const USER_TRACING_HEADER = 'x-af-user-id';
+export const USER_OBJECT = 'userObject';
 export const DEFAULT_USE_CONSUME_WITH_LOCK = false;
 export const CONNECTION_CREATED_CONST = 'connectionCreated';
 export const DEFAULT_OPTIONS = {