Merge branch '6.1.x'

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

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

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

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