diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index a42087ab1..a8c1d7b9d 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -33,7 +33,7 @@
1.8
1.8
2.3.3.RELEASE
- 5.12.3
+ 5.12.6
3.14.6
diff --git a/pom.xml b/pom.xml
index 318629b8b..69692c270 100644
--- a/pom.xml
+++ b/pom.xml
@@ -257,7 +257,7 @@
Horsham.SR8
2.2.6.BUILD-SNAPSHOT
2.2.6.BUILD-SNAPSHOT
- 5.12.3
+ 5.12.6
2.1.7.RELEASE
2.2.5.BUILD-SNAPSHOT
false
diff --git a/spring-cloud-sleuth-dependencies/pom.xml b/spring-cloud-sleuth-dependencies/pom.xml
index 6bff54e45..7b7251b96 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
3.4.1
diff --git a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
index 0b9f3879a..6284afea5 100644
--- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
+++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ITSpringConfiguredReactorClient.java
@@ -93,6 +93,12 @@ abstract class ITSpringConfiguredReactorClient
getMono(context, pathIncludingQuery).block();
}
+ @Override
+ final protected void options(AnnotationConfigApplicationContext context,
+ String path) {
+ optionsMono(context, path).block();
+ }
+
@Override
final protected void post(AnnotationConfigApplicationContext context,
String pathIncludingQuery, String body) {
@@ -105,14 +111,20 @@ abstract class ITSpringConfiguredReactorClient
TestHttpCallbackSubscriber.subscribe(getMono(context, path), callback);
}
- /** Returns a {@link Mono} of the HTTP status code from the given "POST" request. */
- abstract Mono 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/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
index cc2230da7..5a499ce09 100644
--- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
+++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/ReactorNettyHttpClientBraveTests.java
@@ -70,6 +70,19 @@ 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) {
@@ -78,11 +91,4 @@ public class ReactorNettyHttpClientBraveTests extends ITSpringConfiguredReactorC
.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/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
index 9e8bf29f8..529f6b820 100644
--- a/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
+++ b/tests/spring-cloud-sleuth-instrumentation-reactor-tests/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/WebClientBraveTests.java
@@ -52,6 +52,19 @@ public class WebClientBraveTests extends ITSpringConfiguredReactorClient {
TraceWebClientBeanPostProcessor.class);
}
+ @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) {
@@ -60,13 +73,6 @@ public class WebClientBraveTests extends ITSpringConfiguredReactorClient {
.map(ClientResponse::rawStatusCode);
}
- @Override
- Mono getMono(AnnotationConfigApplicationContext context,
- String pathIncludingQuery) {
- return context.getBean(WebClient.Builder.class).build().get()
- .uri(pathIncludingQuery).exchange().map(ClientResponse::rawStatusCode);
- }
-
@Test
@Ignore("WebClient is blind to the implementation of redirects")
@Override