SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed RabbitMQ and more docker-compose

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-01-13 11:36:10 +01:00
parent 4968ad2195
commit e7aa98af6a
4 changed files with 6 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/SampleApp.java
View File

@@ -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;
}
}
}

15
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/src/test/java/integration/ZipkinStreamDockerTests.java
View File

@@ -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() {