@rsdk/core 4.1.0 → 4.2.0-next.1

package/dist/tracing/services/trace.injector.js

@@ -5,9 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TraceInjector = void 0;
 const api_1 = require("@opentelemetry/api");
-const propagator_b3_1 = require("@opentelemetry/propagator-b3");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const common_1 = require("@rsdk/common");
 const decorators_1 = require("@rsdk/decorators");
 const logging_1 = require("@rsdk/logging");
@@ -55,139 +53,19 @@ class TraceInjector {
         }
         return 'data is undefined';
     }
-    static createWrapper(original, spanName, isTracingInterceptor) {
+    static createWrapper(original, spanName, _isTracingInterceptor) {
         return {
             [original.name](...args) {
                 const tracer = api_1.trace.getTracer('@rsdk/open-telemetry', '1.0.0');
-                const executionContext = args[0];
                 /**
                  * Переменный для хранения значений которые получаем для опен телеметрии
                  */
                 let traceId;
                 let spanId;
-                let parentSpanId;
-                /**
-                 * Этот флаг нужен для детекта первого входа и старта трейсинга, логика использования ниже в контексте
-                 */
-                let hasParentSpanId = false;
-                /**
-                 * Переменная для хранения Request/виртуального рекRequestвеста
-                 */
-                let req;
-                /**
-                 * Первый вход обычно происходит в глобальном интерцепторе
-                 * он оборачивается в некий свой интернал тип спана который и передает этот флаг isTracingInterceptor=true
-                 */
-                if (isTracingInterceptor) {
-                    if (executionContext.getType() === 'rpc') {
-                        const metadata = executionContext.switchToRpc().getContext();
-                        /**
-                         * Если мы пришли в GRPC и у нас есть методы для работы с Metadata
-                         * то мы конвертируем Metadata в некий виртуальный request с заголовками (заголовки выбраны как общий стандарт проброса мета информации)
-                         */
-                        if (metadata?.get) {
-                            req = {
-                                headers: {
-                                    /**
-                                     * Пробрасываем текущий трейс ид запроса
-                                     */
-                                    ...(metadata.get(propagator_b3_1.X_B3_TRACE_ID).length > 0
-                                        ? {
-                                            [propagator_b3_1.X_B3_TRACE_ID]: metadata.get(propagator_b3_1.X_B3_TRACE_ID)[0],
-                                        }
-                                        : {}),
-                                    /**
-                                     * Пробрасываем текущий спан ид, он нужен чтобы установить цепочку с парентами и могли видеть правильную вложенность в графане
-                                     */
-                                    ...(metadata.get(propagator_b3_1.X_B3_SPAN_ID).length > 0
-                                        ? {
-                                            [propagator_b3_1.X_B3_SPAN_ID]: metadata.get(propagator_b3_1.X_B3_SPAN_ID)[0],
-                                        }
-                                        : {}),
-                                    /**
-                                     * Вот это не обычная переменная, она нужна для определения общего входа и детекта рутового спан ид,
-                                     * эта переменная нужна для работы флага hasParentSpanId
-                                     */
-                                    ...(metadata.get(propagator_b3_1.X_B3_PARENT_SPAN_ID).length > 0
-                                        ? {
-                                            [propagator_b3_1.X_B3_PARENT_SPAN_ID]: metadata.get(propagator_b3_1.X_B3_PARENT_SPAN_ID)[0],
-                                        }
-                                        : {}),
-                                },
-                            };
-                        }
-                    }
-                    if (executionContext.getType() === 'http') {
-                        req = executionContext.switchToHttp().getRequest();
-                    }
-                    if (executionContext.getType() === 'graphql') {
-                        req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
-                        if (req.connectionInitReceived) {
-                            /**
-                             * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
-                             * и мы перегоняем эти данные в request заголовки
-                             */
-                            req.headers = {
-                                ...req?.headers,
-                                ...Object.entries(req?.connectionParams?.headers || {}).reduce((acc, [key, value]) => {
-                                    acc[key] = value;
-                                    return acc;
-                                }, {}),
-                            };
-                        }
-                    }
-                }
-                if (req?.headers) {
-                    /**
-                     * Мы приводим все ключи заголовков к одному **lower_case** регистру, так как у разных транспортов разные регистры в именовании ключей для заголовков
-                     */
-                    req.headers = {
-                        ...Object.entries(req.headers).reduce((acc, [key, value]) => {
-                            acc[key.toLowerCase()] =
-                                req.headers[key.toLowerCase()] || value;
-                            return acc;
-                        }, {}),
-                    };
-                    /**
-                     * Трейс ид - входящий рутовый идентификатор, он по всем цепочкам идет
-                     */
-                    traceId = req.headers[propagator_b3_1.X_B3_TRACE_ID];
-                    /**
-                     * Спан ид - идентификатор который нужен для построения цепочки вызовов
-                     */
-                    spanId = req.headers[propagator_b3_1.X_B3_SPAN_ID];
-                    /**
-                     * Флаг определяет находимся ли мы на рутовой позиции (самая первая точка входа)
-                     * определяется просто - если с клиента не передали заголовок X_B3_PARENT_SPAN_ID то значит мы в точке входа,
-                     * иначе мы являемся частью другой общей цепочки
-                     */
-                    hasParentSpanId = !!Object.getOwnPropertyDescriptor(req.headers, propagator_b3_1.X_B3_PARENT_SPAN_ID);
-                    /**
-                     * Идентификатор родительского спана - больше нужен для определения рутового состояния в различных кодах по опен телеметрии
-                     */
-                    parentSpanId = req.headers[propagator_b3_1.X_B3_PARENT_SPAN_ID];
-                }
-                if (isTracingInterceptor) {
-                    /**
-                     * Когда мы находимся в интерцепторе, то названием спана является название класса + метод интерцептора
-                     * мы перебиваем на название класса + метод который трекаем
-                     */
-                    spanName = TraceInjector.createSpanName(executionContext.getClass().name, executionContext.getHandler().name);
-                }
                 /**
                  * Создаем новый спан
                  */
                 const span = tracer.startSpan(spanName, {});
-                // path parentSpanId for correct link to parent span
-                if (isTracingInterceptor && hasParentSpanId && parentSpanId) {
-                    /**
-                     * Так как опентелеметрия ставит свой некий парент спан ид, то наш слетает
-                     * если мы работаем в рамках монолита то ничего не слетает
-                     * как только мы перемещаемся между приложениями - он слетает
-                     * чтобы иметь корректный парент спан ид - мы патчим его жестко (из коробки нельзя это сделать)
-                     */
-                    span.parentSpanId = parentSpanId;
-                }
                 /**
                  * После создания контекста ранее при входе в приложение, у нас новый спан ид
                  * мы перетираем значением которе получили через заголовок
@@ -203,15 +81,6 @@ class TraceInjector {
                 if (traceId) {
                     span.spanContext().traceId = traceId;
                 }
-                if (req?.headers) {
-                    /**
-                     * Обычно самая первая точка входа это фронтовый запрос, который содержит некие заголовки хттп
-                     * мы их кладем в рутовый спан
-                     */
-                    span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_METHOD, req.method);
-                    span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_URL, req.originalUrl || req.url);
-                    span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_ROUTE, req.route?.path || req.routeOptions?.url || req.routerPath);
-                }
                 /**
                  * Чтобы пробросить пропатченный спан нужно запустить две строчки ниже:
                  * 1) создаем контекст в котором активный спан перебиваем новым

package/dist/tracing/services/trace.injector.js.map

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

package/dist/tracing/tracing.interceptor.d.ts

@@ -1,9 +1,10 @@
 import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import type { Observable } from 'rxjs';
-/**
- * Интернал глобальный интерцептор для работы опентелеметрии
- * его поведение будет модифицировано в зависимости от включенного или выключенного состояния глобального трэйсинга
- */
 export declare class TracingInterceptor implements NestInterceptor {
-    intercept(_context: ExecutionContext, next: CallHandler): Observable<any>;
+    intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
+    private static extractTracingHeaders;
+    private static extractFromGraphql;
+    private static extractFromHttp;
+    private static extractFromRpc;
+    private static createRequestId;
 }

