@globalart/nestjs-logger 2.4.0 → 2.4.3

package/dist/index.d.cts

@@ -440,14 +440,33 @@ interface IRequestIdGenerator {
   generate(): string;
 }
 //#endregion
+//#region src/core/trace-context.service.d.ts
+declare class TraceContextService {
+  /**
+   * Sets trace-id for the current async context.
+   * Affects all subsequent logs within the same request/async scope.
+   */
+  setTraceId(traceId: string): void;
+  /**
+   * Returns the current trace-id from the async context.
+   */
+  getTraceId(): string | undefined;
+  /**
+   * Runs a callback in a new isolated async context with the given trace-id.
+   * Does not affect the parent context.
+   */
+  runWithTraceId<T>(traceId: string, fn: () => T): T;
+}
+//#endregion
 //#region src/core/logger.service.d.ts
 declare class LoggerService implements LoggerService$1, ILogger {
   private readonly config;
   private readonly formatter;
   private readonly writer;
   private readonly contextResolver;
+  private readonly traceContextService;
   private context?;
-  constructor(config: LoggerConfiguration, formatter: ILogFormatter, writer: ILogWriter, contextResolver: IContextResolver);
+  constructor(config: LoggerConfiguration, formatter: ILogFormatter, writer: ILogWriter, contextResolver: IContextResolver, traceContextService: TraceContextService);
   setContext(context: string): void;
   log(options: LogOptions): void;
   error(options: LogOptions): void;
@@ -511,24 +530,6 @@ declare class LoggerModule extends ConfigurableModuleClass implements NestModule
   private static createDynamicContextProviders;
 }
 //#endregion
-//#region src/core/trace-context.service.d.ts
-declare class TraceContextService {
-  /**
-   * Sets trace-id for the current async context.
-   * Affects all subsequent logs within the same request/async scope.
-   */
-  setTraceId(traceId: string): void;
-  /**
-   * Returns the current trace-id from the async context.
-   */
-  getTraceId(): string | undefined;
-  /**
-   * Runs a callback in a new isolated async context with the given trace-id.
-   * Does not affect the parent context.
-   */
-  runWithTraceId<T>(traceId: string, fn: () => T): T;
-}
-//#endregion
 //#region src/constants/index.d.ts
 declare const LOGGER_CONTEXT_METADATA: unique symbol;
 declare const LOGGER_METADATA_METADATA: unique symbol;

package/dist/index.d.mts

@@ -440,14 +440,33 @@ interface IRequestIdGenerator {
   generate(): string;
 }
 //#endregion
+//#region src/core/trace-context.service.d.ts
+declare class TraceContextService {
+  /**
+   * Sets trace-id for the current async context.
+   * Affects all subsequent logs within the same request/async scope.
+   */
+  setTraceId(traceId: string): void;
+  /**
+   * Returns the current trace-id from the async context.
+   */
+  getTraceId(): string | undefined;
+  /**
+   * Runs a callback in a new isolated async context with the given trace-id.
+   * Does not affect the parent context.
+   */
+  runWithTraceId<T>(traceId: string, fn: () => T): T;
+}
+//#endregion
 //#region src/core/logger.service.d.ts
 declare class LoggerService implements LoggerService$1, ILogger {
   private readonly config;
   private readonly formatter;
   private readonly writer;
   private readonly contextResolver;
+  private readonly traceContextService;
   private context?;
-  constructor(config: LoggerConfiguration, formatter: ILogFormatter, writer: ILogWriter, contextResolver: IContextResolver);
+  constructor(config: LoggerConfiguration, formatter: ILogFormatter, writer: ILogWriter, contextResolver: IContextResolver, traceContextService: TraceContextService);
   setContext(context: string): void;
   log(options: LogOptions): void;
   error(options: LogOptions): void;
@@ -511,24 +530,6 @@ declare class LoggerModule extends ConfigurableModuleClass implements NestModule
   private static createDynamicContextProviders;
 }
 //#endregion
-//#region src/core/trace-context.service.d.ts
-declare class TraceContextService {
-  /**
-   * Sets trace-id for the current async context.
-   * Affects all subsequent logs within the same request/async scope.
-   */
-  setTraceId(traceId: string): void;
-  /**
-   * Returns the current trace-id from the async context.
-   */
-  getTraceId(): string | undefined;
-  /**
-   * Runs a callback in a new isolated async context with the given trace-id.
-   * Does not affect the parent context.
-   */
-  runWithTraceId<T>(traceId: string, fn: () => T): T;
-}
-//#endregion
 //#region src/constants/index.d.ts
 declare const LOGGER_CONTEXT_METADATA: unique symbol;
 declare const LOGGER_METADATA_METADATA: unique symbol;

package/dist/index.mjs

@@ -2,8 +2,8 @@ import { createRequire } from "node:module";
 import { ConfigurableModuleBuilder, Inject, Injectable, Module, RequestMethod, SetMetadata } from "@nestjs/common";
 import { APP_INTERCEPTOR, Reflector } from "@nestjs/core";
 import { hostname } from "os";
-import { AsyncLocalStorage } from "async_hooks";
 import { nanoid } from "nanoid";
