Merge pull request alibaba#612 from alibaba/feature_metrics

surpport metrics
tguangch · Jan 11, 2019 · f82e080 · f82e080
2 parents 84a64d3 + 5891ae0
commit f82e080
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java b/client/src/main/java/com/alibaba/nacos/client/config/http/MetricsHttpAgent.java
@@ -65,7 +65,7 @@ public HttpResult httpPost(String path, List<String> headers, List<String> param
         long end = 0;
         HttpResult result = null;
         try {
-            result = httpAgent.httpGet(path, headers, paramValues, encoding, readTimeoutMs);
+            result = httpAgent.httpPost(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
             end = System.currentTimeMillis();
             MetricsMonitor.getConfigRequestMonitor("POST", path, "NA").record(end - start, TimeUnit.MILLISECONDS);
@@ -84,7 +84,7 @@ public HttpResult httpDelete(String path, List<String> headers, List<String> par
         long end = 0;
         HttpResult result = null;
         try {
-            result = httpAgent.httpGet(path, headers, paramValues, encoding, readTimeoutMs);
+            result = httpAgent.httpDelete(path, headers, paramValues, encoding, readTimeoutMs);
         } catch (IOException e) {
             end = System.currentTimeMillis();
             MetricsMonitor.getConfigRequestMonitor("DELETE", path, "NA").record(end - start, TimeUnit.MILLISECONDS);

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java b/naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
@@ -86,14 +86,40 @@ private void start() {
     }
 
     @Scheduled(cron = "0 0 0 * * ?")
-    public void refresh() {
+    public void refreshMetrics() {
         PushService.setFailedPush(0);
         PushService.setTotalPush(0);
         MetricsMonitor.getHttpHealthCheckMonitor().set(0);
         MetricsMonitor.getMysqlHealthCheckMonitor().set(0);
         MetricsMonitor.getTcpHealthCheckMonitor().set(0);
     }
 
+    @Scheduled(cron = "0/15 * * * * ?")
+    public void collectmetrics() {
+        int domCount = domainsManager.getDomCount();
+        MetricsMonitor.getDomCountMonitor().set(domCount);
+
+        int ipCount = domainsManager.getIPCount();
+        MetricsMonitor.getIpCountMonitor().set(ipCount);
+
+        long maxPushCost = getMaxPushCost();
+        MetricsMonitor.getMaxPushCostMonitor().set(maxPushCost);
+
+        long avgPushCost = getAvgPushCost();
+        MetricsMonitor.getAvgPushCostMonitor().set(avgPushCost);
+
+        MetricsMonitor.getTotalPushMonitor().set(PushService.getTotalPush());
+        MetricsMonitor.getFailedPushMonitor().set(PushService.getFailedPushCount());
+
+        if (RaftCore.isLeader()) {
+            MetricsMonitor.getLeaderStatusMonitor().set(1);
+        } else if (RaftCore.getPeerSet().local().state == FOLLOWER) {
+            MetricsMonitor.getLeaderStatusMonitor().set(0);
+        } else {
+            MetricsMonitor.getLeaderStatusMonitor().set(2);
+        }
+    }
+
     class AllDomNamesTask implements Runnable {
 
         @Override
@@ -113,27 +139,9 @@ class PerformanceLogTask implements Runnable {
         public void run() {
             try {
                 int domCount = domainsManager.getDomCount();
-                MetricsMonitor.getDomCountMonitor().set(domCount);
-
                 int ipCount = domainsManager.getIPCount();
-                MetricsMonitor.getIpCountMonitor().set(ipCount);
-
                 long maxPushCost = getMaxPushCost();
-                MetricsMonitor.getMaxPushCostMonitor().set(maxPushCost);
-
                 long avgPushCost = getAvgPushCost();
-                MetricsMonitor.getAvgPushCostMonitor().set(avgPushCost);
-
-                MetricsMonitor.getTotalPushMonitor().set(PushService.getTotalPush());
-                MetricsMonitor.getFailedPushMonitor().set(PushService.getFailedPushCount());
-
-                if (RaftCore.isLeader()) {
-                    MetricsMonitor.getLeaderStatusMonitor().set(1);
-                } else if (RaftCore.getPeerSet().local().state == FOLLOWER) {
-                    MetricsMonitor.getLeaderStatusMonitor().set(0);
-                } else {
-                    MetricsMonitor.getLeaderStatusMonitor().set(2);
-                }
 
                 Loggers.PERFORMANCE_LOG.info("PERFORMANCE:" + "|" + domCount + "|" + ipCount + "|" + maxPushCost + "|" + avgPushCost);
             } catch (Exception e) {