diff --git a/4-governance/dubbo-samples-tracing/README.md b/4-governance/dubbo-samples-tracing/README.md index 6418973358..318fbe9a43 100644 --- a/4-governance/dubbo-samples-tracing/README.md +++ b/4-governance/dubbo-samples-tracing/README.md @@ -49,7 +49,7 @@ ```yaml org.apache.dubbo - dubbo-spring-boot-tracing-brave-zipkin-starter + dubbo-tracing-brave-zipkin-spring-boot-starter ${version} ``` @@ -59,7 +59,7 @@ ```yaml org.apache.dubbo - dubbo-spring-boot-tracing-otel-otlp-starter + dubbo-tracing-otel-otlp-spring-boot-starter ${version} ``` @@ -110,4 +110,4 @@ ``` -后续还会补齐更多的 starters,如 Jagger、SkyWalking等。 \ No newline at end of file +后续还会补齐更多的 starters,如 Jagger、SkyWalking等。 diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml index 55e8ce5d1f..0af9295bc1 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml @@ -17,64 +17,73 @@ - - org.apache.dubbo - dubbo-samples-spring-boot-tracing-zipkin - 1.0-SNAPSHOT - - 4.0.0 - dubbo-samples-spring-boot-tracing-consumer + + org.apache.dubbo + dubbo-samples-spring-boot-tracing-zipkin + 1.0-SNAPSHOT + + 4.0.0 + dubbo-samples-spring-boot-tracing-consumer - - - org.apache.dubbo - dubbo-samples-spring-boot-tracing-interface - ${project.parent.version} - + + + org.apache.dubbo + dubbo-samples-spring-boot-tracing-interface + ${project.parent.version} + - - - org.apache.dubbo - dubbo-spring-boot-starter - + + + org.apache.dubbo + dubbo-spring-boot-starter + - - - org.apache.dubbo - dubbo-zookeeper-curator5-spring-boot-starter - + + + org.apache.dubbo + dubbo-zookeeper-curator5-spring-boot-starter + - - - org.springframework.boot - spring-boot-starter - + + + org.springframework.boot + spring-boot-starter + - - org.springframework.boot - spring-boot-starter-log4j2 - + + org.springframework.boot + spring-boot-starter-log4j2 + - - org.apache.dubbo - dubbo-tracing-otel-zipkin-spring-boot-starter - - + + org.apache.dubbo + dubbo-tracing-brave-zipkin-spring-boot-starter + - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot-maven-plugin.version} - - - - repackage - - - - - - + + io.zipkin.zipkin2 + zipkin + + + io.micrometer + micrometer-core + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot-maven-plugin.version} + + + + repackage + + + + + + diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/java/org/apache/dubbo/springboot/demo/consumer/ConsumerApplication.java b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/java/org/apache/dubbo/springboot/demo/consumer/ConsumerApplication.java index d13508a52d..55439731f2 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/java/org/apache/dubbo/springboot/demo/consumer/ConsumerApplication.java +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/java/org/apache/dubbo/springboot/demo/consumer/ConsumerApplication.java @@ -38,12 +38,13 @@ public class ConsumerApplication { @DubboReference private DemoService demoService; - public static void main(String[] args) { + public static void main(String[] args) throws InterruptedException { ConfigurableApplicationContext context = SpringApplication.run(ConsumerApplication.class, args); ConsumerApplication application = context.getBean(ConsumerApplication.class); - for (int i = 0; i < 10; i++) { + for (int i = 0; i < 100000; i++) { String result = application.doSayHello("world"); LOGGER.info("result: {}", result); + Thread.sleep(2000); } } diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/resources/application.yml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/resources/application.yml index e1e1f6c683..03def7499f 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/resources/application.yml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/resources/application.yml @@ -24,6 +24,10 @@ dubbo: protocol: name: dubbo port: -1 + qos: + enable: true + port: 33333 + accept-foreign-ip: false registry: id: zk-registry address: zookeeper://127.0.0.1:2181 @@ -45,6 +49,6 @@ dubbo: logging: level: - root: info + root: debug pattern: - console: '[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2} [%X{traceId:-}, %X{spanId:-}]: %m%n' + console: '[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2} [%X{traceId}, %X{spanId}]: %m%n' diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml index e4d1e3cfd4..e9a91874d6 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml @@ -56,22 +56,18 @@ spring-boot-starter-log4j2 - - org.apache.dubbo - dubbo-tracing-otel-zipkin-spring-boot-starter - - - - - io.dropwizard.metrics - metrics-core - 4.1.12.1 - - - org.xerial.snappy - snappy-java - 1.1.10.5 - + + org.apache.dubbo + dubbo-tracing-brave-zipkin-spring-boot-starter + + + io.zipkin.zipkin2 + zipkin + + + io.micrometer + micrometer-core + diff --git a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/src/main/resources/application.yml b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/src/main/resources/application.yml index 6b02c00f66..edf213561d 100644 --- a/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/src/main/resources/application.yml +++ b/4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/src/main/resources/application.yml @@ -45,6 +45,6 @@ dubbo: logging: level: - root: info + root: debug pattern: - console: '[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2} [%X{traceId:-}, %X{spanId:-}]: %m%n' + console: '[%d{dd/MM/yy HH:mm:ss:SSS z}] %t %5p %c{2} [%X{traceId}, %X{spanId}]: %m%n' diff --git a/4-governance/dubbo-samples-tracing/pom.xml b/4-governance/dubbo-samples-tracing/pom.xml index 1e72e553ae..7788bc3021 100644 --- a/4-governance/dubbo-samples-tracing/pom.xml +++ b/4-governance/dubbo-samples-tracing/pom.xml @@ -46,7 +46,7 @@ 1.8 UTF-8 - 3.3.1 + 3.3.3 2.7.8 1.10.6 1.0.5 @@ -110,6 +110,11 @@ pom import + + org.apache.dubbo + dubbo-tracing-brave-zipkin-spring-boot-starter + ${dubbo.version} + junit junit