From 42135cd5fcd9f2d24c7856cb71651ccaf14aae2d Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 30 Jan 2018 20:37:42 +0000 Subject: [PATCH] Polish "Aggregate max statistics in metrics endpoint with Double#max" Closes gh-11852 --- .../boot/actuate/metrics/MetricsEndpoint.java | 6 ++++-- .../boot/actuate/metrics/MetricsEndpointTests.java | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java index 542c4c5d90..4cb378456b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/MetricsEndpoint.java @@ -120,8 +120,10 @@ public class MetricsEndpoint { } private void mergeMeasurements(Map 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 mergeFunction(Statistic statistic) { diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java index 059084f4c0..caf2227a34 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/MetricsEndpointTests.java @@ -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 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 availableTagKeys(MetricsEndpoint.MetricResponse response) {