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 aebe8ec36..a63c5e8c8 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 @@ -100,29 +100,6 @@ 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 - - - org.testcontainers - docker-compose - test - 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 996e0e1c2..60c322a72 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 @@ -19,7 +19,6 @@ import com.twitter.zipkin.gen.BinaryAnnotation; import com.twitter.zipkin.gen.Span; import lombok.extern.slf4j.Slf4j; import org.junit.After; -import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -29,12 +28,10 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.JdkIdGenerator; import org.springframework.util.StringUtils; -import org.testcontainers.containers.DockerComposeContainer; import sample.SampleMessagingApplication; import tools.AbstractDockerIntegrationTest; import tools.IntegrationTestSpanCollector; -import java.io.File; import java.util.Collection; import static org.assertj.core.api.BDDAssertions.then; @@ -50,11 +47,6 @@ public class MessagingApplicationDockerTests extends AbstractDockerIntegrationTe private static String sampleAppUrl = "http://localhost:" + port; @Autowired IntegrationTestSpanCollector integrationTestSpanCollector; - @ClassRule - public static DockerComposeContainer environment = - new DockerComposeContainer(new File("src/test/resources/docker-compose.yml")) - .withExposedService("rabbitmq_1", 5672); - @After public void cleanup() { integrationTestSpanCollector.hashedSpans.clear(); diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/resources/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/resources/docker-compose.yml deleted file mode 100644 index deb4cf8d1..000000000 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-messaging/src/test/resources/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -rabbitmq: - image: rabbitmq:management - ports: - - 5672:5672 - - 15672:15672 \ No newline at end of file diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java index cae4fce7c..7c0ec92aa 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.WebIntegrationTest; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.JdkIdGenerator; import org.testcontainers.containers.DockerComposeContainer; @@ -33,8 +34,9 @@ import java.io.File; @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = { SampleApp.Config.class, AbstractDockerIntegrationTest.ZipkinConfig.class, ZipkinStreamServerApplication.class }) -@WebIntegrationTest() +@WebIntegrationTest @Slf4j +@ActiveProfiles("test") public class ZipkinStreamDockerTests extends AbstractDockerIntegrationTest { private static int port = 9411; @@ -44,8 +46,7 @@ public class ZipkinStreamDockerTests extends AbstractDockerIntegrationTest { public static DockerComposeContainer environment = new DockerComposeContainer(new File("src/test/resources/docker-compose.yml")) .withExposedService("rabbitmq_1", 5672) - .withExposedService("rabbitmq_1", 15672) - .withExposedService("mysql_1", 3306); + .withExposedService("rabbitmq_1", 15672); @Test @SneakyThrows diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml new file mode 100644 index 000000000..53f96d4a8 --- /dev/null +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/application-test.yml @@ -0,0 +1,3 @@ +zipkin: + store: + type: mem # default is inMemory \ No newline at end of file diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml index 819663b8a..c188b5c3b 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml @@ -1,11 +1,3 @@ -mysql: - image: mysql - ports: - - 3306:3306 - environment: - - MYSQL_ROOT_PASSWORD=root - - MYSQL_DATABASE=test - rabbitmq: image: rabbitmq:management ports: diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml index 017d1bb09..90754ab49 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml @@ -3,20 +3,7 @@ query: environment: # Remove TRANSPORT_TYPE to disable tracing - TRANSPORT_TYPE=http - - STORAGE_TYPE=mysql + - STORAGE_TYPE=sqlite-memory ports: - 9411:9411 - - 9901:9901 - links: - - mysql:storage - -rabbitmq: - image: rabbitmq:management - ports: - - 5672 - - 15672 - -mysql: - image: openzipkin/zipkin-mysql:1.30.0 - ports: - - 3306:3306 + - 9901:9901 \ No newline at end of file