@arcblock/pm2-prom-module 2.6.3 → 2.6.5

package/core/pm2.js

@@ -142,11 +142,6 @@ const detectActiveApps = () => {
                 workingApp.updateStatus(entry.status);
             }
         }
-        // Collect statistic from apps. Do it after all APPS created
-        if (activePM2Ids.size > 0) {
-            // logger.debug(`Collect app metrics from PIDs ${Array.from(activePM2Ids)}`);
-            sendCollectStaticticBusEvent(Array.from(activePM2Ids));
-        }
         // Update metric with available apps
         metrics_1.metricAvailableApps === null || metrics_1.metricAvailableApps === void 0 ? void 0 : metrics_1.metricAvailableApps.set(Object.keys(APPS).length);
         // Get all pids to monit
@@ -205,7 +200,6 @@ const detectActiveApps = () => {
     });
 };
 const startPm2Connect = (conf) => {
-    const logger = (0, logger_1.getLogger)();
     pm2_1.default.connect((err) => {
         var _a;
         if (err)
@@ -220,32 +214,6 @@ const startPm2Connect = (conf) => {
             (0, metrics_1.initDynamicGaugeMetricClients)(additionalMetrics);
         }
         detectActiveApps();
-        // Collect statistic from running apps
-        pm2_1.default.launchBus((err, bus) => {
-            if (err)
-                return console.error(err.stack || err);
-            logger.debug('Start bus listener');
-            bus.on('process:msg', (packet) => {
-                if (packet.process &&
-                    packet.raw &&
-                    packet.raw.topic === 'pm2-prom-module:metrics' &&
-                    packet.raw.data) {
-                    const { name, pm_id } = packet.process;
-                    /*logger.debug(
-                        `Got message from app=${name} and pid=${pm_id}. Message=${JSON.stringify(
-                            packet.raw.data
-                        )}`
-                    );*/
-                    if (name && APPS[name] && packet.raw.data.metrics) {
-                        (0, app_2.processAppMetrics)(conf, {
-                            pmId: pm_id,
-                            appName: name,
-                            appResponse: packet.raw.data,
-                        });
-                    }
-                }
-            });
-        });
         // Start timer to update available apps
         setInterval(() => {
             detectActiveApps();
@@ -296,17 +264,3 @@ function processWorkingApp(workingApp) {
         });
     });
 }
-function sendCollectStaticticBusEvent(pm2Ids) {
-    // Request available metrics from all running apps
-    pm2Ids.forEach((pm2id) => {
-        pm2_1.default.sendDataToProcessId(pm2id, {
-            topic: 'pm2-prom-module:collect',
-            data: {},
-            // Required fields by pm2 but we do not use them
-            id: pm2id,
-        }, (err) => {
-            if (err)
-                return console.error(`pm2-prom-module: sendDataToProcessId ${err.stack || err}`);
-        });
-    });
-}

package/metrics/index.js

@@ -48,11 +48,12 @@ const initMetrics = (prefix) => {
         collect() {
             return __awaiter(this, void 0, void 0, function* () {
                 const info = yield (0, docker_1.getBlockletServerInfo)();
+                this.reset();
                 this.set(info, 1);
             });
         },
         registers: [exports.registry],
-        labelNames: ['name', 'version', 'mode', 'internalIP'],
+        labelNames: ['type', 'name', 'version', 'mode', 'internalIP'],
     });
     new prom_client_1.default.Gauge({
         name: `${prefix}_${METRIC_FREE_MEMORY}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arcblock/pm2-prom-module",
-    "version": "2.6.3",
+    "version": "2.6.5",
     "publishConfig": {
         "access": "public"
     },
@@ -8,13 +8,16 @@
     "main": "index.js",
     "dependencies": {
         "@abtnode/util": "^1.16.44",
+        "@types/dockerode": "^3.3.42",
+        "dockerode": "^4.0.7",
         "internal-ip": "^6.2.0",
+        "lodash": "^4.17.21",
         "pidusage": "^3.0.2",
-        "pm2": "^5.3.0",
+        "pm2": "^6.0.8",
         "pmx": "beta",
         "prom-client": "^15.1.3",
         "xbytes": "^1.9.1",
-        "zx": "^4.3.0"
+        "zx": "^8.8.0"
     },
     "scripts": {
         "predev": "export PM2_HOME=~/.arcblock/abtnode && pm2 delete @arcblock/pm2-prom-module && pm2 uninstall @arcblock/pm2-prom-module || true && npm run build",
@@ -46,6 +49,7 @@
         "prefix": "pm2"
     },
     "devDependencies": {
+        "@types/fs-extra": "^11.0.4",
         "@types/node": "^18.19.50",
         "@types/pidusage": "^2.0.5",
         "bumpp": "^10.1.0",

package/utils/docker.js

@@ -12,16 +12,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDockerStats = exports.getCPULimit = exports.getFreeMemory = exports.getUsedMemory = exports.getBlockletServerInfo = exports.getAvailableMemory = exports.hasDockerLimitFiles = void 0;
+exports.getCPULimit = exports.getFreeMemory = exports.getUsedMemory = exports.getBlockletServerInfo = exports.getAvailableMemory = exports.hasDockerLimitFiles = void 0;
+exports.getDockerStats = getDockerStats;
 const promises_1 = require("node:fs/promises");
 const node_os_1 = __importDefault(require("node:os"));
 const cpu_1 = require("./cpu");
-const zx_1 = require("zx");
-const xbytes_1 = __importDefault(require("xbytes"));
+const dockerode_1 = __importDefault(require("dockerode"));
 const get_ip_1 = __importDefault(require("@abtnode/util/lib/get-ip"));
 const internal_ip_1 = require("internal-ip");
-// 禁用命令和结果的自动输出
-zx_1.$.verbose = false;
+const uniq_1 = __importDefault(require("lodash/uniq"));
+// 初始化 Docker 客户端
+const docker = new dockerode_1.default();
 //const MEMORY_AVAILABLE = '/sys/fs/cgroup/memory.limit_in_bytes';
 //const MEMORY_USED = '/sys/fs/cgroup/memory.usage_in_bytes';
 const MEMORY_AVAILABLE = '/sys/fs/cgroup/memory.max';
@@ -59,13 +60,15 @@ const getBlockletServerInfo = () => __awaiter(void 0, void 0, void 0, function*
         if (!internalIP) {
             throw new Error('Failed to get internal IP address');
         }
-        const response = yield fetch(`https://${internalIP.replace(/\./g, '-')}.ip.abtnet.io/.well-known/did.json`);
+        const url = `https://${internalIP.replace(/\./g, '-')}.ip.abtnet.io/.well-known/did.json`;
+        const response = yield fetch(url);
         if (response.status !== 200) {
-            throw new Error(`Failed to get blocklet server info, ip: ${internalIP}, status: ${response.status}, statusText: ${response.statusText}`);
+            throw new Error(`Failed to get blocklet server info, url: ${url}, status: ${response.status}, statusText: ${response.statusText}`);
         }
         const data = yield response.json();
         const metadata = data.services.find((service) => service.type === 'server').metadata;
         return {
+            type: 'server',
             name: metadata.name,
             version: metadata.version,
             mode: metadata.mode,
@@ -75,6 +78,7 @@ const getBlockletServerInfo = () => __awaiter(void 0, void 0, void 0, function*
     catch (error) {
         console.error(error);
         return {
+            type: 'server',
             name: 'unknown',
             version: 'unknown',
             mode: 'unknown',
@@ -94,7 +98,7 @@ const getUsedMemory = () => __awaiter(void 0, void 0, void 0, function* () {
             return usedMemory;
         }
     }
-    catch (_b) {
+    catch (_a) {
         return 0;
     }
 });
@@ -123,7 +127,7 @@ const getFreeMemory = () => __awaiter(void 0, void 0, void 0, function* () {
             return systemFreeMem;
         }
     }
-    catch (_c) {
+    catch (_a) {
         return 0;
     }
 });
@@ -143,41 +147,74 @@ const getCPULimit = () => __awaiter(void 0, void 0, void 0, function* () {
             }
         }
     }
-    catch (_d) { }
+    catch (_a) { }
     return count;
 });
 exports.getCPULimit = getCPULimit;
+/**
+ * 获取单个容器的统计信息
+ */
+function getContainerStats(containerId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g;
+        try {
+            const container = docker.getContainer(containerId);
+            const stats = yield container.stats({ stream: false });
+            // 内存使用信息
+            const memoryUsage = ((_a = stats.memory_stats) === null || _a === void 0 ? void 0 : _a.usage) || 0;
+            const memoryLimit = ((_b = stats.memory_stats) === null || _b === void 0 ? void 0 : _b.limit) || 0;
+            // CPU使用信息
+            const cpuStats = (_c = stats.cpu_stats) === null || _c === void 0 ? void 0 : _c.cpu_usage;
+            const preCpuStats = (_d = stats.precpu_stats) === null || _d === void 0 ? void 0 : _d.cpu_usage;
+            let cpuPercent = 0;
+            if (cpuStats && preCpuStats && ((_e = stats.cpu_stats) === null || _e === void 0 ? void 0 : _e.system_cpu_usage) && ((_f = stats.precpu_stats) === null || _f === void 0 ? void 0 : _f.system_cpu_usage)) {
+                // 计算容器CPU使用时间的增量（纳秒）
+                const cpuDelta = cpuStats.total_usage - preCpuStats.total_usage;
+                // 计算系统CPU时间的增量（纳秒）
+                const systemDelta = stats.cpu_stats.system_cpu_usage - stats.precpu_stats.system_cpu_usage;
+                if (systemDelta > 0 && cpuDelta >= 0) {
+                    // 获取系统可用的CPU核心数
+                    const onlineCpus = ((_g = stats.cpu_stats) === null || _g === void 0 ? void 0 : _g.online_cpus) || node_os_1.default.cpus().length;
+                    // Docker CPU使用率计算公式：
+                    // CPU% = (容器CPU增量 / 系统CPU增量) * CPU核心数 * 100%
+                    // 
+                    // 解释：
+                    // - cpuDelta: 容器在两次采样间隔内使用的CPU时间
+                    // - systemDelta: 系统在两次采样间隔内所有CPU核心的总时间
+                    // - 比值 (cpuDelta/systemDelta) 表示容器占用系统总CPU时间的比例
+                    // - 乘以核心数是因为Docker的统计方式：单核100%使用时，在N核系统上显示为N*100%
+                    cpuPercent = (cpuDelta / systemDelta) * onlineCpus * 100;
+                    // 确保结果为非负数且不超过理论最大值
+                    cpuPercent = Math.max(0, Math.min(cpuPercent, onlineCpus * 100));
+                }
+            }
+            return {
+                name: containerId,
+                cpuUsage: Math.round(cpuPercent * 100) / 100, // 保留2位小数
+                memoryUsage: memoryUsage,
+                totalMemory: memoryLimit,
+            };
+        }
+        catch (error) {
+            console.error(`Failed to get stats for container ${containerId}:`, error.message);
+            return null;
+        }
+    });
+}
 function getDockerStats(ids) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             if (!ids.length) {
                 return [];
             }
