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

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.0-next.14](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.13...v4.0.0-next.14) (2023-11-29)
+
+### Features
+
+* **core:** PFM-601 Add support send trace id from client to server ([#164](https://github.com/R-Vision/rsdk/issues/164)) ([9e37243](https://github.com/R-Vision/rsdk/commit/9e372437fbb3d7d2b1167b99d07b0ac64cb4013d)), closes [#pfm-601](https://github.com/R-Vision/rsdk/issues/pfm-601) [#pfm-601](https://github.com/R-Vision/rsdk/issues/pfm-601)
+
+## [4.0.0-next.13](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.12...v4.0.0-next.13) (2023-11-29)
+
+**Note:** Version bump only for package @rsdk/core
+
 ## [4.0.0-next.12](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.11...v4.0.0-next.12) (2023-11-29)
 
 **Note:** Version bump only for package @rsdk/core

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 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, PingCheckOptions, PingIndicator, } from './health/indicators.abstract';
 export { HealthChecksService } from './health/health.service';
 export { CheckSummary } from './health/types';
@@ -12,8 +14,9 @@ export * from './config';
 export * from './exceptions';
 export * from './exceptions.handling';
 export { InjectLogger } from './logging';
-export { AnyMetric, Counter, Gauge, Histogram, Summary, Metric, MetricsModule, register, } from './metrics';
+export { AnyMetric, Counter, Gauge, Histogram, Metric, MetricsModule, Summary, register, } from './metrics';
 export { PlatformApp } from './app/platform.app';
 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/dist/index.js

@@ -14,8 +14,18 @@ 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.PlatformApp = exports.register = exports.MetricsModule = exports.Metric = exports.Summary = exports.Histogram = exports.Gauge = exports.Counter = exports.InjectLogger = exports.PlatformContext = exports.ConfigTag = exports.CheckResult = exports.Indicator = exports.getLoggerToken = exports.HealthChecksService = exports.PingIndicator = exports.FileSystemIndicator = void 0;
+exports.X_B3_TRACE_ID = exports.X_B3_SPAN_ID = exports.X_B3_PARENT_SPAN_ID = 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 = void 0;
 require("./unhandled-rejection.handler");
+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; } });
+Object.defineProperty(exports, "ActiveSpanModule", { enumerable: true, get: function () { return tracing_1.ActiveSpanModule; } });
+Object.defineProperty(exports, "ActiveSpanStorage", { enumerable: true, get: function () { return tracing_1.ActiveSpanStorage; } });
+Object.defineProperty(exports, "Span", { enumerable: true, get: function () { return tracing_1.Span; } });
 var indicators_abstract_1 = require("./health/indicators.abstract");
 Object.defineProperty(exports, "FileSystemIndicator", { enumerable: true, get: function () { return indicators_abstract_1.FileSystemIndicator; } });
 Object.defineProperty(exports, "PingIndicator", { enumerable: true, get: function () { return indicators_abstract_1.PingIndicator; } });
@@ -40,13 +50,17 @@ var metrics_1 = require("./metrics");
 Object.defineProperty(exports, "Counter", { enumerable: true, get: function () { return metrics_1.Counter; } });
 Object.defineProperty(exports, "Gauge", { enumerable: true, get: function () { return metrics_1.Gauge; } });
 Object.defineProperty(exports, "Histogram", { enumerable: true, get: function () { return metrics_1.Histogram; } });
-Object.defineProperty(exports, "Summary", { enumerable: true, get: function () { return metrics_1.Summary; } });
 Object.defineProperty(exports, "Metric", { enumerable: true, get: function () { return metrics_1.Metric; } });
 Object.defineProperty(exports, "MetricsModule", { enumerable: true, get: function () { return metrics_1.MetricsModule; } });
