From 459d4ea40541312582cc8e754b84cea06b53f2bf Mon Sep 17 00:00:00 2001
From: Yingyu Cheng <1443504+winguse@users.noreply.github.com>
Date: Fri, 18 Oct 2024 11:28:47 -0700
Subject: [PATCH] document update regarding addressResolverGroup settings
 (#3007)

* Update advanced-usage.md

* update doc

* update doc

* pr comments (sorry for getting back late)

* wrap with actual DnsAddressResolverGroup

* use space
---
 docs/advanced-usage.md                        | 30 ++++++++++++++++++-
 .../core/resource/DefaultClientResources.java |  2 +-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md
index 23c3528de4..19e8c2b9d5 100644
--- a/docs/advanced-usage.md
+++ b/docs/advanced-usage.md
@@ -207,7 +207,7 @@ disabled by setting <code>commandLatencyPublisherOptions(…)</code> to
 <td><code>DnsResolvers.JVM_DEFAULT ( or netty if present)</code></td>
 </tr>
 <tr>
-<td colspan="3"><p>Since: 3.5, 4.2</p>
+<td colspan="3"><p>Since: 3.5, 4.2. Deprecated: 6.4</p>
 <p>Configures a DNS resolver to resolve hostnames to a
 <code>java.net.InetAddress</code>. Defaults to the JVM DNS resolution
 that uses blocking hostname resolution and caching of lookup results.
@@ -223,6 +223,34 @@ netty's <code>AddressResolver</code> that resolves DNS names on
 <code>Bootstrap.connect()</code> (requires netty 4.1)</p></td>
 </tr>
 <tr>
+<td><strong>Address Resolver Group</strong></td>
+<td><code>addressResolverGroup</code></td>
+<td><code>DefaultAddressResolverGroup.INSTANCE ( or netty DnsAddressResolverGroup if present)</code></td>
+</tr>
+<tr>
+<td colspan="3"><p>Since: 6.1</p>
+<p>Sets the <code>AddressResolverGroup</code> for DNS resolution. This option is only effective if
+<code>DnsResolvers#UNRESOLVED</code> is used as <code>DnsResolver</code>. Defaults to
+<code>io.netty.resolver.DefaultAddressResolverGroup#INSTANCE</code> if <code>netty-dns-resolver</code>
+is not available, otherwise defaults to <code>io.netty.resolver.dns.DnsAddressResolverGroup</code></p>
+<p>Users of DNS-based Redis-HA setups (e.g. AWS ElastiCache) might want to configure a different DNS 
+resolver group. For example:
+
+```java
+new DnsAddressResolverGroup(
+  new DnsNameResolverBuilder(dnsEventLoop)
+      .channelType(NioDatagramChannel.class)
+      .resolveCache(NoopDnsCache.INSTANCE)
+      .cnameCache(NoopDnsCnameCache.INSTANCE)
+      .authoritativeDnsServerCache(NoopAuthoritativeDnsServerCache.INSTANCE)
+      .consolidateCacheSize(0)
+);
+```
+
+</p>
+</td>
+</tr>
+<tr>
 <td><strong>Reconnect Delay</strong></td>
 <td><code>reconnectDelay</code></td>
 <td><code>Delay.exponential()</code></td>
diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
index 592ffff4ab..a165978df6 100644
--- a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
+++ b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -442,7 +442,7 @@ public Builder computationThreadPoolSize(int computationThreadPoolSize) {
 
         /**
          * Sets the {@link DnsResolver} that is used to resolve hostnames to {@link java.net.InetAddress}. Defaults to
-         * {@link DnsResolvers#JVM_DEFAULT}
+         * {@link DnsResolvers#UNRESOLVED}
          *
          * @param dnsResolver the DNS resolver, must not be {@code null}.
          * @return {@code this} {@link Builder}.