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

Polish

Browse Source 
See gh-15695
This commit is contained in:
Johnny Lim
2019-01-14 16:54:04 +09:00
committed by Stephane Nicoll
parent b22561877d
commit af3ed9ff9f
10 changed files with 25 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,15 +46,16 @@ class RestTemplateMetricsConfiguration {
@Bean
@ConditionalOnMissingBean(RestTemplateExchangeTagsProvider.class)
public DefaultRestTemplateExchangeTagsProvider restTemplateTagConfigurer() {
public DefaultRestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider() {
return new DefaultRestTemplateExchangeTagsProvider();
}
@Bean
public MetricsRestTemplateCustomizer metricsRestTemplateCustomizer(
MeterRegistry meterRegistry,
RestTemplateExchangeTagsProvider restTemplateTagConfigurer) {
return new MetricsRestTemplateCustomizer(meterRegistry, restTemplateTagConfigurer,
RestTemplateExchangeTagsProvider restTemplateExchangeTagsProvider) {
return new MetricsRestTemplateCustomizer(meterRegistry,
restTemplateExchangeTagsProvider,
this.properties.getWeb().getClient().getRequestsMetricName());
}

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/RestTemplateMetricsConfigurationTests.java
View File

@@ -80,8 +80,7 @@ public class RestTemplateMetricsConfigurationTests {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(2);
assertThat(this.output.toString()).contains(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.output.toString())
"Reached the maximum number of URI tags for 'http.client.requests'.")
.contains("Are you using 'uriVariables'?");
});
}
@@ -94,8 +93,7 @@ public class RestTemplateMetricsConfigurationTests {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(this.output.toString()).doesNotContain(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.output.toString())
"Reached the maximum number of URI tags for 'http.client.requests'.")
.doesNotContain("Are you using 'uriVariables'?");
});
}

6
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/WebClientMetricsConfigurationTests.java
View File

@@ -83,8 +83,7 @@ public class WebClientMetricsConfigurationTests {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(2);
assertThat(this.output.toString()).contains(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.output.toString())
"Reached the maximum number of URI tags for 'http.client.requests'.")
.contains("Are you using 'uriVariables'?");
});
}
@@ -97,8 +96,7 @@ public class WebClientMetricsConfigurationTests {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(this.output.toString()).doesNotContain(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.output.toString())
"Reached the maximum number of URI tags for 'http.client.requests'.")
.doesNotContain("Are you using 'uriVariables'?");
});
}