This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.2 by this push:
new 63e5bef4fa fix opentelemetry version change (#14252)
63e5bef4fa is described below
commit 63e5bef4fac4b8a332f1313d80cfec08828cfaca
Author: 王聪洋 <[email protected]>
AuthorDate: Thu May 30 18:03:15 2024 +0800
fix opentelemetry version change (#14252)
* fix opentelemetry version change
* format code
---
.../observability/autoconfigure/exporter/zipkin/HttpSender.java | 6 +++---
.../autoconfigure/exporter/zipkin/ZipkinConfigurations.java | 2 +-
.../autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java | 4 ++--
.../autoconfigure/exporter/zipkin/ZipkinWebClientSender.java | 4 ++--
dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
index 8b4fe1261f..eca49c9349 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
@@ -25,11 +25,11 @@ import java.util.zip.GZIPOutputStream;
import org.springframework.http.HttpHeaders;
import org.springframework.util.unit.DataSize;
-import zipkin2.Call;
-import zipkin2.CheckResult;
-import zipkin2.codec.Encoding;
import zipkin2.reporter.BytesMessageEncoder;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.CheckResult;
import zipkin2.reporter.ClosedSenderException;
+import zipkin2.reporter.Encoding;
import zipkin2.reporter.Sender;
/**
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
index cb5e3701a0..fd50844d9a 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
@@ -134,7 +134,7 @@ class ZipkinConfigurations {
@ConditionalOnMissingBean
@ConditionalOnBean(Sender.class)
AsyncReporter<Span> spanReporter(Sender sender, BytesEncoder<Span>
encoder) {
- return AsyncReporter.builder(sender).build(encoder);
+ return
AsyncReporter.builder(sender).build((zipkin2.reporter.BytesEncoder<Span>)
encoder);
}
}
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
index acd3b5b733..4fda686dc5 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
@@ -19,8 +19,8 @@ package
org.apache.dubbo.spring.boot.observability.autoconfigure.exporter.zipkin
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.web.client.RestTemplate;
-import zipkin2.Call;
-import zipkin2.Callback;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.Callback;
class ZipkinRestTemplateSender extends HttpSender {
private final String endpoint;
diff --git
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
index 637d1c5016..e2f9d2f2dd 100644
---
a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
+++
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
@@ -20,8 +20,8 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
-import zipkin2.Call;
-import zipkin2.Callback;
+import zipkin2.reporter.Call;
+import zipkin2.reporter.Callback;
class ZipkinWebClientSender extends HttpSender {
private final String endpoint;
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
index db97674552..9978d92bcc 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starters/observability/pom.xml
@@ -38,8 +38,8 @@
<properties>
<micrometer.version>1.13.0</micrometer.version>
<micrometer-tracing.version>1.2.5</micrometer-tracing.version>
- <opentelemetry.version>1.34.1</opentelemetry.version>
- <zipkin-reporter.version>2.17.2</zipkin-reporter.version>
+ <opentelemetry.version>1.38.0</opentelemetry.version>
+ <zipkin-reporter.version>3.4.0</zipkin-reporter.version>
<prometheus-client.version>0.16.0</prometheus-client.version>
</properties>
