diff --git a/pom.xml b/pom.xml
index 5cce733e9..836b57123 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
3.1.0-SNAPSHOT
3.0.0-SNAPSHOT
3.0.0-SNAPSHOT
- 5.12.3
+ 5.12.6
0.32.0
0.9.1
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 8dd60ac3a..8629e57d1 100644
--- a/spring-cloud-sleuth-dependencies/pom.xml
+++ b/spring-cloud-sleuth-dependencies/pom.xml
@@ -31,7 +31,7 @@
spring-cloud-sleuth-dependencies
Spring Cloud Sleuth Dependencies
- 5.12.3
+ 5.12.6
0.37.2
4.0.0
0.9.1
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
index 1be27c66e..977db36af 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
@@ -97,6 +97,11 @@ abstract class ITSpringConfiguredReactorClient extends ITHttpAsyncClient postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body);
-
/** Returns a {@link Mono} of the HTTP status code. */
abstract Mono getMono(AnnotationConfigApplicationContext context, String pathIncludingQuery);
+ /**
+ * Returns a {@link Mono} of the HTTP status code from the given "OPTIONS" request.
+ */
+ abstract Mono optionsMono(AnnotationConfigApplicationContext context, String path);
+
+ /** Returns a {@link Mono} of the HTTP status code from the given "POST" request. */
+ abstract Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body);
+
/**
* This assumes that implementations do not issue an HTTP request until
* {@link Subscription#request(long)} is called. Since a client span is only for
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
index 6a5cc831e..c6e5fd5da 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
@@ -71,15 +71,20 @@ public class ReactorNettyHttpClientBraveTests extends ITSpringConfiguredReactorC
super(HttpClientBeanPostProcessor.class);
}
+ @Override
+ Mono getMono(AnnotationConfigApplicationContext context, String pathIncludingQuery) {
+ return context.getBean(HttpClient.class).get().uri(pathIncludingQuery).response().map(r -> r.status().code());
+ }
+
+ @Override
+ Mono optionsMono(AnnotationConfigApplicationContext context, String path) {
+ return context.getBean(HttpClient.class).options().uri(path).response().map(r -> r.status().code());
+ }
+
@Override
Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) {
return context.getBean(HttpClient.class).post().send(ByteBufFlux.fromString(Mono.just(body)))
.uri(pathIncludingQuery).response().map(r -> r.status().code());
}
- @Override
- Mono getMono(AnnotationConfigApplicationContext context, String pathIncludingQuery) {
- return context.getBean(HttpClient.class).get().uri(pathIncludingQuery).response().map(r -> r.status().code());
- }
-
}
diff --git a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
index 2ac762209..e3b8cc42f 100644
--- a/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
+++ b/tests/brave/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
@@ -51,18 +51,24 @@ public class WebClientBraveTests extends ITSpringConfiguredReactorClient {
super(WebClientConfiguration.class, WebClientAutoConfiguration.class, TraceWebClientBeanPostProcessor.class);
}
- @Override
- Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) {
- return context.getBean(WebClient.Builder.class).build().post().uri(pathIncludingQuery)
- .body(BodyInserters.fromValue(body)).exchange().map(ClientResponse::rawStatusCode);
- }
-
@Override
Mono getMono(AnnotationConfigApplicationContext context, String pathIncludingQuery) {
return context.getBean(WebClient.Builder.class).build().get().uri(pathIncludingQuery).exchange()
.map(ClientResponse::rawStatusCode);
}
+ @Override
+ Mono optionsMono(AnnotationConfigApplicationContext context, String path) {
+ return context.getBean(WebClient.Builder.class).build().options().uri(path).exchange()
+ .map(ClientResponse::rawStatusCode);
+ }
+
+ @Override
+ Mono postMono(AnnotationConfigApplicationContext context, String pathIncludingQuery, String body) {
+ return context.getBean(WebClient.Builder.class).build().post().uri(pathIncludingQuery)
+ .body(BodyInserters.fromValue(body)).exchange().map(ClientResponse::rawStatusCode);
+ }
+
@Test
@Ignore("WebClient is blind to the implementation of redirects")
@Override