From 3acffa4545dc5321422b864eaec5e70f5b8c0dae Mon Sep 17 00:00:00 2001
From: iximeow <git@iximeow.net>
Date: Thu, 15 Aug 2024 23:37:40 +0000
Subject: [PATCH] Revert "review comment: remove unneeded
 SocketAddrV6->SocketAddr wrapping"

This reverts commit 0dcec7af386e5d477500319c0937d1928a86c3d1.

allegedly this causes CI to fail in deploy, because it is unable to
`ipadm create-addr -t -T addrconf oxControlService%d/ll`, because the
object cannot be found. given that nothing in oximeter should run that
early, that seems odd..?
---
 oximeter/collector/src/agent.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oximeter/collector/src/agent.rs b/oximeter/collector/src/agent.rs
index 8271b2e0688..5e0983d19a5 100644
--- a/oximeter/collector/src/agent.rs
+++ b/oximeter/collector/src/agent.rs
@@ -815,7 +815,7 @@ async fn refresh_producer_list(agent: OximeterAgent, resolver: Resolver) {
 async fn resolve_nexus_with_backoff(
     log: &Logger,
     resolver: &Resolver,
-) -> SocketAddrV6 {
+) -> SocketAddr {
     let log_failure = |error, delay| {
         warn!(
             log,
@@ -829,6 +829,7 @@ async fn resolve_nexus_with_backoff(
             .lookup_socket_v6(ServiceName::Nexus)
             .await
             .map_err(|e| BackoffError::transient(e.to_string()))
+            .map(|addr| SocketAddr::V6(addr))
     };
     backoff::retry_notify(
         backoff::retry_policy_internal_service(),