diff --git a/.gitignore b/.gitignore index a5605ac6d..4de462934 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ _site/ *.iml *.swp .factorypath +*.log \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index e3670582e..c39e10cf9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ install: - ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ]; then ./docs/src/main/asciidoc/ghpages.sh; fi' script: -- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw -s .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' -- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true' +- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw -s .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration' +- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw install -nsu -Dmaven.test.redirectTestOutputToFile=true -P integration' - jdk_switcher use oraclejdk8 && sh -e scripts/runAcceptanceTests.sh env: global: diff --git a/pom.xml b/pom.xml index d34a5c007..eade96317 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,17 @@ + + maven-surefire-plugin + ${surefire.plugin.version} + + false + + **/Abstract*.java + **/*DockerTests.java + + + @@ -223,33 +234,22 @@ - maven-surefire-plugin - ${surefire.plugin.version} + maven-failsafe-plugin + 2.19.1 false - tools.DockerTests - - - - - - - !integration - - false - - - - - maven-surefire-plugin - ${surefire.plugin.version} - - false - - **/Abstract*.java - **/*DockerTests.java - + + **/*DockerTests.java + + + + integration-test + + integration-test + + + diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java index b8753ef8f..9063b2be5 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/hystrix/SleuthHystrixConcurrencyStrategy.java @@ -19,7 +19,7 @@ public class SleuthHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy HystrixPlugins.getInstance().registerConcurrencyStrategy(this); } catch (Exception e) { HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance().getConcurrencyStrategy(); - log.warn("Failed to register Sleuth Hystrix Concurrency Strategy. Will use the current one which is [" + concurrencyStrategy + "]", e); + log.debug("Failed to register Sleuth Hystrix Concurrency Strategy. Will use the current one which is [" + concurrencyStrategy + "]", e); } } diff --git a/spring-cloud-sleuth-core/src/test/resources/application.yml b/spring-cloud-sleuth-core/src/test/resources/application.yml new file mode 100644 index 000000000..56c7b8d01 --- /dev/null +++ b/spring-cloud-sleuth-core/src/test/resources/application.yml @@ -0,0 +1,4 @@ +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 5000 +ribbon: + ConnectTimeout: 3000 + ReadTimeout: 5000 \ No newline at end of file diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml index 18008e54f..62d08837e 100644 --- a/spring-cloud-sleuth-samples/pom.xml +++ b/spring-cloud-sleuth-samples/pom.xml @@ -40,6 +40,10 @@ + + 2.1.0 + + 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 0de52460e..82b8f8a0d 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 @@ -92,6 +92,24 @@ spring-cloud-sleuth-sample-test-core test + + com.fasterxml.jackson.core + jackson-databind + ${testcontainers.jackson.version} + compile + + + com.fasterxml.jackson.core + jackson-core + ${testcontainers.jackson.version} + compile + + + com.fasterxml.jackson.core + jackson-annotations + ${testcontainers.jackson.version} + compile + diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationDockerTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationDockerTests.java index bf45879dd..0a76e75af 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationDockerTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/java/integration/MessagingApplicationDockerTests.java @@ -21,7 +21,6 @@ import com.twitter.zipkin.gen.Span; import lombok.extern.slf4j.Slf4j; import org.junit.After; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +34,10 @@ import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; import org.testcontainers.containers.DockerComposeContainer; import sample.SampleMessagingApplication; -import tools.*; +import tools.AbstractIntegrationTest; +import tools.AssertingRestTemplate; +import tools.IntegrationTestSpanCollector; +import tools.RequestSendingRunnable; import java.io.File; import java.util.Collection; @@ -46,7 +48,6 @@ import static org.assertj.core.api.BDDAssertions.then; @SpringApplicationConfiguration(classes = { MessagingApplicationDockerTests.Config.class, SampleMessagingApplication.class }) @WebIntegrationTest @Slf4j -@Ignore("Ignored until working on profile") public class MessagingApplicationDockerTests extends AbstractIntegrationTest { private static int port = 3381; 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 478ddaf0a..3d6490461 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 @@ -30,10 +30,6 @@ - - 2.1.0 - - org.springframework.boot