Skip to content

Commit 0910bee

Browse files
committed
zipkin-server
1 parent d29f609 commit 0910bee

File tree

7 files changed

+48
-6
lines changed

7 files changed

+48
-6
lines changed

trace-1/pom.xml

+9-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,17 @@
4242
<groupId>org.springframework.cloud</groupId>
4343
<artifactId>spring-cloud-starter-sleuth</artifactId>
4444
</dependency>
45-
<dependency>
45+
<!--<dependency>
4646
<groupId>org.springframework.cloud</groupId>
4747
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
48+
</dependency>-->
49+
<dependency>
50+
<groupId>org.springframework.cloud</groupId>
51+
<artifactId>spring-cloud-sleuth-stream</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.springframework.cloud</groupId>
55+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
4856
</dependency>
4957

5058
<dependency>

trace-1/src/main/resources/application.properties

+8-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@ eureka.client.serviceUrl.defaultZone=http://${user-password}@peer1:9001/eureka/,
1111

1212

1313
# \u914D\u7F6E\u5C06\u8DDF\u8E2A\u4FE1\u606F\u8F93\u51FA\u5230Zipkin Server\uFF08spring.zipkin.base-url\u9ED8\u8BA4\u503C\u5C31\u662Fhttp://localhost:9411\uFF0C\u5982\u679C\u670D\u52A1\u7AEF\u7AEF\u53E3\u4E3A9411\uFF0C\u8FD9\u91CC\u53EF\u4EE5\u4E0D\u914D\u7F6E\uFF09
14-
spring.zipkin.base-url=http://localhost:9411
14+
#spring.zipkin.base-url=http://localhost:9411
15+
16+
# Spring Cloud Sleuth\u5728\u6574\u5408Zipkin\u65F6\uFF0C\u4E0D\u4EC5\u5B9E\u73B0\u4E86\u4EE5HTTP\u7684\u65B9\u5F0F\u6536\u96C6\u8DDF\u8E2A\u4FE1\u606F\uFF0C\u8FD8\u5B9E\u73B0\u4E86\u901A\u8FC7\u6D88\u606F\u4E2D\u95F4\u4EF6\u6765\u5BF9\u8DDF\u8E2A\u4FE1\u606F\u8FDB\u884C\u5F02\u6B65\u6536\u96C6\u7684\u5C01\u88C5\u3002
17+
# \u901A\u8FC7\u7ED3\u5408Spring Cloud Stream\uFF0C\u6211\u4EEC\u53EF\u4EE5\u975E\u5E38\u8F7B\u677E\u7684\u8BA9\u5E94\u7528\u5BA2\u6237\u7AEF\u5C06\u8DDF\u8E2A\u4FE1\u606F\u8F93\u51FA\u5230\u6D88\u606F\u4E2D\u95F4\u4EF6\u4E0A\uFF0C\u540C\u65F6Zipkin\u670D\u52A1\u7AEF\u4ECE\u6D88\u606F\u4E2D\u95F4\u4EF6\u4E0A\u5F02\u6B65\u5730\u6D88\u8D39\u8FD9\u4E9B\u8DDF\u8E2A\u4FE1\u606F\u3002
18+
spring.rabbitmq.host=localhost
19+
spring.rabbitmq.port=5672
20+
#spring.rabbitmq.username=springcloud
21+
#spring.rabbitmq.password=123456

trace-2/pom.xml

+9-1
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,17 @@
4242
<groupId>org.springframework.cloud</groupId>
4343
<artifactId>spring-cloud-starter-sleuth</artifactId>
4444
</dependency>
45-
<dependency>
45+
<!--<dependency>
4646
<groupId>org.springframework.cloud</groupId>
4747
<artifactId>spring-cloud-sleuth-zipkin</artifactId>
48+
</dependency>-->
49+
<dependency>
50+
<groupId>org.springframework.cloud</groupId>
51+
<artifactId>spring-cloud-sleuth-stream</artifactId>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.springframework.cloud</groupId>
55+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
4856
</dependency>
4957

5058
<dependency>

trace-2/src/main/resources/application.properties

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,11 @@ eureka.client.serviceUrl.defaultZone=http://${user-password}@peer1:9001/eureka/,
1515