+Object.defineProperty(exports, "Summary", { enumerable: true, get: function () { return metrics_1.Summary; } });
 Object.defineProperty(exports, "register", { enumerable: true, get: function () { return metrics_1.register; } });
 var platform_app_1 = require("./app/platform.app");
 Object.defineProperty(exports, "PlatformApp", { enumerable: true, get: function () { return platform_app_1.PlatformApp; } });
 __exportStar(require("./types"), exports);
 __exportStar(require("./app-metadata/decorators"), exports);
 __exportStar(require("./app-metadata/app-metadata.const"), exports);
+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; } });
 //# 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,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,kGAAA,OAAO,OAAA;AACP,iGAAA,MAAM,OAAA;AACN,wGAAA,aAAa,OAAA;AACb,mGAAA,QAAQ,OAAA;AAGV,mDAAiD;AAAxC,2GAAA,WAAW,OAAA;AAEpB,0CAAwB;AAExB,4DAA0C;AAE1C,oEAAkD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yCAAuC;AAEvC,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;AAElD,8DAIsC;AAHpC,oHAAA,mBAAmB,OAAA;AACnB,6GAAA,YAAY,OAAA;AACZ,8GAAA,aAAa,OAAA"}

package/dist/tracing/active-span.module.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Модуль для получения данных активного спана
+ */
+export declare class ActiveSpanModule {
+}

package/dist/tracing/active-span.module.js

@@ -0,0 +1,25 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActiveSpanModule = void 0;
+const common_1 = require("@nestjs/common");
+const active_span_storage_1 = require("./services/active-span.storage");
+/**
+ * Модуль для получения данных активного спана
+ */
+let ActiveSpanModule = class ActiveSpanModule {
+};
+exports.ActiveSpanModule = ActiveSpanModule;
+exports.ActiveSpanModule = ActiveSpanModule = __decorate([
+    (0, common_1.Global)(),
+    (0, common_1.Module)({
+        providers: [active_span_storage_1.ActiveSpanStorage],
+        exports: [active_span_storage_1.ActiveSpanStorage],
+    })
+], ActiveSpanModule);
+//# sourceMappingURL=active-span.module.js.map

package/dist/tracing/active-span.module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"active-span.module.js","sourceRoot":"","sources":["../../src/tracing/active-span.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAgD;AAEhD,wEAAmE;AAEnE;;GAEG;AAMI,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAAG,CAAA;AAAnB,4CAAgB;2BAAhB,gBAAgB;IAL5B,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,uCAAiB,CAAC;QAC9B,OAAO,EAAE,CAAC,uCAAiB,CAAC;KAC7B,CAAC;GACW,gBAAgB,CAAG"}

package/dist/tracing/constants.d.ts

@@ -1,5 +1,11 @@
+import { Size } from '@rsdk/common';
 export declare 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 declare const MAX_BYTES: number;
+/**
+ * Ид запроса - нужен для фильтрации запросов при поиске проблем от конкретного клиента
+ */
+export declare const X_REQUEST_ID = "x-requestid";
+export declare const MAX_BYTES: Size;

package/dist/tracing/constants.js

@@ -1,10 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_BYTES = exports.Constants = void 0;
+exports.MAX_BYTES = exports.X_REQUEST_ID = exports.Constants = void 0;
+const common_1 = require("@rsdk/common");
 var Constants;
 (function (Constants) {
     Constants["TRACE_METADATA_ACTIVE"] = "OPEN_TELEMETRY_TRACE_METADATA_ACTIVE";
+    Constants["REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE"] = "REQUEST_METADATA_ASYNC_LOCAL_STORAGE_ACTIVE";
     Constants["NO_SPAN_METADATA"] = "NO_SPAN_METADATA";
 })(Constants || (exports.Constants = Constants = {}));
-exports.MAX_BYTES = 100 * 1024; // 100kb;
+/**
+ * Ид запроса - нужен для фильтрации запросов при поиске проблем от конкретного клиента
+ */
+exports.X_REQUEST_ID = 'x-requestid';
+exports.MAX_BYTES = new common_1.Size(100, 'kb');
 //# sourceMappingURL=constants.js.map

