root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Stephane Nicoll 2018-08-31 14:44:46 +02:00
parent 7bee9dfc22
commit 4634811c7c
2 changed files with 72 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,8 @@ public class RestTemplateMetricsConfigurationTests {
public void restTemplateCreatedWithBuilderIsInstrumented() {
this.contextRunner.run((context) -> {
MeterRegistry registry = context.getBean(MeterRegistry.class);
RestTemplate restTemplate = context.getBean(RestTemplateBuilder.class)
.build();
validateRestTemplate(restTemplate, registry);
RestTemplateBuilder builder = context.getBean(RestTemplateBuilder.class);
validateRestTemplate(builder, registry);
});
}
@ -65,11 +64,10 @@ public class RestTemplateMetricsConfigurationTests {
public void restTemplateCanBeCustomizedManually() {
this.contextRunner.run((context) -> {
assertThat(context).hasSingleBean(MetricsRestTemplateCustomizer.class);
RestTemplate restTemplate = new RestTemplateBuilder()
.customizers(context.getBean(MetricsRestTemplateCustomizer.class))
.build();
RestTemplateBuilder customBuilder = new RestTemplateBuilder()
.customizers(context.getBean(MetricsRestTemplateCustomizer.class));
MeterRegistry registry = context.getBean(MeterRegistry.class);
validateRestTemplate(restTemplate, registry);
validateRestTemplate(customBuilder, registry);
});
}
@ -96,8 +94,8 @@ public class RestTemplateMetricsConfigurationTests {
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(this.out.toString()).doesNotContain(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.out.toString()).doesNotContain(
"Are you using 'uriVariables' on RestTemplate calls?");
assertThat(this.out.toString())
.doesNotContain("Are you using 'uriVariables'?");
});
}
@ -115,13 +113,23 @@ public class RestTemplateMetricsConfigurationTests {
return registry;
}
private void validateRestTemplate(RestTemplate restTemplate, MeterRegistry registry) {
MockRestServiceServer server = MockRestServiceServer.createServer(restTemplate);
server.expect(requestTo("/test")).andRespond(withStatus(HttpStatus.OK));
private void validateRestTemplate(RestTemplateBuilder builder,
MeterRegistry registry) {
RestTemplate restTemplate = mockRestTemplate(builder);
assertThat(registry.find("http.client.requests").meter()).isNull();
assertThat(restTemplate.getForEntity("/test", Void.class).getStatusCode())
.isEqualTo(HttpStatus.OK);
registry.get("http.client.requests").meter();
assertThat(restTemplate
.getForEntity("/projects/{project}", Void.class, "spring-boot")
.getStatusCode()).isEqualTo(HttpStatus.OK);
assertThat(registry.get("http.client.requests").tags("uri", "/projects/{project}")
.meter()).isNotNull();
}
private RestTemplate mockRestTemplate(RestTemplateBuilder builder) {
RestTemplate restTemplate = builder.build();
MockRestServiceServer server = MockRestServiceServer.createServer(restTemplate);
server.expect(requestTo("/projects/spring-boot"))
.andRespond(withStatus(HttpStatus.OK));
return restTemplate;
}
}

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

