From 583893a29d9997c092fac89c8d6d84dcd6cc89ba Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Tue, 10 Jan 2017 14:55:32 -0500 Subject: [PATCH] Merging PR #446 into master. --- .../sleuth/instrument/web/client/feign/SleuthFeignBuilder.java | 3 ++- .../instrument/web/client/feign/SleuthHystrixFeignBuilder.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignBuilder.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignBuilder.java index 6553a6cc1..c665e456b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignBuilder.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthFeignBuilder.java @@ -16,6 +16,7 @@ package org.springframework.cloud.sleuth.instrument.web.client.feign; +import feign.Retryer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -35,7 +36,7 @@ final class SleuthFeignBuilder { private SleuthFeignBuilder() {} static Feign.Builder builder(BeanFactory beanFactory) { - return Feign.builder() + return Feign.builder().retryer(Retryer.NEVER_RETRY) .client(client(beanFactory)); } diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthHystrixFeignBuilder.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthHystrixFeignBuilder.java index 1efe8cadf..21f480152 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthHystrixFeignBuilder.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/feign/SleuthHystrixFeignBuilder.java @@ -16,6 +16,7 @@ package org.springframework.cloud.sleuth.instrument.web.client.feign; +import feign.Retryer; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -37,7 +38,7 @@ final class SleuthHystrixFeignBuilder { private SleuthHystrixFeignBuilder() {} static Feign.Builder builder(BeanFactory beanFactory) { - return HystrixFeign.builder() + return HystrixFeign.builder().retryer(Retryer.NEVER_RETRY) .client(client(beanFactory)); }