@autofleet/rabbit 3.0.1-beta → 3.0.1-beta1

package/dist/index.js

@@ -126,13 +126,14 @@ 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();
         return {
             timestamp: moment_1.default().unix(),
             headers: {
                 creationTimestamp: moment_1.default().valueOf(),
                 ...customHeaders,
                 [consts_1.USER_TRACING_HEADER]: user?.id,
-                [consts_1.TRACING_HEADER]: trace?.context?.get(consts_1.TRACING_HEADER),
+                [consts_1.TRACING_HEADER]: outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
             },
         };
     }
@@ -339,23 +340,24 @@ 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);
                 if (traceId) {
-                    const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
                     trace?.context?.set(consts_1.TRACING_HEADER, traceId);
                 }
-                else if (userId && enableRabbitTrace) {
+                if (userId && enableRabbitTrace) {
                     try {
-                        await zehut_1.setRabbitTrace(userId);
+                        await zehut_1.createOrSetRabbitTrace(trace, userId);
                     }
                     catch (e) {
                         logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
+                        await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
                     }
                 }
                 if (auditContext) {
-                    auditContext(queue);
+                    await auditContext(queue);
                 }
-                const parsedMessage = RabbitMq.parseMsg(msg);
-                const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
                 const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
                 if (!shouldConsume) {
                     await this.unlockRedisIfNeeded(releaseLock);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "3.0.1-beta",
+  "version": "3.0.1-beta1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@autofleet/logger": "^1.2.8",
-    "@autofleet/zehut": "^3.0.1-beta",
+    "@autofleet/zehut": "^3.0.1-beta2",
     "@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, setRabbitTrace,
+  getCurrentPayload, newTrace, traceTypes, createOrSetRabbitTrace, oubtreak,
 } from '@autofleet/zehut';
 import logger from './logger';
 import RabbitError from './lib/rabbitError';
@@ -114,13 +114,14 @@ class RabbitMq implements IAfRabbitMq {
   static getPublishOptions(customHeaders: CustomMessageHeaders = {}) {
     const trace = getCurrentPayload();
     const user = trace?.context?.get(USER_OBJECT);
+    const outbreakTrace = oubtreak.getCurrentContext();
     return {
       timestamp: moment().unix(),
       headers: {
         creationTimestamp: moment().valueOf(),
         ...customHeaders,
         [USER_TRACING_HEADER]: user?.id,
-        [TRACING_HEADER]: trace?.context?.get(TRACING_HEADER),
+        [TRACING_HEADER]: outbreakTrace?.context?.get(TRACING_HEADER),
       },
     };
   }
@@ -483,23 +484,24 @@ 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);
           if (traceId) {
-            const trace = newTrace(traceTypes.RABBIT);
             (trace as any)?.context?.set(TRACING_HEADER, traceId);
-          } else if (userId && enableRabbitTrace) {
+          }
+          if (userId && enableRabbitTrace) {
             try {
-              await setRabbitTrace(userId);
+              await createOrSetRabbitTrace(trace, userId);
             } catch (e) {
               logger.error('rabbit: failed to setRabbitTrace', { userId, e });
+              await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
             }
           }
 
           if (auditContext) {
-            auditContext(queue);
+            await auditContext(queue);
           }
-
-          const parsedMessage = RabbitMq.parseMsg(msg);
-          const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
           const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
           if (!shouldConsume) {
             await this.unlockRedisIfNeeded(releaseLock);