@rsdk/kafka.transport 4.2.4 → 4.3.0-next.0

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.5-next.0...v4.3.0-next.0) (2024-03-19)
+
+### Features
+
+* reworked cli system ([745ebf5](https://github.com/R-Vision/rsdk/commit/745ebf53635de135a4a9083f47ce833efe2d4411))
+
+## [4.2.5-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.4...v4.2.5-next.0) (2024-03-04)
+
+**Note:** Version bump only for package @rsdk/kafka.transport
+
 ## [4.2.4](https://github.com/R-Vision/rsdk/compare/v4.2.3...v4.2.4) (2024-02-28)
 
 **Note:** Version bump only for package @rsdk/kafka.transport

package/dist/decorators/consume.decorator.d.ts

@@ -1,2 +1,2 @@
 import type { EventType } from '@rsdk/kafka.common';
-export declare const Consume: <T>(eventType: string | EventType<T>) => MethodDecorator;
+export declare const Consume: <T>(eventType: EventType<T> | string) => MethodDecorator;

package/dist/kafka.headers.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="node" />
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+/**
+ * @description хелпер для нормализованного извлечения заголовков из kafka
+ */
+export declare class KafkaHeaders {
+    private headers;
+    constructor(headers: Record<string, string | Buffer | (string | Buffer)[] | undefined>);
+    get<K extends string>(key: MaybeReadonlyArray<K>): Record<K, string | undefined>;
+    get(key: string): string | undefined;
+    private normalizedHeaders;
+}

package/dist/kafka.headers.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KafkaHeaders = void 0;
+/**
+ * @description хелпер для нормализованного извлечения заголовков из kafka
+ */
+class KafkaHeaders {
+    headers;
+    constructor(headers) {
+        this.headers = headers;
+        this.normalizedHeaders = Object.fromEntries(Object.entries(this.headers).map(([k, v]) => [
+            Array.isArray(k)
+                ? k[0].toString().toLowerCase()
+                : k.toString().toLowerCase(),
+            v,
+        ]));
+    }
+    get(key) {
+        if (Array.isArray(key)) {
+            return Object.fromEntries(key.map((k) => [k, this.get(k)]));
+        }
+        return this.normalizedHeaders[key.toLowerCase()];
+    }
+    normalizedHeaders;
+}
+exports.KafkaHeaders = KafkaHeaders;
+//# sourceMappingURL=kafka.headers.js.map

package/dist/kafka.headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kafka.headers.js","sourceRoot":"","sources":["../src/kafka.headers.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,MAAa,YAAY;IAEb;IADV,YACU,OAGP;QAHO,YAAO,GAAP,OAAO,CAGd;QAED,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;YAC3C,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE;gBAC/B,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE;YAC9B,CAAC;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAQD,GAAG,CACD,GAAwC;QAExC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAGzD,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAE,GAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEO,iBAAiB,CAAyB;CACnD;AApCD,oCAoCC"}

package/dist/kafka.tracing-extractor.d.ts

@@ -0,0 +1,6 @@
+import type { ArgumentsHost } from '@nestjs/common';
+import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+export declare class KafkaExtractor implements ProtocolTracingHeadersExtractor {
+    extract(ctx: ArgumentsHost): TracingHeaders;
+}

package/dist/kafka.tracing-extractor.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KafkaExtractor = void 0;
+const common_node_1 = require("@rsdk/common.node");
+const core_1 = require("@rsdk/core");
+const types_1 = require("@rsdk/core/dist/tracing/types");
+const patched_server_kafka_1 = require("./patched-server-kafka/patched-server-kafka");
+const kafka_headers_1 = require("./kafka.headers");
+class KafkaExtractor {
+    extract(ctx) {
+        const kafkaCtx = ctx.getArgByIndex(1);
+        if (!patched_server_kafka_1.PatchedServerKafka.isKafkaContext(kafkaCtx)) {
+            throw new core_1.InputException('Unexpected call with non kafka ArgumentHost');
+        }
+        const msg = kafkaCtx.getMessage();
+        const h = msg.headers;
+        if (!h) {
+            return new types_1.TracingHeaders({});
+        }
+        const headers = new kafka_headers_1.KafkaHeaders(h);
+        return new types_1.TracingHeaders({
+            ...(0, common_node_1.omitUndefined)(headers.get(types_1.tracingHeaders)),
+        });
+    }
+}
+exports.KafkaExtractor = KafkaExtractor;
+//# sourceMappingURL=kafka.tracing-extractor.js.map

package/dist/kafka.tracing-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"kafka.tracing-extractor.js","sourceRoot":"","sources":["../src/kafka.tracing-extractor.ts"],"names":[],"mappings":";;;AACA,mDAAkD;AAElD,qCAA4C;AAC5C,yDAA+E;AAE/E,sFAAiF;AACjF,mDAA+C;AAE/C,MAAa,cAAc;IACzB,OAAO,CAAC,GAAkB;QACxB,MAAM,QAAQ,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,CAAC,yCAAkB,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjD,MAAM,IAAI,qBAAc,CAAC,6CAA6C,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC;QACtB,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,IAAI,sBAAc,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,4BAAY,CAAC,CAAC,CAAC,CAAC;QAEpC,OAAO,IAAI,sBAAc,CAAC;YACxB,GAAG,IAAA,2BAAa,EAAC,OAAO,CAAC,GAAG,CAAC,sBAAc,CAAC,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC;CACF;AAjBD,wCAiBC"}

package/dist/kafka.transport.d.ts

@@ -1,6 +1,6 @@
 import type { ExecutionContext } from '@nestjs/common';
 import type { MicroserviceOptions } from '@nestjs/microservices';
-import type { ConfigContext, IErrorsFormatter, IErrorsTransformer, IMicroserviceTransport, NestModuleDefinitions } from '@rsdk/core';
+import type { ConfigContext, IErrorsFormatter, IErrorsTransformer, IMicroserviceTransport, NestModuleDefinitions, ProtocolTracingHeadersExtractor } from '@rsdk/core';
 export interface KafkaTransportOptions {
     autoCommit?: boolean;
     /**
@@ -33,6 +33,7 @@ export declare class KafkaTransport implements IMicroserviceTransport {
     private logger;
     private brokers?;
     constructor(options?: KafkaTransportOptions | undefined);
+    getHeaderExtractor(): Omit<ProtocolTracingHeadersExtractor, 'protocol'>;
     matchByContext(ctx: ExecutionContext): boolean;
     modules(): NestModuleDefinitions;
     createMicroserviceOptions(): MicroserviceOptions;

package/dist/kafka.transport.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KafkaTransport = void 0;
-const microservices_1 = require("@nestjs/microservices");
 const kafka_interface_1 = require("@nestjs/microservices/external/kafka.interface");
 const core_1 = require("@rsdk/core");
 const kafka_common_1 = require("@rsdk/kafka.common");
 const logging_1 = require("@rsdk/logging");
 const kafka_transport_module_1 = require("./module/kafka-transport.module");
 const patched_server_kafka_1 = require("./patched-server-kafka/patched-server-kafka");
+const kafka_tracing_extractor_1 = require("./kafka.tracing-extractor");
 const kafka_errors_formatter_1 = require("./kafka-errors.formatter");
 // TODO: JsDoc
 class KafkaTransport {
@@ -17,9 +17,12 @@ class KafkaTransport {
     constructor(options) {
         this.options = options;
     }
+    getHeaderExtractor() {
+        return new kafka_tracing_extractor_1.KafkaExtractor();
+    }
     matchByContext(ctx) {
         const maybeKafkaContext = ctx.getArgByIndex(1);
-        return maybeKafkaContext instanceof microservices_1.KafkaContext;
+        return patched_server_kafka_1.PatchedServerKafka.isKafkaContext(maybeKafkaContext);
     }
     modules() {
         return [kafka_transport_module_1.KafkaTransportModule];

package/dist/kafka.transport.js.map

@@ -1 +1 @@
-{"version":3,"file":"kafka.transport.js","sourceRoot":"","sources":["../src/kafka.transport.ts"],"names":[],"mappings":";;;AAEA,yDAAqD;AACrD,oFAA0E;AAQ1E,qCAAsC;AACtC,qDAI4B;AAC5B,2CAA8C;AAE9C,4EAAuE;AACvE,sFAAiF;AACjF,qEAAgE;AAiChE,cAAc;AACd,MAAa,cAAc;IAII;IAHrB,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9C,OAAO,CAAY;IAE3B,YAA6B,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAEhE,cAAc,CAAC,GAAqB;QAClC,MAAM,iBAAiB,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAE/C,OAAO,iBAAiB,YAAY,4BAAY,CAAC;IACnD,CAAC;IAED,OAAO;QACL,OAAO,CAAC,6CAAoB,CAAC,CAAC;IAChC,CAAC;IAED,yBAAyB;QACvB,qDAAqD;QACrD,MAAM,EAAE,IAAI,EAAE,GAAG,eAAQ,CAAC,OAAO,EAAE,CAAC;QAEpC,OAAO;YACL,QAAQ,EAAE,IAAI,yCAAkB,CAAC;gBAC/B,MAAM,EAAE;oBACN,kDAAkD;oBAClD,OAAO,EAAE,IAAI,CAAC,OAAQ;oBACtB,QAAQ,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE;oBAClC,UAAU,EAAE,IAAA,kCAAmB,EAC7B,uBAAa,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAC5C;oBACD,QAAQ,EAAE,0BAAQ,CAAC,KAAK;oBACxB,KAAK,EAAE,+BAAgB;iBACxB;gBACD,QAAQ,EAAE;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,OAAO,EAAE,IAAI;oBACb,KAAK,EAAE,+BAAgB;iBACxB;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;iBACjB;gBACD,QAAQ,EAAE;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,KAAK,EAAE,+BAAgB;iBACxB;gBACD,GAAG,EAAE;oBACH,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI;oBAC5C,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,KAAK,SAAS,IAAI;wBAChE,8BAA8B,EAC5B,IAAI,CAAC,OAAO,EAAE,8BAA8B;qBAC/C,CAAC;iBACH;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,aAA4B;QAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,0BAAW,CAAC,CAAC;QAEvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,OAAO;QACL,kDAAkD;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,OAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,6CAAoB,EAAE,CAAC;IACpC,CAAC;IAED,oBAAoB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA7ED,wCA6EC"}
+{"version":3,"file":"kafka.transport.js","sourceRoot":"","sources":["../src/kafka.transport.ts"],"names":[],"mappings":";;;AAEA,oFAA0E;AAS1E,qCAAsC;AACtC,qDAI4B;AAC5B,2CAA8C;AAE9C,4EAAuE;AACvE,sFAAiF;AACjF,uEAA2D;AAC3D,qEAAgE;AAiChE,cAAc;AACd,MAAa,cAAc;IAII;IAHrB,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC9C,OAAO,CAAY;IAE3B,YAA6B,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;IAAG,CAAC;IAEhE,kBAAkB;QAChB,OAAO,IAAI,wCAAc,EAAE,CAAC;IAC9B,CAAC;IAED,cAAc,CAAC,GAAqB;QAClC,MAAM,iBAAiB,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAE/C,OAAO,yCAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL,OAAO,CAAC,6CAAoB,CAAC,CAAC;IAChC,CAAC;IAED,yBAAyB;QACvB,qDAAqD;QACrD,MAAM,EAAE,IAAI,EAAE,GAAG,eAAQ,CAAC,OAAO,EAAE,CAAC;QAEpC,OAAO;YACL,QAAQ,EAAE,IAAI,yCAAkB,CAAC;gBAC/B,MAAM,EAAE;oBACN,kDAAkD;oBAClD,OAAO,EAAE,IAAI,CAAC,OAAQ;oBACtB,QAAQ,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE;oBAClC,UAAU,EAAE,IAAA,kCAAmB,EAC7B,uBAAa,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAC5C;oBACD,QAAQ,EAAE,0BAAQ,CAAC,KAAK;oBACxB,KAAK,EAAE,+BAAgB;iBACxB;gBACD,QAAQ,EAAE;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,OAAO,EAAE,IAAI;oBACb,KAAK,EAAE,+BAAgB;iBACxB;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE,IAAI;iBACjB;gBACD,QAAQ,EAAE;oBACR,sBAAsB,EAAE,KAAK;oBAC7B,KAAK,EAAE,+BAAgB;iBACxB;gBACD,GAAG,EAAE;oBACH,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,UAAU,IAAI,IAAI;oBAC5C,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,8BAA8B,KAAK,SAAS,IAAI;wBAChE,8BAA8B,EAC5B,IAAI,CAAC,OAAO,EAAE,8BAA8B;qBAC/C,CAAC;iBACH;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,aAA4B;QAC/B,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,0BAAW,CAAC,CAAC;QAEvD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,OAAO;QACL,kDAAkD;QAClD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,OAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,WAAW;QACT,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,6CAAoB,EAAE,CAAC;IACpC,CAAC;IAED,oBAAoB;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAjFD,wCAiFC"}

package/dist/patched-server-kafka/patched-server-kafka.d.ts

@@ -1,5 +1,5 @@
-import type { ConsumerDeserializer, KafkaContext, MessageHandler, MsPattern, ReadPacket } from '@nestjs/microservices';
-import { ServerKafka } from '@nestjs/microservices';
+import type { ConsumerDeserializer, MessageHandler, MsPattern, ReadPacket } from '@nestjs/microservices';
+import { KafkaContext, ServerKafka } from '@nestjs/microservices';
 import type { EachMessagePayload } from '@nestjs/microservices/external/kafka.interface';
 import type { EventType } from '@rsdk/kafka.common';
 import type { Consumer } from 'kafkajs';
@@ -10,6 +10,7 @@ export declare class PatchedServerKafka extends ServerKafka {
     protected deserializer: ConsumerDeserializer & {
         events: Map<string, EventType>;
     };
+    static isKafkaContext(maybeKafkaContext: unknown): maybeKafkaContext is KafkaContext;
     private topics;
     addHandler(pattern: any, callback: MessageHandler, isEventHandler?: boolean, extras?: Record<string, any>): void;
     bindEvents(consumer: Consumer): Promise<void>;

package/dist/patched-server-kafka/patched-server-kafka.js

@@ -9,6 +9,9 @@ const events_deserializer_1 = require("./events.deserializer");
  * Patches default ServerKafka routing and deserialization logic.
  */
 class PatchedServerKafka extends microservices_1.ServerKafka {
+    static isKafkaContext(maybeKafkaContext) {
+        return maybeKafkaContext instanceof microservices_1.KafkaContext;
+    }
     topics = new Set();
     // TODO JSDOC
     addHandler(pattern, callback, isEventHandler = false, extras = {}) {

package/dist/patched-server-kafka/patched-server-kafka.js.map

@@ -1 +1 @@
-{"version":3,"file":"patched-server-kafka.js","sourceRoot":"","sources":["../../src/patched-server-kafka/patched-server-kafka.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"patched-server-kafka.js","sourceRoot":"","sources":["../../src/patched-server-kafka/patched-server-kafka.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/kafka.transport",
-  "version": "4.2.4",
+  "version": "4.3.0-next.0",
   "description": "Transport that consumes messages from kafka",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -14,16 +14,17 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@rsdk/core": "^4.2.4",
-    "@rsdk/kafka.common": "^4.2.4",
-    "@rsdk/logging": "^4.2.4",
-    "@rsdk/metadata": "^4.2.4",
+    "@rsdk/core": "^4.3.0-next.0",
+    "@rsdk/kafka.common": "^4.3.0-next.0",
+    "@rsdk/logging": "^4.3.0-next.0",
+    "@rsdk/metadata": "^4.3.0-next.0",
     "kafkajs": "^2.2.4",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
   "dependencies": {
+    "@rsdk/common.node": "^4.3.0-next.0",
     "lodash": "^4.17.21"
   },
-  "gitHead": "cf72bfa9b31f49827d069de835cde28478f7a395"
+  "gitHead": "68619cc6fc60db01568eede7df182d9882e857dd"
 }

package/src/kafka.headers.ts

@@ -0,0 +1,42 @@
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+
+/**
+ * @description хелпер для нормализованного извлечения заголовков из kafka
+ */
+export class KafkaHeaders {
+  constructor(
+    private headers: Record<
+      string,
+      string | Buffer | (string | Buffer)[] | undefined
+    >,
+  ) {
+    this.normalizedHeaders = Object.fromEntries(
+      Object.entries(this.headers).map(([k, v]) => [
+        Array.isArray(k)
+          ? k[0].toString().toLowerCase()
+          : k.toString().toLowerCase(),
+        v,
+      ]),
+    );
+  }
+
+  get<K extends string>(
+    key: MaybeReadonlyArray<K>,
+  ): Record<K, string | undefined>;
+
+  get(key: string): string | undefined;
+
+  get(
+    key: string | MaybeReadonlyArray<string>,
+  ): Record<string, string | undefined> | string | undefined {
+    if (Array.isArray(key)) {
+      return Object.fromEntries(key.map((k) => [k, this.get(k)])) as Record<
+        string,
+        any
+      >;
+    }
+    return this.normalizedHeaders[(key as string).toLowerCase()];
+  }
+
+  private normalizedHeaders: Record<string, string>;
+}

package/src/kafka.tracing-extractor.ts

@@ -0,0 +1,27 @@
+import type { ArgumentsHost } from '@nestjs/common';
+import { omitUndefined } from '@rsdk/common.node';
+import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import { InputException } from '@rsdk/core';
+import { TracingHeaders, tracingHeaders } from '@rsdk/core/dist/tracing/types';
+
+import { PatchedServerKafka } from './patched-server-kafka/patched-server-kafka';
+import { KafkaHeaders } from './kafka.headers';
+
+export class KafkaExtractor implements ProtocolTracingHeadersExtractor {
+  extract(ctx: ArgumentsHost): TracingHeaders {
+    const kafkaCtx = ctx.getArgByIndex(1);
+    if (!PatchedServerKafka.isKafkaContext(kafkaCtx)) {
+      throw new InputException('Unexpected call with non kafka ArgumentHost');
+    }
+    const msg = kafkaCtx.getMessage();
+    const h = msg.headers;
+    if (!h) {
+      return new TracingHeaders({});
+    }
+    const headers = new KafkaHeaders(h);
+
+    return new TracingHeaders({
+      ...omitUndefined(headers.get(tracingHeaders)),
+    });
+  }
+}

package/src/kafka.transport.ts

@@ -1,6 +1,5 @@
 import type { ExecutionContext } from '@nestjs/common';
 import type { MicroserviceOptions } from '@nestjs/microservices';
-import { KafkaContext } from '@nestjs/microservices';
 import { logLevel } from '@nestjs/microservices/external/kafka.interface';
 import type {
   ConfigContext,
@@ -8,6 +7,7 @@ import type {
   IErrorsTransformer,
   IMicroserviceTransport,
   NestModuleDefinitions,
+  ProtocolTracingHeadersExtractor,
 } from '@rsdk/core';
 import { Manifest } from '@rsdk/core';
 import {
@@ -19,6 +19,7 @@ import { LoggerFactory } from '@rsdk/logging';
 
 import { KafkaTransportModule } from './module/kafka-transport.module';
 import { PatchedServerKafka } from './patched-server-kafka/patched-server-kafka';
+import { KafkaExtractor } from './kafka.tracing-extractor';
 import { KafkaErrorsFormatter } from './kafka-errors.formatter';
 
 // TODO JsDoc
@@ -59,10 +60,14 @@ export class KafkaTransport implements IMicroserviceTransport {
 
   constructor(private readonly options?: KafkaTransportOptions) {}
 
+  getHeaderExtractor(): Omit<ProtocolTracingHeadersExtractor, 'protocol'> {
+    return new KafkaExtractor();
+  }
+
   matchByContext(ctx: ExecutionContext): boolean {
     const maybeKafkaContext = ctx.getArgByIndex(1);
 
-    return maybeKafkaContext instanceof KafkaContext;
+    return PatchedServerKafka.isKafkaContext(maybeKafkaContext);
   }
 
   modules(): NestModuleDefinitions {

package/src/patched-server-kafka/patched-server-kafka.ts

@@ -1,11 +1,10 @@
 import type {
   ConsumerDeserializer,
-  KafkaContext,
   MessageHandler,
   MsPattern,
   ReadPacket,
 } from '@nestjs/microservices';
-import { ServerKafka } from '@nestjs/microservices';
+import { KafkaContext, ServerKafka } from '@nestjs/microservices';
 import type {
   ConsumerSubscribeTopic,
   EachMessagePayload,
@@ -29,6 +28,12 @@ export class PatchedServerKafka extends ServerKafka {
     events: Map<string, EventType>;
   };
 
+  static isKafkaContext(
+    maybeKafkaContext: unknown,
+  ): maybeKafkaContext is KafkaContext {
+    return maybeKafkaContext instanceof KafkaContext;
+  }
+
   private topics: Set<string> = new Set();
 
   // TODO JSDOC