diff --git a/spring-cloud-launcher/pom.xml b/spring-cloud-launcher/pom.xml index 1b0b189..8bc5845 100644 --- a/spring-cloud-launcher/pom.xml +++ b/spring-cloud-launcher/pom.xml @@ -18,7 +18,7 @@ - 1.0.7.RELEASE + 1.0.10.RELEASE @@ -32,7 +32,6 @@ spring-cloud-launcher-hystrixdashboard spring-cloud-launcher-kafka spring-cloud-launcher-stubrunner - spring-cloud-launcher-zipkin diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml index 893b4d7..0b9b237 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/pom.xml @@ -18,7 +18,7 @@ 1.2.2.RELEASE - 1.0.7.RELEASE + 1.0.10.RELEASE diff --git a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml index b31de48..69b846d 100644 --- a/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml +++ b/spring-cloud-launcher/spring-cloud-launcher-deployer/src/main/resources/cloud.yml @@ -90,7 +90,7 @@ spring: application-properties: management.security.enabled: false zipkin: - coordinates: ${dt.pre}zipkin:${dt.ver} + coordinates: io.zipkin.java:zipkin-server:jar:exec:2.7.1 port: 9411 order: 0 properties: diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/.jdk8 b/spring-cloud-launcher/spring-cloud-launcher-zipkin/.jdk8 deleted file mode 100644 index e69de29..0000000 diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml deleted file mode 100644 index 628ba7c..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud.launcher - spring-cloud-launcher-zipkin - jar - - spring-cloud-launcher-zipkin - Spring Cloud Launcher ConfigServer - - - 1.8 - - - - org.springframework.cloud - spring-cloud-launcher - 2.0.0.BUILD-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework.boot - spring-boot-starter-undertow - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - - - io.zipkin.java - zipkin-autoconfigure-ui - - - io.zipkin.java - zipkin-server - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java deleted file mode 100644 index 2430c38..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/java/org/springframework/cloud/launcher/zipkin/ZipkinServerApplication.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2013-2016 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.launcher.zipkin; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Condition; -import org.springframework.context.annotation.ConditionContext; -import org.springframework.context.annotation.Conditional; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.type.AnnotatedTypeMetadata; -import zipkin.collector.CollectorMetrics; -import zipkin.collector.CollectorSampler; -import zipkin.internal.V2StorageComponent; -import zipkin.server.EnableZipkinServer; -import zipkin.storage.StorageComponent; -import zipkin2.storage.InMemoryStorage; - -/** - * @author Spencer Gibb - */ -@EnableZipkinServer -@EnableDiscoveryClient -@SpringBootApplication -public class ZipkinServerApplication { - - - @Bean - @ConditionalOnMissingBean({CollectorSampler.class}) - CollectorSampler traceIdSampler(@Value("${zipkin.collector.sample-rate:1.0}") float rate) { - return CollectorSampler.create(rate); - } - - @Bean - CollectorMetrics metrics() { - return CollectorMetrics.NOOP_METRICS; - } - - static final class StorageTypeMemAbsentOrEmpty implements Condition { - StorageTypeMemAbsentOrEmpty() { - } - - public boolean matches(ConditionContext condition, AnnotatedTypeMetadata ignored) { - String storageType = condition.getEnvironment().getProperty("zipkin.storage.type"); - if (storageType == null) { - return true; - } else { - storageType = storageType.trim(); - return storageType.isEmpty() ? true : storageType.equals("mem"); - } - } - } - - @Configuration - @Conditional({ZipkinServerApplication.StorageTypeMemAbsentOrEmpty.class}) - @ConditionalOnMissingBean({StorageComponent.class}) - static class InMemoryConfiguration { - InMemoryConfiguration() { - } - - @Bean - StorageComponent storage(@Value("${zipkin.storage.strict-trace-id:true}") boolean strictTraceId, @Value("${zipkin.storage.mem.max-spans:500000}") int maxSpans) { - return V2StorageComponent.create(InMemoryStorage.newBuilder().strictTraceId(strictTraceId).maxSpanCount(maxSpans).build()); - } - - @Bean - InMemoryStorage v2Storage(V2StorageComponent component) { - return (InMemoryStorage)component.delegate(); - } - } - - public static void main(String[] args) { - SpringApplication.run(ZipkinServerApplication.class, args); - } -} diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/META-INF/thin-rabbit.properties b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/META-INF/thin-rabbit.properties deleted file mode 100644 index 0343528..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/META-INF/thin-rabbit.properties +++ /dev/null @@ -1,2 +0,0 @@ -exclusions.spring-cloud-starter-bus-kafka: org.springframework.cloud:spring-cloud-starter-bus-kafka -dependencies.spring-cloud-starter-bus-amqp: org.springframework.cloud:spring-cloud-starter-bus-amqp diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/application.yml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/application.yml deleted file mode 100644 index 6e31a29..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring: - application: - name: zipkin - -server: - port: 9411 - -info: - artifactId: "@project.artifactId@" - description: "@project.description@" - version: "@project.version@" \ No newline at end of file diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/launcher/application.yml b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/launcher/application.yml deleted file mode 100644 index c6ba723..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/main/resources/launcher/application.yml +++ /dev/null @@ -1,29 +0,0 @@ -info: - description: Spring Cloud Launcher - -eureka: - client: - instance-info-replication-interval-seconds: 5 - initial-instance-info-replication-interval-seconds: 5 - serviceUrl: - defaultZone: http://localhost:8761/eureka/ - -endpoints: - restart: enabled - -ribbon: - ConnectTimeout: 3000 - ReadTimeout: 60000 - -h2.datasource.url: jdbc:h2:tcp://localhost:9096/~/launcher -#spring: -# datasource: -# url: ${h2.datasource.url} - -logging: - level: - kafka: WARN - org.apache.zookeeper: WARN - org.apache.zookeeper.ClientCnxn: ERROR - org.apache.kafka: WARN - org.I0Itec: WARN diff --git a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java b/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java deleted file mode 100644 index 6864be8..0000000 --- a/spring-cloud-launcher/spring-cloud-launcher-zipkin/src/test/java/org/springframework/cloud/launcher/zipkin/DeployerApplicationTests.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.springframework.cloud.launcher.zipkin; - -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest({ "spring.cloud.bus.enabled=false", "eureka.client.enabled=false" }) -public class DeployerApplicationTests { - - @Test - @Ignore - public void contextLoads() { - } - -}