@forklaunch/core 0.15.5 → 0.15.7

package/lib/http/index.mjs

@@ -556,7 +556,6 @@ import { isNever as isNever2 } from "@forklaunch/common";
 import { trace as trace2 } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
 import pino from "pino";
-import * as PinoPretty from "pino-pretty";
 
 // src/http/guards/isLoggerMeta.ts
 function isLoggerMeta(arg) {
@@ -594,6 +593,15 @@ function normalizeLogArgs(args) {
   for (const arg of args) {
     if (typeof arg === "string" && message === "") {
       message = arg;
+    } else if (arg instanceof Error) {
+      metaObjects.push({
+        err: {
+          message: arg.message,
+          name: arg.name,
+          stack: arg.stack,
+          ...Object.keys(arg).length > 0 ? arg : {}
+        }
+      });
     } else if (arg && typeof arg === "object" && !Array.isArray(arg)) {
       metaObjects.push(arg);
     } else {
@@ -626,13 +634,6 @@ ${JSON.stringify(metadata, null, 2)}` : ""}`;
 var PinoLogger = class _PinoLogger {
   pinoLogger;
   meta;
-  prettyPrinter = PinoPretty.prettyFactory({
-    colorize: true,
-    // Add error handling options
-    errorLikeObjectKeys: ["err", "error"],
-    ignore: "pid,hostname",
-    translateTime: "SYS:standard"
-  });
   constructor(level, meta2 = {}) {
     this.pinoLogger = pino({
       level: level || "info",
@@ -663,6 +664,8 @@ var PinoLogger = class _PinoLogger {
       }
       return true;
     });
+    const [errorMetadata] = normalizeLogArgs(filteredArgs);
+    Object.assign(meta2, errorMetadata);
     const activeSpan = trace2.getActiveSpan();
     if (activeSpan) {
       const activeSpanContext = activeSpan.spanContext();
@@ -715,38 +718,38 @@ function logger(level, meta2 = {}) {
 
 // src/http/telemetry/openTelemetryCollector.ts
 var OpenTelemetryCollector = class {
-  logger;
-  serviceName;
-  metrics;
+  #logger;
+  #serviceName;
+  #metrics;
   // scoped creation and create this in middleware when api execute. Also add correlation id
   constructor(serviceName, level, metricDefinitions) {
-    this.serviceName = serviceName;
-    this.logger = logger(level || "info");
-    this.metrics = {};
+    this.#serviceName = serviceName;
+    this.#logger = logger(level || "info");
+    this.#metrics = {};
     for (const [metricId, metricType] of Object.entries(
       metricDefinitions ?? {}
     )) {
       switch (metricType) {
         case "counter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createCounter(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createCounter(metricId);
           break;
         case "gauge":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createGauge(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createGauge(metricId);
           break;
         case "histogram":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createHistogram(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createHistogram(metricId);
           break;
         case "upDownCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createUpDownCounter(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createUpDownCounter(metricId);
           break;
         case "observableCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableCounter(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createObservableCounter(metricId);
           break;
         case "observableGauge":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableGauge(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createObservableGauge(metricId);
           break;
         case "observableUpDownCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableUpDownCounter(metricId);
+          this.#metrics[metricId] = metrics.getMeter(this.#serviceName).createObservableUpDownCounter(metricId);
           break;
       }
     }
@@ -756,25 +759,25 @@ var OpenTelemetryCollector = class {
     );
   }
   log(level, ...args) {
-    this.logger.log(level, ...args);
+    this.#logger.log(level, ...args);
   }
   info = (msg, ...args) => {
-    this.logger.log("info", msg, ...args);
+    this.#logger.log("info", msg, ...args);
   };
   error = (msg, ...args) => {
-    this.logger.log("error", msg, ...args);
+    this.#logger.log("error", msg, ...args);
   };
   warn = (msg, ...args) => {
-    this.logger.log("warn", msg, ...args);
+    this.#logger.log("warn", msg, ...args);
   };
   debug = (msg, ...args) => {
-    this.logger.log("debug", msg, ...args);
+    this.#logger.log("debug", msg, ...args);
   };
   trace = (msg, ...args) => {
-    this.logger.log("trace", msg, ...args);
+    this.#logger.log("trace", msg, ...args);
   };
   getMetric(metricId) {
-    return this.metrics[metricId];
+    return this.#metrics[metricId];
   }
 };
 dotenv.config({ path: getEnvVar2("DOTENV_FILE_PATH") });
@@ -3964,6 +3967,7 @@ export {
   HTTPStatuses,
   OPENAPI_DEFAULT_VERSION,
   OpenTelemetryCollector,
+  PinoLogger,
   createHmacToken,
   delete_,
   discriminateAuthMethod,