Skip to content

fix tracing log traceId error #1211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
songxiaosheng wants to merge 5 commits into
base: master
Choose a base branch
from
Open

fix tracing log traceId error #1211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0f0645
change metrics sample properties to yaml
songxiaosheng Feb 21, 2025
ffb6ddb
fix tracing log traceId error
songxiaosheng Mar 19, 2025
3a538e6
Merge branch 'master' into master
songxiaosheng Mar 19, 2025
521ac75
fix tracing log traceId error
songxiaosheng Mar 19, 2025
7ddd849
Merge branch 'master' of github.com:songxiaosheng/dubbo-samples
songxiaosheng Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 4-governance/dubbo-samples-tracing/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
```
Expand All @@ -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>
```
Expand Down Expand Up @@ -110,4 +110,4 @@
</dependency>
```

后续还会补齐更多的 starters，如 Jagger、SkyWalking等。
后续还会补齐更多的 starters，如 Jagger、SkyWalking等。
115 changes: 62 additions & 53 deletions 4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/consumer/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 3 additions & 2 deletions ...consumer/src/main/java/org/apache/dubbo/springboot/demo/consumer/ConsumerApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 6 additions & 2 deletions ...cing/dubbo-samples-spring-boot-tracing-zipkin/consumer/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
28 changes: 12 additions & 16 deletions 4-governance/dubbo-samples-tracing/dubbo-samples-spring-boot-tracing-zipkin/provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...cing/dubbo-samples-spring-boot-tracing-zipkin/provider/src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
7 changes: 6 additions & 1 deletion 4-governance/dubbo-samples-tracing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading