@rsdk/core 4.2.0-next.0 → 4.2.0-next.1

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.2.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.2.0-next.0...v4.2.0-next.1) (2024-02-02)
+
+### Features
+
+* rework work with async context ([#201](https://github.com/R-Vision/rsdk/issues/201)) ([26de1a8](https://github.com/R-Vision/rsdk/commit/26de1a814692bcd082c2f1aaedad1215ec0df1a0))
+
 ## [4.2.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.1.0...v4.2.0-next.0) (2024-02-02)
 
 ### Features

package/dist/index.d.ts

@@ -3,7 +3,7 @@ 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, ActiveSpanModule, ActiveSpanStorage, Span, } from './tracing';
+export { TracingModule, saveAsyncHooksContext, createSpan, ActiveSpanModule, ActiveSpanStorage, Span, } from './tracing';
 export { FileSystemCheckOptions, FileSystemIndicator, PingCheckOptions, PingIndicator, } from './health/indicators.abstract';
 export { HealthChecksService } from './health/health.service';
 export { CheckSummary } from './health/types';
@@ -24,3 +24,4 @@ export * from './app-metadata/decorators';
 export * from './app-metadata/app-metadata.const';
 export { getTransportId } from './transport/get-transport-id';
 export { X_B3_PARENT_SPAN_ID, X_B3_SPAN_ID, X_B3_TRACE_ID, } from '@opentelemetry/propagator-b3';
+export { RequestIdProvider } from './tracing/services/request-id.provider';

package/dist/index.js

@@ -14,7 +14,7 @@ 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.X_B3_TRACE_ID = exports.X_B3_SPAN_ID = exports.X_B3_PARENT_SPAN_ID = exports.getTransportId = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.Span = exports.ActiveSpanStorage = exports.ActiveSpanModule = exports.createSpan = exports.saveAsyncHooksContext = exports.TracingModule = exports.RequestMetadataStorage = exports.X_REQUEST_ID = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
+exports.RequestIdProvider = exports.X_B3_TRACE_ID = exports.X_B3_SPAN_ID = exports.X_B3_PARENT_SPAN_ID = exports.getTransportId = exports.PlatformApp = exports.register = exports.Summary = exports.MetricsModule = exports.Metric = exports.Histogram = exports.Gauge = exports.Counter = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = exports.Span = exports.ActiveSpanStorage = exports.ActiveSpanModule = exports.createSpan = exports.saveAsyncHooksContext = exports.TracingModule = exports.X_REQUEST_ID = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
 require("./unhandled-rejection.handler");
 var app_metadata_const_1 = require("./app-metadata/app-metadata.const");
 Object.defineProperty(exports, "APP_SCOPE", { enumerable: true, get: function () { return app_metadata_const_1.APP_SCOPE; } });
@@ -25,7 +25,6 @@ Object.defineProperty(exports, "ProtocolDetector", { enumerable: true, get: func
 var constants_1 = require("./tracing/constants");
 Object.defineProperty(exports, "X_REQUEST_ID", { enumerable: true, get: function () { return constants_1.X_REQUEST_ID; } });
 var tracing_1 = require("./tracing");
-Object.defineProperty(exports, "RequestMetadataStorage", { enumerable: true, get: function () { return tracing_1.RequestMetadataStorage; } });
 Object.defineProperty(exports, "TracingModule", { enumerable: true, get: function () { return tracing_1.TracingModule; } });
 Object.defineProperty(exports, "saveAsyncHooksContext", { enumerable: true, get: function () { return tracing_1.saveAsyncHooksContext; } });
 Object.defineProperty(exports, "createSpan", { enumerable: true, get: function () { return tracing_1.createSpan; } });
@@ -71,4 +70,6 @@ var propagator_b3_1 = require("@opentelemetry/propagator-b3");
 Object.defineProperty(exports, "X_B3_PARENT_SPAN_ID", { enumerable: true, get: function () { return propagator_b3_1.X_B3_PARENT_SPAN_ID; } });
 Object.defineProperty(exports, "X_B3_SPAN_ID", { enumerable: true, get: function () { return propagator_b3_1.X_B3_SPAN_ID; } });
 Object.defineProperty(exports, "X_B3_TRACE_ID", { enumerable: true, get: function () { return propagator_b3_1.X_B3_TRACE_ID; } });
+var request_id_provider_1 = require("./tracing/services/request-id.provider");
+Object.defineProperty(exports, "RequestIdProvider", { enumerable: true, get: function () { return request_id_provider_1.RequestIdProvider; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,iDAAmD;AAA1C,yGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,iHAAA,sBAAsB,OAAA;AACtB,wGAAA,aAAa,OAAA;AACb,gHAAA,qBAAqB,OAAA;AACrB,qGAAA,UAAU,OAAA;AACV,2GAAA,gBAAgB,OAAA;AAChB,4GAAA,iBAAiB,OAAA;AACjB,+FAAA,IAAI,OAAA;AAGN,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAClD,iEAA8D;AAArD,kHAAA,cAAc,OAAA;AAEvB,8DAIsC;AAHpC,oHAAA,mBAAmB,OAAA;AACnB,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,wEAA8D;AAArD,+GAAA,SAAS,OAAA;AAElB,gDAA+C;AAAtC,oGAAA,QAAQ,OAAA;AAEjB,mEAAiE;AAAxD,qHAAA,gBAAgB,OAAA;AAEzB,iDAAmD;AAA1C,yGAAA,YAAY,OAAA;AACrB,qCAOmB;AANjB,wGAAA,aAAa,OAAA;AACb,gHAAA,qBAAqB,OAAA;AACrB,qGAAA,UAAU,OAAA;AACV,2GAAA,gBAAgB,OAAA;AAChB,4GAAA,iBAAiB,OAAA;AACjB,+FAAA,IAAI,OAAA;AAGN,oEAKsC;AAHpC,0HAAA,mBAAmB,OAAA;AAEnB,oHAAA,aAAa,OAAA;AAGf,0DAA8D;AAArD,qHAAA,mBAAmB,OAAA;AAI5B,6CAAmD;AAA1C,yGAAA,cAAc,OAAA;AAEvB,6EAAkE;AAAzD,gHAAA,SAAS,OAAA;AAIlB,4CAA+C;AAAtC,sGAAA,WAAW,OAAA;AAEpB,sDAAkD;AAAzC,yGAAA,SAAS,OAAA;AAElB,uDAAqD;AAA5C,mHAAA,eAAe,OAAA;AAExB,2CAAyB;AAEzB,+CAA6B;AAE7B,wDAAsC;AAEtC,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,qCASmB;AAPjB,kGAAA,OAAO,OAAA;AACP,gGAAA,KAAK,OAAA;AACL,oGAAA,SAAS,OAAA;AACT,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,kGAAA,OAAO,OAAA;AACP,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD;AAClD,iEAA8D;AAArD,kHAAA,cAAc,OAAA;AAEvB,8DAIsC;AAHpC,oHAAA,mBAAmB,OAAA;AACnB,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA;AAEf,8EAA2E;AAAlE,wHAAA,iBAAiB,OAAA"}

package/dist/platform.module.js

@@ -15,6 +15,7 @@ var PlatformModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformModule = void 0;
 const common_1 = require("@nestjs/common");
+const actx_1 = require("@rsdk/actx");
 const plugin_module_1 = require("./plugin/plugin.module");
 const transport_module_1 = require("./transport/transport.module");
 const app_metadata_1 = require("./app-metadata");
@@ -29,12 +30,16 @@ let PlatformModule = PlatformModule_1 = class PlatformModule {
     }
     static forRoot(options) {
         const imports = [
+            /**
+             * Последовательность принципиально важна так как в этом модуле происходит инициализация глобального асинхронного контекста (AsyncLocalStorage)
+             */
+            actx_1.AsyncContextModule,
+            tracing_1.TracingModule.forRoot({ appName: options.name, processing: 'simple' }),
             // Plugins
             plugin_module_1.PlatformPluginModule.forOptions(options),
             // Infrastructure
             app_metadata_1.AppMetadataModule.forRoot(options),
             config_1.PlatformConfigModule.forRoot(options),
-            tracing_1.TracingModule.forRoot({ appName: options.name, processing: 'simple' }),
             logging_1.LoggerInitializingModule,
             ...(options.modules ?? []),
         ];

package/dist/platform.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.module.js","sourceRoot":"","sources":["../src/platform.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAAwC;AAIxC,0DAA8D;AAC9D,mEAAuE;AACvE,iDAAmD;AACnD,qCAAgD;AAChD,6CAAiD;AACjD,uCAAqD;AACrD,uCAA0C;AAG1C,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAEoB;IAD7C,YAC6C,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;IAC1E,CAAC;IAEJ,MAAM,CAAC,OAAO,CAAC,OAAgC;QAC7C,MAAM,OAAO,GAAoC;YAC/C,UAAU;YACV,oCAAoB,CAAC,UAAU,CAAC,OAAO,CAAC;YAExC,iBAAiB;YACjB,gCAAiB,CAAC,OAAO,CAAC,OAAO,CAAC;YAClC,6BAAoB,CAAC,OAAO,CAAC,OAAO,CAAC;YACrC,uBAAa,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;YACtE,kCAAwB;YACxB,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;SAC3B,CAAC;QAEF,oCAAoC;QACpC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,0CAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO;YACP,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,yBAAyB;oBAClC,QAAQ,EAAE,OAAO;iBAClB;aACF;YACD,OAAO,EAAE,CAAC,yBAAyB,CAAC;SACrC,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,QAA4B;QACpC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,8BAAiB,CACzB,mEAAmE,CACpE,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAChD,MAAM,EAAE,mBAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF,CAAA;AA/CY,wCAAc;yBAAd,cAAc;IAEtB,WAAA,IAAA,eAAM,EAAC,yBAAyB,CAAC,CAAA;;GAFzB,cAAc,CA+C1B"}
+{"version":3,"file":"platform.module.js","sourceRoot":"","sources":["../src/platform.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAAwC;AAExC,qCAAgD;AAGhD,0DAA8D;AAC9D,mEAAuE;AACvE,iDAAmD;AACnD,qCAAgD;AAChD,6CAAiD;AACjD,uCAAqD;AACrD,uCAA0C;AAG1C,IAAa,cAAc,sBAA3B,MAAa,cAAc;IAEoB;IAD7C,YAC6C,OAAgC;QAAhC,YAAO,GAAP,OAAO,CAAyB;IAC1E,CAAC;IAEJ,MAAM,CAAC,OAAO,CAAC,OAAgC;QAC7C,MAAM,OAAO,GAAoC;YAC/C;;eAEG;YACH,yBAAkB;YAClB,uBAAa,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;YAEtE,UAAU;YACV,oCAAoB,CAAC,UAAU,CAAC,OAAO,CAAC;YAExC,iBAAiB;YACjB,gCAAiB,CAAC,OAAO,CAAC,OAAO,CAAC;YAClC,6BAAoB,CAAC,OAAO,CAAC,OAAO,CAAC;YACrC,kCAAwB;YACxB,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;SAC3B,CAAC;QAEF,oCAAoC;QACpC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,OAAO,CAAC,IAAI,CAAC,0CAAuB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO;YACP,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,yBAAyB;oBAClC,QAAQ,EAAE,OAAO;iBAClB;aACF;YACD,OAAO,EAAE,CAAC,yBAAyB,CAAC;SACrC,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,QAA4B;QACpC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,MAAM,IAAI,8BAAiB,CACzB,mEAAmE,CACpE,CAAC;QACJ,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YAChD,MAAM,EAAE,mBAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;CACF,CAAA;AApDY,wCAAc;yBAAd,cAAc;IAEtB,WAAA,IAAA,eAAM,EAAC,yBAAyB,CAAC,CAAA;;GAFzB,cAAc,CAoD1B"}

package/dist/tracing/auto-instrumentations.config.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.autoInstumentationOptions = void 0;
 const auto_instrumentations_node_1 = require("@opentelemetry/auto-instrumentations-node");
 const node_http_1 = require("node:http");
-const request_metadata_storage_1 = require("./services/request-metadata.storage");
+const request_id_provider_1 = require("./services/request-id.provider");
 exports.autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAutoInstrumentations)({
     '@opentelemetry/instrumentation-aws-sdk': {
         responseHook: (span, { response }) => {
@@ -35,8 +35,7 @@ exports.autoInstumentationOptions = (0, auto_instrumentations_node_1.getNodeAuto
     '@opentelemetry/instrumentation-pino': {
         enabled: true,
         logHook: (_span, record) => {
-            record['request_id'] =
-                request_metadata_storage_1.RequestMetadataStorage.getInstance()?.getRequestMetadata().requestId;
+            record['request_id'] = request_id_provider_1.RequestIdProvider.get();
         },
     },
 });

package/dist/tracing/auto-instrumentations.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"auto-instrumentations.config.js","sourceRoot":"","sources":["../../src/tracing/auto-instrumentations.config.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,yCAA2D;AAE3D,kFAA6E;AAEhE,QAAA,yBAAyB,GAAU,IAAA,wDAA2B,EAAC;IAC1E,wCAAwC,EAAE;QACxC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;YACnC,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;KACF;IACD,wCAAwC,EAAE;QACxC,WAAW,EAAE,IAAI;KAClB;IACD,qCAAqC,EAAE;QACrC,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAC7B,IAAI,OAAO,YAAY,2BAAe,EAAE,CAAC;gBACvC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;iBAAM,IACL,OAAO,YAAY,yBAAa;gBAChC,OAAO,CAAC,GAAG,CAAC,MAAM;gBAClB,OAAO,CAAC,GAAG,CAAC,GAAG,EACf,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;KACF;IACD,mCAAmC,EAAE;QACnC,yBAAyB,EAAE,IAAI;KAChC;IACD,qCAAqC,EAAE;QACrC,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzB,MAAM,CAAC,YAAY,CAAC;gBAClB,iDAAsB,CAAC,WAAW,EAAE,EAAE,kBAAkB,EAAE,CAAC,SAAS,CAAC;QACzE,CAAC;KACF;CACF,CAAC,CAAC"}
+{"version":3,"file":"auto-instrumentations.config.js","sourceRoot":"","sources":["../../src/tracing/auto-instrumentations.config.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,yCAA2D;AAE3D,wEAAmE;AAEtD,QAAA,yBAAyB,GAAU,IAAA,wDAA2B,EAAC;IAC1E,wCAAwC,EAAE;QACxC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;YACnC,IAAI,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;gBAC1C,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;KACF;IACD,wCAAwC,EAAE;QACxC,WAAW,EAAE,IAAI;KAClB;IACD,qCAAqC,EAAE;QACrC,WAAW,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YAC7B,IAAI,OAAO,YAAY,2BAAe,EAAE,CAAC;gBACvC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;oBAClC,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACtD,CAAC;YACH,CAAC;iBAAM,IACL,OAAO,YAAY,yBAAa;gBAChC,OAAO,CAAC,GAAG,CAAC,MAAM;gBAClB,OAAO,CAAC,GAAG,CAAC,GAAG,EACf,CAAC;gBACD,IAAI,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;KACF;IACD,mCAAmC,EAAE;QACnC,yBAAyB,EAAE,IAAI;KAChC;IACD,qCAAqC,EAAE;QACrC,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACzB,MAAM,CAAC,YAAY,CAAC,GAAG,uCAAiB,CAAC,GAAG,EAAE,CAAC;QACjD,CAAC;KACF;CACF,CAAC,CAAC"}

package/dist/tracing/grpc.headers.d.ts

@@ -0,0 +1,11 @@
+import type { Metadata } from '@grpc/grpc-js';
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+/**
+ * @description хелпер для нормализованного извлечения заголовков из grpc запроса
+ */
+export declare class GrpcHeaders {
+    private metadata;
+    constructor(metadata: Metadata);
+    get<K extends string>(key: MaybeReadonlyArray<K>): Record<K, string | undefined>;
+    get(key: string): string | undefined;
+}

package/dist/tracing/grpc.headers.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GrpcHeaders = void 0;
+/**
+ * @description хелпер для нормализованного извлечения заголовков из grpc запроса
+ */
+class GrpcHeaders {
+    metadata;
+    constructor(metadata) {
+        this.metadata = metadata;
+    }
+    get(key) {
+        if (Array.isArray(key)) {
+            return Object.fromEntries(key.map((k) => [k, this.get(k)]));
+        }
+        const requestIdMetadata = this.metadata.get(key);
+        if (requestIdMetadata.length > 0) {
+            return requestIdMetadata[0].toString();
+        }
+        return undefined;
+    }
+}
+exports.GrpcHeaders = GrpcHeaders;
+//# sourceMappingURL=grpc.headers.js.map

package/dist/tracing/grpc.headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grpc.headers.js","sourceRoot":"","sources":["../../src/tracing/grpc.headers.ts"],"names":[],"mappings":";;;AAGA;;GAEG;AACH,MAAa,WAAW;IACF;IAApB,YAAoB,QAAkB;QAAlB,aAAQ,GAAR,QAAQ,CAAU;IAAG,CAAC;IAM1C,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,MAAM,iBAAiB,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAa,CAAC,CAAC;QAC3D,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACjC,OAAO,iBAAiB,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAtBD,kCAsBC"}

package/dist/tracing/http.headers.d.ts

@@ -0,0 +1,11 @@
+import type { MaybeReadonlyArray } from '@rsdk/common.node';
+/**
+ * @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;
+    private normalizedHeaders;
+}

package/dist/tracing/http.headers.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpHeaders = void 0;
+/**
+ * @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()];
+    }
+    normalizedHeaders;
+}
+exports.HttpHeaders = HttpHeaders;
+//# sourceMappingURL=http.headers.js.map

package/dist/tracing/http.headers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http.headers.js","sourceRoot":"","sources":["../../src/tracing/http.headers.ts"],"names":[],"mappings":";;;AAEA;;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,CAGzD,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAE,GAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/D,CAAC;IAEO,iBAAiB,CAAyB;CACnD;AA1BD,kCA0BC"}

package/dist/tracing/index.d.ts

@@ -1,7 +1,6 @@
 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';

package/dist/tracing/index.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./active-span.module"), exports);
 __exportStar(require("./request-metadata.module"), exports);
 __exportStar(require("./services/active-span.storage"), exports);
-__exportStar(require("./services/request-metadata.storage"), exports);
 __exportStar(require("./tracing.module"), exports);
 __exportStar(require("./utils/create-span"), exports);
 __exportStar(require("./utils/save-async-hooks-context"), exports);

package/dist/tracing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,4DAA0C;AAC1C,iEAA+C;AAC/C,sEAAoD;AACpD,mDAAiC;AACjC,sDAAoC;AACpC,mEAAiD;AACjD,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,4DAA0C;AAC1C,iEAA+C;AAC/C,mDAAiC;AACjC,sDAAoC;AACpC,mEAAiD;AACjD,+CAA6B"}

package/dist/tracing/open-telemetry.interceptor.d.ts

@@ -0,0 +1,5 @@
+import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { Observable } from 'rxjs';
+export declare class OpenTelemetryInterceptor implements NestInterceptor {
+    intercept(_context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>>;
+}

package/dist/tracing/open-telemetry.interceptor.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenTelemetryInterceptor = 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 rxjs_1 = require("rxjs");
+const request_id_provider_1 = require("./services/request-id.provider");
+const services_1 = require("./services");
+class OpenTelemetryInterceptor {
+    intercept(_context, next) {
+        const tracer = api_1.trace.getTracer('@rsdk/open-telemetry', '1.0.0');
+        const spanName = services_1.TraceInjector.createSpanName(OpenTelemetryInterceptor.name, 'intercept');
+        /**
+         * Создаем новый спан
+         */
+        const span = tracer.startSpan(spanName, {});
+        const openTelemetryValues = request_id_provider_1.OpenTelemetryProvider.getOrThrow();
+        const parentSpanId = openTelemetryValues[propagator_b3_1.X_B3_PARENT_SPAN_ID];
+        if (parentSpanId) {
+            span.parentSpanId = parentSpanId;
+        }
+        const spanId = openTelemetryValues[propagator_b3_1.X_B3_SPAN_ID];
+        /**
+         * После создания контекста ранее при входе в приложение, у нас новый спан ид
+         * мы перетираем значением которе получили через заголовок
+         * в рамках приложения он корректный, но при переходе из одного приложения в другой - слетает
+         * и чтобы 100% все было норм, мы всегда патчим его
+         */
+        if (spanId) {
+            span.spanContext().spanId = spanId;
+        }
+        const traceId = openTelemetryValues[propagator_b3_1.X_B3_TRACE_ID];
+        /**
+         * Патчим трайс ид, причина выше
+         */
+        if (traceId) {
+            span.spanContext().traceId = traceId;
+        }
+        /**
+         * Обычно самая первая точка входа это фронтовый запрос, который содержит некие заголовки хттп
+         * мы их кладем в рутовый спан
+         */
+        if (openTelemetryValues.http) {
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_METHOD, openTelemetryValues.http.httpMethod);
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_URL, openTelemetryValues.http.httpUrl);
+            span.setAttribute(semantic_conventions_1.SemanticAttributes.HTTP_ROUTE, openTelemetryValues.http.httpRoute);
+        }
+        /**
+         * Чтобы пробросить пропатченный спан нужно запустить две строчки ниже:
+         * 1) создаем контекст в котором активный спан перебиваем новым
+         * 2) созданный контекст ставим основным и в нем запускаем под процесс
+         */
+        const spanContext = sdk_node_1.api.trace.setSpan(sdk_node_1.api.context.active(), span);
+        return new rxjs_1.Observable((observer) => {
+            sdk_node_1.api.context.with(spanContext, () => {
+                next
+                    .handle()
+                    .pipe((0, rxjs_1.mergeMap)((result) => {
+                    services_1.TraceInjector.enrich(span, result);
+                    span.end();
+                    return (0, rxjs_1.of)(result);
+                }), (0, rxjs_1.catchError)((error) => {
+                    services_1.TraceInjector.recordAndRethrow(error, span);
+                    span.end();
+                    return (0, rxjs_1.throwError)(() => error);
+                }))
+                    .subscribe({
+                    complete: () => {
+                        observer.complete();
+                    },
+                    error: (error) => {
+                        observer.error(error);
+                    },
+                    next: (res) => observer.next(res),
+                });
+            });
+        });
+    }
+}
+exports.OpenTelemetryInterceptor = OpenTelemetryInterceptor;
+//# sourceMappingURL=open-telemetry.interceptor.js.map

package/dist/tracing/open-telemetry.interceptor.js.map

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

package/dist/tracing/request-metadata.module.js

@@ -8,7 +8,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestMetadataModule = void 0;
 const common_1 = require("@nestjs/common");
-const request_metadata_storage_1 = require("./services/request-metadata.storage");
 /**
  * Модуль для хранения и получения данных из аскин локал стораджа
  */
@@ -17,9 +16,6 @@ let RequestMetadataModule = class RequestMetadataModule {
 exports.RequestMetadataModule = RequestMetadataModule;
 exports.RequestMetadataModule = RequestMetadataModule = __decorate([
     (0, common_1.Global)(),
-    (0, common_1.Module)({
-        providers: [request_metadata_storage_1.RequestMetadataStorage],
-        exports: [request_metadata_storage_1.RequestMetadataStorage],
-    })
+    (0, common_1.Module)({})
 ], RequestMetadataModule);
 //# sourceMappingURL=request-metadata.module.js.map

package/dist/tracing/request-metadata.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"request-metadata.module.js","sourceRoot":"","sources":["../../src/tracing/request-metadata.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAEhD,kFAA6E;AAE7E;;GAEG;AAMI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAAG,CAAA;AAAxB,sDAAqB;gCAArB,qBAAqB;IALjC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,iDAAsB,CAAC;QACnC,OAAO,EAAE,CAAC,iDAAsB,CAAC;KAClC,CAAC;GACW,qBAAqB,CAAG"}
+{"version":3,"file":"request-metadata.module.js","sourceRoot":"","sources":["../../src/tracing/request-metadata.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAEhD;;GAEG;AAGI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAAG,CAAA;AAAxB,sDAAqB;gCAArB,qBAAqB;IAFjC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,qBAAqB,CAAG"}

package/dist/tracing/services/instrumentation.service.d.ts

@@ -1,4 +1,3 @@
 export declare class InstrumentationService {
-    injectWrapRequestMetadataInjector(): void;
     injectWrapTraceInjector(): void;
 }

package/dist/tracing/services/instrumentation.service.js

@@ -9,15 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstrumentationService = void 0;
 const common_1 = require("@nestjs/common");
 const tracing_interceptor_1 = require("../tracing.interceptor");
-const request_metadata_injector_1 = require("./request-metadata.injector");
 const trace_injector_1 = require("./trace.injector");
 let InstrumentationService = class InstrumentationService {
-    injectWrapRequestMetadataInjector() {
-        /**
-         * Оборачиваем интерцептор в логику которая несет с собою асинк локал сторадж с requestId
-         */
-        request_metadata_injector_1.RequestMetadataInjector.wrap(tracing_interceptor_1.TracingInterceptor.prototype, tracing_interceptor_1.TracingInterceptor.prototype['intercept']);
-    }
     injectWrapTraceInjector() {
         /**
          * Оборачиваем интерцептор в логику которая несет с собою асинк локал сторадж с traceId, spanId

package/dist/tracing/services/instrumentation.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentation.service.js","sourceRoot":"","sources":["../../../src/tracing/services/instrumentation.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,gEAA4D;AAE5D,2EAAsE;AACtE,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAC1B,iCAAiC;QACtC;;WAEG;QACH,mDAAuB,CAAC,IAAI,CAC1B,wCAAkB,CAAC,SAAS,EAC5B,wCAAkB,CAAC,SAAS,CAAC,WAAW,CAAC,CAC1C,CAAC;IACJ,CAAC;IAEM,uBAAuB;QAC5B;;WAEG;QACH,8BAAa,CAAC,IAAI,CAChB,wCAAkB,CAAC,SAAS,EAC5B,wCAAkB,CAAC,SAAS,CAAC,WAAW,CAAC,EACzC,SAAS,EACT,IAAI,CACL,CAAC;IACJ,CAAC;CACF,CAAA;AAtBY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;GACA,sBAAsB,CAsBlC"}
+{"version":3,"file":"instrumentation.service.js","sourceRoot":"","sources":["../../../src/tracing/services/instrumentation.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAE5C,gEAA4D;AAE5D,qDAAiD;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAC1B,uBAAuB;QAC5B;;WAEG;QACH,8BAAa,CAAC,IAAI,CAChB,wCAAkB,CAAC,SAAS,EAC5B,wCAAkB,CAAC,SAAS,CAAC,WAAW,CAAC,EACzC,SAAS,EACT,IAAI,CACL,CAAC;IACJ,CAAC;CACF,CAAA;AAZY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;GACA,sBAAsB,CAYlC"}

package/dist/tracing/services/request-id.provider.d.ts

@@ -0,0 +1,11 @@
+export declare const RequestIdProvider: import("@rsdk/actx").AsyncContextProvider<string>;
+export declare const OpenTelemetryProvider: import("@rsdk/actx").AsyncContextProvider<{
+    http?: {
+        httpMethod: string;
+        httpUrl: string;
+        httpRoute: string;
+    };
+    "x-b3-spanid"?: string;
+    "x-b3-traceid"?: string;
+    "x-b3-parentspanid"?: string;
+}>;

package/dist/tracing/services/request-id.provider.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpenTelemetryProvider = exports.RequestIdProvider = void 0;
+const actx_1 = require("@rsdk/actx");
+exports.RequestIdProvider = (0, actx_1.createAsyncContextProvider)({
+    name: 'RequestId',
+    rewritable: false,
+});
+exports.OpenTelemetryProvider = (0, actx_1.createAsyncContextProvider)({
+    name: 'OpenTelemetryPropagation',
+    rewritable: false,
+});
+//# sourceMappingURL=request-id.provider.js.map

package/dist/tracing/services/request-id.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request-id.provider.js","sourceRoot":"","sources":["../../../src/tracing/services/request-id.provider.ts"],"names":[],"mappings":";;;AAKA,qCAAwD;AAE3C,QAAA,iBAAiB,GAAG,IAAA,iCAA0B,EAAS;IAClE,IAAI,EAAE,WAAW;IACjB,UAAU,EAAE,KAAK;CAClB,CAAC,CAAC;AAEU,QAAA,qBAAqB,GAAG,IAAA,iCAA0B,EAK5D;IACD,IAAI,EAAE,0BAA0B;IAChC,UAAU,EAAE,KAAK;CAClB,CAAC,CAAC"}

package/dist/tracing/services/trace.injector.d.ts

@@ -1,12 +1,12 @@
-import type { AttributeValue } from '@opentelemetry/api';
+import type { AttributeValue, Span } from '@opentelemetry/api';
 export declare class TraceInjector {
     static wrap(cls: any, original: Function, descriptor?: TypedPropertyDescriptor<any>, isTracingInterceptor?: boolean): void;
     static toAttribute(data: unknown): AttributeValue;
     private static createWrapper;
-    private static createSpanName;
+    static createSpanName(className: string, methodName: string): string;
     private static isWrapped;
     private static nowSpan;
     private static setWrapped;
-    private static recordAndRethrow;
-    private static enrich;
+    static recordAndRethrow(error: unknown, span: Span): void;
+    static enrich(span: Span, data: unknown): unknown;
 }

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) создаем контекст в котором активный спан перебиваем новым