@ -17,16 +17,15 @@
package org.springframework.boot.actuate.autoconfigure.metrics.web.client;
import io.micrometer.core.instrument.MeterRegistry;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import reactor.core.publisher.Mono;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsProperties;
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
import org.springframework.boot.actuate.metrics.web.reactive.client.WebClientExchangeTagsProvider;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.context.annotation.Bean;
@ -45,36 +44,23 @@ import static org.mockito.Mockito.mock;
* Tests for {@link WebClientMetricsConfiguration}
*
* @author Brian Clozel
* @author Stephane Nicoll
*/
public class WebClientMetricsConfigurationTests {
private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.with(MetricsRun.simple())
.withConfiguration(AutoConfigurations.of(WebClientAutoConfiguration.class));
private ClientHttpConnector connector;
@Rule
public OutputCapture out = new OutputCapture();
@Before
public void setup() {
this.connector = mock(ClientHttpConnector.class);
given(this.connector.connect(any(), any(), any()))
.willReturn(Mono.just(new MockClientHttpResponse(HttpStatus.OK)));
}
@Test
public void webClientCreatedWithBuilderIsInstrumented() {
this.contextRunner.run((context) -> {
WebClient.Builder builder = context.getBean(WebClient.Builder.class);
WebClient webClient = builder.clientConnector(this.connector).build();
MeterRegistry registry = context.getBean(MeterRegistry.class);
assertThat(registry.find("http.client.requests").meter()).isNull();
webClient.get().uri("http://example.org/projects/{project}", "spring-boot")
.exchange().block();
assertThat(registry.find("http.client.requests")
.tags("uri", "/projects/{project}").meter()).isNotNull();
WebClient.Builder builder = context.getBean(WebClient.Builder.class);
validateWebClient(builder, registry);
});
}
@ -89,20 +75,10 @@ public class WebClientMetricsConfigurationTests {
@Test
public void afterMaxUrisReachedFurtherUrisAreDenied() {
this.contextRunner
.withPropertyValues("management.metrics.web.client.max-uri-tags=10")
.withPropertyValues("management.metrics.web.client.max-uri-tags=2")
.run((context) -> {
WebClient.Builder builder = context.getBean(WebClient.Builder.class);
WebClient webClient = builder.clientConnector(this.connector).build();
MetricsProperties properties = context
.getBean(MetricsProperties.class);
int maxUriTags = properties.getWeb().getClient().getMaxUriTags();
MeterRegistry registry = context.getBean(MeterRegistry.class);
for (int i = 0; i < maxUriTags + 10; i++) {
webClient.get().uri("http://example.org/projects/" + i).exchange()
.block();
}
assertThat(registry.get("http.client.requests").meters())
.hasSize(maxUriTags);
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(2);
assertThat(this.out.toString()).contains(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.out.toString())
@ -110,8 +86,48 @@ public class WebClientMetricsConfigurationTests {
});
}
@Test
public void shouldNotDenyNorLogIfMaxUrisIsNotReached() {
this.contextRunner
.withPropertyValues("management.metrics.web.client.max-uri-tags=5")
.run((context) -> {
MeterRegistry registry = getInitializedMeterRegistry(context);
assertThat(registry.get("http.client.requests").meters()).hasSize(3);
assertThat(this.out.toString()).doesNotContain(
"Reached the maximum number of URI tags for 'http.client.requests'.");
assertThat(this.out.toString())
.doesNotContain("Are you using 'uriVariables'?");
});
}
private MeterRegistry getInitializedMeterRegistry(
AssertableApplicationContext context) {
WebClient webClient = mockWebClient(context.getBean(WebClient.Builder.class));
MeterRegistry registry = context.getBean(MeterRegistry.class);
for (int i = 0; i < 3; i++) {
webClient.get().uri("http://example.org/projects/" + i).exchange().block();
}
return registry;
}
private void validateWebClient(WebClient.Builder builder, MeterRegistry registry) {
WebClient webClient = mockWebClient(builder);
assertThat(registry.find("http.client.requests").meter()).isNull();
webClient.get().uri("http://example.org/projects/{project}", "spring-boot")
.exchange().block();
assertThat(registry.find("http.client.requests")
.tags("uri", "/projects/{project}").meter()).isNotNull();
}
private WebClient mockWebClient(WebClient.Builder builder) {
ClientHttpConnector connector = mock(ClientHttpConnector.class);
given(connector.connect(any(), any(), any()))
.willReturn(Mono.just(new MockClientHttpResponse(HttpStatus.OK)));
return builder.clientConnector(connector).build();
}
@Configuration
protected static class CustomTagsProviderConfig {
static class CustomTagsProviderConfig {
@Bean
public WebClientExchangeTagsProvider customTagsProvider() {