package/dist/tracing/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/tracing/constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,2EAA8D,CAAA;IAC9D,kDAAqC,CAAA;AACvC,CAAC,EAHW,SAAS,yBAAT,SAAS,QAGpB;AAEY,QAAA,SAAS,GAAG,GAAG,GAAG,IAAK,CAAC,CAAC,SAAS"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/tracing/constants.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AAEpC,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,2EAA8D,CAAA;IAC9D,wGAA2F,CAAA;IAC3F,kDAAqC,CAAA;AACvC,CAAC,EAJW,SAAS,yBAAT,SAAS,QAIpB;AAED;;GAEG;AACU,QAAA,YAAY,GAAG,aAAa,CAAC;AAC7B,QAAA,SAAS,GAAG,IAAI,aAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC"}

package/dist/tracing/decorators/span.decorator.d.ts

@@ -3,4 +3,4 @@
  * Use for classes that you instantiate manually.
  * NOTE: Is redundant for injectables and other nest.js stuff
  */
-export declare const Span: () => MethodDecorator;
+export declare const Span: () => MethodDecorator & ClassDecorator;

package/dist/tracing/decorators/span.decorator.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Span = void 0;
+const core_1 = require("@nestjs/core");
 const exceptions_1 = require("../../exceptions");
 const services_1 = require("../services");
+const metadataScanner = new core_1.MetadataScanner();
 /**
  * Explicitly adds instrumentation to method (don't work for classes!).
  * Use for classes that you instantiate manually.
@@ -14,7 +16,17 @@ function (target, methodName, descriptor) {
     if (typeof methodName === 'symbol') {
         throw new exceptions_1.SymbolKeyDecorationException();
     }
-    services_1.TraceInjector.wrap(target, descriptor.value, descriptor);
+    if (methodName && descriptor) {
+        services_1.TraceInjector.wrap(target, descriptor.value, descriptor);
+    }
+    else {
+        const prototype = target.prototype ?? target;
+        for (const name of metadataScanner.getAllMethodNames(prototype)) {
+            if (name) {
+                services_1.TraceInjector.wrap(prototype, prototype[name]);
+            }
+        }
+    }
 };
 exports.Span = Span;
 //# sourceMappingURL=span.decorator.js.map

package/dist/tracing/decorators/span.decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"span.decorator.js","sourceRoot":"","sources":["../../../src/tracing/decorators/span.decorator.ts"],"names":[],"mappings":";;;AAAA,iDAAgE;AAChE,0CAA4C;AAE5C;;;;GAIG;AACI,MAAM,IAAI,GAAG,GAAoB,EAAE;AACxC,+DAA+D;AAC/D,UACE,MAAc,EACd,UAA2B,EAC3B,UAAwC;IAExC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,MAAM,IAAI,yCAA4B,EAAE,CAAC;KAC1C;IAED,wBAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;AAC3D,CAAC,CAAC;AAZS,QAAA,IAAI,QAYb"}
+{"version":3,"file":"span.decorator.js","sourceRoot":"","sources":["../../../src/tracing/decorators/span.decorator.ts"],"names":[],"mappings":";;;AAAA,uCAA+C;AAE/C,iDAAgE;AAChE,0CAA4C;AAE5C,MAAM,eAAe,GAAG,IAAI,sBAAe,EAAE,CAAC;AAE9C;;;;GAIG;AACI,MAAM,IAAI,GAAG,GAAqC,EAAE;AACzD,+DAA+D;AAC/D,UACE,MAAc,EACd,UAA4B,EAC5B,UAAyC;IAEzC,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;QAClC,MAAM,IAAI,yCAA4B,EAAE,CAAC;KAC1C;IACD,IAAI,UAAU,IAAI,UAAU,EAAE;QAC5B,wBAAa,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;KAC1D;SAAM;QACL,MAAM,SAAS,GAAI,MAAc,CAAC,SAAS,IAAI,MAAM,CAAC;QAEtD,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE;YAC/D,IAAI,IAAI,EAAE;gBACR,wBAAa,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;aAChD;SACF;KACF;AACH,CAAC,CAAC;AArBS,QAAA,IAAI,QAqBb"}

package/dist/tracing/index.d.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/dist/tracing/index.js

@@ -14,5 +14,12 @@ 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 });
+__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);
+__exportStar(require("./decorators"), exports);
 //# sourceMappingURL=index.js.map

package/dist/tracing/index.js.map

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

package/dist/tracing/request-metadata.module.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Модуль для хранения и получения данных из аскин локал стораджа
+ */
+export declare class RequestMetadataModule {
+}

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

