Skip to content

Commit c73c243

Browse files
author
Dmitry Morgachev
committed
fix: align compliancy to Prometheus naming convention
1 parent f326857 commit c73c243

4 files changed

Lines changed: 10 additions & 9 deletions

File tree

lib/metrics/processHandles.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict';
22

3+
const Gauge = require('../gauge');
34
const { aggregateByObjectName } = require('./helpers/processMetricsHelpers');
45
const { updateMetrics } = require('./helpers/processMetricsHelpers');
5-
const Gauge = require('../gauge');
66

77
const NODEJS_ACTIVE_HANDLES = 'nodejs_active_handles';
8-
const NODEJS_ACTIVE_HANDLES_TOTAL = 'nodejs_active_handles_total';
8+
const NODEJS_ACTIVE_HANDLES_TOTAL_NUMBER = 'nodejs_active_handles_total_number';
99

1010
module.exports = (registry, config = {}) => {
1111
// Don't do anything if the function is removed in later nodes (exists in node@6)
@@ -23,7 +23,7 @@ module.exports = (registry, config = {}) => {
2323
registers: registry ? [registry] : undefined
2424
});
2525
const totalGauge = new Gauge({
26-
name: namePrefix + NODEJS_ACTIVE_HANDLES_TOTAL,
26+
name: namePrefix + NODEJS_ACTIVE_HANDLES_TOTAL_NUMBER,
2727
help: 'Total number of active handles.',
2828
registers: registry ? [registry] : undefined
2929
});
@@ -45,5 +45,5 @@ module.exports = (registry, config = {}) => {
4545

4646
module.exports.metricNames = [
4747
NODEJS_ACTIVE_HANDLES,
48-
NODEJS_ACTIVE_HANDLES_TOTAL
48+
NODEJS_ACTIVE_HANDLES_TOTAL_NUMBER
4949
];

lib/metrics/processRequests.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
'use strict';
2+
23
const Gauge = require('../gauge');
34
const { aggregateByObjectName } = require('./helpers/processMetricsHelpers');
45
const { updateMetrics } = require('./helpers/processMetricsHelpers');
56

67
const NODEJS_ACTIVE_REQUESTS = 'nodejs_active_requests';
7-
const NODEJS_ACTIVE_REQUESTS_TOTAL = 'nodejs_active_requests_total';
8+
const NODEJS_ACTIVE_REQUESTS_TOTAL_NUMBER = 'nodejs_active_requests_total_number'; //eslint-disable-line prettier/prettier
89

910
module.exports = (registry, config = {}) => {
1011
// Don't do anything if the function is removed in later nodes (exists in node@6)
@@ -23,7 +24,7 @@ module.exports = (registry, config = {}) => {
2324
});
2425

2526
const totalGauge = new Gauge({
26-
name: namePrefix + NODEJS_ACTIVE_REQUESTS_TOTAL,
27+
name: namePrefix + NODEJS_ACTIVE_REQUESTS_TOTAL_NUMBER,
2728
help: 'Total number of active requests.',
2829
registers: registry ? [registry] : undefined
2930
});
@@ -37,5 +38,5 @@ module.exports = (registry, config = {}) => {
3738

3839
module.exports.metricNames = [
3940
NODEJS_ACTIVE_REQUESTS,
40-
NODEJS_ACTIVE_REQUESTS_TOTAL
41+
NODEJS_ACTIVE_REQUESTS_TOTAL_NUMBER
4142
];

test/metrics/processHandlesTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ describe('processHandles', () => {
2929

3030
expect(metrics[1].help).toEqual('Total number of active handles.');
3131
expect(metrics[1].type).toEqual('gauge');
32-
expect(metrics[1].name).toEqual('nodejs_active_handles_total');
32+
expect(metrics[1].name).toEqual('nodejs_active_handles_total_number');
3333
});
3434
});

test/metrics/processRequestsTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ describe('processRequests', () => {
2828

2929
expect(metrics[1].help).toEqual('Total number of active requests.');
3030
expect(metrics[1].type).toEqual('gauge');
31-
expect(metrics[1].name).toEqual('nodejs_active_requests_total');
31+
expect(metrics[1].name).toEqual('nodejs_active_requests_total_number');
3232
});
3333
});

0 commit comments

Comments
 (0)