refactor: optimize pinoLoggerAdapter

Author: 7eliassen

src/infrastructure/logging/pinoLoggerAdapter.ts

@@ -1,35 +1,38 @@
 import type pino from 'pino';
 import type { DomainLogger } from '@domain/service/shared/logger.js';
-import { getRequestLogger } from '@infrastructure/logging/index.js';
+import { getLogger } from '@infrastructure/logging/index.js';
+import { getCurrentReqId } from '@infrastructure/logging/reqId.context.js';
 
 /**
  * Adapter that wraps a pino.Logger to implement the DomainLogger interface
  * This allows the infrastructure's pino logger to be injected into domain services
  * without the domain layer depending directly on pino
  */
 export class PinoDomainLoggerAdapter implements DomainLogger {
+  private readonly baseLogger: pino.Logger;
+
+  constructor() {
+    this.baseLogger = getLogger('domain');
+  }
+
   public debug(msg: string, meta?: Record<string, unknown>): void {
-    this.getReqLogger().debug({
-      msg,
-      ...meta,
-    });
+    const reqId = getCurrentReqId();
+
+    this.baseLogger.debug({ ...meta,
+      reqId }, msg);
   }
 
   public info(msg: string, meta?: Record<string, unknown>): void {
-    this.getReqLogger().info({
-      msg,
-      ...meta,
-    });
+    const reqId = getCurrentReqId();
+
+    this.baseLogger.info({ ...meta,
+      reqId }, msg);
   }
 
   public warn(msg: string, meta?: Record<string, unknown>): void {
-    this.getReqLogger().warn({
-      msg,
-      ...meta,
-    });
-  }
+    const reqId = getCurrentReqId();
 
-  private getReqLogger(): pino.Logger {
-    return getRequestLogger('domain');
+    this.baseLogger.warn({ ...meta,
+      reqId }, msg);
   }
 }