diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java index 54cceb50dbb..3098e80c049 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java @@ -89,12 +89,6 @@ public class MetricsProperties { public static class Client { - /** - * Whether instrumented requests record percentiles histogram buckets by - * default. - */ - private boolean recordRequestPercentiles; - /** * Name of the metric for sent requests. */ @@ -107,14 +101,6 @@ public class MetricsProperties { */ private int maxUriTags = 100; - public boolean isRecordRequestPercentiles() { - return this.recordRequestPercentiles; - } - - public void setRecordRequestPercentiles(boolean recordRequestPercentiles) { - this.recordRequestPercentiles = recordRequestPercentiles; - } - public String getRequestsMetricName() { return this.requestsMetricName; } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java index a56b21d1d96..7ec4df10dea 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java @@ -69,8 +69,7 @@ public class RestTemplateMetricsAutoConfiguration { RestTemplateExchangeTagsProvider restTemplateTagConfigurer, MetricsProperties properties) { return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateTagConfigurer, - properties.getWeb().getClient().getRequestsMetricName(), - properties.getWeb().getClient().isRecordRequestPercentiles()); + properties.getWeb().getClient().getRequestsMetricName()); } @Bean diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java index 08044ed6507..91c751a312a 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java @@ -50,15 +50,11 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto private final String metricName; - private final boolean recordPercentiles; - MetricsClientHttpRequestInterceptor(MeterRegistry meterRegistry, - RestTemplateExchangeTagsProvider tagProvider, String metricName, - boolean recordPercentiles) { + RestTemplateExchangeTagsProvider tagProvider, String metricName) { this.tagProvider = tagProvider; this.meterRegistry = meterRegistry; this.metricName = metricName; - this.recordPercentiles = recordPercentiles; } @Override @@ -100,8 +96,7 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto String url = ensureLeadingSlash(urlTemplate.get()); return Timer.builder(this.metricName) .tags(this.tagProvider.getTags(url, request, response)) - .description("Timer of RestTemplate operation") - .publishPercentileHistogram(this.recordPercentiles); + .description("Timer of RestTemplate operation"); } private String ensureLeadingSlash(String url) { diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizer.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizer.java index 7757a86f388..9c667805987 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizer.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizer.java @@ -45,13 +45,11 @@ public class MetricsRestTemplateCustomizer implements RestTemplateCustomizer { * @param meterRegistry the meter registry * @param tagProvider the tag provider * @param metricName the name of the recorded metric - * @param recordPercentiles whether percentile histogram buckets should be recorded */ public MetricsRestTemplateCustomizer(MeterRegistry meterRegistry, - RestTemplateExchangeTagsProvider tagProvider, String metricName, - boolean recordPercentiles) { + RestTemplateExchangeTagsProvider tagProvider, String metricName) { this.interceptor = new MetricsClientHttpRequestInterceptor(meterRegistry, - tagProvider, metricName, recordPercentiles); + tagProvider, metricName); } @Override diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java index 2371a6e5c48..83c466d99e3 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java @@ -57,8 +57,7 @@ public class MetricsRestTemplateCustomizerTests { this.restTemplate = new RestTemplate(); this.mockServer = MockRestServiceServer.createServer(this.restTemplate); this.customizer = new MetricsRestTemplateCustomizer(this.registry, - new DefaultRestTemplateExchangeTagsProvider(), "http.client.requests", - true); + new DefaultRestTemplateExchangeTagsProvider(), "http.client.requests"); this.customizer.customize(this.restTemplate); }