xcally-nest-library 0.0.33 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xcally-nest-library",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/modules/logger/pino/logger.module.ts

@@ -3,6 +3,7 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { LoggerModule as LoggerModulePino } from 'nestjs-pino';
 import { LoggerService } from './logger.service';
 import { LOGGER_OPTIONS } from './constants';
+import { ClsModule } from 'nestjs-cls';
 
 export interface LoggerModuleOptions {
   'resource.service.name': string;
@@ -12,6 +13,7 @@ export interface LoggerModuleOptions {
   'resource.service.deployment.environment'?: string;
   'resource.service.deployment.id'?: string;
   'resource.service.deployment.revision'?: string;
+  autoLogging?: boolean;
 }
 
 @Global()
@@ -29,6 +31,7 @@ export class LoggerModule {
       providers,
       exports,
       imports: [
+        ClsModule,
         LoggerModulePino.forRootAsync({
           imports: [ConfigModule],
           inject: [ConfigService],
@@ -42,6 +45,7 @@ export class LoggerModule {
                   return 'info';
                 },
                 level: config.get('LOG_LEVEL') || 'info',
+                autoLogging: options.autoLogging || true,
                 // customErrorMessage?: ((req: IM, res: SR, error: Error) => string) | undefined;
                 // customErrorMessage: (req, res, error) => {
                 //   return 'Auto generated error' + error?.message;

package/src/modules/logger/pino/logger.service.ts

@@ -2,6 +2,7 @@ import { Inject, Injectable } from '@nestjs/common';
 import { PinoLogger } from 'nestjs-pino';
 import { LOGGER_OPTIONS } from './constants';
 import { LoggerModuleOptions } from './logger.module';
+import { ClsService } from 'nestjs-cls';
 /**
  * @interface LoggerMeta
  * @description Interface representing metadata for logging purposes.
@@ -17,19 +18,26 @@ export class LoggerService {
   constructor(
     @Inject(LOGGER_OPTIONS) private readonly loggerOptions: LoggerModuleOptions,
     private readonly logger: PinoLogger,
+    private readonly cls: ClsService,
   ) {}
 
+  private withAdditionalTraceId(meta?: LoggerMeta) {
+    const xcTraceId: string | undefined = this.cls.get('xcTraceId');
+    const xcActionId: string | undefined = this.cls.get('xcActionId');
+    return { ...meta, xcTraceId ,xcActionId};
+  }
+
   debug(msg: string, meta?: LoggerMeta): void {
-    this.logger.debug({ meta, ...this.loggerOptions }, msg);
+    this.logger.debug({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
   }
   warn(msg: string, meta?: LoggerMeta): void {
-    this.logger.warn({ meta, ...this.loggerOptions }, msg);
+    this.logger.warn({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
   }
   error(msg: string, meta?: LoggerMeta): void {
-    this.logger.error({ meta, ...this.loggerOptions }, msg);
+    this.logger.error({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
   }
   fatal(msg: string, meta?: LoggerMeta): void {
-    this.logger.fatal({ meta, ...this.loggerOptions }, msg);
+    this.logger.fatal({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
   }
 
   info(msg: string, meta?: LoggerMeta): void {
@@ -42,10 +50,23 @@ export class LoggerService {
     //   span.end();
     // });
 
-    this.logger.info({ meta, ...this.loggerOptions }, msg);
+    this.logger.info({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
   }
 
   trace(msg: string, meta?: LoggerMeta): void {
-    this.logger.trace({ meta, ...this.loggerOptions }, msg);
+    this.logger.trace({ meta: this.withAdditionalTraceId(meta), ...this.loggerOptions }, msg);
+  }
+
+  // Esempio di uso corretto:
+  someMethod() {
+    this.cls.run(() => {
+      this.cls.set('xcTraceId', 'my-trace-id');
+      // Tutto il codice asincrono che parte da qui vedrà il valore
+      this.logger.info('Log con trace id'); // Qui funziona
+      setTimeout(() => {
+        this.logger.info('Anche qui funziona');
+      }, 100);
+    });
+    // Qui fuori il valore NON è disponibile
   }
 }