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

Cleans up unused brave refs and consolidates to zipkin docker 1.26.0

Browse Source
This commit is contained in:
Adrian Cole
2015-12-14 15:23:21 +08:00
parent 9a38c0d183
commit 1ec5d4f636
4 changed files with 6 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pom.xml
View File

@@ -118,47 +118,11 @@
<artifactId>spring-cloud-starter-sleuth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-core</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-http</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-core-spring</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-spancollector-scribe</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>brave-tracefilters</artifactId>
<version>${brave.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>flume-zipkin-collector-sink</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>com.github.kristofa</groupId>
<artifactId>flume-zipkin-metrics-sink</artifactId>
<version>${brave.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>

2
spring-cloud-sleuth-samples/spring-cloud-sleuth-sample-zipkin-stream/docker-compose.yml
View File

@@ -28,7 +28,7 @@ zipkin:
- mysql
- rabbitmq
web:
image: openzipkin/zipkin-web:1.25.3
image: openzipkin/zipkin-web:1.26.0
ports:
- 8080:8080
environment:

35
spring-cloud-sleuth-stream/docker-compose.yml
View File

@@ -1,35 +0,0 @@
cassandra:
image: quay.io/openzipkin/zipkin-cassandra:1.9.0
ports:
- 9042:9042
collector:
image: quay.io/openzipkin/zipkin-collector:1.9.0
environment:
- BLOCK_ON_CASSANDRA=true
expose:
- 9410
ports:
- 9410:9410
- 9900:9900
links:
- cassandra:db
query:
image: quay.io/openzipkin/zipkin-query:1.9.0
environment:
- BLOCK_ON_CASSANDRA=true
expose:
- 9411
ports:
- 9411:9411
- 9901:9901
links:
- cassandra:db
- collector
web:
image: quay.io/openzipkin/zipkin-web:1.9.0
ports:
- 8080:8080
- 9990:9990
links:
- collector
- query

10
spring-cloud-sleuth-zipkin/docker-compose.yml
View File

@@ -1,9 +1,9 @@
mysql:
image: openzipkin/zipkin-mysql:1.25.0
image: openzipkin/zipkin-mysql:1.26.0
ports:
- 3306:3306
collector:
image: openzipkin/zipkin-collector:1.25.0
image: openzipkin/zipkin-collector:1.26.0
environment:
- TRANSPORT_TYPE=scribe
- STORAGE_TYPE=mysql
@@ -15,7 +15,7 @@ collector:
links:
- mysql:storage
query:
image: openzipkin/zipkin-query:1.25.0
image: openzipkin/zipkin-query:1.26.0
environment:
# Remove TRANSPORT_TYPE to disable tracing
- TRANSPORT_TYPE=http
@@ -28,7 +28,7 @@ query:
links:
- mysql:storage
web:
image: openzipkin/zipkin-web:1.25.0
image: openzipkin/zipkin-web:1.26.0
environment:
# Remove TRANSPORT_TYPE to disable tracing
- TRANSPORT_TYPE=http
@@ -36,4 +36,4 @@ web:
- 8080:8080
- 9990:9990
links:
- query
- query