Merge branch 'metric-api' into traverser_apis

apache · Dec 11, 2023 · afe81aa · afe81aa
2 parents cdd4cce + 5e369f7
commit afe81aa
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 0 deletions.
diff --git a/hugegraph-client/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java b/hugegraph-client/src/main/java/org/apache/hugegraph/api/metrics/MetricsAPI.java
@@ -17,6 +17,7 @@
 
 package org.apache.hugegraph.api.metrics;
 
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.hugegraph.util.CommonUtil;
@@ -27,6 +28,8 @@
 
 public class MetricsAPI extends API {
 
+    public static final String STATISTICS_PATH = "/statistics";
+
     public MetricsAPI(RestClient client) {
         super(client);
         this.path(this.type());
@@ -65,12 +68,39 @@ public Map<String, Object> backend(String graph) {
 
     @SuppressWarnings("unchecked")
     public Map<String, Map<String, Object>> all() {
+        Map<String,Object> params = new HashMap<>();
+        params.put("type", "json");
+        RestResult result = this.client.get(this.path(), params);
+        Map<?, ?> map = result.readObject(Map.class);
+        CommonUtil.checkMapClass(map, String.class, Map.class);
+        for (Object mapValue : map.values()) {
+            CommonUtil.checkMapClass(mapValue, String.class, Object.class);
+        }
+        return (Map<String, Map<String, Object>>) map;
+    }
+
+    @SuppressWarnings("unchecked")
+    public String allWithPromFormat() {
         RestResult result = this.client.get(this.path());
+        return result.content();
+    }
+
+    public Map<String, Map<String, Object>> statistics() {
+        Map<String,Object> params = new HashMap<>();
+        params.put("type", "json");
+        RestResult result = this.client.get(this.path() + STATISTICS_PATH, params);
         Map<?, ?> map = result.readObject(Map.class);
         CommonUtil.checkMapClass(map, String.class, Map.class);
         for (Object mapValue : map.values()) {
             CommonUtil.checkMapClass(mapValue, String.class, Object.class);
         }
+
         return (Map<String, Map<String, Object>>) map;
     }
+
+    @SuppressWarnings("unchecked")
+    public String statisticsWithPromFormat() {
+        RestResult result = this.client.get(this.path() + STATISTICS_PATH);
+        return result.content();
+    }
 }
diff --git a/hugegraph-client/src/main/java/org/apache/hugegraph/driver/MetricsManager.java b/hugegraph-client/src/main/java/org/apache/hugegraph/driver/MetricsManager.java
@@ -48,4 +48,16 @@ public Map<String, Map<String, Object>> system() {
     public Map<String, Map<String, Object>> all() {
         return this.metricsAPI.all();
     }
+
+    public String allWithPromFormat() {
+        return this.metricsAPI.allWithPromFormat();
+    }
+
+    public Map<String, Map<String, Object>> statistics() {
+        return this.metricsAPI.statistics();
+    }
+
+    public String statisticsWithPromFormat() {
+        return this.metricsAPI.statisticsWithPromFormat();
+    }
 }
diff --git a/hugegraph-client/src/test/java/org/apache/hugegraph/functional/MetricsManagerTest.java b/hugegraph-client/src/test/java/org/apache/hugegraph/functional/MetricsManagerTest.java
@@ -50,5 +50,17 @@ public void testAllMetrics() {
         Assert.assertEquals(ImmutableSet.of("gauges", "counters", "histograms",
                                             "meters", "timers"),
                             results.keySet());
+        // prom format
+        String resultsProm = metrics().allWithPromFormat();
+        Assert.assertContains("# HELP hugegraph_info", resultsProm);
+    }
+
+    @Test
+    public void testStatisticsMetrics() {
+        Map<String, Map<String, Object>> results = metrics().statistics();
+        Assert.assertNotNull(results);
+        // prom format
+        String resultsProm = metrics().statisticsWithPromFormat();
+        Assert.assertContains("# HELP hugegraph_info", resultsProm);
     }
 }