diff --git a/spring-cloud-sleuth-samples/pom.xml b/spring-cloud-sleuth-samples/pom.xml
index 67ffbef83..e45f783fe 100644
--- a/spring-cloud-sleuth-samples/pom.xml
+++ b/spring-cloud-sleuth-samples/pom.xml
@@ -88,6 +88,12 @@
0.4.0
compile
+
+ io.zipkin
+ zipkin-java-server
+ 0.4.0
+ compile
+
diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
index 58274c715..69ea08d51 100644
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
+++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/pom.xml
@@ -82,29 +82,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
-
com.github.kristofa
brave-http
@@ -113,6 +90,10 @@
com.github.kristofa
brave-spring-web-servlet-interceptor
+
+ io.zipkin
+ zipkin-java-server
+
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 7c8bfd6fd..e84e4a539 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,10 +15,10 @@
*/
package integration;
+import io.zipkin.server.ZipkinServer;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.junit.Before;
-import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -27,14 +27,12 @@ import org.springframework.boot.test.WebIntegrationTest;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.util.JdkIdGenerator;
-import org.testcontainers.containers.DockerComposeContainer;
import sample.SampleZipkinApplication;
import tools.AbstractIntegrationTest;
-import java.io.File;
-
@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = { AbstractIntegrationTest.WaitUntilZipkinIsUpConfig.class,
+@SpringApplicationConfiguration(classes = {
+ AbstractIntegrationTest.WaitUntilZipkinIsUpConfig.class,
SampleZipkinApplication.class })
@WebIntegrationTest
@TestPropertySource(properties="sample.zipkin.enabled=true")
@@ -46,13 +44,9 @@ public class ZipkinTests extends AbstractIntegrationTest {
private static int port = 3380;
private static String sampleAppUrl = "http://localhost:" + port;
- @ClassRule
- public static DockerComposeContainer environment =
- new DockerComposeContainer(new File("src/test/resources/docker-compose.yml"))
- .withExposedService("query_1", 9411);
-
@Before
public void setup() {
+ ZipkinServer.main(new String[]{"server.port=9411"});
await().until(zipkinQueryServerIsUp());
}
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
deleted file mode 100644
index 90754ab49..000000000
--- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin/src/test/resources/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-query:
- image: openzipkin/zipkin-query:1.30.0
- environment:
- # Remove TRANSPORT_TYPE to disable tracing
- - TRANSPORT_TYPE=http
- - STORAGE_TYPE=sqlite-memory
- ports:
- - 9411:9411
- - 9901:9901
\ No newline at end of file