@autofleet/rabbit 3.0.1-beta9 → 3.1.0

package/dist/index.js

@@ -127,7 +127,7 @@ class RabbitMq {
         const trace = zehut_1.getCurrentPayload();
         const user = trace?.context?.get(consts_1.USER_OBJECT);
         const traceId = trace?.context?.get(consts_1.TRACING_HEADER);
-        const outbreakTrace = zehut_1.oubtreak.getCurrentContext();
+        const outbreakTrace = zehut_1.outbreak.getCurrentContext();
         const obj = Object.fromEntries(trace?.context);
         const jsonString = JSON.stringify(obj);
         logger_1.default.info('getPublishOptions', {
@@ -353,7 +353,7 @@ class RabbitMq {
                 const parsedMessage = RabbitMq.parseMsg(msg);
                 const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
                 const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
-                const outbreakTrace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
+                const outbreakTrace = zehut_1.outbreak.newTrace(zehut_1.traceTypes.RABBIT);
                 if (userId && enableRabbitTrace) {
                     try {
                         await Promise.all([
@@ -379,7 +379,6 @@ class RabbitMq {
                         outbreakTrace,
                         user: trace?.context?.get(consts_1.USER_OBJECT),
                         traceId: trace?.context?.get(consts_1.TRACING_HEADER),
-                        traceId2: outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
                     });
                 }
                 logger_1.default.info('rabbit consume - third trace', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-beta9",
+  "version": "3.1.0",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.1-beta2",
+    "@autofleet/zehut": "^3.0.2",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",
@@ -27,6 +27,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

@@ -9,7 +9,7 @@ import {
   ConfirmChannel, ConsumeMessage, Options, Replies,
 } from 'amqplib';
 import {
-  getCurrentPayload, newTrace, traceTypes, createOrSetRabbitTrace, oubtreak,
+  getCurrentPayload, newTrace, traceTypes, createOrSetRabbitTrace, outbreak,
 } from '@autofleet/zehut';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
@@ -115,7 +115,7 @@ class RabbitMq implements IAfRabbitMq {
     const trace = getCurrentPayload();
     const user = trace?.context?.get(USER_OBJECT);
     const traceId = trace?.context?.get(TRACING_HEADER);
-    const outbreakTrace = oubtreak.getCurrentContext();
+    const outbreakTrace = outbreak.getCurrentContext();
     const obj = Object.fromEntries(trace?.context);
     const jsonString = JSON.stringify(obj);
     logger.info('getPublishOptions', {
@@ -497,7 +497,7 @@ class RabbitMq implements IAfRabbitMq {
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
-          const outbreakTrace = newTrace(traceTypes.RABBIT);
+          const outbreakTrace = outbreak.newTrace(traceTypes.RABBIT);
           if (userId && enableRabbitTrace) {
             try {
               await Promise.all([
@@ -524,7 +524,7 @@ class RabbitMq implements IAfRabbitMq {
               outbreakTrace,
               user: trace?.context?.get(USER_OBJECT),
               traceId: trace?.context?.get(TRACING_HEADER),
-              traceId2: outbreakTrace?.context?.get(TRACING_HEADER),
+              // traceId2: outbreakTrace?.context?.get(TRACING_HEADER),
             });
           }