(dubbo) branch 3.3 updated: upgrade opentelemetry and zipkin-reporter version (#14338)

[albumenj]

This is an automated email from the ASF dual-hosted git repository.

albumenj pushed a commit to branch 3.3
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.3 by this push:
     new ab6ce115f5 upgrade  opentelemetry and zipkin-reporter version (#14338)
ab6ce115f5 is described below

commit ab6ce115f5c8610f150caddc741f96653efce822
Author: xiaosheng <songxiaosh...@elastic.link>
AuthorDate: Wed Jun 19 09:37:55 2024 +0800

    upgrade  opentelemetry and zipkin-reporter version (#14338)
    
    * ⬆️ upgrade zipkin-reporter -> 3.4.0
    
    * ⬆️ upgrade opentelemetry -> 1.39.0
---
 dubbo-dependencies-bom/pom.xml                                     | 4 ++--
 dubbo-metrics/dubbo-tracing/pom.xml                                | 5 +++++
 .../apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java   | 7 ++++---
 .../apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java    | 7 ++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index b2e45cf701..7781cbf37c 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -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>
diff --git a/dubbo-metrics/dubbo-tracing/pom.xml 
b/dubbo-metrics/dubbo-tracing/pom.xml
index 2979b08cd9..77cf3aed8e 100644
--- a/dubbo-metrics/dubbo-tracing/pom.xml
+++ b/dubbo-metrics/dubbo-tracing/pom.xml
@@ -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>
diff --git 
a/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java
 
b/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java
index c2b3d1bb4f..0c1678bff4 100644
--- 
a/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java
+++ 
b/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java
@@ -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();
diff --git 
a/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java
 
b/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java
index 2e870e422b..d60c10415d 100644
--- 
a/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java
+++ 
b/dubbo-metrics/dubbo-tracing/src/main/java/org/apache/dubbo/tracing/exporter/zipkin/ZipkinSpanHandler.java
@@ -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();
     }