natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/3.3' into rest-refine 

# Conflicts:
#	dubbo-plugin/dubbo-triple-servlet/pom.xml
This commit is contained in:
oxsean 2024-06-20 09:28:11 +00:00
parent ec327bc2ea 3c4247eb58
commit 50588d90be
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dubbo-dependencies-bom/pom.xml
View File

@ -122,8 +122,8 @@
<commons_lang3_version>3.14.0</commons_lang3_version>
<envoy_api_version>0.1.35</envoy_api_version>
<micrometer.version>1.13.0</micrometer.version>
<opentelemetry.version>1.26.0</opentelemetry.version>
<zipkin-reporter.version>2.16.4</zipkin-reporter.version>
<opentelemetry.version>1.39.0</opentelemetry.version>
<zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<micrometer-tracing.version>1.3.0</micrometer-tracing.version>
<t_digest.version>3.3</t_digest.version>
<prometheus_client.version>0.16.0</prometheus_client.version>

5
dubbo-metrics/dubbo-tracing/pom.xml
View File

@ -115,5 +115,10 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

7
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java
View File

@ -20,8 +20,8 @@ import org.apache.dubbo.config.nested.ExporterConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
import zipkin2.Span;
import zipkin2.codec.BytesEncoder;
import zipkin2.codec.SpanBytesEncoder;
import zipkin2.reporter.BytesEncoder;
import zipkin2.reporter.SpanBytesEncoder;
/**
* Zipkin span exporter for OTel.
@ -30,8 +30,9 @@ public class ZipkinSpanExporter {
public static io.opentelemetry.sdk.trace.export.SpanExporter getSpanExporter(
ApplicationModel applicationModel, ExporterConfig.ZipkinConfig zipkinConfig) {
BytesEncoder<Span> spanBytesEncoder = getSpanBytesEncoder(applicationModel);
return io.opentelemetry.exporter.zipkin.ZipkinSpanExporter.builder()
.setEncoder(getSpanBytesEncoder(applicationModel))
.setEncoder(spanBytesEncoder)
.setEndpoint(zipkinConfig.getEndpoint())
.setReadTimeout(zipkinConfig.getReadTimeout())
.build();

7
dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java
View File

@ -21,9 +21,9 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
import brave.handler.SpanHandler;
import zipkin2.Span;
import zipkin2.codec.BytesEncoder;
import zipkin2.codec.SpanBytesEncoder;
import zipkin2.reporter.AsyncReporter;
import zipkin2.reporter.BytesEncoder;
import zipkin2.reporter.SpanBytesEncoder;
import zipkin2.reporter.urlconnection.URLConnectionSender;
/**
@ -43,7 +43,8 @@ public class ZipkinSpanHandler {
sender = builder.build();
}
AsyncReporter<Span> spanReporter = AsyncReporter.builder(sender).build(getSpanBytesEncoder(applicationModel));
BytesEncoder<Span> spanBytesEncoder = getSpanBytesEncoder(applicationModel);
AsyncReporter<Span> spanReporter = AsyncReporter.builder(sender).build(spanBytesEncoder);
return zipkin2.reporter.brave.ZipkinSpanHandler.newBuilder(spanReporter).build();
}