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

Drop recordRequestPercentiles property 

Drop the `recordRequestPercentiles` property as it overlaps with the
property based `MeterFilter` support.

Fixes gh-11982
This commit is contained in:
Phillip Webb 2018-02-09 12:33:57 -08:00
parent 9a31b08816
commit d259f68fbf
5 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/MetricsProperties.java
View File

@ -89,12 +89,6 @@ public class MetricsProperties {
public static class Client { public static class Client {
/**
* Whether instrumented requests record percentiles histogram buckets by
* default.
*/
private boolean recordRequestPercentiles;
/** /**
* Name of the metric for sent requests. * Name of the metric for sent requests.
*/ */
@ -107,14 +101,6 @@ public class MetricsProperties {
*/ */
private int maxUriTags = 100; private int maxUriTags = 100;
public boolean isRecordRequestPercentiles() {
return this.recordRequestPercentiles;
}
public void setRecordRequestPercentiles(boolean recordRequestPercentiles) {
this.recordRequestPercentiles = recordRequestPercentiles;
}
public String getRequestsMetricName() { public String getRequestsMetricName() {
return this.requestsMetricName; return this.requestsMetricName;
} }

3
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsAutoConfiguration.java
View File

@ -69,8 +69,7 @@ public class RestTemplateMetricsAutoConfiguration {
RestTemplateExchangeTagsProvider restTemplateTagConfigurer, RestTemplateExchangeTagsProvider restTemplateTagConfigurer,
MetricsProperties properties) { MetricsProperties properties) {
return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateTagConfigurer, return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateTagConfigurer,
properties.getWeb().getClient().getRequestsMetricName(), properties.getWeb().getClient().getRequestsMetricName());
properties.getWeb().getClient().isRecordRequestPercentiles());
} }
@Bean @Bean

9
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/web/client/MetricsClientHttpRequestInterceptor.java
View File

@ -50,15 +50,11 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto
private final String metricName; private final String metricName;
private final boolean recordPercentiles;
MetricsClientHttpRequestInterceptor(MeterRegistry meterRegistry, MetricsClientHttpRequestInterceptor(MeterRegistry meterRegistry,
RestTemplateExchangeTagsProvider tagProvider, String metricName, RestTemplateExchangeTagsProvider tagProvider, String metricName) {
boolean recordPercentiles) {
this.tagProvider = tagProvider; this.tagProvider = tagProvider;
this.meterRegistry = meterRegistry; this.meterRegistry = meterRegistry;
this.metricName = metricName; this.metricName = metricName;
this.recordPercentiles = recordPercentiles;
} }
@Override @Override
@ -100,8 +96,7 @@ class MetricsClientHttpRequestInterceptor implements ClientHttpRequestIntercepto
String url = ensureLeadingSlash(urlTemplate.get()); String url = ensureLeadingSlash(urlTemplate.get());
return Timer.builder(this.metricName) return Timer.builder(this.metricName)
.tags(this.tagProvider.getTags(url, request, response)) .tags(this.tagProvider.getTags(url, request, response))
.description("Timer of RestTemplate operation") .description("Timer of RestTemplate operation");
.publishPercentileHistogram(this.recordPercentiles);
} }
private String ensureLeadingSlash(String url) { private String ensureLeadingSlash(String url) {

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

@ -45,13 +45,11 @@ public class MetricsRestTemplateCustomizer implements RestTemplateCustomizer {
* @param meterRegistry the meter registry * @param meterRegistry the meter registry
* @param tagProvider the tag provider * @param tagProvider the tag provider
* @param metricName the name of the recorded metric * @param metricName the name of the recorded metric
* @param recordPercentiles whether percentile histogram buckets should be recorded
*/ */
public MetricsRestTemplateCustomizer(MeterRegistry meterRegistry, public MetricsRestTemplateCustomizer(MeterRegistry meterRegistry,
RestTemplateExchangeTagsProvider tagProvider, String metricName, RestTemplateExchangeTagsProvider tagProvider, String metricName) {
boolean recordPercentiles) {
this.interceptor = new MetricsClientHttpRequestInterceptor(meterRegistry, this.interceptor = new MetricsClientHttpRequestInterceptor(meterRegistry,
tagProvider, metricName, recordPercentiles); tagProvider, metricName);
} }
@Override @Override

3
spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/web/client/MetricsRestTemplateCustomizerTests.java
View File

@ -57,8 +57,7 @@ public class MetricsRestTemplateCustomizerTests {
this.restTemplate = new RestTemplate(); this.restTemplate = new RestTemplate();
this.mockServer = MockRestServiceServer.createServer(this.restTemplate); this.mockServer = MockRestServiceServer.createServer(this.restTemplate);
this.customizer = new MetricsRestTemplateCustomizer(this.registry, this.customizer = new MetricsRestTemplateCustomizer(this.registry,
new DefaultRestTemplateExchangeTagsProvider(), "http.client.requests", new DefaultRestTemplateExchangeTagsProvider(), "http.client.requests");
true);
this.customizer.customize(this.restTemplate); this.customizer.customize(this.restTemplate);
} }