xcally-nest-library 0.0.34 → 0.0.35

package/package.json

@@ -1,27 +1,11 @@
 {
   "name": "xcally-nest-library",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "",
   "license": "UNLICENSED",
-  "scripts": {
-    "bump:patch": "npm version patch -m \"Bump version to %s\"",
-    "prepublishOnly": "npm run build",
-    "build": "tsc",
-    "build:watch": "rimraf dist && tsc-watch -b -v",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "prettier:check": "prettier --check ./**/*.{ts,js,json,*rc}",
-    "prettier:write": "prettier --write ./**/*.{ts,js,json,*rc}",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "lib:link": "pnpm link --global",
-    "lib:unlink": "pnpm unlink xcally-nest-libs --global"
-  },
   "dependencies": {
     "@nestjs/config": "^4.0.0",
     "class-transformer": "^0.5.1",
@@ -53,5 +37,20 @@
     "@nestjs/common": "^10.0.0 || ^11.0.0",
     "@nestjs/core": "^10.0.0 || ^11.0.0",
     "@nestjs/microservices": "^10.0.0 || ^11.0.0"
+  },
+  "scripts": {
+    "bump:patch": "npm version patch -m \"Bump version to %s\"",
+    "build": "tsc",
+    "build:watch": "rimraf dist && tsc-watch -b -v",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "prettier:check": "prettier --check ./**/*.{ts,js,json,*rc}",
+    "prettier:write": "prettier --write ./**/*.{ts,js,json,*rc}",
+    "start": "nest start",
+    "start:dev": "nest start --watch",
+    "start:debug": "nest start --debug --watch",
+    "start:prod": "node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "lib:link": "pnpm link --global",
+    "lib:unlink": "pnpm unlink xcally-nest-libs --global"
   }
-}
+}

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;
@@ -30,6 +31,7 @@ export class LoggerModule {
       providers,
       exports,
       imports: [
+        ClsModule,
         LoggerModulePino.forRootAsync({
           imports: [ConfigModule],
           inject: [ConfigService],

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
   }
 }