@@ -0,0 +1,25 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+};
+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");
+/**
+ * Модуль для хранения и получения данных из аскин локал стораджа
+ */
+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],
+    })
+], RequestMetadataModule);
+//# sourceMappingURL=request-metadata.module.js.map

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

@@ -0,0 +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"}

package/dist/tracing/services/active-span.storage.d.ts

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

package/dist/tracing/services/active-span.storage.js

@@ -0,0 +1,46 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var ActiveSpanStorage_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ActiveSpanStorage = void 0;
+const common_1 = require("@nestjs/common");
+const sdk_node_1 = require("@opentelemetry/sdk-node");
+/**
+ * Обертка вокруг `api.trace.getActiveSpan()`
+ */
+let ActiveSpanStorage = class ActiveSpanStorage {
+    static { ActiveSpanStorage_1 = this; }
+    /**
+     * Так как этот сервис используется в разных местах, чтобы не усложнять существующий код путем проксирования модулей и сервисов
+     * после создания ложим инстанс в эту статик переменную
+     */
+    static instance;
+    constructor() {
+        if (!ActiveSpanStorage_1.instance) {
+            ActiveSpanStorage_1.instance = this;
+        }
+    }
+    static getInstance() {
+        return ActiveSpanStorage_1.instance;
+    }
+    /**
+     * Получает новое значение в контекст
+     */
+    getActiveSpan() {
+        return sdk_node_1.api.trace.getActiveSpan();
+    }
+};
+exports.ActiveSpanStorage = ActiveSpanStorage;
+exports.ActiveSpanStorage = ActiveSpanStorage = ActiveSpanStorage_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], ActiveSpanStorage);
+//# sourceMappingURL=active-span.storage.js.map

package/dist/tracing/services/active-span.storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"active-span.storage.js","sourceRoot":"","sources":["../../../src/tracing/services/active-span.storage.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,sDAA8C;AAE9C;;GAEG;AAEI,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;;IAC5B;;;OAGG;IACK,MAAM,CAAC,QAAQ,CAAgC;IAEvD;QACE,IAAI,CAAC,mBAAiB,CAAC,QAAQ,EAAE;YAC/B,mBAAiB,CAAC,QAAQ,GAAG,IAAI,CAAC;SACnC;IACH,CAAC;IAED,MAAM,CAAC,WAAW;QAChB,OAAO,mBAAiB,CAAC,QAAQ,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,cAAG,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IACnC,CAAC;CACF,CAAA;AAvBY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;;GACA,iBAAiB,CAuB7B"}

package/dist/tracing/services/index.d.ts

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

package/dist/tracing/services/index.js

@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./instrumentation.service"), exports);
-__exportStar(require("./metadata.scanner"), exports);
 __exportStar(require("./trace.injector"), exports);
 //# sourceMappingURL=index.js.map

package/dist/tracing/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tracing/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,qDAAmC;AACnC,mDAAiC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/tracing/services/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,mDAAiC"}

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

