@autofleet/rabbit 2.5.0-beta.4 → 2.5.0-beta.6

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,7 +124,11 @@ class RabbitMq {
         }
     }
     static getPublishOptions(customHeaders = {}) {
-        const trace = zehut_1.getCurrentPayload();
+        const trace = outbreak_1.getCurrentContext();
+        logger_1.default.info('ANKRI getPublishOptions', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return {
             timestamp: moment_1.default().unix(),
             headers: {
@@ -256,8 +260,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);
@@ -293,7 +297,17 @@ class RabbitMq {
         });
     }
     async publish(exchange, content, customHeaders) {
+        const trace = outbreak_1.getCurrentContext();
+        logger_1.default.info('ANKRI publish', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return wrapSetImmediate(async () => {
+            const trace2 = outbreak_1.getCurrentContext();
+            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);
@@ -301,7 +315,17 @@ class RabbitMq {
         });
     }
     async sendToQueue(queue, content, options, customHeaders) {
+        const trace = outbreak_1.getCurrentContext();
+        logger_1.default.info('ANKRI sendToQueue', {
+            trace,
+            context: Array.from(trace.context),
+        });
         return wrapSetImmediate(async () => {
+            const trace2 = outbreak_1.getCurrentContext();
+            logger_1.default.info('ANKRI sendToQueue 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.4",
+  "version": "2.5.0-beta.6",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -24,15 +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/zehut": "*"
+    "@autofleet/outbreak": "*"
   },
   "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,12 +2,11 @@
 // 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';
@@ -104,7 +103,11 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
-    const trace = getCurrentPayload();
+    const trace = getCurrentContext();
+    logger.info('ANKRI getPublishOptions', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return {
       timestamp: moment().unix(),
       headers: {
@@ -366,7 +369,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);
@@ -414,7 +417,17 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async publish(exchange: string, content: any, customHeaders?: any) : Promise<boolean> {
+    const trace = getCurrentContext();
+    logger.info('ANKRI publish', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return wrapSetImmediate(async () => {
+      const trace2 = getCurrentContext();
+      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);
@@ -425,7 +438,17 @@ class RabbitMq implements IAfRabbitMq {
   }
 
   async sendToQueue(queue: string, content: any, options?: any, customHeaders?: any) : Promise<boolean> {
+    const trace = getCurrentContext();
+    logger.info('ANKRI sendToQueue', {
+      trace,
+      context: Array.from(trace.context),
+    });
     return wrapSetImmediate(async () => {
+      const trace2 = getCurrentContext();
+      logger.info('ANKRI sendToQueue inside wrapSetImmediate', {
+        trace: trace2,
+        context: Array.from(trace.context),
+      });
       RabbitMq.validateName('queue', queue);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertQueue(queue, options);