Clean up some instances of mishandled error logging (#9923)

This cleans up handling of `DdmError` and `ResolveError`. It also
updates any downstream code that was previously relying on the
redundancy in `DdmError`'s `Display` implementation, such that it
instead relies on the implementation of `slog::Value` from the
`slog-error-chain` crate.

Related to #9804 and #9803.

Author: sruggier

Cargo.lock

@@ -22,3 +22,4 @@ sled-hardware-types.workspace = true
 omicron-workspace-hack.workspace = true
 ddm-admin-client.workspace = true
 uuid.workspace = true
+slog-error-chain.workspace = true

clients/ddm-admin-client/Cargo.toml

@@ -18,6 +18,7 @@ use sled_hardware_types::underlay::BOOTSTRAP_MASK;
 use sled_hardware_types::underlay::BOOTSTRAP_PREFIX;
 use sled_hardware_types::underlay::BootstrapInterface;
 use slog::Logger;
+use slog_error_chain::SlogInlineError;
 use std::net::Ipv6Addr;
 use std::net::SocketAddr;
 use std::net::SocketAddrV6;
@@ -28,12 +29,12 @@ use crate::types::EnableStatsRequest;
 // TODO-cleanup Is it okay to hardcode this port number here?
 const DDMD_PORT: u16 = 8000;
 
-#[derive(Debug, Error)]
+#[derive(Debug, Error, SlogInlineError)]
 pub enum DdmError {
-    #[error("Failed to construct an HTTP client: {0}")]
+    #[error("Failed to construct an HTTP client:")]
     HttpClient(#[from] reqwest012::Error),
 
-    #[error("Failed making HTTP request to ddmd: {0}")]
+    #[error("Failed making HTTP request to ddmd")]
     DdmdApi(#[from] Error<types::Error>),
 }
 

clients/ddm-admin-client/src/lib.rs

@@ -144,7 +144,7 @@ pub async fn poll_ddmd_for_bootstore_and_tq_peer_update(
             Err(err) => {
                 warn!(
                     log, "Failed to get prefixes from ddmd";
-                    "err" => #%err,
+                    &err,
                 );
                 break;
             }

sled-agent/src/bootstrap/bootstore_setup.rs

@@ -62,7 +62,7 @@ pub enum EarlyNetworkSetupError {
     #[error("Bad configuration for setting up rack: {0}")]
     BadConfig(String),
 
-    #[error("Error contacting ddmd: {0}")]
+    #[error("Error contacting ddmd")]
     DdmError(#[from] DdmError),
 
     #[error("Error during request to MGS: {0}")]
@@ -71,7 +71,7 @@ pub enum EarlyNetworkSetupError {
     #[error("Error during request to Dendrite: {0}")]
     Dendrite(String),
 
-    #[error("Error during DNS lookup: {0}")]
+    #[error("Error during DNS lookup")]
     DnsResolver(#[from] ResolveError),
 
     #[error("BGP configuration error: {0}")]

sled-agent/src/bootstrap/early_networking.rs

@@ -194,7 +194,7 @@ pub enum Error {
     #[error(transparent)]
     ZoneInstall(#[from] illumos_utils::running_zone::InstallZoneError),
 
-    #[error("Error contacting ddmd: {0}")]
+    #[error("Error contacting ddmd")]
     DdmError(#[from] DdmError),
 
     #[error("Failed to access underlay device: {0}")]

sled-agent/src/services.rs

@@ -145,7 +145,7 @@ async fn possible_sled_agent_addrs(
             Err(err) => {
                 warn!(
                     log, "Failed to get prefixes from ddm";
-                    "err" => #%err,
+                    &err,
                 );
                 tokio::time::sleep(RETRY).await;
             }
@@ -164,7 +164,7 @@ async fn make_ddm_admin_client(log: &Logger) -> DdmAdminClient {
             Err(err) => {
                 warn!(
                     log, "Failed to construct DdmAdminClient";
-                    "err" => #%err,
+                    &err,
                 );
                 tokio::time::sleep(DDM_CONSTRUCT_RETRY).await;
             }