@diia-inhouse/diia-queue 14.0.13 → 14.0.14

package/dist/interfaces/queueConfig/configs.d.ts

@@ -32,6 +32,11 @@ type QueueConfigByQueueName = { [k in QueueName]: {
   topics: ExchangeName[];
 } };
 type QueueConfig = Record<QueueConfigType.Internal, QueueConfigByQueueName>;
+/**
+* Under QueueConfigType.External, each key is auto-prefixed
+* with 'TopicExternal' to form the broker exchange name (e.g.
+* 'Auth' → 'TopicExternalAuth'). See ExternalEventBus.
+*/
 type TopicConfigByConfigType = { [k in ExchangeName]: {
   events: EventName[];
 } };

package/dist/services/eventMessageHandler.d.ts

@@ -21,7 +21,7 @@ declare class EventMessageHandler {
   private getServiceCode;
   private prepareQueueMessageError;
   private resolveTraceId;
-  private extractTraceparentTraceId;
+  private toPropagationCarrier;
 }
 //#endregion
 export { EventMessageHandler };

package/dist/services/eventMessageHandler.js

@@ -2,7 +2,7 @@ import { NackOptions } from "../interfaces/providers/rabbitmq/index.js";
 import "../interfaces/index.js";
 import { ApiError, ValidationError } from "@diia-inhouse/errors";
 import { randomBytes } from "node:crypto";
-import { isValidTraceId, trace } from "@opentelemetry/api";
+import { context, isValidTraceId, propagation, trace } from "@opentelemetry/api";
 import { utils } from "@diia-inhouse/utils";
 //#region src/services/eventMessageHandler.ts
 var EventMessageHandler = class {
@@ -107,17 +107,20 @@ var EventMessageHandler = class {
 		};
 	}
 	resolveTraceId(properties) {
-		const extractedTraceId = this.extractTraceparentTraceId(properties.headers?.traceparent);
+		const carrier = this.toPropagationCarrier(properties.headers);
+		const extractedTraceId = trace.getSpan(propagation.extract(context.active(), carrier))?.spanContext().traceId ?? "";
 		if (isValidTraceId(extractedTraceId)) return extractedTraceId;
 		const activeSpanTraceId = trace.getActiveSpan()?.spanContext().traceId ?? "";
 		if (isValidTraceId(activeSpanTraceId)) return activeSpanTraceId;
 		return properties.headers?.traceId || randomBytes(16).toString("hex");
 	}
-	extractTraceparentTraceId(raw) {
-		if (raw === void 0 || raw === null) return "";
-		const [version, traceId] = (Buffer.isBuffer(raw) ? raw.toString("utf8") : raw).split("-");
-		if (version !== "00" || !traceId) return "";
-		return isValidTraceId(traceId) ? traceId : "";
+	toPropagationCarrier(headers) {
+		const carrier = {};
+		for (const [key, value] of Object.entries(headers ?? {})) {
+			if (value === void 0 || value === null) continue;
+			carrier[key] = Buffer.isBuffer(value) ? value.toString("utf8") : String(value);
+		}
+		return carrier;
 	}
 };
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@diia-inhouse/diia-queue",
-    "version": "14.0.13",
+    "version": "14.0.14",
     "type": "module",
     "description": "Package provide queue functionality",
     "main": "dist/index.js",