@coast/service-common-nest 1.0.50 → 1.0.52

package/dist/lib/logger/LoggerModule.d.ts

@@ -1,8 +1,7 @@
-import { AsyncStoreTrace } from '@coast/service-common/trace/AsyncStoreTrace';
 import { DynamicModule } from '@nestjs/common';
 import { LoggerModuleAsyncOptions } from './LoggerModuleAsyncOptions';
 export declare class LoggerModule {
     static disabled(): DynamicModule;
-    static forRootAsync<AsyncLocalContext extends AsyncStoreTrace = AsyncStoreTrace>(options: LoggerModuleAsyncOptions): DynamicModule;
+    static forRootAsync(options: LoggerModuleAsyncOptions): DynamicModule;
     private static createAsyncOptionsProvider;
 }

package/dist/lib/logger/LoggerModule.js

@@ -11,10 +11,10 @@ exports.LoggerModule = void 0;
 const CoastLogger_1 = require("@coast/service-common/logger/CoastLogger");
 const PinoLogger_1 = require("@coast/service-common/logger/PinoLogger");
 const SilentLogger_1 = require("@coast/service-common/logger/SilentLogger");
+const TraceIdContext_1 = require("@coast/service-common/trace/TraceIdContext");
 const common_1 = require("@nestjs/common");
-const async_hooks_1 = require("async_hooks");
-const AsyncLocalStorageModule_1 = require("../async-local-storage/AsyncLocalStorageModule");
 const Constants_1 = require("../Constants");
