address comments

karencfv · Aug 20, 2024 · dcd4f34 · dcd4f34
1 parent ea32c0c
commit dcd4f34
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/oximeter/collector/src/agent.rs b/oximeter/collector/src/agent.rs
@@ -17,7 +17,6 @@ use futures::TryStreamExt;
 use internal_dns::resolver::Resolver;
 use internal_dns::ServiceName;
 use nexus_client::types::IdSortMode;
-use omicron_common::address::CLICKHOUSE_PORT;
 use omicron_common::address::NEXUS_INTERNAL_PORT;
 use omicron_common::backoff;
 use omicron_common::backoff::BackoffError;
@@ -396,16 +395,15 @@ impl OximeterAgent {
         let db_address = if let Some(address) = db_config.address {
             address
         } else if replicated {
-            let mut address = resolver
-                .lookup_socket_v6(ServiceName::ClickhouseServer)
-                .await?;
-            address.set_port(CLICKHOUSE_PORT);
-            SocketAddr::V6(address)
+            SocketAddr::V6(
+                resolver
+                    .lookup_socket_v6(ServiceName::ClickhouseServer)
+                    .await?,
+            )
         } else {
-            let mut address =
-                resolver.lookup_socket_v6(ServiceName::Clickhouse).await?;
-            address.set_port(CLICKHOUSE_PORT);
-            SocketAddr::V6(address)
+            SocketAddr::V6(
+                resolver.lookup_socket_v6(ServiceName::Clickhouse).await?,
+            )
         };
 
         // Determine the version of the database.