sasai-common-utils 1.0.49 → 1.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasai-common-utils",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Reusable utility library for common logging and other shared features.",
   "main": "src/index.js",
   "scripts": {

package/src/features/logger/index.js

@@ -7,9 +7,10 @@ let contextProvider = () => ({});
 let globalConfig = {};
 let loggerInstance;
 let pinoLogger;
+let pinoTransport;
 
 function setContextProvider(provider) {
-  contextProvider = provider;
+  contextProvider = typeof provider === "function" ? provider : () => ({});
 }
 
 function setGlobalConfig(config) {
@@ -29,6 +30,54 @@ function cleanString(str) {
   return typeof str === "string" ? str.replace(/\\"/g, '"') : str;
 }
 
+function safeJsonStringify(value) {
+  try {
+    return JSON.stringify(value);
+  } catch (error) {
+    return JSON.stringify({
+      message: "Failed to stringify log payload",
+      error: error?.message || "Unknown stringify error",
+    });
+  }
+}
+
+function decodeTokenDetails(headers = {}) {
+  try {
+    const authHeader = headers?.authorization || headers?.Authorization;
+    const token = authHeader?.split(" ")[1];
+    const payload = jwt.decode(token, { complete: true })?.payload;
+
+    return {
+      customerId: payload?.customerId || "",
+      mid: payload?.mid || "",
+      tenantId: payload?.tenantId || "",
+    };
+  } catch (error) {
+    return {
+      customerId: "",
+      mid: "",
+      tenantId: "",
+    };
+  }
+}
+
+function getTraceContext() {
+  try {
+    const traceContext = contextProvider?.() || {};
+    return {
+      trace_id: traceContext?.trace_id || "",
+      span_id: traceContext?.span_id || "",
+      parent_span_id: traceContext?.parent_span_id || "",
+    };
+  } catch (error) {
+    return {
+      trace_id: "",
+      span_id: "",
+      parent_span_id: "",
+    };
+  }
+}
+
 function initPinoLogger() {
   const pinoOptions = {
     timestamp: false,
@@ -37,8 +86,8 @@ function initPinoLogger() {
         ? "silent"
         : globalConfig.LOG_LEVEL,
     base: {
-      service_name: globalConfig.SERVICE_NAME,
-      environment: globalConfig.NODE_ENV || "unknown",
+      "service.name": globalConfig.SERVICE_NAME,
+      "deployment.environment": globalConfig.NODE_ENV,
     },
     formatters: {
       level(label) {
@@ -59,21 +108,25 @@ function initPinoLogger() {
         url: globalConfig.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
         protocol: globalConfig.OTEL_EXPORTER_OTLP_LOGS_PROTOCOL,
         resourceAttributes: {
-          "service.name": globalConfig.SERVICE_NAME || "bff-service",
-          "deployment.environment": globalConfig.NODE_ENV || "unknown",
+          "service.name": globalConfig.SERVICE_NAME,
+          "deployment.environment": globalConfig.NODE_ENV,
         },
       },
     };
 
-    const transport = pino.transport({
+    pinoTransport = pino.transport({
       targets: [stdoutTarget, otelTarget],
     });
 
-    transport.on("error", (err) => {
+    pinoTransport.on("error", (err) => {
       console.error("Pino OTEL transport error:", err);
     });
 
-    pinoLogger = pino(pinoOptions, transport);
+    pinoTransport.on("close", () => {
+      console.warn("Pino OTEL transport closed");
+    });
+
+    pinoLogger = pino(pinoOptions, pinoTransport);
   } else {
     let destination;
     if (globalConfig.DEBUG_MODE === DEBUG_MODES.FILE) {
@@ -83,14 +136,29 @@ function initPinoLogger() {
     }
     pinoLogger = pino(pinoOptions, destination);
   }
+
+  try {
+    pinoLogger.info({
+      message: "Pino logger initialized",
+      "service.name": globalConfig.SERVICE_NAME,
+      "deployment.environment": globalConfig.NODE_ENV,
+      otel_logs_endpoint: globalConfig.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT || "",
+      otel_logs_protocol: globalConfig.OTEL_EXPORTER_OTLP_LOGS_PROTOCOL || "",
+    });
+  } catch (error) {
+    console.error("Failed to write startup log:", error);
+  }
 }
 
 function emitLog(level, data) {
   if (!pinoLogger) return;
-  const { trace, span, message, ...rest } = data;
+
+  const { trace, span, parentSpan, message, ...rest } = data;
+
   pinoLogger[level]({
     trace_id: trace || undefined,
     span_id: span || undefined,
+    parent_span_id: parentSpan || undefined,
     message: cleanString(message),
     ...rest,
   });
@@ -104,20 +172,17 @@ function createLogger(config) {
 
   loggerInstance = {
     logInfo: (message, data = {}) => {
-      const traceContext = contextProvider();
-      const authHeader =
-        data?.headers?.authorization || data?.headers?.Authorization;
-      const tokenData = jwt.decode(authHeader?.split(" ")[1], {
-        complete: true,
-      })?.payload;
+      const traceContext = getTraceContext();
+      const tokenDetails = decodeTokenDetails(data?.headers || {});
 
       const logData = {
-        trace: traceContext?.trace_id || "",
-        span: traceContext?.span_id || "",
+        trace: traceContext.trace_id,
+        span: traceContext.span_id,
+        parentSpan: traceContext.parent_span_id,
         thread: "",
         class: "",
-        message: JSON.stringify({
-          step: data?.step,
+        body: safeJsonStringify({
+          step: data?.step || "",
           message,
           method: data?.method?.toUpperCase() || "",
           parameters: data?.parameters || "",
@@ -125,11 +190,7 @@ function createLogger(config) {
           headers: data?.headers || {},
           responseHeaders: data?.responseHeaders || {},
           api: data?.api || "",
-          tokenDetails: {
-            customerId: tokenData?.customerId || "",
-            mid: tokenData?.mid || "",
-            tenantId: tokenData?.tenantId || "",
-          },
+          tokenDetails,
           responseStatus: data?.statusCode || "",
           requestBody: data?.requestBody || {},
           responseBody: data?.responseBody || {},
@@ -144,36 +205,38 @@ function createLogger(config) {
     },
 
     logError: (data = {}, req = {}) => {
-      const traceContext = contextProvider();
+      const traceContext = getTraceContext();
       const errorResponse = data?.error?.response;
-      const authHeader =
-        data?.headers?.authorization || data?.headers?.Authorization;
-      const tokenData = jwt.decode(authHeader?.split(" ")[1], {
-        complete: true,
-      })?.payload;
+      const tokenDetails = decodeTokenDetails(
+        data?.headers ||
+          errorResponse?.config?.headers ||
+          req?.headers ||
+          {}
+      );
 
       const logData = {
-        trace: traceContext?.trace_id || "",
-        span: traceContext?.span_id || "",
+        trace: traceContext.trace_id,
+        span: traceContext.span_id,
+        parentSpan: traceContext.parent_span_id,
         thread: "",
         class: "",
-        message: JSON.stringify({
+        body: safeJsonStringify({
           step: data?.step || "",
-          message: data?.error?.message,
-          method: errorResponse?.config?.method?.toUpperCase(),
+          message: data?.error?.message || "",
+          method: errorResponse?.config?.method?.toUpperCase() || "",
           parameters: data?.parameters || "",
-          path: errorResponse?.config?.url || req?.originalUrl,
+          path: errorResponse?.config?.url || req?.originalUrl || "",
           responseStatus:
             errorResponse?.status || HTTP_STATUS_CODES.BAD_REQUEST,
-          headers: errorResponse?.config?.headers || {},
-          requestBody: errorResponse?.config?.body || req?.body,
+          headers: errorResponse?.config?.headers || req?.headers || {},
+          requestBody:
+            errorResponse?.config?.data ||
+            errorResponse?.config?.body ||
+            req?.body ||
+            {},
           responseBody: errorResponse?.data || {},
-          stack: data?.error?.stack,
-          tokenDetails: {
-            customerId: tokenData?.customerId || "",
-            mid: tokenData?.mid || "",
-            tenantId: tokenData?.tenantId || "",
-          },
+          stack: data?.error?.stack || "",
+          tokenDetails,
         }),
       };
 
@@ -185,15 +248,27 @@ function createLogger(config) {
     },
 
     logDebug: (message, data = {}) => {
-      const traceContext = contextProvider();
+      const traceContext = getTraceContext();
+
       emitLog("debug", {
-        trace: traceContext?.trace_id || "",
-        span: traceContext?.span_id || "",
-        message:
-          typeof message === "string" ? message : JSON.stringify(message),
+        trace: traceContext.trace_id,
+        span: traceContext.span_id,
+        parentSpan: traceContext.parent_span_id,
+        body:
+          typeof message === "string" ? message : safeJsonStringify(message),
         ...data,
       });
     },
+
+    flush: async () => {
+      try {
+        if (pinoTransport && typeof pinoTransport.flush === "function") {
+          await pinoTransport.flush();
+        }
+      } catch (error) {
+        console.error("Failed to flush pino transport:", error);
+      }
+    },
   };
 
   return loggerInstance;