upgrade trust-dns-resolver to hickory-resolver 0.24 (#1469)

Cargo.toml

@@ -13,6 +13,7 @@ figment = { version = "0.10.10", features = ["toml", "env"] }
 futures-util = "0.3.28"
 harness = { path = "crates/harness" }
 harness_macros = { path = "crates/harness_macros" }
+hickory-resolver = { version = "0.24.0", features = ["system-config"] }
 humantime-serde = "1.1"
 hyper = { version = "1.0.0-rc.4", features = ["full"] }
 hyper-util = { git = "https://github.com/hyperium/hyper-util.git", rev = "f898015" }
@@ -35,7 +36,6 @@ tokio-tungstenite = "0.21.0"
 tokio-util = "0.7.8"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.17"
-trust-dns-resolver = { version = "0.22.0", features = ["system-config"] }
 tungstenite = "0.21.0"
 typeshare = "1.0.0"
 url = "2.3.1"

crates/ott-balancer/Cargo.toml

@@ -33,7 +33,6 @@ route-recognizer = "0.3.1"
 once_cell.workspace = true
 pin-project.workspace = true
 prometheus.workspace = true
-trust-dns-resolver.workspace = true
 
 [dev-dependencies]
 criterion.workspace = true

crates/ott-common/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 anyhow.workspace = true
 async-trait.workspace = true
 futures-util.workspace = true
+hickory-resolver.workspace = true
 hyper.workspace = true
 hyper-util.workspace = true
 http-body-util.workspace = true
@@ -20,6 +21,5 @@ tracing-subscriber.workspace = true
 tokio.workspace = true
 tokio-tungstenite.workspace = true
 tokio-util.workspace = true
-trust-dns-resolver.workspace = true
 tungstenite.workspace = true
 url.workspace = true

crates/ott-common/src/discovery/dns.rs

@@ -1,9 +1,9 @@
 use async_trait::async_trait;
-use tracing::info;
-use trust_dns_resolver::{
+use hickory_resolver::{
     config::{NameServerConfig, Protocol, ResolverConfig, ResolverOpts},
     TokioAsyncResolver,
 };
+use tracing::info;
 
 use super::*;
 
@@ -43,20 +43,19 @@ impl ServiceDiscoverer for DnsServiceDiscoverer {
                 resolver_config.add_name_server(NameServerConfig::new(server, Protocol::Udp));
 
                 TokioAsyncResolver::tokio(resolver_config, ResolverOpts::default())
-                    .expect("failed to create resolver")
             }
         };
 
         let lookup = resolver.ipv4_lookup(&self.config.query).await?;
-        let monoliths = lookup
+        let instances = lookup
             .iter()
             .map(|ip| ConnectionConfig {
-                host: HostOrIp::Ip(IpAddr::V4(*ip)),
+                host: HostOrIp::Ip(ip.0.into()),
                 port: self.config.service_port,
             })
             .collect::<Vec<_>>();
 
-        Ok(monoliths)
+        Ok(instances)
     }
 
     fn mode(&self) -> DiscoveryMode {