@autofleet/rabbit 2.5.0-beta.2 → 2.5.0-beta.3

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,7 +7,6 @@ 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");
@@ -15,10 +14,10 @@ const zehut_1 = require("@autofleet/zehut");
 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,
@@ -256,11 +255,8 @@ class RabbitMq {
                     if (!msg) {
                         return null;
                     }
+                    const traceId = msg.properties.headers[TRACING_HEADER];
                     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 parsedMessage = RabbitMq.parseMsg(msg);
                     const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.5.0-beta.2",
+  "version": "2.5.0-beta.3",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -12,8 +12,6 @@ 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 +56,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 = {
@@ -365,11 +364,8 @@ 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);
 
             const parsedMessage = RabbitMq.parseMsg(msg);