Added unit test for MatchedRuleToMetricSnapshotsConverter (#993)

Signed-off-by: dhoard <[email protected]>

Author: dhoard

collector/src/main/java/io/prometheus/jmx/MatchedRule.java

@@ -99,6 +99,32 @@ public boolean isMatched() {
         return !isUnmatched();
     }
 
+    @Override
+    public String toString() {
+        return "MatchedRule{"
+                + "name='"
+                + name
+                + '\''
+                + ", matchName='"
+                + matchName
+                + '\''
+                + ", type='"
+                + type
+                + '\''
+                + ", help='"
+                + help
+                + '\''
+                + ", labelNames="
+                + labelNames
+                + ", labelValues="
+                + labelValues
+                + ", value="
+                + value
+                + ", valueFactor="
+                + valueFactor
+                + '}';
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

collector/src/main/java/io/prometheus/jmx/MatchedRuleToMetricSnapshotsConverter.java

@@ -1,14 +1,19 @@
 package io.prometheus.jmx;
 
+import io.prometheus.jmx.logger.Logger;
+import io.prometheus.jmx.logger.LoggerFactory;
 import io.prometheus.metrics.model.snapshots.*;
 import java.util.*;
+import java.util.logging.Level;
 
 public class MatchedRuleToMetricSnapshotsConverter {
 
+    private static final Logger LOGGER =
+            LoggerFactory.getLogger(MatchedRuleToMetricSnapshotsConverter.class);
+
     private static final String OBJECTNAME = "_objectname";
 
     public static MetricSnapshots convert(List<MatchedRule> matchedRules) {
-
         Map<String, List<MatchedRule>> rulesByPrometheusMetricName = new HashMap<>();
 
         for (MatchedRule matchedRule : matchedRules) {
@@ -18,6 +23,19 @@ public static MetricSnapshots convert(List<MatchedRule> matchedRules) {
             matchedRulesWithSameName.add(matchedRule);
         }
 
+        if (LOGGER.isLoggable(Level.FINE)) {
+            rulesByPrometheusMetricName
+                    .values()
+                    .forEach(
+                            matchedRules1 ->
+                                    matchedRules1.forEach(
+                                            matchedRule ->
+                                                    LOGGER.log(
+                                                            Level.FINE,
+                                                            "matchedRule %s",
+                                                            matchedRule)));
+        }
+
         MetricSnapshots.Builder result = MetricSnapshots.builder();
         for (List<MatchedRule> rulesWithSameName : rulesByPrometheusMetricName.values()) {
             result.metricSnapshot(convertRulesWithSameName(rulesWithSameName));

collector/src/test/java/io/prometheus/jmx/MatchedRuleToMetricSnapshotsConverterTest.java

@@ -0,0 +1,67 @@
+package io.prometheus.jmx;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.prometheus.metrics.model.snapshots.DataPointSnapshot;
+import io.prometheus.metrics.model.snapshots.MetricMetadata;
+import io.prometheus.metrics.model.snapshots.MetricSnapshots;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+
+public class MatchedRuleToMetricSnapshotsConverterTest {
+
+    @Test
+    public void testMatchedRuleAggregation() {
+        List<MatchedRule> matchedRules = new ArrayList<>();
+
+        matchedRules.add(
+                new MatchedRule(
+                        "jvm_memory_committed_bytes",
+                        "java.lang<type=Memory><HeapMemoryUsage>committed: 16252928",
+                        "UNKNOWN",
+                        "java.lang.management.MemoryUsage"
+                                + " java.lang:name=null,type=Memory,attribute=committed",
+                        of("area"),
+                        of("heap"),
+                        1.6252928E7,
+                        1.0));
+
+        matchedRules.add(
+                new MatchedRule(
+                        "jvm_memory_committed_bytes",
+                        "java.lang<type=Memory><NonHeapMemoryUsage>committed: 17170432",
+                        "UNKNOWN",
+                        "java.lang.management.MemoryUsage"
+                                + " java.lang:name=null,type=Memory,attribute=committed",
+                        of("area"),
+                        of("nonheap"),
+                        2.1757952E7,
+                        1.0));
+
+        MetricSnapshots metricSnapshots =
+                MatchedRuleToMetricSnapshotsConverter.convert(matchedRules);
+
+        assertThat(metricSnapshots).hasSize(1);
+
+        metricSnapshots.forEach(
+                metricSnapshot -> {
+                    MetricMetadata metricMetadata = metricSnapshot.getMetadata();
+
+                    assertThat(metricMetadata.getName()).isEqualTo("jvm_memory_committed_bytes");
+                    assertThat(metricMetadata.getPrometheusName())
+                            .isEqualTo("jvm_memory_committed_bytes");
+
+                    List<? extends DataPointSnapshot> dataPointSnapshots =
+                            metricSnapshot.getDataPoints();
+                    assertThat(dataPointSnapshots).hasSize(2);
+                });
+    }
+
+    private static List<String> of(String... strings) {
+        List<String> list = new ArrayList<>();
+        Collections.addAll(list, strings);
+        return list;
+    }
+}