observe-node 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "observe-node",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Structured logs + Prometheus metrics SDK for Node.js (Loki/Grafana ready)",
   "main": "src/index.js",
   "type": "commonjs",

package/src/http/express.js

@@ -130,14 +130,12 @@ res.send = (body) => {
       ip: req.ip,
     },
 
-    request: {
-      headers,
-      has_auth: hasAuth,
-      query: req.query,                // parsed query object
-      query_string: queryString,       // raw query string
-      params: req.params,              // may be empty (see note)
-     body: capturedRequest
-    },
+    
+request: {
+  query: req.query,
+  params: req.params,
+  body: capturedRequest,  
+},
 
     response: {
       status: res.statusCode,

package/src/index.js

@@ -3,8 +3,12 @@ const start = require("./start");
 const { expressMiddleware } = require("./http/express");
 const { createExpressErrorMiddleware } = require("./http/expressError");
 
+// Prometheus metrics helper
+const { createPrometheusMetrics } = require("./metrics/prometheus");
+
 module.exports = {
   start,
   expressMiddleware,
   createExpressErrorMiddleware,
+  createPrometheusMetrics,
 };

package/src/metrics/prometheus.js

@@ -0,0 +1,77 @@
+// src/metrics/prometheus.js
+const client = require("prom-client");
+
+function createPrometheusMetrics(options = {}) {
+  const {
+    service = "app",
+    metricsPath = "/metrics",
+    collectDefaultMetrics = true,
+    buckets = [0.01, 0.05, 0.1, 0.25, 0.5, 1, 2, 5],
+  } = options;
+
+  const register = new client.Registry();
+
+  if (collectDefaultMetrics) {
+    client.collectDefaultMetrics({ register });
+  }
+
+  const httpRequestsTotal = new client.Counter({
+    name: "http_requests_total",
+    help: "Total HTTP requests",
+    labelNames: ["service", "method", "route", "status"],
+  });
+
+  const httpRequestDurationSeconds = new client.Histogram({
+    name: "http_request_duration_seconds",
+    help: "HTTP request duration in seconds",
+    labelNames: ["service", "method", "route", "status"],
+    buckets,
+  });
+
+  register.registerMetric(httpRequestsTotal);
+  register.registerMetric(httpRequestDurationSeconds);
+
+  // ✅ Express middleware (counts requests)
+  function metricsMiddleware() {
+    return function (req, res, next) {
+      // do not count scraping itself
+      if (req.path === metricsPath) return next();
+
+      const start = process.hrtime.bigint();
+
+      res.on("finish", () => {
+        const end = process.hrtime.bigint();
+        const seconds = Number(end - start) / 1e9;
+
+        // route after match (best effort)
+        const route =
+          (req.route && req.route.path) ||
+          (req.baseUrl ? req.baseUrl + req.path : req.path) ||
+          req.path ||
+          "unknown";
+
+        const labels = {
+          service,
+          method: req.method,
+          route,
+          status: String(res.statusCode),
+        };
+
+        httpRequestsTotal.inc(labels, 1);
+        httpRequestDurationSeconds.observe(labels, seconds);
+      });
+
+      next();
+    };
+  }
+
+  // ✅ /metrics handler
+  async function metricsHandler(req, res) {
+    res.setHeader("Content-Type", register.contentType);
+    res.end(await register.metrics());
+  }
+
+  return { metricsMiddleware, metricsHandler, register };
+}
+
+module.exports = { createPrometheusMetrics };