diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 6542fcc8..6e6c9d6c 100644 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -63,7 +63,15 @@ org.springframework.cloud - spring-cloud-sleuth-zipkin + spring-cloud-sleuth-stream + + + org.springframework.cloud + spring-cloud-starter-sleuth + + + org.springframework.cloud + spring-cloud-stream-binder-rabbit diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml index 907364ff..29f038ba 100644 --- a/pig-gateway/src/main/resources/bootstrap.yml +++ b/pig-gateway/src/main/resources/bootstrap.yml @@ -11,11 +11,6 @@ spring: enabled: true profile: ${spring.profiles.active} label: master - zipkin: - base-url: http://localhost:5002 - sleuth: - sampler: - percentage: 1.0 --- spring: profiles: dev diff --git a/pig-visual/pig-zipkin-elk/pom.xml b/pig-visual/pig-zipkin-elk/pom.xml index 13e3038a..e990555d 100644 --- a/pig-visual/pig-zipkin-elk/pom.xml +++ b/pig-visual/pig-zipkin-elk/pom.xml @@ -23,13 +23,23 @@ pig-common ${pig.version} + + + org.springframework.cloud + spring-cloud-sleuth-zipkin-stream + io.zipkin.java zipkin-autoconfigure-ui + + org.springframework.cloud + spring-cloud-stream-binder-rabbit + io.zipkin.java - zipkin-server + zipkin-autoconfigure-storage-elasticsearch-http + 1.28.0 diff --git a/pig-visual/pig-zipkin-elk/src/main/java/com/github/pig/zipkin/PigZipkinElkApplication.java b/pig-visual/pig-zipkin-elk/src/main/java/com/github/pig/zipkin/PigZipkinElkApplication.java index b9ade920..e66f4208 100644 --- a/pig-visual/pig-zipkin-elk/src/main/java/com/github/pig/zipkin/PigZipkinElkApplication.java +++ b/pig-visual/pig-zipkin-elk/src/main/java/com/github/pig/zipkin/PigZipkinElkApplication.java @@ -3,7 +3,7 @@ package com.github.pig.zipkin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import zipkin.server.EnableZipkinServer; +import org.springframework.cloud.sleuth.zipkin.stream.EnableZipkinStreamServer; /** * @author lengleng @@ -12,7 +12,7 @@ import zipkin.server.EnableZipkinServer; */ @EnableDiscoveryClient @SpringBootApplication -@EnableZipkinServer +@EnableZipkinStreamServer public class PigZipkinElkApplication { public static void main(String[] args) {