SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes the invalid blocking of threads with WebClient; fixes gh-2127

Browse Source
This commit is contained in:
Marcin Grzejszczak
2022-03-08 10:53:30 +01:00
parent 3a76bccb32
commit eee5edf93e
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
spring-cloud-sleuth-autoconfigure/src/main/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinAutoConfiguration.java
View File

@@ -16,9 +16,14 @@
package org.springframework.cloud.sleuth.autoconfig.zipkin2;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
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;
@@ -79,6 +84,8 @@ import org.springframework.web.client.RestTemplate;
@Import({ ZipkinSenderConfigurationImportSelector.class, ZipkinBraveConfiguration.class })
public class ZipkinAutoConfiguration {
private final ExecutorService zipkinExecutor = Executors.newSingleThreadExecutor();
/**
* Zipkin reporter bean name. Name of the bean matters for supporting multiple tracing
* systems.
@@ -93,32 +100,21 @@ 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 CheckResult checkResult(Sender sender, long deadlineMillis) {
CheckResult[] outcome = new CheckResult[1];
Thread thread = new Thread(sender + " check()") {
@Override
public void run() {
try {
outcome[0] = sender.check();
}
catch (Throwable e) {
outcome[0] = CheckResult.failed(e);
}
}
};
thread.start();
static CheckResult checkResult(ExecutorService zipkinExecutor, Sender sender, long deadlineMillis) {
Future<CheckResult> future = zipkinExecutor.submit(sender::check);
try {
thread.join(deadlineMillis);
if (outcome[0] != null) {
return outcome[0];
}
thread.interrupt();
return CheckResult
.failed(new TimeoutException(thread.getName() + " timed out after " + deadlineMillis + "ms"));
return future.get(deadlineMillis, TimeUnit.MILLISECONDS);
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
catch (TimeoutException e) {
return CheckResult.failed(new TimeoutException("Timed out after " + deadlineMillis + "ms"));
}
catch (Exception e) {
return CheckResult.failed(e);
}
}
@@ -127,7 +123,7 @@ public class ZipkinAutoConfiguration {
@ConditionalOnMissingBean(name = REPORTER_BEAN_NAME)
Reporter<Span> reporter(ReporterMetrics reporterMetrics, ZipkinProperties zipkin,
@Qualifier(SENDER_BEAN_NAME) Sender sender) {
CheckResult checkResult = checkResult(sender, 1_000L);
CheckResult checkResult = checkResult(zipkinExecutor, sender, 1_000L);
logCheckResult(sender, checkResult);
// historical constraint. Note: AsyncReporter supports memory bounds

3
spring-cloud-sleuth-autoconfigure/src/test/java/org/springframework/cloud/sleuth/autoconfig/zipkin2/ZipkinHttpSenderConfigurationReactiveTests.java
View File

@@ -48,7 +48,8 @@ class ZipkinHttpSenderConfigurationReactiveTests {
SpringApplication springApplication = new SpringApplication(Config.class);
springApplication.setWebApplicationType(WebApplicationType.REACTIVE);
try (ConfigurableApplicationContext context = springApplication.run("--spring.sleuth.noop.enabled=true")) {
try (ConfigurableApplicationContext context = springApplication.run("--spring.sleuth.noop.enabled=true",
"--server.port=0")) {
then(context.getBean(Sender.class)).isInstanceOf(WebClientSender.class);
}
}