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

Merge branch '6.1.x'

This commit is contained in:
Brian Clozel 2024-03-08 11:36:54 +01:00
parent e66d965fed f6bc828569
commit c1bd9243ee
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java
View File

@ -471,7 +471,7 @@ final class DefaultWebClient implements WebClient {
final AtomicBoolean responseReceived = new AtomicBoolean(); final AtomicBoolean responseReceived = new AtomicBoolean();
return responseMono return responseMono
.doOnNext(response -> responseReceived.set(true)) .doOnNext(response -> responseReceived.set(true))
.doOnError(observationContext::setError) .doOnError(observation::error)
.doFinally(signalType -> { .doFinally(signalType -> {
if (signalType == SignalType.CANCEL && !responseReceived.get()) { if (signalType == SignalType.CANCEL && !responseReceived.get()) {
observationContext.setAborted(true); observationContext.setAborted(true);

5
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientObservationTests.java
View File

@ -110,7 +110,8 @@ class WebClientObservationTests {
StepVerifier.create(client.get().uri("/path").retrieve().bodyToMono(Void.class)) StepVerifier.create(client.get().uri("/path").retrieve().bodyToMono(Void.class))
.expectError(IllegalStateException.class) .expectError(IllegalStateException.class)
.verify(Duration.ofSeconds(5)); .verify(Duration.ofSeconds(5));
assertThatHttpObservation().hasLowCardinalityKeyValue("exception", "IllegalStateException") assertThatHttpObservation().hasError()
.hasLowCardinalityKeyValue("exception", "IllegalStateException")
.hasLowCardinalityKeyValue("status", "CLIENT_ERROR"); .hasLowCardinalityKeyValue("status", "CLIENT_ERROR");
} }
@ -172,7 +173,7 @@ class WebClientObservationTests {
StepVerifier.create(responseMono) StepVerifier.create(responseMono)
.expectError(IllegalStateException.class) .expectError(IllegalStateException.class)
.verify(Duration.ofSeconds(5)); .verify(Duration.ofSeconds(5));
assertThatHttpObservation() assertThatHttpObservation().hasError()
.hasLowCardinalityKeyValue("exception", "IllegalStateException") .hasLowCardinalityKeyValue("exception", "IllegalStateException")
.hasLowCardinalityKeyValue("status", "200"); .hasLowCardinalityKeyValue("status", "200");
} }