@promster/express 5.1.2 → 7.0.1

package/dist/declarations/src/index.d.ts

@@ -1,3 +1,3 @@
 import { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp } from './middleware';
-import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers } from '@promster/metrics';
-export { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, };
+import { getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing } from '@promster/metrics';
+export { createMiddleware, getRequestRecorder, signalIsUp, signalIsNotUp, getSummary, getContentType, Prometheus, defaultRegister, defaultNormalizers, timing, };

package/dist/promster-express.cjs.dev.js

@@ -51,12 +51,13 @@ const createMiddleware = ({
   app: undefined,
   options: undefined
 }) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
-  const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
-  const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
-  const observeGc = metrics.createGcObserver(metricTypes);
-  recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
-  upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
+  const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
+  const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
+  const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
+  recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
+  upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
   exposeOnLocals({
     app,
     key: 'Prometheus',
@@ -73,7 +74,7 @@ const createMiddleware = ({
   }
 
   return (request, response, next) => {
-    const start = process.hrtime();
+    const requestTiming = metrics.timing.start();
     response.on('finish', () => {
       var _allDefaultedOptions$, _allDefaultedOptions$2, _request$headers$cont, _response$getHeader;
 
@@ -96,7 +97,7 @@ const createMiddleware = ({
       const responseContentLength = Number((_response$getHeader = response.getHeader('content-length')) !== null && _response$getHeader !== void 0 ? _response$getHeader : 0);
 
       if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
-        recordRequest(start, {
+        recordRequest(requestTiming, {
           labels,
           requestContentLength,
           responseContentLength
@@ -127,6 +128,10 @@ Object.defineProperty(exports, 'getSummary', {
   enumerable: true,
   get: function () { return metrics.getSummary; }
 });
+Object.defineProperty(exports, 'timing', {
+  enumerable: true,
+  get: function () { return metrics.timing; }
+});
 exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;

package/dist/promster-express.cjs.prod.js

@@ -51,12 +51,13 @@ const createMiddleware = ({
   app: undefined,
   options: undefined
 }) => {
-  const allDefaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
-  const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
-  const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
-  const observeGc = metrics.createGcObserver(metricTypes);
-  recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
-  upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
+  const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
+  const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
+  const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
+  const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
+  const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
+  recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
+  upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
   exposeOnLocals({
     app,
     key: 'Prometheus',
@@ -73,7 +74,7 @@ const createMiddleware = ({
   }
 
   return (request, response, next) => {
-    const start = process.hrtime();
+    const requestTiming = metrics.timing.start();
     response.on('finish', () => {
       var _allDefaultedOptions$, _allDefaultedOptions$2, _request$headers$cont, _response$getHeader;
 
@@ -96,7 +97,7 @@ const createMiddleware = ({
       const responseContentLength = Number((_response$getHeader = response.getHeader('content-length')) !== null && _response$getHeader !== void 0 ? _response$getHeader : 0);
 
       if (!shouldSkipByRequest && !shouldSkipMetricsByEnvironment) {
-        recordRequest(start, {
+        recordRequest(requestTiming, {
           labels,
           requestContentLength,
           responseContentLength
@@ -127,6 +128,10 @@ Object.defineProperty(exports, 'getSummary', {
   enumerable: true,
   get: function () { return metrics.getSummary; }
 });
+Object.defineProperty(exports, 'timing', {
+  enumerable: true,
+  get: function () { return metrics.timing; }
+});
 exports.createMiddleware = createMiddleware;
 exports.getRequestRecorder = getRequestRecorder;
 exports.signalIsNotUp = signalIsNotUp;

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@promster/express",
-  "version": "5.1.2",
+  "version": "7.0.1",
   "description": "Express server integrations of promster",
   "main": "dist/promster-express.cjs.js",
   "typings": "dist/promster-express.cjs.d.ts",
   "types": "dist/promster-express.cjs.d.ts",
-  "scripts": {},
   "files": [
     "readme.md",
     "package.json",
@@ -14,15 +13,16 @@
     "modules/**"
   ],
   "engines": {
-    "node": ">=9",
-    "npm": ">=3"
+    "node": ">=14",
+    "npm": ">=6"
   },
   "publishConfig": {
     "access": "public"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tdeekens/promster.git"
+    "url": "https://github.com/tdeekens/flopflip.git",
+    "directory": "packages/express"
   },
   "author": "Tobias Deekens <nerd@tdeekens.name>",
   "license": "MIT",
@@ -36,11 +36,15 @@
     "prometheus"
   ],
   "dependencies": {
-    "@promster/metrics": "^7.0.2",
+    "@promster/metrics": "^9.1.0",
     "merge-options": "3.0.4",
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@types/express": "4.17.13"
+    "@promster/server": "7.0.2",
+    "@types/express": "4.17.13",
+    "express": "4.17.1",
+    "node-fetch": "2.6.6",
+    "parse-prometheus-text-format": "1.1.1"
   }
 }

package/readme.md

@@ -1,6 +1,5 @@
 <p align="center">
-  <b style="font-size: 25px">⏰ Promster - Measure metrics from Hapi/Express servers with Prometheus 🚦</b><br />
-  <i>Promster is an Prometheus Exporter for Node.js servers written with Express or Hapi.</i>
+  <b style="font-size: 25px">⏰ Promster - Measure metrics from Hapi/Express servers with Prometheus 🚦</b>
 </p>
 
 ### `@promster/express`