fix opentelemetry version change (#14252)

* fix opentelemetry version change * format code
apache · May 30, 2024 · 63e5bef · 63e5bef
1 parent 6ad71e6
commit 63e5bef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.../org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java b/.../org/apache/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/HttpSender.java
@@ -25,11 +25,11 @@
 
 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/...e/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java b/...e/dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinConfigurations.java
@@ -134,7 +134,7 @@ static class ReporterConfiguration {
         @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/...bbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java b/...bbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinRestTemplateSender.java
@@ -19,8 +19,8 @@
 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/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java b/.../dubbo/spring/boot/observability/autoconfigure/exporter/zipkin/ZipkinWebClientSender.java
@@ -20,8 +20,8 @@
 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
@@ -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>