package/dist/tracing/tracing.interceptor.js

@@ -5,20 +5,105 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var TracingInterceptor_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TracingInterceptor = void 0;
 const common_1 = require("@nestjs/common");
-/**
- * Интернал глобальный интерцептор для работы опентелеметрии
- * его поведение будет модифицировано в зависимости от включенного или выключенного состояния глобального трэйсинга
- */
-let TracingInterceptor = class TracingInterceptor {
-    intercept(_context, next) {
+const propagator_b3_1 = require("@opentelemetry/propagator-b3");
+const common_node_1 = require("@rsdk/common.node");
+const node_crypto_1 = require("node:crypto");
+const request_id_provider_1 = require("./services/request-id.provider");
+const constants_1 = require("./constants");
+const grpc_headers_1 = require("./grpc.headers");
+const http_headers_1 = require("./http.headers");
+const tracingHeaders = [
+    constants_1.X_REQUEST_ID,
+    propagator_b3_1.X_B3_TRACE_ID,
+    propagator_b3_1.X_B3_SPAN_ID,
+    propagator_b3_1.X_B3_PARENT_SPAN_ID,
+];
+let TracingInterceptor = TracingInterceptor_1 = class TracingInterceptor {
+    intercept(context, next) {
+        const requestId = TracingInterceptor_1.extractTracingHeaders(context);
+        request_id_provider_1.RequestIdProvider.set(requestId[constants_1.X_REQUEST_ID]);
+        request_id_provider_1.OpenTelemetryProvider.set((0, common_node_1.omitUndefined)(requestId));
         return next.handle();
     }
+    static extractTracingHeaders(executionContext) {
+        /**
+         * В зависимости от типа контекста запускаем парсинг переданной Metadata
+         */
+        switch (executionContext.getType()) {
+            case 'rpc':
+                return this.extractFromRpc(executionContext);
+            case 'http':
+                return this.extractFromHttp(executionContext);
+            case 'graphql':
+                return this.extractFromGraphql(executionContext);
+        }
+        return {
+            [constants_1.X_REQUEST_ID]: this.createRequestId(),
+        };
+    }
+    static extractFromGraphql(executionContext) {
+        const req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
+        /**
+         * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
+         * и мы перегоняем эти данные в request заголовки
+         */
+        const headers = {
+            ...req?.headers,
+            ...req?.connectionParams?.headers,
+        };
+        const extractedHeaders = new http_headers_1.HttpHeaders(headers).get([
+            constants_1.X_REQUEST_ID,
+            propagator_b3_1.X_B3_TRACE_ID,
+            propagator_b3_1.X_B3_SPAN_ID,
+        ]);
+        const h = extractedHeaders;
+        h.http = {
+            httpMethod: req.method,
+            httpRoute: req.route?.path || req.routeOptions?.url || req.routerPath,
+            httpUrl: req.originalUrl || req.url,
+        };
+        h[constants_1.X_REQUEST_ID] ??= (0, node_crypto_1.randomUUID)();
+        return h;
+    }
+    static extractFromHttp(executionContext) {
+        // TODO:
+        const req = executionContext.switchToHttp().getRequest();
+        const headers = new http_headers_1.HttpHeaders(req.headers).get(tracingHeaders);
+        const h = headers;
+        h[constants_1.X_REQUEST_ID] ??= (0, node_crypto_1.randomUUID)();
+        h.http = {
+            httpMethod: req.method,
+            httpRoute: req.route?.path || req.routeOptions?.url || req.routerPath,
+            httpUrl: req.originalUrl || req.url,
+        };
+        return headers;
+    }
+    static extractFromRpc(executionContext) {
+        const metadata = executionContext.switchToRpc().getContext();
+        /**
+         * Если мы пришли в GRPC и у нас есть методы для работы с Metadata
+         * то мы конвертируем Metadata в некий виртуальный request с заголовками (заголовки выбраны как общий стандарт проброса мета информации)
+         */
+        if (metadata?.get) {
+            const grpcHeaders = new grpc_headers_1.GrpcHeaders(metadata);
+            const h = grpcHeaders.get(tracingHeaders);
+            h[constants_1.X_REQUEST_ID] ??= this.createRequestId();
+            return h;
+        }
+        return {
+            [constants_1.X_REQUEST_ID]: (0, node_crypto_1.randomUUID)(),
+        };
+    }
+    static createRequestId() {
+        return (0, node_crypto_1.randomUUID)();
+    }
 };
 exports.TracingInterceptor = TracingInterceptor;
-exports.TracingInterceptor = TracingInterceptor = __decorate([
+exports.TracingInterceptor = TracingInterceptor = TracingInterceptor_1 = __decorate([
     (0, common_1.Injectable)()
 ], TracingInterceptor);
 //# sourceMappingURL=tracing.interceptor.js.map

package/dist/tracing/tracing.interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":";;;;;;;;;AAKA,2CAA4C;AAG5C;;;GAGG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,SAAS,CAAC,QAA0B,EAAE,IAAiB;QACrD,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;CACF,CAAA;AAJY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;GACA,kBAAkB,CAI9B"}
+{"version":3,"file":"tracing.interceptor.js","sourceRoot":"","sources":["../../src/tracing/tracing.interceptor.ts"],"names":[],"mappings":"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"}

package/dist/tracing/tracing.module.d.ts

@@ -1,4 +1,4 @@
-import type { DynamicModule } from '@nestjs/common';
+import type { DynamicModule, OnModuleInit } from '@nestjs/common';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import type { SpanExporter } from '@opentelemetry/sdk-trace-base';
 import { ILogger } from '@rsdk/logging';
@@ -9,7 +9,7 @@ export interface TracingModuleOptions {
     processing: 'simple' | 'batch';
     exporter?: SpanExporter;
 }
-export declare class TracingModule {
+export declare class TracingModule implements OnModuleInit {
     private readonly logger;
     private readonly instrumentations;
     private readonly sdk;

package/dist/tracing/tracing.module.js

@@ -27,9 +27,10 @@ const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
 const logging_1 = require("@rsdk/logging");
 const logging_2 = require("../logging");
-const request_metadata_storage_1 = require("./services/request-metadata.storage");
+const request_id_provider_1 = require("./services/request-id.provider");
 const active_span_module_1 = require("./active-span.module");
 const auto_instrumentations_config_1 = require("./auto-instrumentations.config");
+const open_telemetry_interceptor_1 = require("./open-telemetry.interceptor");
 const request_metadata_module_1 = require("./request-metadata.module");
 const services_1 = require("./services");
 const tracing_config_1 = require("./tracing.config");
@@ -50,24 +51,22 @@ let TracingModule = TracingModule_1 = class TracingModule {
             module: TracingModule_1,
             imports: [request_metadata_module_1.RequestMetadataModule, active_span_module_1.ActiveSpanModule],
             providers: [
+                { provide: core_1.APP_INTERCEPTOR, useValue: new tracing_interceptor_1.TracingInterceptor() },
+                {
+                    provide: core_1.APP_INTERCEPTOR,
+                    useValue: new open_telemetry_interceptor_1.OpenTelemetryInterceptor(),
+                },
                 services_1.InstrumentationService,
                 this.createSDKProvider(options),
-                /**
-                 * Глобальный интерцептор для проброса входящих traceId, spanId и requestId из заголовков и метадаты в активный AsyncLocalStorage запроса
-                 */
-                { provide: core_1.APP_INTERCEPTOR, useClass: tracing_interceptor_1.TracingInterceptor },
             ],
         };
     }
     // Можно добавить включение и выключение при изменении конфига.
     async onModuleInit() {
-        this.logger.debug('Injecting request-metadata storage...');
-        this.instrumentations.injectWrapRequestMetadataInjector();
         if (!this.config.enabled) {
             this.logger.info('Tracing is disabled');
             logging_1.LoggerFactory.applyInstrumentations((record) => {
-                record['request_id'] =
-                    request_metadata_storage_1.RequestMetadataStorage.getInstance()?.getRequestMetadata().requestId;
+                record['request_id'] = request_id_provider_1.RequestIdProvider.get();
             });
             return;
         }

package/dist/tracing/tracing.module.js.map

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

package/dist/types/options.d.ts

@@ -68,4 +68,6 @@ export interface PlatformOptions extends PlatformManifestPathOptions {
     plugins?: PlatformAppPlugin[];
 }
 export type PlatformAppOptions = RequiredFields<PlatformOptions, 'transports' | 'modules'>;
-export type PlatformExtendedOptions = PlatformOptions & ManifestData;
+export type PlatformExtendedOptions = PlatformOptions & ManifestData & {
+    appScope: string;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "4.1.0",
+  "version": "4.2.0-next.1",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -32,18 +32,19 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@rsdk/autodoc.protocol": "^4.1.0",
-    "@rsdk/common": "^4.1.0",
-    "@rsdk/common.nestjs": "^4.1.0",
-    "@rsdk/common.node": "^4.1.0",
-    "@rsdk/decorators": "^4.1.0",
-    "@rsdk/logging": "^4.1.0",
-    "@rsdk/metadata": "^4.1.0",
-    "@rsdk/nest-tools": "^4.1.0",
+    "@rsdk/actx": "^4.2.0-next.1",
+    "@rsdk/autodoc.protocol": "^4.2.0-next.1",
+    "@rsdk/common": "^4.2.0-next.1",
+    "@rsdk/common.nestjs": "^4.2.0-next.1",
+    "@rsdk/common.node": "^4.2.0-next.1",
+    "@rsdk/decorators": "^4.2.0-next.1",
+    "@rsdk/logging": "^4.2.0-next.1",
+    "@rsdk/metadata": "^4.2.0-next.1",
+    "@rsdk/nest-tools": "^4.2.0-next.1",
     "axios": "^1.1.3",
     "pino": "^8.16.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "3215698c567d2eb6018b2e1147217cd305f696c2"
+  "gitHead": "e42244b7badde74fec2badc60a85d53878fe75ae"
 }

package/src/app-metadata/app-metadata.const.ts

@@ -1,3 +1,4 @@
 export const APP_NAME = Symbol('APP_NAME_TOKEN');
+export const APP_SCOPE = Symbol('APP_SCOPE_TOKEN');
 export const APP_DESCRIPTION = Symbol('APP_DESCRIPTION_TOKEN');
 export const APP_VERSION = Symbol('APP_VERSION_TOKEN');

package/src/app-metadata/app-metadata.module.ts

@@ -3,7 +3,12 @@ import { Module } from '@nestjs/common';
 
 import type { PlatformExtendedOptions } from '../types';
 
-import { APP_DESCRIPTION, APP_NAME, APP_VERSION } from './app-metadata.const';
+import {
+  APP_DESCRIPTION,
+  APP_NAME,
+  APP_SCOPE,
+  APP_VERSION,
+} from './app-metadata.const';
 
 @Module({})
 export class AppMetadataModule {
@@ -13,6 +18,10 @@ export class AppMetadataModule {
         provide: APP_NAME,
         useValue: options.name,
       },
+      {
+        provide: APP_SCOPE,
+        useValue: options.appScope,
+      },
       {
         provide: APP_DESCRIPTION,
         useValue: options.description,

package/src/app-metadata/app-name.const.ts

@@ -1 +1 @@
-export const APP_NAME_PATTERN = /^[a-z][a-z-]*\.[.a-z-]*[a-z]$/;
+export const APP_NAME_PATTERN = /(^[a-z][a-z-]*)\.[.a-z-]*[a-z]$/;

package/src/index.ts

@@ -1,14 +1,13 @@
 import './unhandled-rejection.handler';
 
+export { APP_SCOPE } from './app-metadata/app-metadata.const';
+
 export { Manifest } from './manifest/manifest';
 
 export { ProtocolDetector } from './transport/protocol.detector';
 
 export { X_REQUEST_ID } from './tracing/constants';
-
 export {
-  RequestMetadata,
-  RequestMetadataStorage,
   TracingModule,
   saveAsyncHooksContext,
   createSpan,
@@ -73,3 +72,4 @@ export {
   X_B3_SPAN_ID,
   X_B3_TRACE_ID,
 } from '@opentelemetry/propagator-b3';
+export { RequestIdProvider } from './tracing/services/request-id.provider';

package/src/platform.context.ts

@@ -7,6 +7,8 @@ import { LoggerFactory } from '@rsdk/logging';
 import type { RsdkMetadataProvider } from '@rsdk/metadata';
 import { groupBy, intersection } from 'lodash';
 
+import { APP_NAME_PATTERN } from './app-metadata/app-name.const';
+import { InvalidAppNameException } from './app-metadata/exceptions';
 import { ConfigMetadataProvider } from './config/metadata/config-metadata.provider';
 import { Manifest } from './manifest/manifest';
 import { assertAppName } from './app-metadata';
@@ -78,12 +80,18 @@ export class PlatformContext {
     const { name, description, version } = manifestData;
     const appName = this.strictnessOptions?.forceAppName ?? name;
     if (this.strictnessOptions?.skipAssertAppName) {
-      this.logger.warn('assert app name skipped');
+      this.logger.warn('app name asserting was skipped');
     } else {
       assertAppName(appName);
     }
 
+    const regexrResult = APP_NAME_PATTERN.exec(name);
+    const appScope = regexrResult?.[1];
+    if (!regexrResult || !appScope) {
+      throw new InvalidAppNameException(name);
+    }
     const extendedOptions: PlatformExtendedOptions = {
+      appScope,
       description,
       name: appName,
       version,

package/src/platform.module.ts

@@ -1,6 +1,7 @@
 import type { DynamicModule, NestModule } from '@nestjs/common';
 import { Inject } from '@nestjs/common';
 import type { MiddlewareConsumer } from '@nestjs/common/interfaces';
+import { AsyncContextModule } from '@rsdk/actx';
 import type { Constructor } from '@rsdk/common';
 
 import { PlatformPluginModule } from './plugin/plugin.module';
@@ -19,13 +20,18 @@ export class PlatformModule implements NestModule {
 
   static forRoot(options: PlatformExtendedOptions): DynamicModule {
     const imports: (DynamicModule | Constructor)[] = [
+      /**
+       * Последовательность принципиально важна так как в этом модуле происходит инициализация глобального асинхронного контекста (AsyncLocalStorage)
+       */
+      AsyncContextModule,
+      TracingModule.forRoot({ appName: options.name, processing: 'simple' }),
+
       // Plugins
       PlatformPluginModule.forOptions(options),
 
       // Infrastructure
       AppMetadataModule.forRoot(options),
       PlatformConfigModule.forRoot(options),
-      TracingModule.forRoot({ appName: options.name, processing: 'simple' }),
       LoggerInitializingModule,
       ...(options.modules ?? []),
     ];

package/src/tracing/auto-instrumentations.config.ts

@@ -1,7 +1,7 @@
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
 import { ClientRequest, IncomingMessage } from 'node:http';
 
-import { RequestMetadataStorage } from './services/request-metadata.storage';
+import { RequestIdProvider } from './services/request-id.provider';
 
 export const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
   '@opentelemetry/instrumentation-aws-sdk': {
@@ -38,8 +38,7 @@ export const autoInstumentationOptions: any[] = getNodeAutoInstrumentations({
   '@opentelemetry/instrumentation-pino': {
     enabled: true,
     logHook: (_span, record) => {
-      record['request_id'] =
-        RequestMetadataStorage.getInstance()?.getRequestMetadata().requestId;
+      record['request_id'] = RequestIdProvider.get();
     },
   },
 });

package/src/tracing/grpc.headers.ts

@@ -0,0 +1,29 @@
+import type { Metadata } from '@grpc/grpc-js';
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+
+/**
+ * @description хелпер для нормализованного извлечения заголовков из grpc запроса
+ */
+export class GrpcHeaders {
+  constructor(private metadata: Metadata) {}
+
+  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
+      >;
+    }
+    const requestIdMetadata = this.metadata.get(key as string);
+    if (requestIdMetadata.length > 0) {
+      return requestIdMetadata[0].toString();
+    }
+    return undefined;
+  }
+}