From bf25947e9ba35aa2ff7b0094010774a7b79c6949 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Wed, 19 Mar 2025 16:37:39 +0000
Subject: [PATCH 1/2] update omicron

---
 Cargo.lock              | 534 +++++++++++++++++++++++-----------------
 Cargo.toml              |   3 +-
 crutest/src/stats.rs    |   2 +-
 downstairs/src/stats.rs |   2 +-
 upstairs/Cargo.toml     |   3 +-
 upstairs/src/notify.rs  |   4 +-
 6 files changed, 313 insertions(+), 235 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e885b7622..a1a71dd1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -87,18 +87,6 @@ dependencies = [
  "version_check",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy 0.7.32",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.2"
@@ -186,7 +174,7 @@ checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 [[package]]
 name = "api_identity"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "omicron-workspace-hack",
  "proc-macro2",
@@ -355,7 +343,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 [[package]]
 name = "bhyve_api"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=6b5f2af796a3ea57405721407ab70520a93ec73f#6b5f2af796a3ea57405721407ab70520a93ec73f"
 dependencies = [
  "bhyve_api_sys",
  "libc",
@@ -365,7 +353,7 @@ dependencies = [
 [[package]]
 name = "bhyve_api_sys"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=4ba9c33817c89d5d48b96e037a64421fb7a026e2#4ba9c33817c89d5d48b96e037a64421fb7a026e2"
+source = "git+https://github.com/oxidecomputer/propolis?rev=6b5f2af796a3ea57405721407ab70520a93ec73f#6b5f2af796a3ea57405721407ab70520a93ec73f"
 dependencies = [
  "libc",
  "strum 0.26.3",
@@ -701,7 +689,7 @@ checksum = "8c41dc435a7b98e4608224bbf65282309f5403719df9113621b30f8b6f74e2f4"
 dependencies = [
  "nix",
  "terminfo",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "which",
  "windows-sys 0.59.0",
 ]
@@ -709,15 +697,17 @@ dependencies = [
 [[package]]
 name = "clickhouse-admin-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "atomicwrites",
  "camino",
  "camino-tempfile",
+ "chrono",
+ "daft",
  "derive_more",
  "expectorate",
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "omicron-common",
  "omicron-workspace-hack",
  "schemars",
@@ -924,12 +914,13 @@ dependencies = [
  "crucible-common",
  "crucible-protocol",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "expectorate",
  "futures",
  "futures-core",
  "humantime",
- "internal-dns",
+ "internal-dns-resolver",
+ "internal-dns-types",
  "itertools 0.14.0",
  "libc",
  "nexus-client",
@@ -976,7 +967,7 @@ dependencies = [
  "crucible-common",
  "crucible-smf 0.0.0",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "expectorate",
  "futures",
  "http",
@@ -1030,7 +1021,7 @@ dependencies = [
  "anyhow",
  "atty",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "nix",
  "proptest",
  "rustls-pemfile 1.0.4",
@@ -1044,7 +1035,7 @@ dependencies = [
  "slog-term",
  "tempfile",
  "test-strategy",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-rustls 0.24.1",
  "toml 0.8.20",
@@ -1079,7 +1070,7 @@ dependencies = [
  "crucible-common",
  "crucible-protocol",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "expectorate",
  "futures",
  "futures-core",
@@ -1117,7 +1108,7 @@ dependencies = [
  "slog-term",
  "statistical",
  "tempfile",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-rustls 0.24.1",
  "tokio-util",
@@ -1162,7 +1153,7 @@ dependencies = [
  "crucible-pantry",
  "crucible-pantry-client",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "futures",
  "futures-core",
  "hex",
@@ -1228,7 +1219,7 @@ dependencies = [
  "crucible-common",
  "crucible-smf 0.0.0",
  "crucible-workspace-hack",
- "dropshot 0.16.0",
+ "dropshot",
  "expectorate",
  "futures",
  "hex",
@@ -1293,13 +1284,13 @@ dependencies = [
  "libc",
  "num-derive",
  "num-traits",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7#74286f952a2953cd08512015076f0947050deba7"
+source = "git+https://github.com/oxidecomputer/crucible?rev=81a3528adacdbde18fcbf3938247fef17233db11#81a3528adacdbde18fcbf3938247fef17233db11"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
@@ -1492,6 +1483,30 @@ dependencies = [
  "cipher",
 ]
 
+[[package]]
+name = "daft"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca607475e0cd38d41f8d1a5bd8985e7cdc1a205a69942211a475b02e48e406e0"
+dependencies = [
+ "daft-derive",
+ "newtype-uuid",
+ "oxnet",
+ "paste",
+ "uuid",
+]
+
+[[package]]
+name = "daft-derive"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a78e2436bc785be168ec3641025f713acc89b541ab41c318d7a1cfb4a4c2c50e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "darling"
 version = "0.20.3"
@@ -1594,9 +1609,9 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.18"
+version = "0.99.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
+checksum = "3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -1650,23 +1665,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "dns-service-client"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
-dependencies = [
- "anyhow",
- "chrono",
- "expectorate",
- "http",
- "omicron-workspace-hack",
- "progenitor 0.8.0",
- "reqwest",
- "schemars",
- "serde",
- "slog",
-]
-
 [[package]]
 name = "dof"
 version = "0.3.0"
@@ -1681,55 +1679,6 @@ dependencies = [
  "zerocopy 0.7.32",
 ]
 
-[[package]]
-name = "dropshot"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab804b8d4ab58d96e1e19c8ef87e1747a70d2819e92b659d6fe8d5ac5ac44d50"
-dependencies = [
- "async-stream",
- "async-trait",
- "base64 0.22.1",
- "bytes",
- "camino",
- "chrono",
- "debug-ignore",
- "dropshot_endpoint 0.12.0",
- "form_urlencoded",
- "futures",
- "hostname 0.4.0",
- "http",
- "http-body-util",
- "hyper",
- "hyper-util",
- "indexmap 2.7.1",
- "multer",
- "openapiv3",
- "paste",
- "percent-encoding",
- "rustls 0.22.4",
- "rustls-pemfile 2.1.3",
- "schemars",
- "scopeguard",
- "serde",
- "serde_json",
- "serde_path_to_error",
- "serde_urlencoded",
- "sha1",
- "slog",
- "slog-async",
- "slog-bunyan",
- "slog-json",
- "slog-term",
- "tokio",
- "tokio-rustls 0.25.0",
- "toml 0.8.20",
- "usdt",
- "uuid",
- "version_check",
- "waitgroup",
-]
-
 [[package]]
 name = "dropshot"
 version = "0.16.0"
@@ -1743,7 +1692,7 @@ dependencies = [
  "camino",
  "chrono",
  "debug-ignore",
- "dropshot_endpoint 0.16.0",
+ "dropshot_endpoint",
  "form_urlencoded",
  "futures",
  "hostname 0.4.0",
@@ -1771,7 +1720,7 @@ dependencies = [
  "slog-bunyan",
  "slog-json",
  "slog-term",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-rustls 0.25.0",
  "toml 0.8.20",
@@ -1781,20 +1730,6 @@ dependencies = [
  "waitgroup",
 ]
 
-[[package]]
-name = "dropshot_endpoint"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "796be76b11b79de0decd7be2105add01220f8bbe04cf1f83214c0b801414a722"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "serde",
- "serde_tokenstream",
- "syn 2.0.99",
-]
-
 [[package]]
 name = "dropshot_endpoint"
 version = "0.16.0"
@@ -1821,7 +1756,7 @@ dependencies = [
  "crucible-common",
  "crucible-workspace-hack",
  "csv",
- "dropshot 0.16.0",
+ "dropshot",
  "dsc-client",
  "expectorate",
  "openapi-lint",
@@ -1872,9 +1807,9 @@ checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "embedded-io"
@@ -1934,7 +1869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1995,6 +1930,12 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
+[[package]]
+name = "fixedbitset"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+
 [[package]]
 name = "flate2"
 version = "1.0.28"
@@ -2178,13 +2119,13 @@ dependencies = [
 [[package]]
 name = "gateway-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "gateway-messages",
  "omicron-workspace-hack",
- "progenitor 0.8.0",
+ "progenitor 0.9.1",
  "rand 0.8.5",
  "reqwest",
  "schemars",
@@ -2313,17 +2254,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.7",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash 0.8.6",
- "allocator-api2",
+ "ahash",
 ]
 
 [[package]]
@@ -2332,6 +2263,8 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
+ "allocator-api2",
+ "equivalent",
  "foldhash",
 ]
 
@@ -2416,9 +2349,9 @@ dependencies = [
 
 [[package]]
 name = "hickory-resolver"
-version = "0.24.1"
+version = "0.24.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
 dependencies = [
  "cfg-if",
  "futures-util",
@@ -2437,9 +2370,9 @@ dependencies = [
 
 [[package]]
 name = "highway"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c706f1711006204c2ba8fb1a7bd55f689bbf7feca9ff40325206b5e140cff6df"
+checksum = "9040319a6910b901d5d49cbada4a99db52836a1b63228a05f7e2b7f8feef89b1"
 
 [[package]]
 name = "hostname"
@@ -2688,6 +2621,18 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "id-map"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
+dependencies = [
+ "daft",
+ "derive-where",
+ "omicron-workspace-hack",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -2707,12 +2652,12 @@ dependencies = [
 [[package]]
 name = "illumos-sys-hdrs"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 
 [[package]]
 name = "illumos-utils"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2721,9 +2666,12 @@ dependencies = [
  "camino",
  "camino-tempfile",
  "cfg-if",
- "crucible-smf 0.0.0 (git+https://github.com/oxidecomputer/crucible?rev=74286f952a2953cd08512015076f0947050deba7)",
+ "crucible-smf 0.0.0 (git+https://github.com/oxidecomputer/crucible?rev=81a3528adacdbde18fcbf3938247fef17233db11)",
+ "dropshot",
  "futures",
+ "http",
  "ipnetwork",
+ "itertools 0.14.0",
  "libc",
  "macaddr",
  "omicron-common",
@@ -2736,6 +2684,7 @@ dependencies = [
  "schemars",
  "serde",
  "slog",
+ "slog-error-chain",
  "smf",
  "thiserror 1.0.69",
  "tokio",
@@ -2786,6 +2735,42 @@ dependencies = [
  "web-time 1.1.0",
 ]
 
+[[package]]
+name = "ingot"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/ingot.git?rev=bff93247fe75ff889121e39d494cc3805fc01906#bff93247fe75ff889121e39d494cc3805fc01906"
+dependencies = [
+ "bitflags 2.6.0",
+ "ingot-macros",
+ "ingot-types",
+ "macaddr",
+ "serde",
+ "zerocopy 0.8.23",
+]
+
+[[package]]
+name = "ingot-macros"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/ingot.git?rev=bff93247fe75ff889121e39d494cc3805fc01906#bff93247fe75ff889121e39d494cc3805fc01906"
+dependencies = [
+ "darling",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.99",
+]
+
+[[package]]
+name = "ingot-types"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/ingot.git?rev=bff93247fe75ff889121e39d494cc3805fc01906#bff93247fe75ff889121e39d494cc3805fc01906"
+dependencies = [
+ "ingot-macros",
+ "macaddr",
+ "zerocopy 0.8.23",
+]
+
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -2811,23 +2796,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
 [[package]]
-name = "internal-dns"
+name = "internal-dns-resolver"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
- "anyhow",
- "chrono",
- "dns-service-client",
  "futures",
  "hickory-resolver",
- "hyper",
+ "internal-dns-types",
  "omicron-common",
- "omicron-uuid-kinds",
  "omicron-workspace-hack",
+ "qorb",
  "reqwest",
  "slog",
  "thiserror 1.0.69",
- "uuid",
+]
+
+[[package]]
+name = "internal-dns-types"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "omicron-common",
+ "omicron-uuid-kinds",
+ "omicron-workspace-hack",
+ "schemars",
+ "serde",
 ]
 
 [[package]]
@@ -2850,9 +2845,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "ipnetwork"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e"
+checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
 dependencies = [
  "schemars",
  "serde",
@@ -2932,7 +2927,7 @@ dependencies = [
 [[package]]
 name = "kstat-macro"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 dependencies = [
  "quote",
  "syn 2.0.99",
@@ -2976,7 +2971,7 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 [[package]]
 name = "libnet"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/netadm-sys#e07ad76458eb50601e0da4f9da16dbc942bfc2ba"
+source = "git+https://github.com/oxidecomputer/netadm-sys?branch=main#f4eae3d8070760922da93b9edd56ca4103b4c390"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -3018,9 +3013,19 @@ dependencies = [
 
 [[package]]
 name = "libsw"
-version = "3.3.1"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c161a527b6532e9da627817769689c9d90082e5476f5b819d1152b5c76e6901"
+dependencies = [
+ "libsw-core",
+ "tokio",
+]
+
+[[package]]
+name = "libsw-core"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0673364c1ef7a1674241dbad9ba2415354103d6126451f01eeb7aaa25d6b4fce"
+checksum = "262dad4b91186067a332cac496dd358ace6e9a4acdb050c68ca2920513e9d462"
 dependencies = [
  "tokio",
 ]
@@ -3160,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "mg-admin-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1-no-merge#b13b5b240f3967de753fd589b1036745d2770b52"
+source = "git+https://github.com/oxidecomputer/maghemite?rev=caafd889f31faacfaa51e02902990c220c20ef60#caafd889f31faacfaa51e02902990c220c20ef60"
 dependencies = [
  "anyhow",
  "chrono",
@@ -3272,9 +3277,9 @@ dependencies = [
 
 [[package]]
 name = "newtype-uuid"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3526cb7c660872e401beaf3297f95f548ce3b4b4bdd8121b7c0713771d7c4a6e"
+checksum = "ee3224f0e8be7c2a1ebc77ef9c3eecb90f55c6594399ee825de964526b3c9056"
 dependencies = [
  "schemars",
  "serde",
@@ -3293,7 +3298,7 @@ dependencies = [
 [[package]]
 name = "nexus-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "chrono",
  "futures",
@@ -3304,8 +3309,8 @@ dependencies = [
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
  "oxnet",
- "progenitor 0.8.0",
- "regress 0.9.1",
+ "progenitor 0.9.1",
+ "regress",
  "reqwest",
  "schemars",
  "serde",
@@ -3317,8 +3322,9 @@ dependencies = [
 [[package]]
 name = "nexus-sled-agent-shared"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
+ "daft",
  "illumos-utils",
  "omicron-common",
  "omicron-passwords",
@@ -3336,7 +3342,7 @@ dependencies = [
 [[package]]
 name = "nexus-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "api_identity",
@@ -3346,14 +3352,17 @@ dependencies = [
  "clap",
  "clickhouse-admin-types",
  "cookie",
+ "daft",
  "derive-where",
  "derive_more",
- "dns-service-client",
- "dropshot 0.12.0",
+ "dropshot",
  "futures",
  "gateway-client",
  "http",
  "humantime",
+ "id-map",
+ "illumos-utils",
+ "internal-dns-types",
  "ipnetwork",
  "newtype-uuid",
  "newtype_derive",
@@ -3367,6 +3376,7 @@ dependencies = [
  "oxql-types",
  "parse-display",
  "schemars",
+ "semver 1.0.26",
  "serde",
  "serde_json",
  "serde_with",
@@ -3640,7 +3650,7 @@ dependencies = [
 [[package]]
 name = "omicron-common"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "api_identity",
@@ -3648,7 +3658,8 @@ dependencies = [
  "backoff",
  "camino",
  "chrono",
- "dropshot 0.12.0",
+ "daft",
+ "dropshot",
  "futures",
  "hex",
  "http",
@@ -3657,13 +3668,11 @@ dependencies = [
  "mg-admin-client",
  "omicron-uuid-kinds",
  "omicron-workspace-hack",
- "once_cell",
  "oxnet",
  "parse-display",
- "progenitor 0.8.0",
- "progenitor-client 0.8.0",
+ "progenitor-client 0.9.1",
  "rand 0.8.5",
- "regress 0.9.1",
+ "regress",
  "reqwest",
  "schemars",
  "semver 1.0.26",
@@ -3676,13 +3685,14 @@ dependencies = [
  "strum 0.26.3",
  "thiserror 1.0.69",
  "tokio",
+ "tufaceous-artifact",
  "uuid",
 ]
 
 [[package]]
 name = "omicron-passwords"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "argon2",
  "omicron-workspace-hack",
@@ -3696,8 +3706,9 @@ dependencies = [
 [[package]]
 name = "omicron-uuid-kinds"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
+ "daft",
  "newtype-uuid",
  "paste",
  "schemars",
@@ -3846,7 +3857,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
@@ -3897,11 +3908,13 @@ dependencies = [
 [[package]]
 name = "opte"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 dependencies = [
+ "bitflags 2.6.0",
  "cfg-if",
  "dyn-clone",
  "illumos-sys-hdrs",
+ "ingot",
  "kstat-macro",
  "opte-api",
  "postcard",
@@ -3914,9 +3927,10 @@ dependencies = [
 [[package]]
 name = "opte-api"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 dependencies = [
  "illumos-sys-hdrs",
+ "ingot",
  "ipnetwork",
  "postcard",
  "serde",
@@ -3926,7 +3940,7 @@ dependencies = [
 [[package]]
 name = "opte-ioctl"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 dependencies = [
  "libc",
  "libnet",
@@ -3934,7 +3948,7 @@ dependencies = [
  "oxide-vpc",
  "postcard",
  "serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -3963,14 +3977,14 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "owo-colors"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
+checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
 
 [[package]]
 name = "oxide-vpc"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653"
+source = "git+https://github.com/oxidecomputer/opte?rev=cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa#cd9aa6467c5e62c6d97f6aafa2150d6930e3a0fa"
 dependencies = [
  "cfg-if",
  "illumos-sys-hdrs",
@@ -3979,13 +3993,14 @@ dependencies = [
  "serde",
  "smoltcp",
  "tabwriter",
- "zerocopy 0.7.32",
+ "uuid",
+ "zerocopy 0.8.23",
 ]
 
 [[package]]
 name = "oximeter"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "chrono",
@@ -4004,7 +4019,7 @@ dependencies = [
 [[package]]
 name = "oximeter-macro-impl"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "omicron-workspace-hack",
  "proc-macro2",
@@ -4015,11 +4030,12 @@ dependencies = [
 [[package]]
 name = "oximeter-producer"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "chrono",
- "dropshot 0.12.0",
- "internal-dns",
+ "dropshot",
+ "internal-dns-resolver",
+ "internal-dns-types",
  "nexus-client",
  "omicron-common",
  "omicron-workspace-hack",
@@ -4036,7 +4052,7 @@ dependencies = [
 [[package]]
 name = "oximeter-schema"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "chrono",
@@ -4057,7 +4073,7 @@ dependencies = [
 [[package]]
 name = "oximeter-timeseries-macro"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "omicron-workspace-hack",
  "oximeter-schema",
@@ -4070,7 +4086,7 @@ dependencies = [
 [[package]]
 name = "oximeter-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "bytes",
  "chrono",
@@ -4078,6 +4094,7 @@ dependencies = [
  "num 0.4.3",
  "omicron-common",
  "omicron-workspace-hack",
+ "parse-display",
  "regex",
  "schemars",
  "serde",
@@ -4089,7 +4106,7 @@ dependencies = [
 [[package]]
 name = "oxlog"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "camino",
@@ -4102,8 +4119,9 @@ dependencies = [
 
 [[package]]
 name = "oxnet"
-version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/oxnet#7dacd265f1bcd0f8b47bd4805250c4f0812da206"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95f58698da06f0f57b1ea4a8f1b0ca5741ee17927729d2e87dcfcb682266d21d"
 dependencies = [
  "ipnetwork",
  "schemars",
@@ -4114,7 +4132,7 @@ dependencies = [
 [[package]]
 name = "oxql-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "chrono",
@@ -4248,12 +4266,22 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.4.2",
  "indexmap 2.7.1",
  "serde",
  "serde_derive",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772"
+dependencies = [
+ "fixedbitset 0.5.7",
+ "indexmap 2.7.1",
+]
+
 [[package]]
 name = "phf"
 version = "0.11.2"
@@ -4377,9 +4405,9 @@ checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254"
 
 [[package]]
 name = "prettyplease"
-version = "0.2.22"
+version = "0.2.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
+checksum = "5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb"
 dependencies = [
  "proc-macro2",
  "syn 2.0.99",
@@ -4528,7 +4556,7 @@ dependencies = [
  "serde",
  "serde_json",
  "syn 2.0.99",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "typify 0.3.0",
  "unicode-ident",
 ]
@@ -4609,6 +4637,27 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "qorb"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac55d5c7e6acb2b6b1a248b70d08ed437613eb8c05f833de3a5c9397d368fc71"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "debug-ignore",
+ "derive-where",
+ "futures",
+ "hickory-resolver",
+ "rand 0.8.5",
+ "serde",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "usdt",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -4938,21 +4987,11 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "regress"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479"
-dependencies = [
- "hashbrown 0.14.3",
- "memchr",
-]
-
-[[package]]
-name = "regress"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1541daf4e4ed43a0922b7969bdc2170178bcacc5dabf7e39bc508a9fa3953a7a"
+checksum = "78ef7fa9ed0256d64a688a3747d0fef7a88851c18a5e1d57f115f38ec2e09366"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.15.2",
  "memchr",
 ]
 
@@ -5176,7 +5215,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.3",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5327,14 +5366,15 @@ dependencies = [
 
 [[package]]
 name = "schemars"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92"
+checksum = "3fbf2ae1b8bc8e02df939598064d22402220cd5bbcca1c76f7d6a310974d5615"
 dependencies = [
  "bytes",
  "chrono",
  "dyn-clone",
  "schemars_derive",
+ "semver 1.0.26",
  "serde",
  "serde_json",
  "uuid",
@@ -5342,9 +5382,9 @@ dependencies = [
 
 [[package]]
 name = "schemars_derive"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
+checksum = "32e265784ad618884abaea0600a9adf15393368d840e0222d101a072f3f7534d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5549,9 +5589,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -5567,9 +5607,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -5702,7 +5742,7 @@ dependencies = [
 [[package]]
 name = "sled-hardware-types"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "illumos-utils",
  "omicron-common",
@@ -5878,7 +5918,7 @@ dependencies = [
  "futures",
  "lazy_static",
  "newtype_derive",
- "petgraph",
+ "petgraph 0.6.5",
  "schemars",
  "serde",
  "serde_json",
@@ -6114,7 +6154,7 @@ dependencies = [
  "getrandom 0.3.1",
  "once_cell",
  "rustix 1.0.2",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6173,11 +6213,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.11",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -6193,9 +6233,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.11"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6372,6 +6412,7 @@ dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
+ "tokio-util",
 ]
 
 [[package]]
@@ -6584,6 +6625,21 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
+[[package]]
+name = "tufaceous-artifact"
+version = "0.1.0"
+source = "git+https://github.com/oxidecomputer/tufaceous?branch=main#d2387032714f66e31b7e255d89f9bf6eb9b3a010"
+dependencies = [
+ "parse-display",
+ "proptest",
+ "schemars",
+ "semver 1.0.26",
+ "serde",
+ "serde_human_bytes",
+ "strum 0.26.3",
+ "test-strategy",
+]
+
 [[package]]
 name = "twox-hash"
 version = "2.1.0"
@@ -6629,7 +6685,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "regress 0.10.1",
+ "regress",
  "schemars",
  "semver 1.0.26",
  "serde",
@@ -6649,13 +6705,13 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "regress 0.10.1",
+ "regress",
  "schemars",
  "semver 1.0.26",
  "serde",
  "serde_json",
  "syn 2.0.99",
- "thiserror 2.0.11",
+ "thiserror 2.0.12",
  "unicode-ident",
 ]
 
@@ -6778,7 +6834,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 [[package]]
 name = "update-engine"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/omicron?branch=main#75214e1423796d7b885aa8a1981b43005b6cbf6a"
+source = "git+https://github.com/oxidecomputer/omicron?branch=main#52d7df46c6df67cfcbbe9a7cb0a3ae1f72c8a3ae"
 dependencies = [
  "anyhow",
  "cancel-safe-futures",
@@ -6793,7 +6849,7 @@ dependencies = [
  "linear-map",
  "omicron-workspace-hack",
  "owo-colors",
- "petgraph",
+ "petgraph 0.7.1",
  "schemars",
  "serde",
  "serde_json",
@@ -7567,6 +7623,15 @@ dependencies = [
  "zerocopy-derive 0.7.32",
 ]
 
+[[package]]
+name = "zerocopy"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+dependencies = [
+ "zerocopy-derive 0.8.23",
+]
+
 [[package]]
 name = "zerocopy-derive"
 version = "0.6.6"
@@ -7589,6 +7654,17 @@ dependencies = [
  "syn 2.0.99",
 ]
 
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.99",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.7.0"
diff --git a/Cargo.toml b/Cargo.toml
index c42dddeda..e648a9117 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -119,7 +119,8 @@ uuid = { version = "1", features = [ "serde", "v4" ] }
 dropshot = { version = "0.16.0", features = [ "usdt-probes" ] }
 omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 nexus-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
-internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
+internal-dns-resolver = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
+internal-dns-types = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 omicron-uuid-kinds = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
 oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
diff --git a/crutest/src/stats.rs b/crutest/src/stats.rs
index c70583aec..de7947804 100644
--- a/crutest/src/stats.rs
+++ b/crutest/src/stats.rs
@@ -34,7 +34,7 @@ pub fn client_oximeter(
     let config = Config {
         server_info,
         registration_address: Some(registration_address),
-        request_body_max_bytes: 2048,
+        default_request_body_max_bytes: 2048,
         log: LogConfig::Config(logging_config),
     };
 
diff --git a/downstairs/src/stats.rs b/downstairs/src/stats.rs
index ed6fa4638..231f32732 100644
--- a/downstairs/src/stats.rs
+++ b/downstairs/src/stats.rs
@@ -190,7 +190,7 @@ pub async fn ox_stats(
     let config = Config {
         server_info,
         registration_address: Some(registration_address),
-        request_body_max_bytes: 2048,
+        default_request_body_max_bytes: 2048,
         log: LogConfig::Config(logging_config),
     };
 
diff --git a/upstairs/Cargo.toml b/upstairs/Cargo.toml
index 0744d3ea1..91dacccbf 100644
--- a/upstairs/Cargo.toml
+++ b/upstairs/Cargo.toml
@@ -59,7 +59,8 @@ reqwest.workspace = true
 crucible-workspace-hack.workspace = true
 nexus-client.workspace = true
 omicron-uuid-kinds.workspace = true
-internal-dns.workspace = true
+internal-dns-resolver.workspace = true
+internal-dns-types.workspace = true
 
 [dev-dependencies]
 expectorate.workspace = true
diff --git a/upstairs/src/notify.rs b/upstairs/src/notify.rs
index 61c218b37..1c0eacd03 100644
--- a/upstairs/src/notify.rs
+++ b/upstairs/src/notify.rs
@@ -412,8 +412,8 @@ pub(crate) async fn get_nexus_client(
     client: reqwest::Client,
     addr: Ipv6Addr,
 ) -> Option<nexus_client::Client> {
-    use internal_dns::resolver::Resolver;
-    use internal_dns::ServiceName;
+    use internal_dns_resolver::Resolver;
+    use internal_dns_types::names::ServiceName;
 
     // Use any rack internal address for `Resolver::new_from_ip`, as that will
     // use the AZ_PREFIX to find internal DNS servers.

From f97cec98046223ddb58af06ce2781e9bf87fb3e2 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Wed, 19 Mar 2025 16:40:31 +0000
Subject: [PATCH 2/2] hakari!

---
 Cargo.lock                |  1 -
 workspace-hack/Cargo.toml | 19 ++++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a1a71dd1f..4dd9cb8a7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1365,7 +1365,6 @@ dependencies = [
  "usdt",
  "usdt-impl",
  "uuid",
- "zerocopy 0.7.32",
 ]
 
 [[package]]
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 7ca96a869..275d8a70a 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -24,13 +24,13 @@ clap_builder = { version = "4", default-features = false, features = ["cargo", "
 crossbeam-utils = { version = "0.8" }
 crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] }
 digest = { version = "0.10", features = ["mac", "std"] }
-either = { version = "1" }
+either = { version = "1", features = ["use_std"] }
 futures-channel = { version = "0.3", features = ["sink"] }
 futures-core = { version = "0.3" }
 futures-executor = { version = "0.3" }
 futures-sink = { version = "0.3" }
 futures-util = { version = "0.3", features = ["channel", "io", "sink"] }
-hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] }
+hashbrown = { version = "0.15" }
 hex = { version = "0.4", features = ["serde"] }
 indexmap = { version = "2", features = ["serde"] }
 libc = { version = "0.2", features = ["extra_traits"] }
@@ -47,7 +47,7 @@ rand_chacha = { version = "0.3" }
 regex-automata = { version = "0.4", default-features = false, features = ["dfa-onepass", "dfa-search", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] }
 regex-syntax = { version = "0.8" }
 reqwest = { version = "0.12", features = ["blocking", "json", "rustls-tls", "stream"] }
-schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
+schemars = { version = "0.8", features = ["bytes", "chrono", "semver", "uuid1"] }
 scopeguard = { version = "1" }
 semver = { version = "1", features = ["serde"] }
 serde = { version = "1", features = ["alloc", "derive", "rc"] }
@@ -63,7 +63,6 @@ tracing-core = { version = "0.1" }
 usdt = { version = "0.5" }
 usdt-impl = { version = "0.5", default-features = false, features = ["asm", "des"] }
 uuid = { version = "1", features = ["serde", "v4"] }
-zerocopy = { version = "0.7", features = ["derive", "simd"] }
 
 [build-dependencies]
 bitflags = { version = "2", default-features = false, features = ["serde"] }
@@ -75,12 +74,13 @@ clap_builder = { version = "4", default-features = false, features = ["cargo", "
 crossbeam-utils = { version = "0.8" }
 crypto-common = { version = "0.1", default-features = false, features = ["getrandom", "std"] }
 digest = { version = "0.10", features = ["mac", "std"] }
+either = { version = "1", features = ["use_std"] }
 futures-channel = { version = "0.3", features = ["sink"] }
 futures-core = { version = "0.3" }
 futures-executor = { version = "0.3" }
 futures-sink = { version = "0.3" }
 futures-util = { version = "0.3", features = ["channel", "io", "sink"] }
-hashbrown = { version = "0.15", default-features = false, features = ["default-hasher", "inline-more"] }
+hashbrown = { version = "0.15" }
 hex = { version = "0.4", features = ["serde"] }
 indexmap = { version = "2", features = ["serde"] }
 libc = { version = "0.2", features = ["extra_traits"] }
@@ -97,7 +97,7 @@ rand_chacha = { version = "0.3" }
 regex-automata = { version = "0.4", default-features = false, features = ["dfa-onepass", "dfa-search", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] }
 regex-syntax = { version = "0.8" }
 reqwest = { version = "0.12", features = ["blocking", "json", "rustls-tls", "stream"] }
-schemars = { version = "0.8", features = ["bytes", "chrono", "uuid1"] }
+schemars = { version = "0.8", features = ["bytes", "chrono", "semver", "uuid1"] }
 scopeguard = { version = "1" }
 semver = { version = "1", features = ["serde"] }
 serde = { version = "1", features = ["alloc", "derive", "rc"] }
@@ -114,7 +114,6 @@ tracing-core = { version = "0.1" }
 usdt = { version = "0.5" }
 usdt-impl = { version = "0.5", default-features = false, features = ["asm", "des"] }
 uuid = { version = "1", features = ["serde", "v4"] }
-zerocopy = { version = "0.7", features = ["derive", "simd"] }
 
 [target.x86_64-unknown-linux-gnu.dependencies]
 bitflags = { version = "2", default-features = false, features = ["std"] }
@@ -125,7 +124,6 @@ hyper-rustls = { version = "0.27", default-features = false, features = ["http1"
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
 nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }
@@ -139,7 +137,6 @@ hyper = { version = "1", features = ["full"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }
@@ -153,7 +150,6 @@ hyper-rustls = { version = "0.27", default-features = false, features = ["http1"
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
 nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 tokio-util = { version = "0.7", features = ["codec", "io"] }
@@ -165,7 +161,6 @@ hyper = { version = "1", features = ["full"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 tokio-util = { version = "0.7", features = ["codec", "io"] }
@@ -179,7 +174,6 @@ hyper-rustls = { version = "0.27", default-features = false, features = ["http1"
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
 nix = { version = "0.29", features = ["feature", "fs", "term", "uio"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }
@@ -194,7 +188,6 @@ hyper = { version = "1", features = ["full"] }
 hyper-rustls = { version = "0.27", default-features = false, features = ["http1", "http2", "ring", "tls12", "webpki-tokio"] }
 hyper-util = { version = "0.1", features = ["full"] }
 mio = { version = "1", features = ["net", "os-ext"] }
-once_cell = { version = "1", default-features = false, features = ["unstable"] }
 rustix = { version = "0.38", features = ["fs", "stdio", "termios"] }
 rustls-pki-types = { version = "1", features = ["std"] }
 spin = { version = "0.9", default-features = false, features = ["once", "spin_mutex"] }