@promster/express 6.0.0 → 7.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -51,12 +51,13 @@ const createMiddleware = ({
51
51
  app: undefined,
52
52
  options: undefined
53
53
  }) => {
54
- const allDefaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
55
- const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
56
- const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
57
- const observeGc = metrics.createGcObserver(metricTypes);
58
- recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
59
- upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
54
+ const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
55
+ const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
56
+ const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
57
+ const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
58
+ const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
59
+ recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
60
+ upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
60
61
  exposeOnLocals({
61
62
  app,
62
63
  key: 'Prometheus',
@@ -51,12 +51,13 @@ const createMiddleware = ({
51
51
  app: undefined,
52
52
  options: undefined
53
53
  }) => {
54
- const allDefaultedOptions = merge__default["default"](metrics.createMetricTypes.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.defaultNormalizers, options);
55
- const shouldSkipMetricsByEnvironment = allDefaultedOptions.detectKubernetes === true && !metrics.isRunningInKubernetes();
56
- const metricTypes = metrics.createMetricTypes(allDefaultedOptions);
57
- const observeGc = metrics.createGcObserver(metricTypes);
58
- recordRequest = metrics.createRequestRecorder(metricTypes, allDefaultedOptions);
59
- upMetric = metricTypes === null || metricTypes === void 0 ? void 0 : metricTypes.up;
54
+ const allDefaultedOptions = merge__default["default"](metrics.createHttpMetrics.defaultOptions, metrics.createGcMetrics.defaultOptions, metrics.createRequestRecorder.defaultOptions, metrics.createGcObserver.defaultOptions, metrics.defaultNormalizers, options);
55
+ const shouldSkipMetricsByEnvironment = metrics.skipMetricsInEnvironment(allDefaultedOptions);
56
+ const httpMetrics = metrics.createHttpMetrics(allDefaultedOptions);
57
+ const gcMetrics = metrics.createGcMetrics(allDefaultedOptions);
58
+ const observeGc = metrics.createGcObserver(gcMetrics, allDefaultedOptions);
59
+ recordRequest = metrics.createRequestRecorder(httpMetrics, allDefaultedOptions);
60
+ upMetric = gcMetrics === null || gcMetrics === void 0 ? void 0 : gcMetrics.up;
60
61
  exposeOnLocals({
61
62
  app,
62
63
  key: 'Prometheus',
package/package.json CHANGED
@@ -1,11 +1,10 @@
1
1
  {
2
2
  "name": "@promster/express",
3
- "version": "6.0.0",
3
+ "version": "7.0.0",
4
4
  "description": "Express server integrations of promster",
5
5
  "main": "dist/promster-express.cjs.js",
6
6
  "typings": "dist/promster-express.cjs.d.ts",
7
7
  "types": "dist/promster-express.cjs.d.ts",
8
- "scripts": {},
9
8
  "files": [
10
9
  "readme.md",
11
10
  "package.json",
@@ -22,7 +21,8 @@
22
21
  },
23
22
  "repository": {
24
23
  "type": "git",
25
- "url": "git+https://github.com/tdeekens/promster.git"
24
+ "url": "https://github.com/tdeekens/flopflip.git",
25
+ "directory": "packages/express"
26
26
  },
27
27
  "author": "Tobias Deekens <nerd@tdeekens.name>",
28
28
  "license": "MIT",
@@ -36,11 +36,15 @@
36
36
  "prometheus"
37
37
  ],
38
38
  "dependencies": {
39
- "@promster/metrics": "^8.0.0",
39
+ "@promster/metrics": "^9.0.0",
40
40
  "merge-options": "3.0.4",
41
41
  "tslib": "2.3.1"
42
42
  },
43
43
  "devDependencies": {
44
- "@types/express": "4.17.13"
44
+ "@promster/server": "7.0.1",
45
+ "@types/express": "4.17.13",
46
+ "express": "4.17.1",
47
+ "node-fetch": "2.6.6",
48
+ "parse-prometheus-text-format": "1.1.1"
45
49
  }
46
50
  }
package/readme.md CHANGED
@@ -1,6 +1,5 @@
1
1
  <p align="center">
2
- <b style="font-size: 25px">⏰ Promster - Measure metrics from Hapi/Express servers with Prometheus 🚦</b><br />
3
- <i>Promster is an Prometheus Exporter for Node.js servers written with Express or Hapi.</i>
2
+ <b style="font-size: 25px">⏰ Promster - Measure metrics from Hapi/Express servers with Prometheus 🚦</b>
4
3
  </p>
5
4
 
6
5
  ### `@promster/express`