From f0f4444a37cd5c5eb4a89066584583328ddd9b72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jordi=20Mart=C3=ADnez=20Vicent?= <35734630+JordiMartinezVicent@users.noreply.github.com> Date: Tue, 29 Nov 2022 14:36:07 +0100 Subject: [PATCH] Fix application does not shutdown (#2217) --- .../autoconfig/zipkin2/ZipkinAutoConfiguration.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java index fa8e70f735..3c5de9794b 100644 --- a/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java +++ b/spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java @@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import javax.annotation.PreDestroy; - import io.micrometer.core.instrument.MeterRegistry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -103,11 +101,6 @@ public class ZipkinAutoConfiguration { private static final Log log = LogFactory.getLog(ZipkinAutoConfiguration.class); - @PreDestroy - void cleanup() { - this.zipkinExecutor.shutdown(); - } - /** Limits {@link Sender#check()} to {@code deadlineMillis}. */ static CompletableFuture checkResult(ExecutorService zipkinExecutor, Sender sender, long deadlineMillis) { @@ -124,6 +117,8 @@ static CompletableFuture checkResult(ExecutorService zipkinExecutor result = checkResult == null ? CheckResult.failed(exception) : checkResult; } logCheckResult(sender, result); + + zipkinExecutor.shutdown(); }); }