From ab6ce115f5c8610f150caddc741f96653efce822 Mon Sep 17 00:00:00 2001
From: xiaosheng <songxiaosheng@elastic.link>
Date: Wed, 19 Jun 2024 09:37:55 +0800
Subject: [PATCH 1/2] upgrade  opentelemetry and zipkin-reporter version
 (#14338)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ upgrade zipkin-reporter -> 3.4.0

* ⬆️ upgrade opentelemetry -> 1.39.0
---
 dubbo-dependencies-bom/pom.xml                             | 4 ++--
 dubbo-metrics/dubbo-tracing/pom.xml                        | 5 +++++
 .../dubbo/tracing/exporter/zipkin/ZipkinSpanExporter.java  | 7 ++++---
 .../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();
     }
 

From 3c4247eb583106c2b04ec455564bb4d612e9dffa Mon Sep 17 00:00:00 2001
From: Sean Yang <oxsean@gmail.com>
Date: Thu, 20 Jun 2024 15:41:07 +0800
Subject: [PATCH 2/2] Fix Compilation failure in jdk8 (#14350)

---
 dubbo-plugin/dubbo-triple-servlet/pom.xml     | 104 ++++++++++--------
 .../dubbo-spring-boot-3-autoconfigure/pom.xml |  45 ++++++++
 2 files changed, 101 insertions(+), 48 deletions(-)

diff --git a/dubbo-plugin/dubbo-triple-servlet/pom.xml b/dubbo-plugin/dubbo-triple-servlet/pom.xml
index ee6d22318a..0258304f99 100644
--- a/dubbo-plugin/dubbo-triple-servlet/pom.xml
+++ b/dubbo-plugin/dubbo-triple-servlet/pom.xml
@@ -56,52 +56,60 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-sources</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <copy overwrite="true" todir="${sources_directory}">
-                  <fileset dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" />
-                </copy>
-                <replace token="tri.servlet;" value="tri.servlet.jakarta;">
-                  <fileset dir="${sources_directory}" />
-                </replace>
-                <replace token="javax.servlet" value="jakarta.servlet">
-                  <fileset dir="${sources_directory}" />
-                </replace>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-sources</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-sources/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>jdk-version-ge-17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-sources</id>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <target>
+                    <copy overwrite="true" todir="${sources_directory}">
+                      <fileset dir="src/main/java/org/apache/dubbo/rpc/protocol/tri/servlet" />
+                    </copy>
+                    <replace token="tri.servlet;" value="tri.servlet.jakarta;">
+                      <fileset dir="${sources_directory}" />
+                    </replace>
+                    <replace token="javax.servlet" value="jakarta.servlet">
+                      <fileset dir="${sources_directory}" />
+                    </replace>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>add-sources</id>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <phase>generate-sources</phase>
+                <configuration>
+                  <sources>
+                    <source>${project.build.directory}/generated-sources/java</source>
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
index bfaf876099..a31465cc62 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-3-autoconfigure/pom.xml
@@ -66,4 +66,49 @@
       <optional>true</optional>
     </dependency>
   </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <excludes>
+          <exclude>**</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <skipMain>true</skipMain>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>jdk-version-ge-17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <build>
+        <resources>
+          <resource>
+            <directory>src/main/resources</directory>
+          </resource>
+        </resources>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <skipMain>false</skipMain>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>