@@ -1,10 +1,4 @@
-import { ILogger } from '@rsdk/logging';
-import { ExtendedMetadataScanner } from './metadata.scanner';
 export declare class InstrumentationService {
-    private readonly logger;
-    protected readonly scanner: ExtendedMetadataScanner;
-    constructor(logger: ILogger, scanner: ExtendedMetadataScanner);
-    inject(): void;
-    private wrapAugmentations;
-    private wrapMethods;
+    injectWrapRequestMetadataInjector(): void;
+    injectWrapTraceInjector(): void;
 }

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

@@ -5,133 +5,28 @@ 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 __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InstrumentationService = void 0;
 const common_1 = require("@nestjs/common");
-const constants_1 = require("@nestjs/common/constants");
-const core_1 = require("@nestjs/core");
-const logging_1 = require("../../logging");
-const metadata_scanner_1 = require("./metadata.scanner");
+const tracing_interceptor_1 = require("../tracing.interceptor");
+const request_metadata_injector_1 = require("./request-metadata.injector");
 const trace_injector_1 = require("./trace.injector");
-const types = [
-    constants_1.EXCEPTION_FILTERS_METADATA,
-    constants_1.GUARDS_METADATA,
-    constants_1.INTERCEPTORS_METADATA,
-    constants_1.PIPES_METADATA,
-];
 let InstrumentationService = class InstrumentationService {
-    logger;
-    scanner;
-    constructor(logger, scanner) {
-        this.logger = logger;
-        this.scanner = scanner;
-    }
-    inject() {
-        /**
-         * Для каждого контроллера
-         */
-        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(core_1.APP_GUARD) ||
-                token.includes(core_1.APP_PIPE) ||
-                token.includes(core_1.APP_INTERCEPTOR) ||
-                token.includes(core_1.APP_FILTER)) {
-                this.wrapMethods(metatype.prototype);
-            }
-        }
+    injectWrapRequestMetadataInjector() {
         /**
-         * Глобальные гарды, интерцепторы, пайпы и фильтры находятся
-         * в общем списке провайдеров по 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);
-        }
+        request_metadata_injector_1.RequestMetadataInjector.wrap(tracing_interceptor_1.TracingInterceptor.prototype, tracing_interceptor_1.TracingInterceptor.prototype['intercept']);
     }
-    wrapAugmentations(metatype) {
+    injectWrapTraceInjector() {
         /**
-         * Перебираем во вложенных циклах все гарды, интерцепторы, пайпы и фильтры,
-         * повешенные на переданный прототип (metatype).
-         * 1-й уровень - типы сущностей: интерцепторы, гарды, пайпы, фильтры
-         * 2-й уровень - методы сущностей
+         * Оборачиваем интерцептор в логику которая несет с собою асинк локал сторадж с traceId, spanId
          */
-        for (const metakey of types) {
-            for (const instance of Reflect.getMetadata(metakey, metatype) || []) {
-                this.wrapMethods(instance);
-            }
-        }
-    }
-    wrapMethods(obj) {
-        const prototype = obj.prototype ?? obj;
-        this.logger.trace(`Wrapping methods of ${prototype.constructor.name}...`);
-        for (const name of this.scanner.getMethods(prototype)) {
-            trace_injector_1.TraceInjector.wrap(prototype, prototype[name]);
-        }
+        trace_injector_1.TraceInjector.wrap(tracing_interceptor_1.TracingInterceptor.prototype, tracing_interceptor_1.TracingInterceptor.prototype['intercept'], undefined, true);
     }
 };
 exports.InstrumentationService = InstrumentationService;
 exports.InstrumentationService = InstrumentationService = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, logging_1.InjectLogger)(InstrumentationService)),
