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

fix opentelemetry version change (#14252) 

* fix opentelemetry version change

* format code
This commit is contained in:
王聪洋 2024-05-30 18:03:15 +08:00 committed by GitHub
parent 6ad71e676c
commit 63e5bef4fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
View File

@ -25,11 +25,11 @@ import java.util.zip.GZIPOutputStream;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.util.unit.DataSize; import org.springframework.util.unit.DataSize;
import zipkin2.Call;
import zipkin2.CheckResult;
import zipkin2.codec.Encoding;
import zipkin2.reporter.BytesMessageEncoder; import zipkin2.reporter.BytesMessageEncoder;
import zipkin2.reporter.Call;
import zipkin2.reporter.CheckResult;
import zipkin2.reporter.ClosedSenderException; import zipkin2.reporter.ClosedSenderException;
import zipkin2.reporter.Encoding;
import zipkin2.reporter.Sender; import zipkin2.reporter.Sender;
/** /**

2
dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
View File

@ -134,7 +134,7 @@ class ZipkinConfigurations {
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnBean(Sender.class) @ConditionalOnBean(Sender.class)
AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) { AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span> encoder) {
return AsyncReporter.builder(sender).build(encoder); return AsyncReporter.builder(sender).build((zipkin2.reporter.BytesEncoder<Span>) encoder);
} }
} }

4
dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
View File

@ -19,8 +19,8 @@ package org.apache.dubbo.spring.boot.observability.autoconfigure.exporter.zipkin
import org.springframework.http.HttpEntity; import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import zipkin2.Call; import zipkin2.reporter.Call;
import zipkin2.Callback; import zipkin2.reporter.Callback;
class ZipkinRestTemplateSender extends HttpSender { class ZipkinRestTemplateSender extends HttpSender {
private final String endpoint; private final String endpoint;

4
dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
View File

@ -20,8 +20,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import zipkin2.Call; import zipkin2.reporter.Call;
import zipkin2.Callback; import zipkin2.reporter.Callback;
class ZipkinWebClientSender extends HttpSender { class ZipkinWebClientSender extends HttpSender {
private final String endpoint; private final String endpoint;

4
dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
View File

@ -38,8 +38,8 @@
<properties> <properties>
<micrometer.version>1.13.0</micrometer.version> <micrometer.version>1.13.0</micrometer.version>
<micrometer-tracing.version>1.2.5</micrometer-tracing.version> <micrometer-tracing.version>1.2.5</micrometer-tracing.version>
<opentelemetry.version>1.34.1</opentelemetry.version> <opentelemetry.version>1.38.0</opentelemetry.version>
<zipkin-reporter.version>2.17.2</zipkin-reporter.version> <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<prometheus-client.version>0.16.0</prometheus-client.version> <prometheus-client.version>0.16.0</prometheus-client.version>
</properties> </properties>