CHANGELOG.md

@@ -13,6 +13,13 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+## [11.4.0] - 2019-06-04
+
+### Added
+
+- `nodejs_active_handles` metric to the `collectDefaultMetrics()`. Unlike `nodejs_active_handles_total` it split count of active handles by type.
+- `nodejs_active_requests` metric to the `collectDefaultMetrics()`. Unlike `nodejs_active_requests_total` it split count of active requests by type.
+
 ## [11.3.0] - 2019-04-02
 
 ### Changed

lib/metrics/helpers/processMetricsHelpers.js

@@ -0,0 +1,26 @@
+'use strict';
+
+function aggregateByObjectName(list) {
+	const data = {};
+
+	for (const key in list) {
+		if (data.hasOwnProperty(list[key].constructor.name)) {
+			data[list[key].constructor.name] += 1;
+		} else {
+			data[list[key].constructor.name] = 1;
+		}
+	}
+	return data;
+}
+
+function updateMetrics(gauge, data) {
+	gauge.reset();
+	for (const key in data) {
+		gauge.set({ type: key }, data[key], Date.now());
+	}
+}
+
+module.exports = {
+	aggregateByObjectName,
+	updateMetrics
+};

lib/metrics/processHandles.js

@@ -1,8 +1,11 @@
 'use strict';
 
+const { aggregateByObjectName } = require('./helpers/processMetricsHelpers');
+const { updateMetrics } = require('./helpers/processMetricsHelpers');
 const Gauge = require('../gauge');
 
-const NODEJS_ACTIVE_HANDLES = 'nodejs_active_handles_total';
+const NODEJS_ACTIVE_HANDLES = 'nodejs_active_handles';
+const NODEJS_ACTIVE_HANDLES_TOTAL = 'nodejs_active_handles_total';
 
 module.exports = (registry, config = {}) => {
 	// Don't do anything if the function is removed in later nodes (exists in node@6)
@@ -14,13 +17,25 @@ module.exports = (registry, config = {}) => {
 
 	const gauge = new Gauge({
 		name: namePrefix + NODEJS_ACTIVE_HANDLES,
-		help: 'Number of active handles.',
+		help:
+			'Number of active libuv handles grouped by handle type. Every handle type is C++ class name.',
+		labelNames: ['type'],
+		registers: registry ? [registry] : undefined
+	});
+	const totalGauge = new Gauge({
+		name: namePrefix + NODEJS_ACTIVE_HANDLES_TOTAL,
+		help: 'Total number of active handles.',
 		registers: registry ? [registry] : undefined
 	});
 
 	return () => {
-		gauge.set(process._getActiveHandles().length, Date.now());
+		const handles = process._getActiveHandles();
+		updateMetrics(gauge, aggregateByObjectName(handles));
+		totalGauge.set(handles.length, Date.now());
 	};
 };
 
-module.exports.metricNames = [NODEJS_ACTIVE_HANDLES];
+module.exports.metricNames = [
+	NODEJS_ACTIVE_HANDLES,
+	NODEJS_ACTIVE_HANDLES_TOTAL
+];

lib/metrics/processRequests.js

@@ -1,8 +1,10 @@
 'use strict';
-
 const Gauge = require('../gauge');
+const { aggregateByObjectName } = require('./helpers/processMetricsHelpers');
+const { updateMetrics } = require('./helpers/processMetricsHelpers');
 
-const NODEJS_ACTIVE_REQUESTS = 'nodejs_active_requests_total';
+const NODEJS_ACTIVE_REQUESTS = 'nodejs_active_requests';
+const NODEJS_ACTIVE_REQUESTS_TOTAL = 'nodejs_active_requests_total';
 
 module.exports = (registry, config = {}) => {
 	// Don't do anything if the function is removed in later nodes (exists in node@6)
@@ -14,13 +16,26 @@ module.exports = (registry, config = {}) => {
 
 	const gauge = new Gauge({
 		name: namePrefix + NODEJS_ACTIVE_REQUESTS,
-		help: 'Number of active requests.',
+		help:
+			'Number of active libuv requests grouped by request type. Every request type is C++ class name.',
+		labelNames: ['type'],
+		registers: registry ? [registry] : undefined
+	});
+
+	const totalGauge = new Gauge({
+		name: namePrefix + NODEJS_ACTIVE_REQUESTS_TOTAL,
+		help: 'Total number of active requests.',
 		registers: registry ? [registry] : undefined
 	});
 
 	return () => {
-		gauge.set(process._getActiveRequests().length, Date.now());
+		const requests = process._getActiveRequests();
+		updateMetrics(gauge, aggregateByObjectName(requests));
+		totalGauge.set(requests.length, Date.now());
 	};
 };
 
-module.exports.metricNames = [NODEJS_ACTIVE_REQUESTS];
+module.exports.metricNames = [
+	NODEJS_ACTIVE_REQUESTS,
+	NODEJS_ACTIVE_REQUESTS_TOTAL
+];