From f4b979e57414ff39bc7c2571d24d3d62ab72668e Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 20 May 2019 12:31:49 +0200 Subject: [PATCH] Fixed broken compilation --- .../sleuth/instrument/web/TraceHttpAutoConfiguration.java | 3 +++ .../web/client/feign/issues/issue362/Issue362Tests.java | 4 ++-- .../src/test/java/integration/ZipkinTests.java | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java index 336470d2b..95ae9d65b 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/TraceHttpAutoConfiguration.java @@ -24,7 +24,9 @@ import brave.http.HttpSampler; import brave.http.HttpServerParser; import brave.http.HttpTracing; +import org.springframework.boot.actuate.autoconfigure.info.InfoContributorAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -46,6 +48,7 @@ import org.springframework.lang.Nullable; @ConditionalOnProperty(name = "spring.sleuth.http.enabled", havingValue = "true", matchIfMissing = true) @AutoConfigureAfter(TraceWebAutoConfiguration.class) +@AutoConfigureBefore(InfoContributorAutoConfiguration.class) @EnableConfigurationProperties({ TraceKeys.class, SleuthHttpLegacyProperties.class }) public class TraceHttpAutoConfiguration { diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java index df65424cf..8c4d36864 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/issues/issue362/Issue362Tests.java @@ -210,8 +210,8 @@ class CustomConfig { public Exception decode(String methodKey, Response response) { this.feignComponentAsserter.executedComponents.put(ErrorDecoder.class, true); if (response.status() == 409) { - return new RetryableException("Article not Ready", Request.HttpMethod.GET, - new Date()); + return new RetryableException(409, "Article not Ready", + Request.HttpMethod.GET, new Date()); } else { return super.decode(methodKey, response); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java index d167bde5c..d42e76674 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/java/integration/ZipkinTests.java @@ -52,8 +52,9 @@ import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.BDDAssertions.then; @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = { WaitUntilZipkinIsUpConfig.class, - SampleZipkinApplication.class }, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) +@SpringBootTest( + classes = { WaitUntilZipkinIsUpConfig.class, SampleZipkinApplication.class }, + webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) @TestPropertySource(properties = { "sample.zipkin.enabled=true" }) public class ZipkinTests extends AbstractIntegrationTest {