push.rocks/smartmetrics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(smartmetrics): Refactor metrics calculation and update Prometheus integration documentation

Browse Source
This commit is contained in:
Juergen Kunz
2025-06-09 12:07:24 +00:00
parent 34b09ed7a7
commit 30992ea44b
6 changed files with 112 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ts/smartmetrics.classes.smartmetrics.ts
View File

@ -104,7 +104,6 @@ export class SmartMetrics {
}
public async getMetrics() {
const originalMetrics = await this.registry.getMetricsAsJSON();
const pids = await plugins.pidtree(process.pid);
const stats = await plugins.pidusage([process.pid, ...pids]);
@ -140,23 +139,23 @@ export class SmartMetrics {
this.memoryUsageBytesGauge.set(memoryUsageBytes);
}
// Calculate Node.js metrics directly
const cpuUsage = process.cpuUsage();
const process_cpu_seconds_total = (cpuUsage.user + cpuUsage.system) / 1000000; // Convert from microseconds to seconds
const heapStats = plugins.v8.getHeapStatistics();
const nodejs_heap_size_total_bytes = heapStats.total_heap_size;
// Note: Active handles and requests are internal Node.js metrics that require deprecated APIs
// We return 0 here, but the Prometheus default collectors will track the real values
const nodejs_active_handles_total = 0;
const nodejs_active_requests_total = 0;
const returnMetrics: interfaces.IMetricsSnapshot = {
process_cpu_seconds_total: (
originalMetrics.find((metricSet) => metricSet.name === 'process_cpu_seconds_total') as any
).values[0].value,
nodejs_active_handles_total: (
originalMetrics.find((metricSet) => metricSet.name === 'nodejs_active_handles_total') as any
).values[0].value,
nodejs_active_requests_total: (
originalMetrics.find(
(metricSet) => metricSet.name === 'nodejs_active_requests_total'
) as any
).values[0].value,
nodejs_heap_size_total_bytes: (
originalMetrics.find(
(metricSet) => metricSet.name === 'nodejs_heap_size_total_bytes'
) as any
).values[0].value,
process_cpu_seconds_total,
nodejs_active_handles_total,
nodejs_active_requests_total,
nodejs_heap_size_total_bytes,
cpuPercentage,
cpuUsageText,
memoryPercentage,
@ -208,8 +207,9 @@ export class SmartMetrics {
return;
}
const port = this.prometheusPort;
this.prometheusServer.close(() => {
this.logger.log('info', `Prometheus metrics endpoint on port ${this.prometheusPort} has been shut down`);
this.logger.log('info', `Prometheus metrics endpoint on port ${port} has been shut down`);
});
this.prometheusServer = undefined;