Skip to content

Commit da2cc39

Browse files
committed
refactor: migrate tracing core from boot-start to dubbo deployer
1 parent ee87c8d commit da2cc39

File tree

67 files changed

+1456
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1456
-246
lines changed

.artifacts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,5 @@ dubbo-nacos-spring-boot-starter
114114
dubbo-zookeeper-spring-boot-starter
115115
dubbo-zookeeper-curator5-spring-boot-starter
116116
dubbo-spring-security
117+
dubbo-tracing
117118
dubbo-xds

dubbo-cluster/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,5 @@
8686
<version>${project.parent.version}</version>
8787
<optional>true</optional>
8888
</dependency>
89-
<dependency>
90-
<groupId>io.micrometer</groupId>
91-
<artifactId>micrometer-tracing-integration-test</artifactId>
92-
<scope>test</scope>
93-
</dependency>
9489
</dependencies>
9590
</project>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
consumercontext=org.apache.dubbo.rpc.cluster.filter.support.ConsumerContextFilter
22
consumer-classloader=org.apache.dubbo.rpc.cluster.filter.support.ConsumerClassLoaderFilter
33
router-snapshot=org.apache.dubbo.rpc.cluster.router.RouterSnapshotFilter
4-
observationsender=org.apache.dubbo.rpc.cluster.filter.support.ObservationSenderFilter
54
metricsClusterFilter=org.apache.dubbo.rpc.cluster.filter.support.MetricsClusterFilter

dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/AbstractObservationFilterTest.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

dubbo-common/src/main/java/org/apache/dubbo/common/constants/LoggerCodeConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ public interface LoggerCodeConstants {
9292

9393
String VULNERABILITY_WARNING = "0-28";
9494

95+
String COMMON_NOT_FOUND_TRACER_DEPENDENCY = "0-29";
96+
9597

9698
// Registry module
9799

dubbo-common/src/main/java/org/apache/dubbo/config/nested/BaggageConfig.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,19 @@ public class BaggageConfig implements Serializable {
3939
*/
4040
private List<String> remoteFields = new ArrayList<>();
4141

42+
public BaggageConfig() {
43+
}
44+
45+
public BaggageConfig(Boolean enabled) {
46+
this.enabled = enabled;
47+
}
48+
49+
public BaggageConfig(Boolean enabled, Correlation correlation, List<String> remoteFields) {
50+
this.enabled = enabled;
51+
this.correlation = correlation;
52+
this.remoteFields = remoteFields;
53+
}
54+
4255
public Boolean getEnabled() {
4356
return enabled;
4457
}
@@ -76,6 +89,18 @@ public static class Correlation implements Serializable {
7689
*/
7790
private List<String> fields = new ArrayList<>();
7891

92+
public Correlation() {
93+
}
94+
95+
public Correlation(boolean enabled) {
96+
this.enabled = enabled;
97+
}
98+
99+
public Correlation(boolean enabled, List<String> fields) {
100+
this.enabled = enabled;
101+
this.fields = fields;
102+
}
103+
79104
public boolean isEnabled() {
80105
return this.enabled;
81106
}

dubbo-common/src/main/java/org/apache/dubbo/config/nested/ExporterConfig.java

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
package org.apache.dubbo.config.nested;
1919

20+
import org.apache.dubbo.config.support.Nested;
21+
2022
import java.io.Serializable;
2123
import java.time.Duration;
2224
import java.util.HashMap;
2325
import java.util.Map;
2426

25-
import org.apache.dubbo.config.support.Nested;
26-
2727
public class ExporterConfig implements Serializable {
2828

2929
@Nested
@@ -56,15 +56,28 @@ public static class ZipkinConfig implements Serializable {
5656
private String endpoint;
5757

5858
/**
59-
* Connection timeout for requests to Zipkin.
59+
* Connection timeout for requests to Zipkin. (seconds)
6060
*/
6161
private Duration connectTimeout = Duration.ofSeconds(1);
6262

6363
/**
64-
* Read timeout for requests to Zipkin.
64+
* Read timeout for requests to Zipkin. (seconds)
6565
*/
6666
private Duration readTimeout = Duration.ofSeconds(10);
6767

68+
public ZipkinConfig() {
69+
}
70+
71+
public ZipkinConfig(String endpoint) {
72+
this.endpoint = endpoint;
73+
}
74+
75+
public ZipkinConfig(String endpoint, Duration connectTimeout, Duration readTimeout) {
76+
this.endpoint = endpoint;
77+
this.connectTimeout = connectTimeout;
78+
this.readTimeout = readTimeout;
79+
}
80+
6881
public String getEndpoint() {
6982
return endpoint;
7083
}
@@ -98,7 +111,7 @@ public static class OtlpConfig implements Serializable {
98111
private String endpoint;
99112

100113
/**
101-
* The maximum time to wait for the collector to process an exported batch of spans.
114+
* The maximum time to wait for the collector to process an exported batch of spans. (seconds)
102115
*/
103116
private Duration timeout = Duration.ofSeconds(10);
104117

@@ -110,6 +123,24 @@ public static class OtlpConfig implements Serializable {
110123

111124
private Map<String, String> headers = new HashMap<>();
112125

126+
public OtlpConfig() {
127+
}
128+
129+
public OtlpConfig(String endpoint) {
130+
this.endpoint = endpoint;
131+
}
132+
133+
public OtlpConfig(String endpoint, Duration timeout) {
134+
this.endpoint = endpoint;
135+
this.timeout = timeout;
136+
}
137+
138+
public OtlpConfig(String endpoint, Duration timeout, String compressionMethod) {
139+
this.endpoint = endpoint;
140+
this.timeout = timeout;
141+
this.compressionMethod = compressionMethod;
142+
}
143+
113144
public String getEndpoint() {
114145
return endpoint;
115146
}

dubbo-common/src/main/java/org/apache/dubbo/config/nested/PropagationConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ public class PropagationConfig implements Serializable {
2929
*/
3030
private String type = W3C;
3131

32+
public PropagationConfig() {
33+
}
34+
35+
public PropagationConfig(String type) {
36+
this.type = type;
37+
}
38+
3239
public String getType() {
3340
return type;
3441
}

dubbo-common/src/main/java/org/apache/dubbo/config/nested/SamplingConfig.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ public class SamplingConfig implements Serializable {
2525
*/
2626
private float probability = 0.10f;
2727

28+
public SamplingConfig() {
29+
}
30+
31+
public SamplingConfig(float probability) {
32+
this.probability = probability;
33+
}
34+
2835
public float getProbability() {
2936
return this.probability;
3037
}

dubbo-config/dubbo-config-api/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,12 @@
7272
<version>${project.parent.version}</version>
7373
</dependency>
7474

75+
<dependency>
76+
<groupId>org.apache.dubbo</groupId>
77+
<artifactId>dubbo-tracing</artifactId>
78+
<version>${project.parent.version}</version>
79+
</dependency>
80+
7581
<dependency>
7682
<groupId>org.apache.dubbo</groupId>
7783
<artifactId>dubbo-monitor-api</artifactId>

0 commit comments

Comments
 (0)