Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Aggregate max statistics in metrics endpoint with Double#max"

Browse Source 
Closes gh-11852
This commit is contained in:
Andy Wilkinson
2018-01-30 20:37:42 +00:00
parent 92287f75f7
commit 42135cd5fc
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,8 +120,10 @@ public class MetricsEndpoint {
}
private void mergeMeasurements(Map<Statistic, Double> samples, Meter meter) {
meter.measure().forEach((measurement) -> samples.merge(measurement.getStatistic(),
measurement.getValue(), mergeFunction(measurement.getStatistic())));
meter.measure()
.forEach((measurement) -> samples.merge(measurement.getStatistic(),
measurement.getValue(),
mergeFunction(measurement.getStatistic())));
}
private BiFunction<Double, Double, Double> mergeFunction(Statistic statistic) {

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

@@ -135,7 +135,6 @@ public class MetricsEndpointTests {
SimpleMeterRegistry reg = new SimpleMeterRegistry();
reg.timer("timer", "k", "v1").record(1, TimeUnit.SECONDS);
reg.timer("timer", "k", "v2").record(2, TimeUnit.SECONDS);
assertMetricHasStatisticEqualTo(reg, "timer", Statistic.MAX, 2.0);
}
@@ -144,21 +143,22 @@ public class MetricsEndpointTests {
SimpleMeterRegistry reg = new SimpleMeterRegistry();
reg.counter("counter", "k", "v1").increment();
reg.counter("counter", "k", "v2").increment();
assertMetricHasStatisticEqualTo(reg, "counter", Statistic.COUNT, 2.0);
}
private void assertMetricHasStatisticEqualTo(MeterRegistry registry, String metricName, Statistic stat, Double value) {
private void assertMetricHasStatisticEqualTo(MeterRegistry registry,
String metricName, Statistic stat, Double value) {
MetricsEndpoint endpoint = new MetricsEndpoint(registry);
assertThat(endpoint.metric(metricName, Collections.emptyList()).getMeasurements()
.stream().filter(s -> s.getStatistic().equals(stat)).findAny())
.hasValueSatisfying(s -> assertThat(s.getValue()).isEqualTo(value));
.stream().filter((sample) -> sample.getStatistic().equals(stat))
.findAny()).hasValueSatisfying(
(sample) -> assertThat(sample.getValue()).isEqualTo(value));
}
private Optional<Double> getCount(MetricsEndpoint.MetricResponse response) {
return response.getMeasurements().stream()
.filter((ms) -> ms.getStatistic().equals(Statistic.COUNT)).findAny()
.map(MetricsEndpoint.Sample::getValue);
.filter((sample) -> sample.getStatistic().equals(Statistic.COUNT))
.findAny().map(MetricsEndpoint.Sample::getValue);
}
private Stream<String> availableTagKeys(MetricsEndpoint.MetricResponse response) {