@autofleet/rabbit 3.0.1-beta5 → 3.0.1-beta7

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 +11 -3
  2. package/package.json +1 -1
  3. package/src/index.ts +14 -3
package/dist/index.js CHANGED
@@ -350,16 +350,24 @@ 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) {
353
+ if (userId && enableRabbitTrace) {
354
354
  try {
355
- await zehut_1.createOrSetRabbitTrace(trace, userId);
355
+ await Promise.all([
356
+ zehut_1.createOrSetRabbitTrace(trace, userId),
357
+ zehut_1.createOrSetRabbitTrace(outbreakTrace, userId),
358
+ ]);
356
359
  }
357
360
  catch (e) {
358
361
  logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
359
362
  await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
360
363
  }
361
364
  }
362
- else if (traceId) {
365
+ logger_1.default.info('rabbit consume - first trace', {
366
+ trace,
367
+ outbreakTrace,
368
+ user: trace?.context?.get(consts_1.USER_OBJECT),
369
+ });
370
+ if (traceId) {
363
371
  trace?.context?.set(consts_1.TRACING_HEADER, traceId);
364
372
  outbreakTrace?.context.set(consts_1.TRACING_HEADER, traceId);
365
373
  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-beta5",
3
+ "version": "3.0.1-beta7",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/index.ts CHANGED
@@ -494,14 +494,25 @@ 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) {
497
+ if (userId && enableRabbitTrace) {
498
498
  try {
499
- await createOrSetRabbitTrace(trace, userId);
499
+ await Promise.all([
500
+ createOrSetRabbitTrace(trace, userId),
501
+ createOrSetRabbitTrace(outbreakTrace, userId),
502
+ ]);
500
503
  } catch (e) {
501
504
  logger.error('rabbit: failed to setRabbitTrace', { userId, e });
502
505
  await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
503
506
  }
504
- } else if (traceId) {
507
+ }
508
+
509
+ logger.info('rabbit consume - first trace', {
510
+ trace,
511
+ outbreakTrace,
512
+ user: trace?.context?.get(USER_OBJECT),
513
+ });
514
+
515
+ if (traceId) {
505
516
  (trace as any)?.context?.set(TRACING_HEADER, traceId);
506
517
  (outbreakTrace as any)?.context.set(TRACING_HEADER, traceId);
507
518
  logger.info('rabbit consume - second trace', {