.eslintrc

@@ -1,6 +1,10 @@
 {
 	"plugins": ["prettier"],
-	"extends": ["eslint:recommended", "plugin:node/recommended"],
+	"extends": [
+		"eslint:recommended",
+		"plugin:node/recommended",
+		"plugin:prettier/recommended"
+	],
 	"env": {
 		"node": true,
 		"es6": true
@@ -45,8 +49,7 @@
 			"as-needed",
 			{ "requireReturnForObjectLiteral": true }
 		],
-		"prefer-template": "error",
-		"prettier/prettier": "error"
+		"prefer-template": "error"
 	},
 	"overrides": [
 		{
@@ -62,7 +65,7 @@
 			}
 		},
 		{
-			"files": ["example/**/*.js","benchmarks/**/*.js"],
+			"files": ["example/**/*.js", "benchmarks/**/*.js"],
 			"rules": {
 				"no-console": "off"
 			}

CHANGELOG.md

@@ -13,6 +13,13 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+## [11.5.0] - 2019-06-04
+
+### Added
+
+- Added `timestamps` toggle to `collectDefaultMetrics` options
+- Export `validateMetricName`
+
 ## [11.4.0] - 2019-06-04
 
 ### Added

README.md

@@ -88,6 +88,17 @@ const collectDefaultMetrics = client.collectDefaultMetrics;
 collectDefaultMetrics({ prefix: 'my_application_' });
 ```
 
+To disable metric timestamps set `timestamps` to `false` (You can find the list of metrics that support this feature in `test/defaultMetricsTest.js`):
+
+```js
+const client = require('prom-client');
+
+const collectDefaultMetrics = client.collectDefaultMetrics;
+
+// Probe every 5th second.
+collectDefaultMetrics({ timestamps: false });
+```
+
 You can get the full list of metrics by inspecting
 `client.collectDefaultMetrics.metricsList`.
 

index.d.ts

@@ -644,6 +644,7 @@ export function exponentialBuckets(
 
 export interface DefaultMetricsCollectorConfiguration {
 	timeout?: number;
+	timestamps?: boolean;
 	register?: Registry;
 	prefix?: string;
 }
@@ -655,7 +656,7 @@ export interface DefaultMetricsCollectorConfiguration {
  */
 export function collectDefaultMetrics(
 	config?: DefaultMetricsCollectorConfiguration
-): number;
+): ReturnType<typeof setInterval>;
 
 /**
  * Configure default metrics
@@ -671,3 +672,10 @@ export interface defaultMetrics {
 	 */
 	metricsList: string[];
 }
+
+/**
+ * Validate a metric name
+ * @param name The name to validate
+ * @return True if the metric name is valid, false if not
+ */
+export function validateMetricName(name: string): boolean;

index.js

@@ -8,6 +8,7 @@
 exports.register = require('./lib/registry').globalRegistry;
 exports.Registry = require('./lib/registry');
 exports.contentType = require('./lib/registry').globalRegistry.contentType;
+exports.validateMetricName = require('./lib/validation').validateMetricName;
 
 exports.Counter = require('./lib/counter');
 exports.Gauge = require('./lib/gauge');

lib/defaultMetrics.js

@@ -42,7 +42,13 @@ module.exports = function startDefaultMetrics(config) {
 		normalizedConfig = { timeout: config };
 	}
 
-	normalizedConfig = Object.assign({ timeout: 10000 }, normalizedConfig);
+	normalizedConfig = Object.assign(
+		{
+			timestamps: true,
+			timeout: 10000
+		},
+		normalizedConfig
+	);
 
 	if (existingInterval !== null) {
 		clearInterval(existingInterval);
@@ -57,7 +63,7 @@ module.exports = function startDefaultMetrics(config) {
 			);
 		}
 
-		return defaultMetric(normalizedConfig.register, config);
+		return defaultMetric(normalizedConfig.register, normalizedConfig);
 	});
 
 	function updateAllMetrics() {

lib/metrics/heapSizeAndUsed.js

@@ -40,11 +40,19 @@ module.exports = (registry, config = {}) => {
 		// process.memoryUsage() can throw EMFILE errors, see #67
 		const memUsage = safeMemoryUsage();
 		if (memUsage) {
-			const now = Date.now();
-			heapSizeTotal.set(memUsage.heapTotal, now);
-			heapSizeUsed.set(memUsage.heapUsed, now);
-			if (memUsage.external && externalMemUsed) {
-				externalMemUsed.set(memUsage.external, now);
+			if (config.timestamps) {
+				const now = Date.now();
+				heapSizeTotal.set(memUsage.heapTotal, now);
+				heapSizeUsed.set(memUsage.heapUsed, now);
+				if (memUsage.external && externalMemUsed) {
+					externalMemUsed.set(memUsage.external, now);
+				}
+			} else {
+				heapSizeTotal.set(memUsage.heapTotal);
+				heapSizeUsed.set(memUsage.heapUsed);
+				if (memUsage.external && externalMemUsed) {
+					externalMemUsed.set(memUsage.external);
+				}
 			}
 		}
 

lib/metrics/helpers/processMetricsHelpers.js

@@ -13,10 +13,14 @@ function aggregateByObjectName(list) {
 	return data;
 }
 
-function updateMetrics(gauge, data) {
+function updateMetrics(gauge, data, includeTimestamp) {
 	gauge.reset();
 	for (const key in data) {
-		gauge.set({ type: key }, data[key], Date.now());
+		if (includeTimestamp) {
+			gauge.set({ type: key }, data[key], Date.now());
+		} else {
+			gauge.set({ type: key }, data[key]);
+		}
 	}
 }
 

lib/metrics/processHandles.js

@@ -28,11 +28,19 @@ module.exports = (registry, config = {}) => {
 		registers: registry ? [registry] : undefined
 	});
 
-	return () => {
-		const handles = process._getActiveHandles();
-		updateMetrics(gauge, aggregateByObjectName(handles));
-		totalGauge.set(handles.length, Date.now());
-	};
+	const updater = config.timestamps
+		? () => {
+				const handles = process._getActiveHandles();
+				updateMetrics(gauge, aggregateByObjectName(handles), true);
+				totalGauge.set(handles.length, Date.now());
+		  }
+		: () => {
+				const handles = process._getActiveHandles();
+				updateMetrics(gauge, aggregateByObjectName(handles), false);
+				totalGauge.set(handles.length);
+		  };
+
+	return updater;
 };
 
 module.exports.metricNames = [