1616

1717
# \u914D\u7F6E\u5C06\u8DDF\u8E2A\u4FE1\u606F\u8F93\u51FA\u5230Zipkin Server\uFF08spring.zipkin.base-url\u9ED8\u8BA4\u503C\u5C31\u662Fhttp://localhost:9411\uFF0C\u5982\u679C\u670D\u52A1\u7AEF\u7AEF\u53E3\u4E3A9411\uFF0C\u8FD9\u91CC\u53EF\u4EE5\u4E0D\u914D\u7F6E\uFF09
18-
spring.zipkin.base-url=http://localhost:9411
18+
#spring.zipkin.base-url=http://localhost:9411
19+
20+
# Spring Cloud Sleuth\u5728\u6574\u5408Zipkin\u65F6\uFF0C\u4E0D\u4EC5\u5B9E\u73B0\u4E86\u4EE5HTTP\u7684\u65B9\u5F0F\u6536\u96C6\u8DDF\u8E2A\u4FE1\u606F\uFF0C\u8FD8\u5B9E\u73B0\u4E86\u901A\u8FC7\u6D88\u606F\u4E2D\u95F4\u4EF6\u6765\u5BF9\u8DDF\u8E2A\u4FE1\u606F\u8FDB\u884C\u5F02\u6B65\u6536\u96C6\u7684\u5C01\u88C5\u3002
21+
# \u901A\u8FC7\u7ED3\u5408Spring Cloud Stream\uFF0C\u6211\u4EEC\u53EF\u4EE5\u975E\u5E38\u8F7B\u677E\u7684\u8BA9\u5E94\u7528\u5BA2\u6237\u7AEF\u5C06\u8DDF\u8E2A\u4FE1\u606F\u8F93\u51FA\u5230\u6D88\u606F\u4E2D\u95F4\u4EF6\u4E0A\uFF0C\u540C\u65F6Zipkin\u670D\u52A1\u7AEF\u4ECE\u6D88\u606F\u4E2D\u95F4\u4EF6\u4E0A\u5F02\u6B65\u5730\u6D88\u8D39\u8FD9\u4E9B\u8DDF\u8E2A\u4FE1\u606F\u3002
22+
spring.rabbitmq.host=localhost
23+
spring.rabbitmq.port=5672
24+
#spring.rabbitmq.username=springcloud
25+
#spring.rabbitmq.password=123456

zipkin-server/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
<groupId>io.zipkin.java</groupId>
3535
<artifactId>zipkin-autoconfigure-ui</artifactId>
3636
</dependency>
37+
<dependency>
38+
<groupId>org.springframework.cloud</groupId>
39+
<artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
40+
</dependency>
41+
<dependency>
42+
<groupId>org.springframework.cloud</groupId>
43+
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
44+
</dependency>
3745

3846
<dependency>
3947
<groupId>org.springframework.boot</groupId>

zipkin-server/src/main/java/com/caliven/zipkin/server/ZipkinServerApplication.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5-
import zipkin.server.internal.EnableZipkinServer;
5+
import org.springframework.cloud.sleuth.zipkin.stream.EnableZipkinStreamServer;
66

7-
@EnableZipkinServer
7+
// 以http方式启动
8+
// @EnableZipkinServer
9+
// 以 stream 结合 RabbitMQ方式启动服务
10+
@EnableZipkinStreamServer
811
@SpringBootApplication
912
public class ZipkinServerApplication {
1013

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
spring.application.name=zipkin-server
2+
23
# \u5BA2\u6237\u7AEF\u6574\u5408\u65F6\u5019\uFF0C\u81EA\u52A8\u5316\u914D\u7F6E\u4F1A\u8FDE\u63A59411\u7AEF\u53E3\uFF0C\u6240\u4EE5\u5728\u670D\u52A1\u7AEF\u8BBE\u7F6E\u4E86\u7AEF\u53E3\u4E3A9411\u7684\u8BDD\uFF0C\u5BA2\u6237\u7AEF\u53EF\u4EE5\u7701\u53BB\u8FD9\u4E2A\u914D\u7F6E
34
server.port=9411

0 commit comments

Comments
 (0)