@globalart/nestjs-logger 1.2.0 → 1.4.0

package/dist/index.d.cts

@@ -363,12 +363,16 @@ interface LogEntry {
   readonly context?: string;
   readonly metadata?: Record<string, unknown>;
   readonly trace?: string;
+  readonly traceId?: string;
+  readonly spanId?: string;
 }
 interface LogOptions {
-  message: any;
+  message: string;
   context?: string;
-  metadata?: any;
+  metadata?: Record<string, unknown>;
   trace?: string;
+  traceId?: string;
+  spanId?: string;
 }
 interface HttpRequest {
   readonly id: string;
@@ -394,6 +398,8 @@ interface HttpRequestLogEntry {
   readonly res: HttpResponse;
   readonly responseTime: number;
   readonly msg: string;
+  readonly traceId?: string;
+  readonly spanId?: string;
 }
 interface ExcludeOption {
   method: RequestMethod;
@@ -485,6 +491,8 @@ declare class LoggerService implements LoggerService$1, ILogger {
   verbose(options: LogOptions): void;
   logHttpRequest(entry: HttpRequestLogEntry): void;
   private writeLog;
+  private resolveTraceIds;
+  private enrichWithTraceIds;
 }
 //#endregion
 //#region src/core/http-logger.interceptor.d.ts

package/dist/index.d.mts

@@ -363,12 +363,16 @@ interface LogEntry {
   readonly context?: string;
   readonly metadata?: Record<string, unknown>;
   readonly trace?: string;
+  readonly traceId?: string;
+  readonly spanId?: string;
 }
 interface LogOptions {
-  message: any;
+  message: string;
   context?: string;
-  metadata?: any;
+  metadata?: Record<string, unknown>;
   trace?: string;
+  traceId?: string;
+  spanId?: string;
 }
 interface HttpRequest {
   readonly id: string;
@@ -394,6 +398,8 @@ interface HttpRequestLogEntry {
   readonly res: HttpResponse;
   readonly responseTime: number;
   readonly msg: string;
+  readonly traceId?: string;
+  readonly spanId?: string;
 }
 interface ExcludeOption {
   method: RequestMethod;
@@ -485,6 +491,8 @@ declare class LoggerService implements LoggerService$1, ILogger {
   verbose(options: LogOptions): void;
   logHttpRequest(entry: HttpRequestLogEntry): void;
   private writeLog;
+  private resolveTraceIds;
+  private enrichWithTraceIds;
 }
 //#endregion
 //#region src/core/http-logger.interceptor.d.ts

package/dist/index.mjs

@@ -7262,6 +7262,30 @@ const DEFAULT_LOGGER_CONFIG = {
 	logRequests: false
 };
 
+//#endregion
+//#region src/utils/opentelemetry-trace.ts
+let cachedGetter = void 0;
+function createGetter() {
+	try {
+		const api = __require("@opentelemetry/api");
+		return () => {
+			const span = api.trace?.getSpan?.(api.context?.active?.());
+			if (!span) return {};
+			const { spanId, traceId } = span.spanContext?.() ?? {};
+			return spanId && traceId ? {
+				spanId,
+				traceId
+			} : {};
+		};
+	} catch {
+		return () => ({});
+	}
+}
+function getOpenTelemetryTraceIds() {
+	if (cachedGetter === void 0) cachedGetter = createGetter();
+	return cachedGetter?.() ?? {};
+}
+
 //#endregion
 //#region \0@oxc-project+runtime@0.112.0/helpers/decorateMetadata.js
 function __decorateMetadata(k, v) {
@@ -7291,36 +7315,60 @@ let LoggerService = class LoggerService {
 		this.context = context;
 	}
 	log(options) {
-		this.writeLog("info", options.message, options.context, options.metadata);
+		this.writeLog("info", options);
 	}
 	error(options) {
-		this.writeLog("error", options.message, options.context, options.metadata, options.trace);
+		this.writeLog("error", options);
 	}
 	warn(options) {
-		this.writeLog("warn", options.message, options.context, options.metadata);
+		this.writeLog("warn", options);
 	}
 	debug(options) {
-		this.writeLog("debug", options.message, options.context, options.metadata);
+		this.writeLog("debug", options);
 	}
 	verbose(options) {
-		this.writeLog("verbose", options.message, options.context, options.metadata);
+		this.writeLog("verbose", options);
 	}
 	logHttpRequest(entry) {
-		const formatted = this.formatter.formatHttpRequest(entry);
+		const enriched = this.enrichWithTraceIds(entry);
+		const formatted = this.formatter.formatHttpRequest(enriched);
 		this.writer.write(formatted);
 	}
-	writeLog(level, message, context, metadata, trace) {
+	writeLog(level, options) {
+		const { traceId, spanId } = this.resolveTraceIds(options);
 		const entry = {
 			level,
-			message,
+			message: options.message,
 			timestamp: /* @__PURE__ */ new Date(),
-			context: context ?? this.context ?? this.contextResolver.resolve(),
-			metadata,
-			trace
+			context: options.context ?? this.context ?? this.contextResolver.resolve(),
+			metadata: options.metadata,
+			trace: options.trace,
+			traceId,
+			spanId
 		};
 		const formatted = this.formatter.format(entry);
 		this.writer.write(formatted);
 	}
+	resolveTraceIds(options) {
+		if (options.traceId && options.spanId) return {
+			traceId: options.traceId,
+			spanId: options.spanId
+		};
+		const otel = getOpenTelemetryTraceIds();
+		return {
+			traceId: options.traceId ?? otel.traceId,
+			spanId: options.spanId ?? otel.spanId
+		};
+	}
+	enrichWithTraceIds(entry) {
+		if (entry.traceId && entry.spanId) return entry;
+		const otel = getOpenTelemetryTraceIds();
+		return {
+			...entry,
+			traceId: entry.traceId ?? otel.traceId,
+			spanId: entry.spanId ?? otel.spanId
+		};
+	}
 };
 LoggerService = __decorate([Injectable(), __decorateMetadata("design:paramtypes", [
 	Object,
@@ -7649,8 +7697,15 @@ let TextFormatter = class TextFormatter extends BaseFormatter {
 		this.addContext(parts, entry);
 		this.addMessage(parts, entry);
 		this.addMetadata(parts, entry);
+		this.addTraceIds(parts, entry);
 		return parts;
 	}
+	addTraceIds(parts, entry) {
+		if (entry.traceId || entry.spanId) {
+			const ids = [entry.traceId, entry.spanId].filter(Boolean).join("/");
+			parts.push(this.colorize(`[${ids}]`, "magenta"));
+		}
+	}
 	addTimestamp(parts, entry) {
 		if (this.options.timestamp) {
 			const timestamp = this.colorize(`[${this.formatTimestamp(entry.timestamp)}]`, "gray");
@@ -7710,6 +7765,8 @@ let JsonFormatter = class JsonFormatter extends BaseFormatter {
 		if (entry.context) result.context = entry.context;
 		if (entry.metadata) result.metadata = entry.metadata;
 		if (entry.trace) result.trace = entry.trace;
+		if (entry.traceId) result.traceId = entry.traceId;
+		if (entry.spanId) result.spanId = entry.spanId;
 		return result;
 	}
 };
@@ -7719,10 +7776,23 @@ JsonFormatter = __decorate([Injectable()], JsonFormatter);
 //#region src/formatters/pino-formatter.ts
 let PinoFormatter = class PinoFormatter extends BaseFormatter {
 	format(entry) {
-		return JSON.stringify(entry);
+		const obj = {
+			level: entry.level,
+			message: entry.message,
+			timestamp: entry.timestamp,
+			context: entry.context,
+			metadata: entry.metadata,
+			trace: entry.trace
+		};
+		if (entry.traceId) obj.traceId = entry.traceId;
+		if (entry.spanId) obj.spanId = entry.spanId;
+		return JSON.stringify(obj);
 	}
 	formatHttpRequest(entry) {
-		const jsonString = JSON.stringify(entry);
+		const obj = { ...entry };
+		if (entry.traceId) obj.traceId = entry.traceId;
+		if (entry.spanId) obj.spanId = entry.spanId;
+		const jsonString = JSON.stringify(obj);
 		return this.options.colors ? this.colorize(jsonString, this.getColorForLevel(entry.level)) : jsonString;
 	}
 };