fix ReplicaCollector show wrong info

MyCATApache · Feb 15, 2022 · ed31db0 · ed31db0
1 parent 94cf116
commit ed31db0
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/mycat2/src/main/java/io/mycat/exporter/ReplicaCollector.java b/mycat2/src/main/java/io/mycat/exporter/ReplicaCollector.java
@@ -8,10 +8,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class ReplicaCollector extends Collector {
@@ -27,9 +24,10 @@ public List<MetricFamilySamples> collect() {
 
             List<Map<String, Object>> resultSetMap = rowBaseIterator.getResultSetMap();
             for (Map<String, Object> map : resultSetMap) {
-                List<String> collect = map.keySet().stream()
-                        .filter(i -> columns.contains(i))
-                        .map(s -> Objects.toString(map.get(s))).collect(Collectors.toList());
+                List<String> collect = columns.stream()
+                        .map(s -> {
+                            return Optional.ofNullable(map.get(s)).map(i-> Objects.toString(i)).orElse(null);
+                        }).collect(Collectors.toList());
                 Object available = map.get("AVAILABLE");
                 int value = (Boolean.parseBoolean(available.toString())) ? 1 : 0;//check the value
                 gaugeMetricFamily.addMetric(collect, value);