Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ This release marks our first release under the Prometheus umbrella.

### Added

- Add debug logging for metrics collection failures.
- Node 26 added to the test matrix
- Expanded benchmarking code
- new WorkerRegistry to provide equivalent support to AggregatorRegistry
Expand Down
3 changes: 2 additions & 1 deletion benchmarks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

'use strict';

const { debuglog } = require('node:util');
const debug = debuglog('prom:benchmark');
const Benchmark = require('faceoff').default;
const debug = require('debug')('benchmark');

/**
* Async suite workaround. benchmark-regression forwards no options to
Expand Down
7 changes: 5 additions & 2 deletions lib/metrics/eventLoopLag.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@

'use strict';

const { debuglog } = require('node:util');
const Gauge = require('../gauge');

const debug = debuglog('prom:metrics:event-loop-lag');

// Check if perf_hooks module is available
let perf_hooks;
try {
perf_hooks = require('perf_hooks');
} catch {
// node version is too old
} catch (error) {
debug('perf_hooks module is unavailable: %o', error);
}

// Reported always.
Expand Down
7 changes: 5 additions & 2 deletions lib/metrics/gc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@
// limitations under the License.

'use strict';
const { debuglog } = require('node:util');
const Histogram = require('../histogram');

const debug = debuglog('prom:metrics:gc');

let perf_hooks;

try {
perf_hooks = require('perf_hooks');
} catch {
// node version is too old
} catch (error) {
debug('perf_hooks module is unavailable: %o', error);
}

const NODEJS_GC_DURATION_SECONDS = 'nodejs_gc_duration_seconds';
Expand Down
7 changes: 6 additions & 1 deletion lib/metrics/helpers/safeMemoryUsage.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@

'use strict';

const { debuglog } = require('node:util');

const debug = debuglog('prom:metrics:safe-memory-usage');

// process.memoryUsage() can throw on some platforms, see #67
function safeMemoryUsage() {
try {
return process.memoryUsage();
} catch {
} catch (error) {
debug('process.memoryUsage() failed: %o', error);
return;
}
}
Expand Down
7 changes: 6 additions & 1 deletion lib/metrics/helpers/safeRss.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,16 @@

'use strict';

const { debuglog } = require('node:util');

const debug = debuglog('prom:metrics:safe-rss');

// process.memoryUsage.rss() can throw on some platforms, see #67
function safeRss() {
try {
return process.memoryUsage.rss();
} catch {
} catch (error) {
debug('process.memoryUsage.rss() failed: %o', error);
return;
}
}
Expand Down
7 changes: 5 additions & 2 deletions lib/metrics/osMemoryHeapLinux.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@

'use strict';

const { debuglog } = require('node:util');
const Gauge = require('../gauge');
const fs = require('fs');

const debug = debuglog('prom:metrics:os-memory-heap-linux');

const values = ['VmSize', 'VmRSS', 'VmData'];

const PROCESS_RESIDENT_MEMORY = 'process_resident_memory_bytes';
Expand Down Expand Up @@ -70,8 +73,8 @@ module.exports = (registry, config = {}) => {
residentMemGauge.set(labels, structuredOutput.VmRSS);
virtualMemGauge.set(labels, structuredOutput.VmSize);
heapSizeMemGauge.set(labels, structuredOutput.VmData);
} catch {
// noop
} catch (error) {
debug('failed to collect Linux memory metrics: %o', error);
}
},
});
Expand Down
6 changes: 5 additions & 1 deletion lib/metrics/processMaxFileDescriptors.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,12 @@

'use strict';

const { debuglog } = require('node:util');
const Gauge = require('../gauge');
const fs = require('fs');

const debug = debuglog('prom:metrics:process-max-fds');

const PROCESS_MAX_FDS = 'process_max_fds';

let maxFds;
Expand All @@ -34,7 +37,8 @@ module.exports = (registry, config = {}) => {
break;
}
}
} catch {
} catch (error) {
debug('failed to collect maximum file descriptors: %o', error);
return;
}
}
Expand Down
7 changes: 5 additions & 2 deletions lib/metrics/processOpenFileDescriptors.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@

'use strict';

const { debuglog } = require('node:util');
const Gauge = require('../gauge');
const fs = require('fs');
const process = require('process');

const debug = debuglog('prom:metrics:process-open-fds');

const PROCESS_OPEN_FDS = 'process_open_fds';

module.exports = (registry, config = {}) => {
Expand All @@ -40,8 +43,8 @@ module.exports = (registry, config = {}) => {
// Minus 1 to not count the fd that was used by readdirSync(),
// it's now closed.
this.set(labels, fds.length - 1);
} catch {
// noop
} catch (error) {
debug('failed to collect open file descriptors: %o', error);
}
},
});
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"homepage": "https://github.com/prometheus/client_js",
"devDependencies": {
"@eslint/js": "^9.29.0",
"debug": "^4.4.1",
"eslint": "^9.29.0",
"eslint-config-prettier": "^10.1.5",
"eslint-plugin-jsdoc": "^61.4.1",
Expand Down
Loading