From 327ce80c384223846eca54ec3b60de3ef6fda829 Mon Sep 17 00:00:00 2001 From: Denis Stepanov Date: Wed, 22 Mar 2017 10:43:56 +0100 Subject: [PATCH] Use HystrixFeign only if it's present on classpath (#544) --- .../web/client/feign/TraceFeignClientAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java index 6c866afa3..258f5d991 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/TraceFeignClientAutoConfiguration.java @@ -52,7 +52,7 @@ public class TraceFeignClientAutoConfiguration { @Bean @Scope("prototype") - @ConditionalOnClass(name = "com.netflix.hystrix.HystrixCommand") + @ConditionalOnClass(name = {"com.netflix.hystrix.HystrixCommand", "feign.hystrix.HystrixFeign"}) @ConditionalOnProperty(name = "feign.hystrix.enabled", matchIfMissing = true) Feign.Builder feignHystrixBuilder(BeanFactory beanFactory) { return SleuthHystrixFeignBuilder.builder(beanFactory);