@autofleet/rabbit 3.0.1-alpha10 → 3.0.1-alpha2

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, USER_TRACING_HEADER } from './lib/consts';
+import { TRACING_HEADER } from './lib/consts';
 import { CallbackFunction, ConsumeMessageOrNull, ConsumeOptions, CustomMessageHeaders, QueuesCache, RedisLockType, ExchangesCache } from './lib/types';
 export interface IAfRabbitMq {
     ack: any;
@@ -44,7 +44,6 @@ 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

@@ -9,7 +9,7 @@ const util_1 = require("util");
 const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
-const zehut_1 = require("@autofleet/zehut");
+const outbreak_1 = require("@autofleet/outbreak");
 const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./lib/rabbitError"));
 const redis_1 = __importDefault(require("./lib/redis"));
@@ -124,14 +124,12 @@ class RabbitMq {
         }
     }
     static getPublishOptions(customHeaders = {}) {
-        const trace = zehut_1.getCurrentPayload();
-        const user = trace?.context?.get(consts_1.USER_OBJECT);
+        const trace = outbreak_1.getCurrentContext();
         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),
             },
         };
@@ -321,7 +319,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, enableRabbitTrace, } = optionsWithDefaults;
+        const { limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, } = optionsWithDefaults;
         if (useConsumeWithLock) {
             if (!this.redisLock) {
                 throw new Error('Usage of consumeWithLock requires RedisInstance');
@@ -337,19 +335,12 @@ class RabbitMq {
                     return null;
                 }
                 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);
+                    const trace = outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
-                }
-                else if (userId && enableRabbitTrace) {
-                    try {
-                        await zehut_1.setRabbitTrace(userId);
-                    }
-                    catch (e) {
-                        logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
-                    }
+                    logger_1.default.info(`rabbit: [consume] received message with traceId ${traceId}`, {
+                        trace,
+                    });
                 }
                 if (auditContext) {
                     auditContext(queue);

package/dist/lib/consts.d.ts

@@ -2,8 +2,6 @@ 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: {
@@ -13,5 +11,4 @@ export declare const DEFAULT_OPTIONS: {
     lockTimeout: number;
     useConsumeWithLock: boolean;
     auditContext: null;
-    enableRabbitTrace: boolean;
 };

package/dist/lib/consts.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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_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_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 = {
@@ -16,5 +14,4 @@ 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,7 +18,6 @@ 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-alpha10",
+  "version": "3.0.1-alpha2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.1-alpha3",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",
@@ -27,6 +26,9 @@
     "redis-lock": "^0.1.4",
     "uuid": "^8.3.2"
   },
+  "peerDependencies": {
+    "@autofleet/outbreak": "^0.2.1"
+  },
   "devDependencies": {
     "@types/jest": "^26.0.23",
     "@typescript-eslint/eslint-plugin": "^4.8.1",

package/src/index.ts

@@ -8,9 +8,7 @@ import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-
 import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
 } from 'amqplib';
-import {
-  getCurrentPayload, newTrace, traceTypes, setRabbitTrace,
-} from '@autofleet/zehut';
+import { getCurrentContext, newTrace, traceTypes } from '@autofleet/outbreak';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
 import getRedisInstance, { RedisConfig } from './lib/redis';
@@ -21,8 +19,6 @@ import {
   DEFAULT_OPTIONS,
   RETRY_HEADER,
   TRACING_HEADER,
-  USER_OBJECT,
-  USER_TRACING_HEADER,
 } from './lib/consts';
 import {
   CallbackFunction,
@@ -112,14 +108,12 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
-    const trace = getCurrentPayload();
-    const user = trace?.context?.get(USER_OBJECT);
+    const trace = getCurrentContext();
     return {
       timestamp: moment().unix(),
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
-        [USER_TRACING_HEADER]: user?.id,
         [TRACING_HEADER]: trace?.context?.get(TRACING_HEADER),
       },
     };
@@ -461,7 +455,7 @@ class RabbitMq implements IAfRabbitMq {
     const optionsWithDefaults = { ...DEFAULT_OPTIONS, ...options };
     RabbitMq.validateName('queue', queue);
     const {
-      limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext, enableRabbitTrace,
+      limit, deadMessageTtl, useConsumeWithLock, lockTimeout, auditContext,
     } = optionsWithDefaults;
     if (useConsumeWithLock) {
       if (!this.redisLock) {
@@ -481,17 +475,12 @@ 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 && enableRabbitTrace) {
-            try {
-              await setRabbitTrace(userId);
-            } catch (e) {
-              logger.error('rabbit: failed to setRabbitTrace', { userId, e });
-            }
+            logger.info(`rabbit: [consume] received message with traceId ${traceId}`, {
+              trace,
+            });
           }
 
           if (auditContext) {

package/src/lib/consts.ts

@@ -2,8 +2,6 @@ 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 = {
@@ -13,5 +11,4 @@ export const DEFAULT_OPTIONS = {
   lockTimeout: DEFAULT_LOCK_TIMEOUT,
   useConsumeWithLock: DEFAULT_USE_CONSUME_WITH_LOCK,
   auditContext: null,
-  enableRabbitTrace: false,
 };

package/src/lib/types.ts

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