@rsdk/core 4.0.0-next.13 → 4.0.0-next.14

package/dist/tracing/tracing.module.js

@@ -15,20 +15,21 @@ var TracingModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TracingModule = void 0;
 const common_1 = require("@nestjs/common");
+const core_1 = require("@nestjs/core");
 const api_1 = require("@opentelemetry/api");
 const context_async_hooks_1 = require("@opentelemetry/context-async-hooks");
-const core_1 = require("@opentelemetry/core");
 const exporter_trace_otlp_http_1 = require("@opentelemetry/exporter-trace-otlp-http");
-const propagator_b3_1 = require("@opentelemetry/propagator-b3");
 const resources_1 = require("@opentelemetry/resources");
 const sdk_node_1 = require("@opentelemetry/sdk-node");
 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 instrumentation_service_1 = require("./services/instrumentation.service");
-const metadata_scanner_1 = require("./services/metadata.scanner");
+const active_span_module_1 = require("./active-span.module");
+const request_metadata_module_1 = require("./request-metadata.module");
+const services_1 = require("./services");
 const tracing_config_1 = require("./tracing.config");
+const tracing_interceptor_1 = require("./tracing.interceptor");
 let TracingModule = TracingModule_1 = class TracingModule {
     logger;
     instrumentations;
@@ -43,10 +44,14 @@ let TracingModule = TracingModule_1 = class TracingModule {
     static forRoot(options) {
         return {
             module: TracingModule_1,
+            imports: [request_metadata_module_1.RequestMetadataModule, active_span_module_1.ActiveSpanModule],
             providers: [
-                metadata_scanner_1.ExtendedMetadataScanner,
-                instrumentation_service_1.InstrumentationService,
+                services_1.InstrumentationService,
                 this.createSDKProvider(options),
+                /**
+                 * Глобальный интерцептор для проброса входящих traceId, spanId и requestId из заголовков и метадаты в активный AsyncLocalStorage запроса
+                 */
+                { provide: core_1.APP_INTERCEPTOR, useClass: tracing_interceptor_1.TracingInterceptor },
             ],
         };
     }
@@ -69,20 +74,14 @@ let TracingModule = TracingModule_1 = class TracingModule {
                         [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: options.appName,
                     }),
                     spanProcessor: processor,
-                    textMapPropagator: new core_1.CompositePropagator({
-                        propagators: [
-                            new propagator_b3_1.B3Propagator(),
-                            new propagator_b3_1.B3Propagator({
-                                injectEncoding: propagator_b3_1.B3InjectEncoding.MULTI_HEADER,
-                            }),
-                        ],
-                    }),
                 });
             },
         };
     }
     // Можно добавить включение и выключение при изменении конфига.
     async onModuleInit() {
+        this.logger.debug('Injecting request-metadata storage...');
+        this.instrumentations.injectWrapRequestMetadataInjector();
         if (!this.config.enabled) {
             this.logger.info('Tracing is disabled');
             return;
@@ -91,7 +90,7 @@ let TracingModule = TracingModule_1 = class TracingModule {
         this.logger.debug('Starting Open Telemetry SDK...');
         await this.sdk.start();
         this.logger.debug('Instrumenting nest.js entities...');
-        this.instrumentations.inject();
+        this.instrumentations.injectWrapTraceInjector();
         this.logger.debug('Attaching log messages to spans...');
         logging_1.LoggerFactory.onMessage((level, msg) => {
             const span = api_1.trace.getSpan(api_1.context.active());
@@ -107,7 +106,7 @@ exports.TracingModule = TracingModule;
 exports.TracingModule = TracingModule = TracingModule_1 = __decorate([
     (0, common_1.Module)({}),
     __param(0, (0, logging_2.InjectLogger)(TracingModule)),
-    __metadata("design:paramtypes", [Object, instrumentation_service_1.InstrumentationService,
+    __metadata("design:paramtypes", [Object, services_1.InstrumentationService,
         sdk_node_1.NodeSDK,
         tracing_config_1.TracingModuleConfig])
 ], TracingModule);

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/tracing/utils/create-span.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Функция для генерации корректного рандомного traceId и spanId
+ * алгоритм взят из: https://github.com/openzipkin/zipkin-js/blob/ec89188cf6a07e184ab886c1dfb6c9dc276ddfa4/packages/zipkin/src/tracer/randomTraceId.js
+ * спецификация по traceId: https://www.w3.org/TR/trace-context/#considerations-for-trace-id-field-generation
+ * @returns {traceId, spanId}
+ */
+export declare function createSpan(): {
+    traceId: string;
+    spanId: string;
+};

package/dist/tracing/utils/create-span.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSpan = void 0;
+const common_1 = require("@rsdk/common");
+/**
+ * Функция для генерации корректного рандомного traceId и spanId
+ * алгоритм взят из: https://github.com/openzipkin/zipkin-js/blob/ec89188cf6a07e184ab886c1dfb6c9dc276ddfa4/packages/zipkin/src/tracer/randomTraceId.js
+ * спецификация по traceId: https://www.w3.org/TR/trace-context/#considerations-for-trace-id-field-generation
+ * @returns {traceId, spanId}
+ */
+function createSpan() {
+    const rootSpanId = (0, common_1.getRandomBytes)(16);
+    const traceId = (0, common_1.getRandomBytes)(16) + rootSpanId;
+    return {
+        traceId,
+        spanId: rootSpanId,
+    };
+}
+exports.createSpan = createSpan;
+//# sourceMappingURL=create-span.js.map

package/dist/tracing/utils/create-span.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-span.js","sourceRoot":"","sources":["../../../src/tracing/utils/create-span.ts"],"names":[],"mappings":";;;AAAA,yCAA8C;AAE9C;;;;;GAKG;AACH,SAAgB,UAAU;IAIxB,MAAM,UAAU,GAAG,IAAA,uBAAc,EAAC,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAA,uBAAc,EAAC,EAAE,CAAC,GAAG,UAAU,CAAC;IAEhD,OAAO;QACL,OAAO;QACP,MAAM,EAAE,UAAU;KACnB,CAAC;AACJ,CAAC;AAXD,gCAWC"}

package/dist/tracing/utils/save-async-hooks-context.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Проблема: при передаче управления в rxjs теряется контекст асинк локал стораджа
+ *
+ * Решение: Утилита для проброса инфы из асинк локал стораджа в тело пайпа rxjs
+ * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
+ *
+ * Тут есть часть логик трейсер декоратора, суть простая:
+ * мы - находясь в контексте с актуальным асинк Metadata запускаем создание боди для пайпа rx и тем самым мы передаем контекст работы туда
+ * ```
+ * return this.booksStream.pipe(
+ *       concatMap(
+ *         saveAsyncHooksContext(async (book) => {
+ *           return { book: { ...book, pages: request.limit } };
+ *         }),
+ *       ),
+ *     );
+ * ```
+ */
+export declare function saveAsyncHooksContext<T>(fn: (...args: any[]) => Promise<T>): (...args: any[]) => Promise<T>;

package/dist/tracing/utils/save-async-hooks-context.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.saveAsyncHooksContext = void 0;
+const api_1 = require("@opentelemetry/api");
+const sdk_node_1 = require("@opentelemetry/sdk-node");
+const services_1 = require("../services");
+const active_span_storage_1 = require("../services/active-span.storage");
+/**
+ * Проблема: при передаче управления в rxjs теряется контекст асинк локал стораджа
+ *
+ * Решение: Утилита для проброса инфы из асинк локал стораджа в тело пайпа rxjs
+ * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
+ *
+ * Тут есть часть логик трейсер декоратора, суть простая:
+ * мы - находясь в контексте с актуальным асинк Metadata запускаем создание боди для пайпа rx и тем самым мы передаем контекст работы туда
+ * ```
+ * return this.booksStream.pipe(
+ *       concatMap(
+ *         saveAsyncHooksContext(async (book) => {
+ *           return { book: { ...book, pages: request.limit } };
+ *         }),
+ *       ),
+ *     );
+ * ```
+ */
+function saveAsyncHooksContext(fn) {
+    const span = active_span_storage_1.ActiveSpanStorage.getInstance()?.getActiveSpan();
+    return async function (...args) {
+        const activeSpan = active_span_storage_1.ActiveSpanStorage.getInstance()?.getActiveSpan();
+        if (activeSpan) {
+            Object.assign(activeSpan.spanContext(), span?.spanContext());
+            return fn(...args);
+        }
+        else {
+            if (!span) {
+                return fn(...args);
+            }
+            const spanContext = sdk_node_1.api.trace.setSpan(sdk_node_1.api.context.active(), span);
+            return sdk_node_1.api.context.with(spanContext, async () => fn(...args)
+                .then(async (result) => {
+                span.setAttribute('response', services_1.TraceInjector.toAttribute(result));
+                span.setStatus({ code: api_1.SpanStatusCode.OK });
+                span.end();
+                return result;
+            })
+                .catch(async (error) => {
+                span.recordException(error);
+                span.setStatus({
+                    code: api_1.SpanStatusCode.ERROR,
+                    message: error.message,
+                });
+                span.end();
+                throw error;
+            }));
+        }
+    };
+}
+exports.saveAsyncHooksContext = saveAsyncHooksContext;
+//# sourceMappingURL=save-async-hooks-context.js.map

package/dist/tracing/utils/save-async-hooks-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"save-async-hooks-context.js","sourceRoot":"","sources":["../../../src/tracing/utils/save-async-hooks-context.ts"],"names":[],"mappings":";;;AAAA,4CAAoD;AACpD,sDAA8C;AAG9C,0CAA4C;AAC5C,yEAAoE;AAEpE;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,qBAAqB,CACnC,EAAkC;IAElC,MAAM,IAAI,GAAG,uCAAiB,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,CAAC;IAE9D,OAAO,KAAK,WAAW,GAAG,IAAI;QAC5B,MAAM,UAAU,GAAG,uCAAiB,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,CAAC;QACpE,IAAI,UAAU,EAAE;YACd,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7D,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;SACpB;aAAM;YACL,IAAI,CAAC,IAAI,EAAE;gBACT,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;aACpB;YACD,MAAM,WAAW,GAAG,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;YAElE,OAAO,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAC9C,EAAE,CAAC,GAAG,IAAI,CAAC;iBACR,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;gBACrB,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,wBAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;gBACjE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;iBACD,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACrB,IAAI,CAAC,eAAe,CAAC,KAAkB,CAAC,CAAC;gBACzC,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,oBAAc,CAAC,KAAK;oBAC1B,OAAO,EAAG,KAAmB,CAAC,OAAO;iBACtC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,EAAE,CAAC;gBACX,MAAM,KAAK,CAAC;YACd,CAAC,CAAC,CACL,CAAC;SACH;IACH,CAAC,CAAC;AACJ,CAAC;AApCD,sDAoCC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "4.0.0-next.13",
+  "version": "4.0.0-next.14",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -31,18 +31,18 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
-    "@rsdk/autodoc.protocol": "^4.0.0-next.13",
-    "@rsdk/common": "^4.0.0-next.13",
-    "@rsdk/common.nestjs": "^4.0.0-next.13",
-    "@rsdk/common.node": "^4.0.0-next.13",
-    "@rsdk/decorators": "^4.0.0-next.13",
-    "@rsdk/logging": "^4.0.0-next.13",
-    "@rsdk/metadata": "^4.0.0-next.13",
-    "@rsdk/nest-tools": "^4.0.0-next.13",
+    "@rsdk/autodoc.protocol": "^4.0.0-next.14",
+    "@rsdk/common": "^4.0.0-next.14",
+    "@rsdk/common.nestjs": "^4.0.0-next.14",
+    "@rsdk/common.node": "^4.0.0-next.14",
+    "@rsdk/decorators": "^4.0.0-next.14",
+    "@rsdk/logging": "^4.0.0-next.14",
+    "@rsdk/metadata": "^4.0.0-next.14",
+    "@rsdk/nest-tools": "^4.0.0-next.14",
     "axios": "^1.1.3",
     "pino": "^8.16.1",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },
-  "gitHead": "3fe5f00eff1ac7155d8e42dbbbcbd8a6cfd75e93"
+  "gitHead": "567e6d331c4caa6fdadbe0329f91c471b877f7a4"
 }

package/src/index.ts

@@ -1,5 +1,18 @@
 import './unhandled-rejection.handler';
 
+export { X_REQUEST_ID } from './tracing/constants';
+
+export {
+  RequestMetadata,
+  RequestMetadataStorage,
+  TracingModule,
+  saveAsyncHooksContext,
+  createSpan,
+  ActiveSpanModule,
+  ActiveSpanStorage,
+  Span,
+} from './tracing';
+
 export {
   FileSystemCheckOptions,
   FileSystemIndicator,
@@ -36,9 +49,9 @@ export {
   Counter,
   Gauge,
   Histogram,
-  Summary,
   Metric,
   MetricsModule,
+  Summary,
   register,
 } from './metrics';
 
@@ -49,3 +62,9 @@ export * from './types';
 export * from './app-metadata/decorators';
 
 export * from './app-metadata/app-metadata.const';
+
+export {
+  X_B3_PARENT_SPAN_ID,
+  X_B3_SPAN_ID,
+  X_B3_TRACE_ID,
+} from '@opentelemetry/propagator-b3';

package/src/tracing/active-span.module.ts

@@ -0,0 +1,13 @@
+import { Global, Module } from '@nestjs/common';
+
+import { ActiveSpanStorage } from './services/active-span.storage';
+
+/**
+ * Модуль для получения данных активного спана
+ */
+@Global()
+@Module({
+  providers: [ActiveSpanStorage],
+  exports: [ActiveSpanStorage],
+})
+export class ActiveSpanModule {}

package/src/tracing/constants.ts

@@ -1,6 +1,13 @@
+import { Size } from '@rsdk/common';
+
 export enum Constants {
   TRACE_METADATA_ACTIVE = 'OPEN_TELEMETRY_TRACE_METADATA_ACTIVE',
+  REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE = 'REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE',
   NO_SPAN_METADATA = 'NO_SPAN_METADATA',
 }
 
-export const MAX_BYTES = 100 * 1_024; // 100kb;
+/**
+ * Ид запроса - нужен для фильтрации запросов при поиске проблем от конкретного клиента
+ */
+export const X_REQUEST_ID = 'x-requestid';
+export const MAX_BYTES = new Size(100, 'kb');

package/src/tracing/decorators/span.decorator.ts

@@ -1,21 +1,34 @@
+import { MetadataScanner } from '@nestjs/core';
+
 import { SymbolKeyDecorationException } from '../../exceptions';
 import { TraceInjector } from '../services';
 
+const metadataScanner = new MetadataScanner();
+
 /**
  * Explicitly adds instrumentation to method (don't work for classes!).
  * Use for classes that you instantiate manually.
  * NOTE: Is redundant for injectables and other nest.js stuff
  */
-export const Span = (): MethodDecorator =>
+export const Span = (): MethodDecorator & ClassDecorator =>
   // eslint-disable-next-line unicorn/consistent-function-scoping
   function (
     target: object,
-    methodName: string | symbol,
-    descriptor: TypedPropertyDescriptor<any>,
-  ) {
+    methodName?: string | symbol,
+    descriptor?: TypedPropertyDescriptor<any>,
+  ): any {
     if (typeof methodName === 'symbol') {
       throw new SymbolKeyDecorationException();
     }
+    if (methodName && descriptor) {
+      TraceInjector.wrap(target, descriptor.value, descriptor);
+    } else {
+      const prototype = (target as any).prototype ?? target;
 
-    TraceInjector.wrap(target, descriptor.value, descriptor);
+      for (const name of metadataScanner.getAllMethodNames(prototype)) {
+        if (name) {
+          TraceInjector.wrap(prototype, prototype[name]);
+        }
+      }
+    }
   };

package/src/tracing/index.ts

@@ -1 +1,8 @@
+export * from './active-span.module';
+export * from './request-metadata.module';
+export * from './services/active-span.storage';
+export * from './services/request-metadata.storage';
 export * from './tracing.module';
+export * from './utils/create-span';
+export * from './utils/save-async-hooks-context';
+export * from './decorators';

package/src/tracing/request-metadata.module.ts

@@ -0,0 +1,13 @@
+import { Global, Module } from '@nestjs/common';
+
+import { RequestMetadataStorage } from './services/request-metadata.storage';
+
+/**
+ * Модуль для хранения и получения данных из аскин локал стораджа
+ */
+@Global()
+@Module({
+  providers: [RequestMetadataStorage],
+  exports: [RequestMetadataStorage],
+})
+export class RequestMetadataModule {}

package/src/tracing/services/active-span.storage.ts

@@ -0,0 +1,32 @@
+import { Injectable } from '@nestjs/common';
+import type { Span } from '@opentelemetry/api';
+import { api } from '@opentelemetry/sdk-node';
+
+/**
+ * Обертка вокруг `api.trace.getActiveSpan()`
+ */
+@Injectable()
+export class ActiveSpanStorage {
+  /**
+   * Так как этот сервис используется в разных местах, чтобы не усложнять существующий код путем проксирования модулей и сервисов
+   * после создания ложим инстанс в эту статик переменную
+   */
+  private static instance: ActiveSpanStorage | undefined;
+
+  constructor() {
+    if (!ActiveSpanStorage.instance) {
+      ActiveSpanStorage.instance = this;
+    }
+  }
+
+  static getInstance(): ActiveSpanStorage | undefined {
+    return ActiveSpanStorage.instance;
+  }
+
+  /**
+   * Получает новое значение в контекст
+   */
+  getActiveSpan(): Span | undefined {
+    return api.trace.getActiveSpan();
+  }
+}

package/src/tracing/services/index.ts

@@ -1,3 +1,2 @@
 export * from './instrumentation.service';
-export * from './metadata.scanner';
 export * from './trace.injector';

package/src/tracing/services/instrumentation.service.ts

@@ -1,145 +1,31 @@
 import { Injectable } from '@nestjs/common';
-import {
-  EXCEPTION_FILTERS_METADATA,
-  GUARDS_METADATA,
-  INTERCEPTORS_METADATA,
-  PIPES_METADATA,
-} from '@nestjs/common/constants';
-import { APP_FILTER, APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
-import { ILogger } from '@rsdk/logging';
 
-import { InjectLogger } from '../../logging';
+import { TracingInterceptor } from '../tracing.interceptor';
 
-import { ExtendedMetadataScanner } from './metadata.scanner';
+import { RequestMetadataInjector } from './request-metadata.injector';
 import { TraceInjector } from './trace.injector';
 
-const types = [
-  EXCEPTION_FILTERS_METADATA,
-  GUARDS_METADATA,
-  INTERCEPTORS_METADATA,
-  PIPES_METADATA,
-] as const;
-
 @Injectable()
 export class InstrumentationService {
-  constructor(
-    @InjectLogger(InstrumentationService) private readonly logger: ILogger,
-    protected readonly scanner: ExtendedMetadataScanner,
-  ) {}
-
-  public inject(): void {
-    /**
-     * Для каждого контроллера
-     */
-    for (const controller of this.scanner.getControllers()) {
-      /**
-       * Перебираем методы контроллера и оборачиваем их.
-       */
-      this.wrapMethods(controller.metatype.prototype);
-
-      this.wrapAugmentations(controller.metatype);
-
-      /**
-       * Для каждого метода контроллера
-       */
-      for (const name of this.scanner.getMethods(
-        controller.metatype.prototype,
-      )) {
-        /**
-         * Во вложенном цикле находим все гарды, интерцепторы, пайпы и фильтры,
-         * привязанные к методу.
-         * Уровни вложенности, как в цикле выше
-         */
-        const method = controller.metatype.prototype[name];
-
-        this.wrapAugmentations(method);
-      }
-    }
-
-    /**
-     * Глобальные гарды, интерцепторы, пайпы и фильтры находятся
-     * в общем списке провайдеров по injection-токенам.
-     */
-    for (const { metatype, token } of this.scanner.getProviders()) {
-      if (typeof token !== 'string') {
-        continue;
-      }
-
-      if (
-        token.includes(APP_GUARD) ||
-        token.includes(APP_PIPE) ||
-        token.includes(APP_INTERCEPTOR) ||
-        token.includes(APP_FILTER)
-      ) {
-        this.wrapMethods(metatype.prototype);
-      }
-    }
-
+  public injectWrapRequestMetadataInjector(): void {
     /**
-     * Глобальные гарды, интерцепторы, пайпы и фильтры находятся
-     * в общем списке провайдеров по injection-токенам.
+     * Оборачиваем интерцептор в логику которая несет с собою асинк локал сторадж с requestId
      */
-    for (const {
-      metatype: { name, prototype },
-    } of this.scanner.getProviders()) {
-      if (name.toLowerCase().endsWith('module')) {
-        continue;
-      }
-
-      if (
-        name === 'ModuleRef' ||
-        name === 'Reflector' ||
-        name === 'OrphanedReferenceRegistry' ||
-        name === 'TypeFieldsAccessor' ||
-        name === 'TypeMapperSevice' ||
-        name === 'TypeDefinitionsStorage' ||
-        name === 'FileSystemHelper' ||
-        name === 'TypeDefinitionsGenerator' ||
-        name === 'GraphQLSchemaFactory' ||
-        name === 'AstDefinitionNodeFactory' ||
-        name === 'UnionDefinitionFactory' ||
-        name === 'SubscriptionTypeFactory' ||
-        name === 'RootTypeFactory' ||
-        name === 'ResolveTypeFactory' ||
-        name === 'QueryTypeFactory' ||
-        name === 'OrphanedTypesFactory' ||
-        name === 'OutputTypeFactory' ||
-        name === 'ObjectTypeDefinitionFactory' ||
-        name === 'MutationTypeFactory' ||
-        name === 'InterfaceDefinitionFactory' ||
-        name === 'InputTypeFactory' ||
-        name === 'ArgsFactory' ||
-        name === 'InputTypeDefinitionFactory' ||
-        name === 'EnumDefinitionFactory'
-      ) {
-        continue;
-      }
-
-      this.wrapMethods(prototype);
-    }
+    RequestMetadataInjector.wrap(
+      TracingInterceptor.prototype,
+      TracingInterceptor.prototype['intercept'],
+    );
   }
 
-  private wrapAugmentations(metatype: object): void {
+  public injectWrapTraceInjector(): void {
     /**
-     * Перебираем во вложенных циклах все гарды, интерцепторы, пайпы и фильтры,
-     * повешенные на переданный прототип (metatype).
-     * 1-й уровень - типы сущностей: интерцепторы, гарды, пайпы, фильтры
-     * 2-й уровень - методы сущностей
+     * Оборачиваем интерцептор в логику которая несет с собою асинк локал сторадж с traceId, spanId
      */
-    for (const metakey of types) {
-      for (const instance of Reflect.getMetadata(metakey, metatype) || []) {
-        this.wrapMethods(instance);
-      }
-    }
-  }
-
-  private wrapMethods(obj: any): void {
-    const prototype = obj.prototype ?? obj;
-
-    this.logger.trace(`Wrapping methods of ${prototype.constructor.name}...`);
-
-    for (const name of this.scanner.getMethods(prototype)) {
-      TraceInjector.wrap(prototype, prototype[name]);
-    }
+    TraceInjector.wrap(
+      TracingInterceptor.prototype,
+      TracingInterceptor.prototype['intercept'],
+      undefined,
+      true,
+    );
   }
 }