From af70f0dde127520bf130fe300c406ea1c2cd02d5 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 19 May 2016 17:01:57 +0200 Subject: [PATCH] Fixing CGLIB issue with Spring Boot 1.4.0 --- .../hystrix/HystrixAnnotationsIntegrationTests.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java index c3d1d275b..11dd80608 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java @@ -16,8 +16,9 @@ package org.springframework.cloud.sleuth.instrument.hystrix; -import java.util.concurrent.atomic.AtomicReference; - +import com.jayway.awaitility.Awaitility; +import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; +import com.netflix.hystrix.strategy.HystrixPlugins; import org.junit.After; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,9 +38,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.jayway.awaitility.Awaitility; -import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; -import com.netflix.hystrix.strategy.HystrixPlugins; +import java.util.concurrent.atomic.AtomicReference; import static org.assertj.core.api.BDDAssertions.then; import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; @@ -131,7 +130,7 @@ public class HystrixAnnotationsIntegrationTests { } - static class HystrixCommandInvocationSpanCatcher { + public static class HystrixCommandInvocationSpanCatcher { AtomicReference spanCaughtFromHystrixThread;