From b4702612de5ff51c39d7b8bce241037b21252460 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 20 Sep 2024 11:06:18 +0100 Subject: [PATCH] Revert "Increase timeouts in ZipkinWebClientSenderTests" This reverts commit 0aeea6f06940f94c5e80ec04bb7e53d881a8c910. See 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 9a58404b0ee1..66903b9f413e 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 @@ public void onError(Throwable t) { callbackResult.set(new CallbackResult(false, t)); } }); - return Awaitility.await().atMost(Duration.ofMinutes(1)).until(callbackResult::get, Objects::nonNull); + return Awaitility.await().atMost(Duration.ofSeconds(5)).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 a4ddd69b3bc5..dcfb8616660b 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 @@ void beforeEach() { @Override Sender createSender() { - return createSender(Duration.ofMinutes(1)); + return createSender(Duration.ofSeconds(10)); } Sender createSender(Duration timeout) {