Updating dropshot, handling new log_headers field in config struct (#…

…6105)
oxidecomputer · Jul 18, 2024 · c5ed4de · c5ed4de
1 parent 2ba2846
commit c5ed4de
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dns-server/src/lib.rs b/dns-server/src/lib.rs
@@ -138,6 +138,7 @@ impl TransientServer {
                 bind_address: "[::1]:0".parse().unwrap(),
                 request_body_max_bytes: 4 * 1024 * 1024,
                 default_handler_task_mode: dropshot::HandlerTaskMode::Detached,
+                log_headers: vec![],
             },
         )
         .await?;

diff --git a/dns-server/tests/basic_test.rs b/dns-server/tests/basic_test.rs
@@ -419,6 +419,7 @@ fn test_config(
         bind_address: "[::1]:0".to_string().parse().unwrap(),
         request_body_max_bytes: 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
 
     Ok((tmp_dir, config_storage, config_dropshot, logctx))

diff --git a/gateway/src/lib.rs b/gateway/src/lib.rs
@@ -98,6 +98,7 @@ fn start_dropshot_server(
         bind_address: SocketAddr::V6(addr),
         request_body_max_bytes,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
     let http_server_starter = dropshot::HttpServerStarter::new(
         &dropshot,

diff --git a/installinator-api/src/lib.rs b/installinator-api/src/lib.rs
@@ -131,6 +131,7 @@ pub fn default_config(bind_address: std::net::SocketAddr) -> ConfigDropshot {
         // available in omicron.
         request_body_max_bytes: 4 * 1024 * 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     }
 }
 
@@ -153,6 +154,7 @@ pub fn make_server_starter<T: InstallinatorApi>(
         // available in omicron.
         request_body_max_bytes: 4 * 1024 * 1024,
         default_handler_task_mode: HandlerTaskMode::Detached,
+        log_headers: vec![],
     };
 
     let api = crate::installinator_api::api_description::<T>()?;

diff --git a/internal-dns/src/resolver.rs b/internal-dns/src/resolver.rs
@@ -434,6 +434,7 @@ mod test {
                     bind_address: "[::1]:0".parse().unwrap(),
                     request_body_max_bytes: 8 * 1024,
                     default_handler_task_mode: HandlerTaskMode::Detached,
+                    log_headers: vec![],
                 },
             )
             .await

diff --git a/nexus/src/app/background/init.rs b/nexus/src/app/background/init.rs
@@ -928,6 +928,7 @@ pub mod test {
                 bind_address: "[::1]:0".parse().unwrap(),
                 request_body_max_bytes: 8 * 1024,
                 default_handler_task_mode: HandlerTaskMode::Detached,
+                log_headers: vec![],
             },
         )
         .await

diff --git a/nexus/test-utils/src/lib.rs b/nexus/test-utils/src/lib.rs
@@ -1575,6 +1575,7 @@ pub async fn start_dns_server(
             bind_address: "[::1]:0".parse().unwrap(),
             request_body_max_bytes: 8 * 1024,
             default_handler_task_mode: HandlerTaskMode::Detached,
+            log_headers: vec![],
         },
     )
     .await

diff --git a/oximeter/producer/src/lib.rs b/oximeter/producer/src/lib.rs
@@ -222,6 +222,7 @@ impl Server {
             bind_address: server_info.address,
             request_body_max_bytes,
             default_handler_task_mode: dropshot::HandlerTaskMode::Detached,
+            log_headers: vec![],
         };
         let server = Self::build_dropshot_server(&log, &registry, &dropshot)?;
 

diff --git a/sled-agent/src/server.rs b/sled-agent/src/server.rs
@@ -68,7 +68,7 @@ impl Server {
 
         let dropshot_config = dropshot::ConfigDropshot {
             bind_address: SocketAddr::V6(sled_address),
-            ..config.dropshot
+            ..config.dropshot.clone()
         };
         let dropshot_log = log.new(o!("component" => "dropshot (SledAgent)"));
         let http_server = dropshot::HttpServerStarter::new(

diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
@@ -2160,6 +2160,7 @@ impl ServiceManager {
                             request_body_max_bytes: 8192 * 1024,
                             default_handler_task_mode:
                                 HandlerTaskMode::Detached,
+                            log_headers: vec![],
                         },
                     },
                     dropshot_internal: dropshot::ConfigDropshot {
@@ -2170,6 +2171,7 @@ impl ServiceManager {
                         // rack setup.
                         request_body_max_bytes: 10 * 1024 * 1024,
                         default_handler_task_mode: HandlerTaskMode::Detached,
+                        log_headers: vec![],
                     },
                     internal_dns: nexus_config::InternalDns::FromSubnet {
                         subnet: Ipv6Subnet::<RACK_PREFIX>::new(

diff --git a/sled-agent/src/sim/storage.rs b/sled-agent/src/sim/storage.rs
@@ -975,6 +975,7 @@ impl PantryServer {
                 // - bulk writes into disks
                 request_body_max_bytes: 8192 * 1024,
                 default_handler_task_mode: HandlerTaskMode::Detached,
+                log_headers: vec![],
             },
             super::http_entrypoints_pantry::api(),
             pantry.clone(),

diff --git a/wicketd/src/lib.rs b/wicketd/src/lib.rs
@@ -135,6 +135,7 @@ impl Server {
             // some endpoints.
             request_body_max_bytes: 4 << 30,
             default_handler_task_mode: HandlerTaskMode::Detached,
+            log_headers: vec![],
         };
 
         let mgs_manager = MgsManager::new(&log, args.mgs_address);

diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
@@ -99,6 +99,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.5.0", features = ["bytes", "inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
 smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
+socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
@@ -116,7 +117,7 @@ unicode-bidi = { version = "0.3.15" }
 unicode-normalization = { version = "0.1.23" }
 usdt = { version = "0.5.0" }
 usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
-uuid = { version = "1.9.1", features = ["serde", "v4"] }
+uuid = { version = "1.10.0", features = ["serde", "v4"] }
 yasna = { version = "0.5.2", features = ["bit-vec", "num-bigint", "std", "time"] }
 zerocopy = { version = "0.7.34", features = ["derive", "simd"] }
 zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
@@ -204,6 +205,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.5.0", features = ["bytes", "inline", "unicode"] }
 slog = { version = "2.7.0", features = ["dynamic-keys", "max_level_trace", "release_max_level_debug", "release_max_level_trace"] }
 smallvec = { version = "1.13.2", default-features = false, features = ["const_new"] }
+socket2 = { version = "0.5.7", default-features = false, features = ["all"] }
 spin = { version = "0.9.8" }
 string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
@@ -224,7 +226,7 @@ unicode-normalization = { version = "0.1.23" }
 unicode-xid = { version = "0.2.4" }
 usdt = { version = "0.5.0" }
 usdt-impl = { version = "0.5.0", default-features = false, features = ["asm", "des"] }
-uuid = { version = "1.9.1", features = ["serde", "v4"] }
+uuid = { version = "1.10.0", features = ["serde", "v4"] }
 yasna = { version = "0.5.2", features = ["bit-vec", "num-bigint", "std", "time"] }
 zerocopy = { version = "0.7.34", features = ["derive", "simd"] }
 zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }