Bump up netty to 4.1.115 (#12770)

apache · Nov 14, 2024 · 7e6061a · 7e6061a
1 parent c9a959e
commit 7e6061a
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 60 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -144,6 +144,6 @@ dependency:
       version: 1.16.0
       license: Apache-2.0
     - name: io.vertx:vertx-grpc
-      version: 4.5.1
+      version: 4.5.9
       license: EPL-2.0
 
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
@@ -226,7 +226,7 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.17.1 Apache-2.0
     https://mvnrepository.com/artifact/com.fasterxml.jackson.module/jackson-module-kotlin/2.13.4 Apache-2.0
     https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1 Apache-2.0
-    https://mvnrepository.com/artifact/com.google.api.grpc/proto-google-common-protos/2.29.0 Apache-2.0
+    https://mvnrepository.com/artifact/com.google.api.grpc/proto-google-common-protos/2.41.0 Apache-2.0
     https://mvnrepository.com/artifact/com.google.auto.service/auto-service-annotations/1.0.1 Apache-2.0
     https://mvnrepository.com/artifact/com.google.code.findbugs/jsr305/3.0.2 Apache-2.0
     https://mvnrepository.com/artifact/com.google.code.gson/gson/2.9.0 Apache-2.0
@@ -290,43 +290,42 @@ The text of each license is the standard Apache 2.0 license.
     https://mvnrepository.com/artifact/io.fabric8/kubernetes-model-scheduling/6.7.1 Apache-2.0
     https://mvnrepository.com/artifact/io.fabric8/kubernetes-model-storageclass/6.7.1 Apache-2.0
     https://mvnrepository.com/artifact/io.fabric8/zjsonpatch/0.3.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-api/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-context/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-core/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-grpclb/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-netty/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-protobuf/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-protobuf-lite/1.63.0 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-api/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-context/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-core/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-grpclb/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-netty/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-protobuf/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-protobuf-lite/1.68.1 Apache-2.0
     https://mvnrepository.com/artifact/io.grpc/grpc-services/1.64.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-stub/1.63.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.grpc/grpc-util/1.63.0 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-stub/1.68.1 Apache-2.0
+    https://mvnrepository.com/artifact/io.grpc/grpc-util/1.68.1 Apache-2.0
     https://mvnrepository.com/artifact/io.micrometer/micrometer-commons/1.13.0 Apache-2.0
     https://mvnrepository.com/artifact/io.micrometer/micrometer-core/1.13.0 Apache-2.0
     https://mvnrepository.com/artifact/io.micrometer/micrometer-observation/1.13.0 Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-codec-socks/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-common/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-handler/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.52.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.65.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.65.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport-classes-kqueue/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport-native-kqueue/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.108.Final Apache-2.0
-    https://mvnrepository.com/artifact/io.perfmark/perfmark-api/0.26.0 Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-buffer/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec-dns/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec-haproxy/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec-http/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec-http2/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-codec-socks/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-common/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-handler/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-handler-proxy/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-resolver/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-classes-macos/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-resolver-dns-native-macos/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-tcnative-boringssl-static/2.0.69.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-tcnative-classes/2.0.69.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport-classes-epoll/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport-classes-kqueue/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport-native-epoll/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport-native-kqueue/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.netty/netty-transport-native-unix-common/4.1.115.Final Apache-2.0
+    https://mvnrepository.com/artifact/io.perfmark/perfmark-api/0.27.0 Apache-2.0
     https://mvnrepository.com/artifact/io.prometheus/simpleclient/0.6.0 Apache-2.0
     https://mvnrepository.com/artifact/io.prometheus/simpleclient_common/0.6.0 Apache-2.0
     https://mvnrepository.com/artifact/io.prometheus/simpleclient_hotspot/0.6.0 Apache-2.0
@@ -548,7 +547,7 @@ The text of each license is also included in licenses/LICENSE-[project].txt.
     https://npmjs.com/package/monaco-editor/v/0.34.1 0.34.1 MIT
     https://npmjs.com/package/nanoid/v/3.3.7 3.3.7 MIT
     https://mvnrepository.com/artifact/org.checkerframework/checker-qual/3.33.0 MIT
-    https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.23 MIT
+    https://mvnrepository.com/artifact/org.codehaus.mojo/animal-sniffer-annotations/1.24 MIT
     https://mvnrepository.com/artifact/org.curioswitch.curiostack/protobuf-jackson/2.5.0 MIT
     https://mvnrepository.com/artifact/org.slf4j/slf4j-api/1.7.30 MIT
     https://npmjs.com/package/pinia/v/2.0.28 2.0.28 MIT

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -20,6 +20,7 @@
 * Fix "BanyanDBTraceQueryDAO.queryBasicTraces" doesn't support querying by "trace_id".
 * Polish mesh data dispatcher: don't generate Instance/Endpoint metrics if they are empty.
 * Adapt the new metadata standardization in Istio 1.24.
+* Bump up netty to 4.1.115, grpc to 1.68.1, boringssl to 2.0.69.
 
 #### UI
 

diff --git a/...in/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java b/...in/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdConfig.java
@@ -19,7 +19,6 @@
 package org.apache.skywalking.oap.server.cluster.plugin.etcd;
 
 import com.google.common.base.Strings;
-import java.util.Arrays;
 import lombok.Data;
 import org.apache.skywalking.oap.server.library.module.ModuleConfig;
 
@@ -47,9 +46,4 @@ public String getNamespace() {
         }
         return namespace;
     }
