@autofleet/rabbit 3.0.1-beta1 → 3.0.1-beta10

package/dist/index.js

@@ -126,14 +126,24 @@ class RabbitMq {
     static getPublishOptions(customHeaders = {}) {
         const trace = zehut_1.getCurrentPayload();
         const user = trace?.context?.get(consts_1.USER_OBJECT);
-        const outbreakTrace = zehut_1.oubtreak.getCurrentContext();
+        const traceId = trace?.context?.get(consts_1.TRACING_HEADER);
+        const outbreakTrace = zehut_1.outbreak.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,
+        });
         return {
             timestamp: moment_1.default().unix(),
             headers: {
                 creationTimestamp: moment_1.default().valueOf(),
                 ...customHeaders,
                 [consts_1.USER_TRACING_HEADER]: user?.id,
-                [consts_1.TRACING_HEADER]: outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
+                [consts_1.TRACING_HEADER]: traceId || outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
             },
         };
     }
@@ -343,18 +353,37 @@ class RabbitMq {
                 const parsedMessage = RabbitMq.parseMsg(msg);
                 const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
                 const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
-                if (traceId) {
-                    trace?.context?.set(consts_1.TRACING_HEADER, traceId);
-                }
+                const outbreakTrace = zehut_1.outbreak.newTrace(zehut_1.traceTypes.RABBIT);
                 if (userId && enableRabbitTrace) {
                     try {
-                        await zehut_1.createOrSetRabbitTrace(trace, userId);
+                        await Promise.all([
+                            zehut_1.createOrSetRabbitTrace(trace, userId),
+                            zehut_1.createOrSetRabbitTrace(outbreakTrace, userId),
+                        ]);
                     }
                     catch (e) {
                         logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
                         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),
+                    });
+                }
+                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-beta1",
+  "version": "3.0.1-beta10",
   "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.1-beta3",
     "@types/amqplib": "0.8.2",
     "@types/uuid": "^8.3.3",
     "amqp-connection-manager": "4.1.9",

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';
@@ -114,14 +114,24 @@ class RabbitMq implements IAfRabbitMq {
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
     const trace = getCurrentPayload();
     const user = trace?.context?.get(USER_OBJECT);
-    const outbreakTrace = oubtreak.getCurrentContext();
+    const traceId = trace?.context?.get(TRACING_HEADER);
+    const outbreakTrace = outbreak.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,
+    });
     return {
       timestamp: moment().unix(),
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
         [USER_TRACING_HEADER]: user?.id,
-        [TRACING_HEADER]: outbreakTrace?.context?.get(TRACING_HEADER),
+        [TRACING_HEADER]: traceId || outbreakTrace?.context?.get(TRACING_HEADER),
       },
     };
   }
@@ -487,18 +497,40 @@ class RabbitMq implements IAfRabbitMq {
           const parsedMessage = RabbitMq.parseMsg(msg);
           const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const trace = newTrace(traceTypes.RABBIT);
-          if (traceId) {
-            (trace as any)?.context?.set(TRACING_HEADER, traceId);
-          }
+          const outbreakTrace = outbreak.newTrace(traceTypes.RABBIT);
           if (userId && enableRabbitTrace) {
             try {
-              await createOrSetRabbitTrace(trace, userId);
+              await Promise.all([
+                createOrSetRabbitTrace(trace, userId),
+                createOrSetRabbitTrace(outbreakTrace, userId),
+              ]);
             } catch (e) {
               logger.error('rabbit: failed to setRabbitTrace', { userId, e });
               await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
             }
           }
 
+          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);
           }