@rsdk/core 4.3.1-next.1 → 4.3.2-next.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.2-next.0](https://github.com/R-Vision/rsdk/compare/v4.3.1...v4.3.2-next.0) (2024-03-26)
+
+**Note:** Version bump only for package @rsdk/core
+
+## [4.3.1](https://github.com/R-Vision/rsdk/compare/v4.3.1-next.0...v4.3.1) (2024-03-25)
+
+**Note:** Version bump only for package @rsdk/core
+
 ## [4.3.1-next.1](https://github.com/R-Vision/rsdk/compare/v4.3.1-next.0...v4.3.1-next.1) (2024-03-25)
 
 **Note:** Version bump only for package @rsdk/core

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 { TracingModule, saveAsyncHooksContext, createSpan, Span, } from './tracing';
+export { TracingModule, createSpan, Span } from './tracing';
 export { FileSystemCheckOptions, FileSystemIndicator, PingCheckOptions, PingIndicator, } from './health/indicators.abstract';
 export { HealthChecksService } from './health/health.service';
 export { CheckSummary } from './health/types';
@@ -23,4 +23,3 @@ export * from './types';
 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';

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.createSpan = exports.saveAsyncHooksContext = exports.TracingModule = exports.X_REQUEST_ID = exports.ProtocolDetector = exports.Manifest = exports.APP_SCOPE = void 0;
+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.createSpan = 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; } });
@@ -26,7 +26,6 @@ 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, "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, "Span", { enumerable: true, get: function () { return tracing_1.Span; } });
 var indicators_abstract_1 = require("./health/indicators.abstract");
@@ -64,8 +63,4 @@ __exportStar(require("./app-metadata/decorators"), exports);
 __exportStar(require("./app-metadata/app-metadata.const"), exports);
 var get_transport_id_1 = require("./transport/get-transport-id");
 Object.defineProperty(exports, "getTransportId", { enumerable: true, get: function () { return get_transport_id_1.getTransportId; } });
-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,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,qCAKmB;AAJjB,wGAAA,aAAa,OAAA;AACb,gHAAA,qBAAqB,OAAA;AACrB,qGAAA,UAAU,OAAA;AACV,+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,qCAA4D;AAAnD,wGAAA,aAAa,OAAA;AAAE,qGAAA,UAAU,OAAA;AAAE,+FAAA,IAAI,OAAA;AAExC,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"}

package/dist/tracing/index.d.ts

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

package/dist/tracing/index.js

@@ -17,6 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./request-metadata.module"), 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,4DAA0C;AAC1C,mDAAiC;AACjC,sDAAoC;AACpC,mEAAiD;AACjD,+CAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/tracing/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAA0C;AAC1C,mDAAiC;AACjC,sDAAoC;AACpC,+CAA6B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/core",
-  "version": "4.3.1-next.1",
+  "version": "4.3.2-next.0",
   "description": "Nestjs based microservice chassis",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -24,59 +24,17 @@
     "@nestjs/core": "^10.0.0",
     "@nestjs/microservices": "^10.0.0",
     "@opentelemetry/api": "1.7.0",
-    "@opentelemetry/auto-instrumentations-node": "0.40.2",
-    "@opentelemetry/context-async-hooks": "1.18.1",
-    "@opentelemetry/core": "1.18.1",
-    "@opentelemetry/exporter-trace-otlp-http": "0.45.1",
-    "@opentelemetry/propagator-b3": "1.18.1",
-    "@opentelemetry/resources": "1.18.1",
-    "@opentelemetry/sdk-node": "0.45.1",
-    "@opentelemetry/sdk-trace-base": "1.18.1",
-    "@opentelemetry/semantic-conventions": "1.18.1",
-    "@rsdk/actx": "^4.3.1-next.1",
-    "@rsdk/autodoc.protocol": "^4.3.1-next.1",
-    "@rsdk/common": "^4.3.1-next.1",
-    "@rsdk/common.nestjs": "^4.3.1-next.1",
-    "@rsdk/common.node": "^4.3.1-next.1",
-    "@rsdk/decorators": "^4.3.1-next.1",
-    "@rsdk/logging": "^4.3.1-next.1",
-    "@rsdk/metadata": "^4.3.1-next.1",
-    "@rsdk/nest-tools": "^4.3.1-next.1",
-    "@rsdk/tracing": "^4.3.1-next.1",
+    "@rsdk/autodoc.protocol": "^4.3.2-next.0",
+    "@rsdk/common": "^4.3.2-next.0",
+    "@rsdk/common.nestjs": "^4.3.2-next.0",
+    "@rsdk/common.node": "^4.3.2-next.0",
+    "@rsdk/decorators": "^4.3.2-next.0",
+    "@rsdk/logging": "^4.3.2-next.0",
+    "@rsdk/metadata": "^4.3.2-next.0",
+    "@rsdk/nest-tools": "^4.3.2-next.0",
+    "@rsdk/tracing": "^4.3.2-next.0",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.0.0"
   },