-
-    public String[] getEndpointArray() {
-        return Arrays.stream(endpoints.split("\\s*,\\s*")).toArray(String[]::new);
-
-    }
 }
diff --git a/...n/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java b/...n/src/main/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/EtcdCoordinator.java
@@ -77,7 +77,7 @@ public EtcdCoordinator(final ModuleDefineHolder manager,
         }
         this.serviceNameBS = ByteSequence.from(serviceName, Charset.defaultCharset());
         ClientBuilder builder = Client.builder()
-                                      .endpoints(config.getEndpointArray())
+                                      .target(config.getEndpoints())
                                       .authority(config.getAuthority());
         if (StringUtil.isNotEmpty(config.getNamespace())) {
             builder.namespace(ByteSequence.from(config.getNamespace(), Charset.defaultCharset()));

diff --git a/...c/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterEtcdPluginIT.java b/...c/test/java/org/apache/skywalking/oap/server/cluster/plugin/etcd/ClusterEtcdPluginIT.java
@@ -64,7 +64,7 @@ public class ClusterEtcdPluginIT {
 
     @Container
     public final GenericContainer<?> container =
-        new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.0"))
+        new GenericContainer<>(DockerImageName.parse("quay.io/coreos/etcd:v3.5.17"))
             .waitingFor(Wait.forLogMessage(".*ready to serve client requests.*", 1))
             .withEnv(Collections.singletonMap("ALLOW_NONE_AUTHENTICATION", "yes"))
             .withCommand(
@@ -76,7 +76,7 @@ public class ClusterEtcdPluginIT {
 
     @BeforeEach
     public void before() throws Exception {
-        String baseUrl = "http://" + container.getHost() + ":" + container.getMappedPort(2379);
+        String baseUrl = container.getHost() + ":" + container.getMappedPort(2379);
         System.setProperty("etcd.endpoint", baseUrl);
 
         etcdConfig = new ClusterModuleEtcdConfig();

diff --git a/...ache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderFunctionalIT.java b/...ache/skywalking/oap/server/cluster/plugin/etcd/ClusterModuleEtcdProviderFunctionalIT.java
@@ -75,7 +75,7 @@ public void setup() {
         telemetryProvider = mock(NoneTelemetryProvider.class);
         Mockito.when(telemetryProvider.getService(MetricsCreator.class))
                .thenReturn(new MetricsCreatorNoop());
-        endpoint = "http://" + container.getHost() + ":" + container.getMappedPort(2379);
+        endpoint = container.getHost() + ":" + container.getMappedPort(2379);
     }
 
     @Test

diff --git a/...n/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java b/...n/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigWatcherRegister.java
@@ -43,7 +43,7 @@ public EtcdConfigWatcherRegister(EtcdServerSettings setting) {
         super(setting.getPeriod());
         ClientBuilder builder = Client.builder()
                                       .authority(setting.getAuthority())
-                                      .endpoints(setting.getEndpointArray());
+                                      .target(setting.getEndpoints());
 
         if (StringUtil.isNotEmpty(setting.getNamespace())) {
             builder.namespace(ByteSequence.from(setting.getNamespace(), Charset.defaultCharset()));

diff --git a/...src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java b/...src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java
@@ -18,7 +18,6 @@
 package org.apache.skywalking.oap.server.configuration.etcd;
 
 import com.google.common.base.Strings;
-import java.util.Arrays;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -46,8 +45,4 @@ public String getNamespace() {
         }
         return namespace;
     }
-
-    public String[] getEndpointArray() {
-        return Arrays.stream(endpoints.split("\\s*,\\s*")).toArray(String[]::new);
-    }
 }
diff --git a/...rc/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java b/...rc/test/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdConfigurationIT.java
@@ -68,7 +68,7 @@ public class EtcdConfigurationIT {
 
     @BeforeEach
     public void before() throws Exception {
-        System.setProperty("etcd.endpoint", "http://127.0.0.1:" + container.getMappedPort(2379));
+        System.setProperty("etcd.endpoint", "127.0.0.1:" + container.getMappedPort(2379));
 
         final ApplicationConfiguration applicationConfiguration = new ApplicationConfiguration();
         loadConfig(applicationConfiguration);
@@ -87,7 +87,7 @@ public void shouldReadUpdated() throws Exception {
         assertNull(provider.watcher.value());
 
         KV client = Client.builder()
-                          .endpoints("http://localhost:" + container.getMappedPort(2379))
+                          .target("127.0.0.1:" + container.getMappedPort(2379))
                           .namespace(ByteSequence.from("/skywalking/", Charset.defaultCharset()))
                           .build()
                           .getKVClient();
@@ -120,7 +120,7 @@ public void shouldReadUpdated4Group() throws Exception {
         assertEquals("{}", provider.groupWatcher.groupItems().toString());
 
         KV client = Client.builder()
-                          .endpoints("http://localhost:" + container.getMappedPort(2379))
+                          .target("localhost:" + container.getMappedPort(2379))
                           .namespace(ByteSequence.from("/skywalking/", Charset.defaultCharset()))
                           .build()
                           .getKVClient();

diff --git a/pom.xml b/pom.xml
@@ -165,9 +165,9 @@
         <byte-buddy.version>1.14.9</byte-buddy.version>
 
         <!-- core lib dependency -->
-        <grpc.version>1.63.0</grpc.version>
-        <netty.version>4.1.108.Final</netty.version>
-        <netty-tcnative-boringssl-static.version>2.0.52.Final</netty-tcnative-boringssl-static.version>
+        <grpc.version>1.68.1</grpc.version>
+        <netty.version>4.1.115.Final</netty.version>
+        <netty-tcnative-boringssl-static.version>2.0.69.Final</netty-tcnative-boringssl-static.version>
         <gson.version>2.9.0</gson.version>
         <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>

diff --git a/test/e2e-v2/script/docker-compose/base-compose.yml b/test/e2e-v2/script/docker-compose/base-compose.yml
@@ -34,8 +34,8 @@ services:
       SW_JDBC_URL: jdbc:mysql://mysql:3306/swtest?allowMultiQueries=true
       SW_STORAGE_BANYANDB_TARGETS: banyandb:17912
       SW_CONFIG_ETCD_PERIOD: 1
-      SW_CONFIG_ETCD_ENDPOINTS: http://etcd:2379
-      SW_CLUSTER_ETCD_ENDPOINTS: http://etcd:2379
+      SW_CONFIG_ETCD_ENDPOINTS: etcd:2379
+      SW_CLUSTER_ETCD_ENDPOINTS: etcd:2379
     healthcheck:
       test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
       interval: 5s