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

Support nested requests in MetricsClientHttpRequestInterceptor

Browse Source 
Prior to this commit, requests made by `HttpRequestInterceptor`
instances configured on `RestTemplate` would not be recorded
properly.

This commit ensures that nested requests are recorded separately.

Closes gh-20231
This commit is contained in:
Dmytro Nosan
2019-12-26 14:02:01 +02:00
committed by Madhura Bhave
parent 625b40aa90
commit 1a8c321a7b
2 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.boot.actuate.metrics.web.client;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
@@ -29,7 +30,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.actuate.metrics.AutoTimer;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.test.web.client.MockRestServiceServer;
import org.springframework.test.web.client.match.MockRestRequestMatchers;
import org.springframework.test.web.client.response.MockRestResponseCreators;
@@ -107,4 +112,45 @@ class MetricsRestTemplateCustomizerTests {
this.mockServer.verify();
}
@Test
void interceptNestedRequest() {
this.mockServer.expect(MockRestRequestMatchers.requestTo("/test/123"))
.andExpect(MockRestRequestMatchers.method(HttpMethod.GET))
.andRespond(MockRestResponseCreators.withSuccess("OK", MediaType.APPLICATION_JSON));
RestTemplate nestedRestTemplate = new RestTemplate();
MockRestServiceServer nestedMockServer = MockRestServiceServer.createServer(nestedRestTemplate);
nestedMockServer.expect(MockRestRequestMatchers.requestTo("/nestedTest/124"))
.andExpect(MockRestRequestMatchers.method(HttpMethod.GET))
.andRespond(MockRestResponseCreators.withSuccess("OK", MediaType.APPLICATION_JSON));
this.customizer.customize(nestedRestTemplate);
TestInterceptor testInterceptor = new TestInterceptor(nestedRestTemplate);
this.restTemplate.getInterceptors().add(testInterceptor);
this.restTemplate.getForObject("/test/{id}", String.class, 123);
this.registry.get("http.client.requests").tags("uri", "/test/{id}").timer();
this.registry.get("http.client.requests").tags("uri", "/nestedTest/{nestedId}").timer();
this.mockServer.verify();
nestedMockServer.verify();
}
private static final class TestInterceptor implements ClientHttpRequestInterceptor {
private final RestTemplate restTemplate;
private TestInterceptor(RestTemplate restTemplate) {
this.restTemplate = restTemplate;
}
@Override
public ClientHttpResponse intercept(HttpRequest request, byte[] body, ClientHttpRequestExecution execution)
throws IOException {
this.restTemplate.getForObject("/nestedTest/{nestedId}", String.class, 124);
return execution.execute(request, body);
}
}
}