@forklaunch/core 0.5.3 → 0.5.4

package/lib/http/index.mjs

@@ -136,7 +136,7 @@ async function checkAuthorizationToken(authorizationMethod, authorizationToken,
         }
         resourceId = decodedJwt.payload.sub;
       } catch (error) {
-        console.error(error);
+        req.openTelemetryCollector.error(error);
         return invalidAuthorizationToken;
       }
       break;
@@ -217,14 +217,271 @@ async function parseRequestAuth(req, res, next) {
   next?.();
 }
 
+// src/services/getEnvVar.ts
+function getEnvVar(name) {
+  const value = process.env[name];
+  return value;
+}
+
+// src/http/telemetry/openTelemetryCollector.ts
+import { HyperExpressInstrumentation } from "@forklaunch/opentelemetry-instrumentation-hyper-express";
+import {
+  metrics
+} from "@opentelemetry/api";
+import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
+import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
+import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
+import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
+import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
+import { Resource } from "@opentelemetry/resources";
+import { BatchLogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
+import { NodeSDK } from "@opentelemetry/sdk-node";
+import {
+  ATTR_SERVICE_NAME as ATTR_SERVICE_NAME2
+} from "@opentelemetry/semantic-conventions";
+import dotenv from "dotenv";
+
+// src/http/guards/isForklaunchRequest.ts
+function isForklaunchRequest(request) {
+  return request != null && typeof request === "object" && "contractDetails" in request;
+}
+
+// src/http/telemetry/pinoLogger.ts
+import { isNever } from "@forklaunch/common";
+import { trace as trace2 } from "@opentelemetry/api";
+import { logs } from "@opentelemetry/api-logs";
+import pino from "pino";
+
+// src/http/guards/isLoggerMeta.ts
+function isLoggerMeta(arg) {
+  return typeof arg === "object" && arg !== null && "_meta" in arg;
+}
+
+// src/http/telemetry/pinoLogger.ts
+import PinoPretty from "pino-pretty";
+function meta(meta2) {
+  return meta2;
+}
+function mapSeverity(level) {
+  switch (level) {
+    case "silent":
+      return 0;
+    case "trace":
+      return 1;
+    case "debug":
+      return 5;
+    case "info":
+      return 9;
+    case "warn":
+      return 13;
+    case "error":
+      return 17;
+    case "fatal":
+      return 21;
+    default:
+      isNever(level);
+      return 0;
+  }
+}
+var PinoLogger = class _PinoLogger {
+  pinoLogger;
+  meta;
+  prettyPrinter = PinoPretty.prettyFactory({
+    colorize: true
+  });
+  constructor(level, meta2 = {}) {
+    this.pinoLogger = pino({
+      level: level || "info",
+      formatters: {
+        level(label) {
+          return { level: label };
+        }
+      },
+      timestamp: pino.stdTimeFunctions.isoTime,
+      transport: {
+        target: "pino-pretty",
+        options: { colorize: true }
+      }
+    });
+    this.meta = meta2;
+  }
+  log(level, ...args) {
+    let meta2 = {};
+    const filteredArgs = args.filter((arg) => {
+      if (isLoggerMeta(arg)) {
+        Object.assign(meta2, arg);
+        return false;
+      }
+      return true;
+    });
+    const activeSpan = trace2.getActiveSpan();
+    if (activeSpan) {
+      const activeSpanContext = activeSpan.spanContext();
+      meta2.trace_id = activeSpanContext.traceId;
+      meta2.span_id = activeSpanContext.spanId;
+      meta2.trace_flags = activeSpanContext.traceFlags;
+      meta2 = {
+        // @ts-expect-error accessing private property
+        ...activeSpan.attributes,
+        ...meta2
+      };
+    }
+    meta2 = {
+      "api.name": "none",
+      "correlation.id": "none",
+      ...meta2
+    };
+    this.pinoLogger[level](...filteredArgs);
+    logs.getLogger(process.env.OTEL_SERVICE_NAME ?? "unknown").emit({
+      severityText: level,
+      severityNumber: mapSeverity(level),
+      body: this.prettyPrinter(filteredArgs),
+      attributes: { ...this.meta, ...meta2 }
+    });
+  }
+  error = (msg, ...args) => this.log("error", msg, ...args);
+  info = (msg, ...args) => this.log("info", msg, ...args);
+  debug = (msg, ...args) => this.log("debug", msg, ...args);
+  warn = (msg, ...args) => this.log("warn", msg, ...args);
+  trace = (msg, ...args) => this.log("trace", msg, ...args);
+  child(meta2 = {}) {
+    return new _PinoLogger(this.pinoLogger.level, { ...this.meta, ...meta2 });
+  }
+  getBaseLogger() {
+    return this.pinoLogger;
+  }
+};
+function logger(level, meta2 = {}) {
+  return new PinoLogger(level, meta2);
+}
+
+// src/http/telemetry/openTelemetryCollector.ts
+var OpenTelemetryCollector = class {
+  // 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 = {};
+    for (const [metricId, metricType] of Object.entries(
+      metricDefinitions ?? {}
+    )) {
+      switch (metricType) {
+        case "counter":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createCounter(metricId);
+          break;
+        case "gauge":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createGauge(metricId);
+          break;
+        case "histogram":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createHistogram(metricId);
+          break;
+        case "upDownCounter":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createUpDownCounter(metricId);
+          break;
+        case "observableCounter":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableCounter(metricId);
+          break;
+        case "observableGauge":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableGauge(metricId);
+          break;
+        case "observableUpDownCounter":
+          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableUpDownCounter(metricId);
+          break;
+      }
+    }
+    this.log("info", "OpenTelemetry (Traces + Logs + Metrics) started");
+  }
+  logger;
+  metrics;
+  log(level, ...args) {
+    this.logger.log(level, ...args);
+  }
+  info = (msg, ...args) => {
+    this.logger.log("info", msg, ...args);
+  };
+  error = (msg, ...args) => {
+    this.logger.log("error", msg, ...args);
+  };
+  warn = (msg, ...args) => {
+    this.logger.log("warn", msg, ...args);
+  };
+  debug = (msg, ...args) => {
+    this.logger.log("debug", msg, ...args);
+  };
+  trace = (msg, ...args) => {
+    this.logger.log("trace", msg, ...args);
+  };
+  getMetric(metricId) {
+    return this.metrics[metricId];
+  }
+};
+dotenv.config({ path: getEnvVar("ENV_FILE_PATH") });
+new NodeSDK({
+  resource: new Resource({
+    [ATTR_SERVICE_NAME2]: getEnvVar("OTEL_SERVICE_NAME")
+  }),
+  traceExporter: new OTLPTraceExporter({
+    url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
+  }),
+  metricReader: new PeriodicExportingMetricReader({
+    exporter: new OTLPMetricExporter({
+      url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
+    }),
+    exportIntervalMillis: 5e3
+  }),
+  logRecordProcessors: [
+    new BatchLogRecordProcessor(
+      new OTLPLogExporter({
+        url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
+      })
+    )
+  ],
+  instrumentations: [
+    new HttpInstrumentation({
+      applyCustomAttributesOnSpan: (span, request) => {
+        span.setAttribute(
+          "service.name",
+          getEnvVar("OTEL_SERVICE_NAME") ?? "unknown"
+        );
+        if (isForklaunchRequest(request)) {
+          span.setAttribute("api.name", request.contractDetails?.name);
+        }
+      }
+    }),
+    new ExpressInstrumentation(),
+    new HyperExpressInstrumentation()
+  ]
+}).start();
+var httpRequestsTotalCounter = metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
+  description: "Number of HTTP requests"
+});
+var httpServerDurationHistogram = metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createHistogram("http_server_duration", {
+  description: "Duration of HTTP server requests",
+  unit: "s"
+});
+
 // src/http/middleware/request/enrichDetails.middleware.ts
