@autofleet/rabbit 2.5.0-beta.5 → 2.5.0-beta.7

package/dist/index.js

@@ -10,7 +10,7 @@ const redis_lock_1 = __importDefault(require("redis-lock"));
 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"));
@@ -124,11 +124,7 @@ class RabbitMq {
         }
     }
     static getPublishOptions(customHeaders = {}) {
-        const trace = zehut_1.getCurrentPayload();
-        logger_1.default.info('ANKRI getPublishOptions', {
-            trace,
-            context: Array.from(trace.context),
-        });
+        const trace = outbreak_1.getCurrentContext();
         return {
             timestamp: moment_1.default().unix(),
             headers: {
@@ -260,8 +256,8 @@ class RabbitMq {
                         return null;
                     }
                     const traceId = msg.properties.headers[TRACING_HEADER];
-                    const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
-                    trace.context.set(TRACING_HEADER, traceId);
+                    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);
@@ -297,17 +293,7 @@ class RabbitMq {
         });
     }
     async publish(exchange, content, customHeaders) {
-        const trace = zehut_1.getCurrentPayload();
-        logger_1.default.info('ANKRI publish', {
-            trace,
-            context: Array.from(trace.context),
-        });
         return wrapSetImmediate(async () => {
-            const trace2 = zehut_1.getCurrentPayload();
-            logger_1.default.info('ANKRI publish inside wrapSetImmediate', {
-                trace: trace2,
-                context: Array.from(trace.context),
-            });
             RabbitMq.validateName('exchange', exchange);
             const channel = await this.assertChannel();
             await this.assertExchange(exchange);
@@ -315,17 +301,7 @@ class RabbitMq {
         });
     }
     async sendToQueue(queue, content, options, customHeaders) {
-        const trace = zehut_1.getCurrentPayload();
-        logger_1.default.info('ANKRI sendToQueue', {
-            trace,
-            context: Array.from(trace.context),
-        });
         return wrapSetImmediate(async () => {
-            const trace2 = zehut_1.getCurrentPayload();
-            logger_1.default.info('ANKRI wrapSetImmediate inside wrapSetImmediate', {
-                trace: trace2,
-                context: Array.from(trace.context),
-            });
             RabbitMq.validateName('queue', queue);
             const channel = await this.assertChannel();
             await this.assertQueue(queue, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.5.0-beta.5",
+  "version": "2.5.0-beta.7",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -27,7 +27,7 @@
     "uuid": "^8.3.2"
   },
   "peerDependencies": {
-    "@autofleet/zehut": "*"
+    "@autofleet/outbreak": "*"
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",

package/src/index.ts

@@ -6,7 +6,7 @@ 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';
@@ -103,11 +103,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
-    const trace = getCurrentPayload();
-    logger.info('ANKRI getPublishOptions', {
-      trace,
-      context: Array.from(trace.context),
-    });
+    const trace = getCurrentContext();
     return {
       timestamp: moment().unix(),
       headers: {
@@ -369,7 +365,7 @@ class RabbitMq implements IAfRabbitMq {
 
             const traceId = msg.properties.headers[TRACING_HEADER];
             const trace = newTrace(traceTypes.RABBIT);
-            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);
@@ -417,17 +413,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
-    const trace = getCurrentPayload();
-    logger.info('ANKRI publish', {
-      trace,
-      context: Array.from(trace.context),
-    });
     return wrapSetImmediate(async () => {
-      const trace2 = getCurrentPayload();
-      logger.info('ANKRI publish inside wrapSetImmediate', {
-        trace: trace2,
-        context: Array.from(trace.context),
-      });
       RabbitMq.validateName('exchange', exchange);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertExchange(exchange);
@@ -438,17 +424,7 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async sendToQueue(queue: string, content: any, options?: any, customHeaders?: any) : Promise<boolean> {
-    const trace = getCurrentPayload();
-    logger.info('ANKRI sendToQueue', {
-      trace,
-      context: Array.from(trace.context),
-    });
     return wrapSetImmediate(async () => {
-      const trace2 = getCurrentPayload();
-      logger.info('ANKRI wrapSetImmediate inside wrapSetImmediate', {
-        trace: trace2,
-        context: Array.from(trace.context),
-      });
       RabbitMq.validateName('queue', queue);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertQueue(queue, options);