fix(core): update

This commit is contained in:
Philipp Kunz 2023-07-02 22:17:27 +02:00
parent 2ddccdaab1
commit 7d703fe57e
3 changed files with 30 additions and 8 deletions

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@pushrocks/smartmetrics', name: '@pushrocks/smartmetrics',
version: '2.0.1', version: '2.0.2',
description: 'easy system metrics' description: 'easy system metrics'
} }

View File

@ -6,6 +6,7 @@ export class SmartMetrics {
public sourceNameArg: string; public sourceNameArg: string;
public logger: plugins.smartlog.Smartlog; public logger: plugins.smartlog.Smartlog;
public registry: plugins.promClient.Registry; public registry: plugins.promClient.Registry;
public maxMemoryMB: number;
public async setup() { public async setup() {
const collectDefaultMetrics = plugins.promClient.collectDefaultMetrics; const collectDefaultMetrics = plugins.promClient.collectDefaultMetrics;
@ -17,6 +18,27 @@ export class SmartMetrics {
this.logger = loggerArg; this.logger = loggerArg;
this.sourceNameArg = sourceNameArg; this.sourceNameArg = sourceNameArg;
this.setup(); this.setup();
this.checkMemoryLimits();
}
private checkMemoryLimits() {
let heapStats = plugins.v8.getHeapStatistics();
let maxHeapSizeMB = heapStats.heap_size_limit / 1024 / 1024;
let totalSystemMemoryMB = plugins.os.totalmem() / 1024 / 1024;
let dockerMemoryLimitMB = totalSystemMemoryMB;
try {
let dockerMemoryLimitBytes = plugins.fs.readFileSync('/sys/fs/cgroup/memory/memory.limit_in_bytes', 'utf8');
dockerMemoryLimitMB = parseInt(dockerMemoryLimitBytes, 10) / 1024 / 1024;
} catch (error) {
// Ignore - this will fail if not running in a Docker container
}
this.maxMemoryMB = Math.min(totalSystemMemoryMB, dockerMemoryLimitMB);
if (maxHeapSizeMB > this.maxMemoryMB) {
throw new Error('Node.js process can use more memory than is available');
}
} }
public start() { public start() {
@ -53,7 +75,6 @@ export class SmartMetrics {
const pids = await plugins.pidtree(process.pid); const pids = await plugins.pidtree(process.pid);
const stats = await plugins.pidusage([process.pid, ...pids]); const stats = await plugins.pidusage([process.pid, ...pids]);
// lets compute cpu usage
let cpuPercentage = 0; let cpuPercentage = 0;
for (const stat of Object.keys(stats)) { for (const stat of Object.keys(stats)) {
if (!stats[stat]) continue; if (!stats[stat]) continue;
@ -61,16 +82,15 @@ export class SmartMetrics {
} }
let cpuUsageText = `${Math.round(cpuPercentage * 100) / 100} %`; let cpuUsageText = `${Math.round(cpuPercentage * 100) / 100} %`;
// lets compute memory usage
let memoryUsageBytes = 0; let memoryUsageBytes = 0;
for (const stat of Object.keys(stats)) { for (const stat of Object.keys(stats)) {
if (!stats[stat]) continue; if (!stats[stat]) continue;
memoryUsageBytes += stats[stat].memory; memoryUsageBytes += stats[stat].memory;
} }
let memoryPercentage = Math.round((memoryUsageBytes / 1000000000) * 100 * 100) / 100;
let memoryUsageText = `${memoryPercentage}% | ${this.formatBytes( // Correct memory usage percentage calculation
memoryUsageBytes let memoryPercentage = Math.round((memoryUsageBytes / (this.maxMemoryMB * 1024 * 1024)) * 100 * 100) / 100;
)} / ${this.formatBytes(1000000000)}`; let memoryUsageText = `${memoryPercentage}% | ${this.formatBytes(memoryUsageBytes)} / ${this.formatBytes(this.maxMemoryMB * 1024 * 1024)}`;
console.log(`${cpuUsageText} ||| ${memoryUsageText} `); console.log(`${cpuUsageText} ||| ${memoryUsageText} `);

View File

@ -1,7 +1,9 @@
// node native // node native
import * as v8 from 'v8';
import * as os from 'os'; import * as os from 'os';
import * as fs from 'fs';
export { os }; export { v8, os, fs };
// pushrocks scope // pushrocks scope
import * as smartdelay from '@pushrocks/smartdelay'; import * as smartdelay from '@pushrocks/smartdelay';