Filter based on time series, not metric.

brian-brazil · brian-brazil · commit 82b48dff77fd · 2017-05-22T13:30:38.000+01:00
diff --git a/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java b/simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java
@@ -189,10 +189,19 @@ private void findNextElement() {
     }
 
     private Collector.MetricFamilySamples filter(Collector.MetricFamilySamples next) {
-      if (includedNames.isEmpty() || includedNames.contains(next.name)) {
+      if (includedNames.isEmpty()) {
         return next;
       } else {
-        return null;
+        Iterator<Collector.MetricFamilySamples.Sample> it = next.samples.iterator();
+        while (it.hasNext()) {
+            if (!includedNames.contains(it.next().name)) {
+                it.remove();
+            }
+        }
+        if (next.samples.size() == 0) {
+          return null;
+        }
+        return next;
       }
     }
 
diff --git a/simpleclient/src/test/java/io/prometheus/client/CollectorRegistryTest.java b/simpleclient/src/test/java/io/prometheus/client/CollectorRegistryTest.java
@@ -80,15 +80,20 @@ public void testMetricFamilySamples_filterNames() {
     Collector ec = new EmptyCollector().register(registry);
     SkippedCollector sr = new SkippedCollector().register(registry);
     PartiallyFilterCollector pfr = new PartiallyFilterCollector().register(registry);
-    HashSet<String> names = new HashSet<String>();
+    HashSet<String> metrics = new HashSet<String>();
+    HashSet<String> series = new HashSet<String>();
     for (Collector.MetricFamilySamples metricFamilySamples : Collections.list(registry.filteredMetricFamilySamples(
-            new HashSet<String>(Arrays.asList("", "s", "c", "part_filter_a", "part_filter_c"))))) {
-      names.add(metricFamilySamples.name);
+            new HashSet<String>(Arrays.asList("", "s_sum", "c", "part_filter_a", "part_filter_c"))))) {
+      metrics.add(metricFamilySamples.name);
+      for (Collector.MetricFamilySamples.Sample sample : metricFamilySamples.samples) {
+        series.add(sample.name);
+      }
     }
 
     assertEquals(1, sr.collectCallCount);
     assertEquals(2, pfr.collectCallCount);
-    assertEquals(new HashSet<String>(Arrays.asList("s", "c", "part_filter_a", "part_filter_c")), names);
+    assertEquals(new HashSet<String>(Arrays.asList("s", "c", "part_filter_a", "part_filter_c")), metrics);
+    assertEquals(new HashSet<String>(Arrays.asList("s_sum", "c", "part_filter_a", "part_filter_c")), series);
   }
 
   @Test
