pm2-perfmonitor 2.1.4 → 2.2.0

package/lib/app.js

@@ -6,6 +6,7 @@ const {
   parseParamToNumber,
   parseBool,
   sleepAsync,
+  getSysCpuUsageByPid,
 } = require('./utils')
 const { defaultOptions } = require('./defaults')
 const { sendMessage } = require('./message')
@@ -60,6 +61,12 @@ const cpuOverloadHistory = new Map()
 const cpuOverloadRestartHistory = new Map()
 const cpuOverloadRestartFailedHistory = new Map()
 
+/**
+ * perf 样本是否采集中
+ * @type { Map<number,boolean> }
+ */
+const perfSamplingStats = new Map()
+
 /**
  * @param {'log' | 'info' | 'error' | 'warn'} type
  *
@@ -152,18 +159,26 @@ const setCpuOverloadRestartFailedHistory = (pm_id) => {
   }
 }
 
+let isProcessCheckerRunning = false
+
 /**
  * check process
  */
 const processChecker = async () => {
+  if (isProcessCheckerRunning) return
+
   try {
+    isProcessCheckerRunning = true
+
     const apps = await listAppsAsync()
 
     for (const app of apps) {
-      const { name, pm_id, monit, pm2_env, pid } = app
+      const { name, pid, pm_id, monit, pm2_env } = app
+
+      const sysCpuUsage = await getSysCpuUsageByPid(pid)
 
       const appStatus = pm2_env?.status
-      const appCpuUsage = monit?.cpu || 0
+      const appCpuUsage = sysCpuUsage
 
       // 非目标应用，跳过
       if (
@@ -249,6 +264,8 @@ const processChecker = async () => {
         )
 
         if (enablePerfCollection) {
+          perfSamplingStats.set(pm_id, true)
+
           await performPerfSampling({
             pid,
             moduleName: MODULE_NAME,
@@ -257,6 +274,8 @@ const processChecker = async () => {
             sampleDuration: perfSampleDuration,
             sampleFrequency: perfSampleFrequency,
           })
+
+          perfSamplingStats.delete(pm_id)
         }
 
         try {
@@ -292,6 +311,8 @@ const processChecker = async () => {
     }
   } catch (err) {
     logger('error', err)
+  } finally {
+    isProcessCheckerRunning = false
   }
 }
 
@@ -417,6 +438,23 @@ const runModule = () => {
       return res.map((v) => `[${v[0]}]:${v[1]}`).join(' ; ')
     },
   })
+
+  Probe.metric({
+    name: 'Processes in Sampling (perf)',
+    value: () => {
+      const res = []
+
+      for (const [k, v] of perfSamplingStats) {
+        if (v === true) {
+          res.push(k)
+        }
+      }
+
+      if (!res.length) return 'N/A'
+
+      return res.join(', ')
+    },
+  })
 }
 
 runModule()

package/lib/perf-sampler.js

@@ -30,7 +30,7 @@ const execCommand = async (cmd, args, options = {}) => {
 
     return true
   } catch (err) {
-    console.error(`Command failed: ${cmd} ${args.join(' ')}`, err.message)
+    console.error(`Command failed: [${cmd} ${args.join(' ')}]`, err.message)
     return false
   }
 }

package/lib/utils.js

@@ -1,3 +1,5 @@
+const pidusage = require('pidusage')
+
 const parseParamToArray = (value, defaultVal = []) => {
   if (Array.isArray(value)) return value
 
@@ -37,9 +39,21 @@ const sleepAsync = (duration = 0) => {
   })
 }
 
+/**
+ * 获取指定进程的CPU使用率
+ * @param {string| number} pid
+ * @returns { Promise<number> } CPU 使用率
+ */
+const getSysCpuUsageByPid = async (pid) => {
+  const stats = await pidusage(pid)
+
+  return stats.cpu
+}
+
 module.exports = {
   parseParamToArray,
   parseParamToNumber,
   parseBool,
   sleepAsync,
+  getSysCpuUsageByPid,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pm2-perfmonitor",
-  "version": "2.1.4",
+  "version": "2.2.0",
   "description": "A pm2 module for performance monitoring. Automatically detect zombie processes and restart it",
   "author": {
     "name": "elenh",
@@ -44,6 +44,7 @@
   "dependencies": {
     "execa": "^9.6.1",
     "fs-extra": "^11.3.4",
+    "pidusage": "^4.0.1",
     "pm2": "latest",
     "pmx": "latest"
   },
@@ -52,4 +53,4 @@
     "cz-conventional-changelog": "^3.3.0",
     "minimist": "^1.2.8"
   }
-}
+}