From f0f0645e391c6d686baf74e931ff2d8d5c9cad80 Mon Sep 17 00:00:00 2001
From: songxiaosheng <songxiaosheng@apache.org>
Date: Fri, 21 Feb 2025 13:05:18 +0800
Subject: [PATCH 1/3] change metrics sample properties to yaml

---
 .../src/main/resources/application.properties | 13 -------
 .../src/main/resources/application.yaml       | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 13 deletions(-)
 delete mode 100644 4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties
 create mode 100644 4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml

diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties
deleted file mode 100644
index c500a31938..0000000000
--- a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-management.metrics.tags.application=dubbo-samples-metrics-spring-boot
-management.server.port=18081
-management.endpoints.web.base-path=/management
-management.endpoints.web.exposure.include=info,health,env,prometheus
-spring.main.allow-circular-references=true
-management.endpoint.metrics.enabled=true
-management.endpoint.prometheus.enabled=true
-management.metrics.export.prometheus.enabled=true
-server.port=18080
-dubbo.application.name=metrics-provider
-dubbo.registry.address=zookeeper://${ZOOKEEPER_ADDRESS:127.0.0.1}:2181
-dubbo.metrics.protocol=prometheus
-#dubbo.metrics.enable-jvm-metrics=true
diff --git a/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml
new file mode 100644
index 0000000000..a134bf206d
--- /dev/null
+++ b/4-governance/dubbo-samples-metrics-spring-boot/src/main/resources/application.yaml
@@ -0,0 +1,35 @@
+management:
+  metrics:
+    tags:
+      application: dubbo-samples-metrics-spring-boot
+    export:
+      prometheus:
+        enabled: true
+  server:
+    port: 18081
+  endpoints:
+    web:
+      base-path: /management
+      exposure:
+        include: info,health,env,prometheus
+  endpoint:
+    metrics:
+      enabled: true
+    prometheus:
+      enabled: true
+
+spring:
+  main:
+    allow-circular-references: true
+
+server:
+  port: 18080
+
+dubbo:
+  application:
+    name: metrics-provider
+  registry:
+    address: zookeeper://${ZOOKEEPER_ADDRESS:127.0.0.1}:2181
+  metrics:
+    protocol: prometheus
+    # enable-jvm-metrics: true

From ffb6ddb67da6ae07929184b21a2142be181d0c78 Mon Sep 17 00:00:00 2001
From: songxiaosheng <songxiaosheng@apache.org>
Date: Wed, 19 Mar 2025 08:00:35 +0800
Subject: [PATCH 2/3]  fix tracing log traceId error

---
 4-governance/dubbo-samples-tracing/README.md  |   6 +-
 .../consumer/pom.xml                          | 115 ++++++++++--------
 .../demo/consumer/ConsumerApplication.java    |   5 +-
 .../src/main/resources/application.yml        |   8 +-
 .../provider/pom.xml                          |  28 ++---
 .../src/main/resources/application.yml        |   2 +-
 4-governance/dubbo-samples-tracing/pom.xml    |   7 +-
 7 files changed, 93 insertions(+), 78 deletions(-)

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
   <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-spring-boot-tracing-brave-zipkin-starter</artifactId>
+      <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
       <version>${version}</version>
   </dependency>
 ```
@@ -59,7 +59,7 @@
 ```yaml
  <dependency>
       <groupId>org.apache.dubbo</groupId>
-      <artifactId>dubbo-spring-boot-tracing-otel-otlp-starter</artifactId>
+      <artifactId>dubbo-tracing-otel-otlp-spring-boot-starter</artifactId>
       <version>${version}</version>
   </dependency>
 ```
@@ -110,4 +110,4 @@
   </dependency>
 ```
 
-后续还会补齐更多的 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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.apache.dubbo</groupId>
-        <artifactId>dubbo-samples-spring-boot-tracing-zipkin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>dubbo-samples-spring-boot-tracing-consumer</artifactId>
+  <parent>
+    <groupId>org.apache.dubbo</groupId>
+    <artifactId>dubbo-samples-spring-boot-tracing-zipkin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>dubbo-samples-spring-boot-tracing-consumer</artifactId>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-samples-spring-boot-tracing-interface</artifactId>
-            <version>${project.parent.version}</version>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-samples-spring-boot-tracing-interface</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
 
-        <!-- dubbo starter -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
+    <!-- dubbo starter -->
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-spring-boot-starter</artifactId>
+    </dependency>
 
-        <!-- registry dependency -->
-        <dependency>
-          <groupId>org.apache.dubbo</groupId>
-          <artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
-        </dependency>
+    <!-- registry dependency -->
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+    </dependency>
 
-        <!-- spring starter -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
+    <!-- spring starter -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-log4j2</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.apache.dubbo</groupId>
+      <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
+    </dependency>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <dependency>
+      <groupId>io.zipkin.zipkin2</groupId>
+      <artifactId>zipkin</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-core</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring-boot-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>repackage</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
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 @@
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-tracing-otel-zipkin-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- Embedded Zookeeper Server Dependencies -->
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>4.1.12.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.xerial.snappy</groupId>
-            <artifactId>snappy-java</artifactId>
-            <version>1.1.10.5</version>
-        </dependency>
+      <dependency>
+        <groupId>org.apache.dubbo</groupId>
+        <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>io.zipkin.zipkin2</groupId>
+        <artifactId>zipkin</artifactId>
+      </dependency>
+      <dependency>
+        <groupId>io.micrometer</groupId>
+        <artifactId>micrometer-core</artifactId>
+      </dependency>
     </dependencies>
 
     <build>
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..860654c5aa 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'
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 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <dubbo.version>3.3.1</dubbo.version>
+        <dubbo.version>3.3.3</dubbo.version>
         <spring-boot.version>2.7.8</spring-boot.version>
         <micrometer.version>1.10.6</micrometer.version>
         <micrometer-tracing.version>1.0.5</micrometer-tracing.version>
@@ -110,6 +110,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+          <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-tracing-brave-zipkin-spring-boot-starter</artifactId>
+            <version>${dubbo.version}</version>
+          </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>

From 521ac75e6359fa4f8151601a44474a4b0c85050b Mon Sep 17 00:00:00 2001
From: songxiaosheng <songxiaosheng@apache.org>
Date: Wed, 19 Mar 2025 08:04:06 +0800
Subject: [PATCH 3/3]  fix tracing log traceId error

---
 .../provider/src/main/resources/application.yml                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 860654c5aa..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
@@ -47,4 +47,4 @@ logging:
   level:
     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'