@globalart/nestjs-logger 2.4.0 → 2.4.3

package/dist/index.cjs

@@ -5,8 +5,8 @@ var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).export
 let _nestjs_common = require("@nestjs/common");
 let _nestjs_core = require("@nestjs/core");
 let os = require("os");
-let async_hooks = require("async_hooks");
 let nanoid = require("nanoid");
+let async_hooks = require("async_hooks");
 let crypto = require("crypto");
 //#region ../../node_modules/.pnpm/rxjs@7.8.2/node_modules/rxjs/dist/cjs/internal/util/isFunction.js
 var require_isFunction = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -7073,11 +7073,6 @@ function getOpenTelemetryTraceIds() {
 //#region src/core/trace-context.storage.ts
 const traceContextStorage = new async_hooks.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;
@@ -7086,7 +7081,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([(0, _nestjs_common.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",
@@ -7097,11 +7124,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;
@@ -7151,8 +7179,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 ?? (0, nanoid.nanoid)(10)
@@ -7163,7 +7191,8 @@ LoggerService = __decorate([(0, _nestjs_common.Injectable)(), __decorateMetadata
 	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
@@ -7656,32 +7685,6 @@ let TraceContextMiddleware = class TraceContextMiddleware {
 };
 TraceContextMiddleware = __decorate([(0, _nestjs_common.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([(0, _nestjs_common.Injectable)()], TraceContextService);
-//#endregion
 //#region src/core/logger.module.ts
 const { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN, OPTIONS_TYPE, ASYNC_OPTIONS_TYPE } = new _nestjs_common.ConfigurableModuleBuilder().setClassMethodName("forRoot").setExtras({ global: true }, (definition, extras) => ({
 	...definition,
@@ -7765,18 +7768,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
 				]
 			},
 			{