Merge branch '3.3.x'

Closes spring-projectsgh-42389

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java

@@ -81,7 +81,7 @@ void beforeEach() {
 
 	@Override
 	BytesMessageSender createSender() {
-		return createSender(Encoding.JSON, Duration.ofSeconds(10));
+		return createSender(Encoding.JSON, Duration.ofMinutes(1));
 	}
 
 	ZipkinWebClientSender createSender(Encoding encoding, Duration timeout) {
@@ -110,7 +110,7 @@ void sendShouldSendSpansToZipkin() throws IOException, InterruptedException {
 	void sendShouldSendSpansToZipkinInProto3() throws IOException, InterruptedException {
 		mockBackEnd.enqueue(new MockResponse());
 		List<byte[]> encodedSpans = List.of(toByteArray("span1"), toByteArray("span2"));
-		try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofSeconds(10))) {
+		try (BytesMessageSender sender = createSender(Encoding.PROTO3, Duration.ofMinutes(1))) {
 			sender.send(encodedSpans);
 		}
 		requestAssertions((request) -> {
@@ -126,7 +126,7 @@ void sendUsesDynamicEndpoint() throws Exception {
 		mockBackEnd.enqueue(new MockResponse());
 		try (HttpEndpointSupplier httpEndpointSupplier = new TestHttpEndpointSupplier(ZIPKIN_URL)) {
 			try (BytesMessageSender sender = createSender((endpoint) -> httpEndpointSupplier, Encoding.JSON,
-					Duration.ofSeconds(10))) {
+					Duration.ofMinutes(1))) {
 				sender.send(Collections.emptyList());
 				sender.send(Collections.emptyList());
 			}