-function enrichDetails(path, contractDetails, requestSchema, responseSchemas) {
+function enrichDetails(path, contractDetails, requestSchema, responseSchemas, openTelemetryCollector) {
   return (req, res, next) => {
     req.originalPath = path;
     req.contractDetails = contractDetails;
     req.requestSchema = requestSchema;
     res.responseSchemas = responseSchemas;
+    req.openTelemetryCollector = openTelemetryCollector;
     req.context.span?.setAttribute(ATTR_API_NAME, req.contractDetails?.name);
+    const startTime = process.hrtime();
+    res.on("finish", () => {
+      const [seconds, nanoseconds] = process.hrtime(startTime);
+      const durationMs = seconds + nanoseconds / 1e9;
+      httpServerDurationHistogram.record(durationMs, {
+        [ATTR_SERVICE_NAME]: getEnvVar("OTEL_SERVICE_NAME") || "unknown",
+        [ATTR_API_NAME]: req.contractDetails?.name || "unknown",
+        [ATTR_HTTP_REQUEST_METHOD]: req.method,
+        [ATTR_HTTP_ROUTE]: req.originalPath || "unknown",
+        [ATTR_HTTP_RESPONSE_STATUS_CODE]: res.statusCode
+      });
+    });
     next?.();
   };
 }
@@ -266,7 +523,9 @@ function parse(req, _res, next) {
         );
         break;
       case "warning":
-        console.warn(prettyPrintParseErrors(parsedRequest.errors, "Request"));
+        req.openTelemetryCollector.warn(
+          prettyPrintParseErrors(parsedRequest.errors, "Request")
+        );
         break;
       case "none":
         break;
@@ -277,9 +536,10 @@ function parse(req, _res, next) {
 
 // src/http/router/expressLikeRouter.ts
 var ForklaunchExpressLikeRouter = class {
-  constructor(basePath, schemaValidator, internal) {
+  constructor(basePath, schemaValidator, internal, openTelemetryCollector) {
     this.schemaValidator = schemaValidator;
     this.internal = internal;
+    this.openTelemetryCollector = openTelemetryCollector;
     this.basePath = basePath;
   }
   requestHandler;
@@ -298,7 +558,8 @@ var ForklaunchExpressLikeRouter = class {
         `${this.basePath}${path}`,
         contractDetails,
         requestSchema,
-        responseSchemas
+        responseSchemas,
+        this.openTelemetryCollector
       ),
       parse,
       parseRequestAuth
@@ -859,20 +1120,16 @@ var ForklaunchExpressLikeApplication = class extends ForklaunchExpressLikeRouter
    *
    * @param {SV} schemaValidator - The schema validator.
    */
-  constructor(schemaValidator, internal) {
-    super("/", schemaValidator, internal);
+  constructor(schemaValidator, internal, openTelemetryCollector) {
+    super("/", schemaValidator, internal, openTelemetryCollector);
     this.schemaValidator = schemaValidator;
     this.internal = internal;
+    this.openTelemetryCollector = openTelemetryCollector;
     this.internal.use(createContext(this.schemaValidator));
     this.internal.use(cors);
   }
 };
 
-// src/http/guards/isForklaunchRequest.ts
-function isForklaunchRequest(request) {
-  return request != null && typeof request === "object" && "contractDetails" in request;
-}
-
 // src/http/guards/isPath.ts
 function isPath(path) {
   return path.startsWith("/");
@@ -946,7 +1203,7 @@ var put = (_schemaValidator, path, contractDetails, ...handlers) => {
 };
 
 // src/http/handlers/trace.ts
-var trace2 = (_schemaValidator, path, contractDetails, ...handlers) => {
+var trace3 = (_schemaValidator, path, contractDetails, ...handlers) => {
   return typedHandler(_schemaValidator, path, "trace", contractDetails, ...handlers);
 };
 
@@ -1971,8 +2228,10 @@ function parse2(req, res, next) {
 ${parseErrors.join("\n\n")}`));
         break;
       case "warning":
-        console.warn(`Invalid response:
-${parseErrors.join("\n\n")}`);
+        req.openTelemetryCollector.warn(
+          `Invalid response:
+${parseErrors.join("\n\n")}`
+        );
         break;
       case "none":
         break;
@@ -1981,96 +2240,6 @@ ${parseErrors.join("\n\n")}`);
   next?.();
 }
 
-// src/http/telemetry/pinoLogger.ts
-import { isNever } from "@forklaunch/common";
-import { trace as trace3 } from "@opentelemetry/api";
-import { logs } from "@opentelemetry/api-logs";
-import pino from "pino";
-function mapSeverity(level) {
-  switch (level) {
-    case "silent":
-      return 0;
-    case "trace":
-      return 1;
-    case "debug":
-      return 5;
-    case "info":
-      return 9;
-    case "warn":
-      return 13;
-    case "error":
-      return 17;
-    case "fatal":
-      return 21;
-    default:
-      isNever(level);
-      return 0;
-  }
-}
-var PinoLogger = class _PinoLogger {
-  pinoLogger;
-  meta;
-  constructor(level, meta = {}) {
-    this.pinoLogger = pino({
-      level: level || "info",
-      formatters: {
-        level(label) {
-          return { level: label };
-        }
-      },
-      timestamp: pino.stdTimeFunctions.isoTime,
-      transport: {
-        target: "pino-pretty",
-        options: { colorize: true }
-      }
-    });
-    this.meta = meta;
-  }
-  log(level, msg, meta = {}) {
-    const activeSpan = trace3.getActiveSpan();
-    if (activeSpan) {
-      const activeSpanContext = activeSpan.spanContext();
-      meta.trace_id = activeSpanContext.traceId;
-      meta.span_id = activeSpanContext.spanId;
-      meta.trace_flags = activeSpanContext.traceFlags;
-      if (!meta.api_name) {
-        meta = { ...meta, ...activeSpan?.attributes };
-      }
-    }
-    this.pinoLogger[level](msg);
-    logs.getLogger(process.env.OTEL_SERVICE_NAME ?? "unknown").emit({
-      severityText: level,
-      severityNumber: mapSeverity(level),
-      body: msg,
-      attributes: { ...this.meta, ...meta }
-    });
-  }
-  error(msg, meta = {}) {
-    this.log("error", msg, meta);
-  }
-  info(msg, meta = {}) {
-    this.log("info", msg, meta);
-  }
-  debug(msg, meta = {}) {
-    this.log("debug", msg, meta);
-  }
-  warn(msg, meta = {}) {
-    this.log("warn", msg, meta);
-  }
-  trace(msg, meta = {}) {
-    this.log("trace", msg, meta);
-  }
-  child(meta = {}) {
-    return new _PinoLogger(this.pinoLogger.level, { ...this.meta, ...meta });
-  }
-  getBaseLogger() {
-    return this.pinoLogger;
-  }
-};
-function logger(level, meta = {}) {
-  return new PinoLogger(level, meta);
-}
-
 // src/http/telemetry/recordMetric.ts
 import {
   ATTR_HTTP_REQUEST_METHOD as ATTR_HTTP_REQUEST_METHOD3,
@@ -2085,130 +2254,6 @@ import {
   prettyPrintParseErrors as prettyPrintParseErrors3
 } from "@forklaunch/validator";
 
-// src/services/getEnvVar.ts
-function getEnvVar(name) {
-  const value = process.env[name];
-  return value;
-}
-
-// src/http/telemetry/openTelemetryCollector.ts
-import { HyperExpressInstrumentation } from "@forklaunch/opentelemetry-instrumentation-hyper-express";
-import {
-  metrics
-} from "@opentelemetry/api";
-import { OTLPLogExporter } from "@opentelemetry/exporter-logs-otlp-http";
-import { OTLPMetricExporter } from "@opentelemetry/exporter-metrics-otlp-http";
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
-import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
-import { Resource } from "@opentelemetry/resources";
-import { BatchLogRecordProcessor } from "@opentelemetry/sdk-logs";
-import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
-import { NodeSDK } from "@opentelemetry/sdk-node";
-import {
-  ATTR_SERVICE_NAME as ATTR_SERVICE_NAME2
-} from "@opentelemetry/semantic-conventions";
-import dotenv from "dotenv";
-var OpenTelemetryCollector = class {
-  // 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 = {};
-    for (const [metricId, metricType] of Object.entries(
-      metricDefinitions ?? {}
-    )) {
-      switch (metricType) {
-        case "counter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createCounter(metricId);
-          break;
-        case "gauge":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createGauge(metricId);
-          break;
-        case "histogram":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createHistogram(metricId);
-          break;
-        case "upDownCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createUpDownCounter(metricId);
-          break;
-        case "observableCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableCounter(metricId);
-          break;
-        case "observableGauge":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableGauge(metricId);
-          break;
-        case "observableUpDownCounter":
-          this.metrics[metricId] = metrics.getMeter(this.serviceName).createObservableUpDownCounter(metricId);
-          break;
-      }
-    }
-    this.log("info", "OpenTelemetry (Traces + Logs + Metrics) started");
-  }
-  logger;
-  metrics;
-  log(level, msg, meta = {}) {
-    this.logger.log(level, msg, meta);
-  }
-  info(msg, meta = {}) {
-    this.logger.info(msg, meta);
-  }
-  error(msg, meta = {}) {
-    this.logger.error(msg, meta);
-  }
-  warn(msg, meta = {}) {
-    this.logger.warn(msg, meta);
-  }
-  debug(msg, meta = {}) {
-    this.logger.debug(msg, meta);
-  }
-  trace(msg, meta = {}) {
-    this.logger.trace(msg, meta);
-  }
-  getMetric(metricId) {
-    return this.metrics[metricId];
-  }
-};
-dotenv.config({ path: getEnvVar("ENV_FILE_PATH") });
-new NodeSDK({
-  resource: new Resource({
-    [ATTR_SERVICE_NAME2]: getEnvVar("OTEL_SERVICE_NAME")
-  }),
-  traceExporter: new OTLPTraceExporter({
-    url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/traces`
-  }),
-  metricReader: new PeriodicExportingMetricReader({
-    exporter: new OTLPMetricExporter({
-      url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/metrics`
-    }),
-    exportIntervalMillis: 5e3
-  }),
-  logRecordProcessors: [
-    new BatchLogRecordProcessor(
-      new OTLPLogExporter({
-        url: `${getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT") ?? "http://localhost:4318"}/v1/logs`
-      })
-    )
-  ],
-  instrumentations: [
-    new HttpInstrumentation({
-      applyCustomAttributesOnSpan: (span, request) => {
-        span.setAttribute(
-          "service.name",
-          getEnvVar("OTEL_SERVICE_NAME") ?? "unknown"
-        );
-        if (isForklaunchRequest(request)) {
-          span.setAttribute("api.name", request.contractDetails?.name);
-        }
-      }
-    }),
-    new ExpressInstrumentation(),
-    new HyperExpressInstrumentation()
-  ]
-}).start();
-var httpRequestsTotalCounter = metrics.getMeter(getEnvVar("OTEL_SERVICE_NAME") || "unknown").createCounter("http_requests_total", {
-  description: "Number of HTTP requests"
-});
-
 // src/http/telemetry/recordMetric.ts
 function recordMetric(req, res) {
   httpRequestsTotalCounter.add(1, {
@@ -2227,6 +2272,7 @@ function enrichExpressLikeSend(instance, req, res, originalSend, data, shouldEnr
   if (shouldEnrich) {
     recordMetric(req, res);
     if (res.statusCode === 404) {
+      res.type("text/plain");
       res.status(404);
       logger("error").error("Not Found");
       originalSend.call(instance, "Not Found");
@@ -2240,6 +2286,7 @@ function enrichExpressLikeSend(instance, req, res, originalSend, data, shouldEnr
 ${res.locals.errorMessage}`;
         }
         logger("error").error(errorString);
+        res.type("text/plain");
         res.status(500);
         originalSend.call(instance, errorString);
         parseErrorSent = true;
@@ -2416,6 +2463,7 @@ export {
   getCodeForStatus,
   head,
   httpRequestsTotalCounter,
+  httpServerDurationHistogram,
   isClientError,
   isForklaunchRequest,
   isForklaunchRouter,
@@ -2425,6 +2473,7 @@ export {
   isSuccessful,
   isValidStatusCode,
   logger,
+  meta,
   metricsDefinitions,
   middleware,
   options,
@@ -2432,7 +2481,7 @@ export {
   post,
   put,
   recordMetric,
-  trace2 as trace,
+  trace3 as trace,
   typedHandler
 };
 //# sourceMappingURL=index.mjs.map