update dropshot and progenitor

common/src/lib.rs

@@ -34,18 +34,18 @@ pub mod packaging;
 macro_rules! generate_logging_api {
     ($path:literal) => {
         progenitor::generate_api!(
-            $path,
-            slog::Logger,
-            |log: &slog::Logger, request: &reqwest::Request| {
+            spec = $path,
+            inner_type = slog::Logger,
+            pre_hook = (|log: &slog::Logger, request: &reqwest::Request| {
                 slog::debug!(log, "client request";
                     "method" => %request.method(),
                     "uri" => %request.url(),
                     "body" => ?&request.body(),
                 );
-            },
-            |log: &slog::Logger, result: &Result<_, _>| {
+            }),
+            post_hook = (|log: &slog::Logger, result: &Result<_, _>| {
                 slog::debug!(log, "client response"; "result" => ?result);
-            },
+            }),
         );
     };
 }

oximeter/producer/examples/producer.rs

@@ -86,8 +86,11 @@ impl Producer for CpuBusyProducer {
 #[tokio::main]
 async fn main() {
     let address = "[::1]:0".parse().unwrap();
-    let dropshot_config =
-        ConfigDropshot { bind_address: address, request_body_max_bytes: 2048 };
+    let dropshot_config = ConfigDropshot {
+        bind_address: address,
+        request_body_max_bytes: 2048,
+        tls: None,
+    };
     let logging_config =
         ConfigLogging::StderrTerminal { level: ConfigLoggingLevel::Debug };
     let server_info = ProducerEndpoint {

oximeter/producer/src/lib.rs

@@ -180,6 +180,7 @@ pub async fn register(
     client
         .cpapi_producers_post(&server_info.into())
         .await
+        .map(|_| ())
         .map_err(|msg| Error::RegistrationError(msg.to_string()))
 }
 

sled-agent/src/sim/disk.rs

@@ -95,6 +95,7 @@ impl Simulatable for SimDisk {
                 &nexus_client::types::DiskRuntimeState::from(current),
             )
             .await
+            .map(|_| ())
             .map_err(Error::from)
     }
 }

sled-agent/src/sim/instance.rs

@@ -102,6 +102,7 @@ impl Simulatable for SimInstance {
                 &nexus_client::types::InstanceRuntimeState::from(current),
             )
             .await
+            .map(|_| ())
             .map_err(Error::from)
     }
 }