@autofleet/rabbit 3.0.1-beta9 → 3.1.1

package/dist/index.js

@@ -127,16 +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 obj = Object.fromEntries(trace?.context);
-        const jsonString = JSON.stringify(obj);
-        logger_1.default.info('getPublishOptions', {
-            traceId,
-            user,
-            traceId2: outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
-            traceContextSize: trace?.context?.size,
-            jsonString,
-        });
+        const outbreakTrace = zehut_1.outbreak.getCurrentContext();
         return {
             timestamp: moment_1.default().unix(),
             headers: {
@@ -349,11 +340,13 @@ class RabbitMq {
                 }
                 const traceId = msg.properties.headers[consts_1.TRACING_HEADER];
                 const userId = msg.properties.headers[consts_1.USER_TRACING_HEADER];
-                logger_1.default.info('rabbit: consume', { traceId, userId, enableRabbitTrace });
                 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);
+                // setting also outbreak trace as part of legacy code
+                const outbreakTrace = zehut_1.outbreak.newTrace(zehut_1.traceTypes.RABBIT);
+                // enableRabbitTrace is a flag to protect from different flows that doesn't work with permission
+                // and we don't want to fail the flow because of it
                 if (userId && enableRabbitTrace) {
                     try {
                         await Promise.all([
@@ -366,25 +359,10 @@ class RabbitMq {
                         await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
                     }
                 }
-                logger_1.default.info('rabbit consume - first trace', {
-                    trace,
-                    outbreakTrace,
-                    user: trace?.context?.get(consts_1.USER_OBJECT),
-                });
                 if (traceId) {
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
                     outbreakTrace?.context.set(consts_1.TRACING_HEADER, traceId);
-                    logger_1.default.info('rabbit consume - second trace', {
-                        trace,
-                        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', {
-                    trace: zehut_1.getCurrentPayload(),
-                });
                 if (auditContext) {
                     await auditContext(queue);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-beta9",
+  "version": "3.1.1",
   "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,16 +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 obj = Object.fromEntries(trace?.context);
-    const jsonString = JSON.stringify(obj);
-    logger.info('getPublishOptions', {
-      traceId,
-      user,
-      traceId2: outbreakTrace?.context?.get(TRACING_HEADER),
-      traceContextSize: trace?.context?.size,
-      jsonString,
-    });
+    const outbreakTrace = outbreak.getCurrentContext();
     return {
       timestamp: moment().unix(),
       headers: {
@@ -493,11 +484,13 @@ class RabbitMq implements IAfRabbitMq {
 
           const traceId = msg.properties.headers[TRACING_HEADER];
           const userId = msg.properties.headers[USER_TRACING_HEADER];
-          logger.info('rabbit: consume', { traceId, userId, enableRabbitTrace });
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
-          const outbreakTrace = newTrace(traceTypes.RABBIT);
+          // setting also outbreak trace as part of legacy code
+          const outbreakTrace = outbreak.newTrace(traceTypes.RABBIT);
+          // enableRabbitTrace is a flag to protect from different flows that doesn't work with permission
+          // and we don't want to fail the flow because of it
           if (userId && enableRabbitTrace) {
             try {
               await Promise.all([
@@ -510,27 +503,11 @@ class RabbitMq implements IAfRabbitMq {
             }
           }
 
-          logger.info('rabbit consume - first trace', {
-            trace,
-            outbreakTrace,
-            user: trace?.context?.get(USER_OBJECT),
-          });
-
           if (traceId) {
             (trace as any)?.context?.set(TRACING_HEADER, traceId);
             (outbreakTrace as any)?.context.set(TRACING_HEADER, traceId);
-            logger.info('rabbit consume - second trace', {
-              trace,
-              outbreakTrace,
-              user: trace?.context?.get(USER_OBJECT),
-              traceId: trace?.context?.get(TRACING_HEADER),
-              traceId2: outbreakTrace?.context?.get(TRACING_HEADER),
-            });
           }
 
-          logger.info('rabbit consume - third trace', {
-            trace: getCurrentPayload(),
-          });
           if (auditContext) {
             await auditContext(queue);
           }