@rsdk/http.server 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/http.server
+
 ## [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/http.server

package/dist/http-adapter/abstract-rsdk-http-adapter.d.ts

@@ -3,10 +3,11 @@ import type { Controller, INestApplication } from '@nestjs/common/interfaces';
 import type { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import type { AbstractHttpAdapter } from '@nestjs/core';
 import type { Constructor, DeepPartial } from '@rsdk/common';
-import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, NestModuleDefinitions } from '@rsdk/core';
+import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, NestModuleDefinitions, ProtocolTracingHeadersExtractor } from '@rsdk/core';
 import { HttpConfig } from '../http.config';
 import type { SwaggerOptions } from '../http.transport';
 export declare abstract class AbstractRsdkHttpTransport implements IHttpTransport {
+    getHeaderExtractor(): ProtocolTracingHeadersExtractor;
     abstract readonly options?: {
         cors?: CorsOptions;
         globalPrefix?: string;

package/dist/http-adapter/abstract-rsdk-http-adapter.js

@@ -9,8 +9,18 @@ const node_fs_1 = require("node:fs");
 const controllers_1 = require("../controllers");
 const error_handling_1 = require("../error-handling");
 const http_config_1 = require("../http.config");
+const http_headers_1 = require("../http.headers");
 const http_logger_interceptor_1 = require("../http-logger.interceptor");
 class AbstractRsdkHttpTransport {
+    getHeaderExtractor() {
+        return {
+            extract(executionContext) {
+                // TODO:
+                const req = executionContext.switchToHttp().getRequest();
+                return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders(req);
+            },
+        };
+    }
     matchByContext(ctx) {
         return ctx.getType() === 'http';
     }

package/dist/http-adapter/abstract-rsdk-http-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-rsdk-http-adapter.js","sourceRoot":"","sources":["../../src/http-adapter/abstract-rsdk-http-adapter.ts"],"names":[],"mappings":";;;AAIA,uCAA+C;AAC/C,6CAAgD;AAChD,4EAAmG;AAWnG,qCAAoE;AACpE,qCAAwC;AAExC,gDAA6E;AAC7E,sDAI2B;AAC3B,gDAA4C;AAE5C,wEAAmE;AAEnE,MAAsB,yBAAyB;IAoB7C,cAAc,CAAC,GAAqB;QAClC,OAAO,GAAG,CAAC,OAAO,EAAE,KAAK,MAAM,CAAC;IAClC,CAAC;IAED,OAAO;QACL,OAAO;YACL;gBACE,MAAM,EAAE,yBAAgC;gBACxC,SAAS,EAAE;oBACT;wBACE,OAAO,EAAE,sBAAe;wBACxB,QAAQ,EAAE,+CAAqB;qBAChC;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAED,kBAAkB;QAChB,OAAO,IAAI,oCAAmB,EAAE,CAAC;IACnC,CAAC;IAED,eAAe;QACb,OAAO,IAAI,iCAAgB,EAAE,CAAC;IAChC,CAAC;IAED,oBAAoB;QAClB,OAAO,CAAC,IAAI,sCAAqB,EAAE,CAAC,CAAC;IACvC,CAAC;IAED,WAAW;QACT,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,mBAAmB;QACjB,OAAO,kCAAoB,CAAC;IAC9B,CAAC;IAED,oBAAoB;QAClB,OAAO,mCAAqB,CAAC;IAC/B,CAAC;IAED,iBAAiB,CAAC,aAA4B;QAC5C,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC;QAEzD,OAAO;YACL,IAAI;YACJ,IAAI;SACL,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,aAA4B;QACxC,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC,CAAC;IACnE,CAAC;IAED,YAAY,CACV,GAAqB,EACrB,aAA4B;QAE5B,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,wBAAU,CAAC,CAAC;QACxD,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;QAC3D,IAAI,YAAY,EAAE,CAAC;YACjB,GAAG,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,IAAI,EAAE,CAAC;YACT,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,SAAS,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,IAAI,kCAAuB,EAAE;iBAC1C,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,eAAQ,CAAC,CAAC;iBAC3B,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,kBAAW,CAAC,CAAC;iBAChC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAe,CAAC,CAAC,CAAC;YAE5C,6CAA6C;YAC7C,OAAO,EAAE,SAAS,EAAE,CAAC,OAAO,CAAC,CAAC;YAE9B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,uBAAa,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;YAE9D,IAAI,OAAO,EAAE,IAAI,EAAE,CAAC;gBAClB,IAAA,uBAAa,EAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACd,uBAAa,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,UAAU,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;IACH,CAAC;CAGF;AA/GD,8DA+GC"}
+{"version":3,"file":"abstract-rsdk-http-adapter.js","sourceRoot":"","sources":["../../src/http-adapter/abstract-rsdk-http-adapter.ts"],"names":[],"mappings":"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"}

package/dist/http.headers.d.ts

@@ -0,0 +1,23 @@
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+/**
+ * @description хелпер для нормализованного извлечения заголовков из http запроса
+ */
+export declare class HttpHeaders {
+    private headers;
+    constructor(headers: Record<string, string>);
+    get<K extends string>(key: MaybeReadonlyArray<K>): Record<K, string | undefined>;
+    get(key: string): string | undefined;
+    getTracingHeaders(req: any): TracingHeaders;
+    getHeaders(req: any): {
+        'x-b3-parentspanid'?: string;
+        'x-b3-spanid'?: string;
+        'x-b3-traceid'?: string;
+        attributes: {
+            [p: string]: any;
+        };
+        'x-requestid'?: string;
+        spanName: string;
+    };
+    private normalizedHeaders;
+}

package/dist/http.headers.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpHeaders = void 0;
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const types_1 = require("@rsdk/core/dist/tracing/types");
+/**
+ * @description хелпер для нормализованного извлечения заголовков из http запроса
+ */
+class HttpHeaders {
+    headers;
+    constructor(headers) {
+        this.headers = headers;
+        this.normalizedHeaders = Object.fromEntries(Object.entries(headers).map(([k, v]) => [k.toLowerCase(), v]));
+    }
+    get(key) {
+        if (Array.isArray(key)) {
+            return Object.fromEntries(key.map((k) => [k, this.get(k)]));
+        }
+        return this.normalizedHeaders[key.toLowerCase()];
+    }
+    getTracingHeaders(req) {
+        return new types_1.TracingHeaders(this.getHeaders(req));
+    }
+    getHeaders(req) {
+        const httpRoute = req.route?.path ||
+            req.routeOptions?.url ||
+            req.routerPath ||
+            req.originalUrl;
+        const headers = this.get(types_1.tracingHeaders);
+        return {
+            spanName: req.method + ' ' + httpRoute,
+            ...headers,
+            attributes: {
+                [semantic_conventions_1.SemanticAttributes.HTTP_METHOD]: req.method,
+                [semantic_conventions_1.SemanticAttributes.HTTP_ROUTE]: httpRoute,
+                [semantic_conventions_1.SemanticAttributes.HTTP_URL]: req.originalUrl || req.url,
+            },
+        };
+    }
+    normalizedHeaders;
+}
+exports.HttpHeaders = HttpHeaders;
+//# sourceMappingURL=http.headers.js.map

package/dist/http.headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../src/http.headers.ts"],"names":[],"mappings":";;;AAAA,8EAAyE;AAEzE,yDAIuC;AAEvC;;GAEG;AACH,MAAa,WAAW;IACF;IAApB,YAAoB,OAA+B;QAA/B,YAAO,GAAP,OAAO,CAAwB;QACjD,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CACzC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,CAC9D,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,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAE,GAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,iBAAiB,CAAC,GAAQ;QACxB,OAAO,IAAI,sBAAc,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,UAAU,CAAC,GAAQ;QAQjB,MAAM,SAAS,GACb,GAAG,CAAC,KAAK,EAAE,IAAI;YACf,GAAG,CAAC,YAAY,EAAE,GAAG;YACrB,GAAG,CAAC,UAAU;YACd,GAAG,CAAC,WAAW,CAAC;QAClB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,sBAAc,CAAqB,CAAC;QAE7D,OAAO;YACL,QAAQ,EAAE,GAAG,CAAC,MAAO,GAAG,GAAG,GAAG,SAAS;YACvC,GAAG,OAAO;YACV,UAAU,EAAE;gBACV,CAAC,yCAAkB,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,MAAO;gBAC7C,CAAC,yCAAkB,CAAC,UAAU,CAAC,EAAE,SAAS;gBAC1C,CAAC,yCAAkB,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,GAAG;aAC1D;SACF,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAyB;CACnD;AArDD,kCAqDC"}

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

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

package/dist/http.tracing-extractor.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpTracingExtractor = void 0;
+const http_headers_1 = require("./http.headers");
+class HttpTracingExtractor {
+    extract(executionContext) {
+        // TODO:
+        const req = executionContext.switchToHttp().getRequest();
+        return new http_headers_1.HttpHeaders(req.headers).getTracingHeaders(req);
+    }
+}
+exports.HttpTracingExtractor = HttpTracingExtractor;
+//# sourceMappingURL=http.tracing-extractor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"http.tracing-extractor.js","sourceRoot":"","sources":["../src/http.tracing-extractor.ts"],"names":[],"mappings":";;;AAIA,iDAA6C;AAE7C,MAAa,oBAAoB;IAC/B,OAAO,CAAC,gBAA+B;QACrC,QAAQ;QACR,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,CAAC,UAAU,EAAO,CAAC;QAE9D,OAAO,IAAI,0BAAW,CACpB,GAAG,CAAC,OAAiC,CACtC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF;AATD,oDASC"}

package/dist/http.transport.d.ts

@@ -4,7 +4,7 @@ import type { CorsOptions } from '@nestjs/common/interfaces/external/cors-option
 import type { AbstractHttpAdapter } from '@nestjs/core';
 import { DocumentBuilder as OriginalDocumentBuilder } from '@nestjs/swagger';
 import type { Constructor, DeepPartial } from '@rsdk/common';
-import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport } from '@rsdk/core';
+import type { ConfigContext, HttpOptions, IErrorsFormatter, IErrorsSender, IErrorsTransformer, IHttpTransport, ProtocolTracingHeadersExtractor } from '@rsdk/core';
 export interface ParsersConfig {
     body: {
         json: boolean;
@@ -30,6 +30,7 @@ export interface HttpTransportOptions {
 export declare class HttpTransport implements IHttpTransport {
     private readonly adapter;
     private readonly options;
+    getHeaderExtractor(): ProtocolTracingHeadersExtractor;
     constructor(adapter: AbstractHttpAdapter, options?: HttpTransportOptions);
     matchByContext(ctx: ExecutionContext): boolean;
     getProtocol(): string;

package/dist/http.transport.js

@@ -13,12 +13,16 @@ const node_fs_1 = require("node:fs");
 const controllers_1 = require("./controllers");
 const error_handling_1 = require("./error-handling");
 const http_config_1 = require("./http.config");
+const http_tracing_extractor_1 = require("./http.tracing-extractor");
 /**
  * @deprecated use concrete implementation from @rsdk/http.server.<implementation>, example: @rsdk/http.server.{express,fastify}
  */
 class HttpTransport {
     adapter;
     options;
+    getHeaderExtractor() {
+        return new http_tracing_extractor_1.HttpTracingExtractor();
+    }
     constructor(adapter, options = {}) {
         this.adapter = adapter;
         this.options = options;

package/dist/http.transport.js.map

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

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export { AbstractRsdkHttpTransport } from './http-adapter/abstract-rsdk-http-adapter';
 export * from './http.transport';
+export { HttpHeaders } from './http.headers';

package/dist/index.js

@@ -14,8 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractRsdkHttpTransport = void 0;
+exports.HttpHeaders = exports.AbstractRsdkHttpTransport = void 0;
 var abstract_rsdk_http_adapter_1 = require("./http-adapter/abstract-rsdk-http-adapter");
 Object.defineProperty(exports, "AbstractRsdkHttpTransport", { enumerable: true, get: function () { return abstract_rsdk_http_adapter_1.AbstractRsdkHttpTransport; } });
 __exportStar(require("./http.transport"), exports);
+var http_headers_1 = require("./http.headers");
+Object.defineProperty(exports, "HttpHeaders", { enumerable: true, get: function () { return http_headers_1.HttpHeaders; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wFAAsF;AAA7E,uIAAA,yBAAyB,OAAA;AAElC,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wFAAsF;AAA7E,uIAAA,yBAAyB,OAAA;AAElC,mDAAiC;AACjC,+CAA6C;AAApC,2GAAA,WAAW,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/http.server",
-  "version": "4.2.4",
+  "version": "4.3.0-next.0",
   "description": "HTTP transport for rsdk apps (needs some of HTTP adapters)",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -14,13 +14,14 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/swagger": "^7.0.0",
-    "@rsdk/common": "^4.2.4",
-    "@rsdk/core": "^4.2.4",
-    "@rsdk/logging": "^4.2.4",
+    "@opentelemetry/semantic-conventions": "1.18.1",
+    "@rsdk/common": "^4.3.0-next.0",
+    "@rsdk/core": "^4.3.0-next.0",
+    "@rsdk/logging": "^4.3.0-next.0",
     "body-parser": "^1.20.1",
     "cookie-parser": "^1.4.6",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "cf72bfa9b31f49827d069de835cde28478f7a395"
+  "gitHead": "68619cc6fc60db01568eede7df182d9882e857dd"
 }

package/src/http-adapter/abstract-rsdk-http-adapter.ts

@@ -1,4 +1,4 @@
-import type { ExecutionContext } from '@nestjs/common';
+import type { ArgumentsHost, ExecutionContext } from '@nestjs/common';
 import type { Controller, INestApplication } from '@nestjs/common/interfaces';
 import type { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
 import type { AbstractHttpAdapter } from '@nestjs/core';
@@ -14,8 +14,10 @@ import type {
   IErrorsTransformer,
   IHttpTransport,
   NestModuleDefinitions,
+  ProtocolTracingHeadersExtractor,
 } from '@rsdk/core';
 import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
+import type { TracingHeaders } from '@rsdk/core/dist/tracing/types';
 import { writeFileSync } from 'node:fs';
 
 import { HealthHttpController, MetricsHttpController } from '../controllers';
@@ -25,10 +27,24 @@ import {
   HttpErrorsTransformer,
 } from '../error-handling';
 import { HttpConfig } from '../http.config';
+import { HttpHeaders } from '../http.headers';
 import type { SwaggerOptions } from '../http.transport';
 import { HttpLoggerInterceptor } from '../http-logger.interceptor';
 
 export abstract class AbstractRsdkHttpTransport implements IHttpTransport {
+  getHeaderExtractor(): ProtocolTracingHeadersExtractor {
+    return {
+      extract(executionContext: ArgumentsHost): TracingHeaders {
+        // TODO:
+        const req = executionContext.switchToHttp().getRequest<any>();
+
+        return new HttpHeaders(
+          req.headers as Record<string, string>,
+        ).getTracingHeaders(req);
+      },
+    };
+  }
+
   abstract readonly options?: {
     // CORS middleware options
     cors?: CorsOptions;

package/src/http.headers.ts

@@ -0,0 +1,65 @@
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+import {
+  type Headers,
+  TracingHeaders,
+  tracingHeaders,
+} from '@rsdk/core/dist/tracing/types';
+
+/**
+ * @description хелпер для нормализованного извлечения заголовков из http запроса
+ */
+export class HttpHeaders {
+  constructor(private headers: Record<string, string>) {
+    this.normalizedHeaders = Object.fromEntries(
+      Object.entries(headers).map(([k, v]) => [k.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)]));
+    }
+    return this.normalizedHeaders[(key as string).toLowerCase()];
+  }
+
+  getTracingHeaders(req: any): TracingHeaders {
+    return new TracingHeaders(this.getHeaders(req));
+  }
+
+  getHeaders(req: any): {
+    'x-b3-parentspanid'?: string;
+    'x-b3-spanid'?: string;
+    'x-b3-traceid'?: string;
+    attributes: { [p: string]: any };
+    'x-requestid'?: string;
+    spanName: string;
+  } {
+    const httpRoute =
+      req.route?.path ||
+      req.routeOptions?.url ||
+      req.routerPath ||
+      req.originalUrl;
+    const headers = this.get(tracingHeaders) as Partial<Headers>;
+
+    return {
+      spanName: req.method! + ' ' + httpRoute,
+      ...headers,
+      attributes: {
+        [SemanticAttributes.HTTP_METHOD]: req.method!,
+        [SemanticAttributes.HTTP_ROUTE]: httpRoute,
+        [SemanticAttributes.HTTP_URL]: req.originalUrl || req.url,
+      },
+    };
+  }
+
+  private normalizedHeaders: Record<string, string>;
+}

package/src/http.tracing-extractor.ts

@@ -0,0 +1,16 @@
+import type { ArgumentsHost } from '@nestjs/common';
+import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import type { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+
+import { HttpHeaders } from './http.headers';
+
+export class HttpTracingExtractor implements ProtocolTracingHeadersExtractor {
+  extract(executionContext: ArgumentsHost): TracingHeaders {
+    // TODO:
+    const req = executionContext.switchToHttp().getRequest<any>();
+
+    return new HttpHeaders(
+      req.headers as Record<string, string>,
+    ).getTracingHeaders(req);
+  }
+}

package/src/http.transport.ts

@@ -15,6 +15,7 @@ import type {
   IErrorsSender,
   IErrorsTransformer,
   IHttpTransport,
+  ProtocolTracingHeadersExtractor,
 } from '@rsdk/core';
 import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from '@rsdk/core';
 import { json, urlencoded } from 'body-parser';
@@ -28,6 +29,7 @@ import {
   HttpErrorsTransformer,
 } from './error-handling';
 import { HttpConfig } from './http.config';
+import { HttpTracingExtractor } from './http.tracing-extractor';
 
 export interface ParsersConfig {
   body: {
@@ -77,6 +79,10 @@ export interface HttpTransportOptions {
  * @deprecated use concrete implementation from @rsdk/http.server.<implementation>, example: @rsdk/http.server.{express,fastify}
  */
 export class HttpTransport implements IHttpTransport {
+  getHeaderExtractor(): ProtocolTracingHeadersExtractor {
+    return new HttpTracingExtractor();
+  }
+
   constructor(
     private readonly adapter: AbstractHttpAdapter,
     private readonly options: HttpTransportOptions = {},

package/src/index.ts

@@ -1,3 +1,4 @@
 export { AbstractRsdkHttpTransport } from './http-adapter/abstract-rsdk-http-adapter';
 
 export * from './http.transport';
+export { HttpHeaders } from './http.headers';