Make timestamps optional

.gitignore

@@ -57,3 +57,4 @@ typings/
 # dotenv environment variables file
 .env
 
+.idea

lib/index.d.ts

@@ -1,5 +1,5 @@
 import * as promClient from "prom-client";
 import * as express from "express";
 
-export const client: typeof promClient; 
-export declare function instrument (server: express.Express): void;
+export const client: typeof promClient;
+export declare function instrument (server: express.Express, options?): void;

lib/index.js

@@ -1,5 +1,6 @@
 const client = require("prom-client");
 const gcStats = require("prometheus-gc-stats");
+const cluster = require("cluster");
 
 client.collectDefaultMetrics();
 gcStats(client.register)();
@@ -29,6 +30,7 @@ const metric = {
 function defaultOptions(options) {
   options = options || {};
   options.url = options.url || "/metrics";
+  options.timestamps = options.timestamps || false;
   return options;
 }
 
@@ -47,8 +49,13 @@ function instrument(server, options) {
           status: res.statusCode
         };
 
-        metric.http.requests.clients.dec(1, Date.now());
-        metric.http.requests.throughput.inc(labels, 1, Date.now());
+        if (opt.timestamps) {
+          metric.http.requests.clients.dec(1, Date.now());
+          metric.http.requests.throughput.inc(labels, 1, Date.now());
+        } else {
+          metric.http.requests.clients.dec(1);
+          metric.http.requests.throughput.inc(labels, 1);
+        }
         end(labels);
       });
     }
@@ -58,10 +65,22 @@ function instrument(server, options) {
 
   server.use(middleware);
 
-  server.get(opt.url, (req, res) => {
-    res.header("content-type", "text/plain; charset=utf-8");
-    return res.send(client.register.metrics());
-  });
+  if (cluster.isMaster) {
+    const aggregatorRegistry = new client.AggregatorRegistry();
+
+    server.get(opt.url, (req, res) => {
+      aggregatorRegistry.clusterMetrics((err, metrics) => {
+        if (err) console.log(err);
+        res.set('Content-Type', aggregatorRegistry.contentType);
+        res.send(metrics);
+      });
+    });
+  } else {
+    server.get(opt.url, (req, res) => {
+      res.header("content-type", "text/plain; charset=utf-8");
+      return res.send(client.register.metrics(opt.timestamps));
+    });
+  }
 }
 module.exports = {
   client,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trussle/tricorder",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Express middleware to provide basic metrics to Prometheus",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",