From e32a2cd72021561ecfc6a8904fd5ccf4525b192e Mon Sep 17 00:00:00 2001 From: Alex Panchenko <440271+panchenko@users.noreply.github.com> Date: Thu, 16 Oct 2025 17:46:54 +0200 Subject: [PATCH 1/3] simplify DnsNameResolver.resolveAddresses() --- .../java/io/grpc/internal/DnsNameResolver.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java index 6f1cf4cd900..6c48389b95b 100644 --- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java +++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java @@ -23,7 +23,6 @@ import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import com.google.common.base.Throwables; import com.google.common.base.Verify; import com.google.common.base.VerifyException; import io.grpc.Attributes; @@ -211,20 +210,8 @@ public void refresh() { resolve(); } - private List resolveAddresses() { - List addresses; - Exception addressesException = null; - try { - addresses = addressResolver.resolveAddress(host); - } catch (Exception e) { - addressesException = e; - Throwables.throwIfUnchecked(e); - throw new RuntimeException(e); - } finally { - if (addressesException != null) { - logger.log(Level.FINE, "Address resolution failure", addressesException); - } - } + private List resolveAddresses() throws Exception { + List addresses = addressResolver.resolveAddress(host); // Each address forms an EAG List servers = new ArrayList<>(addresses.size()); for (InetAddress inetAddr : addresses) { @@ -280,6 +267,7 @@ protected InternalResolutionResult doResolve(boolean forceTxt) { try { result.addresses = resolveAddresses(); } catch (Exception e) { + logger.log(Level.FINE, "Address resolution failure", e); if (!forceTxt) { result.error = Status.UNAVAILABLE.withDescription("Unable to resolve host " + host).withCause(e); From 6247935e5439aa98e68838c0ad1b282d12224ce1 Mon Sep 17 00:00:00 2001 From: Alex Panchenko <440271+panchenko@users.noreply.github.com> Date: Thu, 16 Oct 2025 18:08:50 +0200 Subject: [PATCH 2/3] update undertow --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bf03cc6e18e..84b5d05409e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,8 +104,8 @@ signature-java = "org.codehaus.mojo.signature:java18:1.0" tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.31" tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89" truth = "com.google.truth:truth:1.4.4" -undertow-servlet22 = "io.undertow:undertow-servlet:2.2.37.Final" -undertow-servlet = "io.undertow:undertow-servlet:2.3.18.Final" +undertow-servlet22 = "io.undertow:undertow-servlet:2.2.38.Final" +undertow-servlet = "io.undertow:undertow-servlet:2.3.20.Final" # Do not update: Pinned to the last version supporting Java 8. # See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1 From 5fad840939430119bb1cd5188e67a41f2b420974 Mon Sep 17 00:00:00 2001 From: Alex Panchenko <440271+panchenko@users.noreply.github.com> Date: Fri, 17 Oct 2025 16:25:03 +0200 Subject: [PATCH 3/3] Revert "update undertow" This reverts commit 6247935e5439aa98e68838c0ad1b282d12224ce1. --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 84b5d05409e..bf03cc6e18e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -104,8 +104,8 @@ signature-java = "org.codehaus.mojo.signature:java18:1.0" tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.31" tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.89" truth = "com.google.truth:truth:1.4.4" -undertow-servlet22 = "io.undertow:undertow-servlet:2.2.38.Final" -undertow-servlet = "io.undertow:undertow-servlet:2.3.20.Final" +undertow-servlet22 = "io.undertow:undertow-servlet:2.2.37.Final" +undertow-servlet = "io.undertow:undertow-servlet:2.3.18.Final" # Do not update: Pinned to the last version supporting Java 8. # See https://checkstyle.sourceforge.io/releasenotes.html#Release_10.1