From 59b406b9ac62303c9fcc729e2a3c84df81056af4 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 19 Mar 2018 15:30:17 +0100 Subject: [PATCH] Added a check on Feign's class --- .../web/client/feign/TraceFeignClientAutoConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 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 cd9684766..c3829f2b2 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 @@ -17,6 +17,7 @@ package org.springframework.cloud.sleuth.instrument.web.client.feign; import brave.http.HttpTracing; +import feign.Client; import feign.Feign; import feign.okhttp.OkHttpClient; import org.springframework.beans.factory.BeanFactory; @@ -43,7 +44,7 @@ import org.springframework.context.annotation.Scope; */ @Configuration @ConditionalOnProperty(value = "spring.sleuth.feign.enabled", matchIfMissing = true) -@ConditionalOnClass(FeignContext.class) +@ConditionalOnClass({ Client.class, FeignContext.class }) @ConditionalOnBean(HttpTracing.class) @AutoConfigureBefore(FeignAutoConfiguration.class) @AutoConfigureAfter({SleuthHystrixAutoConfiguration.class, TraceHttpAutoConfiguration.class})