diff --git a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java index 140a5fc621..ba089a4d6a 100644 --- a/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java +++ b/prometheus-metrics-core/src/main/java/io/prometheus/metrics/core/metrics/StatefulMetric.java @@ -138,11 +138,15 @@ public D labelValues(String... labelValues) { */ public void remove(String... labelValues) { data.remove(Arrays.asList(labelValues)); + if (labelValues.length == 0) { + noLabels = null; + } } /** Remove the data points when the given function. */ public void removeIf(Function, Boolean> f) { data.entrySet().removeIf(entry -> f.apply(Collections.unmodifiableList(entry.getKey()))); + noLabels = null; } /** Reset the metric (remove all data points). */ diff --git a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java index f940d505dd..fc736de512 100644 --- a/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java +++ b/prometheus-metrics-core/src/test/java/io/prometheus/metrics/core/metrics/StatefulMetricTest.java @@ -75,6 +75,30 @@ void testClear() { assertThat(counter.collect().getDataPoints()).hasSize(1); } + @Test + void testRemoveNoLabels() { + Counter counter = Counter.builder().name("test").build(); + counter.inc(); + counter.remove(); + + // Making inc() works correctly after remove() + counter.inc(); + assertThat(counter.collect().getDataPoints()).hasSize(1); + assertThat(counter.collect().getDataPoints().get(0).getValue()).isEqualTo(1.0); + } + + @Test + void testRemoveIfNoLabels() { + Counter counter = Counter.builder().name("test").build(); + counter.inc(); + counter.removeIf(labelValues -> true); + + // Making inc() works correctly after removeIf() + counter.inc(); + assertThat(counter.collect().getDataPoints()).hasSize(1); + assertThat(counter.collect().getDataPoints().get(0).getValue()).isEqualTo(1.0); + } + @Test void testClearNoLabels() { Counter counter = Counter.builder().name("test").build();