From e7aa98af6a9343dea56fa7c363467df3f9c93bcd Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 13 Jan 2016 11:36:10 +0100 Subject: [PATCH] Removed RabbitMQ and more docker-compose --- .../pom.xml | 16 ----- .../src/test/java/integration/SampleApp.java | 66 +------------------ .../integration/ZipkinStreamDockerTests.java | 15 ++--- .../src/test/resources/docker-compose.yml | 5 -- 4 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml index a31a691b0..b31e7b8c6 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/pom.xml @@ -92,22 +92,6 @@ spring-cloud-sleuth-sample-test-core test - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.core - jackson-annotations - - - org.testcontainers - docker-compose - diff --git a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/SampleApp.java b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/SampleApp.java index fe6564130..673b2ce3f 100644 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/SampleApp.java +++ b/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/SampleApp.java @@ -2,23 +2,16 @@ package integration; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.connection.RabbitConnectionFactoryBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.amqp.RabbitProperties; +import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.cloud.sleuth.TraceManager; import org.springframework.cloud.sleuth.trace.TraceContextHolder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import tools.AbstractDockerIntegrationTest; -import java.io.IOException; -import java.net.InetAddress; -import java.net.ServerSocket; import java.util.Random; /** @@ -44,68 +37,13 @@ public class SampleApp { } @Configuration - @EnableAutoConfiguration + @EnableAutoConfiguration(exclude = RabbitAutoConfiguration.class) @Slf4j public static class Config { - public static final int RABBITMQ_PORT = 5672; - @Bean SampleApp sampleApp() { return new SampleApp(); } - @Bean - @SneakyThrows - ConnectionFactory connectionFactory() { - RabbitProperties config = rabbitProperties(); - AbstractDockerIntegrationTest.await().until(() -> { - try { - ServerSocket serverSocket = new ServerSocket(RABBITMQ_PORT, 50, - InetAddress.getByName(AbstractDockerIntegrationTest.getDockerURI().getHost())); - serverSocket.close(); - } catch (IOException e) { - log.info("RabbitMQ is up and running - proceeding"); - return true; - } - log.warn("RabbitMQ has not started yet..."); - return false; - }); - RabbitConnectionFactoryBean factory = new RabbitConnectionFactoryBean(); - if (config.getHost() != null) { - factory.setHost(config.getHost()); - factory.setPort(config.getPort()); - } - if (config.getUsername() != null) { - factory.setUsername(config.getUsername()); - } - if (config.getPassword() != null) { - factory.setPassword(config.getPassword()); - } - if (config.getVirtualHost() != null) { - factory.setVirtualHost(config.getVirtualHost()); - } - if (config.getRequestedHeartbeat() != null) { - factory.setRequestedHeartbeat(config.getRequestedHeartbeat()); - } - RabbitProperties.Ssl ssl = config.getSsl(); - if (ssl.isEnabled()) { - factory.setUseSSL(true); - factory.setKeyStore(ssl.getKeyStore()); - factory.setKeyStorePassphrase(ssl.getKeyStorePassword()); - factory.setTrustStore(ssl.getTrustStore()); - factory.setTrustStorePassphrase(ssl.getTrustStorePassword()); - } - factory.afterPropertiesSet(); - CachingConnectionFactory connectionFactory = new CachingConnectionFactory( - factory.getObject()); - connectionFactory.setAddresses(config.getAddresses()); - return connectionFactory; - } - - RabbitProperties rabbitProperties() { - RabbitProperties rabbitProperties = new RabbitProperties(); - rabbitProperties.setHost(AbstractDockerIntegrationTest.getDockerURI().getHost()); - return rabbitProperties; - } } } 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 7c0ec92aa..75ce9c2be 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 @@ -18,22 +18,21 @@ package integration; import example.ZipkinStreamServerApplication; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.WebIntegrationTest; +import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.JdkIdGenerator; -import org.testcontainers.containers.DockerComposeContainer; import tools.AbstractDockerIntegrationTest; -import java.io.File; - @RunWith(SpringJUnit4ClassRunner.class) @SpringApplicationConfiguration(classes = { SampleApp.Config.class, - AbstractDockerIntegrationTest.ZipkinConfig.class, ZipkinStreamServerApplication.class }) + AbstractDockerIntegrationTest.ZipkinConfig.class, + TestSupportBinderAutoConfiguration.class, + ZipkinStreamServerApplication.class }) @WebIntegrationTest @Slf4j @ActiveProfiles("test") @@ -42,12 +41,6 @@ public class ZipkinStreamDockerTests extends AbstractDockerIntegrationTest { private static int port = 9411; private static String sampleAppUrl = "http://localhost:" + port; - @ClassRule - public static DockerComposeContainer environment = - new DockerComposeContainer(new File("src/test/resources/docker-compose.yml")) - .withExposedService("rabbitmq_1", 5672) - .withExposedService("rabbitmq_1", 15672); - @Test @SneakyThrows public void should_propagate_spans_to_zipkin() { 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 deleted file mode 100644 index c188b5c3b..000000000 --- a/spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/resources/docker-compose.yml +++ /dev/null @@ -1,5 +0,0 @@ -rabbitmq: - image: rabbitmq:management - ports: - - 5672:5672 - - 15672:15672