@autofleet/rabbit 2.2.6 → 2.2.8-add-context-1

package/dist/index.js

@@ -18,6 +18,7 @@ const moment_1 = __importDefault(require("moment"));
 const redis_lock_1 = __importDefault(require("redis-lock"));
 const amqp_connection_manager_1 = require("amqp-connection-manager");
 const events_1 = require("events");
+const outbreak_1 = require("@autofleet/outbreak");
 // import { newTrace, traceTypes } from '@autofleet/outbreak';
 const util_1 = require("util");
 const logger_1 = __importDefault(require("./logger"));
@@ -55,9 +56,6 @@ class RabbitMq {
                 const { properties: { timestamp, headers } } = msg;
                 if (timestamp && (headers === null || headers === void 0 ? void 0 : headers.redisTimestampValidationKey) && this.redisClient) {
                     const lastMessageTimestamp = yield this.redisClient.getAsync(headers.redisTimestampValidationKey);
-                    logger_1.default.info('rabbit: checking if should consume params', {
-                        msg, timestamp, headers, lastMessageTimestamp,
-                    });
                     return !lastMessageTimestamp || (parseInt(lastMessageTimestamp, 10) <= parseInt(timestamp, 10));
                 }
                 return true;
@@ -282,11 +280,11 @@ class RabbitMq {
                         }
                         const parsedMessage = RabbitMq.parseMsg(msg);
                         const shouldConsume = yield this.shouldConsumeMessageByTimestamp(parsedMessage);
-                        logger_1.default.info('rabbit: trying to consume', { queue, shouldConsume, msg });
                         if (!shouldConsume) {
                             return this.ack(channel, msg)(msg);
                         }
                         try {
+                            outbreak_1.newTrace(outbreak_1.traceTypes.RABBIT);
                             yield callback(parsedMessage, this.ack(channel, msg, true), this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg));
                         }
                         catch (e) {
@@ -332,7 +330,6 @@ class RabbitMq {
                 RabbitMq.validateName('queue', queue);
                 const channel = yield this.assertChannel();
                 yield this.assertQueue(queue, options);
-                logger_1.default.info('rabbit: sending to queue', { queue, content, customHeaders });
                 return channel.sendToQueue(queue, Buffer.from(JSON.stringify(content)), RabbitMq.getPublishOptions(customHeaders));
             }));
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/rabbit",
-  "version": "2.2.6",
+  "version": "2.2.8-add-context-1",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/index.ts

@@ -5,6 +5,7 @@ import RedisLock from 'redis-lock';
 import { ConfirmChannel, Options, ConsumeMessage } from 'amqplib';
 import { AmqpConnectionManager, ChannelWrapper, connect } from 'amqp-connection-manager';
 import { EventEmitter } from 'events';
+import { newTrace, traceTypes } from '@autofleet/outbreak';
 // import { newTrace, traceTypes } from '@autofleet/outbreak';
 import { promisify } from 'util';
 import logger from './logger';
@@ -150,9 +151,6 @@ class RabbitMq implements IAfRabbitMq {
       const { properties: { timestamp, headers } } = msg;
       if (timestamp && headers?.redisTimestampValidationKey && this.redisClient) {
         const lastMessageTimestamp = await this.redisClient.getAsync(headers.redisTimestampValidationKey);
-        logger.info('rabbit: checking if should consume params', {
-          msg, timestamp, headers, lastMessageTimestamp,
-        });
         return !lastMessageTimestamp || (parseInt(lastMessageTimestamp, 10) <= parseInt(timestamp, 10));
       }
       return true;
@@ -355,11 +353,11 @@ class RabbitMq implements IAfRabbitMq {
             }
             const parsedMessage = RabbitMq.parseMsg(msg);
             const shouldConsume = await this.shouldConsumeMessageByTimestamp(parsedMessage);
-            logger.info('rabbit: trying to consume', { queue, shouldConsume, msg });
             if (!shouldConsume) {
               return this.ack(channel, msg)(msg);
             }
             try {
+              newTrace(traceTypes.RABBIT);
               await callback(
                 parsedMessage,
                 this.ack(channel, msg, true),
@@ -413,7 +411,6 @@ class RabbitMq implements IAfRabbitMq {
       RabbitMq.validateName('queue', queue);
       const channel: ChannelWrapper = await this.assertChannel();
       await this.assertQueue(queue, options);
-      logger.info('rabbit: sending to queue', { queue, content, customHeaders });
       return channel.sendToQueue(queue,
         Buffer.from(JSON.stringify(content)),
         RabbitMq.getPublishOptions(customHeaders));