@autofleet/rabbit 3.0.1-beta6 → 3.0.1-beta8
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.
- package/dist/index.js +9 -2
- package/package.json +1 -1
- package/src/index.ts +9 -2
package/dist/index.js
CHANGED
|
@@ -128,10 +128,14 @@ class RabbitMq {
|
|
|
128
128
|
const user = trace?.context?.get(consts_1.USER_OBJECT);
|
|
129
129
|
const traceId = trace?.context?.get(consts_1.TRACING_HEADER);
|
|
130
130
|
const outbreakTrace = zehut_1.oubtreak.getCurrentContext();
|
|
131
|
+
const obj = Object.fromEntries(trace?.context);
|
|
132
|
+
const jsonString = JSON.stringify(obj);
|
|
131
133
|
logger_1.default.info('getPublishOptions', {
|
|
132
134
|
traceId,
|
|
133
135
|
user,
|
|
134
136
|
traceId2: outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
|
|
137
|
+
traceContextSize: trace?.context?.size,
|
|
138
|
+
jsonString,
|
|
135
139
|
});
|
|
136
140
|
return {
|
|
137
141
|
timestamp: moment_1.default().unix(),
|
|
@@ -139,7 +143,7 @@ class RabbitMq {
|
|
|
139
143
|
creationTimestamp: moment_1.default().valueOf(),
|
|
140
144
|
...customHeaders,
|
|
141
145
|
[consts_1.USER_TRACING_HEADER]: user?.id,
|
|
142
|
-
[consts_1.TRACING_HEADER]:
|
|
146
|
+
[consts_1.TRACING_HEADER]: traceId || outbreakTrace?.context?.get(consts_1.TRACING_HEADER),
|
|
143
147
|
},
|
|
144
148
|
};
|
|
145
149
|
}
|
|
@@ -352,7 +356,10 @@ class RabbitMq {
|
|
|
352
356
|
const outbreakTrace = zehut_1.newTrace(zehut_1.traceTypes.RABBIT);
|
|
353
357
|
if (userId && enableRabbitTrace) {
|
|
354
358
|
try {
|
|
355
|
-
await
|
|
359
|
+
await Promise.all([
|
|
360
|
+
zehut_1.createOrSetRabbitTrace(trace, userId),
|
|
361
|
+
zehut_1.createOrSetRabbitTrace(outbreakTrace, userId),
|
|
362
|
+
]);
|
|
356
363
|
}
|
|
357
364
|
catch (e) {
|
|
358
365
|
logger_1.default.error('rabbit: failed to setRabbitTrace', { userId, e });
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -116,10 +116,14 @@ class RabbitMq implements IAfRabbitMq {
|
|
|
116
116
|
const user = trace?.context?.get(USER_OBJECT);
|
|
117
117
|
const traceId = trace?.context?.get(TRACING_HEADER);
|
|
118
118
|
const outbreakTrace = oubtreak.getCurrentContext();
|
|
119
|
+
const obj = Object.fromEntries(trace?.context);
|
|
120
|
+
const jsonString = JSON.stringify(obj);
|
|
119
121
|
logger.info('getPublishOptions', {
|
|
120
122
|
traceId,
|
|
121
123
|
user,
|
|
122
124
|
traceId2: outbreakTrace?.context?.get(TRACING_HEADER),
|
|
125
|
+
traceContextSize: trace?.context?.size,
|
|
126
|
+
jsonString,
|
|
123
127
|
});
|
|
124
128
|
return {
|
|
125
129
|
timestamp: moment().unix(),
|
|
@@ -127,7 +131,7 @@ class RabbitMq implements IAfRabbitMq {
|
|
|
127
131
|
creationTimestamp: moment().valueOf(),
|
|
128
132
|
...customHeaders,
|
|
129
133
|
[USER_TRACING_HEADER]: user?.id,
|
|
130
|
-
[TRACING_HEADER]:
|
|
134
|
+
[TRACING_HEADER]: traceId || outbreakTrace?.context?.get(TRACING_HEADER),
|
|
131
135
|
},
|
|
132
136
|
};
|
|
133
137
|
}
|
|
@@ -496,7 +500,10 @@ class RabbitMq implements IAfRabbitMq {
|
|
|
496
500
|
const outbreakTrace = newTrace(traceTypes.RABBIT);
|
|
497
501
|
if (userId && enableRabbitTrace) {
|
|
498
502
|
try {
|
|
499
|
-
await
|
|
503
|
+
await Promise.all([
|
|
504
|
+
createOrSetRabbitTrace(trace, userId),
|
|
505
|
+
createOrSetRabbitTrace(outbreakTrace, userId),
|
|
506
|
+
]);
|
|
500
507
|
} catch (e) {
|
|
501
508
|
logger.error('rabbit: failed to setRabbitTrace', { userId, e });
|
|
502
509
|
await this.nack(channel, queue, optionsWithDefaults, { messageTtl: deadMessageTtl }, msg, releaseLock)(msg);
|