root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Deduplicate tag values in metrics actuator endpoint 

See gh-11492
This commit is contained in:
Jon Schneider 2018-01-03 13:45:27 -06:00 committed by Stephane Nicoll
parent 1962cbb623
commit ebb51d5533
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java
View File

@ -16,10 +16,6 @@
package org.springframework.boot.actuate.metrics; package org.springframework.boot.actuate.metrics;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -66,8 +62,7 @@ public class MetricsEndpoint {
if (registry instanceof CompositeMeterRegistry) { if (registry instanceof CompositeMeterRegistry) {
((CompositeMeterRegistry) registry).getRegistries() ((CompositeMeterRegistry) registry).getRegistries()
.forEach((member) -> collectNames(names, member)); .forEach((member) -> collectNames(names, member));
} } else {
else {
registry.getMeters().stream().map(this::getName).forEach(names::add); registry.getMeters().stream().map(this::getName).forEach(names::add);
} }
} }
@ -88,7 +83,7 @@ public class MetricsEndpoint {
return null; return null;
} }
Map<Statistic, Double> samples = getSamples(meters); Map<Statistic, Double> samples = getSamples(meters);
Map<String, List<String>> availableTags = getAvailableTags(meters); Map<String, Set<String>> availableTags = getAvailableTags(meters);
tags.forEach((t) -> availableTags.remove(t.getKey())); tags.forEach((t) -> availableTags.remove(t.getKey()));
return new MetricResponse(requiredMetricName, return new MetricResponse(requiredMetricName,
asList(samples, MetricResponse.Sample::new), asList(samples, MetricResponse.Sample::new),
@ -107,8 +102,7 @@ public class MetricsEndpoint {
if (registry instanceof CompositeMeterRegistry) { if (registry instanceof CompositeMeterRegistry) {
((CompositeMeterRegistry) registry).getRegistries() ((CompositeMeterRegistry) registry).getRegistries()
.forEach((member) -> collectMeters(meters, member, name, tags)); .forEach((member) -> collectMeters(meters, member, name, tags));
} } else {
else {
meters.addAll(registry.find(name).tags(tags).meters()); meters.addAll(registry.find(name).tags(tags).meters());
} }
} }
@ -124,8 +118,8 @@ public class MetricsEndpoint {
measurement.getValue(), Double::sum)); measurement.getValue(), Double::sum));
} }
private Map<String, List<String>> getAvailableTags(List<Meter> meters) { private Map<String, Set<String>> getAvailableTags(List<Meter> meters) {
Map<String, List<String>> availableTags = new HashMap<>(); Map<String, Set<String>> availableTags = new HashMap<>();
meters.forEach((meter) -> mergeAvailableTags(availableTags, meter)); meters.forEach((meter) -> mergeAvailableTags(availableTags, meter));
return availableTags; return availableTags;
} }
@ -133,15 +127,15 @@ public class MetricsEndpoint {
private void mergeAvailableTags(Map<String, List<String>> availableTags, private void mergeAvailableTags(Map<String, List<String>> availableTags,
Meter meter) { Meter meter) {
meter.getId().getTags().forEach((tag) -> { meter.getId().getTags().forEach((tag) -> {
List<String> value = Collections.singletonList(tag.getValue()); Set<String> value = Collections.singleton(tag.getValue());
availableTags.merge(tag.getKey(), value, this::merge); availableTags.merge(tag.getKey(), value, this::merge);
}); });
} }
private <T> List<T> merge(List<T> list1, List<T> list2) { private <T> Set<T> merge(Set<T> set1, Set<T> set2) {
List<T> result = new ArrayList<>(list1.size() + list2.size()); Set<T> result = new HashSet<>(set1.size() + set2.size());
result.addAll(list1); result.addAll(set1);
result.addAll(list2); result.addAll(set2);
return result; return result;
} }
@ -204,9 +198,9 @@ public class MetricsEndpoint {
private final String tag; private final String tag;
private final List<String> values; private final Set<String> values;
AvailableTag(String tag, List<String> values) { AvailableTag(String tag, Set<String> values) {
this.tag = tag; this.tag = tag;
this.values = values; this.values = values;
} }
@ -215,7 +209,7 @@ public class MetricsEndpoint {
return this.tag; return this.tag;
} }
public List<String> getValues() { public Set<String> getValues() {
return this.values; return this.values;
} }
} }

13
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java
View File

@ -87,6 +87,19 @@ public class MetricsEndpointTests {
assertThat(getCount(response)).hasValue(4.0); assertThat(getCount(response)).hasValue(4.0);
} }
@Test
public void metricTagValuesAreDeduplicated() {
this.registry.counter("cache", "host", "1", "region", "east", "result", "hit");
this.registry.counter("cache", "host", "1", "region", "east", "result", "miss");
MetricsEndpoint.MetricResponse response = this.endpoint.metric("cache",
Collections.singletonList("host:1"));
assertThat(response.getAvailableTags()
.stream()
.filter(t -> t.getTag().equals("region"))
.flatMap(t -> t.getValues().stream()))
.containsExactly("east");
}
@Test @Test
public void metricWithSpaceInTagValue() { public void metricWithSpaceInTagValue() {
this.registry.counter("counter", "key", "a space").increment(2); this.registry.counter("counter", "key", "a space").increment(2);