-  "peerDependenciesMeta": {
-    "@opentelemetry/api": {
-      "optional": true
-    },
-    "@opentelemetry/auto-instrumentations-node": {
-      "optional": true
-    },
-    "@opentelemetry/context-async-hooks": {
-      "optional": true
-    },
-    "@opentelemetry/core": {
-      "optional": true
-    },
-    "@opentelemetry/exporter-trace-otlp-http": {
-      "optional": true
-    },
-    "@opentelemetry/propagator-b3": {
-      "optional": true
-    },
-    "@opentelemetry/resources": {
-      "optional": true
-    },
-    "@opentelemetry/sdk-node": {
-      "optional": true
-    },
-    "@opentelemetry/sdk-trace-base": {
-      "optional": true
-    },
-    "@opentelemetry/semantic-conventions": {
-      "optional": true
-    }
-  },
-  "gitHead": "79ad5e9c5f25719390d866add5ef49c5f513485c"
+  "gitHead": "0e20ee52d21a698fd9177b33f13ca297042ae244"
 }

package/src/index.ts

@@ -7,12 +7,7 @@ export { Manifest } from './manifest/manifest';
 export { ProtocolDetector } from './transport/protocol.detector';
 
 export { X_REQUEST_ID } from './tracing/constants';
-export {
-  TracingModule,
-  saveAsyncHooksContext,
-  createSpan,
-  Span,
-} from './tracing';
+export { TracingModule, createSpan, Span } from './tracing';
 
 export {
   FileSystemCheckOptions,
@@ -64,9 +59,3 @@ 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';

package/src/tracing/index.ts

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

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

@@ -1,19 +0,0 @@
-/**
- * Проблема: при передаче управления в 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

@@ -1,56 +0,0 @@
-"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");
-/**
- * Проблема: при передаче управления в rxjs теряется контекст асинк локал стораджа
- *
- * Решение: Утилита для проброса инфы из асинк локал стораджа в тело пайпа rxjs
- * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
- *
- * Тут есть часть логик трейсер декоратора, суть простая:
- * мы - находясь в контексте с актуальным асинк Metadata запускаем создание боди для пайпа rx и тем самым мы передаем контекст работы туда
- * ```
- * return this.booksStream.pipe(
- *       concatMap(
- *         saveAsyncHooksContext(async (book) => {
- *           return { book: { ...book, pages: request.limit } };
- *         }),
- *       ),
- *     );
- * ```
- */
-function saveAsyncHooksContext(fn) {
-    const span = sdk_node_1.api.trace.getActiveSpan();
-    return async function (...args) {
-        const activeSpan = sdk_node_1.api.trace.getActiveSpan();
-        if (activeSpan) {
-            Object.assign(activeSpan.spanContext(), span?.spanContext());
-            return fn(...args);
-        }
-        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

@@ -1 +0,0 @@
-{"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;AAE5C;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,qBAAqB,CACnC,EAAkC;IAElC,MAAM,IAAI,GAAG,cAAG,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;IAEvC,OAAO,KAAK,WAAW,GAAG,IAAI;QAC5B,MAAM,UAAU,GAAG,cAAG,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;QAC7C,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;YAC7D,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QACrB,CAAC;QACD,MAAM,WAAW,GAAG,cAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO,cAAG,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE,CAC9C,EAAE,CAAC,GAAG,IAAI,CAAC;aACR,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,wBAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YACjE,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,oBAAc,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;aACD,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,IAAI,CAAC,eAAe,CAAC,KAAkB,CAAC,CAAC;YACzC,IAAI,CAAC,SAAS,CAAC;gBACb,IAAI,EAAE,oBAAc,CAAC,KAAK;gBAC1B,OAAO,EAAG,KAAmB,CAAC,OAAO;aACtC,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,MAAM,KAAK,CAAC;QACd,CAAC,CAAC,CACL,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAnCD,sDAmCC"}

package/src/tracing/utils/save-async-hooks-context.ts

@@ -1,60 +0,0 @@
-import { SpanStatusCode } from '@opentelemetry/api';
-import { api } from '@opentelemetry/sdk-node';
-import type { ErrorLike } from '@rsdk/common';
-
-import { TraceInjector } from '../services';
-
-/**
- * Проблема: при передаче управления в rxjs теряется контекст асинк локал стораджа
- *
- * Решение: Утилита для проброса инфы из асинк локал стораджа в тело пайпа rxjs
- * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
- *
- * Тут есть часть логик трейсер декоратора, суть простая:
- * мы - находясь в контексте с актуальным асинк Metadata запускаем создание боди для пайпа rx и тем самым мы передаем контекст работы туда
- * ```
- * return this.booksStream.pipe(
- *       concatMap(
- *         saveAsyncHooksContext(async (book) => {
- *           return { book: { ...book, pages: request.limit } };
- *         }),
- *       ),
- *     );
- * ```
- */
-export function saveAsyncHooksContext<T>(
-  fn: (...args: any[]) => Promise<T>,
-): (...args: any[]) => Promise<T> {
-  const span = api.trace.getActiveSpan();
-
-  return async function (...args): Promise<T> {
-    const activeSpan = api.trace.getActiveSpan();
-    if (activeSpan) {
-      Object.assign(activeSpan.spanContext(), span?.spanContext());
-      return fn(...args);
-    }
-    if (!span) {
-      return fn(...args);
-    }
-    const spanContext = api.trace.setSpan(api.context.active(), span);
-
-    return api.context.with(spanContext, async () =>
-      fn(...args)
-        .then(async (result) => {
-          span.setAttribute('response', TraceInjector.toAttribute(result));
-          span.setStatus({ code: SpanStatusCode.OK });
-          span.end();
-          return result;
-        })
-        .catch(async (error) => {
-          span.recordException(error as ErrorLike);
-          span.setStatus({
-            code: SpanStatusCode.ERROR,
-            message: (error as ErrorLike).message,
-          });
-          span.end();
-          throw error;
-        }),
-    );
-  };
-}