Improve handling of non-standard status codes in WebClient metrics

Fixes gh-17695
spring-projects · Aug 23, 2019 · 608228d · 608228d
1 parent 52050c1
commit 608228d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/...a/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java b/...a/org/springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTags.java
@@ -80,7 +80,7 @@ private static String extractPath(String url) {
 	 * @return the status tag
 	 */
 	public static Tag status(ClientResponse response) {
-		return Tag.of("status", String.valueOf(response.statusCode().value()));
+		return Tag.of("status", String.valueOf(response.rawStatusCode()));
 	}
 
 	/**

diff --git a/...k/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProviderTests.java b/...k/boot/actuate/metrics/web/reactive/client/DefaultWebClientExchangeTagsProviderTests.java
@@ -53,7 +53,7 @@ public void setup() {
 		this.request = ClientRequest.create(HttpMethod.GET, URI.create("https://example.org/projects/spring-boot"))
 				.attribute(URI_TEMPLATE_ATTRIBUTE, "https://example.org/projects/{project}").build();
 		this.response = mock(ClientResponse.class);
-		given(this.response.statusCode()).willReturn(HttpStatus.OK);
+		given(this.response.rawStatusCode()).willReturn(HttpStatus.OK.value());
 	}
 
 	@Test

diff --git a/...amework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunctionTests.java b/...amework/boot/actuate/metrics/web/reactive/client/MetricsWebClientFilterFunctionTests.java
@@ -71,7 +71,7 @@ public void setup() {
 	public void filterShouldRecordTimer() {
 		ClientRequest request = ClientRequest
 				.create(HttpMethod.GET, URI.create("https://example.com/projects/spring-boot")).build();
-		given(this.response.statusCode()).willReturn(HttpStatus.OK);
+		given(this.response.rawStatusCode()).willReturn(HttpStatus.OK.value());
 		this.filterFunction.filter(request, this.exchange).block(Duration.ofSeconds(30));
 		assertThat(this.registry.get("http.client.requests")
 				.tags("method", "GET", "uri", "/projects/spring-boot", "status", "200").timer().count()).isEqualTo(1);
@@ -82,7 +82,7 @@ public void filterWhenUriTemplatePresentShouldRecordTimer() {
 		ClientRequest request = ClientRequest
 				.create(HttpMethod.GET, URI.create("https://example.com/projects/spring-boot"))
 				.attribute(URI_TEMPLATE_ATTRIBUTE, "/projects/{project}").build();
-		given(this.response.statusCode()).willReturn(HttpStatus.OK);
+		given(this.response.rawStatusCode()).willReturn(HttpStatus.OK.value());
 		this.filterFunction.filter(request, this.exchange).block(Duration.ofSeconds(30));
 		assertThat(this.registry.get("http.client.requests")
 				.tags("method", "GET", "uri", "/projects/{project}", "status", "200").timer().count()).isEqualTo(1);

diff --git a/.../springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java b/.../springframework/boot/actuate/metrics/web/reactive/client/WebClientExchangeTagsTests.java
@@ -51,7 +51,6 @@ public void setup() {
 		this.request = ClientRequest.create(HttpMethod.GET, URI.create("https://example.org/projects/spring-boot"))
 				.attribute(URI_TEMPLATE_ATTRIBUTE, "https://example.org/projects/{project}").build();
 		this.response = mock(ClientResponse.class);
-		given(this.response.statusCode()).willReturn(HttpStatus.OK);
 	}
 
 	@Test
@@ -85,6 +84,7 @@ public void clientName() {
 
 	@Test
 	public void status() {
+		given(this.response.rawStatusCode()).willReturn(HttpStatus.OK.value());
 		assertThat(WebClientExchangeTags.status(this.response)).isEqualTo(Tag.of("status", "200"));
 	}
 
@@ -99,4 +99,10 @@ public void statusWhenClientException() {
 				.isEqualTo(Tag.of("status", "CLIENT_ERROR"));
 	}
 
+	@Test
+	public void statusWhenNonStandard() {
+		given(this.response.rawStatusCode()).willReturn(490);
+		assertThat(WebClientExchangeTags.status(this.response)).isEqualTo(Tag.of("status", "490"));
+	}
+
 }