-    __metadata("design:paramtypes", [Object, metadata_scanner_1.ExtendedMetadataScanner])
+    (0, common_1.Injectable)()
 ], InstrumentationService);
 //# sourceMappingURL=instrumentation.service.js.map

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;AAC5C,wDAKkC;AAClC,uCAAgF;AAGhF,2CAA6C;AAE7C,yDAA6D;AAC7D,qDAAiD;AAEjD,MAAM,KAAK,GAAG;IACZ,sCAA0B;IAC1B,2BAAe;IACf,iCAAqB;IACrB,0BAAc;CACN,CAAC;AAGJ,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAEwB;IACpC;IAFrB,YACyD,MAAe,EACnD,OAAgC;QADI,WAAM,GAAN,MAAM,CAAS;QACnD,YAAO,GAAP,OAAO,CAAyB;IAClD,CAAC;IAEG,MAAM;QACX;;WAEG;QACH,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE;YACtD;;eAEG;YACH,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAEhD,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAE5C;;eAEG;YACH,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CACxC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAC9B,EAAE;gBACD;;;;mBAIG;gBACH,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAEnD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;aAChC;SACF;QAED;;;WAGG;QACH,KAAK,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE;YAC7D,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,SAAS;aACV;YAED,IACE,KAAK,CAAC,QAAQ,CAAC,gBAAS,CAAC;gBACzB,KAAK,CAAC,QAAQ,CAAC,eAAQ,CAAC;gBACxB,KAAK,CAAC,QAAQ,CAAC,sBAAe,CAAC;gBAC/B,KAAK,CAAC,QAAQ,CAAC,iBAAU,CAAC,EAC1B;gBACA,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aACtC;SACF;QAED;;;WAGG;QACH,KAAK,MAAM,EACT,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE;YAChC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACzC,SAAS;aACV;YAED,IACE,IAAI,KAAK,WAAW;gBACpB,IAAI,KAAK,WAAW;gBACpB,IAAI,KAAK,2BAA2B;gBACpC,IAAI,KAAK,oBAAoB;gBAC7B,IAAI,KAAK,kBAAkB;gBAC3B,IAAI,KAAK,wBAAwB;gBACjC,IAAI,KAAK,kBAAkB;gBAC3B,IAAI,KAAK,0BAA0B;gBACnC,IAAI,KAAK,sBAAsB;gBAC/B,IAAI,KAAK,0BAA0B;gBACnC,IAAI,KAAK,wBAAwB;gBACjC,IAAI,KAAK,yBAAyB;gBAClC,IAAI,KAAK,iBAAiB;gBAC1B,IAAI,KAAK,oBAAoB;gBAC7B,IAAI,KAAK,kBAAkB;gBAC3B,IAAI,KAAK,sBAAsB;gBAC/B,IAAI,KAAK,mBAAmB;gBAC5B,IAAI,KAAK,6BAA6B;gBACtC,IAAI,KAAK,qBAAqB;gBAC9B,IAAI,KAAK,4BAA4B;gBACrC,IAAI,KAAK,kBAAkB;gBAC3B,IAAI,KAAK,aAAa;gBACtB,IAAI,KAAK,4BAA4B;gBACrC,IAAI,KAAK,uBAAuB,EAChC;gBACA,SAAS;aACV;YAED,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;SAC7B;IACH,CAAC;IAEO,iBAAiB,CAAC,QAAgB;QACxC;;;;;WAKG;QACH,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YAC3B,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE;gBACnE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;aAC5B;SACF;IACH,CAAC;IAEO,WAAW,CAAC,GAAQ;QAC1B,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC;QAEvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,CAAC;QAE1E,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YACrD,8BAAa,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;SAChD;IACH,CAAC;CACF,CAAA;AAzHY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,sBAAY,EAAC,sBAAsB,CAAC,CAAA;6CACT,0CAAuB;GAH1C,sBAAsB,CAyHlC"}
+{"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"}

package/dist/tracing/services/request-metadata.injector.d.ts

@@ -0,0 +1,6 @@
+export declare class RequestMetadataInjector {
+    static wrap(cls: any, original: Function): void;
+    private static createWrapper;
+    private static isWrapped;
+    private static setWrapped;
+}