@autofleet/rabbit 2.5.0-beta.1 → 2.5.0-beta.10

package/dist/index.d.ts

@@ -3,7 +3,6 @@ import { Options, ConsumeMessage } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 import { RedisConfig } from './redis';
-declare const TRACING_HEADER = "x-trace-id";
 export interface IAfRabbitMq {
     ack: any;
     nack: any;
@@ -38,6 +37,7 @@ declare type CallbackFunction = (msg: ConsumeMessage, ack: Function, nack: Funct
 export interface AfRabbitOptions {
     disableReconnect: boolean;
 }
+declare const TRACING_HEADER = "x-trace-id";
 declare class RabbitMq implements IAfRabbitMq {
     static parseMsg(msg: any): any;
     static validateName(type: string, name: string): void;

package/dist/index.js

@@ -7,18 +7,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // eslint-disable-next-line max-classes-per-file
 const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
-const shortid_1 = __importDefault(require("shortid"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
 const util_1 = require("util");
-const zehut_1 = require("@autofleet/zehut");
+const outbreak_1 = require("@autofleet/outbreak");
 const logger_1 = __importDefault(require("./logger"));
 const rabbitError_1 = __importDefault(require("./rabbitError"));
 const redis_1 = __importDefault(require("./redis"));
-const TRACING_HEADER = 'x-trace-id';
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
 const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 const RETRY_HEADER = 'x-retry-count';
+const TRACING_HEADER = 'x-trace-id';
 const DEFAULT_USE_CONSUME_WITH_LOCK = false;
 const defaultOptions = {
     limit: 1,
@@ -125,12 +124,13 @@ class RabbitMq {
         }
     }
     static getPublishOptions(customHeaders = {}) {
+        const trace = outbreak_1.getCurrentContext();
         return {
             timestamp: moment_1.default().unix(),
             headers: {
                 creationTimestamp: moment_1.default().valueOf(),
                 ...customHeaders,
-                [TRACING_HEADER]: zehut_1.getCurrentPayload()?.get?.(TRACING_HEADER),
+                [TRACING_HEADER]: trace?.context?.get(TRACING_HEADER),
             },
         };
     }
@@ -255,12 +255,9 @@ class RabbitMq {
                     if (!msg) {
                         return null;
                     }
-                    const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
-                    let traceId = msg.properties.headers[TRACING_HEADER];
-                    if (typeof traceId === 'undefined') {
-                        traceId = shortid_1.default.generate();
-                    }
-                    trace.context.set(TRACING_HEADER, traceId);
+                    const traceId = msg.properties.headers[TRACING_HEADER];
+                    const trace = outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
+                    trace?.context?.set(TRACING_HEADER, traceId);
                     const parsedMessage = RabbitMq.parseMsg(msg);
                     const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
                     const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.5.0-beta.1",
+  "version": "2.5.0-beta.10",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,6 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.0",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",
@@ -25,12 +24,13 @@
     "moment": "^2.29.1",
     "redis": "^3.1.2",
     "redis-lock": "^0.1.4",
-    "shortid": "^2.2.16",
     "uuid": "^8.3.2"
   },
+  "peerDependencies": {
+    "@autofleet/outbreak": "^0.2.1"
+  },
   "devDependencies": {
     "@types/jest": "^26.0.23",
-    "@types/shortid": "^0.0.29",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "eslint": "^7.13.0",
     "eslint-config-airbnb-typescript": "^12.0.0",

package/src/index.ts

@@ -2,18 +2,15 @@
 // eslint-disable-next-line max-classes-per-file
 import moment from 'moment';
 import RedisLock from 'redis-lock';
-import shortid from 'shortid';
 import { ConfirmChannel, Options, ConsumeMessage } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
 import { promisify } from 'util';
-import { traceTypes, getCurrentPayload, newTrace } from '@autofleet/zehut';
+import { traceTypes, getCurrentContext, newTrace } from '@autofleet/outbreak';
 import logger from './logger';
 import RabbitError from './rabbitError';
 import getRedisInstance, { RedisConfig } from './redis';
 
-const TRACING_HEADER = 'x-trace-id';
-
 export interface IAfRabbitMq {
   ack: any;
   nack: any;
@@ -58,6 +55,7 @@ export interface AfRabbitOptions {
 const DEFAULT_DEAD_TTL_TWO_DAYS = 60000 * 60 * 48;
 const DEFAULT_LOCK_TIMEOUT = 1000 * 5;
 const RETRY_HEADER = 'x-retry-count';
+const TRACING_HEADER = 'x-trace-id';
 const DEFAULT_USE_CONSUME_WITH_LOCK = false;
 
 const defaultOptions = {
@@ -105,12 +103,13 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
+    const trace = getCurrentContext();
     return {
       timestamp: moment().unix(),
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
-        [TRACING_HEADER]: getCurrentPayload()?.get?.(TRACING_HEADER),
+        [TRACING_HEADER]: trace?.context?.get(TRACING_HEADER),
       },
     };
   }
@@ -364,12 +363,9 @@ class RabbitMq implements IAfRabbitMq {
               return null;
             }
 
+            const traceId = msg.properties.headers[TRACING_HEADER];
             const trace = newTrace(traceTypes.RABBIT);
-            let traceId = msg.properties.headers[TRACING_HEADER];
-            if (typeof traceId === 'undefined') {
-              traceId = shortid.generate();
-            }
-            trace.context.set(TRACING_HEADER, traceId);
+            (trace as any)?.context?.set(TRACING_HEADER, traceId);
 
             const parsedMessage = RabbitMq.parseMsg(msg);
             const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);