diff --git a/pom.xml b/pom.xml index 6682425ad..5caa41ef4 100644 --- a/pom.xml +++ b/pom.xml @@ -201,27 +201,27 @@ test - com.jayway.awaitility + org.awaitility awaitility - 1.7.0 + 3.0.0 test com.github.tomakehurst wiremock - 2.5.1 + 2.6.0 test pl.pragmatists JUnitParams - 1.0.6 + 1.1.0 test org.assertj assertj-core - 3.6.2 + 3.8.0 test diff --git a/spring-cloud-sleuth-core/pom.xml b/spring-cloud-sleuth-core/pom.xml index df4056809..79e36b7de 100644 --- a/spring-cloud-sleuth-core/pom.xml +++ b/spring-cloud-sleuth-core/pom.xml @@ -126,7 +126,7 @@ test - com.jayway.awaitility + org.awaitility awaitility test diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue410/Issue410Tests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue410/Issue410Tests.java index 01939d93a..49ebff6a5 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue410/Issue410Tests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/async/issues/issue410/Issue410Tests.java @@ -52,7 +52,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; /** * @author Marcin Grzejszczak @@ -88,7 +88,7 @@ public class Issue410Tests { "http://localhost:" + port() + "/without_pool", String.class); then(response).isEqualTo(span.traceIdString()); - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.asyncTask.getSpan().get()).isNotNull(); then(this.asyncTask.getSpan().get().getTraceId()) .isEqualTo(span.getTraceId()); @@ -108,7 +108,7 @@ public class Issue410Tests { "http://localhost:" + port() + "/with_pool", String.class); then(response).isEqualTo(span.traceIdString()); - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.asyncTask.getSpan().get()).isNotNull(); then(this.asyncTask.getSpan().get().getTraceId()) .isEqualTo(span.getTraceId()); @@ -131,7 +131,7 @@ public class Issue410Tests { "http://localhost:" + port() + "/completable", String.class); then(response).isEqualTo(span.traceIdString()); - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.asyncTask.getSpan().get()).isNotNull(); then(this.asyncTask.getSpan().get().getTraceId()) .isEqualTo(span.getTraceId()); @@ -154,7 +154,7 @@ public class Issue410Tests { "http://localhost:" + port() + "/taskScheduler", String.class); then(response).isEqualTo(span.traceIdString()); - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.asyncTask.getSpan().get()).isNotNull(); then(this.asyncTask.getSpan().get().getTraceId()) .isEqualTo(span.getTraceId()); 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 d2d890bc6..967559dc5 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 @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; import com.netflix.hystrix.strategy.HystrixPlugins; @@ -91,26 +91,20 @@ public class HystrixAnnotationsIntegrationTests { private void thenSpanInHystrixThreadIsContinued(final Span span) { then(span).isNotNull(); - Awaitility.await().atMost(5, SECONDS).until(new Runnable() { - @Override - public void run() { + Awaitility.await().atMost(5, SECONDS).untilAsserted(() -> { then(HystrixAnnotationsIntegrationTests.this.catcher).isNotNull(); then(span) .hasTraceIdEqualTo(HystrixAnnotationsIntegrationTests.this.catcher .getTraceId()) .hasNameEqualTo(HystrixAnnotationsIntegrationTests.this.catcher .getSpanName()); - } }); } private void thenSpanInHystrixThreadIsCreated() { - Awaitility.await().atMost(5, SECONDS).until(new Runnable() { - @Override - public void run() { - then(HystrixAnnotationsIntegrationTests.this.catcher.getSpan()) - .nameStartsWith("hystrix").isALocalComponentSpan(); - } + Awaitility.await().atMost(5, SECONDS).untilAsserted(() -> { + then(HystrixAnnotationsIntegrationTests.this.catcher.getSpan()) + .nameStartsWith("hystrix").isALocalComponentSpan(); }); } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java index cbed5bf7b..fed36665c 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/rxjava/SleuthRxJavaTests.java @@ -1,6 +1,6 @@ package org.springframework.cloud.sleuth.instrument.rxjava; -import static com.jayway.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import static java.util.concurrent.TimeUnit.SECONDS; import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; @@ -70,7 +70,7 @@ public class SleuthRxJavaTests { then(this.caller.toString()).isEqualTo("actual_action"); then(this.tracer.getCurrentSpan()).isNull(); await().atMost(5, SECONDS) - .until(() -> then(this.listener.getEvents()).hasSize(1)); + .untilAsserted(() -> then(this.listener.getEvents()).hasSize(1)); then(this.listener.getEvents().get(0)).hasNameEqualTo("rxjava"); then(this.listener.getEvents().get(0)).isExportable(); then(this.listener.getEvents().get(0)).hasATag(Span.SPAN_LOCAL_COMPONENT_TAG_NAME, diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java index 269982f29..f0b3ea2ca 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/scheduling/TracingOnScheduledTests.java @@ -16,10 +16,6 @@ package org.springframework.cloud.sleuth.instrument.scheduling; -import static com.jayway.awaitility.Awaitility.await; -import static java.util.concurrent.TimeUnit.SECONDS; -import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; - import java.util.concurrent.atomic.AtomicBoolean; import org.hamcrest.Matchers; @@ -36,6 +32,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.test.context.junit4.SpringRunner; +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.awaitility.Awaitility.await; +import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; + @RunWith(SpringRunner.class) @SpringBootTest(classes = { ScheduledTestConfiguration.class }) public class TracingOnScheduledTests { @@ -47,13 +47,13 @@ public class TracingOnScheduledTests { @Test public void should_have_span_set_after_scheduled_method_has_been_executed() { - await().atMost(5, SECONDS).until(spanIsSetOnAScheduledMethod()); + await().atMost(5, SECONDS).untilAsserted(this::spanIsSetOnAScheduledMethod); } @Test public void should_have_a_new_span_set_each_time_a_scheduled_method_has_been_executed() { - Span firstSpan = this.beanWithScheduledMethod.getSpan(); - await().atMost(5, SECONDS).until(differentSpanHasBeenSetThan(firstSpan)); + final Span firstSpan = this.beanWithScheduledMethod.getSpan(); + await().atMost(5, SECONDS).untilAsserted(() -> differentSpanHasBeenSetThan(firstSpan)); } @Test @@ -65,27 +65,19 @@ public class TracingOnScheduledTests { } private Runnable spanIsSetOnAScheduledMethod() { - return new Runnable() { - @Override - public void run() { - Span storedSpan = TracingOnScheduledTests.this.beanWithScheduledMethod - .getSpan(); - then(storedSpan).isNotNull(); - then(storedSpan.getTraceId()).isNotNull(); - then(storedSpan).hasATag("class", "TestBeanWithScheduledMethod"); - then(storedSpan).hasATag("method", "scheduledMethod"); - } + return () -> { + Span storedSpan = TracingOnScheduledTests.this.beanWithScheduledMethod + .getSpan(); + then(storedSpan).isNotNull(); + then(storedSpan.getTraceId()).isNotNull(); + then(storedSpan).hasATag("class", "TestBeanWithScheduledMethod"); + then(storedSpan).hasATag("method", "scheduledMethod"); }; } private Runnable differentSpanHasBeenSetThan(final Span spanToCompare) { - return new Runnable() { - @Override - public void run() { - then(TracingOnScheduledTests.this.beanWithScheduledMethod.getSpan()) - .isNotEqualTo(spanToCompare); - } - }; + return () -> then(TracingOnScheduledTests.this.beanWithScheduledMethod.getSpan()) + .isNotEqualTo(spanToCompare); } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SpringDataInstrumentationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SpringDataInstrumentationTests.java index 66d59b8e6..e0ff466d9 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SpringDataInstrumentationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/SpringDataInstrumentationTests.java @@ -54,7 +54,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.client.RestTemplate; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; /** * @author Marcin Grzejszczak @@ -84,7 +84,7 @@ public class SpringDataInstrumentationTests { then(names).isNotEmpty(); then(this.arrayListSpanAccumulator.getSpans()).isNotEmpty(); - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(new ListOfSpans(this.arrayListSpanAccumulator.getSpans())) .hasASpanWithName("http:/reservations") .hasASpanWithTagKeyEqualTo("mvc.controller.class"); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceAsyncIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceAsyncIntegrationTests.java index fdbeb62b7..29645c716 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceAsyncIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceAsyncIntegrationTests.java @@ -23,7 +23,7 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.test.context.junit4.SpringRunner; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; @RunWith(SpringRunner.class) @SpringBootTest(classes = { @@ -53,17 +53,13 @@ public class TraceAsyncIntegrationTests { } private void thenTraceIdIsPassedFromTheCurrentThreadToTheAsyncOne(final Span span) { - Awaitility.await().atMost(5, SECONDS).until(new Runnable() { - @Override - public void run() { - then(TraceAsyncIntegrationTests.this.classPerformingAsyncLogic.getSpan()) - .hasTraceIdEqualTo(span.getTraceId()) - .hasNameEqualTo("invoke-asynchronous-logic") - .isALocalComponentSpan() - .hasATag("class", "ClassPerformingAsyncLogic") - .hasATag("method", "invokeAsynchronousLogic"); - } - }); + Awaitility.await().atMost(5, SECONDS).untilAsserted( + () -> then(TraceAsyncIntegrationTests.this.classPerformingAsyncLogic.getSpan()) + .hasTraceIdEqualTo(span.getTraceId()) + .hasNameEqualTo("invoke-asynchronous-logic") + .isALocalComponentSpan() + .hasATag("class", "ClassPerformingAsyncLogic") + .hasATag("method", "invokeAsynchronousLogic")); } @After diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterCustomExtractorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterCustomExtractorTests.java index c874f6ae9..8f1640342 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterCustomExtractorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/TraceFilterCustomExtractorTests.java @@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import static com.jayway.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import static java.util.concurrent.TimeUnit.SECONDS; import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; @@ -83,9 +83,11 @@ public class TraceFilterCustomExtractorTests { } finally { this.tracer.close(newSpan); } - await().atMost(5, SECONDS).until(() -> then(this.accumulator.getSpans().stream().filter( - span -> span.getSpanId() == newSpan.getSpanId()).findFirst().get()) - .hasTraceIdEqualTo(newSpan.getTraceId())); + await().atMost(5, SECONDS).untilAsserted(() -> { + then(this.accumulator.getSpans().stream().filter( + span -> span.getSpanId() == newSpan.getSpanId()).findFirst().get()) + .hasTraceIdEqualTo(newSpan.getTraceId()); + }); BDDAssertions.then(responseEntity.getBody()) .containsEntry("correlationid", Span.idToHex(newSpan.getTraceId())) .containsKey("myspanid") diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTests.java index e2210dc77..9f1162b14 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebAsyncClientAutoConfigurationTests.java @@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.AsyncRestTemplate; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; @@ -206,7 +206,7 @@ public class TraceWebAsyncClientAutoConfigurationTests { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(new ArrayList<>(this.accumulator.getSpans()).stream() .filter(span -> span.logs().stream().filter(log -> Span.CLIENT_RECV.equals(log.getEvent())) .findFirst().isPresent()).findFirst().get()).matches( diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java index b9b5fa686..5dea3d19b 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/feign/servererrors/FeignClientServerErrorTests.java @@ -16,10 +16,18 @@ package org.springframework.cloud.sleuth.instrument.web.client.feign.servererrors; +import com.netflix.hystrix.exception.HystrixRuntimeException; +import com.netflix.loadbalancer.BaseLoadBalancer; +import com.netflix.loadbalancer.ILoadBalancer; +import com.netflix.loadbalancer.Server; +import feign.codec.Decoder; +import feign.codec.ErrorDecoder; + import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -54,15 +62,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import com.jayway.awaitility.Awaitility; -import com.netflix.hystrix.exception.HystrixRuntimeException; -import com.netflix.loadbalancer.BaseLoadBalancer; -import com.netflix.loadbalancer.ILoadBalancer; -import com.netflix.loadbalancer.Server; - -import feign.codec.Decoder; -import feign.codec.ErrorDecoder; - import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then; /** @@ -93,7 +92,7 @@ public class FeignClientServerErrorTests { } catch (HystrixRuntimeException e) { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.capture.toString()) .doesNotContain("Tried to close span but it is not the current span"); then(ExceptionUtils.getLastException()).isNull(); @@ -110,7 +109,7 @@ public class FeignClientServerErrorTests { } catch (HystrixRuntimeException e) { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.capture.toString()) .doesNotContain("Tried to close span but it is not the current span"); then(ExceptionUtils.getLastException()).isNull(); @@ -124,7 +123,7 @@ public class FeignClientServerErrorTests { } catch (HystrixRuntimeException e) { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.capture.toString()).doesNotContain("Tried to close span but it is not the current span"); then(ExceptionUtils.getLastException()).isNull(); }); @@ -137,9 +136,10 @@ public class FeignClientServerErrorTests { } catch (HystrixRuntimeException e) { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.capture.toString()).doesNotContain("Tried to close span but it is not the current span"); then(ExceptionUtils.getLastException()).isNull(); + }); } @@ -150,7 +150,7 @@ public class FeignClientServerErrorTests { } catch (HystrixRuntimeException e) { } - Awaitility.await().until(() -> { + Awaitility.await().untilAsserted(() -> { then(this.capture.toString()).doesNotContain("Tried to close span but it is not the current span"); then(ExceptionUtils.getLastException()).isNull(); }); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java index 7f9bf918c..1c9db2dd4 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/integration/WebClientTests.java @@ -69,7 +69,7 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.RestTemplate; -import com.jayway.awaitility.Awaitility; +import org.awaitility.Awaitility; import com.netflix.loadbalancer.BaseLoadBalancer; import com.netflix.loadbalancer.ILoadBalancer; import com.netflix.loadbalancer.Server; @@ -113,7 +113,7 @@ public class WebClientTests { ResponseEntityProvider provider) { ResponseEntity response = provider.get(this); - Awaitility.await().atMost(2, TimeUnit.SECONDS).until(() -> { + Awaitility.await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> { then(getHeader(response, Span.TRACE_ID_NAME)).isNull(); then(getHeader(response, Span.SPAN_ID_NAME)).isNull(); List spans = new ArrayList<>(this.listener.getSpans()); diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java index 9bb07e185..db423f3cd 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/multiple/MultipleHopsIntegrationTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.client.RestTemplate; -import static com.jayway.awaitility.Awaitility.await; +import static org.awaitility.Awaitility.await; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toList; @@ -59,7 +59,7 @@ public class MultipleHopsIntegrationTests { public void should_prepare_spans_for_export() throws Exception { this.restTemplate.getForObject("http://localhost:" + this.config.port + "/greeting", String.class); - await().atMost(5, SECONDS).until(() -> { + await().atMost(5, SECONDS).untilAsserted(() -> { then(this.arrayListSpanAccumulator.getSpans().stream().map(Span::getName) .collect( toList())).containsAll(asList("http:/greeting", "message:greetings", @@ -82,7 +82,7 @@ public class MultipleHopsIntegrationTests { URI.create("http://localhost:" + this.config.port + "/greeting")); this.restTemplate.exchange(requestEntity, String.class); - await().atMost(5, SECONDS).until(() -> { + await().atMost(5, SECONDS).untilAsserted(() -> { then(new ListOfSpans(this.arrayListSpanAccumulator.getSpans())) .everySpanHasABaggage("foo", "bar") .anySpanHasABaggage("baz", "baz"); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml index 55c691fe8..5380ce6be 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/pom.xml @@ -103,7 +103,7 @@ test - com.jayway.awaitility + org.awaitility awaitility test diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationTests.java index aff5ca52a..611492637 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationTests.java @@ -63,11 +63,13 @@ public class MessagingApplicationTests extends AbstractIntegrationTest { public void should_have_passed_trace_id_when_message_is_about_to_be_sent() { long traceId = new Random().nextLong(); - await().atMost(5, SECONDS).until(httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/", traceId)); + await().atMost(5, SECONDS).untilAsserted(() -> + httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/", traceId).run() + ); - await().atMost(5, SECONDS).until(() -> { - thenAllSpansHaveTraceIdEqualTo(traceId); - }); + await().atMost(5, SECONDS).untilAsserted(() -> + thenAllSpansHaveTraceIdEqualTo(traceId) + ); } @Test @@ -75,9 +77,11 @@ public class MessagingApplicationTests extends AbstractIntegrationTest { long traceId = new Random().nextLong(); long spanId = new Random().nextLong(); - await().atMost(5, SECONDS).until(httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/", traceId, spanId)); + await().atMost(5, SECONDS).untilAsserted(() -> + httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/", traceId, spanId).run() + ); - await().atMost(5, SECONDS).until(() -> { + await().atMost(5, SECONDS).untilAsserted(() -> { thenAllSpansHaveTraceIdEqualTo(traceId); thenTheSpansHaveProperParentStructure(); }); @@ -87,9 +91,11 @@ public class MessagingApplicationTests extends AbstractIntegrationTest { public void should_have_passed_trace_id_with_annotations_in_async_thread_when_message_is_about_to_be_sent() { long traceId = new Random().nextLong(); - await().atMost(5, SECONDS).until(httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/xform", traceId)); + await().atMost(5, SECONDS).untilAsserted(() -> + httpMessageWithTraceIdInHeadersIsSuccessfullySent(sampleAppUrl + "/xform", traceId).run() + ); - await().atMost(5, SECONDS).until(() -> { + await().atMost(5, SECONDS).untilAsserted(() -> { thenAllSpansHaveTraceIdEqualTo(traceId); thenThereIsAtLeastOneBinaryAnnotationWithKey("background-sleep-millis"); }); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml index 58e46d97f..9863f05d4 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/pom.xml @@ -106,7 +106,7 @@ compile - com.jayway.awaitility + org.awaitility awaitility compile diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java index 34c5e79a1..4d4d23a3e 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-test-core/src/main/java/tools/AbstractIntegrationTest.java @@ -15,6 +15,9 @@ */ package tools; +import zipkin.Codec; +import zipkin.Span; + import java.lang.invoke.MethodHandles; import java.net.URI; import java.util.ArrayList; @@ -24,11 +27,10 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import com.jayway.awaitility.Awaitility; -import com.jayway.awaitility.core.ConditionFactory; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.awaitility.Awaitility; +import org.awaitility.core.ConditionFactory; import org.junit.After; import org.junit.Before; import org.springframework.cloud.sleuth.trace.IntegrationTestSpanContextHolder; @@ -39,9 +41,6 @@ import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; -import zipkin.Codec; -import zipkin.Span; - import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.BDDAssertions.then; diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml index eed4195e1..1720e7335 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-websocket/pom.xml @@ -99,7 +99,7 @@ test - com.jayway.awaitility + org.awaitility awaitility test diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamTests.java index bacd7bf69..4510d1b9d 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamTests.java @@ -60,7 +60,8 @@ public class ZipkinStreamTests extends AbstractIntegrationTest { @Before public void setup() { - await().atMost(10, SECONDS).until(zipkinServerIsUp()); + await().atMost(10, SECONDS) + .untilAsserted(() -> zipkinServerIsUp().run()); } @Test @@ -70,7 +71,9 @@ public class ZipkinStreamTests extends AbstractIntegrationTest { this.input.send(messageWithSpan(span)); - await().atMost(5, SECONDS).until(allSpansWereRegisteredInZipkinWithTraceIdEqualTo(this.traceId)); + await().atMost(5, SECONDS).untilAsserted(() -> + allSpansWereRegisteredInZipkinWithTraceIdEqualTo(this.traceId) + ); } private Message messageWithSpan(Span span) { 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 5716abee1..246e891df 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 @@ -15,6 +15,12 @@ */ package integration; +import integration.ZipkinTests.WaitUntilZipkinIsUpConfig; +import sample.SampleZipkinApplication; +import tools.AbstractIntegrationTest; +import zipkin.junit.ZipkinRule; +import zipkin.server.EnableZipkinServer; + import java.net.URI; import java.util.Random; @@ -33,12 +39,6 @@ import org.springframework.context.annotation.Primary; import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import integration.ZipkinTests.WaitUntilZipkinIsUpConfig; -import sample.SampleZipkinApplication; -import tools.AbstractIntegrationTest; -import zipkin.junit.ZipkinRule; -import zipkin.server.EnableZipkinServer; - import static java.util.concurrent.TimeUnit.SECONDS; @RunWith(SpringJUnit4ClassRunner.class) @@ -67,10 +67,14 @@ public class ZipkinTests extends AbstractIntegrationTest { public void should_propagate_spans_to_zipkin() { long traceId = new Random().nextLong(); - await().atMost(10, SECONDS).until(httpMessageWithTraceIdInHeadersIsSuccessfullySent( - this.sampleAppUrl + "/hi2", traceId)); + await().atMost(10, SECONDS).untilAsserted(() -> + httpMessageWithTraceIdInHeadersIsSuccessfullySent( + this.sampleAppUrl + "/hi2", traceId).run() + ); - await().atMost(10, SECONDS).until(allSpansWereRegisteredInZipkinWithTraceIdEqualTo(traceId)); + await().atMost(10, SECONDS).untilAsserted(() -> + allSpansWereRegisteredInZipkinWithTraceIdEqualTo(traceId).run() + ); } @Override diff --git a/spring-cloud-sleuth-stream/pom.xml b/spring-cloud-sleuth-stream/pom.xml index 426b0d6e6..3b9179c5c 100644 --- a/spring-cloud-sleuth-stream/pom.xml +++ b/spring-cloud-sleuth-stream/pom.xml @@ -63,7 +63,7 @@ test - com.jayway.awaitility + org.awaitility awaitility test diff --git a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java index 60afa4341..e8b02d8e5 100644 --- a/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java +++ b/spring-cloud-sleuth-stream/src/test/java/org/springframework/cloud/sleuth/stream/StreamSpanListenerTests.java @@ -16,25 +16,19 @@ package org.springframework.cloud.sleuth.stream; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.verify; - import java.util.Collection; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; - import javax.annotation.PostConstruct; +import org.awaitility.Awaitility; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.metrics.CounterService; -import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.cloud.commons.util.UtilAutoConfiguration; @@ -59,7 +53,11 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.messaging.Message; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import com.jayway.awaitility.Awaitility; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.verify; /** * @author Dave Syer @@ -93,7 +91,7 @@ public class StreamSpanListenerTests { this.tracer.close(context); - Awaitility.await().until(() -> assertThat(StreamSpanListenerTests.this.test.spans()).hasSize(1)); + Awaitility.await().untilAsserted(() -> assertThat(StreamSpanListenerTests.this.test.spans()).hasSize(1)); } @Test @@ -107,7 +105,7 @@ public class StreamSpanListenerTests { this.tracer.close(context); - Awaitility.await().until(() -> assertThat(StreamSpanListenerTests.this.test.spans()).hasSize(2)); + Awaitility.await().untilAsserted(() -> assertThat(StreamSpanListenerTests.this.test.spans()).hasSize(2)); } void logServerReceived(Span parent) {