-            const result = yield (0, zx_1.$) `docker stats --no-stream --format "{{json .}}" -a`;
-            if (result.exitCode || !result.stdout) {
-                return [];
-            }
-            const statsRows = result.stdout
-                .split('\n')
-                .filter(Boolean)
-                .map((x) => JSON.parse(x));
-            const stats = statsRows.map((x) => {
-                const [memoryUsage, totalMemory] = x.MemUsage.split('/').map((x) => xbytes_1.default.parseSize(x.trim()));
-                return {
-                    name: x.Name,
-                    cpuUsage: +x.CPUPerc.replace('%', ''),
-                    memoryUsage: memoryUsage,
-                    totalMemory: totalMemory,
-                };
-            });
-            return ids.map((id) => {
-                return stats.find((x) => x.name === id);
-            });
+            // 并行获取所有容器的统计信息
+            const results = yield Promise.all((0, uniq_1.default)(ids).map(id => getContainerStats(id)));
+            // 过滤出成功的结果
+            return results.filter((stat) => stat !== null);
         }
         catch (error) {
-            console.error(error);
+            console.error('Error getting Docker stats:', error);
             return [];
         }
     });
 }
-exports.getDockerStats = getDockerStats;

package/utils/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toUndescore = void 0;
+exports.toUndescore = toUndescore;
 function toUndescore(str) {
     return str.toLowerCase().replace(/\s+/g, '_');
 }
-exports.toUndescore = toUndescore;