@autofleet/rabbit 3.0.1-beta4 → 3.0.1-beta5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.js +3 -8
  2. package/package.json +1 -1
  3. package/src/index.ts +3 -11
package/dist/index.js CHANGED
@@ -139,7 +139,7 @@ class RabbitMq {
139
139
  creationTimestamp: moment_1.default().valueOf(),
140
140
  ...customHeaders,
141
141
  [consts_1.USER_TRACING_HEADER]: user?.id,
142
- [consts_1.TRACING_HEADER]: traceId || outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
142
+ [consts_1.TRACING_HEADER]: user?.traceId || outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
143
143
  },
144
144
  };
145
145
  }
@@ -350,7 +350,7 @@ class RabbitMq {
350
350
  const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
351
351
  const trace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
352
352
  const outbreakTrace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
353
- if (userId && enableRabbitTrace) {
353
+ if (userId) {
354
354
  try {
355
355
  await zehut_1.createOrSetRabbitTrace(trace, userId);
356
356
  }
@@ -359,12 +359,7 @@ class RabbitMq {
359
359
  await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
360
360
  }
361
361
  }
362
- logger_1.default.info('rabbit consume - first trace', {
363
- trace,
364
- outbreakTrace,
365
- user: trace?.context?.get(consts_1.USER_OBJECT),
366
- });
367
- if (traceId) {
362
+ else if (traceId) {
368
363
  trace?.context?.set(consts_1.TRACING_HEADER, traceId);
369
364
  outbreakTrace?.context.set(consts_1.TRACING_HEADER, traceId);
370
365
  logger_1.default.info('rabbit consume - second trace', {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/rabbit",
3
- "version": "3.0.1-beta4",
3
+ "version": "3.0.1-beta5",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/index.ts CHANGED
@@ -127,7 +127,7 @@ class RabbitMq implements IAfRabbitMq {
127
127
  creationTimestamp: moment().valueOf(),
128
128
  ...customHeaders,
129
129
  [USER_TRACING_HEADER]: user?.id,
130
- [TRACING_HEADER]: traceId || outbreakTrace?.context?.get(TRACING_HEADER),
130
+ [TRACING_HEADER]: user?.traceId || outbreakTrace?.context?.get(TRACING_HEADER),
131
131
  },
132
132
  };
133
133
  }
@@ -494,22 +494,14 @@ class RabbitMq implements IAfRabbitMq {
494
494
  const releaseLock = await this.lockRedisIfNeeded(parsedMessage, optionsWithDefaults);
495
495
  const trace = newTrace(traceTypes.RABBIT);
496
496
  const outbreakTrace = newTrace(traceTypes.RABBIT);
497
- if (userId && enableRabbitTrace) {
497
+ if (userId) {
498
498
  try {
499
499
  await createOrSetRabbitTrace(trace, userId);
500
500
  } catch (e) {
501
501
  logger.error('rabbit: failed to setRabbitTrace', { userId, e });
502
502
  await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
503
503
  }
504
- }
505
-
506
- logger.info('rabbit consume - first trace', {
507
- trace,
508
- outbreakTrace,
509
- user: trace?.context?.get(USER_OBJECT),
510
- });
511
-
512
- if (traceId) {
504
+ } else if (traceId) {
513
505
  (trace as any)?.context?.set(TRACING_HEADER, traceId);
514
506
  (outbreakTrace as any)?.context.set(TRACING_HEADER, traceId);
515
507
  logger.info('rabbit consume - second trace', {