chore: optimize metrics statistics

X-Profiler · Sep 4, 2020 · b08429f · b08429f
1 parent 1abbc2c
commit b08429f
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 9 deletions.
diff --git a/app/service/metric.js b/app/service/metric.js
@@ -27,6 +27,30 @@ class MetricService extends Service {
     return list;
   }
 
+  getAverageMetric(metrics, key) {
+    const { ctx: { app } } = this;
+
+    let value = 0;
+    for (const metric of metrics) {
+      if (!metric) {
+        continue;
+      }
+
+      const metricValue = metric[key];
+
+      // disks
+      if (typeof metricValue === 'object') {
+        return metricValue;
+      }
+
+      // common metric value
+      if (app.isNumber(metricValue)) {
+        value += metric[key] || 0;
+      }
+    }
+    return value / metrics.length;
+  }
+
   handleTrends(trends, keys, duration) {
     if (!trends.length || !keys.length) {
       return [];
@@ -45,6 +69,7 @@ class MetricService extends Service {
       const time = moment(trend.log_time).format(formatter);
       trendMap[time] = trend;
     }
+
     const validInterval = 60 * 1000;
     for (let time = start; time < end; time += 60 * 1000) {
       const timeKey = moment(time).format(formatter);
@@ -58,22 +83,40 @@ class MetricService extends Service {
       }
     }
 
+    for (let time = start; time < end; time += interval) {
+      const timeKey = moment(time).format(formatter);
+      if (!trendMap[timeKey]) {
+        continue;
+      }
+      const duration = [];
+      for (let index = 0; index < interval / validInterval; index++) {
+        const timeKeyTmp = moment(time + index * validInterval).format(formatter);
+        const trendTmp = trendMap[timeKeyTmp];
+        if (!trendTmp) {
+          duration.push(null);
+        } else {
+          duration.push(trendTmp);
+        }
+      }
+      trendMap[timeKey] = duration;
+    }
+
     const results = [];
     for (let time = start; time < end; time += interval) {
       const data = { time };
       const timeKey = moment(time).format(formatter);
-      const trend = trendMap[timeKey];
-      if (trend) {
+      const metrics = trendMap[timeKey];
+      if (metrics && metrics.some(metric => metric)) {
         keys.forEach(keyObj => {
           if (typeof keyObj === 'string') {
-            data[keyObj] = trend[keyObj];
+            data[keyObj] = this.getAverageMetric(metrics, keyObj);
           } else {
             const { key, label, handle } = keyObj;
             const showLabel = label || key;
             if (typeof handle === 'function') {
-              data[showLabel] = handle(trend[key]);
+              data[showLabel] = handle(this.getAverageMetric(metrics, key));
             } else {
-              data[showLabel] = trend[key];
+              data[showLabel] = this.getAverageMetric(metrics, key);
             }
           }
         });

diff --git a/app/service/process.js b/app/service/process.js
@@ -49,7 +49,10 @@ class ProcessService extends Service {
         ];
         break;
       case 'uvTrend':
-        keys = ['active_handles'];
+        keys = [{
+          key: 'active_handles',
+          handle: value => Math.round(value),
+        }];
         break;
       case 'qpsTrend':
         keys = [{
@@ -60,13 +63,20 @@ class ProcessService extends Service {
       case 'timerTrend':
         keys = [{
           key: 'active_timer_handles', label: 'active_timers',
+          handle: value => Math.round(value),
         }];
         break;
       case 'tcpTrend':
-        keys = ['active_tcp_handles'];
+        keys = [{
+          key: 'active_tcp_handles',
+          handle: value => Math.round(value),
+        }];
         break;
       case 'udpTrend':
-        keys = ['active_udp_handles'];
+        keys = [{
+          key: 'active_udp_handles',
+          handle: value => Math.round(value),
+        }];
         break;
       default:
         break;

diff --git a/app/service/system.js b/app/service/system.js
@@ -144,7 +144,10 @@ class SystemService extends Service {
         ];
         break;
       case 'nodeCountTrend':
-        keys = ['node_count'];
+        keys = [{
+          key: 'node_count',
+          handle: value => Math.round(value),
+        }];
         break;
       case 'osGcTrend':
         keys = [