+import { AsyncLocalStorage } from "async_hooks";
 import { randomBytes, randomUUID } from "crypto";
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
@@ -7074,11 +7074,6 @@ function getOpenTelemetryTraceIds() {
 //#region src/core/trace-context.storage.ts
 const traceContextStorage = new AsyncLocalStorage();
 //#endregion
-//#region \0@oxc-project+runtime@0.115.0/helpers/decorateMetadata.js
-function __decorateMetadata(k, v) {
-	if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
-//#endregion
 //#region \0@oxc-project+runtime@0.115.0/helpers/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -7087,7 +7082,39 @@ function __decorate(decorators, target, key, desc) {
 	return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 //#endregion
+//#region src/core/trace-context.service.ts
+let TraceContextService = class TraceContextService {
+	/**
+	* Sets trace-id for the current async context.
+	* Affects all subsequent logs within the same request/async scope.
+	*/
+	setTraceId(traceId) {
+		const store = traceContextStorage.getStore();
+		if (store) store.correlationId = traceId;
+	}
+	/**
+	* Returns the current trace-id from the async context.
+	*/
+	getTraceId() {
+		return traceContextStorage.getStore()?.correlationId;
+	}
+	/**
+	* Runs a callback in a new isolated async context with the given trace-id.
+	* Does not affect the parent context.
+	*/
+	runWithTraceId(traceId, fn) {
+		return traceContextStorage.run({ correlationId: traceId }, fn);
+	}
+};
+TraceContextService = __decorate([Injectable()], TraceContextService);
+//#endregion
+//#region \0@oxc-project+runtime@0.115.0/helpers/decorateMetadata.js
+function __decorateMetadata(k, v) {
+	if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
+//#endregion
 //#region src/core/logger.service.ts
+var _ref$2;
 const PINO_LEVEL_TO_LOG_LEVEL = {
 	60: "error",
 	50: "error",
@@ -7098,11 +7125,12 @@ const PINO_LEVEL_TO_LOG_LEVEL = {
 };
 let LoggerService = class LoggerService {
 	context;
-	constructor(config, formatter, writer, contextResolver) {
+	constructor(config, formatter, writer, contextResolver, traceContextService) {
 		this.config = config;
 		this.formatter = formatter;
 		this.writer = writer;
 		this.contextResolver = contextResolver;
+		this.traceContextService = traceContextService;
 	}
 	setContext(context) {
 		this.context = context;
@@ -7152,8 +7180,8 @@ let LoggerService = class LoggerService {
 			traceId: source.traceId,
 			spanId: source.spanId
 		};
+		const correlationId = this.traceContextService.getTraceId();
 		const otel = getOpenTelemetryTraceIds();
-		const correlationId = traceContextStorage.getStore()?.correlationId;
 		return {
 			traceId: source.traceId ?? otel.traceId ?? correlationId,
 			spanId: source.spanId ?? otel.spanId ?? nanoid(10)
@@ -7164,7 +7192,8 @@ LoggerService = __decorate([Injectable(), __decorateMetadata("design:paramtypes"
 	Object,
 	Object,
 	Object,
-	Object
+	Object,
+	typeof (_ref$2 = typeof TraceContextService !== "undefined" && TraceContextService) === "function" ? _ref$2 : Object
 ])], LoggerService);
 //#endregion
 //#region \0@oxc-project+runtime@0.115.0/helpers/decorateParam.js
@@ -7657,32 +7686,6 @@ let TraceContextMiddleware = class TraceContextMiddleware {
 };
 TraceContextMiddleware = __decorate([Injectable()], TraceContextMiddleware);
 //#endregion
-//#region src/core/trace-context.service.ts
-let TraceContextService = class TraceContextService {
-	/**
-	* Sets trace-id for the current async context.
-	* Affects all subsequent logs within the same request/async scope.
-	*/
-	setTraceId(traceId) {
-		const store = traceContextStorage.getStore();
-		if (store) store.correlationId = traceId;
-	}
-	/**
-	* Returns the current trace-id from the async context.
-	*/
-	getTraceId() {
-		return traceContextStorage.getStore()?.correlationId;
-	}
-	/**
-	* Runs a callback in a new isolated async context with the given trace-id.
-	* Does not affect the parent context.
-	*/
-	runWithTraceId(traceId, fn) {
-		return traceContextStorage.run({ correlationId: traceId }, fn);
-	}
-};
-TraceContextService = __decorate([Injectable()], TraceContextService);
-//#endregion
 //#region src/core/logger.module.ts
 const { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN, OPTIONS_TYPE, ASYNC_OPTIONS_TYPE } = new ConfigurableModuleBuilder().setClassMethodName("forRoot").setExtras({ global: true }, (definition, extras) => ({
 	...definition,
@@ -7766,18 +7769,19 @@ let LoggerModule = class LoggerModule extends ConfigurableModuleClass {
 			},
 			{
 				provide: LOGGER_SERVICE_TOKEN,
-				useFactory: (config, formatterFactory, writer, contextResolver) => {
+				useFactory: (config, formatterFactory, writer, contextResolver, traceContextService) => {
 					return new LoggerService(config, formatterFactory.create(config.format, {
 						colors: config.colors,
 						timestamp: config.timestamp,
 						context: config.context
-					}), writer, contextResolver);
+					}), writer, contextResolver, traceContextService);
 				},
 				inject: [
 					LOGGER_CONFIG_TOKEN,
 					FormatterFactory,
 					ConsoleWriter,
-					ContextResolver
+					ContextResolver,
+					TraceContextService
 				]
 			},
 			{