Oximeter producer kind parameter is now required (#573)

oxidecomputer · Nov 30, 2023 · 76c845d · 76c845d
1 parent 6f3f597
commit 76c845d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,8 +78,8 @@ oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch =
 oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 
 # Crucible
-crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
-crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "945f040d259ca8013d3fb26f510453da7cd7b1a6" }
+crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "2e02507fb1625ee392ca9a0063a4a62793597648" }
+crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "2e02507fb1625ee392ca9a0063a4a62793597648" }
 
 # External dependencies
 anyhow = "1.0"

diff --git a/bin/propolis-server/src/lib/stats.rs b/bin/propolis-server/src/lib/stats.rs
@@ -126,7 +126,7 @@ pub async fn start_oximeter_server(
 
     let server_info = ProducerEndpoint {
         id,
-        kind: Some(ProducerKind::Instance),
+        kind: ProducerKind::Instance,
         address: my_address,
         base_route: "/collect".to_string(),
         interval: OXIMETER_STAT_INTERVAL,