From 0aeea6f06940f94c5e80ec04bb7e53d881a8c910 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 19 Sep 2024 14:11:09 +0100 Subject: [PATCH] Increase timeouts in ZipkinWebClientSenderTests This is an attempt to stabilize the tests. They are currently flaky due to a timeout that appears to occur because the mock web server isn't responding quickly enough. A larger timeout will either confirm this if the tests stabilize or indicate that the problem has a different cause if they do not stabilize. Closes gh-42375 --- .../autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java | 2 +- .../tracing/zipkin/ZipkinWebClientSenderTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java index 66903b9f41..9a58404b0e 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinHttpSenderTests.java @@ -91,7 +91,7 @@ abstract class ZipkinHttpSenderTests { callbackResult.set(new CallbackResult(false, t)); } }); - return Awaitility.await().atMost(Duration.ofSeconds(5)).until(callbackResult::get, Objects::nonNull); + return Awaitility.await().atMost(Duration.ofMinutes(1)).until(callbackResult::get, Objects::nonNull); } protected void makeSyncRequest(List encodedSpans) throws IOException { diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java index dcfb861666..a4ddd69b3b 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinWebClientSenderTests.java @@ -80,7 +80,7 @@ class ZipkinWebClientSenderTests extends ZipkinHttpSenderTests { @Override Sender createSender() { - return createSender(Duration.ofSeconds(10)); + return createSender(Duration.ofMinutes(1)); } Sender createSender(Duration timeout) {