+const TraceIdContextModule_1 = require("../tracing/TraceIdContextModule");
 let LoggerModule = LoggerModule_1 = class LoggerModule {
     static disabled() {
         const coastLogger = {
@@ -30,14 +30,14 @@ let LoggerModule = LoggerModule_1 = class LoggerModule {
     static forRootAsync(options) {
         const optionsProvider = LoggerModule_1.createAsyncOptionsProvider(options);
         const coastLogger = {
-            inject: [async_hooks_1.AsyncLocalStorage, Constants_1.Constants.LOGGER_OPTIONS],
+            inject: [Constants_1.Constants.LOGGER_OPTIONS, TraceIdContext_1.TraceIdContext],
             provide: Constants_1.Constants.COAST_LOGGER,
-            useFactory: (asyncLocalStorage, options) => new PinoLogger_1.PinoLogger(asyncLocalStorage, options),
+            useFactory: (options, context) => new PinoLogger_1.PinoLogger(context, options),
         };
         return {
             global: true,
             exports: [Constants_1.Constants.COAST_LOGGER],
-            imports: [AsyncLocalStorageModule_1.AsyncLocalStorageModule, ...(options.imports ?? [])],
+            imports: [TraceIdContextModule_1.TraceIdContextModule, ...(options.imports ?? [])],
             module: LoggerModule_1,
             providers: [coastLogger, optionsProvider],
         };

package/dist/lib/logger/LoggerModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoggerModule.js","sourceRoot":"","sources":["../../../lib/logger/LoggerModule.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,0EAAuE;AAEvE,wEAAqE;AACrE,4EAAyE;AAEzE,2CAAyE;AAEzE,6CAAgD;AAEhD,4FAAyF;AACzF,4CAAyC;AAKlC,IAAM,YAAY,oBAAlB,MAAM,YAAY;IACd,MAAM,CAAC,QAAQ;QAClB,MAAM,WAAW,GAAkB;YAC/B,OAAO,EAAE,yBAAW;YACpB,QAAQ,EAAE,IAAI,2BAAY,EAAE;SAC/B,CAAC;QAEF,OAAO;YACH,OAAO,EAAE,CAAC,WAAW,CAAC;YACtB,MAAM,EAAE,cAAY;YACpB,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,YAAY,CACtB,OAAiC;QAEjC,MAAM,eAAe,GAAG,cAAY,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAEzE,MAAM,WAAW,GAAoB;YACjC,MAAM,EAAE,CAAC,+BAAiB,EAAE,qBAAS,CAAC,cAAc,CAAC;YACrD,OAAO,EAAE,qBAAS,CAAC,YAAY;YAC/B,UAAU,EAAE,CAAC,iBAAuD,EAAE,OAAsB,EAAe,EAAE,CACzG,IAAI,uBAAU,CAAC,iBAAiB,EAAE,OAAO,CAAC;SACjD,CAAC;QAEF,OAAO;YACH,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,CAAC,qBAAS,CAAC,YAAY,CAAC;YACjC,OAAO,EAAE,CAAC,iDAAuB,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC9D,MAAM,EAAE,cAAY;YACpB,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;SAC5C,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,0BAA0B,CAAC,OAAiC;QACvE,OAAO;YACH,OAAO,EAAE,qBAAS,CAAC,cAAc;YACjC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;SAC/B,CAAC;IACN,CAAC;CACJ,CAAA;AA1CY,oCAAY;uBAAZ,YAAY;IAFxB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,YAAY,CA0CxB"}
+{"version":3,"file":"LoggerModule.js","sourceRoot":"","sources":["../../../lib/logger/LoggerModule.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,0EAAuE;AAEvE,wEAAqE;AACrE,4EAAyE;AACzE,+EAA4E;AAC5E,2CAAyE;AAGzE,4CAAyC;AACzC,0EAAuE;AAKhE,IAAM,YAAY,oBAAlB,MAAM,YAAY;IACd,MAAM,CAAC,QAAQ;QAClB,MAAM,WAAW,GAAkB;YAC/B,OAAO,EAAE,yBAAW;YACpB,QAAQ,EAAE,IAAI,2BAAY,EAAE;SAC/B,CAAC;QAEF,OAAO;YACH,OAAO,EAAE,CAAC,WAAW,CAAC;YACtB,MAAM,EAAE,cAAY;YACpB,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,YAAY,CAAC,OAAiC;QACxD,MAAM,eAAe,GAAG,cAAY,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;QAEzE,MAAM,WAAW,GAAoB;YACjC,MAAM,EAAE,CAAC,qBAAS,CAAC,cAAc,EAAE,+BAAc,CAAC;YAClD,OAAO,EAAE,qBAAS,CAAC,YAAY;YAC/B,UAAU,EAAE,CAAC,OAAsB,EAAE,OAAuB,EAAe,EAAE,CAAC,IAAI,uBAAU,CAAC,OAAO,EAAE,OAAO,CAAC;SACjH,CAAC;QAEF,OAAO;YACH,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,CAAC,qBAAS,CAAC,YAAY,CAAC;YACjC,OAAO,EAAE,CAAC,2CAAoB,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,EAAE,cAAY;YACpB,SAAS,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC;SAC5C,CAAC;IACN,CAAC;IAEO,MAAM,CAAC,0BAA0B,CAAC,OAAiC;QACvE,OAAO;YACH,OAAO,EAAE,qBAAS,CAAC,cAAc;YACjC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;SAC/B,CAAC;IACN,CAAC;CACJ,CAAA;AAvCY,oCAAY;uBAAZ,YAAY;IAFxB,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,YAAY,CAuCxB"}

package/dist/lib/tracing/TraceIdContextModule.d.ts

@@ -0,0 +1,2 @@
+export declare class TraceIdContextModule {
+}

package/dist/lib/{async-local-storage/AsyncLocalStorageModule.js → tracing/TraceIdContextModule.js}

@@ -6,21 +6,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncLocalStorageModule = void 0;
+exports.TraceIdContextModule = void 0;
+const TraceIdContext_1 = require("@coast/service-common/trace/TraceIdContext");
 const common_1 = require("@nestjs/common");
-const async_hooks_1 = require("async_hooks");
-let AsyncLocalStorageModule = class AsyncLocalStorageModule {
+let TraceIdContextModule = class TraceIdContextModule {
 };
-exports.AsyncLocalStorageModule = AsyncLocalStorageModule;
-exports.AsyncLocalStorageModule = AsyncLocalStorageModule = __decorate([
+exports.TraceIdContextModule = TraceIdContextModule;
+exports.TraceIdContextModule = TraceIdContextModule = __decorate([
+    (0, common_1.Global)(),
     (0, common_1.Module)({
-        providers: [
-            {
-                provide: async_hooks_1.AsyncLocalStorage,
-                useFactory: () => new async_hooks_1.AsyncLocalStorage(),
-            },
-        ],
-        exports: [async_hooks_1.AsyncLocalStorage],
+        providers: [TraceIdContext_1.TraceIdContext],
+        exports: [TraceIdContext_1.TraceIdContext],
     })
-], AsyncLocalStorageModule);
-//# sourceMappingURL=AsyncLocalStorageModule.js.map
+], TraceIdContextModule);
+//# sourceMappingURL=TraceIdContextModule.js.map

package/dist/lib/tracing/TraceIdContextModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TraceIdContextModule.js","sourceRoot":"","sources":["../../../lib/tracing/TraceIdContextModule.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+EAA4E;AAC5E,2CAAgD;AAOzC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;CAAG,CAAA;AAAvB,oDAAoB;+BAApB,oBAAoB;IALhC,IAAA,eAAM,GAAE;IACR,IAAA,eAAM,EAAC;QACJ,SAAS,EAAE,CAAC,+BAAc,CAAC;QAC3B,OAAO,EAAE,CAAC,+BAAc,CAAC;KAC5B,CAAC;GACW,oBAAoB,CAAG"}

package/dist/lib/tracing/TraceIdInterceptor.d.ts

@@ -0,0 +1,10 @@
+import { Trace } from '@coast/service-common/trace/Trace';
+import { TraceIdContext } from '@coast/service-common/trace/TraceIdContext';
+import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
+import { Observable } from 'rxjs';
+export declare abstract class TraceIdInterceptor implements NestInterceptor {
+    private readonly traceIdContext;
+    constructor(traceIdContext: TraceIdContext);
+    intercept(context: ExecutionContext, next: CallHandler): Observable<unknown> | Promise<Observable<unknown>>;
+    protected abstract generateContext(executionContext: ExecutionContext): Trace;
+}

package/dist/lib/{async-local-storage/AsyncLocalStorageInterceptor.js → tracing/TraceIdInterceptor.js}

@@ -12,20 +12,20 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AsyncLocalStorageInterceptor = void 0;
+exports.TraceIdInterceptor = void 0;
+const TraceIdContext_1 = require("@coast/service-common/trace/TraceIdContext");
 const common_1 = require("@nestjs/common");
-const async_hooks_1 = require("async_hooks");
-let AsyncLocalStorageInterceptor = class AsyncLocalStorageInterceptor {
-    constructor(asyncLocalStorage) {
-        this.asyncLocalStorage = asyncLocalStorage;
+let TraceIdInterceptor = class TraceIdInterceptor {
+    constructor(traceIdContext) {
+        this.traceIdContext = traceIdContext;
     }
     intercept(context, next) {
-        return this.asyncLocalStorage.run(this.generateContext(context), next.handle);
+        return this.traceIdContext.initialize(next.handle, this.generateContext(context));
     }
 };
-exports.AsyncLocalStorageInterceptor = AsyncLocalStorageInterceptor;
-exports.AsyncLocalStorageInterceptor = AsyncLocalStorageInterceptor = __decorate([
+exports.TraceIdInterceptor = TraceIdInterceptor;
+exports.TraceIdInterceptor = TraceIdInterceptor = __decorate([
     __param(0, (0, common_1.Inject)()),
-    __metadata("design:paramtypes", [async_hooks_1.AsyncLocalStorage])
-], AsyncLocalStorageInterceptor);
-//# sourceMappingURL=AsyncLocalStorageInterceptor.js.map
+    __metadata("design:paramtypes", [TraceIdContext_1.TraceIdContext])
+], TraceIdInterceptor);
+//# sourceMappingURL=TraceIdInterceptor.js.map

package/dist/lib/tracing/TraceIdInterceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TraceIdInterceptor.js","sourceRoot":"","sources":["../../../lib/tracing/TraceIdInterceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,+EAA4E;AAC5E,2CAAwF;AAGxF,IAAsB,kBAAkB,GAAxC,MAAsB,kBAAkB;IACpC,YAAuC,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAElE,SAAS,CAAC,OAAyB,EAAE,IAAiB;QACzD,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC;IACtF,CAAC;CAGJ,CAAA;AARqB,gDAAkB;6BAAlB,kBAAkB;IACvB,WAAA,IAAA,eAAM,GAAE,CAAA;qCAAkC,+BAAc;GADnD,kBAAkB,CAQvC"}

package/dist/lib/tracing/TraceIdInterceptorModule.d.ts

@@ -0,0 +1,6 @@
+import { DynamicModule } from '@nestjs/common';
+import { FactoryProvider } from '@nestjs/common/interfaces';
+import { TraceIdInterceptor } from './TraceIdInterceptor';
+export declare class TraceIdInterceptorModule {
+    static forRootAsync(interceptor: FactoryProvider<TraceIdInterceptor>): DynamicModule;
+}

package/dist/lib/tracing/TraceIdInterceptorModule.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TraceIdInterceptorModule = void 0;
+const TraceIdContext_1 = require("@coast/service-common/trace/TraceIdContext");
+class TraceIdInterceptorModule {
+    static forRootAsync(interceptor) {
+        return {
+            exports: [interceptor],
+            module: TraceIdInterceptorModule,
+            providers: [interceptor, TraceIdContext_1.TraceIdContext],
+        };
+    }
+}
+exports.TraceIdInterceptorModule = TraceIdInterceptorModule;
+//# sourceMappingURL=TraceIdInterceptorModule.js.map

package/dist/lib/tracing/TraceIdInterceptorModule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TraceIdInterceptorModule.js","sourceRoot":"","sources":["../../../lib/tracing/TraceIdInterceptorModule.ts"],"names":[],"mappings":";;;AAAA,+EAA4E;AAM5E,MAAa,wBAAwB;IACjC,MAAM,CAAC,YAAY,CAAC,WAAgD;QAChE,OAAO;YACH,OAAO,EAAE,CAAC,WAAW,CAAC;YACtB,MAAM,EAAE,wBAAwB;YAChC,SAAS,EAAE,CAAC,WAAW,EAAE,+BAAc,CAAC;SAC3C,CAAC;IACN,CAAC;CACJ;AARD,4DAQC"}