From 8ae0833152dd4b01ad7426f5c931f1e74f99cbd4 Mon Sep 17 00:00:00 2001
From: iximeow <git@iximeow.net>
Date: Fri, 16 Aug 2024 03:40:56 +0000
Subject: [PATCH 01/28] [internal-dns] remove lookup_ipv6 in favor of
 lookup_socket_v6 (#6320)

`lookup_ipv6` is both buggy and easy to misuse:
* it sends an AAAA query for a domain which should have a SRV record
- this works only because
https://github.com/oxidecomputer/omicron/issues/4051 means the SRV
record is incorrectly returned, along with the actually-desired AAAA for
the SRV's target in Additionals
* it looks up an IPv6 address from a SRV record *but ignores the port*.
in places `lookup_ipv6` was used, it was paired consistently with the
hardcoded port NEXUS_INTERNAL_PORT and matched what should be in the
resolved SRV record. if we for example wanted to move Nexus' port (or
start a test Nexus on an atypical port), the authoritative port number
in the SRV response would be ignored for the hardcoded port.

lets just use the port that we told DNS we're at!

we may still want a bare IPv6 address for a service if we're going to
test network reachability, for example, but we're not doing that with
this function today. this all is distinct from helpers like
`lookup_all_ipv6`.

if we need a service's IPv6 address to use with an alternate port to
access a different API, we *probably* should have a distinct SRV record
for that lookup to use instead? i've found three instances of this:
* wicket assumes the techport proxy is on the same IP as Nexus' API, but that isn't necessarily true
* we assume the CRDB admin service listens on the same IP as CRDB itself, but that doesn't have to be true
* we look up addresses for MGS via `ServiceName::Dendrite`, but there's a
`ServiceName::ManagementGatewayService`, so either that's a typo or can be made to have its own SRV records

there are some uses of `lookup_all_ipv6` that make a lot of sense still,
where we're discovering the rack's network and _really_ do not care
about the port that Dendrite happens to be on.
---
 internal-dns/src/resolver.rs    | 73 ++++++++++++++-------------------
 oximeter/collector/src/agent.rs |  8 +---
 oximeter/collector/src/lib.rs   | 17 ++++----
 3 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/internal-dns/src/resolver.rs b/internal-dns/src/resolver.rs
index b3dadf16d2..5d3832a417 100644
--- a/internal-dns/src/resolver.rs
+++ b/internal-dns/src/resolver.rs
@@ -160,27 +160,6 @@ impl Resolver {
         self.resolver.clear_cache();
     }
 
-    /// Looks up a single [`Ipv6Addr`] based on the SRV name.
-    /// Returns an error if the record does not exist.
-    // TODO: There are lots of ways this API can expand: Caching,
-    // actually respecting TTL, looking up ports, etc.
-    //
-    // For now, however, it serves as a very simple "get everyone using DNS"
-    // API that can be improved upon later.
-    pub async fn lookup_ipv6(
-        &self,
-        srv: crate::ServiceName,
-    ) -> Result<Ipv6Addr, ResolveError> {
-        let name = srv.srv_name();
-        debug!(self.log, "lookup_ipv6 srv"; "dns_name" => &name);
-        let response = self.resolver.ipv6_lookup(&name).await?;
-        let address = response
-            .iter()
-            .next()
-            .ok_or_else(|| ResolveError::NotFound(srv))?;
-        Ok(address.0)
-    }
-
     /// Returns the targets of the SRV records for a DNS name
     ///
     /// The returned values are generally other DNS names that themselves would
@@ -235,6 +214,12 @@ impl Resolver {
     // TODO-robustness: any callers of this should probably be using
     // all the targets for a given SRV and not just the first one
     // we get, see [`Resolver::lookup_all_socket_v6`].
+    //
+    // TODO: There are lots of ways this API can expand: Caching,
+    // actually respecting TTL, looking up ports, etc.
+    //
+    // For now, however, it serves as a very simple "get everyone using DNS"
+    // API that can be improved upon later.
     pub async fn lookup_socket_v6(
         &self,
         service: crate::ServiceName,
@@ -549,11 +534,11 @@ mod test {
         dns_server.update(&dns_config).await.unwrap();
 
         let resolver = dns_server.resolver().unwrap();
-        let found_ip = resolver
-            .lookup_ipv6(ServiceName::Cockroach)
+        let found_addr = resolver
+            .lookup_socket_v6(ServiceName::Cockroach)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(found_ip, ip,);
+        assert_eq!(found_addr.ip(), &ip,);
 
         dns_server.cleanup_successful();
         logctx.cleanup_successful();
@@ -631,11 +616,13 @@ mod test {
 
         // Look up Cockroach
         let resolver = dns_server.resolver().unwrap();
-        let ip = resolver
-            .lookup_ipv6(ServiceName::Cockroach)
+        let resolved_addr = resolver
+            .lookup_socket_v6(ServiceName::Cockroach)
             .await
             .expect("Should have been able to look up IP address");
-        assert!(cockroach_addrs.iter().any(|addr| addr.ip() == &ip));
+        assert!(cockroach_addrs
+            .iter()
+            .any(|addr| addr.ip() == resolved_addr.ip()));
 
         // Look up all the Cockroach addresses.
         let mut ips =
@@ -649,18 +636,18 @@ mod test {
         );
 
         // Look up Clickhouse
-        let ip = resolver
-            .lookup_ipv6(ServiceName::Clickhouse)
+        let addr = resolver
+            .lookup_socket_v6(ServiceName::Clickhouse)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(&ip, clickhouse_addr.ip());
+        assert_eq!(addr.ip(), clickhouse_addr.ip());
 
         // Look up Backend Service
-        let ip = resolver
-            .lookup_ipv6(srv_backend)
+        let addr = resolver
+            .lookup_socket_v6(srv_backend)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(&ip, crucible_addr.ip());
+        assert_eq!(addr.ip(), crucible_addr.ip());
 
         // If we deploy a new generation that removes all records, then we don't
         // find anything any more.
@@ -671,7 +658,7 @@ mod test {
         // If we remove the records for all services, we won't find them any
         // more.  (e.g., there's no hidden caching going on)
         let error = resolver
-            .lookup_ipv6(ServiceName::Cockroach)
+            .lookup_socket_v6(ServiceName::Cockroach)
             .await
             .expect_err("unexpectedly found records");
         assert_matches!(
@@ -708,11 +695,11 @@ mod test {
         dns_builder.service_backend_zone(srv_crdb, &zone, 12345).unwrap();
         let dns_config = dns_builder.build_full_config_for_initial_generation();
         dns_server.update(&dns_config).await.unwrap();
-        let found_ip = resolver
-            .lookup_ipv6(ServiceName::Cockroach)
+        let found_addr = resolver
+            .lookup_socket_v6(ServiceName::Cockroach)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(found_ip, ip1);
+        assert_eq!(found_addr.ip(), &ip1);
 
         // If we insert the same record with a new address, it should be
         // updated.
@@ -726,11 +713,11 @@ mod test {
             dns_builder.build_full_config_for_initial_generation();
         dns_config.generation += 1;
         dns_server.update(&dns_config).await.unwrap();
-        let found_ip = resolver
-            .lookup_ipv6(ServiceName::Cockroach)
+        let found_addr = resolver
+            .lookup_socket_v6(ServiceName::Cockroach)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(found_ip, ip2);
+        assert_eq!(found_addr.ip(), &ip2);
 
         dns_server.cleanup_successful();
         logctx.cleanup_successful();
@@ -861,11 +848,11 @@ mod test {
         dns_server.update(&dns_config).await.unwrap();
 
         // Confirm that we can access this record manually.
-        let found_ip = resolver
-            .lookup_ipv6(ServiceName::Nexus)
+        let found_addr = resolver
+            .lookup_socket_v6(ServiceName::Nexus)
             .await
             .expect("Should have been able to look up IP address");
-        assert_eq!(found_ip, ip);
+        assert_eq!(found_addr.ip(), &ip);
 
         // Confirm that the progenitor client can access this record too.
         let value = client.test_endpoint().await.unwrap();
diff --git a/oximeter/collector/src/agent.rs b/oximeter/collector/src/agent.rs
index 5da9a1dfa8..8271b2e068 100644
--- a/oximeter/collector/src/agent.rs
+++ b/oximeter/collector/src/agent.rs
@@ -18,7 +18,6 @@ use internal_dns::resolver::Resolver;
 use internal_dns::ServiceName;
 use nexus_client::types::IdSortMode;
 use omicron_common::address::CLICKHOUSE_PORT;
-use omicron_common::address::NEXUS_INTERNAL_PORT;
 use omicron_common::backoff;
 use omicron_common::backoff::BackoffError;
 use oximeter::types::ProducerResults;
@@ -816,7 +815,7 @@ async fn refresh_producer_list(agent: OximeterAgent, resolver: Resolver) {
 async fn resolve_nexus_with_backoff(
     log: &Logger,
     resolver: &Resolver,
-) -> SocketAddr {
+) -> SocketAddrV6 {
     let log_failure = |error, delay| {
         warn!(
             log,
@@ -827,12 +826,9 @@ async fn resolve_nexus_with_backoff(
     };
     let do_lookup = || async {
         resolver
-            .lookup_ipv6(ServiceName::Nexus)
+            .lookup_socket_v6(ServiceName::Nexus)
             .await
             .map_err(|e| BackoffError::transient(e.to_string()))
-            .map(|ip| {
-                SocketAddr::V6(SocketAddrV6::new(ip, NEXUS_INTERNAL_PORT, 0, 0))
-            })
     };
     backoff::retry_notify(
         backoff::retry_policy_internal_service(),
diff --git a/oximeter/collector/src/lib.rs b/oximeter/collector/src/lib.rs
index 02bf9152f4..7dd423d074 100644
--- a/oximeter/collector/src/lib.rs
+++ b/oximeter/collector/src/lib.rs
@@ -14,7 +14,6 @@ use dropshot::HttpServerStarter;
 use internal_dns::resolver::ResolveError;
 use internal_dns::resolver::Resolver;
 use internal_dns::ServiceName;
-use omicron_common::address::NEXUS_INTERNAL_PORT;
 use omicron_common::api::internal::nexus::ProducerEndpoint;
 use omicron_common::backoff;
 use omicron_common::FileKv;
@@ -251,14 +250,14 @@ impl Oximeter {
             let nexus_address = if let Some(address) = config.nexus_address {
                 address
             } else {
-                SocketAddr::V6(SocketAddrV6::new(
-                    resolver.lookup_ipv6(ServiceName::Nexus).await.map_err(
-                        |e| backoff::BackoffError::transient(e.to_string()),
-                    )?,
-                    NEXUS_INTERNAL_PORT,
-                    0,
-                    0,
-                ))
+                SocketAddr::V6(
+                    resolver
+                        .lookup_socket_v6(ServiceName::Nexus)
+                        .await
+                        .map_err(|e| {
+                            backoff::BackoffError::transient(e.to_string())
+                        })?,
+                )
             };
             let client = nexus_client::Client::new(
                 &format!("http://{nexus_address}"),

From d7d4beaf0dbfa82c6ae0da10a6ce43b3c5a89142 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 04:47:25 +0000
Subject: [PATCH 02/28] Update Rust crate tokio to 1.39.2 (#6249)

---
 Cargo.lock                | 15 +++++++--------
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml | 20 ++++++++++----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5fd17fd158..f561aed2ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6488,7 +6488,7 @@ dependencies = [
  "log",
  "managed",
  "memchr",
- "mio 0.8.11",
+ "mio 1.0.2",
  "nix 0.28.0",
  "nom",
  "num-bigint-dig",
@@ -10546,28 +10546,27 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.38.1"
+version = "1.39.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df"
+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio 0.8.11",
- "num_cpus",
+ "mio 1.0.2",
  "parking_lot 0.12.2",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 2bb189b6c0..1b62af959d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -568,7 +568,7 @@ textwrap = "0.16.1"
 test-strategy = "0.3.1"
 thiserror = "1.0"
 tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
-tokio = "1.38.1"
+tokio = "1.39.2"
 tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
 tokio-stream = "0.1.15"
 tokio-tungstenite = "0.20"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 5edfbccf93..7983c38052 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -107,7 +107,7 @@ string_cache = { version = "0.8.7" }
 subtle = { version = "2.5.0" }
 syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
-tokio = { version = "1.38.1", features = ["full", "test-util"] }
+tokio = { version = "1.39.2", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.15", features = ["net"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
@@ -216,7 +216,7 @@ syn-dff4ba8e3ae991db = { package = "syn", version = "1.0.109", features = ["extr
 syn-f595c2ba2a3f28df = { package = "syn", version = "2.0.74", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
 time = { version = "0.3.36", features = ["formatting", "local-offset", "macros", "parsing"] }
 time-macros = { version = "0.2.18", default-features = false, features = ["formatting", "parsing"] }
-tokio = { version = "1.38.1", features = ["full", "test-util"] }
+tokio = { version = "1.39.2", features = ["full", "test-util"] }
 tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 tokio-stream = { version = "0.1.15", features = ["net"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
@@ -235,7 +235,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
 [target.x86_64-unknown-linux-gnu.dependencies]
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
@@ -244,35 +244,35 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 [target.x86_64-unknown-linux-gnu.build-dependencies]
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
 linux-raw-sys = { version = "0.4.13", default-features = false, features = ["elf", "errno", "general", "ioctl", "no_std", "std", "system"] }
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-apple-darwin.dependencies]
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.x86_64-apple-darwin.build-dependencies]
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.aarch64-apple-darwin.dependencies]
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
 
 [target.aarch64-apple-darwin.build-dependencies]
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
@@ -280,7 +280,7 @@ signal-hook-mio = { version = "0.2.4", default-features = false, features = ["su
 
 [target.x86_64-unknown-illumos.dependencies]
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
@@ -290,7 +290,7 @@ toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", featu
 
 [target.x86_64-unknown-illumos.build-dependencies]
 dof = { version = "0.3.0", default-features = false, features = ["des"] }
-mio = { version = "0.8.11", features = ["net", "os-ext"] }
+mio = { version = "1.0.2", features = ["net", "os-ext"] }
 nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signal", "term", "uio"] }
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }

From 3c585f2180f149c532e268eaaed17329fdc935e4 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 06:22:35 +0000
Subject: [PATCH 03/28] Update Rust crate camino to v1.1.8 (#6357)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f561aed2ae..a62b4e2983 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -815,9 +815,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "3054fea8a20d8ff3968d5b22cc27501d2b08dc4decdb31b184323f00c5ef23bb"
 dependencies = [
  "serde",
 ]

From a7885d1da2e2f60c2cc648d9b80d25c1216fde3b Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 10:41:12 -0700
Subject: [PATCH 04/28] Update Rust crate clap to v4.5.16 (#6360)

---
 Cargo.lock                | 4 ++--
 workspace-hack/Cargo.toml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a62b4e2983..849c82f1f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1074,9 +1074,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.15"
+version = "4.5.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc"
+checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
 dependencies = [
  "clap_builder",
  "clap_derive",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 7983c38052..5dc3bc11e7 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -33,7 +33,7 @@ byteorder = { version = "1.5.0" }
 bytes = { version = "1.7.1", features = ["serde"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 cipher = { version = "0.4.4", default-features = false, features = ["block-padding", "zeroize"] }
-clap = { version = "4.5.15", features = ["cargo", "derive", "env", "wrap_help"] }
+clap = { version = "4.5.16", features = ["cargo", "derive", "env", "wrap_help"] }
 clap_builder = { version = "4.5.15", default-features = false, features = ["cargo", "color", "env", "std", "suggestions", "usage", "wrap_help"] }
 console = { version = "0.15.8" }
 const-oid = { version = "0.9.6", default-features = false, features = ["db", "std"] }
@@ -140,7 +140,7 @@ bytes = { version = "1.7.1", features = ["serde"] }
 cc = { version = "1.0.97", default-features = false, features = ["parallel"] }
 chrono = { version = "0.4.38", features = ["serde"] }
 cipher = { version = "0.4.4", default-features = false, features = ["block-padding", "zeroize"] }
-clap = { version = "4.5.15", features = ["cargo", "derive", "env", "wrap_help"] }
+clap = { version = "4.5.16", features = ["cargo", "derive", "env", "wrap_help"] }
 clap_builder = { version = "4.5.15", default-features = false, features = ["cargo", "color", "env", "std", "suggestions", "usage", "wrap_help"] }
 console = { version = "0.15.8" }
 const-oid = { version = "0.9.6", default-features = false, features = ["db", "std"] }

From 921ec6d58ca1e0f5797924050e585bb7803618db Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 16 Aug 2024 15:04:19 -0700
Subject: [PATCH 05/28] remove redundant background task log entries (#6323)

---
 nexus/src/app/background/tasks/lookup_region_port.rs  |  3 ---
 nexus/src/app/background/tasks/phantom_disks.rs       |  4 +---
 .../app/background/tasks/physical_disk_adoption.rs    |  3 ---
 nexus/src/app/background/tasks/region_replacement.rs  |  3 ---
 .../app/background/tasks/region_replacement_driver.rs |  5 -----
 .../region_snapshot_replacement_garbage_collect.rs    | 11 -----------
 .../tasks/region_snapshot_replacement_start.rs        |  5 -----
 7 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/nexus/src/app/background/tasks/lookup_region_port.rs b/nexus/src/app/background/tasks/lookup_region_port.rs
index fbfc5c5af2..df501fe6b1 100644
--- a/nexus/src/app/background/tasks/lookup_region_port.rs
+++ b/nexus/src/app/background/tasks/lookup_region_port.rs
@@ -53,7 +53,6 @@ impl BackgroundTask for LookupRegionPort {
     ) -> BoxFuture<'a, serde_json::Value> {
         async {
             let log = &opctx.log;
-            info!(&log, "lookup region port task started");
 
             let mut status = LookupRegionPortStatus::default();
 
@@ -147,8 +146,6 @@ impl BackgroundTask for LookupRegionPort {
                 }
             }
 
-            info!(&log, "lookup region port task done");
-
             json!(status)
         }
         .boxed()
diff --git a/nexus/src/app/background/tasks/phantom_disks.rs b/nexus/src/app/background/tasks/phantom_disks.rs
index 4b0d8bec38..7f3fceab1c 100644
--- a/nexus/src/app/background/tasks/phantom_disks.rs
+++ b/nexus/src/app/background/tasks/phantom_disks.rs
@@ -43,7 +43,6 @@ impl BackgroundTask for PhantomDiskDetector {
     ) -> BoxFuture<'a, serde_json::Value> {
         async {
             let log = &opctx.log;
-            warn!(&log, "phantom disk task started");
 
             let phantom_disks = match self.datastore.find_phantom_disks().await
             {
@@ -83,14 +82,13 @@ impl BackgroundTask for PhantomDiskDetector {
                 } else {
                     info!(
                         &log,
-                        "phandom disk {} un-deleted andset to faulted ok",
+                        "phandom disk {} un-deleted and set to faulted ok",
                         disk.id(),
                     );
                     phantom_disk_deleted_ok += 1;
                 }
             }
 
-            warn!(&log, "phantom disk task done");
             json!({
                 "phantom_disk_deleted_ok": phantom_disk_deleted_ok,
                 "phantom_disk_deleted_err": phantom_disk_deleted_err,
diff --git a/nexus/src/app/background/tasks/physical_disk_adoption.rs b/nexus/src/app/background/tasks/physical_disk_adoption.rs
index f3b9e8ac62..b1eceed0b6 100644
--- a/nexus/src/app/background/tasks/physical_disk_adoption.rs
+++ b/nexus/src/app/background/tasks/physical_disk_adoption.rs
@@ -96,8 +96,6 @@ impl BackgroundTask for PhysicalDiskAdoption {
             }
 
             let mut disks_added = 0;
-            let log = &opctx.log;
-            warn!(&log, "physical disk adoption task started");
 
             let collection_id = *self.rx_inventory_collection.borrow();
             let Some(collection_id) = collection_id else {
@@ -171,7 +169,6 @@ impl BackgroundTask for PhysicalDiskAdoption {
                 );
             }
 
-            warn!(&log, "physical disk adoption task done");
             json!({
                 "physical_disks_added": disks_added,
             })
diff --git a/nexus/src/app/background/tasks/region_replacement.rs b/nexus/src/app/background/tasks/region_replacement.rs
index f852f21734..ba0e7f86fb 100644
--- a/nexus/src/app/background/tasks/region_replacement.rs
+++ b/nexus/src/app/background/tasks/region_replacement.rs
@@ -61,7 +61,6 @@ impl BackgroundTask for RegionReplacementDetector {
     ) -> BoxFuture<'a, serde_json::Value> {
         async {
             let log = &opctx.log;
-            warn!(&log, "region replacement task started");
 
             let mut ok = 0;
             let mut err = 0;
@@ -182,8 +181,6 @@ impl BackgroundTask for RegionReplacementDetector {
                 }
             }
 
-            warn!(&log, "region replacement task done");
-
             json!({
                 "region_replacement_started_ok": ok,
                 "region_replacement_started_err": err,
diff --git a/nexus/src/app/background/tasks/region_replacement_driver.rs b/nexus/src/app/background/tasks/region_replacement_driver.rs
index 284ed2c368..02db86eab3 100644
--- a/nexus/src/app/background/tasks/region_replacement_driver.rs
+++ b/nexus/src/app/background/tasks/region_replacement_driver.rs
@@ -227,16 +227,11 @@ impl BackgroundTask for RegionReplacementDriver {
         opctx: &'a OpContext,
     ) -> BoxFuture<'a, serde_json::Value> {
         async {
-            let log = &opctx.log;
-            info!(&log, "region replacement driver task started");
-
             let mut status = RegionReplacementDriverStatus::default();
 
             self.drive_running_replacements_forward(opctx, &mut status).await;
             self.complete_done_replacements(opctx, &mut status).await;
 
-            info!(&log, "region replacement driver task done");
-
             json!(status)
         }
         .boxed()
diff --git a/nexus/src/app/background/tasks/region_snapshot_replacement_garbage_collect.rs b/nexus/src/app/background/tasks/region_snapshot_replacement_garbage_collect.rs
index 4c66c166ff..77dc87c060 100644
--- a/nexus/src/app/background/tasks/region_snapshot_replacement_garbage_collect.rs
+++ b/nexus/src/app/background/tasks/region_snapshot_replacement_garbage_collect.rs
@@ -129,12 +129,6 @@ impl BackgroundTask for RegionSnapshotReplacementGarbageCollect {
         opctx: &'a OpContext,
     ) -> BoxFuture<'a, serde_json::Value> {
         async move {
-            let log = &opctx.log;
-            info!(
-                &log,
-                "region snapshot replacement garbage collect task started",
-            );
-
             let mut status =
                 RegionSnapshotReplacementGarbageCollectStatus::default();
 
@@ -144,11 +138,6 @@ impl BackgroundTask for RegionSnapshotReplacementGarbageCollect {
             )
             .await;
 
-            info!(
-                &log,
-                "region snapshot replacement garbage collect task done"
-            );
-
             json!(status)
         }
         .boxed()
diff --git a/nexus/src/app/background/tasks/region_snapshot_replacement_start.rs b/nexus/src/app/background/tasks/region_snapshot_replacement_start.rs
index 9bc66d48c8..1fdc17690d 100644
--- a/nexus/src/app/background/tasks/region_snapshot_replacement_start.rs
+++ b/nexus/src/app/background/tasks/region_snapshot_replacement_start.rs
@@ -232,9 +232,6 @@ impl BackgroundTask for RegionSnapshotReplacementDetector {
         opctx: &'a OpContext,
     ) -> BoxFuture<'a, serde_json::Value> {
         async {
-            let log = &opctx.log;
-            info!(&log, "region snapshot replacement start task started");
-
             let mut status = RegionSnapshotReplacementStartStatus::default();
 
             self.create_requests_for_region_snapshots_on_expunged_disks(
@@ -249,8 +246,6 @@ impl BackgroundTask for RegionSnapshotReplacementDetector {
             )
             .await;
 
-            info!(&log, "region snapshot replacement start task done");
-
             json!(status)
         }
         .boxed()

From 6bb3c13e79488efccd39b6daa8f9def6a727616f Mon Sep 17 00:00:00 2001
From: David Crespo <david-crespo@users.noreply.github.com>
Date: Fri, 16 Aug 2024 17:09:48 -0500
Subject: [PATCH 06/28] Bump web console (vpc routers + routes, instance
 polling, edit quotas) (#6366)

https://github.com/oxidecomputer/console/compare/17ae890c...33b7a505

* [33b7a505](https://github.com/oxidecomputer/console/commit/33b7a505)
oxidecomputer/console#2360
* [1a2cb52d](https://github.com/oxidecomputer/console/commit/1a2cb52d)
oxidecomputer/console#2369
* [9e831174](https://github.com/oxidecomputer/console/commit/9e831174)
oxidecomputer/console#2374
* [e30f2eb8](https://github.com/oxidecomputer/console/commit/e30f2eb8)
oxidecomputer/console#2373
* [bb53f1b2](https://github.com/oxidecomputer/console/commit/bb53f1b2)
oxidecomputer/console#2371
* [29398e74](https://github.com/oxidecomputer/console/commit/29398e74)
oxidecomputer/console#2343
* [68e2dc89](https://github.com/oxidecomputer/console/commit/68e2dc89)
oxidecomputer/console#2359
* [11e29ed8](https://github.com/oxidecomputer/console/commit/11e29ed8)
bump omicron to latest main
* [b6ed3757](https://github.com/oxidecomputer/console/commit/b6ed3757)
oxidecomputer/console#2370
* [af6c1f4a](https://github.com/oxidecomputer/console/commit/af6c1f4a)
oxidecomputer/console#2368
* [60ef745c](https://github.com/oxidecomputer/console/commit/60ef745c)
disallow unreachable code in ts config, fix one case of it
* [3a6f815a](https://github.com/oxidecomputer/console/commit/3a6f815a)
oxidecomputer/console#2364
* [80b3f2f3](https://github.com/oxidecomputer/console/commit/80b3f2f3)
oxidecomputer/console#2366
* [dab60d9d](https://github.com/oxidecomputer/console/commit/dab60d9d)
oxidecomputer/console#2358
* [8e3314f1](https://github.com/oxidecomputer/console/commit/8e3314f1)
oxidecomputer/console#2362
* [9b5cdfa0](https://github.com/oxidecomputer/console/commit/9b5cdfa0)
bump TS generator for bugfix (just adds whitespace)
* [07b6c151](https://github.com/oxidecomputer/console/commit/07b6c151)
oxidecomputer/console#2349
* [d32fddc2](https://github.com/oxidecomputer/console/commit/d32fddc2)
Revert "Focus confirm button instead of cancel in modals
(oxidecomputer/console#2340)"
* [84a1501e](https://github.com/oxidecomputer/console/commit/84a1501e)
oxidecomputer/console#2341
* [6615cb6b](https://github.com/oxidecomputer/console/commit/6615cb6b)
oxidecomputer/console#2340
* [e48b0096](https://github.com/oxidecomputer/console/commit/e48b0096)
delete unused vscode tasks
* [22a6c50f](https://github.com/oxidecomputer/console/commit/22a6c50f)
tighten TypeValueCell spacing
* [4eacb3d7](https://github.com/oxidecomputer/console/commit/4eacb3d7)
oxidecomputer/console#2338
* [f278a747](https://github.com/oxidecomputer/console/commit/f278a747)
oxidecomputer/console#2332
* [016ad1b4](https://github.com/oxidecomputer/console/commit/016ad1b4)
oxidecomputer/console#2337
* [2d1a22a2](https://github.com/oxidecomputer/console/commit/2d1a22a2)
oxidecomputer/console#2336
* [be0f087f](https://github.com/oxidecomputer/console/commit/be0f087f)
oxidecomputer/console#2329
---
 tools/console_version | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/console_version b/tools/console_version
index 4f67064733..994d30396b 100644
--- a/tools/console_version
+++ b/tools/console_version
@@ -1,2 +1,2 @@
-COMMIT="17ae890c68a5277fbefe773694e790a8f1b178b4"
-SHA2="273a31ba14546305bfafeb9aedb2d9a7530328a0359cda363380c9ca3240b948"
+COMMIT="33b7a505a222b258a155636e8ee79c7ee3c132d2"
+SHA2="f9089e18d52d7a54149b364a0b3ae4efba421c13eca6f7752a23b74dc3fa1a8e"

From c86ff799803a918d858b744478af3100de7d927c Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 16 Aug 2024 15:56:32 -0700
Subject: [PATCH 07/28] clear `OMDB_` environment variables when running omdb
 tests (#6368)

---
 dev-tools/omdb/tests/test_all_output.rs | 24 ++++++++++++++++++++++++
 nexus/test-utils/src/lib.rs             |  1 +
 2 files changed, 25 insertions(+)

diff --git a/dev-tools/omdb/tests/test_all_output.rs b/dev-tools/omdb/tests/test_all_output.rs
index 45492c14ce..1afee71122 100644
--- a/dev-tools/omdb/tests/test_all_output.rs
+++ b/dev-tools/omdb/tests/test_all_output.rs
@@ -56,6 +56,7 @@ fn assert_oximeter_list_producers_output(
 
 #[tokio::test]
 async fn test_omdb_usage_errors() {
+    clear_omdb_env();
     let cmd_path = path_to_executable(CMD_OMDB);
     let mut output = String::new();
     let invocations: &[&[&'static str]] = &[
@@ -111,6 +112,8 @@ async fn test_omdb_usage_errors() {
 
 #[nexus_test]
 async fn test_omdb_success_cases(cptestctx: &ControlPlaneTestContext) {
+    clear_omdb_env();
+
     let gwtestctx = gateway_test_utils::setup::test_setup(
         "test_omdb_success_case",
         gateway_messages::SpPort::One,
@@ -271,6 +274,8 @@ async fn test_omdb_success_cases(cptestctx: &ControlPlaneTestContext) {
 /// that's covered by the success tests above.
 #[nexus_test]
 async fn test_omdb_env_settings(cptestctx: &ControlPlaneTestContext) {
+    clear_omdb_env();
+
     let cmd_path = path_to_executable(CMD_OMDB);
     let postgres_url = cptestctx.database.listen_url().to_string();
     let nexus_internal_url =
@@ -504,3 +509,22 @@ async fn do_run_extra<F>(
 
     write!(output, "=============================================\n").unwrap();
 }
+
+// We're testing behavior that can be affected by OMDB-related environment
+// variables.  Clear all of them from the current process so that all child
+// processes don't have them.  OMDB environment variables can affect even the
+// help output provided by clap.  See clap-rs/clap#5673 for an example.
+fn clear_omdb_env() {
+    // Rust documents that it's not safe to manipulate the environment in a
+    // multi-threaded process outside of Windows because it's possible that
+    // other threads are reading or writing the environment and most systems do
+    // not support this.  On illumos, the underlying interfaces are broadly
+    // thread-safe.  Further, Omicron only supports running tests under `cargo
+    // nextest`, in which case there are no threads running concurrently here
+    // that may be reading or modifying the environment.
+    for (env_var, _) in std::env::vars().filter(|(k, _)| k.starts_with("OMDB_"))
+    {
+        eprintln!("removing {:?} from environment", env_var);
+        std::env::remove_var(env_var);
+    }
+}
diff --git a/nexus/test-utils/src/lib.rs b/nexus/test-utils/src/lib.rs
index 3dcffb399b..ea46f2d017 100644
--- a/nexus/test-utils/src/lib.rs
+++ b/nexus/test-utils/src/lib.rs
@@ -4,6 +4,7 @@
 
 //! Integration testing facilities for Nexus
 
+#[cfg(feature = "omicron-dev")]
 use anyhow::Context;
 use anyhow::Result;
 use camino::Utf8Path;

From f334531ecf2c570fa1be931fcb518911bc2b6e1c Mon Sep 17 00:00:00 2001
From: Benjamin Naecker <ben@oxide.computer>
Date: Fri, 16 Aug 2024 16:19:35 -0700
Subject: [PATCH 08/28] Make OxQL UUID parsing case-insensitive (#6359)

Fixes #6358
---
 oximeter/db/src/oxql/ast/grammar.rs | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/oximeter/db/src/oxql/ast/grammar.rs b/oximeter/db/src/oxql/ast/grammar.rs
index a7585402b6..cbca4470f9 100644
--- a/oximeter/db/src/oxql/ast/grammar.rs
+++ b/oximeter/db/src/oxql/ast/grammar.rs
@@ -189,11 +189,11 @@ peg::parser! {
         rule dashed_uuid_literal() -> Uuid
             = s:$(
                 "\""
-                ['a'..='f' | '0'..='9']*<8> "-"
-                ['a'..='f' | '0'..='9']*<4> "-"
-                ['a'..='f' | '0'..='9']*<4> "-"
-                ['a'..='f' | '0'..='9']*<4> "-"
-                ['a'..='f' | '0'..='9']*<12>
+                ['a'..='f' | 'A'..='F' | '0'..='9']*<8> "-"
+                ['a'..='f' | 'A'..='F' | '0'..='9']*<4> "-"
+                ['a'..='f' | 'A'..='F' | '0'..='9']*<4> "-"
+                ['a'..='f' | 'A'..='F' | '0'..='9']*<4> "-"
+                ['a'..='f' | 'A'..='F' | '0'..='9']*<12>
                 "\""
             ) {?
                 let Some(middle) = s.get(1..37) else {
@@ -202,7 +202,7 @@ peg::parser! {
                 middle.parse().or(Err("invalid UUID literal"))
             }
         rule undashed_uuid_literal() -> Uuid
-            = s:$("\"" ['a'..='f' | '0'..='9']*<32> "\"") {?
+            = s:$("\"" ['a'..='f' | 'A'..='F' | '0'..='9']*<32> "\"") {?
             let Some(middle) = s.get(1..33) else {
                 return Err("invalid UUID literal");
             };
@@ -734,6 +734,15 @@ mod tests {
         .is_err());
     }
 
+    #[test]
+    fn test_uuid_literal_is_case_insensitive() {
+        const ID: Uuid = uuid::uuid!("880D82A1-102F-4699-BE1A-7E2A6A469E8E");
+        let as_str = format!("\"{ID}\"");
+        let as_lower = as_str.to_lowercase();
+        assert_eq!(query_parser::uuid_literal_impl(&as_str).unwrap(), ID,);
+        assert_eq!(query_parser::uuid_literal_impl(&as_lower).unwrap(), ID,);
+    }
+
     #[test]
     fn test_integer_literal() {
         assert_eq!(query_parser::integer_literal_impl("1").unwrap(), 1);

From c28455a0625704a9b9af874cbb40202fe5429166 Mon Sep 17 00:00:00 2001
From: Eliza Weisman <eliza@elizas.website>
Date: Fri, 16 Aug 2024 16:22:35 -0700
Subject: [PATCH 09/28] [oximeter] Use `fmt::Display` for TOML errors (#6365)

---
 oximeter/timeseries-macro/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/oximeter/timeseries-macro/src/lib.rs b/oximeter/timeseries-macro/src/lib.rs
index 317a8533a4..0c70e73445 100644
--- a/oximeter/timeseries-macro/src/lib.rs
+++ b/oximeter/timeseries-macro/src/lib.rs
@@ -59,9 +59,8 @@ pub fn use_timeseries(
                 Err(e) => {
                     let msg = format!(
                         "Failed to generate timeseries types \
-                        from '{}': {:?}",
+                        from '{}': {e}",
                         path.display(),
-                        e,
                     );
                     return syn::Error::new(token.span(), msg)
                         .into_compile_error()

From 8e4ac4cf1a1f255f8bde4532de42fa38102b44e2 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 16 Aug 2024 16:37:00 -0700
Subject: [PATCH 10/28] re-assign sagas from expunged Nexus instances (#6215)

---
 nexus/db-queries/src/db/datastore/saga.rs     | 249 ++++++++++++++++--
 nexus/db-queries/src/db/sec_store.rs          |   9 +-
 .../execution/src/cockroachdb.rs              |   3 +-
 nexus/reconfigurator/execution/src/dns.rs     |  10 +-
 nexus/reconfigurator/execution/src/lib.rs     |  61 +++--
 nexus/reconfigurator/execution/src/sagas.rs   |  71 +++++
 nexus/src/app/background/init.rs              |   3 +-
 .../background/tasks/blueprint_execution.rs   |  34 ++-
 8 files changed, 376 insertions(+), 64 deletions(-)
 create mode 100644 nexus/reconfigurator/execution/src/sagas.rs

diff --git a/nexus/db-queries/src/db/datastore/saga.rs b/nexus/db-queries/src/db/datastore/saga.rs
index 939929e665..0b626804e1 100644
--- a/nexus/db-queries/src/db/datastore/saga.rs
+++ b/nexus/db-queries/src/db/datastore/saga.rs
@@ -9,7 +9,6 @@ use super::SQL_BATCH_SIZE;
 use crate::db;
 use crate::db::error::public_error_from_diesel;
 use crate::db::error::ErrorHandler;
-use crate::db::model::Generation;
 use crate::db::pagination::paginated;
 use crate::db::pagination::paginated_multicolumn;
 use crate::db::pagination::Paginator;
@@ -17,10 +16,12 @@ use crate::db::update_and_check::UpdateAndCheck;
 use crate::db::update_and_check::UpdateStatus;
 use async_bb8_diesel::AsyncRunQueryDsl;
 use diesel::prelude::*;
+use nexus_auth::authz;
 use nexus_auth::context::OpContext;
 use omicron_common::api::external::Error;
 use omicron_common::api::external::LookupType;
 use omicron_common::api::external::ResourceType;
+use std::ops::Add;
 
 impl DataStore {
     pub async fn saga_create(
@@ -80,21 +81,15 @@ impl DataStore {
     /// now, we're implementing saga adoption only in cases where the original
     /// SEC/Nexus has been expunged.)
     ///
-    /// However, in the future, it may be possible for multiple SECs to try and
-    /// update the same saga, and overwrite each other's state. For example,
-    /// one SEC might try and update the state to Running while the other one
-    /// updates it to Done. That case would have to be carefully considered and
-    /// tested here, probably using the (currently unused)
-    /// `current_adopt_generation` field to enable optimistic concurrency.
-    ///
-    /// To reiterate, we are *not* considering the case where several SECs try
-    /// to update the same saga. That will be a future enhancement.
+    /// It's conceivable that multiple SECs do try to udpate the same saga
+    /// concurrently.  That would be a bug.  This is noticed and prevented by
+    /// making this query conditional on current_sec and failing with a conflict
+    /// if the current SEC has changed.
     pub async fn saga_update_state(
         &self,
         saga_id: steno::SagaId,
         new_state: steno::SagaCachedState,
         current_sec: db::saga_types::SecId,
-        current_adopt_generation: Generation,
     ) -> Result<(), Error> {
         use db::schema::saga::dsl;
 
@@ -102,7 +97,6 @@ impl DataStore {
         let result = diesel::update(dsl::saga)
             .filter(dsl::id.eq(saga_id))
             .filter(dsl::current_sec.eq(current_sec))
-            .filter(dsl::adopt_generation.eq(current_adopt_generation))
             .set(dsl::saga_state.eq(db::saga_types::SagaCachedState(new_state)))
             .check_if_exists::<db::saga_types::Saga>(saga_id)
             .execute_and_check(&*self.pool_connection_unauthorized().await?)
@@ -119,20 +113,19 @@ impl DataStore {
 
         match result.status {
             UpdateStatus::Updated => Ok(()),
-            UpdateStatus::NotUpdatedButExists => Err(Error::invalid_request(
-                format!(
-                    "failed to update saga {:?} with state {:?}: preconditions not met: \
-                    expected current_sec = {:?}, adopt_generation = {:?}, \
-                    but found current_sec = {:?}, adopt_generation = {:?}, state = {:?}",
+            UpdateStatus::NotUpdatedButExists => {
+                Err(Error::invalid_request(format!(
+                    "failed to update saga {:?} with state {:?}:\
+                     preconditions not met: \
+                     expected current_sec = {:?}, \
+                     but found current_sec = {:?}, state = {:?}",
                     saga_id,
                     new_state,
                     current_sec,
-                    current_adopt_generation,
                     result.found.current_sec,
-                    result.found.adopt_generation,
                     result.found.saga_state,
-                )
-            )),
+                )))
+            }
         }
     }
 
@@ -207,16 +200,75 @@ impl DataStore {
 
         Ok(events)
     }
+
+    /// Updates all sagas that are currently assigned to any of the SEC ids in
+    /// `sec_ids`, assigning them to `new_sec_id` instead.
+    ///
+    /// Generally, an SEC id corresponds to a Nexus id.  This change causes the
+    /// Nexus instance `new_sec_id` to discover these sagas and resume executing
+    /// them the next time it performs saga recovery (which is normally on
+    /// startup and periodically).  Generally, `new_sec_id` is the _current_
+    /// Nexus instance and the caller should activate the saga recovery
+    /// background task after calling this function to immediately resume the
+    /// newly-assigned sagas.
+    ///
+    /// **Warning:** This operation is only safe if the other SECs `sec_ids` are
+    /// not currently running.  If those SECs are still running, then two (or
+    /// more) SECs may wind up running the same saga concurrently.  This would
+    /// likely violate implicit assumptions made by various saga actions,
+    /// leading to hard-to-debug errors and state corruption.
+    pub async fn sagas_reassign_sec(
+        &self,
+        opctx: &OpContext,
+        sec_ids: &[db::saga_types::SecId],
+        new_sec_id: db::saga_types::SecId,
+    ) -> Result<usize, Error> {
+        opctx.authorize(authz::Action::Modify, &authz::FLEET).await?;
+
+        let now = chrono::Utc::now();
+        let conn = self.pool_connection_authorized(opctx).await?;
+
+        // It would be more robust to do this in batches.  However, Diesel does
+        // not appear to support the UPDATE ... LIMIT syntax using the normal
+        // builder.  In practice, it's extremely unlikely we'd have so many
+        // in-progress sagas that this would be a problem.
+        use db::schema::saga::dsl;
+        diesel::update(
+            dsl::saga
+                .filter(dsl::current_sec.is_not_null())
+                .filter(
+                    dsl::current_sec.eq_any(
+                        sec_ids.into_iter().cloned().collect::<Vec<_>>(),
+                    ),
+                )
+                .filter(dsl::saga_state.ne(db::saga_types::SagaCachedState(
+                    steno::SagaCachedState::Done,
+                ))),
+        )
+        .set((
+            dsl::current_sec.eq(Some(new_sec_id)),
+            dsl::adopt_generation.eq(dsl::adopt_generation.add(1)),
+            dsl::adopt_time.eq(now),
+        ))
+        .execute_async(&*conn)
+        .await
+        .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
+    }
 }
 
 #[cfg(test)]
 mod test {
     use super::*;
     use crate::db::datastore::test_utils::datastore_test;
+    use async_bb8_diesel::AsyncConnection;
+    use async_bb8_diesel::AsyncSimpleConnection;
+    use db::queries::ALLOW_FULL_TABLE_SCAN_SQL;
     use nexus_db_model::{SagaNodeEvent, SecId};
     use nexus_test_utils::db::test_setup_database;
+    use omicron_common::api::external::Generation;
     use omicron_test_utils::dev;
     use rand::seq::SliceRandom;
+    use std::collections::BTreeSet;
     use uuid::Uuid;
 
     // Tests pagination in listing sagas that are candidates for recovery
@@ -440,7 +492,6 @@ mod test {
                 node_cx.saga_id,
                 steno::SagaCachedState::Running,
                 node_cx.sec_id,
-                db::model::Generation::new(),
             )
             .await
             .expect("updating state to Running again");
@@ -451,7 +502,6 @@ mod test {
                 node_cx.saga_id,
                 steno::SagaCachedState::Done,
                 node_cx.sec_id,
-                db::model::Generation::new(),
             )
             .await
             .expect("updating state to Done");
@@ -463,7 +513,6 @@ mod test {
                 node_cx.saga_id,
                 steno::SagaCachedState::Done,
                 node_cx.sec_id,
-                db::model::Generation::new(),
             )
             .await
             .expect("updating state to Done again");
@@ -509,4 +558,156 @@ mod test {
             SagaNodeEvent::new(event, self.sec_id)
         }
     }
+
+    #[tokio::test]
+    async fn test_saga_reassignment() {
+        // Test setup
+        let logctx = dev::test_setup_log("test_saga_reassignment");
+        let mut db = test_setup_database(&logctx.log).await;
+        let (_, datastore) = datastore_test(&logctx, &db).await;
+        let opctx = OpContext::for_tests(logctx.log.clone(), datastore.clone());
+
+        // Populate the database with a few different sagas:
+        //
+        // - assigned to SEC A: done, running, and unwinding
+        // - assigned to SEC B: done, running, and unwinding
+        // - assigned to SEC C: done, running, and unwinding
+        // - assigned to SEC D: done, running, and unwinding
+        //
+        // Then we'll reassign SECs B's and C's sagas to SEC A and check exactly
+        // which sagas were changed by this.  This exercises:
+        // - that we don't touch A's sagas (the one we're assigning *to*)
+        // - that we do touch both B's and C's sagas (the ones we're assigning
+        //   *from*)
+        // - that we don't touch D's sagas (some other SEC)
+        // - that we don't touch any "done" sagas
+        // - that we do touch both running and unwinding sagas
+        let mut sagas_to_insert = Vec::new();
+        let sec_a = SecId(Uuid::new_v4());
+        let sec_b = SecId(Uuid::new_v4());
+        let sec_c = SecId(Uuid::new_v4());
+        let sec_d = SecId(Uuid::new_v4());
+
+        for sec_id in [sec_a, sec_b, sec_c, sec_d] {
+            for state in [
+                steno::SagaCachedState::Running,
+                steno::SagaCachedState::Unwinding,
+                steno::SagaCachedState::Done,
+            ] {
+                let params = steno::SagaCreateParams {
+                    id: steno::SagaId(Uuid::new_v4()),
+                    name: steno::SagaName::new("tewst saga"),
+                    dag: serde_json::value::Value::Null,
+                    state,
+                };
+
+                sagas_to_insert
+                    .push(db::model::saga_types::Saga::new(sec_id, params));
+            }
+        }
+        println!("sagas to insert: {:?}", sagas_to_insert);
+
+        // These two sets are complements, but we write out the conditions to
+        // double-check that we've got it right.
+        let sagas_affected: BTreeSet<_> = sagas_to_insert
+            .iter()
+            .filter_map(|saga| {
+                ((saga.creator == sec_b || saga.creator == sec_c)
+                    && (saga.saga_state.0 == steno::SagaCachedState::Running
+                        || saga.saga_state.0
+                            == steno::SagaCachedState::Unwinding))
+                    .then(|| saga.id)
+            })
+            .collect();
+        let sagas_unaffected: BTreeSet<_> = sagas_to_insert
+            .iter()
+            .filter_map(|saga| {
+                (saga.creator == sec_a
+                    || saga.creator == sec_d
+                    || saga.saga_state.0 == steno::SagaCachedState::Done)
+                    .then(|| saga.id)
+            })
+            .collect();
+        println!("sagas affected: {:?}", sagas_affected);
+        println!("sagas UNaffected: {:?}", sagas_unaffected);
+        assert_eq!(sagas_affected.intersection(&sagas_unaffected).count(), 0);
+        assert_eq!(
+            sagas_affected.len() + sagas_unaffected.len(),
+            sagas_to_insert.len()
+        );
+
+        // Insert the sagas.
+        let count = {
+            use db::schema::saga::dsl;
+            let conn = datastore.pool_connection_for_tests().await.unwrap();
+            diesel::insert_into(dsl::saga)
+                .values(sagas_to_insert)
+                .execute_async(&*conn)
+                .await
+                .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))
+                .expect("successful insertion")
+        };
+        assert_eq!(count, sagas_affected.len() + sagas_unaffected.len());
+
+        // Reassign uncompleted sagas from SECs B and C to SEC A.
+        let nreassigned = datastore
+            .sagas_reassign_sec(&opctx, &[sec_b, sec_c], sec_a)
+            .await
+            .expect("failed to re-assign sagas");
+
+        // Fetch all the sagas and check their states.
+        let all_sagas: Vec<_> = datastore
+            .pool_connection_for_tests()
+            .await
+            .unwrap()
+            .transaction_async(|conn| async move {
+                use db::schema::saga::dsl;
+                conn.batch_execute_async(ALLOW_FULL_TABLE_SCAN_SQL).await?;
+                dsl::saga
+                    .select(nexus_db_model::Saga::as_select())
+                    .load_async(&conn)
+                    .await
+            })
+            .await
+            .unwrap();
+
+        for saga in all_sagas {
+            println!("checking saga: {:?}", saga);
+            let current_sec = saga.current_sec.unwrap();
+            if sagas_affected.contains(&saga.id) {
+                assert!(saga.creator == sec_b || saga.creator == sec_c);
+                assert_eq!(current_sec, sec_a);
+                assert_eq!(*saga.adopt_generation, Generation::from(2));
+                assert!(
+                    saga.saga_state.0 == steno::SagaCachedState::Running
+                        || saga.saga_state.0
+                            == steno::SagaCachedState::Unwinding
+                );
+            } else if sagas_unaffected.contains(&saga.id) {
+                assert_eq!(current_sec, saga.creator);
+                assert_eq!(*saga.adopt_generation, Generation::from(1));
+                // Its SEC and state could be anything since we've deliberately
+                // included sagas with various states and SECs that should not
+                // be affected by the reassignment.
+            } else {
+                println!(
+                    "ignoring saga that was not created by this test: {:?}",
+                    saga
+                );
+            }
+        }
+
+        assert_eq!(nreassigned, sagas_affected.len());
+
+        // If we do it again, we should make no changes.
+        let nreassigned = datastore
+            .sagas_reassign_sec(&opctx, &[sec_b, sec_c], sec_a)
+            .await
+            .expect("failed to re-assign sagas");
+        assert_eq!(nreassigned, 0);
+
+        // Test cleanup
+        db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
+    }
 }
diff --git a/nexus/db-queries/src/db/sec_store.rs b/nexus/db-queries/src/db/sec_store.rs
index 0dcc3aa717..920ff3aee1 100644
--- a/nexus/db-queries/src/db/sec_store.rs
+++ b/nexus/db-queries/src/db/sec_store.rs
@@ -4,7 +4,7 @@
 
 //! Implementation of [`steno::SecStore`] backed by Omicron's database
 
-use crate::db::{self, model::Generation};
+use crate::db;
 use anyhow::Context;
 use async_trait::async_trait;
 use dropshot::HttpError;
@@ -102,12 +102,7 @@ impl steno::SecStore for CockroachDbSecStore {
             &log,
             || {
                 self.datastore
-                    .saga_update_state(
-                        id,
-                        update,
-                        self.sec_id,
-                        Generation::new(),
-                    )
+                    .saga_update_state(id, update, self.sec_id)
                     .map_err(backoff::BackoffError::transient)
             },
             "updating saga state",
diff --git a/nexus/reconfigurator/execution/src/cockroachdb.rs b/nexus/reconfigurator/execution/src/cockroachdb.rs
index 498944598d..277f5f91c4 100644
--- a/nexus/reconfigurator/execution/src/cockroachdb.rs
+++ b/nexus/reconfigurator/execution/src/cockroachdb.rs
@@ -39,6 +39,7 @@ mod test {
     use nexus_test_utils_macros::nexus_test;
     use nexus_types::deployment::CockroachDbClusterVersion;
     use std::sync::Arc;
+    use uuid::Uuid;
 
     type ControlPlaneTestContext =
         nexus_test_utils::ControlPlaneTestContext<omicron_nexus::Server>;
@@ -101,7 +102,7 @@ mod test {
             datastore,
             resolver,
             &blueprint,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
diff --git a/nexus/reconfigurator/execution/src/dns.rs b/nexus/reconfigurator/execution/src/dns.rs
index 846d19ead3..4395944b25 100644
--- a/nexus/reconfigurator/execution/src/dns.rs
+++ b/nexus/reconfigurator/execution/src/dns.rs
@@ -1250,7 +1250,7 @@ mod test {
             datastore,
             resolver,
             &blueprint,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
@@ -1390,7 +1390,7 @@ mod test {
             datastore,
             resolver,
             &blueprint2,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
@@ -1464,7 +1464,7 @@ mod test {
             datastore,
             resolver,
             &blueprint2,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
@@ -1500,7 +1500,7 @@ mod test {
             datastore,
             resolver,
             &blueprint2,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
@@ -1594,7 +1594,7 @@ mod test {
             datastore,
             resolver,
             &blueprint,
-            "test-suite",
+            Uuid::new_v4(),
             &overrides,
         )
         .await
diff --git a/nexus/reconfigurator/execution/src/lib.rs b/nexus/reconfigurator/execution/src/lib.rs
index bb525b1b8b..8606187762 100644
--- a/nexus/reconfigurator/execution/src/lib.rs
+++ b/nexus/reconfigurator/execution/src/lib.rs
@@ -24,6 +24,7 @@ use slog::info;
 use slog_error_chain::InlineErrorChain;
 use std::collections::BTreeMap;
 use std::net::SocketAddrV6;
+use uuid::Uuid;
 
 mod cockroachdb;
 mod datasets;
@@ -31,6 +32,7 @@ mod dns;
 mod omicron_physical_disks;
 mod omicron_zones;
 mod overridables;
+mod sagas;
 mod sled_state;
 
 pub use dns::blueprint_external_dns_config;
@@ -73,38 +75,32 @@ impl From<nexus_db_model::Sled> for Sled {
 ///
 /// The assumption is that callers are running this periodically or in a loop to
 /// deal with transient errors or changes in the underlying system state.
-pub async fn realize_blueprint<S>(
+pub async fn realize_blueprint(
     opctx: &OpContext,
     datastore: &DataStore,
     resolver: &Resolver,
     blueprint: &Blueprint,
-    nexus_label: S,
-) -> Result<(), Vec<anyhow::Error>>
-where
-    String: From<S>,
-{
+    nexus_id: Uuid,
+) -> Result<bool, Vec<anyhow::Error>> {
     realize_blueprint_with_overrides(
         opctx,
         datastore,
         resolver,
         blueprint,
-        nexus_label,
+        nexus_id,
         &Default::default(),
     )
     .await
 }
 
-pub async fn realize_blueprint_with_overrides<S>(
+pub async fn realize_blueprint_with_overrides(
     opctx: &OpContext,
     datastore: &DataStore,
     resolver: &Resolver,
     blueprint: &Blueprint,
-    nexus_label: S,
+    nexus_id: Uuid,
     overrides: &Overridables,
-) -> Result<(), Vec<anyhow::Error>>
-where
-    String: From<S>,
-{
+) -> Result<bool, Vec<anyhow::Error>> {
     let opctx = opctx.child(BTreeMap::from([(
         "comment".to_string(),
         blueprint.comment.clone(),
@@ -182,7 +178,7 @@ where
     dns::deploy_dns(
         &opctx,
         datastore,
-        String::from(nexus_label),
+        nexus_id.to_string(),
         blueprint,
         &sleds_by_id,
         overrides,
@@ -215,14 +211,43 @@ where
     omicron_physical_disks::decommission_expunged_disks(&opctx, datastore)
         .await?;
 
+    // From this point on, we'll assume that any errors that we encounter do
+    // *not* require stopping execution.  We'll just accumulate them and return
+    // them all at the end.
+    //
+    // TODO We should probably do this with more of the errors above, too.
+    let mut errors = Vec::new();
+
+    // For any expunged Nexus zones, re-assign in-progress sagas to some other
+    // Nexus.  If this fails for some reason, it doesn't affect anything else.
+    let sec_id = nexus_db_model::SecId(nexus_id);
+    let reassigned = sagas::reassign_sagas_from_expunged(
+        &opctx, datastore, blueprint, sec_id,
+    )
+    .await
+    .context("failed to re-assign sagas");
+    let needs_saga_recovery = match reassigned {
+        Ok(needs_recovery) => needs_recovery,
+        Err(error) => {
+            errors.push(error);
+            false
+        }
+    };
+
     // This is likely to error if any cluster upgrades are in progress (which
     // can take some time), so it should remain at the end so that other parts
     // of the blueprint can progress normally.
-    cockroachdb::ensure_settings(&opctx, datastore, blueprint)
-        .await
-        .map_err(|err| vec![err])?;
+    if let Err(error) =
+        cockroachdb::ensure_settings(&opctx, datastore, blueprint).await
+    {
+        errors.push(error);
+    }
 
-    Ok(())
+    if errors.is_empty() {
+        Ok(needs_saga_recovery)
+    } else {
+        Err(errors)
+    }
 }
 
 #[cfg(test)]
diff --git a/nexus/reconfigurator/execution/src/sagas.rs b/nexus/reconfigurator/execution/src/sagas.rs
new file mode 100644
index 0000000000..458328ef00
--- /dev/null
+++ b/nexus/reconfigurator/execution/src/sagas.rs
@@ -0,0 +1,71 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! Re-assign sagas from expunged Nexus zones
+
+use nexus_db_model::SecId;
+use nexus_db_queries::context::OpContext;
+use nexus_db_queries::db::DataStore;
+use nexus_types::deployment::Blueprint;
+use nexus_types::deployment::BlueprintZoneFilter;
+use omicron_common::api::external::Error;
+use omicron_uuid_kinds::GenericUuid;
+use slog::{debug, info, warn};
+
+/// For each expunged Nexus zone, re-assign sagas owned by that Nexus to the
+/// specified nexus (`nexus_id`).
+pub(crate) async fn reassign_sagas_from_expunged(
+    opctx: &OpContext,
+    datastore: &DataStore,
+    blueprint: &Blueprint,
+    nexus_id: SecId,
+) -> Result<bool, Error> {
+    let log = &opctx.log;
+
+    // Identify any Nexus zones that have been expunged and need to have sagas
+    // re-assigned.
+    //
+    // TODO: Currently, we take any expunged Nexus instances and attempt to
+    // assign all their sagas to ourselves.  Per RFD 289, we can only re-assign
+    // sagas between two instances of Nexus that are at the same version.  Right
+    // now this can't happen so there's nothing to do here to ensure that
+    // constraint.  However, once we support allowing the control plane to be
+    // online _during_ an upgrade, there may be multiple different Nexus
+    // instances running at the same time.  At that point, we will need to make
+    // sure that we only ever try to assign ourselves sagas from other Nexus
+    // instances that we know are running the same version as ourselves.
+    let nexus_zone_ids: Vec<_> = blueprint
+        .all_omicron_zones(BlueprintZoneFilter::Expunged)
+        .filter_map(|(_, z)| {
+            z.zone_type
+                .is_nexus()
+                .then(|| nexus_db_model::SecId(z.id.into_untyped_uuid()))
+        })
+        .collect();
+
+    debug!(log, "re-assign sagas: found Nexus instances";
+        "nexus_zone_ids" => ?nexus_zone_ids);
+
+    let result =
+        datastore.sagas_reassign_sec(opctx, &nexus_zone_ids, nexus_id).await;
+
+    match result {
+        Ok(count) => {
+            info!(log, "re-assigned sagas";
+                "nexus_zone_ids" => ?nexus_zone_ids,
+                "count" => count,
+            );
+
+            Ok(count != 0)
+        }
+        Err(error) => {
+            warn!(log, "failed to re-assign sagas";
+                "nexus_zone_ids" => ?nexus_zone_ids,
+                &error,
+            );
+
+            Err(error)
+        }
+    }
+}
diff --git a/nexus/src/app/background/init.rs b/nexus/src/app/background/init.rs
index 6bd805a491..37c276fa07 100644
--- a/nexus/src/app/background/init.rs
+++ b/nexus/src/app/background/init.rs
@@ -448,7 +448,8 @@ impl BackgroundTasksInitializer {
             datastore.clone(),
             resolver.clone(),
             rx_blueprint.clone(),
-            nexus_id.to_string(),
+            nexus_id,
+            task_saga_recovery.clone(),
         );
         let rx_blueprint_exec = blueprint_executor.watcher();
         driver.register(TaskDefinition {
diff --git a/nexus/src/app/background/tasks/blueprint_execution.rs b/nexus/src/app/background/tasks/blueprint_execution.rs
index ee780812ae..b430270ec9 100644
--- a/nexus/src/app/background/tasks/blueprint_execution.rs
+++ b/nexus/src/app/background/tasks/blueprint_execution.rs
@@ -4,7 +4,7 @@
 
 //! Background task for realizing a plan blueprint
 
-use crate::app::background::BackgroundTask;
+use crate::app::background::{Activator, BackgroundTask};
 use futures::future::BoxFuture;
 use futures::FutureExt;
 use internal_dns::resolver::Resolver;
@@ -14,6 +14,7 @@ use nexus_types::deployment::{Blueprint, BlueprintTarget};
 use serde_json::json;
 use std::sync::Arc;
 use tokio::sync::watch;
+use uuid::Uuid;
 
 /// Background task that takes a [`Blueprint`] and realizes the change to
 /// the state of the system based on the `Blueprint`.
@@ -21,8 +22,9 @@ pub struct BlueprintExecutor {
     datastore: Arc<DataStore>,
     resolver: Resolver,
     rx_blueprint: watch::Receiver<Option<Arc<(BlueprintTarget, Blueprint)>>>,
-    nexus_label: String,
+    nexus_id: Uuid,
     tx: watch::Sender<usize>,
+    saga_recovery: Activator,
 }
 
 impl BlueprintExecutor {
@@ -32,10 +34,18 @@ impl BlueprintExecutor {
         rx_blueprint: watch::Receiver<
             Option<Arc<(BlueprintTarget, Blueprint)>>,
         >,
-        nexus_label: String,
+        nexus_id: Uuid,
+        saga_recovery: Activator,
     ) -> BlueprintExecutor {
         let (tx, _) = watch::channel(0);
-        BlueprintExecutor { datastore, resolver, rx_blueprint, nexus_label, tx }
+        BlueprintExecutor {
+            datastore,
+            resolver,
+            rx_blueprint,
+            nexus_id,
+            tx,
+            saga_recovery,
+        }
     }
 
     pub fn watcher(&self) -> watch::Receiver<usize> {
@@ -81,16 +91,23 @@ impl BlueprintExecutor {
             &self.datastore,
             &self.resolver,
             blueprint,
-            &self.nexus_label,
+            self.nexus_id,
         )
         .await;
 
         // Trigger anybody waiting for this to finish.
         self.tx.send_modify(|count| *count = *count + 1);
 
+        // If executing the blueprint requires activating the saga recovery
+        // background task, do that now.
+        info!(&opctx.log, "activating saga recovery task");
+        if let Ok(true) = result {
+            self.saga_recovery.activate();
+        }
+
         // Return the result as a `serde_json::Value`
         match result {
-            Ok(()) => json!({}),
+            Ok(_) => json!({}),
             Err(errors) => {
                 let errors: Vec<_> =
                     errors.into_iter().map(|e| format!("{:#}", e)).collect();
@@ -115,7 +132,7 @@ impl BackgroundTask for BlueprintExecutor {
 #[cfg(test)]
 mod test {
     use super::BlueprintExecutor;
-    use crate::app::background::BackgroundTask;
+    use crate::app::background::{Activator, BackgroundTask};
     use httptest::matchers::{all_of, request};
     use httptest::responders::status_code;
     use httptest::Expectation;
@@ -261,7 +278,8 @@ mod test {
             datastore.clone(),
             resolver.clone(),
             blueprint_rx,
-            String::from("test-suite"),
+            Uuid::new_v4(),
+            Activator::new(),
         );
 
         // Now we're ready.

From b927049862e2161f08fae2480dadc1b0a4572b26 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Fri, 16 Aug 2024 17:10:24 -0700
Subject: [PATCH 11/28] add issue templates for flaky tests (#4833)

---
 .../test-flake-from-buildomat.md              | 65 +++++++++++++++++++
 .../test-flake-from-local-failure.md          | 42 ++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/test-flake-from-buildomat.md
 create mode 100644 .github/ISSUE_TEMPLATE/test-flake-from-local-failure.md

diff --git a/.github/ISSUE_TEMPLATE/test-flake-from-buildomat.md b/.github/ISSUE_TEMPLATE/test-flake-from-buildomat.md
new file mode 100644
index 0000000000..eb1ac2c6e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/test-flake-from-buildomat.md
@@ -0,0 +1,65 @@
+---
+name: Test flake from buildomat
+about: Report a test failure from a CI run either on "main" or on a PR where you don't
+  think the PR changes caused the failure
+title: 'test failed in CI: NAME_OF_TEST'
+labels: Test Flake
+assignees: ''
+
+---
+
+<!--
+    This template is for cases where you've got a test that failed in CI for a pull request and
+    you believe it's not related to changes in your branch.
+-->
+
+This test failed on a CI run on **"main" (or pull request XXX)**:
+
+    Link here to the GitHub page showing the test failure.
+    If it's from a PR, this might look like:
+    https://github.com/oxidecomputer/omicron/pull/4588/checks?check_run_id=19198066410
+    It could also be a link to a failure on "main", which would look like:
+    https://github.com/oxidecomputer/omicron/runs/20589829185
+    This is useful because it shows which commit failed and all the surrounding context.
+
+Log showing the specific test failure:
+
+
+    Link here to the specific line of output from the buildomat log showing the failure:
+    https://buildomat.eng.oxide.computer/wg/0/details/01HGH32FQYKZJNX9J62HNABKPA/31C5jyox8tyHUIuDDevKkXlDZCyNw143z4nOq8wLl3xtjKzT/01HGH32V3P0HH6B56S46AJAT63#S4455
+    This is useful because it shows all the details about the test failure.
+
+Excerpt from the log showing the failure:
+
+```
+Paste here an excerpt from the log.
+This is redundant with the log above but helps people searching for the error message
+or test name.  It also works if the link above becomes unavailable.
+Here's an example:
+
+------
+
+failures:
+    integration_tests::updates::test_update_races
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 4 filtered out; finished in 4.84s
+
+
+--- STDERR:              wicketd::mod integration_tests::updates::test_update_races ---
+log file: /var/tmp/omicron_tmp/mod-ae2eb84a30e4213e-test_artifact_upload_while_updating.14133.0.log
+note: configured to log to "/var/tmp/omicron_tmp/mod-ae2eb84a30e4213e-test_artifact_upload_while_updating.14133.0.log"
+hint: Generated a random key:
+hint:
+hint:   ed25519:826a8f799d4cc767158c990a60f721215bfd71f8f94fa88ba1960037bd6e5554
+hint:
+hint: To modify this repository, you will need this key. Use the -k/--key
+hint: command line flag or the TUFACEOUS_KEY environment variable:
+hint:
+hint:   export TUFACEOUS_KEY=ed25519:826a8f799d4cc767158c990a60f721215bfd71f8f94fa88ba1960037bd6e5554
+hint:
+hint: To prevent this default behavior, use --no-generate-key.
+thread 'integration_tests::updates::test_update_races' panicked at wicketd/tests/integration_tests/updates.rs:482:41:
+at least one event
+stack backtrace:
+...
+```
diff --git a/.github/ISSUE_TEMPLATE/test-flake-from-local-failure.md b/.github/ISSUE_TEMPLATE/test-flake-from-local-failure.md
new file mode 100644
index 0000000000..e963c83926
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/test-flake-from-local-failure.md
@@ -0,0 +1,42 @@
+---
+name: Test flake from local failure
+about: Report a test failure that happened locally (not CI) that you believe is not
+  related to local changes
+title: 'test failure: TEST_NAME'
+labels: Test Flake
+assignees: ''
+
+---
+
+On branch **BRANCH** commit **COMMIT**, I saw this test failure:
+
+```
+Include the trimmed, relevant output from `cargo nextest`.  Here's an example:
+
+-------
+failures:
+    integration_tests::updates::test_update_races
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 4 filtered out; finished in 4.84s
+
+
+--- STDERR:              wicketd::mod integration_tests::updates::test_update_races ---
+log file: /var/tmp/omicron_tmp/mod-ae2eb84a30e4213e-test_artifact_upload_while_updating.14133.0.log
+note: configured to log to "/var/tmp/omicron_tmp/mod-ae2eb84a30e4213e-test_artifact_upload_while_updating.14133.0.log"
+hint: Generated a random key:
+hint:
+hint:   ed25519:826a8f799d4cc767158c990a60f721215bfd71f8f94fa88ba1960037bd6e5554
+hint:
+hint: To modify this repository, you will need this key. Use the -k/--key
+hint: command line flag or the TUFACEOUS_KEY environment variable:
+hint:
+hint:   export TUFACEOUS_KEY=ed25519:826a8f799d4cc767158c990a60f721215bfd71f8f94fa88ba1960037bd6e5554
+hint:
+hint: To prevent this default behavior, use --no-generate-key.
+thread 'integration_tests::updates::test_update_races' panicked at wicketd/tests/integration_tests/updates.rs:482:41:
+at least one event
+stack backtrace:
+...
+```
+
+**NOTE: Consider attaching any log files produced by the test.**

From fac7e2780043fa60f35c7fc8c673af0d3dc7842d Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 16 Aug 2024 20:05:38 -0700
Subject: [PATCH 12/28] [oximeter] split oximeter-impl into -types, -schema and
 -test-utils (#6355)

The Nexus external API uses several types from oximeter, and in the interest of
keeping the upcoming nexus-external-api crate's graph small, it makes sense to
split it into three crates.

The crates are:

* **oximeter-types**: Core type definitions (there are a lot of them).
* **oximeter-schema**: Library for working with schemas.
* **oximeter-test-utils**: Test utilities.

The names match the other services in omicron, e.g. `sled-agent-types` and
`nexus-test-utils`.
---
 Cargo.lock                                    |  97 +++--
 Cargo.toml                                    |  12 +-
 oximeter/db/Cargo.toml                        |   1 +
 oximeter/db/src/client/mod.rs                 |  27 +-
 oximeter/db/src/model.rs                      |   9 +-
 oximeter/db/tests/integration_test.rs         |  13 +-
 oximeter/impl/src/test_util.rs                | 130 -------
 oximeter/oximeter/Cargo.toml                  |   3 +-
 oximeter/oximeter/src/lib.rs                  |   9 +-
 oximeter/schema/Cargo.toml                    |  24 ++
 .../src/bin/oximeter-schema.rs                |   6 +-
 .../src/schema => schema/src}/codegen.rs      | 349 +++++++++---------
 .../{impl/src/schema => schema/src}/ir.rs     |  20 +-
 oximeter/schema/src/lib.rs                    |  12 +
 oximeter/test-utils/Cargo.toml                |  15 +
 oximeter/test-utils/src/lib.rs                | 295 +++++++++++++++
 oximeter/timeseries-macro/Cargo.toml          |   3 +-
 oximeter/timeseries-macro/src/lib.rs          |   4 +-
 oximeter/{impl => types}/Cargo.toml           |  12 +-
 oximeter/{impl => types}/benches/quantile.rs  |   2 +-
 oximeter/{impl => types}/src/histogram.rs     |   8 +-
 oximeter/{impl => types}/src/lib.rs           |   7 +-
 oximeter/{impl => types}/src/quantile.rs      |  16 +-
 .../src/schema/mod.rs => types/src/schema.rs} | 125 -------
 oximeter/{impl => types}/src/traits.rs        |  22 +-
 oximeter/{impl => types}/src/types.rs         |  32 +-
 .../{impl => types}/tests/fail/failures.rs    |   0
 .../tests/fail/failures.stderr                |   0
 .../{impl => types}/tests/test_compilation.rs |   0
 29 files changed, 663 insertions(+), 590 deletions(-)
 delete mode 100644 oximeter/impl/src/test_util.rs
 create mode 100644 oximeter/schema/Cargo.toml
 rename oximeter/{oximeter => schema}/src/bin/oximeter-schema.rs (93%)
 rename oximeter/{impl/src/schema => schema/src}/codegen.rs (73%)
 rename oximeter/{impl/src/schema => schema/src}/ir.rs (99%)
 create mode 100644 oximeter/schema/src/lib.rs
 create mode 100644 oximeter/test-utils/Cargo.toml
 create mode 100644 oximeter/test-utils/src/lib.rs
 rename oximeter/{impl => types}/Cargo.toml (78%)
 rename oximeter/{impl => types}/benches/quantile.rs (97%)
 rename oximeter/{impl => types}/src/histogram.rs (99%)
 rename oximeter/{impl => types}/src/lib.rs (92%)
 rename oximeter/{impl => types}/src/quantile.rs (97%)
 rename oximeter/{impl/src/schema/mod.rs => types/src/schema.rs} (75%)
 rename oximeter/{impl => types}/src/traits.rs (96%)
 rename oximeter/{impl => types}/src/types.rs (97%)
 rename oximeter/{impl => types}/tests/fail/failures.rs (100%)
 rename oximeter/{impl => types}/tests/fail/failures.stderr (100%)
 rename oximeter/{impl => types}/tests/test_compilation.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 849c82f1f0..3b62f3001a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6821,9 +6821,10 @@ dependencies = [
  "chrono",
  "clap",
  "omicron-workspace-hack",
- "oximeter-impl",
  "oximeter-macro-impl",
+ "oximeter-schema",
  "oximeter-timeseries-macro",
+ "oximeter-types",
  "prettyplease",
  "syn 2.0.74",
  "toml 0.8.19",
@@ -6925,6 +6926,7 @@ dependencies = [
  "omicron-test-utils",
  "omicron-workspace-hack",
  "oximeter",
+ "oximeter-test-utils",
  "peg",
  "reedline",
  "regex",
@@ -6948,39 +6950,6 @@ dependencies = [
  "uuid",
 ]
 
-[[package]]
-name = "oximeter-impl"
-version = "0.1.0"
-dependencies = [
- "approx",
- "bytes",
- "chrono",
- "criterion",
- "float-ord",
- "heck 0.5.0",
- "num",
- "omicron-common",
- "omicron-workspace-hack",
- "oximeter-macro-impl",
- "prettyplease",
- "proc-macro2",
- "quote",
- "rand",
- "rand_distr",
- "regex",
- "rstest",
- "schemars",
- "serde",
- "serde_json",
- "slog-error-chain",
- "strum",
- "syn 2.0.74",
- "thiserror",
- "toml 0.8.19",
- "trybuild",
- "uuid",
-]
-
 [[package]]
 name = "oximeter-instruments"
 version = "0.1.0"
@@ -7041,17 +7010,75 @@ dependencies = [
  "uuid",
 ]
 
+[[package]]
+name = "oximeter-schema"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "clap",
+ "heck 0.5.0",
+ "omicron-workspace-hack",
+ "oximeter-types",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "schemars",
+ "serde",
+ "slog-error-chain",
+ "syn 2.0.74",
+ "toml 0.8.19",
+]
+
+[[package]]
+name = "oximeter-test-utils"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "omicron-workspace-hack",
+ "oximeter-macro-impl",
+ "oximeter-types",
+ "uuid",
+]
+
 [[package]]
 name = "oximeter-timeseries-macro"
 version = "0.1.0"
 dependencies = [
  "omicron-workspace-hack",
- "oximeter-impl",
+ "oximeter-schema",
+ "oximeter-types",
  "proc-macro2",
  "quote",
  "syn 2.0.74",
 ]
 
+[[package]]
+name = "oximeter-types"
+version = "0.1.0"
+dependencies = [
+ "approx",
+ "bytes",
+ "chrono",
+ "criterion",
+ "float-ord",
+ "num",
+ "omicron-common",
+ "omicron-workspace-hack",
+ "oximeter-macro-impl",
+ "rand",
+ "rand_distr",
+ "regex",
+ "rstest",
+ "schemars",
+ "serde",
+ "serde_json",
+ "strum",
+ "thiserror",
+ "trybuild",
+ "uuid",
+]
+
 [[package]]
 name = "oxlog"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 1b62af959d..ea687936e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,12 +77,14 @@ members = [
     "oximeter/api",
     "oximeter/collector",
     "oximeter/db",
-    "oximeter/impl",
     "oximeter/instruments",
     "oximeter/oximeter-macro-impl",
     "oximeter/oximeter",
     "oximeter/producer",
+    "oximeter/schema",
+    "oximeter/test-utils",
     "oximeter/timeseries-macro",
+    "oximeter/types",
     "package",
     "passwords",
     "rpaths",
@@ -191,12 +193,14 @@ default-members = [
     "oximeter/api",
     "oximeter/collector",
     "oximeter/db",
-    "oximeter/impl",
     "oximeter/instruments",
     "oximeter/oximeter-macro-impl",
     "oximeter/oximeter",
     "oximeter/producer",
+    "oximeter/schema",
+    "oximeter/test-utils",
     "oximeter/timeseries-macro",
+    "oximeter/types",
     "package",
     "passwords",
     "rpaths",
@@ -459,11 +463,13 @@ oximeter-api = { path = "oximeter/api" }
 oximeter-client = { path = "clients/oximeter-client" }
 oximeter-db = { path = "oximeter/db/", default-features = false }
 oximeter-collector = { path = "oximeter/collector" }
-oximeter-impl = { path = "oximeter/impl" }
 oximeter-instruments = { path = "oximeter/instruments" }
 oximeter-macro-impl = { path = "oximeter/oximeter-macro-impl" }
 oximeter-producer = { path = "oximeter/producer" }
+oximeter-schema = { path = "oximeter/schema" }
+oximeter-test-utils = { path = "oximeter/test-utils" }
 oximeter-timeseries-macro = { path = "oximeter/timeseries-macro" }
+oximeter-types = { path = "oximeter/types" }
 p256 = "0.13"
 parse-display = "0.10.0"
 partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] }
diff --git a/oximeter/db/Cargo.toml b/oximeter/db/Cargo.toml
index e3cf089cb5..6a7cedbc22 100644
--- a/oximeter/db/Cargo.toml
+++ b/oximeter/db/Cargo.toml
@@ -89,6 +89,7 @@ expectorate.workspace = true
 indexmap.workspace = true
 itertools.workspace = true
 omicron-test-utils.workspace = true
+oximeter-test-utils.workspace = true
 slog-dtrace.workspace = true
 sqlformat.workspace = true
 sqlparser.workspace = true
diff --git a/oximeter/db/src/client/mod.rs b/oximeter/db/src/client/mod.rs
index 30ae4b68d2..176e1bd5f8 100644
--- a/oximeter/db/src/client/mod.rs
+++ b/oximeter/db/src/client/mod.rs
@@ -1191,7 +1191,6 @@ mod tests {
     };
     use omicron_test_utils::dev::test_setup_log;
     use oximeter::histogram::Histogram;
-    use oximeter::test_util;
     use oximeter::types::MissingDatum;
     use oximeter::Datum;
     use oximeter::FieldValue;
@@ -1723,7 +1722,7 @@ mod tests {
         let samples = {
             let mut s = Vec::with_capacity(8);
             for _ in 0..s.capacity() {
-                s.push(test_util::make_hist_sample())
+                s.push(oximeter_test_utils::make_hist_sample())
             }
             s
         };
@@ -1762,7 +1761,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let sample = test_util::make_sample();
+        let sample = oximeter_test_utils::make_sample();
         client.insert_samples(&[sample]).await.unwrap();
 
         let bad_name = name_mismatch::TestTarget {
@@ -1770,7 +1769,7 @@ mod tests {
             name2: "second_name".into(),
             num: 2,
         };
-        let metric = test_util::TestMetric {
+        let metric = oximeter_test_utils::TestMetric {
             id: uuid::Uuid::new_v4(),
             good: true,
             datum: 1,
@@ -1792,7 +1791,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let sample = test_util::make_sample();
+        let sample = oximeter_test_utils::make_sample();
 
         // Verify that this sample is considered new, i.e., we return rows to update the timeseries
         // schema table.
@@ -1867,7 +1866,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = test_util::generate_test_samples(2, 2, 2, 2);
+        let samples = oximeter_test_utils::generate_test_samples(2, 2, 2, 2);
         client.insert_samples(&samples).await?;
 
         let sample = samples.first().unwrap();
@@ -1956,7 +1955,7 @@ mod tests {
         // we'd like to exercise the logic of ClickHouse's replacing merge tree engine.
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = test_util::generate_test_samples(2, 2, 2, 2);
+        let samples = oximeter_test_utils::generate_test_samples(2, 2, 2, 2);
         client.insert_samples(&samples).await?;
 
         async fn assert_table_count(
@@ -2631,7 +2630,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = test_util::generate_test_samples(2, 2, 2, 2);
+        let samples = oximeter_test_utils::generate_test_samples(2, 2, 2, 2);
         client.insert_samples(&samples).await?;
 
         let original_schema = client.schema.lock().await.clone();
@@ -2656,7 +2655,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = test_util::generate_test_samples(2, 2, 2, 2);
+        let samples = oximeter_test_utils::generate_test_samples(2, 2, 2, 2);
         client.insert_samples(&samples).await?;
 
         let limit = 100u32.try_into().unwrap();
@@ -2691,7 +2690,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = test_util::generate_test_samples(2, 2, 2, 2);
+        let samples = oximeter_test_utils::generate_test_samples(2, 2, 2, 2);
         client.insert_samples(&samples).await?;
 
         let limit = 7u32.try_into().unwrap();
@@ -3364,7 +3363,7 @@ mod tests {
         // The values here don't matter much, we just want to check that
         // the database data hasn't been dropped.
         assert_eq!(0, get_schema_count(&client).await);
-        let sample = test_util::make_sample();
+        let sample = oximeter_test_utils::make_sample();
         client.insert_samples(&[sample.clone()]).await.unwrap();
         assert_eq!(1, get_schema_count(&client).await);
 
@@ -3438,7 +3437,7 @@ mod tests {
         // The values here don't matter much, we just want to check that
         // the database data gets dropped later.
         assert_eq!(0, get_schema_count(&client).await);
-        let sample = test_util::make_sample();
+        let sample = oximeter_test_utils::make_sample();
         client.insert_samples(&[sample.clone()]).await.unwrap();
         assert_eq!(1, get_schema_count(&client).await);
 
@@ -3464,7 +3463,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = [test_util::make_sample()];
+        let samples = [oximeter_test_utils::make_sample()];
         client.insert_samples(&samples).await.unwrap();
 
         // Get the count of schema directly from the DB, which should have just
@@ -3549,7 +3548,7 @@ mod tests {
 
         let client = Client::new(address, &log);
         db_type.init_db(&client).await.unwrap();
-        let samples = [test_util::make_sample()];
+        let samples = [oximeter_test_utils::make_sample()];
 
         // We're using the components of the `insert_samples()` method here,
         // which has been refactored explicitly for this test. We need to insert
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
index f27df4ed49..3e34ad10e3 100644
--- a/oximeter/db/src/model.rs
+++ b/oximeter/db/src/model.rs
@@ -1880,7 +1880,6 @@ mod tests {
     use super::*;
     use chrono::Timelike;
     use oximeter::histogram::Record;
-    use oximeter::test_util;
     use oximeter::Datum;
 
     #[test]
@@ -1983,7 +1982,7 @@ mod tests {
 
     #[test]
     fn test_unroll_from_source() {
-        let sample = test_util::make_sample();
+        let sample = oximeter_test_utils::make_sample();
         let out = unroll_from_source(&sample);
         assert_eq!(out["oximeter.fields_string"].len(), 2);
         assert_eq!(out["oximeter.fields_i64"].len(), 1);
@@ -2003,8 +2002,8 @@ mod tests {
     // datum.
     #[test]
     fn test_unroll_missing_measurement_row() {
-        let sample = test_util::make_sample();
-        let missing_sample = test_util::make_missing_sample();
+        let sample = oximeter_test_utils::make_sample();
+        let missing_sample = oximeter_test_utils::make_missing_sample();
         let (table_name, row) = unroll_measurement_row(&sample);
         let (missing_table_name, missing_row) =
             unroll_measurement_row(&missing_sample);
@@ -2022,7 +2021,7 @@ mod tests {
 
     #[test]
     fn test_unroll_measurement_row() {
-        let sample = test_util::make_hist_sample();
+        let sample = oximeter_test_utils::make_hist_sample();
         let (table_name, row) = unroll_measurement_row(&sample);
         assert_eq!(table_name, "oximeter.measurements_histogramf64");
         let unpacked: HistogramF64MeasurementRow =
diff --git a/oximeter/db/tests/integration_test.rs b/oximeter/db/tests/integration_test.rs
index 732683c414..f5d81d51d1 100644
--- a/oximeter/db/tests/integration_test.rs
+++ b/oximeter/db/tests/integration_test.rs
@@ -10,7 +10,6 @@ use clickward::{
 use dropshot::test_util::log_prefix_for_test;
 use omicron_test_utils::dev::poll;
 use omicron_test_utils::dev::test_setup_log;
-use oximeter::test_util;
 use oximeter_db::{Client, DbWrite, OxqlResult, Sample, TestDbWrite};
 use slog::{debug, info, Logger};
 use std::collections::BTreeSet;
@@ -199,7 +198,7 @@ async fn test_cluster() -> anyhow::Result<()> {
     // Let's write some samples to our first replica and wait for them to show
     // up on replica 2.
     let start = tokio::time::Instant::now();
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
@@ -261,7 +260,7 @@ async fn test_cluster() -> anyhow::Result<()> {
     info!(log, "successfully stopped server 1");
 
     // Generate some new samples and insert them at replica3
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
@@ -298,7 +297,7 @@ async fn test_cluster() -> anyhow::Result<()> {
         .expect("failed to get samples from client1");
 
     // We still have a quorum (2 of 3 keepers), so we should be able to insert
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
@@ -321,7 +320,7 @@ async fn test_cluster() -> anyhow::Result<()> {
         .expect("failed to get samples from client1");
 
     info!(log, "Attempting to insert samples without keeper quorum");
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
@@ -350,7 +349,7 @@ async fn test_cluster() -> anyhow::Result<()> {
     )
     .await
     .expect("failed to sync keepers");
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
@@ -370,7 +369,7 @@ async fn test_cluster() -> anyhow::Result<()> {
     )
     .await
     .expect("failed to sync keepers");
-    let samples = test_util::generate_test_samples(
+    let samples = oximeter_test_utils::generate_test_samples(
         input.n_projects,
         input.n_instances,
         input.n_cpus,
diff --git a/oximeter/impl/src/test_util.rs b/oximeter/impl/src/test_util.rs
deleted file mode 100644
index c2ac7b34bd..0000000000
--- a/oximeter/impl/src/test_util.rs
+++ /dev/null
@@ -1,130 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-//! Utilities for testing the oximeter crate.
-// Copyright 2024 Oxide Computer Company
-
-use crate::histogram;
-use crate::histogram::{Histogram, Record};
-use crate::types::{Cumulative, Sample};
-use uuid::Uuid;
-
-#[derive(oximeter::Target)]
-pub struct TestTarget {
-    pub name1: String,
-    pub name2: String,
-    pub num: i64,
-}
-
-impl Default for TestTarget {
-    fn default() -> Self {
-        TestTarget {
-            name1: "first_name".into(),
-            name2: "second_name".into(),
-            num: 0,
-        }
-    }
-}
-
-#[derive(oximeter::Metric)]
-pub struct TestMetric {
-    pub id: Uuid,
-    pub good: bool,
-    pub datum: i64,
-}
-
-#[derive(oximeter::Metric)]
-pub struct TestCumulativeMetric {
-    pub id: Uuid,
-    pub good: bool,
-    pub datum: Cumulative<i64>,
-}
-
-#[derive(oximeter::Metric)]
-pub struct TestHistogram {
-    pub id: Uuid,
-    pub good: bool,
-    pub datum: Histogram<f64>,
-}
-
-const ID: Uuid = uuid::uuid!("e00ced4d-39d1-446a-ae85-a67f05c9750b");
-
-pub fn make_sample() -> Sample {
-    let target = TestTarget::default();
-    let metric = TestMetric { id: ID, good: true, datum: 1 };
-    Sample::new(&target, &metric).unwrap()
-}
-
-pub fn make_missing_sample() -> Sample {
-    let target = TestTarget::default();
-    let metric = TestMetric { id: ID, good: true, datum: 1 };
-    Sample::new_missing(&target, &metric).unwrap()
-}
-
-pub fn make_hist_sample() -> Sample {
-    let target = TestTarget::default();
-    let mut hist = histogram::Histogram::new(&[0.0, 5.0, 10.0]).unwrap();
-    hist.sample(1.0).unwrap();
-    hist.sample(2.0).unwrap();
-    hist.sample(6.0).unwrap();
-    let metric = TestHistogram { id: ID, good: true, datum: hist };
-    Sample::new(&target, &metric).unwrap()
-}
-
-/// A target identifying a single virtual machine instance
-#[derive(Debug, Clone, Copy, oximeter::Target)]
-pub struct VirtualMachine {
-    pub project_id: Uuid,
-    pub instance_id: Uuid,
-}
-
-/// A metric recording the total time a vCPU is busy, by its ID
-#[derive(Debug, Clone, Copy, oximeter::Metric)]
-pub struct CpuBusy {
-    cpu_id: i64,
-    datum: Cumulative<f64>,
-}
-
-pub fn generate_test_samples(
-    n_projects: usize,
-    n_instances: usize,
-    n_cpus: usize,
-    n_samples: usize,
-) -> Vec<Sample> {
-    let n_timeseries = n_projects * n_instances * n_cpus;
-    let mut samples = Vec::with_capacity(n_samples * n_timeseries);
-    for _ in 0..n_projects {
-        let project_id = Uuid::new_v4();
-        for _ in 0..n_instances {
-            let vm = VirtualMachine { project_id, instance_id: Uuid::new_v4() };
-            for cpu in 0..n_cpus {
-                for sample in 0..n_samples {
-                    let cpu_busy = CpuBusy {
-                        cpu_id: cpu as _,
-                        datum: Cumulative::new(sample as f64),
-                    };
-                    let sample = Sample::new(&vm, &cpu_busy).unwrap();
-                    samples.push(sample);
-                }
-            }
-        }
-    }
-    samples
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_gen_test_samples() {
-        let (n_projects, n_instances, n_cpus, n_samples) = (2, 2, 2, 2);
-        let samples =
-            generate_test_samples(n_projects, n_instances, n_cpus, n_samples);
-        assert_eq!(
-            samples.len(),
-            n_projects * n_instances * n_cpus * n_samples
-        );
-    }
-}
diff --git a/oximeter/oximeter/Cargo.toml b/oximeter/oximeter/Cargo.toml
index c04d1bd3ae..63b370bee6 100644
--- a/oximeter/oximeter/Cargo.toml
+++ b/oximeter/oximeter/Cargo.toml
@@ -13,9 +13,10 @@ anyhow.workspace = true
 clap.workspace = true
 chrono.workspace = true
 omicron-workspace-hack.workspace = true
-oximeter-impl.workspace = true
 oximeter-macro-impl.workspace = true
+oximeter-schema.workspace = true
 oximeter-timeseries-macro.workspace = true
+oximeter-types.workspace = true
 prettyplease.workspace = true
 syn.workspace = true
 toml.workspace = true
diff --git a/oximeter/oximeter/src/lib.rs b/oximeter/oximeter/src/lib.rs
index 5ec6a49e5c..913318b8a8 100644
--- a/oximeter/oximeter/src/lib.rs
+++ b/oximeter/oximeter/src/lib.rs
@@ -185,14 +185,15 @@
 //! `Producer`s may be registered with the same `ProducerServer`, each with potentially different
 //! sampling intervals.
 
-pub use oximeter_impl::*;
+pub use oximeter_macro_impl::{Metric, Target};
 pub use oximeter_timeseries_macro::use_timeseries;
+pub use oximeter_types::*;
 
 #[cfg(test)]
 mod test {
-    use oximeter_impl::schema::ir::load_schema;
-    use oximeter_impl::schema::{FieldSource, SCHEMA_DIRECTORY};
-    use oximeter_impl::TimeseriesSchema;
+    use oximeter_schema::ir::load_schema;
+    use oximeter_types::schema::{FieldSource, SCHEMA_DIRECTORY};
+    use oximeter_types::TimeseriesSchema;
     use std::collections::BTreeMap;
     use std::fs;
 
diff --git a/oximeter/schema/Cargo.toml b/oximeter/schema/Cargo.toml
new file mode 100644
index 0000000000..fe2e28705a
--- /dev/null
+++ b/oximeter/schema/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "oximeter-schema"
+version = "0.1.0"
+edition = "2021"
+license = "MPL-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow.workspace = true
+chrono.workspace = true
+clap.workspace = true
+heck.workspace = true
+omicron-workspace-hack.workspace = true
+oximeter-types.workspace = true
+prettyplease.workspace = true
+proc-macro2.workspace = true
+quote.workspace = true
+schemars.workspace = true
+serde.workspace = true
+slog-error-chain.workspace = true
+syn.workspace = true
+toml.workspace = true
diff --git a/oximeter/oximeter/src/bin/oximeter-schema.rs b/oximeter/schema/src/bin/oximeter-schema.rs
similarity index 93%
rename from oximeter/oximeter/src/bin/oximeter-schema.rs
rename to oximeter/schema/src/bin/oximeter-schema.rs
index 14fb31b1e8..5595a28639 100644
--- a/oximeter/oximeter/src/bin/oximeter-schema.rs
+++ b/oximeter/schema/src/bin/oximeter-schema.rs
@@ -9,7 +9,7 @@
 use anyhow::Context as _;
 use clap::Parser;
 use clap::Subcommand;
-use oximeter::schema::ir::TimeseriesDefinition;
+use oximeter_schema::ir::TimeseriesDefinition;
 use std::num::NonZeroU8;
 use std::path::PathBuf;
 
@@ -56,7 +56,7 @@ fn main() -> anyhow::Result<()> {
             println!("{def:#?}");
         }
         Cmd::Schema { timeseries, version } => {
-            let schema = oximeter_impl::schema::ir::load_schema(&contents)?;
+            let schema = oximeter_schema::ir::load_schema(&contents)?;
             match (timeseries, version) {
                 (None, None) => {
                     for each in schema.into_iter() {
@@ -87,7 +87,7 @@ fn main() -> anyhow::Result<()> {
             }
         }
         Cmd::Emit => {
-            let code = oximeter::schema::codegen::use_timeseries(&contents)?;
+            let code = oximeter_schema::codegen::use_timeseries(&contents)?;
             let formatted =
                 prettyplease::unparse(&syn::parse_file(&format!("{code}"))?);
             println!("{formatted}");
diff --git a/oximeter/impl/src/schema/codegen.rs b/oximeter/schema/src/codegen.rs
similarity index 73%
rename from oximeter/impl/src/schema/codegen.rs
rename to oximeter/schema/src/codegen.rs
index 4778cf4970..0429cf0534 100644
--- a/oximeter/impl/src/schema/codegen.rs
+++ b/oximeter/schema/src/codegen.rs
@@ -6,18 +6,18 @@
 
 //! Generate Rust types and code from oximeter schema definitions.
 
-use crate::schema::ir::find_schema_version;
-use crate::schema::ir::load_schema;
-use crate::schema::AuthzScope;
-use crate::schema::FieldSource;
-use crate::schema::Units;
-use crate::DatumType;
-use crate::FieldSchema;
-use crate::FieldType;
-use crate::MetricsError;
-use crate::TimeseriesSchema;
+use crate::ir::find_schema_version;
+use crate::ir::load_schema;
 use chrono::prelude::DateTime;
 use chrono::prelude::Utc;
+use oximeter_types::AuthzScope;
+use oximeter_types::DatumType;
+use oximeter_types::FieldSchema;
+use oximeter_types::FieldSource;
+use oximeter_types::FieldType;
+use oximeter_types::MetricsError;
+use oximeter_types::TimeseriesSchema;
+use oximeter_types::Units;
 use proc_macro2::TokenStream;
 use quote::quote;
 
@@ -34,7 +34,7 @@ pub fn use_timeseries(contents: &str) -> Result<TokenStream, MetricsError> {
     let latest = find_schema_version(schema.iter().cloned(), None);
     let mod_name = quote::format_ident!("{}", latest[0].target_name());
     let types = emit_schema_types(latest);
-    let func = emit_schema_function(schema.into_iter());
+    let func = emit_schema_function(schema.iter());
     Ok(quote! {
         pub mod #mod_name {
             #types
@@ -43,9 +43,10 @@ pub fn use_timeseries(contents: &str) -> Result<TokenStream, MetricsError> {
     })
 }
 
-fn emit_schema_function(
-    list: impl Iterator<Item = TimeseriesSchema>,
+fn emit_schema_function<'a>(
+    list: impl Iterator<Item = &'a TimeseriesSchema>,
 ) -> TokenStream {
+    let list = list.map(quote_timeseries_schema);
     quote! {
         pub fn timeseries_schema() -> Vec<::oximeter::schema::TimeseriesSchema> {
             vec![
@@ -310,66 +311,63 @@ fn emit_one(source: FieldSource, schema: &TimeseriesSchema) -> TokenStream {
 // This is used so that we can emit a function that will return the same data as
 // we parse from the TOML file with the timeseries definition, as a way to
 // export the definitions without needing that actual file at runtime.
-impl quote::ToTokens for DatumType {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let toks = match self {
-            DatumType::Bool => quote! { ::oximeter::DatumType::Bool },
-            DatumType::I8 => quote! { ::oximeter::DatumType::I8 },
-            DatumType::U8 => quote! { ::oximeter::DatumType::U8 },
-            DatumType::I16 => quote! { ::oximeter::DatumType::I16 },
-            DatumType::U16 => quote! { ::oximeter::DatumType::U16 },
-            DatumType::I32 => quote! { ::oximeter::DatumType::I32 },
-            DatumType::U32 => quote! { ::oximeter::DatumType::U32 },
-            DatumType::I64 => quote! { ::oximeter::DatumType::I64 },
-            DatumType::U64 => quote! { ::oximeter::DatumType::U64 },
-            DatumType::F32 => quote! { ::oximeter::DatumType::F32 },
-            DatumType::F64 => quote! { ::oximeter::DatumType::F64 },
-            DatumType::String => quote! { ::oximeter::DatumType::String },
-            DatumType::Bytes => quote! { ::oximeter::DatumType::Bytes },
-            DatumType::CumulativeI64 => {
-                quote! { ::oximeter::DatumType::CumulativeI64 }
-            }
-            DatumType::CumulativeU64 => {
-                quote! { ::oximeter::DatumType::CumulativeU64 }
-            }
-            DatumType::CumulativeF32 => {
-                quote! { ::oximeter::DatumType::CumulativeF32 }
-            }
-            DatumType::CumulativeF64 => {
-                quote! { ::oximeter::DatumType::CumulativeF64 }
-            }
-            DatumType::HistogramI8 => {
-                quote! { ::oximeter::DatumType::HistogramI8 }
-            }
-            DatumType::HistogramU8 => {
-                quote! { ::oximeter::DatumType::HistogramU8 }
-            }
-            DatumType::HistogramI16 => {
-                quote! { ::oximeter::DatumType::HistogramI16 }
-            }
-            DatumType::HistogramU16 => {
-                quote! { ::oximeter::DatumType::HistogramU16 }
-            }
-            DatumType::HistogramI32 => {
-                quote! { ::oximeter::DatumType::HistogramI32 }
-            }
-            DatumType::HistogramU32 => {
-                quote! { ::oximeter::DatumType::HistogramU32 }
-            }
-            DatumType::HistogramI64 => {
-                quote! { ::oximeter::DatumType::HistogramI64 }
-            }
-            DatumType::HistogramU64 => {
-                quote! { ::oximeter::DatumType::HistogramU64 }
-            }
-            DatumType::HistogramF32 => {
-                quote! { ::oximeter::DatumType::HistogramF32 }
-            }
-            DatumType::HistogramF64 => {
-                quote! { ::oximeter::DatumType::HistogramF64 }
-            }
-        };
-        toks.to_tokens(tokens);
+fn quote_datum_type(datum_type: DatumType) -> TokenStream {
+    match datum_type {
+        DatumType::Bool => quote! { ::oximeter::DatumType::Bool },
+        DatumType::I8 => quote! { ::oximeter::DatumType::I8 },
+        DatumType::U8 => quote! { ::oximeter::DatumType::U8 },
+        DatumType::I16 => quote! { ::oximeter::DatumType::I16 },
+        DatumType::U16 => quote! { ::oximeter::DatumType::U16 },
+        DatumType::I32 => quote! { ::oximeter::DatumType::I32 },
+        DatumType::U32 => quote! { ::oximeter::DatumType::U32 },
+        DatumType::I64 => quote! { ::oximeter::DatumType::I64 },
+        DatumType::U64 => quote! { ::oximeter::DatumType::U64 },
+        DatumType::F32 => quote! { ::oximeter::DatumType::F32 },
+        DatumType::F64 => quote! { ::oximeter::DatumType::F64 },
+        DatumType::String => quote! { ::oximeter::DatumType::String },
+        DatumType::Bytes => quote! { ::oximeter::DatumType::Bytes },
+        DatumType::CumulativeI64 => {
+            quote! { ::oximeter::DatumType::CumulativeI64 }
+        }
+        DatumType::CumulativeU64 => {
+            quote! { ::oximeter::DatumType::CumulativeU64 }
+        }
+        DatumType::CumulativeF32 => {
+            quote! { ::oximeter::DatumType::CumulativeF32 }
+        }
+        DatumType::CumulativeF64 => {
+            quote! { ::oximeter::DatumType::CumulativeF64 }
+        }
+        DatumType::HistogramI8 => {
+            quote! { ::oximeter::DatumType::HistogramI8 }
+        }
+        DatumType::HistogramU8 => {
+            quote! { ::oximeter::DatumType::HistogramU8 }
+        }
+        DatumType::HistogramI16 => {
+            quote! { ::oximeter::DatumType::HistogramI16 }
+        }
+        DatumType::HistogramU16 => {
+            quote! { ::oximeter::DatumType::HistogramU16 }
+        }
+        DatumType::HistogramI32 => {
+            quote! { ::oximeter::DatumType::HistogramI32 }
+        }
+        DatumType::HistogramU32 => {
+            quote! { ::oximeter::DatumType::HistogramU32 }
+        }
+        DatumType::HistogramI64 => {
+            quote! { ::oximeter::DatumType::HistogramI64 }
+        }
+        DatumType::HistogramU64 => {
+            quote! { ::oximeter::DatumType::HistogramU64 }
+        }
+        DatumType::HistogramF32 => {
+            quote! { ::oximeter::DatumType::HistogramF32 }
+        }
+        DatumType::HistogramF64 => {
+            quote! { ::oximeter::DatumType::HistogramF64 }
+        }
     }
 }
 
@@ -452,55 +450,46 @@ fn emit_rust_type_for_field(field_type: FieldType) -> TokenStream {
     }
 }
 
-impl quote::ToTokens for FieldSource {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let toks = match self {
-            FieldSource::Target => {
-                quote! { ::oximeter::schema::FieldSource::Target }
-            }
-            FieldSource::Metric => {
-                quote! { ::oximeter::schema::FieldSource::Metric }
-            }
-        };
-        toks.to_tokens(tokens);
+fn quote_field_source(source: FieldSource) -> TokenStream {
+    match source {
+        FieldSource::Target => {
+            quote! { ::oximeter::schema::FieldSource::Target }
+        }
+        FieldSource::Metric => {
+            quote! { ::oximeter::schema::FieldSource::Metric }
+        }
     }
 }
 
-impl quote::ToTokens for FieldType {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let toks = match self {
-            FieldType::String => quote! { ::oximeter::FieldType::String },
-            FieldType::I8 => quote! { ::oximeter::FieldType::I8 },
-            FieldType::U8 => quote! { ::oximeter::FieldType::U8 },
-            FieldType::I16 => quote! { ::oximeter::FieldType::I16 },
-            FieldType::U16 => quote! { ::oximeter::FieldType::U16 },
-            FieldType::I32 => quote! { ::oximeter::FieldType::I32 },
-            FieldType::U32 => quote! { ::oximeter::FieldType::U32 },
-            FieldType::I64 => quote! { ::oximeter::FieldType::I64 },
-            FieldType::U64 => quote! { ::oximeter::FieldType::U64 },
-            FieldType::IpAddr => quote! { ::oximeter::FieldType::IpAddr },
-            FieldType::Uuid => quote! { ::oximeter::FieldType::Uuid },
-            FieldType::Bool => quote! { ::oximeter::FieldType::Bool },
-        };
-        toks.to_tokens(tokens);
+fn quote_field_type(field_type: FieldType) -> TokenStream {
+    match field_type {
+        FieldType::String => quote! { ::oximeter::FieldType::String },
+        FieldType::I8 => quote! { ::oximeter::FieldType::I8 },
+        FieldType::U8 => quote! { ::oximeter::FieldType::U8 },
+        FieldType::I16 => quote! { ::oximeter::FieldType::I16 },
+        FieldType::U16 => quote! { ::oximeter::FieldType::U16 },
+        FieldType::I32 => quote! { ::oximeter::FieldType::I32 },
+        FieldType::U32 => quote! { ::oximeter::FieldType::U32 },
+        FieldType::I64 => quote! { ::oximeter::FieldType::I64 },
+        FieldType::U64 => quote! { ::oximeter::FieldType::U64 },
+        FieldType::IpAddr => quote! { ::oximeter::FieldType::IpAddr },
+        FieldType::Uuid => quote! { ::oximeter::FieldType::Uuid },
+        FieldType::Bool => quote! { ::oximeter::FieldType::Bool },
     }
 }
 
-impl quote::ToTokens for AuthzScope {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let toks = match self {
-            AuthzScope::Fleet => {
-                quote! { ::oximeter::schema::AuthzScope::Fleet }
-            }
-            AuthzScope::Silo => quote! { ::oximeter::schema::AuthzScope::Silo },
-            AuthzScope::Project => {
-                quote! { ::oximeter::schema::AuthzScope::Project }
-            }
-            AuthzScope::ViewableToAll => {
-                quote! { ::oximeter::schema::AuthzScope::ViewableToAll }
-            }
-        };
-        toks.to_tokens(tokens);
+fn quote_authz_scope(authz_scope: AuthzScope) -> TokenStream {
+    match authz_scope {
+        AuthzScope::Fleet => {
+            quote! { ::oximeter::schema::AuthzScope::Fleet }
+        }
+        AuthzScope::Silo => quote! { ::oximeter::schema::AuthzScope::Silo },
+        AuthzScope::Project => {
+            quote! { ::oximeter::schema::AuthzScope::Project }
+        }
+        AuthzScope::ViewableToAll => {
+            quote! { ::oximeter::schema::AuthzScope::ViewableToAll }
+        }
     }
 }
 
@@ -512,85 +501,79 @@ fn quote_creation_time(created: DateTime<Utc>) -> TokenStream {
     }
 }
 
-impl quote::ToTokens for Units {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let toks = match self {
-            Units::None => quote! { ::oximeter::schema::Units::None },
-            Units::Count => quote! { ::oximeter::schema::Units::Count },
-            Units::Bytes => quote! { ::oximeter::schema::Units::Bytes },
-            Units::Seconds => quote! { ::oximeter::schema::Units::Seconds },
-            Units::Nanoseconds => {
-                quote! { ::oximeter::schema::Units::Nanoseconds }
-            }
-            Units::Amps => quote! { ::oximeter::schema::Units::Amps },
-            Units::Volts => quote! { ::oximeter::schema::Units::Volts },
-            Units::DegreesCelcius => {
-                quote! { ::oximeter::schema::Units::DegreesCelcius }
-            }
-            Units::Rpm => quote! { ::oximeter::schema::Units::Rpm  },
-        };
-        toks.to_tokens(tokens);
+fn quote_units(units: Units) -> TokenStream {
+    match units {
+        Units::None => quote! { ::oximeter::schema::Units::None },
+        Units::Count => quote! { ::oximeter::schema::Units::Count },
+        Units::Bytes => quote! { ::oximeter::schema::Units::Bytes },
+        Units::Seconds => quote! { ::oximeter::schema::Units::Seconds },
+        Units::Nanoseconds => {
+            quote! { ::oximeter::schema::Units::Nanoseconds }
+        }
+        Units::Amps => quote! { ::oximeter::schema::Units::Amps },
+        Units::Volts => quote! { ::oximeter::schema::Units::Volts },
+        Units::DegreesCelcius => {
+            quote! { ::oximeter::schema::Units::DegreesCelcius }
+        }
+        Units::Rpm => quote! { ::oximeter::schema::Units::Rpm },
     }
 }
 
-impl quote::ToTokens for FieldSchema {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let name = self.name.as_str();
-        let field_type = self.field_type;
-        let source = self.source;
-        let description = self.description.as_str();
-        let toks = quote! {
-            ::oximeter::FieldSchema {
-                name: String::from(#name),
-                field_type: #field_type,
-                source: #source,
-                description: String::from(#description),
-            }
-        };
-        toks.to_tokens(tokens);
+fn quote_field_schema(field_schema: &FieldSchema) -> TokenStream {
+    let name = field_schema.name.as_str();
+    let field_type = quote_field_type(field_schema.field_type);
+    let source = quote_field_source(field_schema.source);
+    let description = field_schema.description.as_str();
+    quote! {
+        ::oximeter::FieldSchema {
+            name: String::from(#name),
+            field_type: #field_type,
+            source: #source,
+            description: String::from(#description),
+        }
     }
 }
 
-impl quote::ToTokens for TimeseriesSchema {
-    fn to_tokens(&self, tokens: &mut TokenStream) {
-        let field_schema = &self.field_schema;
-        let timeseries_name = self.timeseries_name.to_string();
-        let target_description = self.description.target.as_str();
-        let metric_description = self.description.metric.as_str();
-        let authz_scope = self.authz_scope;
-        let units = self.units;
-        let datum_type = self.datum_type;
-        let ver = self.version.get();
-        let version = quote! { ::core::num::NonZeroU8::new(#ver).unwrap() };
-        let created = quote_creation_time(self.created);
-        let toks = quote! {
-            ::oximeter::schema::TimeseriesSchema {
-                timeseries_name:
-                    <::oximeter::TimeseriesName as ::std::convert::TryFrom<&str>>::try_from(
-                        #timeseries_name
-                    ).unwrap(),
-                description: ::oximeter::schema::TimeseriesDescription {
-                    target: String::from(#target_description),
-                    metric: String::from(#metric_description),
-                },
-                authz_scope: #authz_scope,
-                units: #units,
-                field_schema: ::std::collections::BTreeSet::from([
-                    #(#field_schema),*
-                ]),
-                datum_type: #datum_type,
-                version: #version,
-                created: #created,
-            }
-        };
-        toks.to_tokens(tokens);
+fn quote_timeseries_schema(
+    timeseries_schema: &TimeseriesSchema,
+) -> TokenStream {
+    let field_schema =
+        timeseries_schema.field_schema.iter().map(quote_field_schema);
+    let timeseries_name = timeseries_schema.timeseries_name.to_string();
+    let target_description = timeseries_schema.description.target.as_str();
+    let metric_description = timeseries_schema.description.metric.as_str();
+    let authz_scope = quote_authz_scope(timeseries_schema.authz_scope);
+    let units = quote_units(timeseries_schema.units);
+    let datum_type = quote_datum_type(timeseries_schema.datum_type);
+    let ver = timeseries_schema.version.get();
+    let version = quote! { ::core::num::NonZeroU8::new(#ver).unwrap() };
+    let created = quote_creation_time(timeseries_schema.created);
+    quote! {
+        ::oximeter::schema::TimeseriesSchema {
+            timeseries_name:
+                <::oximeter::TimeseriesName as ::std::convert::TryFrom<&str>>::try_from(
+                    #timeseries_name
+                ).unwrap(),
+            description: ::oximeter::schema::TimeseriesDescription {
+                target: String::from(#target_description),
+                metric: String::from(#metric_description),
+            },
+            authz_scope: #authz_scope,
+            units: #units,
+            field_schema: ::std::collections::BTreeSet::from([
+                #(#field_schema),*
+            ]),
+            datum_type: #datum_type,
+            version: #version,
+            created: #created,
+        }
     }
 }
 
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::schema::TimeseriesDescription;
+    use oximeter_types::TimeseriesDescription;
     use std::{collections::BTreeSet, num::NonZeroU8};
 
     #[test]
diff --git a/oximeter/impl/src/schema/ir.rs b/oximeter/schema/src/ir.rs
similarity index 99%
rename from oximeter/impl/src/schema/ir.rs
rename to oximeter/schema/src/ir.rs
index f7a209294f..370236000a 100644
--- a/oximeter/impl/src/schema/ir.rs
+++ b/oximeter/schema/src/ir.rs
@@ -11,17 +11,17 @@
 //! inspected or used to generate code that contains the equivalent Rust types
 //! and trait implementations.
 
-use crate::schema::AuthzScope;
-use crate::schema::DatumType;
-use crate::schema::FieldSource;
-use crate::schema::FieldType;
-use crate::schema::TimeseriesDescription;
-use crate::schema::Units;
-use crate::FieldSchema;
-use crate::MetricsError;
-use crate::TimeseriesName;
-use crate::TimeseriesSchema;
 use chrono::Utc;
+use oximeter_types::AuthzScope;
+use oximeter_types::DatumType;
+use oximeter_types::FieldSchema;
+use oximeter_types::FieldSource;
+use oximeter_types::FieldType;
+use oximeter_types::MetricsError;
+use oximeter_types::TimeseriesDescription;
+use oximeter_types::TimeseriesName;
+use oximeter_types::TimeseriesSchema;
+use oximeter_types::Units;
 use serde::Deserialize;
 use std::collections::btree_map::Entry;
 use std::collections::BTreeMap;
diff --git a/oximeter/schema/src/lib.rs b/oximeter/schema/src/lib.rs
new file mode 100644
index 0000000000..b1ce73a940
--- /dev/null
+++ b/oximeter/schema/src/lib.rs
@@ -0,0 +1,12 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Copyright 2024 Oxide Computer Company
+
+//! Tools for working with schemas for fields and timeseries.
+//!
+//! The actual schema type definitions are in [`oximeter_types::schema`].
+
+pub mod codegen;
+pub mod ir;
diff --git a/oximeter/test-utils/Cargo.toml b/oximeter/test-utils/Cargo.toml
new file mode 100644
index 0000000000..f463e74aca
--- /dev/null
+++ b/oximeter/test-utils/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "oximeter-test-utils"
+version = "0.1.0"
+edition = "2021"
+license = "MPL-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+chrono.workspace = true
+omicron-workspace-hack.workspace = true
+oximeter-macro-impl.workspace = true
+oximeter-types.workspace = true
+uuid.workspace = true
diff --git a/oximeter/test-utils/src/lib.rs b/oximeter/test-utils/src/lib.rs
new file mode 100644
index 0000000000..04c49add65
--- /dev/null
+++ b/oximeter/test-utils/src/lib.rs
@@ -0,0 +1,295 @@
+// Copyright 2024 Oxide Computer Company
+
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! Utilities for testing the oximeter crate.
+
+// Export the current crate as `oximeter`. The macros defined in `oximeter-macro-impl` generate
+// code referring to symbols like `oximeter::traits::Target`. In consumers of this crate, that's
+// fine, but internally there _is_ no crate named `oximeter`, it's just `self` or `crate`.
+//
+// See https://github.com/rust-lang/rust/pull/55275 for the PR introducing this fix, which links to
+// lots of related issues and discussion.
+extern crate self as oximeter;
+
+use oximeter_macro_impl::{Metric, Target};
+use oximeter_types::histogram;
+use oximeter_types::histogram::{Histogram, Record};
+use oximeter_types::traits;
+use oximeter_types::types::{
+    Cumulative, Datum, DatumType, FieldType, FieldValue, Measurement, Sample,
+};
+use oximeter_types::{Metric, Target};
+use uuid::Uuid;
+
+#[derive(Target)]
+pub struct TestTarget {
+    pub name1: String,
+    pub name2: String,
+    pub num: i64,
+}
+
+impl Default for TestTarget {
+    fn default() -> Self {
+        TestTarget {
+            name1: "first_name".into(),
+            name2: "second_name".into(),
+            num: 0,
+        }
+    }
+}
+
+#[derive(Metric)]
+pub struct TestMetric {
+    pub id: Uuid,
+    pub good: bool,
+    pub datum: i64,
+}
+
+#[derive(Metric)]
+pub struct TestCumulativeMetric {
+    pub id: Uuid,
+    pub good: bool,
+    pub datum: Cumulative<i64>,
+}
+
+#[derive(Metric)]
+pub struct TestHistogram {
+    pub id: Uuid,
+    pub good: bool,
+    pub datum: Histogram<f64>,
+}
+
+const ID: Uuid = uuid::uuid!("e00ced4d-39d1-446a-ae85-a67f05c9750b");
+
+pub fn make_sample() -> Sample {
+    let target = TestTarget::default();
+    let metric = TestMetric { id: ID, good: true, datum: 1 };
+    Sample::new(&target, &metric).unwrap()
+}
+
+pub fn make_missing_sample() -> Sample {
+    let target = TestTarget::default();
+    let metric = TestMetric { id: ID, good: true, datum: 1 };
+    Sample::new_missing(&target, &metric).unwrap()
+}
+
+pub fn make_hist_sample() -> Sample {
+    let target = TestTarget::default();
+    let mut hist = histogram::Histogram::new(&[0.0, 5.0, 10.0]).unwrap();
+    hist.sample(1.0).unwrap();
+    hist.sample(2.0).unwrap();
+    hist.sample(6.0).unwrap();
+    let metric = TestHistogram { id: ID, good: true, datum: hist };
+    Sample::new(&target, &metric).unwrap()
+}
+
+/// A target identifying a single virtual machine instance
+#[derive(Debug, Clone, Copy, oximeter::Target)]
+pub struct VirtualMachine {
+    pub project_id: Uuid,
+    pub instance_id: Uuid,
+}
+
+/// A metric recording the total time a vCPU is busy, by its ID
+#[derive(Debug, Clone, Copy, oximeter::Metric)]
+pub struct CpuBusy {
+    cpu_id: i64,
+    datum: Cumulative<f64>,
+}
+
+pub fn generate_test_samples(
+    n_projects: usize,
+    n_instances: usize,
+    n_cpus: usize,
+    n_samples: usize,
+) -> Vec<Sample> {
+    let n_timeseries = n_projects * n_instances * n_cpus;
+    let mut samples = Vec::with_capacity(n_samples * n_timeseries);
+    for _ in 0..n_projects {
+        let project_id = Uuid::new_v4();
+        for _ in 0..n_instances {
+            let vm = VirtualMachine { project_id, instance_id: Uuid::new_v4() };
+            for cpu in 0..n_cpus {
+                for sample in 0..n_samples {
+                    let cpu_busy = CpuBusy {
+                        cpu_id: cpu as _,
+                        datum: Cumulative::new(sample as f64),
+                    };
+                    let sample = Sample::new(&vm, &cpu_busy).unwrap();
+                    samples.push(sample);
+                }
+            }
+        }
+    }
+    samples
+}
+
+#[cfg(test)]
+mod tests {
+    use chrono::Utc;
+    use oximeter_types::{
+        schema::{
+            default_schema_version, AuthzScope, FieldSchema, FieldSource,
+            TimeseriesSchema, Units,
+        },
+        TimeseriesName,
+    };
+
+    use super::*;
+
+    #[test]
+    fn test_gen_test_samples() {
+        let (n_projects, n_instances, n_cpus, n_samples) = (2, 2, 2, 2);
+        let samples =
+            generate_test_samples(n_projects, n_instances, n_cpus, n_samples);
+        assert_eq!(
+            samples.len(),
+            n_projects * n_instances * n_cpus * n_samples
+        );
+    }
+
+    #[test]
+    fn test_sample_struct() {
+        let t = TestTarget::default();
+        let m = TestMetric { id: Uuid::new_v4(), good: true, datum: 1i64 };
+        let sample = Sample::new(&t, &m).unwrap();
+        assert_eq!(
+            sample.timeseries_name,
+            format!("{}:{}", t.name(), m.name())
+        );
+        assert!(sample.measurement.start_time().is_none());
+        assert_eq!(sample.measurement.datum(), &Datum::from(1i64));
+
+        let m = TestCumulativeMetric {
+            id: Uuid::new_v4(),
+            good: true,
+            datum: 1i64.into(),
+        };
+        let sample = Sample::new(&t, &m).unwrap();
+        assert!(sample.measurement.start_time().is_some());
+    }
+
+    #[derive(Target)]
+    struct MyTarget {
+        id: Uuid,
+        name: String,
+    }
+
+    const ID: Uuid = uuid::uuid!("ca565ef4-65dc-4ab0-8622-7be43ed72105");
+
+    impl Default for MyTarget {
+        fn default() -> Self {
+            Self { id: ID, name: String::from("name") }
+        }
+    }
+
+    #[derive(Metric)]
+    struct MyMetric {
+        happy: bool,
+        datum: u64,
+    }
+
+    impl Default for MyMetric {
+        fn default() -> Self {
+            Self { happy: true, datum: 0 }
+        }
+    }
+
+    #[test]
+    fn test_timeseries_schema_from_parts() {
+        let target = MyTarget::default();
+        let metric = MyMetric::default();
+        let schema = TimeseriesSchema::new(&target, &metric).unwrap();
+
+        assert_eq!(schema.timeseries_name, "my_target:my_metric");
+        let f = schema.schema_for_field("id").unwrap();
+        assert_eq!(f.name, "id");
+        assert_eq!(f.field_type, FieldType::Uuid);
+        assert_eq!(f.source, FieldSource::Target);
+
+        let f = schema.schema_for_field("name").unwrap();
+        assert_eq!(f.name, "name");
+        assert_eq!(f.field_type, FieldType::String);
+        assert_eq!(f.source, FieldSource::Target);
+
+        let f = schema.schema_for_field("happy").unwrap();
+        assert_eq!(f.name, "happy");
+        assert_eq!(f.field_type, FieldType::Bool);
+        assert_eq!(f.source, FieldSource::Metric);
+        assert_eq!(schema.datum_type, DatumType::U64);
+    }
+
+    #[test]
+    fn test_timeseries_schema_from_sample() {
+        let target = MyTarget::default();
+        let metric = MyMetric::default();
+        let sample = Sample::new(&target, &metric).unwrap();
+        let schema = TimeseriesSchema::new(&target, &metric).unwrap();
+        let schema_from_sample = TimeseriesSchema::from(&sample);
+        assert_eq!(schema, schema_from_sample);
+    }
+
+    // Test that we correctly order field across a target and metric.
+    //
+    // In an earlier commit, we switched from storing fields in an unordered Vec
+    // to using a BTree{Map,Set} to ensure ordering by name. However, the
+    // `TimeseriesSchema` type stored all its fields by chaining the sorted
+    // fields from the target and metric, without then sorting _across_ them.
+    //
+    // This was exacerbated by the error reporting, where we did in fact sort
+    // all fields across the target and metric, making it difficult to tell how
+    // the derived schema was different, if at all.
+    //
+    // This test generates a sample with a schema where the target and metric
+    // fields are sorted within them, but not across them. We check that the
+    // derived schema are actually equal, which means we've imposed that
+    // ordering when deriving the schema.
+    #[test]
+    fn test_schema_field_ordering_across_target_metric() {
+        let target_field = FieldSchema {
+            name: String::from("later"),
+            field_type: FieldType::U64,
+            source: FieldSource::Target,
+            description: String::new(),
+        };
+        let metric_field = FieldSchema {
+            name: String::from("earlier"),
+            field_type: FieldType::U64,
+            source: FieldSource::Metric,
+            description: String::new(),
+        };
+        let timeseries_name: TimeseriesName = "foo:bar".parse().unwrap();
+        let datum_type = DatumType::U64;
+        let field_schema =
+            [target_field.clone(), metric_field.clone()].into_iter().collect();
+        let expected_schema = TimeseriesSchema {
+            timeseries_name,
+            description: Default::default(),
+            field_schema,
+            datum_type,
+            version: default_schema_version(),
+            authz_scope: AuthzScope::Fleet,
+            units: Units::Count,
+            created: Utc::now(),
+        };
+
+        #[derive(oximeter::Target)]
+        struct Foo {
+            later: u64,
+        }
+        #[derive(oximeter::Metric)]
+        struct Bar {
+            earlier: u64,
+            datum: u64,
+        }
+
+        let target = Foo { later: 1 };
+        let metric = Bar { earlier: 2, datum: 10 };
+        let sample = Sample::new(&target, &metric).unwrap();
+        let derived_schema = TimeseriesSchema::from(&sample);
+        assert_eq!(derived_schema, expected_schema);
+    }
+}
diff --git a/oximeter/timeseries-macro/Cargo.toml b/oximeter/timeseries-macro/Cargo.toml
index db591aed06..2fb8b8f312 100644
--- a/oximeter/timeseries-macro/Cargo.toml
+++ b/oximeter/timeseries-macro/Cargo.toml
@@ -8,7 +8,8 @@ proc-macro = true
 
 [dependencies]
 omicron-workspace-hack.workspace = true
-oximeter-impl.workspace = true
+oximeter-schema.workspace = true
+oximeter-types.workspace = true
 proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
diff --git a/oximeter/timeseries-macro/src/lib.rs b/oximeter/timeseries-macro/src/lib.rs
index 0c70e73445..12ec2cc417 100644
--- a/oximeter/timeseries-macro/src/lib.rs
+++ b/oximeter/timeseries-macro/src/lib.rs
@@ -8,7 +8,7 @@
 
 extern crate proc_macro;
 
-use oximeter_impl::schema::SCHEMA_DIRECTORY;
+use oximeter_types::schema::SCHEMA_DIRECTORY;
 
 /// Generate code to use the timeseries from one target.
 ///
@@ -45,7 +45,7 @@ pub fn use_timeseries(
                         .into();
                 }
             };
-            match oximeter_impl::schema::codegen::use_timeseries(&contents) {
+            match oximeter_schema::codegen::use_timeseries(&contents) {
                 Ok(toks) => {
                     let path_ = path.display().to_string();
                     return quote::quote! {
diff --git a/oximeter/impl/Cargo.toml b/oximeter/types/Cargo.toml
similarity index 78%
rename from oximeter/impl/Cargo.toml
rename to oximeter/types/Cargo.toml
index 91277d9d47..6d6bbc07e6 100644
--- a/oximeter/impl/Cargo.toml
+++ b/oximeter/types/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "oximeter-impl"
+name = "oximeter-types"
 version = "0.1.0"
 edition = "2021"
 license = "MPL-2.0"
@@ -11,22 +11,13 @@ workspace = true
 bytes = { workspace = true, features = [ "serde" ] }
 chrono.workspace = true
 float-ord.workspace = true
-heck.workspace = true
 num.workspace = true
 omicron-common.workspace = true
 omicron-workspace-hack.workspace = true
-oximeter-macro-impl.workspace = true
-prettyplease.workspace = true
-proc-macro2.workspace = true
-quote.workspace = true
 regex.workspace = true
 schemars = { workspace = true, features = [ "uuid1", "bytes", "chrono" ] }
 serde.workspace = true
-serde_json.workspace = true
-slog-error-chain.workspace = true
 strum.workspace = true
-syn.workspace = true
-toml.workspace = true
 thiserror.workspace = true
 uuid.workspace = true
 
@@ -34,6 +25,7 @@ uuid.workspace = true
 approx.workspace = true
 # For benchmark
 criterion.workspace = true
+oximeter-macro-impl.workspace = true
 rand = { workspace = true, features = ["std_rng"] }
 rand_distr.workspace = true
 rstest.workspace = true
diff --git a/oximeter/impl/benches/quantile.rs b/oximeter/types/benches/quantile.rs
similarity index 97%
rename from oximeter/impl/benches/quantile.rs
rename to oximeter/types/benches/quantile.rs
index 4540ba8f6a..b88cb211e6 100644
--- a/oximeter/impl/benches/quantile.rs
+++ b/oximeter/types/benches/quantile.rs
@@ -8,7 +8,7 @@
 // Copyright 2024 Oxide Computer Company
 
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use oximeter_impl::Quantile;
+use oximeter_types::Quantile;
 use rand_distr::{Distribution, Normal};
 
 /// Emulates baseline code in a Python implementation of the P²
diff --git a/oximeter/impl/src/histogram.rs b/oximeter/types/src/histogram.rs
similarity index 99%
rename from oximeter/impl/src/histogram.rs
rename to oximeter/types/src/histogram.rs
index 40df0a1b41..0b85727ee0 100644
--- a/oximeter/impl/src/histogram.rs
+++ b/oximeter/types/src/histogram.rs
@@ -523,9 +523,9 @@ where
     /// Example
     /// -------
     /// ```rust
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::histogram::Histogram;
     ///
     /// let hist = Histogram::with_bins(&[(0..10).into(), (10..100).into()]).unwrap();
@@ -922,9 +922,9 @@ where
     /// -------
     ///
     /// ```rust
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::histogram::{Histogram, BinRange};
     /// use std::ops::{RangeBounds, Bound};
     ///
diff --git a/oximeter/impl/src/lib.rs b/oximeter/types/src/lib.rs
similarity index 92%
rename from oximeter/impl/src/lib.rs
rename to oximeter/types/src/lib.rs
index 5acbeb9422..7a1a480f8d 100644
--- a/oximeter/impl/src/lib.rs
+++ b/oximeter/types/src/lib.rs
@@ -4,8 +4,6 @@
 
 // Copyright 2024 Oxide Computer Company
 
-pub use oximeter_macro_impl::*;
-
 // Export the current crate as `oximeter`. The macros defined in `oximeter-macro-impl` generate
 // code referring to symbols like `oximeter::traits::Target`. In consumers of this crate, that's
 // fine, but internally there _is_ no crate named `oximeter`, it's just `self` or `crate`.
@@ -17,15 +15,18 @@ extern crate self as oximeter;
 pub mod histogram;
 pub mod quantile;
 pub mod schema;
-pub mod test_util;
 pub mod traits;
 pub mod types;
 
 pub use quantile::Quantile;
 pub use quantile::QuantileError;
+pub use schema::AuthzScope;
 pub use schema::FieldSchema;
+pub use schema::FieldSource;
+pub use schema::TimeseriesDescription;
 pub use schema::TimeseriesName;
 pub use schema::TimeseriesSchema;
+pub use schema::Units;
 pub use traits::Metric;
 pub use traits::Producer;
 pub use traits::Target;
diff --git a/oximeter/impl/src/quantile.rs b/oximeter/types/src/quantile.rs
similarity index 97%
rename from oximeter/impl/src/quantile.rs
rename to oximeter/types/src/quantile.rs
index fafe9c9ece..40777217e5 100644
--- a/oximeter/impl/src/quantile.rs
+++ b/oximeter/types/src/quantile.rs
@@ -78,9 +78,9 @@ impl Quantile {
     /// # Examples
     ///
     /// ```
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::Quantile;
     /// let q = Quantile::new(0.5).unwrap();
     ///
@@ -116,9 +116,9 @@ impl Quantile {
     ///
     /// # Examples
     /// ```
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::Quantile;
     /// let q = Quantile::from_parts(
     ///    0.5,
@@ -200,9 +200,9 @@ impl Quantile {
     /// # Examples
     ///
     /// ```
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::Quantile;
     /// let mut q = Quantile::new(0.5).unwrap();
     /// for o in 1..=100 {
@@ -243,9 +243,9 @@ impl Quantile {
     /// # Examples
     ///
     /// ```
-    /// # // Rename the impl crate so the doctests can refer to the public
+    /// # // Rename the types crate so the doctests can refer to the public
     /// # // `oximeter` crate, not the private impl.
-    /// # use oximeter_impl as oximeter;
+    /// # use oximeter_types as oximeter;
     /// use oximeter::Quantile;
     /// let mut q = Quantile::new(0.9).unwrap();
     /// q.append(10).unwrap();
diff --git a/oximeter/impl/src/schema/mod.rs b/oximeter/types/src/schema.rs
similarity index 75%
rename from oximeter/impl/src/schema/mod.rs
rename to oximeter/types/src/schema.rs
index 250604d7be..2efd5265ff 100644
--- a/oximeter/impl/src/schema/mod.rs
+++ b/oximeter/types/src/schema.rs
@@ -6,9 +6,6 @@
 
 //! Tools for working with schema for fields and timeseries.
 
-pub mod codegen;
-pub mod ir;
-
 use crate::types::DatumType;
 use crate::types::FieldType;
 use crate::types::MetricsError;
@@ -402,7 +399,6 @@ pub enum AuthzScope {
 mod tests {
     use super::*;
     use std::convert::TryFrom;
-    use uuid::Uuid;
 
     #[test]
     fn test_timeseries_name() {
@@ -426,127 +422,6 @@ mod tests {
         assert!(TimeseriesName::try_from("x.a:b").is_err());
     }
 
-    #[derive(Target)]
-    struct MyTarget {
-        id: Uuid,
-        name: String,
-    }
-
-    const ID: Uuid = uuid::uuid!("ca565ef4-65dc-4ab0-8622-7be43ed72105");
-
-    impl Default for MyTarget {
-        fn default() -> Self {
-            Self { id: ID, name: String::from("name") }
-        }
-    }
-
-    #[derive(Metric)]
-    struct MyMetric {
-        happy: bool,
-        datum: u64,
-    }
-
-    impl Default for MyMetric {
-        fn default() -> Self {
-            Self { happy: true, datum: 0 }
-        }
-    }
-
-    #[test]
-    fn test_timeseries_schema_from_parts() {
-        let target = MyTarget::default();
-        let metric = MyMetric::default();
-        let schema = TimeseriesSchema::new(&target, &metric).unwrap();
-
-        assert_eq!(schema.timeseries_name, "my_target:my_metric");
-        let f = schema.schema_for_field("id").unwrap();
-        assert_eq!(f.name, "id");
-        assert_eq!(f.field_type, FieldType::Uuid);
-        assert_eq!(f.source, FieldSource::Target);
-
-        let f = schema.schema_for_field("name").unwrap();
-        assert_eq!(f.name, "name");
-        assert_eq!(f.field_type, FieldType::String);
-        assert_eq!(f.source, FieldSource::Target);
-
-        let f = schema.schema_for_field("happy").unwrap();
-        assert_eq!(f.name, "happy");
-        assert_eq!(f.field_type, FieldType::Bool);
-        assert_eq!(f.source, FieldSource::Metric);
-        assert_eq!(schema.datum_type, DatumType::U64);
-    }
-
-    #[test]
-    fn test_timeseries_schema_from_sample() {
-        let target = MyTarget::default();
-        let metric = MyMetric::default();
-        let sample = Sample::new(&target, &metric).unwrap();
-        let schema = TimeseriesSchema::new(&target, &metric).unwrap();
-        let schema_from_sample = TimeseriesSchema::from(&sample);
-        assert_eq!(schema, schema_from_sample);
-    }
-
-    // Test that we correctly order field across a target and metric.
-    //
-    // In an earlier commit, we switched from storing fields in an unordered Vec
-    // to using a BTree{Map,Set} to ensure ordering by name. However, the
-    // `TimeseriesSchema` type stored all its fields by chaining the sorted
-    // fields from the target and metric, without then sorting _across_ them.
-    //
-    // This was exacerbated by the error reporting, where we did in fact sort
-    // all fields across the target and metric, making it difficult to tell how
-    // the derived schema was different, if at all.
-    //
-    // This test generates a sample with a schema where the target and metric
-    // fields are sorted within them, but not across them. We check that the
-    // derived schema are actually equal, which means we've imposed that
-    // ordering when deriving the schema.
-    #[test]
-    fn test_schema_field_ordering_across_target_metric() {
-        let target_field = FieldSchema {
-            name: String::from("later"),
-            field_type: FieldType::U64,
-            source: FieldSource::Target,
-            description: String::new(),
-        };
-        let metric_field = FieldSchema {
-            name: String::from("earlier"),
-            field_type: FieldType::U64,
-            source: FieldSource::Metric,
-            description: String::new(),
-        };
-        let timeseries_name: TimeseriesName = "foo:bar".parse().unwrap();
-        let datum_type = DatumType::U64;
-        let field_schema =
-            [target_field.clone(), metric_field.clone()].into_iter().collect();
-        let expected_schema = TimeseriesSchema {
-            timeseries_name,
-            description: Default::default(),
-            field_schema,
-            datum_type,
-            version: default_schema_version(),
-            authz_scope: AuthzScope::Fleet,
-            units: Units::Count,
-            created: Utc::now(),
-        };
-
-        #[derive(oximeter::Target)]
-        struct Foo {
-            later: u64,
-        }
-        #[derive(oximeter::Metric)]
-        struct Bar {
-            earlier: u64,
-            datum: u64,
-        }
-
-        let target = Foo { later: 1 };
-        let metric = Bar { earlier: 2, datum: 10 };
-        let sample = Sample::new(&target, &metric).unwrap();
-        let derived_schema = TimeseriesSchema::from(&sample);
-        assert_eq!(derived_schema, expected_schema);
-    }
-
     #[test]
     fn test_field_schema_ordering() {
         let mut fields = BTreeSet::new();
diff --git a/oximeter/impl/src/traits.rs b/oximeter/types/src/traits.rs
similarity index 96%
rename from oximeter/impl/src/traits.rs
rename to oximeter/types/src/traits.rs
index 16baa4f619..91ecca817d 100644
--- a/oximeter/impl/src/traits.rs
+++ b/oximeter/types/src/traits.rs
@@ -45,9 +45,9 @@ use std::ops::AddAssign;
 /// --------
 ///
 /// ```rust
-/// # // Rename the impl crate so the doctests can refer to the public
+/// # // Rename the types crate so the doctests can refer to the public
 /// # // `oximeter` crate, not the private impl.
-/// # extern crate oximeter_impl as oximeter;
+/// # extern crate oximeter_types as oximeter;
 /// # use oximeter_macro_impl::*;
 /// use oximeter::{traits::Target, types::FieldType};
 /// use uuid::Uuid;
@@ -75,9 +75,9 @@ use std::ops::AddAssign;
 /// supported types.
 ///
 /// ```compile_fail
-/// # // Rename the impl crate so the doctests can refer to the public
+/// # // Rename the types crate so the doctests can refer to the public
 /// # // `oximeter` crate, not the private impl.
-/// # extern crate oximeter_impl as oximeter;
+/// # extern crate oximeter_types as oximeter;
 /// # use oximeter_macro_impl::*;
 /// #[derive(oximeter::Target)]
 /// struct Bad {
@@ -160,9 +160,9 @@ pub trait Target {
 /// Example
 /// -------
 /// ```rust
-/// # // Rename the impl crate so the doctests can refer to the public
+/// # // Rename the types crate so the doctests can refer to the public
 /// # // `oximeter` crate, not the private impl.
-/// # extern crate oximeter_impl as oximeter;
+/// # extern crate oximeter_types as oximeter;
 /// # use oximeter_macro_impl::*;
 /// use chrono::Utc;
 /// use oximeter::Metric;
@@ -185,9 +185,9 @@ pub trait Target {
 /// an unsupported type.
 ///
 /// ```compile_fail
-/// # // Rename the impl crate so the doctests can refer to the public
+/// # // Rename the types crate so the doctests can refer to the public
 /// # // `oximeter` crate, not the private impl.
-/// # extern crate oximeter_impl as oximeter;
+/// # extern crate oximeter_types as oximeter;
 /// # use oximeter_macro_impl::*;
 /// #[derive(Metric)]
 /// pub struct BadType {
@@ -364,9 +364,9 @@ pub use crate::histogram::HistogramSupport;
 /// Example
 /// -------
 /// ```rust
-/// # // Rename the impl crate so the doctests can refer to the public
+/// # // Rename the types crate so the doctests can refer to the public
 /// # // `oximeter` crate, not the private impl.
-/// # extern crate oximeter_impl as oximeter;
+/// # extern crate oximeter_types as oximeter;
 /// # use oximeter_macro_impl::*;
 /// use oximeter::{Datum, MetricsError, Metric, Producer, Target};
 /// use oximeter::types::{Measurement, Sample, Cumulative};
@@ -464,6 +464,8 @@ pub trait Producer: Send + Sync + std::fmt::Debug + 'static {
 
 #[cfg(test)]
 mod tests {
+    use oximeter_macro_impl::{Metric, Target};
+
     use crate::types;
     use crate::{
         Datum, DatumType, FieldType, FieldValue, Metric, MetricsError,
diff --git a/oximeter/impl/src/types.rs b/oximeter/types/src/types.rs
similarity index 97%
rename from oximeter/impl/src/types.rs
rename to oximeter/types/src/types.rs
index 370557f7f7..60260e3649 100644
--- a/oximeter/impl/src/types.rs
+++ b/oximeter/types/src/types.rs
@@ -850,7 +850,7 @@ pub struct Sample {
     /// The version of the timeseries this sample belongs to
     //
     // TODO-cleanup: This should be removed once schema are tracked in CRDB.
-    #[serde(default = "::oximeter::schema::default_schema_version")]
+    #[serde(default = "crate::schema::default_schema_version")]
     pub timeseries_version: NonZeroU8,
 
     // Target name and fields
@@ -1104,15 +1104,10 @@ mod tests {
     use super::Measurement;
     use super::MetricsError;
     use super::Sample;
-    use crate::test_util;
-    use crate::types;
-    use crate::Metric;
-    use crate::Target;
     use bytes::Bytes;
     use std::collections::BTreeMap;
     use std::net::Ipv4Addr;
     use std::net::Ipv6Addr;
-    use uuid::Uuid;
 
     #[test]
     fn test_cumulative_i64() {
@@ -1176,31 +1171,6 @@ mod tests {
         assert!(measurement.timestamp() >= measurement.start_time().unwrap());
     }
 
-    #[test]
-    fn test_sample_struct() {
-        let t = test_util::TestTarget::default();
-        let m = test_util::TestMetric {
-            id: Uuid::new_v4(),
-            good: true,
-            datum: 1i64,
-        };
-        let sample = types::Sample::new(&t, &m).unwrap();
-        assert_eq!(
-            sample.timeseries_name,
-            format!("{}:{}", t.name(), m.name())
-        );
-        assert!(sample.measurement.start_time().is_none());
-        assert_eq!(sample.measurement.datum(), &Datum::from(1i64));
-
-        let m = test_util::TestCumulativeMetric {
-            id: Uuid::new_v4(),
-            good: true,
-            datum: 1i64.into(),
-        };
-        let sample = types::Sample::new(&t, &m).unwrap();
-        assert!(sample.measurement.start_time().is_some());
-    }
-
     #[rstest::rstest]
     #[case::as_string("some string", FieldValue::String("some string".into()))]
     #[case::as_i8("2", FieldValue::I8(2))]
diff --git a/oximeter/impl/tests/fail/failures.rs b/oximeter/types/tests/fail/failures.rs
similarity index 100%
rename from oximeter/impl/tests/fail/failures.rs
rename to oximeter/types/tests/fail/failures.rs
diff --git a/oximeter/impl/tests/fail/failures.stderr b/oximeter/types/tests/fail/failures.stderr
similarity index 100%
rename from oximeter/impl/tests/fail/failures.stderr
rename to oximeter/types/tests/fail/failures.stderr
diff --git a/oximeter/impl/tests/test_compilation.rs b/oximeter/types/tests/test_compilation.rs
similarity index 100%
rename from oximeter/impl/tests/test_compilation.rs
rename to oximeter/types/tests/test_compilation.rs

From dae480a84551638886a4c66c1d29d2f8d6669a9d Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 05:36:18 +0000
Subject: [PATCH 13/28] Update Rust crate libc to 0.2.156 (#6375)

Co-authored-by: oxide-renovate[bot] <146848827+oxide-renovate[bot]@users.noreply.github.com>
---
 Cargo.lock                | 4 ++--
 Cargo.toml                | 2 +-
 workspace-hack/Cargo.toml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3b62f3001a..bad1af8f6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4307,9 +4307,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.156"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
 
 [[package]]
 name = "libdlpi-sys"
diff --git a/Cargo.toml b/Cargo.toml
index ea687936e3..cac3395a7d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -396,7 +396,7 @@ ipnetwork = { version = "0.20", features = ["schemars"] }
 ispf = { git = "https://github.com/oxidecomputer/ispf" }
 key-manager = { path = "key-manager" }
 kstat-rs = "0.2.4"
-libc = "0.2.155"
+libc = "0.2.156"
 libfalcon = { git = "https://github.com/oxidecomputer/falcon", rev = "e69694a1f7cc9fe31fab27f321017280531fb5f7" }
 libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "dd5bb221d327a1bc9287961718c3c10d6bd37da0" }
 linear-map = "1.2.0"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 5dc3bc11e7..854179a4db 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -69,7 +69,7 @@ itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
-libc = { version = "0.2.155", features = ["extra_traits"] }
+libc = { version = "0.2.156", features = ["extra_traits"] }
 log = { version = "0.4.21", default-features = false, features = ["std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }
@@ -176,7 +176,7 @@ itertools-5ef9efb8ec2df382 = { package = "itertools", version = "0.12.1" }
 itertools-93f6ce9d446188ac = { package = "itertools", version = "0.10.5" }
 lalrpop-util = { version = "0.19.12" }
 lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
-libc = { version = "0.2.155", features = ["extra_traits"] }
+libc = { version = "0.2.156", features = ["extra_traits"] }
 log = { version = "0.4.21", default-features = false, features = ["std"] }
 managed = { version = "0.8.0", default-features = false, features = ["alloc", "map"] }
 memchr = { version = "2.7.2" }

From f69ea9d4ec7f71ccf7babc53e94ee175674bfe06 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 01:41:19 -0700
Subject: [PATCH 14/28] Update Rust crate rstest to 0.22.0 (#6347)

---
 Cargo.lock                | 31 ++++++++++++++++++++++++++-----
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml |  4 ++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bad1af8f6b..3f084cd822 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5673,7 +5673,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -7786,6 +7786,15 @@ dependencies = [
  "toml_edit 0.19.15",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -8562,9 +8571,9 @@ dependencies = [
 
 [[package]]
 name = "rstest"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330"
+checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8574,12 +8583,13 @@ dependencies = [
 
 [[package]]
 name = "rstest_macros"
-version = "0.19.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25"
+checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42"
 dependencies = [
  "cfg-if",
  "glob",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "regex",
@@ -10751,6 +10761,17 @@ dependencies = [
  "winnow 0.5.40",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.4.0",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.20"
diff --git a/Cargo.toml b/Cargo.toml
index cac3395a7d..8cb1b667d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -506,7 +506,7 @@ regress = "0.9.1"
 reqwest = { version = "0.11", default-features = false }
 ring = "0.17.8"
 rpassword = "7.3.1"
-rstest = "0.19.0"
+rstest = "0.22.0"
 rustfmt-wrapper = "0.2"
 rustls = "0.22.2"
 rustls-pemfile = "2.1.3"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 854179a4db..b42f8093fb 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -112,6 +112,7 @@ tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serd
 tokio-stream = { version = "0.1.15", features = ["net"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
 toml = { version = "0.7.8" }
+toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
 toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.20", features = ["serde"] }
 tracing = { version = "0.1.40", features = ["log"] }
 unicode-bidi = { version = "0.3.15" }
@@ -221,6 +222,7 @@ tokio-postgres = { version = "0.7.11", features = ["with-chrono-0_4", "with-serd
 tokio-stream = { version = "0.1.15", features = ["net"] }
 tokio-util = { version = "0.7.11", features = ["codec", "io-util"] }
 toml = { version = "0.7.8" }
+toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
 toml_edit-3c51e837cfc5589a = { package = "toml_edit", version = "0.22.20", features = ["serde"] }
 tracing = { version = "0.1.40", features = ["log"] }
 unicode-bidi = { version = "0.3.15" }
@@ -285,7 +287,6 @@ nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signa
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
-toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 
 [target.x86_64-unknown-illumos.build-dependencies]
@@ -295,7 +296,6 @@ nix = { version = "0.28.0", features = ["feature", "fs", "ioctl", "poll", "signa
 once_cell = { version = "1.19.0" }
 rustix = { version = "0.38.34", features = ["fs", "stdio", "system", "termios"] }
 signal-hook-mio = { version = "0.2.4", default-features = false, features = ["support-v0_8", "support-v1_0"] }
-toml_datetime = { version = "0.6.8", default-features = false, features = ["serde"] }
 toml_edit-cdcf2f9584511fe6 = { package = "toml_edit", version = "0.19.15", features = ["serde"] }
 
 ### END HAKARI SECTION

From f1e28fd27f4060580ff0a8945a0923c25864ee09 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:12:45 +0000
Subject: [PATCH 15/28] Update Rust crate serde to v1.0.208 (#6376)

---
 Cargo.lock                | 8 ++++----
 workspace-hack/Cargo.toml | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f084cd822..d0ac123970 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9142,9 +9142,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.207"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2"
+checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
 dependencies = [
  "serde_derive",
 ]
@@ -9180,9 +9180,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.207"
+version = "1.0.208"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e"
+checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index b42f8093fb..973b87c00a 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -95,7 +95,7 @@ rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.207", features = ["alloc", "derive", "rc"] }
+serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
@@ -203,7 +203,7 @@ rsa = { version = "0.9.6", features = ["serde", "sha2"] }
 schemars = { version = "0.8.21", features = ["bytes", "chrono", "uuid1"] }
 scopeguard = { version = "1.2.0" }
 semver = { version = "1.0.23", features = ["serde"] }
-serde = { version = "1.0.207", features = ["alloc", "derive", "rc"] }
+serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }

From 8fcd26f86398ed7732b02ed8ab584bdb489c40a7 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:13:39 +0000
Subject: [PATCH 16/28] Update Rust crate serde_with to 3.9.0 (#6377)

---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d0ac123970..4ce34b9f84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9286,9 +9286,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.8.3"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -9304,9 +9304,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.3"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 8cb1b667d7..a2b4363455 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -521,7 +521,7 @@ serde_json = "1.0.125"
 serde_path_to_error = "0.1.16"
 serde_tokenstream = "0.2"
 serde_urlencoded = "0.7.1"
-serde_with = "3.8.3"
+serde_with = "3.9.0"
 sha2 = "0.10.8"
 sha3 = "0.10.8"
 shell-words = "1.1.0"

From b1b5572a44c9b636c49e897f1173e4f8d4f7b235 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Aug 2024 10:11:22 -0700
Subject: [PATCH 17/28] Update Rust crate similar to 2.6.0 (#6378)

---
 Cargo.lock                |  7 +++----
 Cargo.toml                |  2 +-
 workspace-hack/Cargo.toml | 10 ++++------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ce34b9f84..51bf324679 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6439,7 +6439,6 @@ dependencies = [
  "bit-vec",
  "bitflags 1.3.2",
  "bitflags 2.6.0",
- "bstr 0.2.17",
  "bstr 1.9.1",
  "byteorder",
  "bytes",
@@ -9435,11 +9434,11 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
 dependencies = [
- "bstr 0.2.17",
+ "bstr 1.9.1",
  "unicode-segmentation",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index a2b4363455..a86d986e80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -528,7 +528,7 @@ shell-words = "1.1.0"
 signal-hook = "0.3"
 signal-hook-tokio = { version = "0.3", features = [ "futures-v0_3" ] }
 sigpipe = "0.1.3"
-similar = { version = "2.5.0", features = ["bytes"] }
+similar = { version = "2.6.0", features = ["bytes"] }
 similar-asserts = "1.5.0"
 # Don't change sled's version on accident; sled's on-disk format is not yet
 # stable and requires manual migrations. In the limit this won't matter because
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 973b87c00a..fb1b94ae0f 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -27,8 +27,7 @@ bit-set = { version = "0.5.3" }
 bit-vec = { version = "0.6.3" }
 bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.6.0", default-features = false, features = ["serde", "std"] }
-bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17" }
-bstr-dff4ba8e3ae991db = { package = "bstr", version = "1.9.1" }
+bstr = { version = "1.9.1" }
 byteorder = { version = "1.5.0" }
 bytes = { version = "1.7.1", features = ["serde"] }
 chrono = { version = "0.4.38", features = ["serde"] }
@@ -99,7 +98,7 @@ serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
-similar = { version = "2.5.0", features = ["bytes", "inline", "unicode"] }
+similar = { version = "2.6.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"] }
 spin = { version = "0.9.8" }
@@ -134,8 +133,7 @@ bit-set = { version = "0.5.3" }
 bit-vec = { version = "0.6.3" }
 bitflags-dff4ba8e3ae991db = { package = "bitflags", version = "1.3.2" }
 bitflags-f595c2ba2a3f28df = { package = "bitflags", version = "2.6.0", default-features = false, features = ["serde", "std"] }
-bstr-6f8ce4dd05d13bba = { package = "bstr", version = "0.2.17" }
-bstr-dff4ba8e3ae991db = { package = "bstr", version = "1.9.1" }
+bstr = { version = "1.9.1" }
 byteorder = { version = "1.5.0" }
 bytes = { version = "1.7.1", features = ["serde"] }
 cc = { version = "1.0.97", default-features = false, features = ["parallel"] }
@@ -207,7 +205,7 @@ serde = { version = "1.0.208", features = ["alloc", "derive", "rc"] }
 serde_json = { version = "1.0.125", features = ["raw_value", "unbounded_depth"] }
 sha1 = { version = "0.10.6", features = ["oid"] }
 sha2 = { version = "0.10.8", features = ["oid"] }
-similar = { version = "2.5.0", features = ["bytes", "inline", "unicode"] }
+similar = { version = "2.6.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"] }
 spin = { version = "0.9.8" }

From 24c129b40579d9f51e664f9cea114705f16444d8 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 04:33:07 +0000
Subject: [PATCH 18/28] Update taiki-e/install-action digest to 2d7ff60 (#6381)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [taiki-e/install-action](https://togithub.com/taiki-e/install-action)
| action | digest | [`4f13fb6` ->
`2d7ff60`](https://togithub.com/taiki-e/install-action/compare/4f13fb6...2d7ff60)
|

---

### Configuration

📅 **Schedule**: Branch creation - "after 8pm,before 6am" in timezone
America/Los_Angeles, Automerge - "after 8pm,before 6am" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS40IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->

Co-authored-by: oxide-renovate[bot] <146848827+oxide-renovate[bot]@users.noreply.github.com>
---
 .github/workflows/hakari.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
index ddc4ffc021..4b4d09ba35 100644
--- a/.github/workflows/hakari.yml
+++ b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@4f13fb62448d53782828736cd5b0fd395b5f0c06 # v2
+        uses: taiki-e/install-action@2d7ff60c815c5236dc38fd3909d97d6d605315d2 # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

From 4e8c731a6848a73eff1c449f6785228563dec016 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Sat, 17 Aug 2024 21:47:19 -0700
Subject: [PATCH 19/28] [2/6] [oxql] move core types to a new oxql-types crate
 (#6364)

Means that the Nexus external API crate doesn't have to pull in
oximeter-db.

I did have to expose a few mutators, but my general reasoning is that
because these types derive `Deserialize`, it's always possible to make
these changes by serializing into JSON and working with them there.
---
 Cargo.lock                                    |  16 +
 Cargo.toml                                    |   3 +
 nexus/Cargo.toml                              |   1 +
 nexus/src/app/metrics.rs                      |   4 +-
 nexus/src/external_api/http_entrypoints.rs    |   2 +-
 nexus/tests/integration_tests/metrics.rs      |   6 +-
 openapi/nexus.json                            |  14 +-
 oximeter/db/Cargo.toml                        |   1 +
 oximeter/db/src/client/mod.rs                 |   4 +-
 oximeter/db/src/client/oxql.rs                |  30 +-
 oximeter/db/src/lib.rs                        |   3 +-
 oximeter/db/src/model.rs                      |   2 +-
 oximeter/db/src/oxql/ast/table_ops/align.rs   |  35 +-
 oximeter/db/src/oxql/ast/table_ops/filter.rs  |  47 +-
 .../db/src/oxql/ast/table_ops/group_by.rs     |  73 ++-
 oximeter/db/src/oxql/ast/table_ops/join.rs    | 292 +---------
 oximeter/db/src/oxql/ast/table_ops/limit.rs   | 108 ++--
 oximeter/db/src/oxql/ast/table_ops/mod.rs     |   2 +-
 oximeter/db/src/oxql/mod.rs                   |   4 -
 oximeter/db/src/oxql/query/mod.rs             |  10 -
 oximeter/db/src/query.rs                      |   5 +-
 oximeter/db/src/shells/oxql.rs                |   3 +-
 oximeter/oxql-types/Cargo.toml                |  18 +
 oximeter/oxql-types/src/lib.rs                |  23 +
 .../{db/src/oxql => oxql-types/src}/point.rs  | 525 ++++++++++++++----
 .../{db/src/oxql => oxql-types/src}/table.rs  |  89 ++-
 oximeter/types/src/schema.rs                  |   2 +
 27 files changed, 710 insertions(+), 612 deletions(-)
 create mode 100644 oximeter/oxql-types/Cargo.toml
 create mode 100644 oximeter/oxql-types/src/lib.rs
 rename oximeter/{db/src/oxql => oxql-types/src}/point.rs (82%)
 rename oximeter/{db/src/oxql => oxql-types/src}/table.rs (75%)

diff --git a/Cargo.lock b/Cargo.lock
index 51bf324679..2943a4f2c2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6077,6 +6077,7 @@ dependencies = [
  "oximeter-instruments",
  "oximeter-producer",
  "oxnet",
+ "oxql-types",
  "parse-display",
  "paste",
  "pem",
@@ -6926,6 +6927,7 @@ dependencies = [
  "omicron-workspace-hack",
  "oximeter",
  "oximeter-test-utils",
+ "oxql-types",
  "peg",
  "reedline",
  "regex",
@@ -7102,6 +7104,20 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "oxql-types"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "chrono",
+ "highway",
+ "num",
+ "omicron-workspace-hack",
+ "oximeter-types",
+ "schemars",
+ "serde",
+]
+
 [[package]]
 name = "p256"
 version = "0.13.2"
diff --git a/Cargo.toml b/Cargo.toml
index a86d986e80..83aea83ddf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ members = [
     "oximeter/instruments",
     "oximeter/oximeter-macro-impl",
     "oximeter/oximeter",
+    "oximeter/oxql-types",
     "oximeter/producer",
     "oximeter/schema",
     "oximeter/test-utils",
@@ -196,6 +197,7 @@ default-members = [
     "oximeter/instruments",
     "oximeter/oximeter-macro-impl",
     "oximeter/oximeter",
+    "oximeter/oxql-types",
     "oximeter/producer",
     "oximeter/schema",
     "oximeter/test-utils",
@@ -470,6 +472,7 @@ oximeter-schema = { path = "oximeter/schema" }
 oximeter-test-utils = { path = "oximeter/test-utils" }
 oximeter-timeseries-macro = { path = "oximeter/timeseries-macro" }
 oximeter-types = { path = "oximeter/types" }
+oxql-types = { path = "oximeter/oxql-types" }
 p256 = "0.13"
 parse-display = "0.10.0"
 partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] }
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
index 8977507505..5b181c7fa0 100644
--- a/nexus/Cargo.toml
+++ b/nexus/Cargo.toml
@@ -57,6 +57,7 @@ openssl.workspace = true
 oximeter-client.workspace = true
 oximeter-db = { workspace = true, default-features = false, features = [ "oxql" ] }
 oxnet.workspace = true
+oxql-types.workspace = true
 parse-display.workspace = true
 paste.workspace = true
 # See omicron-rpaths for more about the "pq-sys" dependency.
diff --git a/nexus/src/app/metrics.rs b/nexus/src/app/metrics.rs
index 3728a3bdc1..3a6e7e27be 100644
--- a/nexus/src/app/metrics.rs
+++ b/nexus/src/app/metrics.rs
@@ -14,7 +14,7 @@ use nexus_db_queries::{
 };
 use omicron_common::api::external::{Error, InternalContext};
 use oximeter_db::{
-    oxql, Measurement, TimeseriesSchema, TimeseriesSchemaPaginationParams,
+    Measurement, TimeseriesSchema, TimeseriesSchemaPaginationParams,
 };
 use std::num::NonZeroU32;
 
@@ -138,7 +138,7 @@ impl super::Nexus {
         &self,
         opctx: &OpContext,
         query: impl AsRef<str>,
-    ) -> Result<Vec<oxql::Table>, Error> {
+    ) -> Result<Vec<oxql_types::Table>, Error> {
         // Must be a fleet user to list timeseries schema.
         //
         // TODO-security: We need to figure out how to implement proper security
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
index 8e8b63229b..df522f18ab 100644
--- a/nexus/src/external_api/http_entrypoints.rs
+++ b/nexus/src/external_api/http_entrypoints.rs
@@ -6386,7 +6386,7 @@ async fn timeseries_schema_list(
 async fn timeseries_query(
     rqctx: RequestContext<ApiContext>,
     body: TypedBody<params::TimeseriesQuery>,
-) -> Result<HttpResponseOk<Vec<oximeter_db::oxql::Table>>, HttpError> {
+) -> Result<HttpResponseOk<Vec<oxql_types::Table>>, HttpError> {
     let apictx = rqctx.context();
     let handler = async {
         let nexus = &apictx.context.nexus;
diff --git a/nexus/tests/integration_tests/metrics.rs b/nexus/tests/integration_tests/metrics.rs
index 9cfa0350e8..e24de2a3ad 100644
--- a/nexus/tests/integration_tests/metrics.rs
+++ b/nexus/tests/integration_tests/metrics.rs
@@ -284,7 +284,7 @@ async fn test_timeseries_schema_list(
 pub async fn timeseries_query(
     cptestctx: &ControlPlaneTestContext<omicron_nexus::Server>,
     query: impl ToString,
-) -> Vec<oximeter_db::oxql::Table> {
+) -> Vec<oxql_types::Table> {
     // first, make sure the latest timeseries have been collected.
     cptestctx.oximeter.force_collect().await;
 
@@ -429,11 +429,11 @@ async fn test_instance_watcher_metrics(
 
     #[track_caller]
     fn count_state(
-        table: &oximeter_db::oxql::Table,
+        table: &oxql_types::Table,
         instance_id: InstanceUuid,
         state: &'static str,
     ) -> i64 {
-        use oximeter_db::oxql::point::ValueArray;
+        use oxql_types::point::ValueArray;
         let uuid = FieldValue::Uuid(instance_id.into_untyped_uuid());
         let state = FieldValue::String(state.into());
         let mut timeserieses = table.timeseries().filter(|ts| {
diff --git a/openapi/nexus.json b/openapi/nexus.json
index 27e2870b6e..a0cbfa2f63 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -20131,10 +20131,20 @@
         "type": "object",
         "properties": {
           "metric_type": {
-            "$ref": "#/components/schemas/MetricType"
+            "description": "The type of this metric.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/MetricType"
+              }
+            ]
           },
           "values": {
-            "$ref": "#/components/schemas/ValueArray"
+            "description": "The data values.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/ValueArray"
+              }
+            ]
           }
         },
         "required": [
diff --git a/oximeter/db/Cargo.toml b/oximeter/db/Cargo.toml
index 6a7cedbc22..2a9c615da2 100644
--- a/oximeter/db/Cargo.toml
+++ b/oximeter/db/Cargo.toml
@@ -24,6 +24,7 @@ num.workspace = true
 omicron-common.workspace = true
 omicron-workspace-hack.workspace = true
 oximeter.workspace = true
+oxql-types.workspace = true
 regex.workspace = true
 serde.workspace = true
 serde_json.workspace = true
diff --git a/oximeter/db/src/client/mod.rs b/oximeter/db/src/client/mod.rs
index 176e1bd5f8..c2b07ebaa6 100644
--- a/oximeter/db/src/client/mod.rs
+++ b/oximeter/db/src/client/mod.rs
@@ -22,8 +22,6 @@ use crate::Error;
 use crate::Metric;
 use crate::Target;
 use crate::Timeseries;
-use crate::TimeseriesKey;
-use crate::TimeseriesName;
 use crate::TimeseriesPageSelector;
 use crate::TimeseriesScanParams;
 use crate::TimeseriesSchema;
@@ -31,7 +29,9 @@ use dropshot::EmptyScanParams;
 use dropshot::PaginationOrder;
 use dropshot::ResultsPage;
 use dropshot::WhichPage;
+use oximeter::schema::TimeseriesKey;
 use oximeter::types::Sample;
+use oximeter::TimeseriesName;
 use regex::Regex;
 use regex::RegexBuilder;
 use slog::debug;
diff --git a/oximeter/db/src/client/oxql.rs b/oximeter/db/src/client/oxql.rs
index 29586b8189..4005fa873e 100644
--- a/oximeter/db/src/client/oxql.rs
+++ b/oximeter/db/src/client/oxql.rs
@@ -18,7 +18,7 @@ use crate::query::field_table_name;
 use crate::Error;
 use crate::Metric;
 use crate::Target;
-use crate::TimeseriesKey;
+use oximeter::schema::TimeseriesKey;
 use oximeter::TimeseriesSchema;
 use slog::debug;
 use slog::trace;
@@ -68,7 +68,7 @@ pub struct OxqlResult {
     pub query_summaries: Vec<QuerySummary>,
 
     /// The list of OxQL tables returned from the query.
-    pub tables: Vec<oxql::Table>,
+    pub tables: Vec<oxql_types::Table>,
 }
 
 /// The maximum number of data values fetched from the database for an OxQL
@@ -479,7 +479,9 @@ impl Client {
                 query_id,
                 total_duration: query_start.elapsed(),
                 query_summaries,
-                tables: vec![oxql::Table::new(schema.timeseries_name.as_str())],
+                tables: vec![oxql_types::Table::new(
+                    schema.timeseries_name.as_str(),
+                )],
             };
             return Ok(result);
         }
@@ -503,7 +505,7 @@ impl Client {
 
         // At this point, let's construct a set of tables and run the results
         // through the transformation pipeline.
-        let mut tables = vec![oxql::Table::from_timeseries(
+        let mut tables = vec![oxql_types::Table::from_timeseries(
             schema.timeseries_name.as_str(),
             timeseries_by_key.into_values(),
         )?];
@@ -553,7 +555,7 @@ impl Client {
         limit: Option<Limit>,
         total_rows_fetched: &mut u64,
     ) -> Result<
-        (Vec<QuerySummary>, BTreeMap<TimeseriesKey, oxql::Timeseries>),
+        (Vec<QuerySummary>, BTreeMap<TimeseriesKey, oxql_types::Timeseries>),
         Error,
     > {
         // We'll create timeseries for each key on the fly. To enable computing
@@ -624,25 +626,25 @@ impl Client {
         for (key, measurements) in measurements_by_key.into_iter() {
             // Constuct a new timeseries, from the target/metric info.
             let (target, metric) = info.get(&key).unwrap();
-            let mut timeseries = oxql::Timeseries::new(
+            let mut timeseries = oxql_types::Timeseries::new(
                 target
                     .fields
                     .iter()
                     .chain(metric.fields.iter())
                     .map(|field| (field.name.clone(), field.value.clone())),
-                oxql::point::DataType::try_from(schema.datum_type)?,
+                oxql_types::point::DataType::try_from(schema.datum_type)?,
                 if schema.datum_type.is_cumulative() {
-                    oxql::point::MetricType::Delta
+                    oxql_types::point::MetricType::Delta
                 } else {
-                    oxql::point::MetricType::Gauge
+                    oxql_types::point::MetricType::Gauge
                 },
             )?;
 
             // Covert its oximeter measurements into OxQL data types.
             let points = if schema.datum_type.is_cumulative() {
-                oxql::point::Points::delta_from_cumulative(&measurements)?
+                oxql_types::point::Points::delta_from_cumulative(&measurements)?
             } else {
-                oxql::point::Points::gauge_from_gauge(&measurements)?
+                oxql_types::point::Points::gauge_from_gauge(&measurements)?
             };
             timeseries.points = points;
             debug!(
@@ -1108,10 +1110,7 @@ fn update_total_rows_and_check(
 mod tests {
     use super::ConsistentKeyGroup;
     use crate::client::oxql::chunk_consistent_key_groups_impl;
-    use crate::{
-        oxql::{point::Points, Table, Timeseries},
-        Client, DbWrite,
-    };
+    use crate::{Client, DbWrite};
     use crate::{Metric, Target};
     use chrono::{DateTime, Utc};
     use dropshot::test_util::LogContext;
@@ -1119,6 +1118,7 @@ mod tests {
     use omicron_test_utils::dev::test_setup_log;
     use oximeter::{types::Cumulative, FieldValue};
     use oximeter::{DatumType, Sample};
+    use oxql_types::{point::Points, Table, Timeseries};
     use std::collections::BTreeMap;
     use std::time::Duration;
 
diff --git a/oximeter/db/src/lib.rs b/oximeter/db/src/lib.rs
index 9ad382c97d..5d56d802c9 100644
--- a/oximeter/db/src/lib.rs
+++ b/oximeter/db/src/lib.rs
@@ -14,6 +14,7 @@ use dropshot::EmptyScanParams;
 use dropshot::PaginationParams;
 pub use oximeter::schema::FieldSchema;
 pub use oximeter::schema::FieldSource;
+use oximeter::schema::TimeseriesKey;
 pub use oximeter::schema::TimeseriesName;
 pub use oximeter::schema::TimeseriesSchema;
 pub use oximeter::DatumType;
@@ -267,8 +268,6 @@ pub async fn make_client(
     Ok(client)
 }
 
-pub(crate) type TimeseriesKey = u64;
-
 // TODO-cleanup: Add the timeseries version in to the computation of the key.
 // This will require a full drop of the database, since we're changing the
 // sorting key and the timeseries key on each past sample. See
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
index 3e34ad10e3..986bf00225 100644
--- a/oximeter/db/src/model.rs
+++ b/oximeter/db/src/model.rs
@@ -11,13 +11,13 @@ use crate::FieldSchema;
 use crate::FieldSource;
 use crate::Metric;
 use crate::Target;
-use crate::TimeseriesKey;
 use crate::TimeseriesSchema;
 use bytes::Bytes;
 use chrono::DateTime;
 use chrono::Utc;
 use num::traits::Zero;
 use oximeter::histogram::Histogram;
+use oximeter::schema::TimeseriesKey;
 use oximeter::traits;
 use oximeter::types::Cumulative;
 use oximeter::types::Datum;
diff --git a/oximeter/db/src/oxql/ast/table_ops/align.rs b/oximeter/db/src/oxql/ast/table_ops/align.rs
index cf54ebc312..b0cd7d80f1 100644
--- a/oximeter/db/src/oxql/ast/table_ops/align.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/align.rs
@@ -6,19 +6,19 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use crate::oxql::point::DataType;
-use crate::oxql::point::MetricType;
-use crate::oxql::point::Points;
-use crate::oxql::point::ValueArray;
-use crate::oxql::point::Values;
-use crate::oxql::query::Alignment;
-use crate::oxql::Error;
-use crate::oxql::Table;
-use crate::oxql::Timeseries;
 use anyhow::Context;
+use anyhow::Error;
 use chrono::DateTime;
 use chrono::TimeDelta;
 use chrono::Utc;
+use oxql_types::point::DataType;
+use oxql_types::point::MetricType;
+use oxql_types::point::Points;
+use oxql_types::point::ValueArray;
+use oxql_types::point::Values;
+use oxql_types::Alignment;
+use oxql_types::Table;
+use oxql_types::Timeseries;
 use std::time::Duration;
 
 // The maximum factor by which an alignment operation may upsample data.
@@ -144,7 +144,7 @@ fn align_mean_within(
             "Alignment by mean requires a gauge or delta metric, not {}",
             metric_type,
         );
-        verify_max_upsampling_ratio(&points.timestamps, &period)?;
+        verify_max_upsampling_ratio(points.timestamps(), &period)?;
 
         // Always convert the output to doubles, when computing the mean. The
         // output is always a gauge, so we do not need the start times of the
@@ -179,7 +179,7 @@ fn align_mean_within(
         // - Compute the mean of those.
         let period_ =
             TimeDelta::from_std(*period).context("time delta out of range")?;
-        let first_timestamp = points.timestamps[0];
+        let first_timestamp = points.timestamps()[0];
         let mut ix: u32 = 0;
         loop {
             // Compute the next output timestamp, by shifting the query end time
@@ -220,15 +220,15 @@ fn align_mean_within(
             // entries.
             let output_value = if matches!(metric_type, MetricType::Gauge) {
                 mean_gauge_value_in_window(
-                    &points.timestamps,
+                    points.timestamps(),
                     &input_points,
                     window_start,
                     output_time,
                 )
             } else {
                 mean_delta_value_in_window(
-                    points.start_times.as_ref().unwrap(),
-                    &points.timestamps,
+                    points.start_times().unwrap(),
+                    points.timestamps(),
                     &input_points,
                     window_start,
                     output_time,
@@ -255,10 +255,9 @@ fn align_mean_within(
             ValueArray::Double(output_values.into_iter().rev().collect());
         let timestamps = output_timestamps.into_iter().rev().collect();
         let values = Values { values, metric_type: MetricType::Gauge };
-        new_timeseries.points =
-            Points { start_times: None, timestamps, values: vec![values] };
-        new_timeseries.alignment =
-            Some(Alignment { end_time: *query_end, period: *period });
+        new_timeseries.points = Points::new(None, timestamps, vec![values]);
+        new_timeseries
+            .set_alignment(Alignment { end_time: *query_end, period: *period });
         output_table.insert(new_timeseries).unwrap();
     }
     Ok(output_table)
diff --git a/oximeter/db/src/oxql/ast/table_ops/filter.rs b/oximeter/db/src/oxql/ast/table_ops/filter.rs
index b6fc533e4d..ad398da983 100644
--- a/oximeter/db/src/oxql/ast/table_ops/filter.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/filter.rs
@@ -12,18 +12,18 @@ use crate::oxql::ast::literal::Literal;
 use crate::oxql::ast::logical_op::LogicalOp;
 use crate::oxql::ast::table_ops::limit::Limit;
 use crate::oxql::ast::table_ops::limit::LimitKind;
-use crate::oxql::point::DataType;
-use crate::oxql::point::MetricType;
-use crate::oxql::point::Points;
-use crate::oxql::point::ValueArray;
 use crate::oxql::Error;
-use crate::oxql::Table;
-use crate::oxql::Timeseries;
 use crate::shells::special_idents;
 use chrono::DateTime;
 use chrono::Utc;
 use oximeter::FieldType;
 use oximeter::FieldValue;
+use oxql_types::point::DataType;
+use oxql_types::point::MetricType;
+use oxql_types::point::Points;
+use oxql_types::point::ValueArray;
+use oxql_types::Table;
+use oxql_types::Timeseries;
 use regex::Regex;
 use std::collections::BTreeSet;
 use std::fmt;
@@ -340,16 +340,13 @@ impl Filter {
                 // Apply the filter to the data points as well.
                 let points = self.filter_points(&input.points)?;
 
-                // Similar to above, if the filter removes all data points in
-                // the timeseries, let's remove the timeseries altogether.
-                if points.is_empty() {
-                    continue;
+                if let Some(new_timeseries) = input.copy_with_points(points) {
+                    timeseries.push(new_timeseries);
+                } else {
+                    // None means that the filter removed all data points in
+                    // the timeseries. In that case, we remove the timeseries
+                    // altogether.
                 }
-                timeseries.push(Timeseries {
-                    fields: input.fields.clone(),
-                    points,
-                    alignment: input.alignment,
-                })
             }
             output_tables.push(Table::from_timeseries(
                 table.name(),
@@ -823,7 +820,7 @@ impl SimpleFilter {
     ) -> Result<Vec<bool>, Error> {
         let ident = self.ident.as_str();
         if ident == "timestamp" {
-            self.filter_points_by_timestamp(negated, &points.timestamps)
+            self.filter_points_by_timestamp(negated, points.timestamps())
         } else if ident == "datum" {
             anyhow::ensure!(
                 points.dimensionality() == 1,
@@ -1151,15 +1148,15 @@ impl SimpleFilter {
 mod tests {
     use crate::oxql::ast::grammar::query_parser;
     use crate::oxql::ast::logical_op::LogicalOp;
-    use crate::oxql::point::DataType;
-    use crate::oxql::point::MetricType;
-    use crate::oxql::point::Points;
-    use crate::oxql::point::ValueArray;
-    use crate::oxql::point::Values;
-    use crate::oxql::Table;
-    use crate::oxql::Timeseries;
     use chrono::Utc;
     use oximeter::FieldValue;
+    use oxql_types::point::DataType;
+    use oxql_types::point::MetricType;
+    use oxql_types::point::Points;
+    use oxql_types::point::ValueArray;
+    use oxql_types::point::Values;
+    use oxql_types::Table;
+    use oxql_types::Timeseries;
     use std::time::Duration;
     use uuid::Uuid;
 
@@ -1172,7 +1169,7 @@ mod tests {
             values: ValueArray::Double(vec![Some(0.0), Some(2.0)]),
             metric_type: MetricType::Gauge,
         }];
-        let points = Points { start_times, timestamps, values };
+        let points = Points::new(start_times, timestamps, values);
 
         // This filter should remove the first point based on its timestamp.
         let t = Utc::now() + Duration::from_secs(10);
@@ -1205,7 +1202,7 @@ mod tests {
             values: ValueArray::Double(vec![Some(0.0), Some(2.0)]),
             metric_type: MetricType::Gauge,
         }];
-        let points = Points { start_times, timestamps, values };
+        let points = Points::new(start_times, timestamps, values);
 
         let filter =
             query_parser::filter("filter datum < \"something\"").unwrap();
diff --git a/oximeter/db/src/oxql/ast/table_ops/group_by.rs b/oximeter/db/src/oxql/ast/table_ops/group_by.rs
index f40572d762..c48804a788 100644
--- a/oximeter/db/src/oxql/ast/table_ops/group_by.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/group_by.rs
@@ -10,13 +10,13 @@ use chrono::DateTime;
 use chrono::Utc;
 
 use crate::oxql::ast::ident::Ident;
-use crate::oxql::point::DataType;
-use crate::oxql::point::MetricType;
-use crate::oxql::point::ValueArray;
-use crate::oxql::Error;
-use crate::oxql::Table;
-use crate::oxql::Timeseries;
-use crate::TimeseriesKey;
+use anyhow::Error;
+use oximeter::schema::TimeseriesKey;
+use oxql_types::point::DataType;
+use oxql_types::point::MetricType;
+use oxql_types::point::ValueArray;
+use oxql_types::Table;
+use oxql_types::Timeseries;
 use std::collections::btree_map::Entry;
 use std::collections::BTreeMap;
 
@@ -98,7 +98,7 @@ impl GroupBy {
                             ValueArray::Double(new_values),
                             ValueArray::Double(existing_values),
                         ) => {
-                            let new_timestamps = &dropped.points.timestamps;
+                            let new_timestamps = dropped.points.timestamps();
 
                             // We will be merging the new data with the
                             // existing, but borrow-checking limits the degree
@@ -106,7 +106,7 @@ impl GroupBy {
                             // entry in the output table. Instead, aggregate
                             // everything into a copy of the expected data.
                             let mut timestamps =
-                                existing.points.timestamps.clone();
+                                existing.points.timestamps().to_owned();
                             let mut values = existing_values.clone();
 
                             // Merge in the new values, so long as they actually
@@ -152,10 +152,7 @@ impl GroupBy {
 
                             // Replace the existing output timeseries's
                             // timestamps and data arrays.
-                            std::mem::swap(
-                                &mut existing.points.timestamps,
-                                &mut timestamps,
-                            );
+                            existing.points.set_timestamps(timestamps);
                             existing
                                 .points
                                 .values_mut(0)
@@ -166,7 +163,7 @@ impl GroupBy {
                             ValueArray::Integer(new_values),
                             ValueArray::Integer(existing_values),
                         ) => {
-                            let new_timestamps = &dropped.points.timestamps;
+                            let new_timestamps = dropped.points.timestamps();
 
                             // We will be merging the new data with the
                             // existing, but borrow-checking limits the degree
@@ -174,7 +171,7 @@ impl GroupBy {
                             // entry in the output table. Instead, aggregate
                             // everything into a copy of the expected data.
                             let mut timestamps =
-                                existing.points.timestamps.clone();
+                                existing.points.timestamps().to_owned();
                             let mut values = existing_values.clone();
 
                             // Merge in the new values, so long as they actually
@@ -220,10 +217,7 @@ impl GroupBy {
 
                             // Replace the existing output timeseries's
                             // timestamps and data arrays.
-                            std::mem::swap(
-                                &mut existing.points.timestamps,
-                                &mut timestamps,
-                            );
+                            existing.points.set_timestamps(timestamps);
                             existing
                                 .points
                                 .values_mut(0)
@@ -286,14 +280,15 @@ impl GroupBy {
                     else {
                         unreachable!();
                     };
-                    let new_timestamps = &new_points.timestamps;
+                    let new_timestamps = new_points.timestamps();
 
                     // We will be merging the new data with the
                     // existing, but borrow-checking limits the degree
                     // to which we can easily do this on the `existing`
                     // entry in the output table. Instead, aggregate
                     // everything into a copy of the expected data.
-                    let mut timestamps = existing.points.timestamps.clone();
+                    let mut timestamps =
+                        existing.points.timestamps().to_owned();
                     let mut values = existing
                         .points
                         .values(0)
@@ -360,10 +355,7 @@ impl GroupBy {
 
                     // Replace the existing output timeseries's
                     // timestamps and data arrays.
-                    std::mem::swap(
-                        &mut existing.points.timestamps,
-                        &mut timestamps,
-                    );
+                    existing.points.set_timestamps(timestamps);
                     existing
                         .points
                         .values_mut(0)
@@ -388,7 +380,7 @@ impl GroupBy {
                     // _zero_ for any where the values are none.
                     let counts = new_timeseries
                         .points
-                        .timestamps
+                        .timestamps()
                         .iter()
                         .zip(values)
                         .map(|(timestamp, maybe_value)| {
@@ -434,16 +426,16 @@ pub enum Reducer {
 #[cfg(test)]
 mod tests {
     use super::{GroupBy, Reducer};
-    use crate::oxql::{
-        ast::{
-            ident::Ident,
-            table_ops::align::{Align, AlignmentMethod},
-        },
-        point::{DataType, MetricType, ValueArray},
-        Table, Timeseries,
+    use crate::oxql::ast::{
+        ident::Ident,
+        table_ops::align::{Align, AlignmentMethod},
     };
     use chrono::{DateTime, Utc};
     use oximeter::FieldValue;
+    use oxql_types::{
+        point::{DataType, MetricType, ValueArray},
+        Table, Timeseries,
+    };
     use std::{collections::BTreeMap, time::Duration};
 
     // Which timeseries the second data point is missing from.
@@ -495,8 +487,8 @@ mod tests {
                 MetricType::Gauge,
             )
             .unwrap();
-            ts0.points.start_times = None;
-            ts0.points.timestamps.clone_from(&timestamps);
+            ts0.points.clear_start_times();
+            ts0.points.set_timestamps(timestamps.clone());
             *ts0.points.values_mut(0).unwrap() = ValueArray::Double(vec![
                 Some(1.0),
                 if matches!(
@@ -527,7 +519,7 @@ mod tests {
                 MetricType::Gauge,
             )
             .unwrap();
-            ts1.points.start_times = None;
+            ts1.points.clear_start_times();
 
             // Non-overlapping in this test setup means that we just shift one
             // value from this array backward in time by one additional second.
@@ -538,7 +530,7 @@ mod tests {
             //
             // When reducing, t0 is never changed, and t1-t2 are always reduced
             // together, if the values are present.
-            ts1.points.timestamps = if cfg.overlapping_times {
+            let new_timestamps = if cfg.overlapping_times {
                 timestamps.clone()
             } else {
                 let mut new_timestamps = timestamps.clone();
@@ -546,6 +538,7 @@ mod tests {
                 timestamps.insert(0, new_timestamps[0]);
                 new_timestamps
             };
+            ts1.points.set_timestamps(new_timestamps);
             *ts1.points.values_mut(0).unwrap() = ValueArray::Double(vec![
                 Some(2.0),
                 if matches!(cfg.missing_value, MissingValue::Both) {
@@ -604,11 +597,13 @@ mod tests {
             let points = &grouped_timeseries.points;
             assert_eq!(points.dimensionality(), 1, "Points should still be 1D");
             assert_eq!(
-                points.start_times, None,
+                points.start_times(),
+                None,
                 "Points should not have start times"
             );
             assert_eq!(
-                points.timestamps, test.timestamps,
+                points.timestamps(),
+                test.timestamps,
                 "Points do not have correct timestamps"
             );
 
diff --git a/oximeter/db/src/oxql/ast/table_ops/join.rs b/oximeter/db/src/oxql/ast/table_ops/join.rs
index 3c150a4acf..2893f6cf3e 100644
--- a/oximeter/db/src/oxql/ast/table_ops/join.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/join.rs
@@ -6,12 +6,10 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use crate::oxql::point::MetricType;
-use crate::oxql::point::Points;
-use crate::oxql::point::Values;
-use crate::oxql::Error;
-use crate::oxql::Table;
 use anyhow::Context;
+use anyhow::Error;
+use oxql_types::point::MetricType;
+use oxql_types::Table;
 
 /// An AST node for a natural inner join.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -80,10 +78,8 @@ impl Join {
                 // 1. They have the same alignment, and
                 // 2. We merge the timepoints rather than simply creating a
                 //    ragged array of points.
-                timeseries.points = inner_join_point_arrays(
-                    &timeseries.points,
-                    &next_timeseries.points,
-                )?;
+                timeseries.points =
+                    timeseries.points.inner_join(&next_timeseries.points)?;
             }
             // We'll also update the name, to indicate the joined data.
             out.name.push(',');
@@ -93,101 +89,6 @@ impl Join {
     }
 }
 
-// Given two arrays of points, stack them together at matching timepoints.
-//
-// For time points in either which do not have a corresponding point in the
-// other, the entire time point is elided.
-fn inner_join_point_arrays(
-    left: &Points,
-    right: &Points,
-) -> Result<Points, Error> {
-    // Create an output array with roughly the right capacity, and double the
-    // number of dimensions. We're trying to stack output value arrays together
-    // along the dimension axis.
-    let data_types =
-        left.data_types().chain(right.data_types()).collect::<Vec<_>>();
-    let metric_types =
-        left.metric_types().chain(right.metric_types()).collect::<Vec<_>>();
-    let mut out = Points::with_capacity(
-        left.len().max(right.len()),
-        data_types.iter().copied(),
-        metric_types.iter().copied(),
-    )?;
-
-    // Iterate through each array until one is exhausted. We're only inserting
-    // values from both arrays where the timestamps actually match, since this
-    // is an inner join. We may want to insert missing values where timestamps
-    // do not match on either side, when we support an outer join of some kind.
-    let n_left_dim = left.values.len();
-    let mut left_ix = 0;
-    let mut right_ix = 0;
-    while left_ix < left.len() && right_ix < right.len() {
-        let left_timestamp = left.timestamps[left_ix];
-        let right_timestamp = right.timestamps[right_ix];
-        if left_timestamp == right_timestamp {
-            out.timestamps.push(left_timestamp);
-            push_concrete_values(
-                &mut out.values[..n_left_dim],
-                &left.values,
-                left_ix,
-            );
-            push_concrete_values(
-                &mut out.values[n_left_dim..],
-                &right.values,
-                right_ix,
-            );
-            left_ix += 1;
-            right_ix += 1;
-        } else if left_timestamp < right_timestamp {
-            left_ix += 1;
-        } else {
-            right_ix += 1;
-        }
-    }
-    Ok(out)
-}
-
-// Push the `i`th value from each dimension of `from` onto `to`.
-fn push_concrete_values(to: &mut [Values], from: &[Values], i: usize) {
-    assert_eq!(to.len(), from.len());
-    for (output, input) in to.iter_mut().zip(from.iter()) {
-        let input_array = &input.values;
-        let output_array = &mut output.values;
-        assert_eq!(input_array.data_type(), output_array.data_type());
-        if let Ok(ints) = input_array.as_integer() {
-            output_array.as_integer_mut().unwrap().push(ints[i]);
-            continue;
-        }
-        if let Ok(doubles) = input_array.as_double() {
-            output_array.as_double_mut().unwrap().push(doubles[i]);
-            continue;
-        }
-        if let Ok(bools) = input_array.as_boolean() {
-            output_array.as_boolean_mut().unwrap().push(bools[i]);
-            continue;
-        }
-        if let Ok(strings) = input_array.as_string() {
-            output_array.as_string_mut().unwrap().push(strings[i].clone());
-            continue;
-        }
-        if let Ok(dists) = input_array.as_integer_distribution() {
-            output_array
-                .as_integer_distribution_mut()
-                .unwrap()
-                .push(dists[i].clone());
-            continue;
-        }
-        if let Ok(dists) = input_array.as_double_distribution() {
-            output_array
-                .as_double_distribution_mut()
-                .unwrap()
-                .push(dists[i].clone());
-            continue;
-        }
-        unreachable!();
-    }
-}
-
 // Return an error if any metric types are not suitable for joining.
 fn ensure_all_metric_types(
     mut metric_types: impl ExactSizeIterator<Item = MetricType>,
@@ -200,186 +101,3 @@ fn ensure_all_metric_types(
     );
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::oxql::point::DataType;
-    use crate::oxql::point::Datum;
-    use crate::oxql::point::ValueArray;
-    use chrono::Utc;
-    use std::time::Duration;
-
-    #[test]
-    fn test_push_concrete_values() {
-        let mut points = Points::with_capacity(
-            2,
-            [DataType::Integer, DataType::Double].into_iter(),
-            [MetricType::Gauge, MetricType::Gauge].into_iter(),
-        )
-        .unwrap();
-
-        // Push a concrete value for the integer dimension
-        let from_ints = vec![Values {
-            values: ValueArray::Integer(vec![Some(1)]),
-            metric_type: MetricType::Gauge,
-        }];
-        push_concrete_values(&mut points.values[..1], &from_ints, 0);
-
-        // And another for the double dimension.
-        let from_doubles = vec![Values {
-            values: ValueArray::Double(vec![Some(2.0)]),
-            metric_type: MetricType::Gauge,
-        }];
-        push_concrete_values(&mut points.values[1..], &from_doubles, 0);
-
-        assert_eq!(
-            points.dimensionality(),
-            2,
-            "Points should have 2 dimensions",
-        );
-        let ints = points.values[0].values.as_integer().unwrap();
-        assert_eq!(
-            ints.len(),
-            1,
-            "Should have pushed one point in the first dimension"
-        );
-        assert_eq!(
-            ints[0],
-            Some(1),
-            "Should have pushed 1 onto the first dimension"
-        );
-        let doubles = points.values[1].values.as_double().unwrap();
-        assert_eq!(
-            doubles.len(),
-            1,
-            "Should have pushed one point in the second dimension"
-        );
-        assert_eq!(
-            doubles[0],
-            Some(2.0),
-            "Should have pushed 2.0 onto the second dimension"
-        );
-    }
-
-    #[test]
-    fn test_join_point_arrays() {
-        let now = Utc::now();
-
-        // Create a set of integer points to join with.
-        //
-        // This will have two timestamps, one of which will match the points
-        // below that are merged in.
-        let int_points = Points {
-            start_times: None,
-            timestamps: vec![
-                now - Duration::from_secs(3),
-                now - Duration::from_secs(2),
-                now,
-            ],
-            values: vec![Values {
-                values: ValueArray::Integer(vec![Some(1), Some(2), Some(3)]),
-                metric_type: MetricType::Gauge,
-            }],
-        };
-
-        // Create an additional set of double points.
-        //
-        // This also has two timepoints, one of which matches with the above,
-        // and one of which does not.
-        let double_points = Points {
-            start_times: None,
-            timestamps: vec![
-                now - Duration::from_secs(3),
-                now - Duration::from_secs(1),
-                now,
-            ],
-            values: vec![Values {
-                values: ValueArray::Double(vec![
-                    Some(4.0),
-                    Some(5.0),
-                    Some(6.0),
-                ]),
-                metric_type: MetricType::Gauge,
-            }],
-        };
-
-        // Merge the arrays.
-        let merged =
-            inner_join_point_arrays(&int_points, &double_points).unwrap();
-
-        // Basic checks that we merged in the right values and have the right
-        // types and dimensions.
-        assert_eq!(
-            merged.dimensionality(),
-            2,
-            "Should have appended the dimensions from each input array"
-        );
-        assert_eq!(merged.len(), 2, "Should have merged two common points",);
-        assert_eq!(
-            merged.data_types().collect::<Vec<_>>(),
-            &[DataType::Integer, DataType::Double],
-            "Should have combined the data types of the input arrays"
-        );
-        assert_eq!(
-            merged.metric_types().collect::<Vec<_>>(),
-            &[MetricType::Gauge, MetricType::Gauge],
-            "Should have combined the metric types of the input arrays"
-        );
-
-        // Check the actual values of the array.
-        let mut points = merged.iter_points();
-
-        // The first and last timepoint overlapped between the two arrays, so we
-        // should have both of them as concrete samples.
-        let pt = points.next().unwrap();
-        assert_eq!(pt.start_time, None, "Gauges don't have a start time");
-        assert_eq!(
-            *pt.timestamp, int_points.timestamps[0],
-            "Should have taken the first input timestamp from both arrays",
-        );
-        assert_eq!(
-            *pt.timestamp, double_points.timestamps[0],
-            "Should have taken the first input timestamp from both arrays",
-        );
-        let values = pt.values;
-        assert_eq!(values.len(), 2, "Should have 2 dimensions");
-        assert_eq!(
-            &values[0],
-            &(Datum::Integer(Some(&1)), MetricType::Gauge),
-            "Should have pulled value from first integer array."
-        );
-        assert_eq!(
-            &values[1],
-            &(Datum::Double(Some(&4.0)), MetricType::Gauge),
-            "Should have pulled value from second double array."
-        );
-
-        // And the next point
-        let pt = points.next().unwrap();
-        assert_eq!(pt.start_time, None, "Gauges don't have a start time");
-        assert_eq!(
-            *pt.timestamp, int_points.timestamps[2],
-            "Should have taken the input timestamp from both arrays",
-        );
-        assert_eq!(
-            *pt.timestamp, double_points.timestamps[2],
-            "Should have taken the input timestamp from both arrays",
-        );
-        let values = pt.values;
-        assert_eq!(values.len(), 2, "Should have 2 dimensions");
-        assert_eq!(
-            &values[0],
-            &(Datum::Integer(Some(&3)), MetricType::Gauge),
-            "Should have pulled value from first integer array."
-        );
-        assert_eq!(
-            &values[1],
-            &(Datum::Double(Some(&6.0)), MetricType::Gauge),
-            "Should have pulled value from second double array."
-        );
-
-        // And there should be no other values.
-        assert!(points.next().is_none(), "There should be no more points");
-    }
-}
diff --git a/oximeter/db/src/oxql/ast/table_ops/limit.rs b/oximeter/db/src/oxql/ast/table_ops/limit.rs
index 0205868f5c..89afb31a7c 100644
--- a/oximeter/db/src/oxql/ast/table_ops/limit.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/limit.rs
@@ -6,12 +6,8 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use crate::oxql::point::Points;
-use crate::oxql::point::ValueArray;
-use crate::oxql::point::Values;
-use crate::oxql::Error;
-use crate::oxql::Table;
-use crate::oxql::Timeseries;
+use anyhow::Error;
+use oxql_types::Table;
 use std::num::NonZeroUsize;
 
 /// The kind of limiting operation
@@ -65,58 +61,7 @@ impl Limit {
                         }
                     };
 
-                    // Slice the various data arrays.
-                    let start_times = input_points
-                        .start_times
-                        .as_ref()
-                        .map(|s| s[start..end].to_vec());
-                    let timestamps =
-                        input_points.timestamps[start..end].to_vec();
-                    let values = input_points
-                        .values
-                        .iter()
-                        .map(|vals| {
-                            let values = match &vals.values {
-                                ValueArray::Integer(inner) => {
-                                    ValueArray::Integer(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                                ValueArray::Double(inner) => {
-                                    ValueArray::Double(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                                ValueArray::Boolean(inner) => {
-                                    ValueArray::Boolean(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                                ValueArray::String(inner) => {
-                                    ValueArray::String(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                                ValueArray::IntegerDistribution(inner) => {
-                                    ValueArray::IntegerDistribution(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                                ValueArray::DoubleDistribution(inner) => {
-                                    ValueArray::DoubleDistribution(
-                                        inner[start..end].to_vec(),
-                                    )
-                                }
-                            };
-                            Values { values, metric_type: vals.metric_type }
-                        })
-                        .collect();
-                    let points = Points { start_times, timestamps, values };
-                    Timeseries {
-                        fields: timeseries.fields.clone(),
-                        points,
-                        alignment: timeseries.alignment,
-                    }
+                    timeseries.limit(start, end)
                 });
                 Table::from_timeseries(table.name(), timeseries)
             })
@@ -127,9 +72,12 @@ impl Limit {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::oxql::point::{DataType, MetricType};
     use chrono::Utc;
     use oximeter::FieldValue;
+    use oxql_types::{
+        point::{DataType, MetricType},
+        Timeseries,
+    };
     use std::{collections::BTreeMap, time::Duration};
 
     fn test_tables() -> Vec<Table> {
@@ -150,12 +98,14 @@ mod tests {
             MetricType::Gauge,
         )
         .unwrap();
-        timeseries.points.timestamps.clone_from(&timestamps);
-        timeseries.points.values[0].values.as_integer_mut().unwrap().extend([
-            Some(1),
-            Some(2),
-            Some(3),
-        ]);
+        timeseries.points.set_timestamps(timestamps.clone());
+        timeseries
+            .points
+            .values_mut(0)
+            .unwrap()
+            .as_integer_mut()
+            .unwrap()
+            .extend([Some(1), Some(2), Some(3)]);
         let table1 =
             Table::from_timeseries("first", std::iter::once(timeseries))
                 .unwrap();
@@ -166,12 +116,14 @@ mod tests {
             MetricType::Gauge,
         )
         .unwrap();
-        timeseries.points.timestamps.clone_from(&timestamps);
-        timeseries.points.values[0].values.as_integer_mut().unwrap().extend([
-            Some(4),
-            Some(5),
-            Some(6),
-        ]);
+        timeseries.points.set_timestamps(timestamps.clone());
+        timeseries
+            .points
+            .values_mut(0)
+            .unwrap()
+            .as_integer_mut()
+            .unwrap()
+            .extend([Some(4), Some(5), Some(6)]);
         let table2 =
             Table::from_timeseries("second", std::iter::once(timeseries))
                 .unwrap();
@@ -223,7 +175,8 @@ mod tests {
                     "Limited table should have the same fields"
                 );
                 assert_eq!(
-                    timeseries.alignment, limited_timeseries.alignment,
+                    timeseries.alignment(),
+                    limited_timeseries.alignment(),
                     "Limited timeseries should have the same alignment"
                 );
                 assert_eq!(
@@ -237,14 +190,15 @@ mod tests {
                 // These depend on the limit operation.
                 let points = &timeseries.points;
                 let limited_points = &limited_timeseries.points;
-                assert_eq!(points.start_times, limited_points.start_times);
+                assert_eq!(points.start_times(), limited_points.start_times());
                 assert_eq!(
-                    points.timestamps[start..end],
-                    limited_points.timestamps
+                    &points.timestamps()[start..end],
+                    limited_points.timestamps()
                 );
                 assert_eq!(
-                    limited_points.values[0].values.as_integer().unwrap(),
-                    &points.values[0].values.as_integer().unwrap()[start..end],
+                    limited_points.values(0).unwrap().as_integer().unwrap(),
+                    &points.values(0).unwrap().as_integer().unwrap()
+                        [start..end],
                     "Points should be limited to [{start}..{end}]",
                 );
             }
diff --git a/oximeter/db/src/oxql/ast/table_ops/mod.rs b/oximeter/db/src/oxql/ast/table_ops/mod.rs
index 46f5106a08..8b8d4cbe1b 100644
--- a/oximeter/db/src/oxql/ast/table_ops/mod.rs
+++ b/oximeter/db/src/oxql/ast/table_ops/mod.rs
@@ -20,10 +20,10 @@ use self::join::Join;
 use self::limit::Limit;
 use crate::oxql::ast::Query;
 use crate::oxql::Error;
-use crate::oxql::Table;
 use chrono::DateTime;
 use chrono::Utc;
 use oximeter::TimeseriesName;
+use oxql_types::Table;
 
 /// A basic table operation, the atoms of an OxQL query.
 #[derive(Clone, Debug, PartialEq)]
diff --git a/oximeter/db/src/oxql/mod.rs b/oximeter/db/src/oxql/mod.rs
index 3961fae1cc..fcdfb783c5 100644
--- a/oximeter/db/src/oxql/mod.rs
+++ b/oximeter/db/src/oxql/mod.rs
@@ -10,13 +10,9 @@ use peg::error::ParseError as PegError;
 use peg::str::LineCol;
 
 pub mod ast;
-pub mod point;
 pub mod query;
-pub mod table;
 
 pub use self::query::Query;
-pub use self::table::Table;
-pub use self::table::Timeseries;
 pub use anyhow::Error;
 
 /// Format a PEG parsing error into a nice anyhow error.
diff --git a/oximeter/db/src/oxql/query/mod.rs b/oximeter/db/src/oxql/query/mod.rs
index e1fada9f2a..46c9bbc92c 100644
--- a/oximeter/db/src/oxql/query/mod.rs
+++ b/oximeter/db/src/oxql/query/mod.rs
@@ -23,7 +23,6 @@ use crate::oxql::Error;
 use crate::TimeseriesName;
 use chrono::DateTime;
 use chrono::Utc;
-use std::time::Duration;
 
 /// A parsed OxQL query.
 #[derive(Clone, Debug, PartialEq)]
@@ -391,15 +390,6 @@ fn restrict_filter_idents(
     }
 }
 
-/// Describes the time alignment for an OxQL query.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Alignment {
-    /// The end time of the query, which the temporal reference point.
-    pub end_time: DateTime<Utc>,
-    /// The alignment period, the interval on which values are produced.
-    pub period: Duration,
-}
-
 #[cfg(test)]
 mod tests {
     use super::Filter;
diff --git a/oximeter/db/src/query.rs b/oximeter/db/src/query.rs
index ceabf00888..556ced0437 100644
--- a/oximeter/db/src/query.rs
+++ b/oximeter/db/src/query.rs
@@ -6,11 +6,12 @@
 // Copyright 2021 Oxide Computer Company
 
 use crate::{
-    Error, FieldSchema, FieldSource, TimeseriesKey, TimeseriesSchema,
-    DATABASE_NAME, DATABASE_SELECT_FORMAT,
+    Error, FieldSchema, FieldSource, TimeseriesSchema, DATABASE_NAME,
+    DATABASE_SELECT_FORMAT,
 };
 use chrono::{DateTime, Utc};
 use dropshot::PaginationOrder;
+use oximeter::schema::TimeseriesKey;
 use oximeter::types::{DatumType, FieldType, FieldValue};
 use oximeter::{Metric, Target};
 use regex::Regex;
diff --git a/oximeter/db/src/shells/oxql.rs b/oximeter/db/src/shells/oxql.rs
index 0f23ea7d64..f46d08c0cf 100644
--- a/oximeter/db/src/shells/oxql.rs
+++ b/oximeter/db/src/shells/oxql.rs
@@ -7,9 +7,10 @@
 // Copyright 2024 Oxide Computer
 
 use super::{list_timeseries, prepare_columns};
-use crate::{make_client, oxql::Table, Client, OxqlResult};
+use crate::{make_client, Client, OxqlResult};
 use clap::Args;
 use crossterm::style::Stylize;
+use oxql_types::Table;
 use reedline::DefaultPrompt;
 use reedline::DefaultPromptSegment;
 use reedline::Reedline;
diff --git a/oximeter/oxql-types/Cargo.toml b/oximeter/oxql-types/Cargo.toml
new file mode 100644
index 0000000000..da7c7bcd1c
--- /dev/null
+++ b/oximeter/oxql-types/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "oxql-types"
+version = "0.1.0"
+edition = "2021"
+license = "MPL-2.0"
+
+[lints]
+workspace = true
+
+[dependencies]
+anyhow.workspace = true
+chrono.workspace = true
+highway.workspace = true
+num.workspace = true
+omicron-workspace-hack.workspace = true
+oximeter-types.workspace = true
+schemars.workspace = true
+serde.workspace = true
diff --git a/oximeter/oxql-types/src/lib.rs b/oximeter/oxql-types/src/lib.rs
new file mode 100644
index 0000000000..00468705a9
--- /dev/null
+++ b/oximeter/oxql-types/src/lib.rs
@@ -0,0 +1,23 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! Core types for OxQL.
+
+use chrono::{DateTime, Utc};
+use std::time::Duration;
+
+pub mod point;
+pub mod table;
+
+pub use self::table::Table;
+pub use self::table::Timeseries;
+
+/// Describes the time alignment for an OxQL query.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Alignment {
+    /// The end time of the query, which the temporal reference point.
+    pub end_time: DateTime<Utc>,
+    /// The alignment period, the interval on which values are produced.
+    pub period: Duration,
+}
diff --git a/oximeter/db/src/oxql/point.rs b/oximeter/oxql-types/src/point.rs
similarity index 82%
rename from oximeter/db/src/oxql/point.rs
rename to oximeter/oxql-types/src/point.rs
index e04193e8b8..6e3c7143dc 100644
--- a/oximeter/db/src/oxql/point.rs
+++ b/oximeter/oxql-types/src/point.rs
@@ -6,15 +6,15 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use super::Error;
 use anyhow::Context;
+use anyhow::Error;
 use chrono::DateTime;
 use chrono::Utc;
 use num::ToPrimitive;
-use oximeter::traits::HistogramSupport;
-use oximeter::DatumType;
-use oximeter::Measurement;
-use oximeter::Quantile;
+use oximeter_types::traits::HistogramSupport;
+use oximeter_types::DatumType;
+use oximeter_types::Measurement;
+use oximeter_types::Quantile;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -131,32 +131,32 @@ impl CumulativeDatum {
     // not cumulative.
     fn from_cumulative(meas: &Measurement) -> Result<Self, Error> {
         let datum = match meas.datum() {
-            oximeter::Datum::CumulativeI64(val) => {
+            oximeter_types::Datum::CumulativeI64(val) => {
                 CumulativeDatum::Integer(val.value())
             }
-            oximeter::Datum::CumulativeU64(val) => {
+            oximeter_types::Datum::CumulativeU64(val) => {
                 let int = val
                     .value()
                     .try_into()
                     .context("Overflow converting u64 to i64")?;
                 CumulativeDatum::Integer(int)
             }
-            oximeter::Datum::CumulativeF32(val) => {
+            oximeter_types::Datum::CumulativeF32(val) => {
                 CumulativeDatum::Double(val.value().into())
             }
-            oximeter::Datum::CumulativeF64(val) => {
+            oximeter_types::Datum::CumulativeF64(val) => {
                 CumulativeDatum::Double(val.value())
             }
-            oximeter::Datum::HistogramI8(hist) => hist.into(),
-            oximeter::Datum::HistogramU8(hist) => hist.into(),
-            oximeter::Datum::HistogramI16(hist) => hist.into(),
-            oximeter::Datum::HistogramU16(hist) => hist.into(),
-            oximeter::Datum::HistogramI32(hist) => hist.into(),
-            oximeter::Datum::HistogramU32(hist) => hist.into(),
-            oximeter::Datum::HistogramI64(hist) => hist.into(),
-            oximeter::Datum::HistogramU64(hist) => hist.try_into()?,
-            oximeter::Datum::HistogramF32(hist) => hist.into(),
-            oximeter::Datum::HistogramF64(hist) => hist.into(),
+            oximeter_types::Datum::HistogramI8(hist) => hist.into(),
+            oximeter_types::Datum::HistogramU8(hist) => hist.into(),
+            oximeter_types::Datum::HistogramI16(hist) => hist.into(),
+            oximeter_types::Datum::HistogramU16(hist) => hist.into(),
+            oximeter_types::Datum::HistogramI32(hist) => hist.into(),
+            oximeter_types::Datum::HistogramU32(hist) => hist.into(),
+            oximeter_types::Datum::HistogramI64(hist) => hist.into(),
+            oximeter_types::Datum::HistogramU64(hist) => hist.try_into()?,
+            oximeter_types::Datum::HistogramF32(hist) => hist.into(),
+            oximeter_types::Datum::HistogramF64(hist) => hist.into(),
             other => anyhow::bail!(
                 "Input datum of type {} is not cumulative",
                 other.datum_type(),
@@ -169,10 +169,10 @@ impl CumulativeDatum {
 /// A single list of values, for one dimension of a timeseries.
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 pub struct Values {
-    // The data values.
-    pub(super) values: ValueArray,
-    // The type of this metric.
-    pub(super) metric_type: MetricType,
+    /// The data values.
+    pub values: ValueArray,
+    /// The type of this metric.
+    pub metric_type: MetricType,
 }
 
 impl Values {
@@ -285,14 +285,23 @@ impl<'a> fmt::Display for Datum<'a> {
 #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
 pub struct Points {
     // The start time points for cumulative or delta metrics.
-    pub(super) start_times: Option<Vec<DateTime<Utc>>>,
+    pub(crate) start_times: Option<Vec<DateTime<Utc>>>,
     // The timestamp of each value.
-    pub(super) timestamps: Vec<DateTime<Utc>>,
+    pub(crate) timestamps: Vec<DateTime<Utc>>,
     // The array of data values, one for each dimension.
-    pub(super) values: Vec<Values>,
+    pub(crate) values: Vec<Values>,
 }
 
 impl Points {
+    /// Construct a new `Points` with the provided data.
+    pub fn new(
+        start_times: Option<Vec<DateTime<Utc>>>,
+        timestamps: Vec<DateTime<Utc>>,
+        values: Vec<Values>,
+    ) -> Self {
+        Self { start_times, timestamps, values }
+    }
+
     /// Construct an empty array of points to hold data of the provided type.
     pub fn empty(data_type: DataType, metric_type: MetricType) -> Self {
         Self::with_capacity(
@@ -303,8 +312,28 @@ impl Points {
         .unwrap()
     }
 
-    // Return a mutable reference to the value array of the specified dimension, if any.
-    pub(super) fn values_mut(&mut self, dim: usize) -> Option<&mut ValueArray> {
+    /// Return the start times of the points, if any.
+    pub fn start_times(&self) -> Option<&[DateTime<Utc>]> {
+        self.start_times.as_deref()
+    }
+
+    /// Clear the start times of the points.
+    pub fn clear_start_times(&mut self) {
+        self.start_times = None;
+    }
+
+    /// Return the timestamps of the points.
+    pub fn timestamps(&self) -> &[DateTime<Utc>] {
+        &self.timestamps
+    }
+
+    pub fn set_timestamps(&mut self, timestamps: Vec<DateTime<Utc>>) {
+        self.timestamps = timestamps;
+    }
+
+    /// Return a mutable reference to the value array of the specified
+    /// dimension, if any.
+    pub fn values_mut(&mut self, dim: usize) -> Option<&mut ValueArray> {
         self.values.get_mut(dim).map(|val| &mut val.values)
     }
 
@@ -563,8 +592,8 @@ impl Points {
         })
     }
 
-    // Filter points in self to those where `to_keep` is true.
-    pub(crate) fn filter(&self, to_keep: Vec<bool>) -> Result<Points, Error> {
+    /// Filter points in self to those where `to_keep` is true.
+    pub fn filter(&self, to_keep: Vec<bool>) -> Result<Points, Error> {
         anyhow::ensure!(
             to_keep.len() == self.len(),
             "Filter array must be the same length as self",
@@ -646,8 +675,8 @@ impl Points {
         Ok(out)
     }
 
-    // Return a new set of points, with the values casted to the provided types.
-    pub(crate) fn cast(&self, types: &[DataType]) -> Result<Self, Error> {
+    /// Return a new set of points, with the values casted to the provided types.
+    pub fn cast(&self, types: &[DataType]) -> Result<Self, Error> {
         anyhow::ensure!(
             types.len() == self.dimensionality(),
             "Cannot cast to {} types, the data has dimensionality {}",
@@ -863,12 +892,104 @@ impl Points {
         Ok(Self { start_times, timestamps, values: new_values })
     }
 
+    /// Given two arrays of points, stack them together at matching timepoints.
+    ///
+    /// For time points in either which do not have a corresponding point in
+    /// the other, the entire time point is elided.
+    pub fn inner_join(&self, right: &Points) -> Result<Points, Error> {
+        // Create an output array with roughly the right capacity, and double the
+        // number of dimensions. We're trying to stack output value arrays together
+        // along the dimension axis.
+        let data_types =
+            self.data_types().chain(right.data_types()).collect::<Vec<_>>();
+        let metric_types =
+            self.metric_types().chain(right.metric_types()).collect::<Vec<_>>();
+        let mut out = Points::with_capacity(
+            self.len().max(right.len()),
+            data_types.iter().copied(),
+            metric_types.iter().copied(),
+        )?;
+
+        // Iterate through each array until one is exhausted. We're only inserting
+        // values from both arrays where the timestamps actually match, since this
+        // is an inner join. We may want to insert missing values where timestamps
+        // do not match on either side, when we support an outer join of some kind.
+        let n_left_dim = self.dimensionality();
+        let mut left_ix = 0;
+        let mut right_ix = 0;
+        while left_ix < self.len() && right_ix < right.len() {
+            let left_timestamp = self.timestamps()[left_ix];
+            let right_timestamp = right.timestamps()[right_ix];
+            if left_timestamp == right_timestamp {
+                out.timestamps.push(left_timestamp);
+                push_concrete_values(
+                    &mut out.values[..n_left_dim],
+                    &self.values,
+                    left_ix,
+                );
+                push_concrete_values(
+                    &mut out.values[n_left_dim..],
+                    &right.values,
+                    right_ix,
+                );
+                left_ix += 1;
+                right_ix += 1;
+            } else if left_timestamp < right_timestamp {
+                left_ix += 1;
+            } else {
+                right_ix += 1;
+            }
+        }
+        Ok(out)
+    }
+
     /// Return true if self contains no data points.
     pub fn is_empty(&self) -> bool {
         self.len() == 0
     }
 }
 
+// Push the `i`th value from each dimension of `from` onto `to`.
+fn push_concrete_values(to: &mut [Values], from: &[Values], i: usize) {
+    assert_eq!(to.len(), from.len());
+    for (output, input) in to.iter_mut().zip(from.iter()) {
+        let input_array = &input.values;
+        let output_array = &mut output.values;
+        assert_eq!(input_array.data_type(), output_array.data_type());
+        if let Ok(ints) = input_array.as_integer() {
+            output_array.as_integer_mut().unwrap().push(ints[i]);
+            continue;
+        }
+        if let Ok(doubles) = input_array.as_double() {
+            output_array.as_double_mut().unwrap().push(doubles[i]);
+            continue;
+        }
+        if let Ok(bools) = input_array.as_boolean() {
+            output_array.as_boolean_mut().unwrap().push(bools[i]);
+            continue;
+        }
+        if let Ok(strings) = input_array.as_string() {
+            output_array.as_string_mut().unwrap().push(strings[i].clone());
+            continue;
+        }
+        if let Ok(dists) = input_array.as_integer_distribution() {
+            output_array
+                .as_integer_distribution_mut()
+                .unwrap()
+                .push(dists[i].clone());
+            continue;
+        }
+        if let Ok(dists) = input_array.as_double_distribution() {
+            output_array
+                .as_double_distribution_mut()
+                .unwrap()
+                .push(dists[i].clone());
+            continue;
+        }
+        unreachable!();
+    }
+}
+
 /// List of data values for one timeseries.
 ///
 /// Each element is an option, where `None` represents a missing sample.
@@ -900,8 +1021,8 @@ impl ValueArray {
         }
     }
 
-    // Return the data type in self.
-    pub(super) fn data_type(&self) -> DataType {
+    /// Return the data type in self.
+    pub fn data_type(&self) -> DataType {
         match self {
             ValueArray::Integer(_) => DataType::Integer,
             ValueArray::Double(_) => DataType::Double,
@@ -947,10 +1068,8 @@ impl ValueArray {
         Ok(inner)
     }
 
-    // Access the inner array of integers, if possible.
-    pub(super) fn as_integer_mut(
-        &mut self,
-    ) -> Result<&mut Vec<Option<i64>>, Error> {
+    /// Access the inner array of integers, if possible.
+    pub fn as_integer_mut(&mut self) -> Result<&mut Vec<Option<i64>>, Error> {
         let ValueArray::Integer(inner) = self else {
             anyhow::bail!(
                 "Cannot access value array as integer type, it has type {}",
@@ -1107,91 +1226,97 @@ impl ValueArray {
     // Push a value directly from a datum, without modification.
     fn push_value_from_datum(
         &mut self,
-        datum: &oximeter::Datum,
+        datum: &oximeter_types::Datum,
     ) -> Result<(), Error> {
         match datum {
-            oximeter::Datum::Bool(b) => self.as_boolean_mut()?.push(Some(*b)),
-            oximeter::Datum::I8(i) => {
+            oximeter_types::Datum::Bool(b) => {
+                self.as_boolean_mut()?.push(Some(*b))
+            }
+            oximeter_types::Datum::I8(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::U8(i) => {
+            oximeter_types::Datum::U8(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::I16(i) => {
+            oximeter_types::Datum::I16(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::U16(i) => {
+            oximeter_types::Datum::U16(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::I32(i) => {
+            oximeter_types::Datum::I32(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::U32(i) => {
+            oximeter_types::Datum::U32(i) => {
                 self.as_integer_mut()?.push(Some(i64::from(*i)))
             }
-            oximeter::Datum::I64(i) => self.as_integer_mut()?.push(Some(*i)),
-            oximeter::Datum::U64(i) => {
+            oximeter_types::Datum::I64(i) => {
+                self.as_integer_mut()?.push(Some(*i))
+            }
+            oximeter_types::Datum::U64(i) => {
                 let i =
                     i.to_i64().context("Failed to convert u64 datum to i64")?;
                 self.as_integer_mut()?.push(Some(i));
             }
-            oximeter::Datum::F32(f) => {
+            oximeter_types::Datum::F32(f) => {
                 self.as_double_mut()?.push(Some(f64::from(*f)))
             }
-            oximeter::Datum::F64(f) => self.as_double_mut()?.push(Some(*f)),
-            oximeter::Datum::String(s) => {
+            oximeter_types::Datum::F64(f) => {
+                self.as_double_mut()?.push(Some(*f))
+            }
+            oximeter_types::Datum::String(s) => {
                 self.as_string_mut()?.push(Some(s.clone()))
             }
-            oximeter::Datum::Bytes(_) => {
+            oximeter_types::Datum::Bytes(_) => {
                 anyhow::bail!("Bytes data types are not yet supported")
             }
-            oximeter::Datum::CumulativeI64(c) => {
+            oximeter_types::Datum::CumulativeI64(c) => {
                 self.as_integer_mut()?.push(Some(c.value()))
             }
-            oximeter::Datum::CumulativeU64(c) => {
+            oximeter_types::Datum::CumulativeU64(c) => {
                 let c = c
                     .value()
                     .to_i64()
                     .context("Failed to convert u64 datum to i64")?;
                 self.as_integer_mut()?.push(Some(c));
             }
-            oximeter::Datum::CumulativeF32(c) => {
+            oximeter_types::Datum::CumulativeF32(c) => {
                 self.as_double_mut()?.push(Some(f64::from(c.value())))
             }
-            oximeter::Datum::CumulativeF64(c) => {
+            oximeter_types::Datum::CumulativeF64(c) => {
                 self.as_double_mut()?.push(Some(c.value()))
             }
-            oximeter::Datum::HistogramI8(h) => self
+            oximeter_types::Datum::HistogramI8(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramU8(h) => self
+            oximeter_types::Datum::HistogramU8(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramI16(h) => self
+            oximeter_types::Datum::HistogramI16(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramU16(h) => self
+            oximeter_types::Datum::HistogramU16(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramI32(h) => self
+            oximeter_types::Datum::HistogramI32(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramU32(h) => self
+            oximeter_types::Datum::HistogramU32(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramI64(h) => self
+            oximeter_types::Datum::HistogramI64(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramU64(h) => self
+            oximeter_types::Datum::HistogramU64(h) => self
                 .as_integer_distribution_mut()?
                 .push(Some(Distribution::try_from(h)?)),
-            oximeter::Datum::HistogramF32(h) => self
+            oximeter_types::Datum::HistogramF32(h) => self
                 .as_double_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::HistogramF64(h) => self
+            oximeter_types::Datum::HistogramF64(h) => self
                 .as_double_distribution_mut()?
                 .push(Some(Distribution::from(h))),
-            oximeter::Datum::Missing(missing) => {
+            oximeter_types::Datum::Missing(missing) => {
                 self.push_missing(missing.datum_type())?
             }
         }
@@ -1216,7 +1341,7 @@ impl ValueArray {
     fn push_diff_from_last_to_datum(
         &mut self,
         last_datum: &Option<CumulativeDatum>,
-        new_datum: &oximeter::Datum,
+        new_datum: &oximeter_types::Datum,
         data_type: DataType,
     ) -> Result<(), Error> {
         match (last_datum.as_ref(), new_datum.is_missing()) {
@@ -1253,49 +1378,49 @@ impl ValueArray {
                 match (last_datum, new_datum) {
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::I8(new),
+                        oximeter_types::Datum::I8(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::U8(new),
+                        oximeter_types::Datum::U8(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::I16(new),
+                        oximeter_types::Datum::I16(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::U16(new),
+                        oximeter_types::Datum::U16(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::I32(new),
+                        oximeter_types::Datum::I32(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::U32(new),
+                        oximeter_types::Datum::U32(new),
                     ) => {
                         let new = i64::from(*new);
                         self.as_integer_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::I64(new),
+                        oximeter_types::Datum::I64(new),
                     ) => {
                         let diff = new
                             .checked_sub(*last)
@@ -1304,7 +1429,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::U64(new),
+                        oximeter_types::Datum::U64(new),
                     ) => {
                         let new = new
                             .to_i64()
@@ -1316,20 +1441,20 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::Double(last),
-                        oximeter::Datum::F32(new),
+                        oximeter_types::Datum::F32(new),
                     ) => {
                         self.as_double_mut()?
                             .push(Some(f64::from(*new) - last));
                     }
                     (
                         CumulativeDatum::Double(last),
-                        oximeter::Datum::F64(new),
+                        oximeter_types::Datum::F64(new),
                     ) => {
                         self.as_double_mut()?.push(Some(new - last));
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::CumulativeI64(new),
+                        oximeter_types::Datum::CumulativeI64(new),
                     ) => {
                         let new = new.value();
                         let diff = new
@@ -1339,7 +1464,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::Integer(last),
-                        oximeter::Datum::CumulativeU64(new),
+                        oximeter_types::Datum::CumulativeU64(new),
                     ) => {
                         let new = new
                             .value()
@@ -1352,20 +1477,20 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::Double(last),
-                        oximeter::Datum::CumulativeF32(new),
+                        oximeter_types::Datum::CumulativeF32(new),
                     ) => {
                         self.as_double_mut()?
                             .push(Some(f64::from(new.value()) - last));
                     }
                     (
                         CumulativeDatum::Double(last),
-                        oximeter::Datum::CumulativeF64(new),
+                        oximeter_types::Datum::CumulativeF64(new),
                     ) => {
                         self.as_double_mut()?.push(Some(new.value() - last));
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramI8(new),
+                        oximeter_types::Datum::HistogramI8(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1373,7 +1498,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramU8(new),
+                        oximeter_types::Datum::HistogramU8(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1381,7 +1506,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramI16(new),
+                        oximeter_types::Datum::HistogramI16(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1389,7 +1514,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramU16(new),
+                        oximeter_types::Datum::HistogramU16(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1397,7 +1522,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramI32(new),
+                        oximeter_types::Datum::HistogramI32(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1405,7 +1530,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramU32(new),
+                        oximeter_types::Datum::HistogramU32(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1413,7 +1538,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramI64(new),
+                        oximeter_types::Datum::HistogramI64(new),
                     ) => {
                         let new = Distribution::from(new);
                         self.as_integer_distribution_mut()?
@@ -1421,7 +1546,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::IntegerDistribution(last),
-                        oximeter::Datum::HistogramU64(new),
+                        oximeter_types::Datum::HistogramU64(new),
                     ) => {
                         let new = Distribution::try_from(new)?;
                         self.as_integer_distribution_mut()?
@@ -1429,7 +1554,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::DoubleDistribution(last),
-                        oximeter::Datum::HistogramF32(new),
+                        oximeter_types::Datum::HistogramF32(new),
                     ) => {
                         let new = Distribution::<f64>::from(new);
                         self.as_double_distribution_mut()?
@@ -1437,7 +1562,7 @@ impl ValueArray {
                     }
                     (
                         CumulativeDatum::DoubleDistribution(last),
-                        oximeter::Datum::HistogramF64(new),
+                        oximeter_types::Datum::HistogramF64(new),
                     ) => {
                         let new = Distribution::<f64>::from(new);
                         self.as_double_distribution_mut()?
@@ -1486,8 +1611,8 @@ impl ValueArray {
         }
     }
 
-    // Swap the value in self with other, asserting they're the same type.
-    pub(crate) fn swap(&mut self, mut values: ValueArray) {
+    /// Swap the value in self with other, asserting they're the same type.
+    pub fn swap(&mut self, mut values: ValueArray) {
         use std::mem::swap;
         match (self, &mut values) {
             (ValueArray::Integer(x), ValueArray::Integer(y)) => swap(x, y),
@@ -1733,8 +1858,10 @@ where
 
 macro_rules! i64_dist_from {
     ($t:ty) => {
-        impl From<&oximeter::histogram::Histogram<$t>> for Distribution<i64> {
-            fn from(hist: &oximeter::histogram::Histogram<$t>) -> Self {
+        impl From<&oximeter_types::histogram::Histogram<$t>>
+            for Distribution<i64>
+        {
+            fn from(hist: &oximeter_types::histogram::Histogram<$t>) -> Self {
                 let (bins, counts) = hist.bins_and_counts();
                 Self {
                     bins: bins.into_iter().map(i64::from).collect(),
@@ -1750,8 +1877,10 @@ macro_rules! i64_dist_from {
             }
         }
 
-        impl From<&oximeter::histogram::Histogram<$t>> for CumulativeDatum {
-            fn from(hist: &oximeter::histogram::Histogram<$t>) -> Self {
+        impl From<&oximeter_types::histogram::Histogram<$t>>
+            for CumulativeDatum
+        {
+            fn from(hist: &oximeter_types::histogram::Histogram<$t>) -> Self {
                 CumulativeDatum::IntegerDistribution(hist.into())
             }
         }
@@ -1766,10 +1895,10 @@ i64_dist_from!(i32);
 i64_dist_from!(u32);
 i64_dist_from!(i64);
 
-impl TryFrom<&oximeter::histogram::Histogram<u64>> for Distribution<i64> {
+impl TryFrom<&oximeter_types::histogram::Histogram<u64>> for Distribution<i64> {
     type Error = Error;
     fn try_from(
-        hist: &oximeter::histogram::Histogram<u64>,
+        hist: &oximeter_types::histogram::Histogram<u64>,
     ) -> Result<Self, Self::Error> {
         let (bins, counts) = hist.bins_and_counts();
         let bins = bins
@@ -1791,10 +1920,10 @@ impl TryFrom<&oximeter::histogram::Histogram<u64>> for Distribution<i64> {
     }
 }
 
-impl TryFrom<&oximeter::histogram::Histogram<u64>> for CumulativeDatum {
+impl TryFrom<&oximeter_types::histogram::Histogram<u64>> for CumulativeDatum {
     type Error = Error;
     fn try_from(
-        hist: &oximeter::histogram::Histogram<u64>,
+        hist: &oximeter_types::histogram::Histogram<u64>,
     ) -> Result<Self, Self::Error> {
         hist.try_into().map(CumulativeDatum::IntegerDistribution)
     }
@@ -1802,8 +1931,10 @@ impl TryFrom<&oximeter::histogram::Histogram<u64>> for CumulativeDatum {
 
 macro_rules! f64_dist_from {
     ($t:ty) => {
-        impl From<&oximeter::histogram::Histogram<$t>> for Distribution<f64> {
-            fn from(hist: &oximeter::histogram::Histogram<$t>) -> Self {
+        impl From<&oximeter_types::histogram::Histogram<$t>>
+            for Distribution<f64>
+        {
+            fn from(hist: &oximeter_types::histogram::Histogram<$t>) -> Self {
                 let (bins, counts) = hist.bins_and_counts();
                 Self {
                     bins: bins.into_iter().map(f64::from).collect(),
@@ -1819,8 +1950,10 @@ macro_rules! f64_dist_from {
             }
         }
 
-        impl From<&oximeter::histogram::Histogram<$t>> for CumulativeDatum {
-            fn from(hist: &oximeter::histogram::Histogram<$t>) -> Self {
+        impl From<&oximeter_types::histogram::Histogram<$t>>
+            for CumulativeDatum
+        {
+            fn from(hist: &oximeter_types::histogram::Histogram<$t>) -> Self {
                 CumulativeDatum::DoubleDistribution(hist.into())
             }
         }
@@ -1833,9 +1966,9 @@ f64_dist_from!(f64);
 #[cfg(test)]
 mod tests {
     use super::{Distribution, MetricType, Points, Values};
-    use crate::oxql::point::{DataType, ValueArray};
+    use crate::point::{push_concrete_values, DataType, Datum, ValueArray};
     use chrono::{DateTime, Utc};
-    use oximeter::{
+    use oximeter_types::{
         histogram::Record, types::Cumulative, Measurement, Quantile,
     };
     use std::time::Duration;
@@ -1939,12 +2072,12 @@ mod tests {
         let now = Utc::now();
         let current1 = now + Duration::from_secs(1);
         let mut hist1 =
-            oximeter::histogram::Histogram::new(&[0i64, 10, 20]).unwrap();
+            oximeter_types::histogram::Histogram::new(&[0i64, 10, 20]).unwrap();
         hist1.sample(1).unwrap();
         hist1.set_start_time(current1);
         let current2 = now + Duration::from_secs(2);
         let mut hist2 =
-            oximeter::histogram::Histogram::new(&[0i64, 10, 20]).unwrap();
+            oximeter_types::histogram::Histogram::new(&[0i64, 10, 20]).unwrap();
         hist2.sample(5).unwrap();
         hist2.sample(10).unwrap();
         hist2.sample(15).unwrap();
@@ -2273,4 +2406,176 @@ mod tests {
             .cast(&[DataType::DoubleDistribution, DataType::DoubleDistribution])
             .is_err());
     }
+
+    #[test]
+    fn test_push_concrete_values() {
+        let mut points = Points::with_capacity(
+            2,
+            [DataType::Integer, DataType::Double].into_iter(),
+            [MetricType::Gauge, MetricType::Gauge].into_iter(),
+        )
+        .unwrap();
+
+        // Push a concrete value for the integer dimension
+        let from_ints = vec![Values {
+            values: ValueArray::Integer(vec![Some(1)]),
+            metric_type: MetricType::Gauge,
+        }];
+        push_concrete_values(&mut points.values[..1], &from_ints, 0);
+
+        // And another for the double dimension.
+        let from_doubles = vec![Values {
+            values: ValueArray::Double(vec![Some(2.0)]),
+            metric_type: MetricType::Gauge,
+        }];
+        push_concrete_values(&mut points.values[1..], &from_doubles, 0);
+
+        assert_eq!(
+            points.dimensionality(),
+            2,
+            "Points should have 2 dimensions",
+        );
+        let ints = points.values[0].values.as_integer().unwrap();
+        assert_eq!(
+            ints.len(),
+            1,
+            "Should have pushed one point in the first dimension"
+        );
+        assert_eq!(
+            ints[0],
+            Some(1),
+            "Should have pushed 1 onto the first dimension"
+        );
+        let doubles = points.values[1].values.as_double().unwrap();
+        assert_eq!(
+            doubles.len(),
+            1,
+            "Should have pushed one point in the second dimension"
+        );
+        assert_eq!(
+            doubles[0],
+            Some(2.0),
+            "Should have pushed 2.0 onto the second dimension"
+        );
+    }
+
+    #[test]
+    fn test_join_point_arrays() {
+        let now = Utc::now();
+
+        // Create a set of integer points to join with.
+        //
+        // This will have two timestamps, one of which will match the points
+        // below that are merged in.
+        let int_points = Points {
+            start_times: None,
+            timestamps: vec![
+                now - Duration::from_secs(3),
+                now - Duration::from_secs(2),
+                now,
+            ],
+            values: vec![Values {
+                values: ValueArray::Integer(vec![Some(1), Some(2), Some(3)]),
+                metric_type: MetricType::Gauge,
+            }],
+        };
+
+        // Create an additional set of double points.
+        //
+        // This also has two timepoints, one of which matches with the above,
+        // and one of which does not.
+        let double_points = Points {
+            start_times: None,
+            timestamps: vec![
+                now - Duration::from_secs(3),
+                now - Duration::from_secs(1),
+                now,
+            ],
+            values: vec![Values {
+                values: ValueArray::Double(vec![
+                    Some(4.0),
+                    Some(5.0),
+                    Some(6.0),
+                ]),
+                metric_type: MetricType::Gauge,
+            }],
+        };
+
+        // Merge the arrays.
+        let merged = int_points.inner_join(&double_points).unwrap();
+
+        // Basic checks that we merged in the right values and have the right
+        // types and dimensions.
+        assert_eq!(
+            merged.dimensionality(),
+            2,
+            "Should have appended the dimensions from each input array"
+        );
+        assert_eq!(merged.len(), 2, "Should have merged two common points",);
+        assert_eq!(
+            merged.data_types().collect::<Vec<_>>(),
+            &[DataType::Integer, DataType::Double],
+            "Should have combined the data types of the input arrays"
+        );
+        assert_eq!(
+            merged.metric_types().collect::<Vec<_>>(),
+            &[MetricType::Gauge, MetricType::Gauge],
+            "Should have combined the metric types of the input arrays"
+        );
+
+        // Check the actual values of the array.
+        let mut points = merged.iter_points();
+
+        // The first and last timepoint overlapped between the two arrays, so we
+        // should have both of them as concrete samples.
+        let pt = points.next().unwrap();
+        assert_eq!(pt.start_time, None, "Gauges don't have a start time");
+        assert_eq!(
+            *pt.timestamp, int_points.timestamps[0],
+            "Should have taken the first input timestamp from both arrays",
+        );
+        assert_eq!(
+            *pt.timestamp, double_points.timestamps[0],
+            "Should have taken the first input timestamp from both arrays",
+        );
+        let values = pt.values;
+        assert_eq!(values.len(), 2, "Should have 2 dimensions");
+        assert_eq!(
+            &values[0],
+            &(Datum::Integer(Some(&1)), MetricType::Gauge),
+            "Should have pulled value from first integer array."
+        );
+        assert_eq!(
+            &values[1],
+            &(Datum::Double(Some(&4.0)), MetricType::Gauge),
+            "Should have pulled value from second double array."
+        );
+
+        // And the next point
+        let pt = points.next().unwrap();
+        assert_eq!(pt.start_time, None, "Gauges don't have a start time");
+        assert_eq!(
+            *pt.timestamp, int_points.timestamps[2],
+            "Should have taken the input timestamp from both arrays",
+        );
+        assert_eq!(
+            *pt.timestamp, double_points.timestamps[2],
+            "Should have taken the input timestamp from both arrays",
+        );
+        let values = pt.values;
+        assert_eq!(values.len(), 2, "Should have 2 dimensions");
+        assert_eq!(
+            &values[0],
+            &(Datum::Integer(Some(&3)), MetricType::Gauge),
+            "Should have pulled value from first integer array."
+        );
+        assert_eq!(
+            &values[1],
+            &(Datum::Double(Some(&6.0)), MetricType::Gauge),
+            "Should have pulled value from second double array."
+        );
+
+        // And there should be no other values.
+        assert!(points.next().is_none(), "There should be no more points");
+    }
 }
diff --git a/oximeter/db/src/oxql/table.rs b/oximeter/oxql-types/src/table.rs
similarity index 75%
rename from oximeter/db/src/oxql/table.rs
rename to oximeter/oxql-types/src/table.rs
index 2cd141d2fa..f37992942f 100644
--- a/oximeter/db/src/oxql/table.rs
+++ b/oximeter/oxql-types/src/table.rs
@@ -6,14 +6,16 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use super::point::DataType;
-use super::point::MetricType;
-use super::point::Points;
-use super::query::Alignment;
-use super::Error;
-use crate::TimeseriesKey;
+use crate::point::DataType;
+use crate::point::MetricType;
+use crate::point::Points;
+use crate::point::ValueArray;
+use crate::point::Values;
+use crate::Alignment;
+use anyhow::Error;
 use highway::HighwayHasher;
-use oximeter::FieldValue;
+use oximeter_types::schema::TimeseriesKey;
+use oximeter_types::FieldValue;
 use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
@@ -67,10 +69,20 @@ impl Timeseries {
         hasher.finish()
     }
 
+    /// Return the alignment of this timeseries, if any.
+    pub fn alignment(&self) -> Option<Alignment> {
+        self.alignment
+    }
+
+    /// Set the alignment of this timeseries.
+    pub fn set_alignment(&mut self, alignment: Alignment) {
+        self.alignment = Some(alignment);
+    }
+
     /// Return a copy of the timeseries, keeping only the provided fields.
     ///
     /// An error is returned if the timeseries does not contain those fields.
-    pub(crate) fn copy_with_fields(
+    pub fn copy_with_fields(
         &self,
         kept_fields: &[&str],
     ) -> Result<Self, Error> {
@@ -88,6 +100,20 @@ impl Timeseries {
         })
     }
 
+    /// Return a copy of the timeseries, keeping only the provided points.
+    ///
+    /// Returns `None` if `kept_points` is empty.
+    pub fn copy_with_points(&self, kept_points: Points) -> Option<Self> {
+        if kept_points.is_empty() {
+            return None;
+        }
+        Some(Self {
+            fields: self.fields.clone(),
+            points: kept_points,
+            alignment: self.alignment,
+        })
+    }
+
     // Return `true` if the schema in `other` matches that of `self`.
     fn matches_schema(&self, other: &Timeseries) -> bool {
         if self.fields.len() != other.fields.len() {
@@ -125,7 +151,7 @@ impl Timeseries {
     /// This returns an error if the points cannot be so cast, or the
     /// dimensionality of the types requested differs from the dimensionality of
     /// the points themselves.
-    pub(crate) fn cast(&self, types: &[DataType]) -> Result<Timeseries, Error> {
+    pub fn cast(&self, types: &[DataType]) -> Result<Timeseries, Error> {
         let fields = self.fields.clone();
         Ok(Self {
             fields,
@@ -133,6 +159,49 @@ impl Timeseries {
             alignment: self.alignment,
         })
     }
+
+    /// Return a new timeseries, with the points limited to the provided range.
+    pub fn limit(&self, start: usize, end: usize) -> Self {
+        let input_points = &self.points;
+
+        // Slice the various data arrays.
+        let start_times =
+            input_points.start_times().map(|s| s[start..end].to_vec());
+        let timestamps = input_points.timestamps()[start..end].to_vec();
+        let values = input_points
+            .values
+            .iter()
+            .map(|vals| {
+                let values = match &vals.values {
+                    ValueArray::Integer(inner) => {
+                        ValueArray::Integer(inner[start..end].to_vec())
+                    }
+                    ValueArray::Double(inner) => {
+                        ValueArray::Double(inner[start..end].to_vec())
+                    }
+                    ValueArray::Boolean(inner) => {
+                        ValueArray::Boolean(inner[start..end].to_vec())
+                    }
+                    ValueArray::String(inner) => {
+                        ValueArray::String(inner[start..end].to_vec())
+                    }
+                    ValueArray::IntegerDistribution(inner) => {
+                        ValueArray::IntegerDistribution(
+                            inner[start..end].to_vec(),
+                        )
+                    }
+                    ValueArray::DoubleDistribution(inner) => {
+                        ValueArray::DoubleDistribution(
+                            inner[start..end].to_vec(),
+                        )
+                    }
+                };
+                Values { values, metric_type: vals.metric_type }
+            })
+            .collect();
+        let points = Points::new(start_times, timestamps, values);
+        Self { fields: self.fields.clone(), points, alignment: self.alignment }
+    }
 }
 
 /// A table represents one or more timeseries with the same schema.
@@ -146,7 +215,7 @@ pub struct Table {
     //
     // This starts as the name of the timeseries schema the data is derived
     // from, but can be modified as operations are done.
-    pub(super) name: String,
+    pub name: String,
     // The set of timeseries in the table, ordered by key.
     timeseries: BTreeMap<TimeseriesKey, Timeseries>,
 }
diff --git a/oximeter/types/src/schema.rs b/oximeter/types/src/schema.rs
index 2efd5265ff..80aaa6f101 100644
--- a/oximeter/types/src/schema.rs
+++ b/oximeter/types/src/schema.rs
@@ -28,6 +28,8 @@ use std::num::NonZeroU8;
 pub const SCHEMA_DIRECTORY: &str =
     concat!(env!("CARGO_MANIFEST_DIR"), "/../oximeter/schema");
 
+pub type TimeseriesKey = u64;
+
 /// The name and type information for a field of a timeseries schema.
 #[derive(
     Clone,

From a63e7840eabaaf3e4105dc4af4685c262409a4d0 Mon Sep 17 00:00:00 2001
From: Benjamin Naecker <ben@oxide.computer>
Date: Sat, 17 Aug 2024 23:35:26 -0700
Subject: [PATCH 20/28] Make OxQL query response type into an object (#6374)

- Fixes #6371
---
 Cargo.lock                                 |  1 +
 nexus/src/external_api/http_entrypoints.rs |  4 ++--
 nexus/tests/integration_tests/metrics.rs   | 13 ++++++++-----
 nexus/types/Cargo.toml                     |  1 +
 nexus/types/src/external_api/views.rs      |  9 +++++++++
 openapi/nexus.json                         | 22 +++++++++++++++++-----
 6 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2943a4f2c2..040ecd9e98 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5461,6 +5461,7 @@ dependencies = [
  "omicron-workspace-hack",
  "openssl",
  "oxnet",
+ "oxql-types",
  "parse-display",
  "proptest",
  "schemars",
diff --git a/nexus/src/external_api/http_entrypoints.rs b/nexus/src/external_api/http_entrypoints.rs
index df522f18ab..5b80c973e3 100644
--- a/nexus/src/external_api/http_entrypoints.rs
+++ b/nexus/src/external_api/http_entrypoints.rs
@@ -6386,7 +6386,7 @@ async fn timeseries_schema_list(
 async fn timeseries_query(
     rqctx: RequestContext<ApiContext>,
     body: TypedBody<params::TimeseriesQuery>,
-) -> Result<HttpResponseOk<Vec<oxql_types::Table>>, HttpError> {
+) -> Result<HttpResponseOk<views::OxqlQueryResult>, HttpError> {
     let apictx = rqctx.context();
     let handler = async {
         let nexus = &apictx.context.nexus;
@@ -6395,7 +6395,7 @@ async fn timeseries_query(
         nexus
             .timeseries_query(&opctx, &query)
             .await
-            .map(HttpResponseOk)
+            .map(|tables| HttpResponseOk(views::OxqlQueryResult { tables }))
             .map_err(HttpError::from)
     };
     apictx
diff --git a/nexus/tests/integration_tests/metrics.rs b/nexus/tests/integration_tests/metrics.rs
index e24de2a3ad..3b808984ae 100644
--- a/nexus/tests/integration_tests/metrics.rs
+++ b/nexus/tests/integration_tests/metrics.rs
@@ -19,6 +19,7 @@ use nexus_test_utils::resource_helpers::{
 };
 use nexus_test_utils::ControlPlaneTestContext;
 use nexus_test_utils_macros::nexus_test;
+use nexus_types::external_api::views::OxqlQueryResult;
 use omicron_test_utils::dev::poll::{wait_for_condition, CondCheckError};
 use omicron_uuid_kinds::{GenericUuid, InstanceUuid};
 use oximeter::types::Datum;
@@ -307,12 +308,14 @@ pub async fn timeseries_query(
     .unwrap_or_else(|e| {
         panic!("timeseries query failed: {e:?}\nquery: {query}")
     });
-    rsp.parsed_body().unwrap_or_else(|e| {
-        panic!(
-            "could not parse timeseries query response: {e:?}\n\
+    rsp.parsed_body::<OxqlQueryResult>()
+        .unwrap_or_else(|e| {
+            panic!(
+                "could not parse timeseries query response: {e:?}\n\
             query: {query}\nresponse: {rsp:#?}"
-        );
-    })
+            );
+        })
+        .tables
 }
 
 #[nexus_test]
diff --git a/nexus/types/Cargo.toml b/nexus/types/Cargo.toml
index a4418d2a74..8dd6292d5c 100644
--- a/nexus/types/Cargo.toml
+++ b/nexus/types/Cargo.toml
@@ -19,6 +19,7 @@ humantime.workspace = true
 ipnetwork.workspace = true
 omicron-uuid-kinds.workspace = true
 openssl.workspace = true
+oxql-types.workspace = true
 oxnet.workspace = true
 parse-display.workspace = true
 schemars = { workspace = true, features = ["chrono", "uuid1"] }
diff --git a/nexus/types/src/external_api/views.rs b/nexus/types/src/external_api/views.rs
index e241f849ee..58c2e560ab 100644
--- a/nexus/types/src/external_api/views.rs
+++ b/nexus/types/src/external_api/views.rs
@@ -971,3 +971,12 @@ pub struct AllowList {
     /// The allowlist of IPs or subnets.
     pub allowed_ips: ExternalAllowedSourceIps,
 }
+
+// OxQL QUERIES
+
+/// The result of a successful OxQL query.
+#[derive(Clone, Debug, Deserialize, JsonSchema, Serialize)]
+pub struct OxqlQueryResult {
+    /// Tables resulting from the query, each containing timeseries.
+    pub tables: Vec<oxql_types::Table>,
+}
diff --git a/openapi/nexus.json b/openapi/nexus.json
index a0cbfa2f63..c29cb8a95c 100644
--- a/openapi/nexus.json
+++ b/openapi/nexus.json
@@ -8026,11 +8026,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "title": "Array_of_Table",
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/Table"
-                  }
+                  "$ref": "#/components/schemas/OxqlQueryResult"
                 }
               }
             }
@@ -16501,6 +16497,22 @@
           }
         ]
       },
+      "OxqlQueryResult": {
+        "description": "The result of a successful OxQL query.",
+        "type": "object",
+        "properties": {
+          "tables": {
+            "description": "Tables resulting from the query, each containing timeseries.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Table"
+            }
+          }
+        },
+        "required": [
+          "tables"
+        ]
+      },
       "Password": {
         "title": "A password used to authenticate a user",
         "description": "Passwords may be subject to additional constraints.",

From ede17c7a26017d29c2fccc1f0183a945793dd693 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Sun, 18 Aug 2024 16:42:00 -0700
Subject: [PATCH 21/28] Update Rust crate camino to v1.1.9 (#6382)

---
 Cargo.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 040ecd9e98..f3aafb9b7d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -815,9 +815,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3054fea8a20d8ff3968d5b22cc27501d2b08dc4decdb31b184323f00c5ef23bb"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]

From b449abb736c10313df1d5e0c8f126970b2b968e5 Mon Sep 17 00:00:00 2001
From: "oxide-renovate[bot]"
 <146848827+oxide-renovate[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 04:32:11 +0000
Subject: [PATCH 22/28] Update taiki-e/install-action digest to 37129d5 (#6384)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [taiki-e/install-action](https://togithub.com/taiki-e/install-action)
| action | digest | [`2d7ff60` ->
`37129d5`](https://togithub.com/taiki-e/install-action/compare/2d7ff60...37129d5)
|

---

### Configuration

📅 **Schedule**: Branch creation - "after 8pm,before 6am" in timezone
America/Los_Angeles, Automerge - "after 8pm,before 6am" in timezone
America/Los_Angeles.

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4zOS42IiwidXBkYXRlZEluVmVyIjoiMzguMzkuNiIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiZGVwZW5kZW5jaWVzIl19-->

Co-authored-by: oxide-renovate[bot] <146848827+oxide-renovate[bot]@users.noreply.github.com>
---
 .github/workflows/hakari.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/hakari.yml b/.github/workflows/hakari.yml
index 4b4d09ba35..63752880d6 100644
--- a/.github/workflows/hakari.yml
+++ b/.github/workflows/hakari.yml
@@ -24,7 +24,7 @@ jobs:
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@2d7ff60c815c5236dc38fd3909d97d6d605315d2 # v2
+        uses: taiki-e/install-action@37129d5de13e9122cce55a7a5e7e49981cef514c # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date

From 5eb0284d3733ad1ae8633332458bcaa26c3b5c29 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Mon, 19 Aug 2024 09:05:01 -0700
Subject: [PATCH 23/28] releng: allow building os image from local sources
 (#6126)

---
 dev-tools/releng/src/main.rs | 73 ++++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 33 deletions(-)

diff --git a/dev-tools/releng/src/main.rs b/dev-tools/releng/src/main.rs
index ee649e79b2..264eec2503 100644
--- a/dev-tools/releng/src/main.rs
+++ b/dev-tools/releng/src/main.rs
@@ -143,6 +143,10 @@ struct Args {
     /// Path to a pre-built omicron-package binary (skips building if set)
     #[clap(long, env = "OMICRON_PACKAGE")]
     omicron_package_bin: Option<Utf8PathBuf>,
+
+    /// Build the helios OS image from local sources.
+    #[clap(long)]
+    helios_local: bool,
 }
 
 impl Args {
@@ -286,7 +290,7 @@ async fn main() -> Result<()> {
                     logger,
                     "helios checkout at {0} is out-of-date; run \
                     `git pull -C {0}`, or run omicron-releng with \
-                    --ignore-helios-origin or --helios-path",
+                    --ignore-helios-origin or --helios-dir",
                     shell_words::quote(args.helios_dir.as_str())
                 );
                 preflight_ok = false;
@@ -496,39 +500,42 @@ async fn main() -> Result<()> {
             Utc::now().format("%Y-%m-%d %H:%M")
         );
 
-        // helios-build experiment-image
-        jobs.push_command(
-            format!("{}-image", target),
-            Command::new("ptime")
-                .arg("-m")
-                .arg(args.helios_dir.join("helios-build"))
-                .arg("experiment-image")
-                .arg("-o") // output directory for image
-                .arg(args.output_dir.join(format!("os-{}", target)))
+        let mut image_cmd = Command::new("ptime")
+            .arg("-m")
+            .arg(args.helios_dir.join("helios-build"))
+            .arg("experiment-image")
+            .arg("-o") // output directory for image
+            .arg(args.output_dir.join(format!("os-{}", target)))
+            .arg("-F") // pass extra image builder features
+            .arg(format!("optever={}", opte_version.trim()))
+            .arg("-P") // include all files from extra proto area
+            .arg(proto_dir.join("root"))
+            .arg("-N") // image name
+            .arg(image_name)
+            .arg("-s") // tempdir name suffix
+            .arg(target.as_str())
+            .args(target.image_build_args())
+            .current_dir(&args.helios_dir)
+            .env(
+                "IMAGE_DATASET",
+                match target {
+                    Target::Host => &args.host_dataset,
+                    Target::Recovery => &args.recovery_dataset,
+                },
+            )
+            .env_remove("CARGO")
+            .env_remove("RUSTUP_TOOLCHAIN");
+
+        if !args.helios_local {
+            image_cmd = image_cmd
                 .arg("-p") // use an external package repository
-                .arg(format!("helios-dev={}", HELIOS_REPO))
-                .arg("-F") // pass extra image builder features
-                .arg(format!("optever={}", opte_version.trim()))
-                .arg("-P") // include all files from extra proto area
-                .arg(proto_dir.join("root"))
-                .arg("-N") // image name
-                .arg(image_name)
-                .arg("-s") // tempdir name suffix
-                .arg(target.as_str())
-                .args(target.image_build_args())
-                .current_dir(&args.helios_dir)
-                .env(
-                    "IMAGE_DATASET",
-                    match target {
-                        Target::Host => &args.host_dataset,
-                        Target::Recovery => &args.recovery_dataset,
-                    },
-                )
-                .env_remove("CARGO")
-                .env_remove("RUSTUP_TOOLCHAIN"),
-        )
-        .after("helios-setup")
-        .after(format!("{}-proto", target));
+                .arg(format!("helios-dev={HELIOS_REPO}"))
+        }
+
+        // helios-build experiment-image
+        jobs.push_command(format!("{}-image", target), image_cmd)
+            .after("helios-setup")
+            .after(format!("{}-proto", target));
     }
     // Build the recovery target after we build the host target. Only one
     // of these will build at a time since Cargo locks its target directory;

From b29947e9efd4fc79864a85d1a6776acfd2d94ea8 Mon Sep 17 00:00:00 2001
From: Benjamin Naecker <ben@oxide.computer>
Date: Mon, 19 Aug 2024 09:25:39 -0700
Subject: [PATCH 24/28] Slim down the ClickHouse database (#6352)

- Add TTLs to all field tables, by using a materialized column with the
time each record is inserted. ClickHouse will retain the latest
timestamp, so when we stop inserting, the TTL clock will start counting
down on those timeseries records.
- Update Dropshot dependency.
- Add operation ID to HTTP service timeseries, remove other fields.
Expunge the old timeseries too.
- Remove unnecessary stingifying of URIs in latency tracking.
---
 Cargo.lock                                    |   7 +-
 ...ast_updated_column_to_fields_i64_local.sql |   1 +
 ...ast_updated_column_on_fields_i64_local.sql |   1 +
 .../10/02_add_ttl_to_fields_i64_local.sql     |   1 +
 ...st_updated_column_to_fields_uuid_local.sql |   1 +
 ...st_updated_column_on_fields_uuid_local.sql |   1 +
 .../10/05_add_ttl_to_fields_uuid_local.sql    |   1 +
 ...st_updated_column_to_fields_bool_local.sql |   1 +
 ...st_updated_column_on_fields_bool_local.sql |   1 +
 .../10/08_add_ttl_to_fields_bool_local.sql    |   1 +
 ..._updated_column_to_fields_ipaddr_local.sql |   1 +
 ..._updated_column_on_fields_ipaddr_local.sql |   1 +
 .../10/11_add_ttl_to_fields_ipaddr_local.sql  |   1 +
 ..._updated_column_to_fields_string_local.sql |   1 +
 ..._updated_column_on_fields_string_local.sql |   1 +
 .../10/14_add_ttl_to_fields_string_local.sql  |   1 +
 ...last_updated_column_to_fields_i8_local.sql |   1 +
 ...last_updated_column_on_fields_i8_local.sql |   1 +
 .../10/17_add_ttl_to_fields_i8_local.sql      |   1 +
 ...last_updated_column_to_fields_u8_local.sql |   1 +
 ...last_updated_column_on_fields_u8_local.sql |   1 +
 .../10/20_add_ttl_to_fields_u8_local.sql      |   1 +
 ...ast_updated_column_to_fields_i16_local.sql |   1 +
 ...ast_updated_column_on_fields_i16_local.sql |   1 +
 .../10/23_add_ttl_to_fields_i16_local.sql     |   1 +
 ...ast_updated_column_to_fields_u16_local.sql |   1 +
 ...ast_updated_column_on_fields_u16_local.sql |   1 +
 .../10/26_add_ttl_to_fields_u16_local.sql     |   1 +
 ...ast_updated_column_to_fields_i32_local.sql |   1 +
 ...ast_updated_column_on_fields_i32_local.sql |   1 +
 .../10/29_add_ttl_to_fields_i32_local.sql     |   1 +
 ...ast_updated_column_to_fields_u32_local.sql |   1 +
 ...ast_updated_column_on_fields_u32_local.sql |   1 +
 .../10/32_add_ttl_to_fields_u32_local.sql     |   1 +
 ...ast_updated_column_to_fields_u64_local.sql |   1 +
 ...ast_updated_column_on_fields_u64_local.sql |   1 +
 .../10/35_add_ttl_to_fields_u64_local.sql     |   1 +
 .../replicated/10/timeseries-to-delete.txt    |   1 +
 oximeter/db/schema/replicated/db-init-1.sql   |  12 +-
 oximeter/db/schema/replicated/db-init-2.sql   |  60 ++++++---
 ...add_last_updated_column_to_fields_bool.sql |   1 +
 ...ize_last_updated_column_on_fields_bool.sql |   1 +
 .../10/02_add_ttl_to_fields_bool.sql          |   1 +
 ...3_add_last_updated_column_to_fields_i8.sql |   1 +
 ...alize_last_updated_column_on_fields_i8.sql |   1 +
 .../10/05_add_ttl_to_fields_i8.sql            |   1 +
 ...6_add_last_updated_column_to_fields_u8.sql |   1 +
 ...alize_last_updated_column_on_fields_u8.sql |   1 +
 .../10/08_add_ttl_to_fields_u8.sql            |   1 +
 ..._add_last_updated_column_to_fields_i16.sql |   1 +
 ...lize_last_updated_column_on_fields_i16.sql |   1 +
 .../10/11_add_ttl_to_fields_i16.sql           |   1 +
 ..._add_last_updated_column_to_fields_u16.sql |   1 +
 ...lize_last_updated_column_on_fields_u16.sql |   1 +
 .../10/14_add_ttl_to_fields_u16.sql           |   1 +
 ..._add_last_updated_column_to_fields_i32.sql |   1 +
 ...lize_last_updated_column_on_fields_i32.sql |   1 +
 .../10/17_add_ttl_to_fields_i32.sql           |   1 +
 ..._add_last_updated_column_to_fields_u32.sql |   1 +
 ...lize_last_updated_column_on_fields_u32.sql |   1 +
 .../10/20_add_ttl_to_fields_u32.sql           |   1 +
 ..._add_last_updated_column_to_fields_i64.sql |   1 +
 ...lize_last_updated_column_on_fields_i64.sql |   1 +
 .../10/23_add_ttl_to_fields_i64.sql           |   1 +
 ..._add_last_updated_column_to_fields_u64.sql |   1 +
 ...lize_last_updated_column_on_fields_u64.sql |   1 +
 .../10/26_add_ttl_to_fields_u64.sql           |   1 +
 ...d_last_updated_column_to_fields_ipaddr.sql |   1 +
 ...e_last_updated_column_on_fields_ipaddr.sql |   1 +
 .../10/29_add_ttl_to_fields_ipaddr.sql        |   1 +
 ...d_last_updated_column_to_fields_string.sql |   1 +
 ...e_last_updated_column_on_fields_string.sql |   1 +
 .../10/32_add_ttl_to_fields_string.sql        |   1 +
 ...add_last_updated_column_to_fields_uuid.sql |   1 +
 ...ize_last_updated_column_on_fields_uuid.sql |   1 +
 .../10/35_add_ttl_to_fields_uuid.sql          |   1 +
 .../single-node/10/timeseries-to-delete.txt   |   1 +
 oximeter/db/schema/single-node/db-init.sql    |  80 ++++++++----
 oximeter/db/src/model.rs                      |   2 +-
 oximeter/instruments/src/http.rs              | 119 ++++++++----------
 oximeter/oximeter/schema/http-service.toml    |  15 +--
 workspace-hack/Cargo.toml                     |   2 +
 82 files changed, 244 insertions(+), 127 deletions(-)
 create mode 100644 oximeter/db/schema/replicated/10/00_add_last_updated_column_to_fields_i64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/01_materialize_last_updated_column_on_fields_i64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/02_add_ttl_to_fields_i64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/03_add_last_updated_column_to_fields_uuid_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/04_materialize_last_updated_column_on_fields_uuid_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/05_add_ttl_to_fields_uuid_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/06_add_last_updated_column_to_fields_bool_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/07_materialize_last_updated_column_on_fields_bool_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/08_add_ttl_to_fields_bool_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/09_add_last_updated_column_to_fields_ipaddr_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/10_materialize_last_updated_column_on_fields_ipaddr_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/11_add_ttl_to_fields_ipaddr_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/12_add_last_updated_column_to_fields_string_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/13_materialize_last_updated_column_on_fields_string_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/14_add_ttl_to_fields_string_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/15_add_last_updated_column_to_fields_i8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/16_materialize_last_updated_column_on_fields_i8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/17_add_ttl_to_fields_i8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/18_add_last_updated_column_to_fields_u8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/19_materialize_last_updated_column_on_fields_u8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/20_add_ttl_to_fields_u8_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/21_add_last_updated_column_to_fields_i16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/22_materialize_last_updated_column_on_fields_i16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/23_add_ttl_to_fields_i16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/24_add_last_updated_column_to_fields_u16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/25_materialize_last_updated_column_on_fields_u16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/26_add_ttl_to_fields_u16_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/27_add_last_updated_column_to_fields_i32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/28_materialize_last_updated_column_on_fields_i32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/29_add_ttl_to_fields_i32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/30_add_last_updated_column_to_fields_u32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/31_materialize_last_updated_column_on_fields_u32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/32_add_ttl_to_fields_u32_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/33_add_last_updated_column_to_fields_u64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/34_materialize_last_updated_column_on_fields_u64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/35_add_ttl_to_fields_u64_local.sql
 create mode 100644 oximeter/db/schema/replicated/10/timeseries-to-delete.txt
 create mode 100644 oximeter/db/schema/single-node/10/00_add_last_updated_column_to_fields_bool.sql
 create mode 100644 oximeter/db/schema/single-node/10/01_materialize_last_updated_column_on_fields_bool.sql
 create mode 100644 oximeter/db/schema/single-node/10/02_add_ttl_to_fields_bool.sql
 create mode 100644 oximeter/db/schema/single-node/10/03_add_last_updated_column_to_fields_i8.sql
 create mode 100644 oximeter/db/schema/single-node/10/04_materialize_last_updated_column_on_fields_i8.sql
 create mode 100644 oximeter/db/schema/single-node/10/05_add_ttl_to_fields_i8.sql
 create mode 100644 oximeter/db/schema/single-node/10/06_add_last_updated_column_to_fields_u8.sql
 create mode 100644 oximeter/db/schema/single-node/10/07_materialize_last_updated_column_on_fields_u8.sql
 create mode 100644 oximeter/db/schema/single-node/10/08_add_ttl_to_fields_u8.sql
 create mode 100644 oximeter/db/schema/single-node/10/09_add_last_updated_column_to_fields_i16.sql
 create mode 100644 oximeter/db/schema/single-node/10/10_materialize_last_updated_column_on_fields_i16.sql
 create mode 100644 oximeter/db/schema/single-node/10/11_add_ttl_to_fields_i16.sql
 create mode 100644 oximeter/db/schema/single-node/10/12_add_last_updated_column_to_fields_u16.sql
 create mode 100644 oximeter/db/schema/single-node/10/13_materialize_last_updated_column_on_fields_u16.sql
 create mode 100644 oximeter/db/schema/single-node/10/14_add_ttl_to_fields_u16.sql
 create mode 100644 oximeter/db/schema/single-node/10/15_add_last_updated_column_to_fields_i32.sql
 create mode 100644 oximeter/db/schema/single-node/10/16_materialize_last_updated_column_on_fields_i32.sql
 create mode 100644 oximeter/db/schema/single-node/10/17_add_ttl_to_fields_i32.sql
 create mode 100644 oximeter/db/schema/single-node/10/18_add_last_updated_column_to_fields_u32.sql
 create mode 100644 oximeter/db/schema/single-node/10/19_materialize_last_updated_column_on_fields_u32.sql
 create mode 100644 oximeter/db/schema/single-node/10/20_add_ttl_to_fields_u32.sql
 create mode 100644 oximeter/db/schema/single-node/10/21_add_last_updated_column_to_fields_i64.sql
 create mode 100644 oximeter/db/schema/single-node/10/22_materialize_last_updated_column_on_fields_i64.sql
 create mode 100644 oximeter/db/schema/single-node/10/23_add_ttl_to_fields_i64.sql
 create mode 100644 oximeter/db/schema/single-node/10/24_add_last_updated_column_to_fields_u64.sql
 create mode 100644 oximeter/db/schema/single-node/10/25_materialize_last_updated_column_on_fields_u64.sql
 create mode 100644 oximeter/db/schema/single-node/10/26_add_ttl_to_fields_u64.sql
 create mode 100644 oximeter/db/schema/single-node/10/27_add_last_updated_column_to_fields_ipaddr.sql
 create mode 100644 oximeter/db/schema/single-node/10/28_materialize_last_updated_column_on_fields_ipaddr.sql
 create mode 100644 oximeter/db/schema/single-node/10/29_add_ttl_to_fields_ipaddr.sql
 create mode 100644 oximeter/db/schema/single-node/10/30_add_last_updated_column_to_fields_string.sql
 create mode 100644 oximeter/db/schema/single-node/10/31_materialize_last_updated_column_on_fields_string.sql
 create mode 100644 oximeter/db/schema/single-node/10/32_add_ttl_to_fields_string.sql
 create mode 100644 oximeter/db/schema/single-node/10/33_add_last_updated_column_to_fields_uuid.sql
 create mode 100644 oximeter/db/schema/single-node/10/34_materialize_last_updated_column_on_fields_uuid.sql
 create mode 100644 oximeter/db/schema/single-node/10/35_add_ttl_to_fields_uuid.sql
 create mode 100644 oximeter/db/schema/single-node/10/timeseries-to-delete.txt

diff --git a/Cargo.lock b/Cargo.lock
index f3aafb9b7d..874b33134f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2213,7 +2213,7 @@ dependencies = [
 [[package]]
 name = "dropshot"
 version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#52d900a470b8f08eddf021813470b2a9194f2cc0"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
 dependencies = [
  "async-stream",
  "async-trait",
@@ -2259,7 +2259,7 @@ dependencies = [
 [[package]]
 name = "dropshot_endpoint"
 version = "0.10.2-dev"
-source = "git+https://github.com/oxidecomputer/dropshot?branch=main#52d900a470b8f08eddf021813470b2a9194f2cc0"
+source = "git+https://github.com/oxidecomputer/dropshot?branch=main#06c8dab40e28d313f8bb0e15e1027eeace3bce89"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -3616,7 +3616,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.5.7",
+ "socket2 0.4.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -6523,6 +6523,7 @@ dependencies = [
  "similar",
  "slog",
  "smallvec 1.13.2",
+ "socket2 0.5.7",
  "spin 0.9.8",
  "string_cache",
  "subtle",
diff --git a/oximeter/db/schema/replicated/10/00_add_last_updated_column_to_fields_i64_local.sql b/oximeter/db/schema/replicated/10/00_add_last_updated_column_to_fields_i64_local.sql
new file mode 100644
index 0000000000..04158b36ce
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/00_add_last_updated_column_to_fields_i64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/01_materialize_last_updated_column_on_fields_i64_local.sql b/oximeter/db/schema/replicated/10/01_materialize_last_updated_column_on_fields_i64_local.sql
new file mode 100644
index 0000000000..2e35dd2793
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/01_materialize_last_updated_column_on_fields_i64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/02_add_ttl_to_fields_i64_local.sql b/oximeter/db/schema/replicated/10/02_add_ttl_to_fields_i64_local.sql
new file mode 100644
index 0000000000..25e5303e5a
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/02_add_ttl_to_fields_i64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/03_add_last_updated_column_to_fields_uuid_local.sql b/oximeter/db/schema/replicated/10/03_add_last_updated_column_to_fields_uuid_local.sql
new file mode 100644
index 0000000000..f26fdedbb6
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/03_add_last_updated_column_to_fields_uuid_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/04_materialize_last_updated_column_on_fields_uuid_local.sql b/oximeter/db/schema/replicated/10/04_materialize_last_updated_column_on_fields_uuid_local.sql
new file mode 100644
index 0000000000..1bc623f418
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/04_materialize_last_updated_column_on_fields_uuid_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/05_add_ttl_to_fields_uuid_local.sql b/oximeter/db/schema/replicated/10/05_add_ttl_to_fields_uuid_local.sql
new file mode 100644
index 0000000000..b98bba1e88
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/05_add_ttl_to_fields_uuid_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/06_add_last_updated_column_to_fields_bool_local.sql b/oximeter/db/schema/replicated/10/06_add_last_updated_column_to_fields_bool_local.sql
new file mode 100644
index 0000000000..bf3c16dde5
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/06_add_last_updated_column_to_fields_bool_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/07_materialize_last_updated_column_on_fields_bool_local.sql b/oximeter/db/schema/replicated/10/07_materialize_last_updated_column_on_fields_bool_local.sql
new file mode 100644
index 0000000000..3ddb0eec84
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/07_materialize_last_updated_column_on_fields_bool_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/08_add_ttl_to_fields_bool_local.sql b/oximeter/db/schema/replicated/10/08_add_ttl_to_fields_bool_local.sql
new file mode 100644
index 0000000000..58d599cf49
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/08_add_ttl_to_fields_bool_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/09_add_last_updated_column_to_fields_ipaddr_local.sql b/oximeter/db/schema/replicated/10/09_add_last_updated_column_to_fields_ipaddr_local.sql
new file mode 100644
index 0000000000..94696b7b06
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/09_add_last_updated_column_to_fields_ipaddr_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/10_materialize_last_updated_column_on_fields_ipaddr_local.sql b/oximeter/db/schema/replicated/10/10_materialize_last_updated_column_on_fields_ipaddr_local.sql
new file mode 100644
index 0000000000..f621033d56
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/10_materialize_last_updated_column_on_fields_ipaddr_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/11_add_ttl_to_fields_ipaddr_local.sql b/oximeter/db/schema/replicated/10/11_add_ttl_to_fields_ipaddr_local.sql
new file mode 100644
index 0000000000..4a01da9e74
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/11_add_ttl_to_fields_ipaddr_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/12_add_last_updated_column_to_fields_string_local.sql b/oximeter/db/schema/replicated/10/12_add_last_updated_column_to_fields_string_local.sql
new file mode 100644
index 0000000000..173d803437
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/12_add_last_updated_column_to_fields_string_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/13_materialize_last_updated_column_on_fields_string_local.sql b/oximeter/db/schema/replicated/10/13_materialize_last_updated_column_on_fields_string_local.sql
new file mode 100644
index 0000000000..d9fcc84eba
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/13_materialize_last_updated_column_on_fields_string_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/14_add_ttl_to_fields_string_local.sql b/oximeter/db/schema/replicated/10/14_add_ttl_to_fields_string_local.sql
new file mode 100644
index 0000000000..8c9aecca9d
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/14_add_ttl_to_fields_string_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/15_add_last_updated_column_to_fields_i8_local.sql b/oximeter/db/schema/replicated/10/15_add_last_updated_column_to_fields_i8_local.sql
new file mode 100644
index 0000000000..8d071424f6
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/15_add_last_updated_column_to_fields_i8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/16_materialize_last_updated_column_on_fields_i8_local.sql b/oximeter/db/schema/replicated/10/16_materialize_last_updated_column_on_fields_i8_local.sql
new file mode 100644
index 0000000000..ac5fa948ae
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/16_materialize_last_updated_column_on_fields_i8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/17_add_ttl_to_fields_i8_local.sql b/oximeter/db/schema/replicated/10/17_add_ttl_to_fields_i8_local.sql
new file mode 100644
index 0000000000..3caa1b93f6
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/17_add_ttl_to_fields_i8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/18_add_last_updated_column_to_fields_u8_local.sql b/oximeter/db/schema/replicated/10/18_add_last_updated_column_to_fields_u8_local.sql
new file mode 100644
index 0000000000..ed6978c7e6
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/18_add_last_updated_column_to_fields_u8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/19_materialize_last_updated_column_on_fields_u8_local.sql b/oximeter/db/schema/replicated/10/19_materialize_last_updated_column_on_fields_u8_local.sql
new file mode 100644
index 0000000000..81ce8626a7
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/19_materialize_last_updated_column_on_fields_u8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/20_add_ttl_to_fields_u8_local.sql b/oximeter/db/schema/replicated/10/20_add_ttl_to_fields_u8_local.sql
new file mode 100644
index 0000000000..2a7c757dc8
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/20_add_ttl_to_fields_u8_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/21_add_last_updated_column_to_fields_i16_local.sql b/oximeter/db/schema/replicated/10/21_add_last_updated_column_to_fields_i16_local.sql
new file mode 100644
index 0000000000..cbe0b08fe4
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/21_add_last_updated_column_to_fields_i16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/22_materialize_last_updated_column_on_fields_i16_local.sql b/oximeter/db/schema/replicated/10/22_materialize_last_updated_column_on_fields_i16_local.sql
new file mode 100644
index 0000000000..d4854807b7
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/22_materialize_last_updated_column_on_fields_i16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/23_add_ttl_to_fields_i16_local.sql b/oximeter/db/schema/replicated/10/23_add_ttl_to_fields_i16_local.sql
new file mode 100644
index 0000000000..c84b634a00
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/23_add_ttl_to_fields_i16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/24_add_last_updated_column_to_fields_u16_local.sql b/oximeter/db/schema/replicated/10/24_add_last_updated_column_to_fields_u16_local.sql
new file mode 100644
index 0000000000..60c28c0047
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/24_add_last_updated_column_to_fields_u16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/25_materialize_last_updated_column_on_fields_u16_local.sql b/oximeter/db/schema/replicated/10/25_materialize_last_updated_column_on_fields_u16_local.sql
new file mode 100644
index 0000000000..b38cdda831
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/25_materialize_last_updated_column_on_fields_u16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/26_add_ttl_to_fields_u16_local.sql b/oximeter/db/schema/replicated/10/26_add_ttl_to_fields_u16_local.sql
new file mode 100644
index 0000000000..cd533ffd8f
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/26_add_ttl_to_fields_u16_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/27_add_last_updated_column_to_fields_i32_local.sql b/oximeter/db/schema/replicated/10/27_add_last_updated_column_to_fields_i32_local.sql
new file mode 100644
index 0000000000..1ea7093d8f
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/27_add_last_updated_column_to_fields_i32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/28_materialize_last_updated_column_on_fields_i32_local.sql b/oximeter/db/schema/replicated/10/28_materialize_last_updated_column_on_fields_i32_local.sql
new file mode 100644
index 0000000000..f9f6464729
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/28_materialize_last_updated_column_on_fields_i32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/29_add_ttl_to_fields_i32_local.sql b/oximeter/db/schema/replicated/10/29_add_ttl_to_fields_i32_local.sql
new file mode 100644
index 0000000000..7c37ee9b21
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/29_add_ttl_to_fields_i32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/30_add_last_updated_column_to_fields_u32_local.sql b/oximeter/db/schema/replicated/10/30_add_last_updated_column_to_fields_u32_local.sql
new file mode 100644
index 0000000000..b15eab9387
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/30_add_last_updated_column_to_fields_u32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/31_materialize_last_updated_column_on_fields_u32_local.sql b/oximeter/db/schema/replicated/10/31_materialize_last_updated_column_on_fields_u32_local.sql
new file mode 100644
index 0000000000..caa96ab5eb
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/31_materialize_last_updated_column_on_fields_u32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/32_add_ttl_to_fields_u32_local.sql b/oximeter/db/schema/replicated/10/32_add_ttl_to_fields_u32_local.sql
new file mode 100644
index 0000000000..25af5ee660
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/32_add_ttl_to_fields_u32_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/33_add_last_updated_column_to_fields_u64_local.sql b/oximeter/db/schema/replicated/10/33_add_last_updated_column_to_fields_u64_local.sql
new file mode 100644
index 0000000000..e85bd845d4
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/33_add_last_updated_column_to_fields_u64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64_local ON CLUSTER oximeter_cluster ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/replicated/10/34_materialize_last_updated_column_on_fields_u64_local.sql b/oximeter/db/schema/replicated/10/34_materialize_last_updated_column_on_fields_u64_local.sql
new file mode 100644
index 0000000000..d287a02c6f
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/34_materialize_last_updated_column_on_fields_u64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64_local ON CLUSTER oximeter_cluster MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/replicated/10/35_add_ttl_to_fields_u64_local.sql b/oximeter/db/schema/replicated/10/35_add_ttl_to_fields_u64_local.sql
new file mode 100644
index 0000000000..02eb09c300
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/35_add_ttl_to_fields_u64_local.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64_local ON CLUSTER oximeter_cluster MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/replicated/10/timeseries-to-delete.txt b/oximeter/db/schema/replicated/10/timeseries-to-delete.txt
new file mode 100644
index 0000000000..40b90e05ff
--- /dev/null
+++ b/oximeter/db/schema/replicated/10/timeseries-to-delete.txt
@@ -0,0 +1 @@
+http_service:request_latency_histogram
diff --git a/oximeter/db/schema/replicated/db-init-1.sql b/oximeter/db/schema/replicated/db-init-1.sql
index 176e5b64f7..4eac2b4e37 100644
--- a/oximeter/db/schema/replicated/db-init-1.sql
+++ b/oximeter/db/schema/replicated/db-init-1.sql
@@ -78,10 +78,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_i64_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int64
+    field_value Int64,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_i64_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i64 ON CLUSTER oximeter_cluster
 AS oximeter.fields_i64_local
@@ -93,10 +95,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_uuid_local ON CLUSTER oximeter_cluste
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UUID
+    field_value UUID,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_uuid_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_uuid ON CLUSTER oximeter_cluster
 AS oximeter.fields_uuid_local
diff --git a/oximeter/db/schema/replicated/db-init-2.sql b/oximeter/db/schema/replicated/db-init-2.sql
index ae0431ec84..51e64e20e0 100644
--- a/oximeter/db/schema/replicated/db-init-2.sql
+++ b/oximeter/db/schema/replicated/db-init-2.sql
@@ -595,10 +595,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_bool_local ON CLUSTER oximeter_cluste
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt8
+    field_value UInt8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_bool_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_bool ON CLUSTER oximeter_cluster
 AS oximeter.fields_bool_local
@@ -609,10 +611,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_ipaddr_local ON CLUSTER oximeter_clus
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value IPv6
+    field_value IPv6,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_ipaddr_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_ipaddr ON CLUSTER oximeter_cluster
 AS oximeter.fields_ipaddr_local
@@ -623,10 +627,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_string_local ON CLUSTER oximeter_clus
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value String
+    field_value String,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_string_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_string ON CLUSTER oximeter_cluster
 AS oximeter.fields_string_local
@@ -637,10 +643,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_i8_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int8
+    field_value Int8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_i8_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i8 ON CLUSTER oximeter_cluster
 AS oximeter.fields_i8_local
@@ -651,10 +659,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_u8_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt8
+    field_value UInt8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_u8_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u8 ON CLUSTER oximeter_cluster
 AS oximeter.fields_u8_local
@@ -665,10 +675,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_i16_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int16
+    field_value Int16,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_i16_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i16 ON CLUSTER oximeter_cluster
 AS oximeter.fields_i16_local
@@ -679,10 +691,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_u16_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt16
+    field_value UInt16,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_u16_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u16 ON CLUSTER oximeter_cluster
 AS oximeter.fields_u16_local
@@ -693,10 +707,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_i32_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int32
+    field_value Int32,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_i32_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i32 ON CLUSTER oximeter_cluster
 AS oximeter.fields_i32_local
@@ -707,10 +723,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_u32_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt32
+    field_value UInt32,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_u32_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u32 ON CLUSTER oximeter_cluster
 AS oximeter.fields_u32_local
@@ -721,10 +739,12 @@ CREATE TABLE IF NOT EXISTS oximeter.fields_u64_local ON CLUSTER oximeter_cluster
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt64
+    field_value UInt64,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplicatedReplacingMergeTree('/clickhouse/tables/{shard}/fields_u64_local', '{replica}')
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u64 ON CLUSTER oximeter_cluster
 AS oximeter.fields_u64_local
diff --git a/oximeter/db/schema/single-node/10/00_add_last_updated_column_to_fields_bool.sql b/oximeter/db/schema/single-node/10/00_add_last_updated_column_to_fields_bool.sql
new file mode 100644
index 0000000000..86f46a43bf
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/00_add_last_updated_column_to_fields_bool.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/01_materialize_last_updated_column_on_fields_bool.sql b/oximeter/db/schema/single-node/10/01_materialize_last_updated_column_on_fields_bool.sql
new file mode 100644
index 0000000000..6ebec2d506
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/01_materialize_last_updated_column_on_fields_bool.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/02_add_ttl_to_fields_bool.sql b/oximeter/db/schema/single-node/10/02_add_ttl_to_fields_bool.sql
new file mode 100644
index 0000000000..cc07b8cd1d
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/02_add_ttl_to_fields_bool.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_bool MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/03_add_last_updated_column_to_fields_i8.sql b/oximeter/db/schema/single-node/10/03_add_last_updated_column_to_fields_i8.sql
new file mode 100644
index 0000000000..884b5ffed6
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/03_add_last_updated_column_to_fields_i8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/04_materialize_last_updated_column_on_fields_i8.sql b/oximeter/db/schema/single-node/10/04_materialize_last_updated_column_on_fields_i8.sql
new file mode 100644
index 0000000000..ef569d80c3
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/04_materialize_last_updated_column_on_fields_i8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/05_add_ttl_to_fields_i8.sql b/oximeter/db/schema/single-node/10/05_add_ttl_to_fields_i8.sql
new file mode 100644
index 0000000000..adfc3dd1a4
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/05_add_ttl_to_fields_i8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i8 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/06_add_last_updated_column_to_fields_u8.sql b/oximeter/db/schema/single-node/10/06_add_last_updated_column_to_fields_u8.sql
new file mode 100644
index 0000000000..0f4e43ce2c
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/06_add_last_updated_column_to_fields_u8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/07_materialize_last_updated_column_on_fields_u8.sql b/oximeter/db/schema/single-node/10/07_materialize_last_updated_column_on_fields_u8.sql
new file mode 100644
index 0000000000..8dcbb32bb2
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/07_materialize_last_updated_column_on_fields_u8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/08_add_ttl_to_fields_u8.sql b/oximeter/db/schema/single-node/10/08_add_ttl_to_fields_u8.sql
new file mode 100644
index 0000000000..11a83bde7a
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/08_add_ttl_to_fields_u8.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u8 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/09_add_last_updated_column_to_fields_i16.sql b/oximeter/db/schema/single-node/10/09_add_last_updated_column_to_fields_i16.sql
new file mode 100644
index 0000000000..d27f38f94f
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/09_add_last_updated_column_to_fields_i16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/10_materialize_last_updated_column_on_fields_i16.sql b/oximeter/db/schema/single-node/10/10_materialize_last_updated_column_on_fields_i16.sql
new file mode 100644
index 0000000000..cd60a2a1e9
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/10_materialize_last_updated_column_on_fields_i16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/11_add_ttl_to_fields_i16.sql b/oximeter/db/schema/single-node/10/11_add_ttl_to_fields_i16.sql
new file mode 100644
index 0000000000..5b1b2fcfb6
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/11_add_ttl_to_fields_i16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i16 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/12_add_last_updated_column_to_fields_u16.sql b/oximeter/db/schema/single-node/10/12_add_last_updated_column_to_fields_u16.sql
new file mode 100644
index 0000000000..a71753f95d
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/12_add_last_updated_column_to_fields_u16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/13_materialize_last_updated_column_on_fields_u16.sql b/oximeter/db/schema/single-node/10/13_materialize_last_updated_column_on_fields_u16.sql
new file mode 100644
index 0000000000..c8dbfb494e
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/13_materialize_last_updated_column_on_fields_u16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/14_add_ttl_to_fields_u16.sql b/oximeter/db/schema/single-node/10/14_add_ttl_to_fields_u16.sql
new file mode 100644
index 0000000000..30da688c8c
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/14_add_ttl_to_fields_u16.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u16 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/15_add_last_updated_column_to_fields_i32.sql b/oximeter/db/schema/single-node/10/15_add_last_updated_column_to_fields_i32.sql
new file mode 100644
index 0000000000..eb0f377e2d
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/15_add_last_updated_column_to_fields_i32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/16_materialize_last_updated_column_on_fields_i32.sql b/oximeter/db/schema/single-node/10/16_materialize_last_updated_column_on_fields_i32.sql
new file mode 100644
index 0000000000..9cd4fa05c8
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/16_materialize_last_updated_column_on_fields_i32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/17_add_ttl_to_fields_i32.sql b/oximeter/db/schema/single-node/10/17_add_ttl_to_fields_i32.sql
new file mode 100644
index 0000000000..5230634097
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/17_add_ttl_to_fields_i32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i32 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/18_add_last_updated_column_to_fields_u32.sql b/oximeter/db/schema/single-node/10/18_add_last_updated_column_to_fields_u32.sql
new file mode 100644
index 0000000000..9d967784e9
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/18_add_last_updated_column_to_fields_u32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/19_materialize_last_updated_column_on_fields_u32.sql b/oximeter/db/schema/single-node/10/19_materialize_last_updated_column_on_fields_u32.sql
new file mode 100644
index 0000000000..f625138b59
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/19_materialize_last_updated_column_on_fields_u32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/20_add_ttl_to_fields_u32.sql b/oximeter/db/schema/single-node/10/20_add_ttl_to_fields_u32.sql
new file mode 100644
index 0000000000..fc80ce7102
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/20_add_ttl_to_fields_u32.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u32 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/21_add_last_updated_column_to_fields_i64.sql b/oximeter/db/schema/single-node/10/21_add_last_updated_column_to_fields_i64.sql
new file mode 100644
index 0000000000..26256d3924
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/21_add_last_updated_column_to_fields_i64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/22_materialize_last_updated_column_on_fields_i64.sql b/oximeter/db/schema/single-node/10/22_materialize_last_updated_column_on_fields_i64.sql
new file mode 100644
index 0000000000..a81294e535
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/22_materialize_last_updated_column_on_fields_i64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/23_add_ttl_to_fields_i64.sql b/oximeter/db/schema/single-node/10/23_add_ttl_to_fields_i64.sql
new file mode 100644
index 0000000000..43ca166755
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/23_add_ttl_to_fields_i64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_i64 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/24_add_last_updated_column_to_fields_u64.sql b/oximeter/db/schema/single-node/10/24_add_last_updated_column_to_fields_u64.sql
new file mode 100644
index 0000000000..46074c79ce
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/24_add_last_updated_column_to_fields_u64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64 ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/25_materialize_last_updated_column_on_fields_u64.sql b/oximeter/db/schema/single-node/10/25_materialize_last_updated_column_on_fields_u64.sql
new file mode 100644
index 0000000000..a68d449de7
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/25_materialize_last_updated_column_on_fields_u64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64 MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/26_add_ttl_to_fields_u64.sql b/oximeter/db/schema/single-node/10/26_add_ttl_to_fields_u64.sql
new file mode 100644
index 0000000000..48afb51bf1
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/26_add_ttl_to_fields_u64.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_u64 MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/27_add_last_updated_column_to_fields_ipaddr.sql b/oximeter/db/schema/single-node/10/27_add_last_updated_column_to_fields_ipaddr.sql
new file mode 100644
index 0000000000..d3c6be9072
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/27_add_last_updated_column_to_fields_ipaddr.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/28_materialize_last_updated_column_on_fields_ipaddr.sql b/oximeter/db/schema/single-node/10/28_materialize_last_updated_column_on_fields_ipaddr.sql
new file mode 100644
index 0000000000..5bdffd4b2e
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/28_materialize_last_updated_column_on_fields_ipaddr.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/29_add_ttl_to_fields_ipaddr.sql b/oximeter/db/schema/single-node/10/29_add_ttl_to_fields_ipaddr.sql
new file mode 100644
index 0000000000..4551db90cd
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/29_add_ttl_to_fields_ipaddr.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_ipaddr MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/30_add_last_updated_column_to_fields_string.sql b/oximeter/db/schema/single-node/10/30_add_last_updated_column_to_fields_string.sql
new file mode 100644
index 0000000000..024c5f8f94
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/30_add_last_updated_column_to_fields_string.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/31_materialize_last_updated_column_on_fields_string.sql b/oximeter/db/schema/single-node/10/31_materialize_last_updated_column_on_fields_string.sql
new file mode 100644
index 0000000000..67d3b7a596
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/31_materialize_last_updated_column_on_fields_string.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/32_add_ttl_to_fields_string.sql b/oximeter/db/schema/single-node/10/32_add_ttl_to_fields_string.sql
new file mode 100644
index 0000000000..c5272df459
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/32_add_ttl_to_fields_string.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_string MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/33_add_last_updated_column_to_fields_uuid.sql b/oximeter/db/schema/single-node/10/33_add_last_updated_column_to_fields_uuid.sql
new file mode 100644
index 0000000000..8d01b382fe
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/33_add_last_updated_column_to_fields_uuid.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid ADD COLUMN IF NOT EXISTS last_updated_at DateTime MATERIALIZED now();
diff --git a/oximeter/db/schema/single-node/10/34_materialize_last_updated_column_on_fields_uuid.sql b/oximeter/db/schema/single-node/10/34_materialize_last_updated_column_on_fields_uuid.sql
new file mode 100644
index 0000000000..06fbd94d02
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/34_materialize_last_updated_column_on_fields_uuid.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid MATERIALIZE COLUMN last_updated_at;
diff --git a/oximeter/db/schema/single-node/10/35_add_ttl_to_fields_uuid.sql b/oximeter/db/schema/single-node/10/35_add_ttl_to_fields_uuid.sql
new file mode 100644
index 0000000000..481055d4f5
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/35_add_ttl_to_fields_uuid.sql
@@ -0,0 +1 @@
+ALTER TABLE oximeter.fields_uuid MODIFY TTL last_updated_at + INTERVAL 30 DAY;
diff --git a/oximeter/db/schema/single-node/10/timeseries-to-delete.txt b/oximeter/db/schema/single-node/10/timeseries-to-delete.txt
new file mode 100644
index 0000000000..40b90e05ff
--- /dev/null
+++ b/oximeter/db/schema/single-node/10/timeseries-to-delete.txt
@@ -0,0 +1 @@
+http_service:request_latency_histogram
diff --git a/oximeter/db/schema/single-node/db-init.sql b/oximeter/db/schema/single-node/db-init.sql
index 38e9d0b70c..184951feeb 100644
--- a/oximeter/db/schema/single-node/db-init.sql
+++ b/oximeter/db/schema/single-node/db-init.sql
@@ -504,126 +504,158 @@ TTL toDateTime(timestamp) + INTERVAL 30 DAY;
  * timeseries name and then key, since it would improve lookups where one
  * already has the key. Realistically though, these tables are quite small and
  * so performance benefits will be low in absolute terms.
+ *
+ * TTL: We use a materialized column to expire old field table records. This
+ * column is generated automatically by the database whenever a new row is
+ * inserted. It cannot be inserted directly, nor is it returned in a `SELECT *`
+ * query. Since these tables are `ReplacingMergeTree`s, that means the last
+ * record will remain during a deduplication, which will have the last
+ * timestamp. ClickHouse will then expire old data for us, similar to the
+ * measurement tables.
  */
 CREATE TABLE IF NOT EXISTS oximeter.fields_bool
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt8
+    field_value UInt8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i8
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int8
+    field_value Int8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u8
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt8
+    field_value UInt8,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i16
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int16
+    field_value Int16,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u16
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt16
+    field_value UInt16,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i32
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int32
+    field_value Int32,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u32
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt32
+    field_value UInt32,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_i64
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value Int64
+    field_value Int64,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_u64
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UInt64
+    field_value UInt64,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_ipaddr
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value IPv6
+    field_value IPv6,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_string
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value String
+    field_value String,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 CREATE TABLE IF NOT EXISTS oximeter.fields_uuid
 (
     timeseries_name String,
     timeseries_key UInt64,
     field_name String,
-    field_value UUID
+    field_value UUID,
+    last_updated_at DateTime MATERIALIZED now()
 )
 ENGINE = ReplacingMergeTree()
-ORDER BY (timeseries_name, field_name, field_value, timeseries_key);
+ORDER BY (timeseries_name, field_name, field_value, timeseries_key)
+TTL last_updated_at + INTERVAL 30 DAY;
 
 /* The timeseries schema table stores the extracted schema for the samples
  * oximeter collects.
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
index 986bf00225..7608f81e45 100644
--- a/oximeter/db/src/model.rs
+++ b/oximeter/db/src/model.rs
@@ -45,7 +45,7 @@ use uuid::Uuid;
 /// - [`crate::Client::initialize_db_with_version`]
 /// - [`crate::Client::ensure_schema`]
 /// - The `clickhouse-schema-updater` binary in this crate
-pub const OXIMETER_VERSION: u64 = 9;
+pub const OXIMETER_VERSION: u64 = 10;
 
 // Wrapper type to represent a boolean in the database.
 //
diff --git a/oximeter/instruments/src/http.rs b/oximeter/instruments/src/http.rs
index 6a0a35ce63..2eef327d02 100644
--- a/oximeter/instruments/src/http.rs
+++ b/oximeter/instruments/src/http.rs
@@ -6,17 +6,14 @@
 
 // Copyright 2024 Oxide Computer Company
 
-use dropshot::{
-    HttpError, HttpResponse, RequestContext, RequestInfo, ServerContext,
-};
+use dropshot::{HttpError, HttpResponse, RequestContext, ServerContext};
 use futures::Future;
 use http::StatusCode;
-use http::Uri;
 use oximeter::{
     histogram::Histogram, histogram::Record, MetricsError, Producer, Sample,
 };
-use std::borrow::Cow;
-use std::collections::BTreeMap;
+use std::collections::HashMap;
+use std::hash::{DefaultHasher, Hash as _, Hasher};
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
@@ -24,28 +21,18 @@ oximeter::use_timeseries!("http-service.toml");
 pub use http_service::HttpService;
 pub use http_service::RequestLatencyHistogram;
 
-// Return the route portion of the request, normalized to include a single
-// leading slash and no trailing slashes.
-fn normalized_uri_path(uri: &Uri) -> Cow<'static, str> {
-    Cow::Owned(format!(
-        "/{}",
-        uri.path().trim_end_matches('/').trim_start_matches('/')
-    ))
-}
-
 impl RequestLatencyHistogram {
     /// Build a new `RequestLatencyHistogram` with a specified histogram.
     ///
     /// Latencies are expressed in seconds.
     pub fn new(
-        request: &RequestInfo,
+        operation_id: &str,
         status_code: StatusCode,
         histogram: Histogram<f64>,
     ) -> Self {
         Self {
-            route: normalized_uri_path(request.uri()),
-            method: request.method().to_string().into(),
-            status_code: status_code.as_u16().into(),
+            operation_id: operation_id.to_string().into(),
+            status_code: status_code.as_u16(),
             datum: histogram,
         }
     }
@@ -59,25 +46,27 @@ impl RequestLatencyHistogram {
     ///
     /// Latencies are expressed as seconds.
     pub fn with_latency_decades(
-        request: &RequestInfo,
+        operation_id: &str,
         status_code: StatusCode,
         start_decade: i16,
         end_decade: i16,
     ) -> Result<Self, MetricsError> {
         Ok(Self::new(
-            request,
+            operation_id,
             status_code,
             Histogram::span_decades(start_decade, end_decade)?,
         ))
     }
 
-    fn key_for(request: &RequestInfo, status_code: StatusCode) -> String {
-        format!(
-            "{}:{}:{}",
-            normalized_uri_path(request.uri()),
-            request.method(),
-            status_code.as_u16()
-        )
+    /// Return a key used to ID this histogram.
+    ///
+    /// This is a quick way to look up the histogram tracking any particular
+    /// request and response.
+    fn key_for(operation_id: &str, status_code: StatusCode) -> u64 {
+        let mut hasher = DefaultHasher::new();
+        operation_id.hash(&mut hasher);
+        status_code.hash(&mut hasher);
+        hasher.finish()
     }
 }
 
@@ -92,8 +81,19 @@ impl RequestLatencyHistogram {
 /// The `LatencyTracker` can be used to produce metric data collected by `oximeter`.
 #[derive(Debug, Clone)]
 pub struct LatencyTracker {
+    /// The HTTP service target for which we're tracking request histograms.
     pub service: HttpService,
-    latencies: Arc<Mutex<BTreeMap<String, RequestLatencyHistogram>>>,
+    /// The latency histogram for each request.
+    ///
+    /// The map here use a hash of the request fields (operation and status
+    /// code) as the key to each histogram. It's a bit redundant to then store
+    /// that in a hashmap, but this lets us avoid creating a new
+    /// `RequestLatencyHistogram` when handling a request that we already have
+    /// one for. Instead, we use this key to get the existing entry.
+    latencies: Arc<Mutex<HashMap<u64, RequestLatencyHistogram>>>,
+    /// The histogram used to track each request.
+    ///
+    /// We store it here to clone as we see new requests.
     histogram: Histogram<f64>,
 }
 
@@ -104,7 +104,7 @@ impl LatencyTracker {
     pub fn new(service: HttpService, histogram: Histogram<f64>) -> Self {
         Self {
             service,
-            latencies: Arc::new(Mutex::new(BTreeMap::new())),
+            latencies: Arc::new(Mutex::new(HashMap::new())),
             histogram,
         }
     }
@@ -129,15 +129,15 @@ impl LatencyTracker {
     /// to which the other arguments belong. (One is created if it does not exist.)
     pub fn update(
         &self,
-        request: &RequestInfo,
+        operation_id: &str,
         status_code: StatusCode,
         latency: Duration,
     ) -> Result<(), MetricsError> {
-        let key = RequestLatencyHistogram::key_for(request, status_code);
+        let key = RequestLatencyHistogram::key_for(operation_id, status_code);
         let mut latencies = self.latencies.lock().unwrap();
         let entry = latencies.entry(key).or_insert_with(|| {
             RequestLatencyHistogram::new(
-                request,
+                operation_id,
                 status_code,
                 self.histogram.clone(),
             )
@@ -170,14 +170,14 @@ impl LatencyTracker {
             Ok(response) => response.status_code(),
             Err(ref e) => e.status_code,
         };
-        if let Err(e) = self.update(&context.request, status_code, latency) {
+        if let Err(e) = self.update(&context.operation_id, status_code, latency)
+        {
             slog::error!(
                 &context.log,
                 "error instrumenting dropshot handler";
                 "error" => ?e,
                 "status_code" => status_code.as_u16(),
-                "method" => %context.request.method(),
-                "uri" => %context.request.uri(),
+                "operation_id" => &context.operation_id,
                 "remote_addr" => context.request.remote_addr(),
                 "latency" => ?latency,
             );
@@ -220,41 +220,24 @@ mod tests {
             HttpService { name: "my-service".into(), id: ID.parse().unwrap() };
         let hist = Histogram::new(&[0.0, 1.0]).unwrap();
         let tracker = LatencyTracker::new(service, hist);
-        let request = http::request::Builder::new()
-            .method(http::Method::GET)
-            .uri("/some/uri")
-            .body(())
+        let status_code0 = StatusCode::OK;
+        let status_code1 = StatusCode::NOT_FOUND;
+        let operation_id = "some_operation_id";
+        tracker
+            .update(operation_id, status_code0, Duration::from_secs_f64(0.5))
             .unwrap();
-        let status_code = StatusCode::OK;
         tracker
-            .update(
-                &RequestInfo::new(&request, "0.0.0.0:0".parse().unwrap()),
-                status_code,
-                Duration::from_secs_f64(0.5),
-            )
+            .update(operation_id, status_code1, Duration::from_secs_f64(0.5))
             .unwrap();
-
-        let key = "/some/uri:GET:200";
-        let actual_hist = tracker.latencies.lock().unwrap()[key].datum.clone();
-        assert_eq!(actual_hist.n_samples(), 1);
-        let bins = actual_hist.iter().collect::<Vec<_>>();
-        assert_eq!(bins[1].count, 1);
-    }
-
-    #[test]
-    fn test_normalize_uri_path() {
-        const EXPECTED: &str = "/foo/bar";
-        const TESTS: &[&str] = &[
-            "/foo/bar",
-            "/foo/bar/",
-            "//foo/bar",
-            "//foo/bar/",
-            "/foo/bar//",
-            "////foo/bar/////",
-        ];
-        for test in TESTS.iter() {
-            println!("{test}");
-            assert_eq!(normalized_uri_path(&test.parse().unwrap()), EXPECTED);
+        let key0 = RequestLatencyHistogram::key_for(operation_id, status_code0);
+        let key1 = RequestLatencyHistogram::key_for(operation_id, status_code1);
+        let latencies = tracker.latencies.lock().unwrap();
+        assert_eq!(latencies.len(), 2);
+        for key in [key0, key1] {
+            let actual_hist = &latencies[&key].datum;
+            assert_eq!(actual_hist.n_samples(), 1);
+            let bins = actual_hist.iter().collect::<Vec<_>>();
+            assert_eq!(bins[1].count, 1);
         }
     }
 }
diff --git a/oximeter/oximeter/schema/http-service.toml b/oximeter/oximeter/schema/http-service.toml
index 9098110656..5270f6942c 100644
--- a/oximeter/oximeter/schema/http-service.toml
+++ b/oximeter/oximeter/schema/http-service.toml
@@ -14,7 +14,7 @@ description = "Duration for the server to handle a request"
 units = "seconds"
 datum_type = "histogram_f64"
 versions = [
-    { added_in = 1, fields = [ "route", "method", "status_code" ] }
+    { added_in = 1, fields = [ "operation_id", "status_code" ] }
 ]
 
 [fields.name]
@@ -25,14 +25,15 @@ description = "The name of the HTTP server, or program running it"
 type = "uuid"
 description = "UUID of the HTTP server"
 
-[fields.route]
+[fields.operation_id]
 type = "string"
-description = "HTTP route in the request"
+description = """\
+The identifier for the HTTP operation.\
 
-[fields.method]
-type = "string"
-description = "HTTP method in the request"
+In most cases, this the OpenAPI `operationId` field that uniquely identifies the
+endpoint the request is targeted to and the HTTP method used.
+"""
 
 [fields.status_code]
-type = "i64"
+type = "u16"
 description = "HTTP status code in the server's response"
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index fb1b94ae0f..1c58626d2d 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -101,6 +101,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.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" }
@@ -208,6 +209,7 @@ sha2 = { version = "0.10.8", features = ["oid"] }
 similar = { version = "2.6.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" }

From 845298e32594018b579353c1487f9c6456efffea Mon Sep 17 00:00:00 2001
From: Benjamin Naecker <ben@oxide.computer>
Date: Mon, 19 Aug 2024 09:45:55 -0700
Subject: [PATCH 25/28] Support hex integer literals in OxQL (#6380)

---
 oximeter/db/src/oxql/ast/grammar.rs | 47 ++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/oximeter/db/src/oxql/ast/grammar.rs b/oximeter/db/src/oxql/ast/grammar.rs
index cbca4470f9..62182ec553 100644
--- a/oximeter/db/src/oxql/ast/grammar.rs
+++ b/oximeter/db/src/oxql/ast/grammar.rs
@@ -279,11 +279,27 @@ peg::parser! {
         pub rule string_literal() -> Literal
             = s:string_literal_impl() { Literal::String(s) }
 
+        pub(super) rule hex_integer_literal_impl() -> i128
+            = n:$("0x" ['0'..='9' | 'a'..='f' | 'A'..='F']+ !['.'])
+        {?
+            let Some((maybe_sign, digits)) = n.split_once("0x") else {
+                return Err("hex literals should start with '0x'");
+            };
+            i128::from_str_radix(digits, 16).map_err(|_| "invalid hex literal")
+        }
+
+        pub(super) rule dec_integer_literal_impl() -> i128
+            = n:$(['0'..='9']+ !['e' | 'E' | '.'])
+        {?
+            n.parse().map_err(|_| "integer literal")
+        }
+
         pub(super) rule integer_literal_impl() -> i128
-            = n:$("-"? ['0'..='9']+ !['e' | 'E' | '.'])
+            = maybe_sign:$("-"?) n:(hex_integer_literal_impl() / dec_integer_literal_impl())
         {?
-            let Ok(x) = n.parse() else {
-                return Err("integer literal");
+            let sign = if maybe_sign == "-" { -1 } else { 1 };
+            let Some(x) = n.checked_mul(sign) else {
+                return Err("negative overflow");
             };
             if x < i128::from(i64::MIN) {
                 Err("negative overflow")
@@ -747,13 +763,36 @@ mod tests {
     fn test_integer_literal() {
         assert_eq!(query_parser::integer_literal_impl("1").unwrap(), 1);
         assert_eq!(query_parser::integer_literal_impl("-1").unwrap(), -1);
-        assert_eq!(query_parser::integer_literal_impl("-1").unwrap(), -1);
 
         assert!(query_parser::integer_literal_impl("-1.0").is_err());
         assert!(query_parser::integer_literal_impl("-1.").is_err());
         assert!(query_parser::integer_literal_impl("1e3").is_err());
     }
 
+    #[test]
+    fn test_hex_integer_literal() {
+        assert_eq!(query_parser::integer_literal_impl("0x1").unwrap(), 1);
+        assert_eq!(query_parser::integer_literal_impl("-0x1").unwrap(), -1);
+        assert_eq!(query_parser::integer_literal_impl("-0xa").unwrap(), -0xa);
+        assert_eq!(
+            query_parser::integer_literal_impl("0xfeed").unwrap(),
+            0xfeed
+        );
+        assert_eq!(
+            query_parser::integer_literal_impl("0xFEED").unwrap(),
+            0xfeed
+        );
+
+        // Out of range in either direction
+        assert!(query_parser::integer_literal_impl("0xFFFFFFFFFFFFFFFFFFFF")
+            .is_err());
+        assert!(query_parser::integer_literal_impl("-0xFFFFFFFFFFFFFFFFFFFF")
+            .is_err());
+
+        assert!(query_parser::integer_literal_impl("-0x1.0").is_err());
+        assert!(query_parser::integer_literal_impl("-0x1.").is_err());
+    }
+
     #[test]
     fn test_double_literal() {
         assert_eq!(query_parser::double_literal_impl("1.0").unwrap(), 1.0);

From 54b387871e17579f9ad30166d4b7522ddc18ba31 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 19 Aug 2024 10:36:31 -0700
Subject: [PATCH 26/28] [sled-agent] make sled-agent-sim implement the
 sled-agent API trait (#6339)

`sled-agent-sim` is another implementation of the API, so it can be backed by
the same trait, reducing the likelihood of confusion.

I did have to add stub implementations for unimplemented methods, though -- I
think that's okay. (I'd like to address this via the `api_description` macro at
some point.)
---
 sled-agent/src/sim/http_entrypoints.rs | 894 +++++++++++++------------
 1 file changed, 455 insertions(+), 439 deletions(-)

diff --git a/sled-agent/src/sim/http_entrypoints.rs b/sled-agent/src/sim/http_entrypoints.rs
index c219a747ce..e93bebad98 100644
--- a/sled-agent/src/sim/http_entrypoints.rs
+++ b/sled-agent/src/sim/http_entrypoints.rs
@@ -5,18 +5,27 @@
 //! HTTP entrypoint functions for the sled agent's exposed API
 
 use super::collection::PokeMode;
+use camino::Utf8PathBuf;
+use dropshot::endpoint;
 use dropshot::ApiDescription;
+use dropshot::FreeformBody;
 use dropshot::HttpError;
+use dropshot::HttpResponseCreated;
+use dropshot::HttpResponseDeleted;
+use dropshot::HttpResponseHeaders;
 use dropshot::HttpResponseOk;
 use dropshot::HttpResponseUpdatedNoContent;
 use dropshot::Path;
+use dropshot::Query;
 use dropshot::RequestContext;
+use dropshot::StreamingBody;
 use dropshot::TypedBody;
-use dropshot::{endpoint, ApiDescriptionRegisterError};
+use nexus_sled_agent_shared::inventory::SledRole;
 use nexus_sled_agent_shared::inventory::{Inventory, OmicronZonesConfig};
 use omicron_common::api::internal::nexus::DiskRuntimeState;
 use omicron_common::api::internal::nexus::SledInstanceState;
 use omicron_common::api::internal::nexus::UpdateArtifactId;
+use omicron_common::api::internal::shared::SledIdentifiers;
 use omicron_common::api::internal::shared::VirtualNetworkInterfaceHost;
 use omicron_common::api::internal::shared::{
     ResolvedVpcRouteSet, ResolvedVpcRouteState, SwitchPorts,
@@ -24,8 +33,12 @@ use omicron_common::api::internal::shared::{
 use omicron_common::disk::DisksManagementResult;
 use omicron_common::disk::OmicronPhysicalDisksConfig;
 use omicron_uuid_kinds::{GenericUuid, InstanceUuid};
-use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
+use sled_agent_api::*;
+use sled_agent_types::boot_disk::BootDiskOsWriteStatus;
+use sled_agent_types::boot_disk::BootDiskPathParams;
+use sled_agent_types::boot_disk::BootDiskUpdatePathParams;
+use sled_agent_types::boot_disk::BootDiskWriteStartQueryParams;
+use sled_agent_types::bootstore::BootstoreStatus;
 use sled_agent_types::disk::DiskEnsureBody;
 use sled_agent_types::early_networking::EarlyNetworkConfig;
 use sled_agent_types::firewall_rules::VpcFirewallRulesEnsureBody;
@@ -35,8 +48,14 @@ use sled_agent_types::instance::InstancePutStateBody;
 use sled_agent_types::instance::InstancePutStateResponse;
 use sled_agent_types::instance::InstanceUnregisterResponse;
 use sled_agent_types::sled::AddSledRequest;
+use sled_agent_types::time_sync::TimeSync;
+use sled_agent_types::zone_bundle::BundleUtilization;
+use sled_agent_types::zone_bundle::CleanupContext;
+use sled_agent_types::zone_bundle::CleanupCount;
+use sled_agent_types::zone_bundle::ZoneBundleId;
+use sled_agent_types::zone_bundle::ZoneBundleMetadata;
+use std::collections::BTreeMap;
 use std::sync::Arc;
-use uuid::Uuid;
 
 use super::sled_agent::SledAgent;
 
@@ -44,510 +63,507 @@ type SledApiDescription = ApiDescription<Arc<SledAgent>>;
 
 /// Returns a description of the sled agent API
 pub fn api() -> SledApiDescription {
-    fn register_endpoints(
-        api: &mut SledApiDescription,
-    ) -> Result<(), ApiDescriptionRegisterError> {
-        api.register(instance_put_state)?;
-        api.register(instance_get_state)?;
-        api.register(instance_register)?;
-        api.register(instance_unregister)?;
-        api.register(instance_put_external_ip)?;
-        api.register(instance_delete_external_ip)?;
+    fn register_endpoints() -> Result<SledApiDescription, anyhow::Error> {
+        let mut api = sled_agent_api::sled_agent_api_mod::api_description::<
+            SledAgentSimImpl,
+        >()?;
         api.register(instance_poke_post)?;
         api.register(instance_poke_single_step_post)?;
         api.register(instance_post_sim_migration_source)?;
-        api.register(disk_put)?;
         api.register(disk_poke_post)?;
-        api.register(update_artifact)?;
-        api.register(instance_issue_disk_snapshot_request)?;
-        api.register(vpc_firewall_rules_put)?;
-        api.register(set_v2p)?;
-        api.register(del_v2p)?;
-        api.register(list_v2p)?;
-        api.register(uplink_ensure)?;
-        api.register(read_network_bootstore_config)?;
-        api.register(write_network_bootstore_config)?;
-        api.register(inventory)?;
-        api.register(omicron_physical_disks_get)?;
-        api.register(omicron_physical_disks_put)?;
-        api.register(omicron_zones_get)?;
-        api.register(omicron_zones_put)?;
-        api.register(sled_add)?;
-        api.register(list_vpc_routes)?;
-        api.register(set_vpc_routes)?;
-
-        Ok(())
-    }
-
-    let mut api = SledApiDescription::new();
-    if let Err(err) = register_endpoints(&mut api) {
-        panic!("failed to register entrypoints: {}", err);
-    }
-    api
-}
 
-/// Path parameters for Instance requests (sled agent API)
-#[derive(Deserialize, JsonSchema)]
-struct InstancePathParam {
-    instance_id: InstanceUuid,
-}
+        Ok(api)
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/instances/{instance_id}",
-}]
-async fn instance_register(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-    body: TypedBody<InstanceEnsureBody>,
-) -> Result<HttpResponseOk<SledInstanceState>, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    let body_args = body.into_inner();
-    Ok(HttpResponseOk(
-        sa.instance_register(
-            instance_id,
-            body_args.propolis_id,
-            body_args.hardware,
-            body_args.instance_runtime,
-            body_args.vmm_runtime,
-            body_args.metadata,
+    register_endpoints().expect("failed to register entrypoints")
+}
+
+enum SledAgentSimImpl {}
+
+impl SledAgentApi for SledAgentSimImpl {
+    type Context = Arc<SledAgent>;
+
+    async fn instance_register(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+        body: TypedBody<InstanceEnsureBody>,
+    ) -> Result<HttpResponseOk<SledInstanceState>, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        let body_args = body.into_inner();
+        Ok(HttpResponseOk(
+            sa.instance_register(
+                instance_id,
+                body_args.propolis_id,
+                body_args.hardware,
+                body_args.instance_runtime,
+                body_args.vmm_runtime,
+                body_args.metadata,
+            )
+            .await?,
+        ))
+    }
+
+    async fn instance_unregister(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+    ) -> Result<HttpResponseOk<InstanceUnregisterResponse>, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        Ok(HttpResponseOk(sa.instance_unregister(instance_id).await?))
+    }
+
+    async fn instance_put_state(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+        body: TypedBody<InstancePutStateBody>,
+    ) -> Result<HttpResponseOk<InstancePutStateResponse>, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        let body_args = body.into_inner();
+        Ok(HttpResponseOk(
+            sa.instance_ensure_state(instance_id, body_args.state).await?,
+        ))
+    }
+
+    async fn instance_get_state(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+    ) -> Result<HttpResponseOk<SledInstanceState>, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        Ok(HttpResponseOk(sa.instance_get_state(instance_id).await?))
+    }
+
+    async fn instance_put_external_ip(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+        body: TypedBody<InstanceExternalIpBody>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        let body_args = body.into_inner();
+        sa.instance_put_external_ip(instance_id, &body_args).await?;
+        Ok(HttpResponseUpdatedNoContent())
+    }
+
+    async fn instance_delete_external_ip(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstancePathParam>,
+        body: TypedBody<InstanceExternalIpBody>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        let instance_id = path_params.into_inner().instance_id;
+        let body_args = body.into_inner();
+        sa.instance_delete_external_ip(instance_id, &body_args).await?;
+        Ok(HttpResponseUpdatedNoContent())
+    }
+
+    async fn disk_put(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<DiskPathParam>,
+        body: TypedBody<DiskEnsureBody>,
+    ) -> Result<HttpResponseOk<DiskRuntimeState>, HttpError> {
+        let sa = rqctx.context();
+        let disk_id = path_params.into_inner().disk_id;
+        let body_args = body.into_inner();
+        Ok(HttpResponseOk(
+            sa.disk_ensure(
+                disk_id,
+                body_args.initial_runtime.clone(),
+                body_args.target.clone(),
+            )
+            .await?,
+        ))
+    }
+
+    async fn update_artifact(
+        rqctx: RequestContext<Self::Context>,
+        artifact: TypedBody<UpdateArtifactId>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        sa.updates()
+            .download_artifact(
+                artifact.into_inner(),
+                rqctx.context().nexus_client.as_ref(),
+            )
+            .await
+            .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
+        Ok(HttpResponseUpdatedNoContent())
+    }
+
+    async fn instance_issue_disk_snapshot_request(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<InstanceIssueDiskSnapshotRequestPathParam>,
+        body: TypedBody<InstanceIssueDiskSnapshotRequestBody>,
+    ) -> Result<
+        HttpResponseOk<InstanceIssueDiskSnapshotRequestResponse>,
+        HttpError,
+    > {
+        let sa = rqctx.context();
+        let path_params = path_params.into_inner();
+        let body = body.into_inner();
+
+        sa.instance_issue_disk_snapshot_request(
+            InstanceUuid::from_untyped_uuid(path_params.instance_id),
+            path_params.disk_id,
+            body.snapshot_id,
         )
-        .await?,
-    ))
-}
+        .await
+        .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
 
-#[endpoint {
-    method = DELETE,
-    path = "/instances/{instance_id}",
-}]
-async fn instance_unregister(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseOk<InstanceUnregisterResponse>, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    Ok(HttpResponseOk(sa.instance_unregister(instance_id).await?))
-}
+        Ok(HttpResponseOk(InstanceIssueDiskSnapshotRequestResponse {
+            snapshot_id: body.snapshot_id,
+        }))
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/instances/{instance_id}/state",
-}]
-async fn instance_put_state(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-    body: TypedBody<InstancePutStateBody>,
-) -> Result<HttpResponseOk<InstancePutStateResponse>, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    let body_args = body.into_inner();
-    Ok(HttpResponseOk(
-        sa.instance_ensure_state(instance_id, body_args.state).await?,
-    ))
-}
+    async fn vpc_firewall_rules_put(
+        rqctx: RequestContext<Self::Context>,
+        path_params: Path<VpcPathParam>,
+        body: TypedBody<VpcFirewallRulesEnsureBody>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let _sa = rqctx.context();
+        let _vpc_id = path_params.into_inner().vpc_id;
+        let _body_args = body.into_inner();
 
-#[endpoint {
-    method = GET,
-    path = "/instances/{instance_id}/state",
-}]
-async fn instance_get_state(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseOk<SledInstanceState>, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    Ok(HttpResponseOk(sa.instance_get_state(instance_id).await?))
-}
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/instances/{instance_id}/external-ip",
-}]
-async fn instance_put_external_ip(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-    body: TypedBody<InstanceExternalIpBody>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    let body_args = body.into_inner();
-    sa.instance_put_external_ip(instance_id, &body_args).await?;
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn set_v2p(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<VirtualNetworkInterfaceHost>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        let body_args = body.into_inner();
 
-#[endpoint {
-    method = DELETE,
-    path = "/instances/{instance_id}/external-ip",
-}]
-async fn instance_delete_external_ip(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-    body: TypedBody<InstanceExternalIpBody>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    let body_args = body.into_inner();
-    sa.instance_delete_external_ip(instance_id, &body_args).await?;
-    Ok(HttpResponseUpdatedNoContent())
-}
+        sa.set_virtual_nic_host(&body_args)
+            .await
+            .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
 
-#[endpoint {
-    method = POST,
-    path = "/instances/{instance_id}/poke",
-}]
-async fn instance_poke_post(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    sa.instance_poke(instance_id, PokeMode::Drain).await;
-    Ok(HttpResponseUpdatedNoContent())
-}
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-#[endpoint {
-    method = POST,
-    path = "/instances/{instance_id}/poke-single-step",
-}]
-async fn instance_poke_single_step_post(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    sa.instance_poke(instance_id, PokeMode::SingleStep).await;
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn del_v2p(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<VirtualNetworkInterfaceHost>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        let body_args = body.into_inner();
 
-#[endpoint {
-    method = POST,
-    path = "/instances/{instance_id}/sim-migration-source",
-}]
-async fn instance_post_sim_migration_source(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstancePathParam>,
-    body: TypedBody<super::instance::SimulateMigrationSource>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let instance_id = path_params.into_inner().instance_id;
-    sa.instance_simulate_migration_source(instance_id, body.into_inner())
-        .await?;
-    Ok(HttpResponseUpdatedNoContent())
-}
+        sa.unset_virtual_nic_host(&body_args)
+            .await
+            .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
 
-/// Path parameters for Disk requests (sled agent API)
-#[derive(Deserialize, JsonSchema)]
-struct DiskPathParam {
-    disk_id: Uuid,
-}
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/disks/{disk_id}",
-}]
-async fn disk_put(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<DiskPathParam>,
-    body: TypedBody<DiskEnsureBody>,
-) -> Result<HttpResponseOk<DiskRuntimeState>, HttpError> {
-    let sa = rqctx.context();
-    let disk_id = path_params.into_inner().disk_id;
-    let body_args = body.into_inner();
-    Ok(HttpResponseOk(
-        sa.disk_ensure(
-            disk_id,
-            body_args.initial_runtime.clone(),
-            body_args.target.clone(),
-        )
-        .await?,
-    ))
-}
+    async fn list_v2p(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Vec<VirtualNetworkInterfaceHost>>, HttpError>
+    {
+        let sa = rqctx.context();
 
-#[endpoint {
-    method = POST,
-    path = "/disks/{disk_id}/poke",
-}]
-async fn disk_poke_post(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<DiskPathParam>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let disk_id = path_params.into_inner().disk_id;
-    sa.disk_poke(disk_id).await;
-    Ok(HttpResponseUpdatedNoContent())
-}
+        let vnics = sa.list_virtual_nics().await.map_err(HttpError::from)?;
 
-#[endpoint {
-    method = POST,
-    path = "/update"
-}]
-async fn update_artifact(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    artifact: TypedBody<UpdateArtifactId>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    sa.updates()
-        .download_artifact(
-            artifact.into_inner(),
-            rqctx.context().nexus_client.as_ref(),
-        )
-        .await
-        .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
-    Ok(HttpResponseUpdatedNoContent())
-}
+        Ok(HttpResponseOk(vnics))
+    }
 
-#[derive(Deserialize, JsonSchema)]
-pub struct InstanceIssueDiskSnapshotRequestPathParam {
-    instance_id: Uuid,
-    disk_id: Uuid,
-}
+    async fn uplink_ensure(
+        _rqctx: RequestContext<Self::Context>,
+        _body: TypedBody<SwitchPorts>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-#[derive(Deserialize, JsonSchema)]
-pub struct InstanceIssueDiskSnapshotRequestBody {
-    snapshot_id: Uuid,
-}
+    async fn read_network_bootstore_config_cache(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<EarlyNetworkConfig>, HttpError> {
+        let config =
+            rqctx.context().bootstore_network_config.lock().await.clone();
+        Ok(HttpResponseOk(config))
+    }
 
-#[derive(Serialize, JsonSchema)]
-pub struct InstanceIssueDiskSnapshotRequestResponse {
-    snapshot_id: Uuid,
-}
+    async fn write_network_bootstore_config(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<EarlyNetworkConfig>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let mut config = rqctx.context().bootstore_network_config.lock().await;
+        *config = body.into_inner();
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-/// Take a snapshot of a disk that is attached to an instance
-#[endpoint {
-    method = POST,
-    path = "/instances/{instance_id}/disks/{disk_id}/snapshot",
-}]
-async fn instance_issue_disk_snapshot_request(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<InstanceIssueDiskSnapshotRequestPathParam>,
-    body: TypedBody<InstanceIssueDiskSnapshotRequestBody>,
-) -> Result<HttpResponseOk<InstanceIssueDiskSnapshotRequestResponse>, HttpError>
-{
-    let sa = rqctx.context();
-    let path_params = path_params.into_inner();
-    let body = body.into_inner();
-
-    sa.instance_issue_disk_snapshot_request(
-        InstanceUuid::from_untyped_uuid(path_params.instance_id),
-        path_params.disk_id,
-        body.snapshot_id,
-    )
-    .await
-    .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
-
-    Ok(HttpResponseOk(InstanceIssueDiskSnapshotRequestResponse {
-        snapshot_id: body.snapshot_id,
-    }))
-}
+    /// Fetch basic information about this sled
+    async fn inventory(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Inventory>, HttpError> {
+        let sa = rqctx.context();
+        Ok(HttpResponseOk(
+            sa.inventory(rqctx.server.local_addr).await.map_err(|e| {
+                HttpError::for_internal_error(format!("{:#}", e))
+            })?,
+        ))
+    }
 
-/// Path parameters for VPC requests (sled agent API)
-#[derive(Deserialize, JsonSchema)]
-struct VpcPathParam {
-    vpc_id: Uuid,
-}
+    async fn omicron_physical_disks_put(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<OmicronPhysicalDisksConfig>,
+    ) -> Result<HttpResponseOk<DisksManagementResult>, HttpError> {
+        let sa = rqctx.context();
+        let body_args = body.into_inner();
+        let result = sa.omicron_physical_disks_ensure(body_args).await?;
+        Ok(HttpResponseOk(result))
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/vpc/{vpc_id}/firewall/rules",
-}]
-async fn vpc_firewall_rules_put(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    path_params: Path<VpcPathParam>,
-    body: TypedBody<VpcFirewallRulesEnsureBody>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let _sa = rqctx.context();
-    let _vpc_id = path_params.into_inner().vpc_id;
-    let _body_args = body.into_inner();
+    async fn omicron_physical_disks_get(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<OmicronPhysicalDisksConfig>, HttpError> {
+        let sa = rqctx.context();
+        Ok(HttpResponseOk(sa.omicron_physical_disks_list().await?))
+    }
 
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn omicron_zones_get(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<OmicronZonesConfig>, HttpError> {
+        let sa = rqctx.context();
+        Ok(HttpResponseOk(sa.omicron_zones_list().await))
+    }
 
-/// Create a mapping from a virtual NIC to a physical host
-#[endpoint {
-    method = PUT,
-    path = "/v2p/",
-}]
-async fn set_v2p(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<VirtualNetworkInterfaceHost>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let body_args = body.into_inner();
+    async fn omicron_zones_put(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<OmicronZonesConfig>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        let body_args = body.into_inner();
+        sa.omicron_zones_ensure(body_args).await;
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-    sa.set_virtual_nic_host(&body_args)
-        .await
-        .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
+    async fn sled_add(
+        _rqctx: RequestContext<Self::Context>,
+        _body: TypedBody<AddSledRequest>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn list_vpc_routes(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Vec<ResolvedVpcRouteState>>, HttpError> {
+        let sa = rqctx.context();
+        Ok(HttpResponseOk(sa.list_vpc_routes().await))
+    }
 
-/// Delete a mapping from a virtual NIC to a physical host
-#[endpoint {
-    method = DELETE,
-    path = "/v2p/",
-}]
-async fn del_v2p(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<VirtualNetworkInterfaceHost>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let sa = rqctx.context();
-    let body_args = body.into_inner();
+    async fn set_vpc_routes(
+        rqctx: RequestContext<Self::Context>,
+        body: TypedBody<Vec<ResolvedVpcRouteSet>>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        let sa = rqctx.context();
+        sa.set_vpc_routes(body.into_inner()).await;
+        Ok(HttpResponseUpdatedNoContent())
+    }
 
-    sa.unset_virtual_nic_host(&body_args)
-        .await
-        .map_err(|e| HttpError::for_internal_error(e.to_string()))?;
+    // --- Unimplemented endpoints ---
 
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn zone_bundle_list_all(
+        _rqctx: RequestContext<Self::Context>,
+        _query: Query<ZoneBundleFilter>,
+    ) -> Result<HttpResponseOk<Vec<ZoneBundleMetadata>>, HttpError> {
+        method_unimplemented()
+    }
 
-/// List v2p mappings present on sled
-#[endpoint {
-    method = GET,
-    path = "/v2p/",
-}]
-async fn list_v2p(
-    rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<Vec<VirtualNetworkInterfaceHost>>, HttpError> {
-    let sa = rqctx.context();
+    async fn zone_bundle_list(
+        _rqctx: RequestContext<Self::Context>,
+        _params: Path<ZonePathParam>,
+    ) -> Result<HttpResponseOk<Vec<ZoneBundleMetadata>>, HttpError> {
+        method_unimplemented()
+    }
 
-    let vnics = sa.list_virtual_nics().await.map_err(HttpError::from)?;
+    async fn zone_bundle_create(
+        _rqctx: RequestContext<Self::Context>,
+        _params: Path<ZonePathParam>,
+    ) -> Result<HttpResponseCreated<ZoneBundleMetadata>, HttpError> {
+        method_unimplemented()
+    }
 
-    Ok(HttpResponseOk(vnics))
-}
+    async fn zone_bundle_get(
+        _rqctx: RequestContext<Self::Context>,
+        _params: Path<ZoneBundleId>,
+    ) -> Result<HttpResponseHeaders<HttpResponseOk<FreeformBody>>, HttpError>
+    {
+        method_unimplemented()
+    }
 
-#[endpoint {
-    method = POST,
-    path = "/switch-ports",
-}]
-async fn uplink_ensure(
-    _rqctx: RequestContext<Arc<SledAgent>>,
-    _body: TypedBody<SwitchPorts>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn zone_bundle_delete(
+        _rqctx: RequestContext<Self::Context>,
+        _params: Path<ZoneBundleId>,
+    ) -> Result<HttpResponseDeleted, HttpError> {
+        method_unimplemented()
+    }
 
-#[endpoint {
-    method = GET,
-    path = "/network-bootstore-config",
-}]
-async fn read_network_bootstore_config(
-    rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<EarlyNetworkConfig>, HttpError> {
-    let config = rqctx.context().bootstore_network_config.lock().await.clone();
-    Ok(HttpResponseOk(config))
-}
+    async fn zone_bundle_utilization(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<
+        HttpResponseOk<BTreeMap<Utf8PathBuf, BundleUtilization>>,
+        HttpError,
+    > {
+        method_unimplemented()
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/network-bootstore-config",
-}]
-async fn write_network_bootstore_config(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<EarlyNetworkConfig>,
-) -> Result<HttpResponseUpdatedNoContent, HttpError> {
-    let mut config = rqctx.context().bootstore_network_config.lock().await;
-    *config = body.into_inner();
-    Ok(HttpResponseUpdatedNoContent())
-}
+    async fn zone_bundle_cleanup_context(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<CleanupContext>, HttpError> {
+        method_unimplemented()
+    }
 
-/// Fetch basic information about this sled
-#[endpoint {
-    method = GET,
-    path = "/inventory",
-}]
-async fn inventory(
-    rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<Inventory>, HttpError> {
-    let sa = rqctx.context();
-    Ok(HttpResponseOk(
-        sa.inventory(rqctx.server.local_addr)
-            .await
-            .map_err(|e| HttpError::for_internal_error(format!("{:#}", e)))?,
-    ))
-}
+    async fn zone_bundle_cleanup_context_update(
+        _rqctx: RequestContext<Self::Context>,
+        _body: TypedBody<CleanupContextUpdate>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        method_unimplemented()
+    }
 
-#[endpoint {
-    method = PUT,
-    path = "/omicron-physical-disks",
-}]
-async fn omicron_physical_disks_put(
-    rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<OmicronPhysicalDisksConfig>,
-) -> Result<HttpResponseOk<DisksManagementResult>, HttpError> {
-    let sa = rqctx.context();
-    let body_args = body.into_inner();
-    let result = sa.omicron_physical_disks_ensure(body_args).await?;
-    Ok(HttpResponseOk(result))
-}
+    async fn zone_bundle_cleanup(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<BTreeMap<Utf8PathBuf, CleanupCount>>, HttpError>
+    {
+        method_unimplemented()
+    }
 
-#[endpoint {
-    method = GET,
-    path = "/omicron-physical-disks",
-}]
-async fn omicron_physical_disks_get(
-    rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<OmicronPhysicalDisksConfig>, HttpError> {
-    let sa = rqctx.context();
-    Ok(HttpResponseOk(sa.omicron_physical_disks_list().await?))
+    async fn zones_list(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Vec<String>>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn zpools_get(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Vec<Zpool>>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn sled_role_get(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<SledRole>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn cockroachdb_init(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn timesync_get(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<TimeSync>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn host_os_write_start(
+        _rqctx: RequestContext<Self::Context>,
+        _path_params: Path<BootDiskPathParams>,
+        _query_params: Query<BootDiskWriteStartQueryParams>,
+        _body: StreamingBody,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn host_os_write_status_get(
+        _rqctx: RequestContext<Self::Context>,
+        _path_params: Path<BootDiskPathParams>,
+    ) -> Result<HttpResponseOk<BootDiskOsWriteStatus>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn host_os_write_status_delete(
+        _rqctx: RequestContext<Self::Context>,
+        _path_params: Path<BootDiskUpdatePathParams>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn sled_identifiers(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<SledIdentifiers>, HttpError> {
+        method_unimplemented()
+    }
+
+    async fn bootstore_status(
+        _rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<BootstoreStatus>, HttpError> {
+        method_unimplemented()
+    }
 }
 
-#[endpoint {
-    method = GET,
-    path = "/omicron-zones",
-}]
-async fn omicron_zones_get(
-    rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<OmicronZonesConfig>, HttpError> {
-    let sa = rqctx.context();
-    Ok(HttpResponseOk(sa.omicron_zones_list().await))
+fn method_unimplemented<T>() -> Result<T, HttpError> {
+    Err(HttpError {
+        // Use a client error here (405 Method Not Allowed vs 501 Not
+        // Implemented) even though it isn't strictly accurate here, so tests
+        // get to see the error message.
+        status_code: http::StatusCode::METHOD_NOT_ALLOWED,
+        error_code: None,
+        external_message: "Method not implemented in sled-agent-sim"
+            .to_string(),
+        internal_message: "Method not implemented in sled-agent-sim"
+            .to_string(),
+    })
 }
 
+// --- Extra endpoints only available in the sim implementation ---
+
 #[endpoint {
-    method = PUT,
-    path = "/omicron-zones",
+    method = POST,
+    path = "/instances/{instance_id}/poke",
 }]
-async fn omicron_zones_put(
+async fn instance_poke_post(
     rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<OmicronZonesConfig>,
+    path_params: Path<InstancePathParam>,
 ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
     let sa = rqctx.context();
-    let body_args = body.into_inner();
-    sa.omicron_zones_ensure(body_args).await;
+    let instance_id = path_params.into_inner().instance_id;
+    sa.instance_poke(instance_id, PokeMode::Drain).await;
     Ok(HttpResponseUpdatedNoContent())
 }
 
 #[endpoint {
-    method = PUT,
-    path = "/sleds"
+    method = POST,
+    path = "/instances/{instance_id}/poke-single-step",
 }]
-async fn sled_add(
-    _rqctx: RequestContext<Arc<SledAgent>>,
-    _body: TypedBody<AddSledRequest>,
+async fn instance_poke_single_step_post(
+    rqctx: RequestContext<Arc<SledAgent>>,
+    path_params: Path<InstancePathParam>,
 ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
+    let sa = rqctx.context();
+    let instance_id = path_params.into_inner().instance_id;
+    sa.instance_poke(instance_id, PokeMode::SingleStep).await;
     Ok(HttpResponseUpdatedNoContent())
 }
 
 #[endpoint {
-    method = GET,
-    path = "/vpc-routes",
+    method = POST,
+    path = "/instances/{instance_id}/sim-migration-source",
 }]
-async fn list_vpc_routes(
+async fn instance_post_sim_migration_source(
     rqctx: RequestContext<Arc<SledAgent>>,
-) -> Result<HttpResponseOk<Vec<ResolvedVpcRouteState>>, HttpError> {
+    path_params: Path<InstancePathParam>,
+    body: TypedBody<super::instance::SimulateMigrationSource>,
+) -> Result<HttpResponseUpdatedNoContent, HttpError> {
     let sa = rqctx.context();
-    Ok(HttpResponseOk(sa.list_vpc_routes().await))
+    let instance_id = path_params.into_inner().instance_id;
+    sa.instance_simulate_migration_source(instance_id, body.into_inner())
+        .await?;
+    Ok(HttpResponseUpdatedNoContent())
 }
 
 #[endpoint {
-    method = PUT,
-    path = "/vpc-routes",
+    method = POST,
+    path = "/disks/{disk_id}/poke",
 }]
-async fn set_vpc_routes(
+async fn disk_poke_post(
     rqctx: RequestContext<Arc<SledAgent>>,
-    body: TypedBody<Vec<ResolvedVpcRouteSet>>,
+    path_params: Path<DiskPathParam>,
 ) -> Result<HttpResponseUpdatedNoContent, HttpError> {
     let sa = rqctx.context();
-    sa.set_vpc_routes(body.into_inner()).await;
+    let disk_id = path_params.into_inner().disk_id;
+    sa.disk_poke(disk_id).await;
     Ok(HttpResponseUpdatedNoContent())
 }

From 6dd980251a26430466bcd5aff1edad5416cf94e5 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Mon, 19 Aug 2024 12:13:05 -0700
Subject: [PATCH 27/28] [3/6] [nexus-auth] move some types into nexus-types
 (#6369)

Put them here rather than in `nexus-auth` so that the upcoming
nexus-external-api crate has fewer dependencies.
---
 Cargo.lock                                             |  5 +++++
 nexus/auth/src/authn/external/mod.rs                   |  1 -
 nexus/auth/src/authn/external/session_cookie.rs        |  2 +-
 nexus/src/external_api/console_api.rs                  | 10 ++++------
 nexus/types/Cargo.toml                                 |  5 +++++
 .../src/authn/external => types/src/authn}/cookies.rs  |  0
 nexus/types/src/authn/mod.rs                           |  7 +++++++
 nexus/types/src/lib.rs                                 |  1 +
 8 files changed, 23 insertions(+), 8 deletions(-)
 rename nexus/{auth/src/authn/external => types/src/authn}/cookies.rs (100%)
 create mode 100644 nexus/types/src/authn/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index 874b33134f..6bd71f6d38 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5443,17 +5443,22 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "api_identity",
+ "async-trait",
  "base64 0.22.1",
  "chrono",
  "clap",
+ "cookie 0.18.1",
  "derive-where",
  "derive_more",
  "dns-service-client",
+ "dropshot",
  "futures",
  "gateway-client",
+ "http 0.2.12",
  "humantime",
  "ipnetwork",
  "newtype-uuid",
+ "newtype_derive",
  "nexus-sled-agent-shared",
  "omicron-common",
  "omicron-passwords",
diff --git a/nexus/auth/src/authn/external/mod.rs b/nexus/auth/src/authn/external/mod.rs
index ccb7218285..5c7fc7af05 100644
--- a/nexus/auth/src/authn/external/mod.rs
+++ b/nexus/auth/src/authn/external/mod.rs
@@ -13,7 +13,6 @@ use slog::trace;
 use std::borrow::Borrow;
 use uuid::Uuid;
 
-pub mod cookies;
 pub mod session_cookie;
 pub mod spoof;
 pub mod token;
diff --git a/nexus/auth/src/authn/external/session_cookie.rs b/nexus/auth/src/authn/external/session_cookie.rs
index 7811bf2826..f6b23308a0 100644
--- a/nexus/auth/src/authn/external/session_cookie.rs
+++ b/nexus/auth/src/authn/external/session_cookie.rs
@@ -4,7 +4,6 @@
 
 //! authn scheme for console that looks up cookie values in a session table
 
-use super::cookies::parse_cookies;
 use super::{HttpAuthnScheme, Reason, SchemeResult};
 use crate::authn;
 use crate::authn::{Actor, Details};
@@ -13,6 +12,7 @@ use async_trait::async_trait;
 use chrono::{DateTime, Duration, Utc};
 use dropshot::HttpError;
 use http::HeaderValue;
+use nexus_types::authn::cookies::parse_cookies;
 use slog::debug;
 use uuid::Uuid;
 
diff --git a/nexus/src/external_api/console_api.rs b/nexus/src/external_api/console_api.rs
index fb0a47bbea..2169b631a7 100644
--- a/nexus/src/external_api/console_api.rs
+++ b/nexus/src/external_api/console_api.rs
@@ -35,15 +35,13 @@ use nexus_db_model::AuthenticationMode;
 use nexus_db_queries::authn::silos::IdentityProviderType;
 use nexus_db_queries::context::OpContext;
 use nexus_db_queries::{
-    authn::external::{
-        cookies::Cookies,
-        session_cookie::{
-            clear_session_cookie_header_value, session_cookie_header_value,
-            SessionStore, SESSION_COOKIE_COOKIE_NAME,
-        },
+    authn::external::session_cookie::{
+        clear_session_cookie_header_value, session_cookie_header_value,
+        SessionStore, SESSION_COOKIE_COOKIE_NAME,
     },
     db::identity::Asset,
 };
+use nexus_types::authn::cookies::Cookies;
 use nexus_types::external_api::params;
 use nexus_types::identity::Resource;
 use omicron_common::api::external::http_pagination::PaginatedBy;
diff --git a/nexus/types/Cargo.toml b/nexus/types/Cargo.toml
index 8dd6292d5c..124f0d42c9 100644
--- a/nexus/types/Cargo.toml
+++ b/nexus/types/Cargo.toml
@@ -9,14 +9,19 @@ workspace = true
 
 [dependencies]
 anyhow.workspace = true
+async-trait.workspace = true
 chrono.workspace = true
 clap.workspace = true
+cookie.workspace = true
 base64.workspace = true
 derive-where.workspace = true
 derive_more.workspace = true
+dropshot.workspace = true
 futures.workspace = true
+http.workspace = true
 humantime.workspace = true
 ipnetwork.workspace = true
+newtype_derive.workspace = true
 omicron-uuid-kinds.workspace = true
 openssl.workspace = true
 oxql-types.workspace = true
diff --git a/nexus/auth/src/authn/external/cookies.rs b/nexus/types/src/authn/cookies.rs
similarity index 100%
rename from nexus/auth/src/authn/external/cookies.rs
rename to nexus/types/src/authn/cookies.rs
diff --git a/nexus/types/src/authn/mod.rs b/nexus/types/src/authn/mod.rs
new file mode 100644
index 0000000000..f87935428e
--- /dev/null
+++ b/nexus/types/src/authn/mod.rs
@@ -0,0 +1,7 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+//! Authentication types for the Nexus API.
+
+pub mod cookies;
diff --git a/nexus/types/src/lib.rs b/nexus/types/src/lib.rs
index 494573e834..8a0a3ec80e 100644
--- a/nexus/types/src/lib.rs
+++ b/nexus/types/src/lib.rs
@@ -29,6 +29,7 @@
 //! rules, so our model layer knows about our views. That seems to be a
 //! relatively minor offense, so it's the way we leave things for now.
 
+pub mod authn;
 pub mod deployment;
 pub mod external_api;
 pub mod identity;

From a338e8a69ad8c9924856a20125d39b048c7cb8e1 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Mon, 19 Aug 2024 16:49:56 -0700
Subject: [PATCH 28/28] fix flaky test_demo_saga (#6388)

---
 nexus/src/app/saga.rs       |   4 +
 nexus/src/app/sagas/demo.rs | 154 +++++++++++++++++++++++++++---------
 2 files changed, 119 insertions(+), 39 deletions(-)

diff --git a/nexus/src/app/saga.rs b/nexus/src/app/saga.rs
index 5bc69946ad..975df7fc3b 100644
--- a/nexus/src/app/saga.rs
+++ b/nexus/src/app/saga.rs
@@ -469,6 +469,10 @@ impl super::Nexus {
         // We don't need the handle that runnable_saga.start() returns because
         // we're not going to wait for the saga to finish here.
         let _ = runnable_saga.start().await?;
+
+        let mut demo_sagas = self.demo_sagas()?;
+        demo_sagas.preregister(demo_saga_id);
+
         Ok(DemoSaga { saga_id, demo_saga_id })
     }
 
diff --git a/nexus/src/app/sagas/demo.rs b/nexus/src/app/sagas/demo.rs
index 4a8eda8b80..d76a48688d 100644
--- a/nexus/src/app/sagas/demo.rs
+++ b/nexus/src/app/sagas/demo.rs
@@ -21,56 +21,66 @@
 use super::NexusActionContext;
 use super::{ActionRegistry, NexusSaga, SagaInitError};
 use crate::app::sagas::declare_saga_actions;
-use anyhow::ensure;
+use anyhow::Context;
 use omicron_common::api::external::Error;
 use omicron_uuid_kinds::DemoSagaUuid;
 use serde::Deserialize;
 use serde::Serialize;
 use slog::info;
 use std::collections::BTreeMap;
+use std::future::Future;
+use std::sync::Arc;
 use steno::ActionError;
-use tokio::sync::oneshot;
+use tokio::sync::Semaphore;
 
-/// Set of demo sagas that have been marked completed
+/// Rendezvous point for demo sagas
 ///
-/// Nexus maintains one of these at the top level.  Individual demo sagas wait
-/// until their id shows up here, then remove it and proceed.
+/// This is where:
+///
+/// - demo sagas wait for a completion message
+/// - completion messages are recorded for demo sagas that haven't started
+///   waiting yet
+///
+/// Nexus maintains one of these structures at the top level.
 pub struct CompletingDemoSagas {
-    ids: BTreeMap<DemoSagaUuid, oneshot::Sender<()>>,
+    sagas: BTreeMap<DemoSagaUuid, Arc<Semaphore>>,
 }
 
 impl CompletingDemoSagas {
     pub fn new() -> CompletingDemoSagas {
-        CompletingDemoSagas { ids: BTreeMap::new() }
+        CompletingDemoSagas { sagas: BTreeMap::new() }
     }
 
-    pub fn complete(&mut self, id: DemoSagaUuid) -> Result<(), Error> {
-        self.ids
-            .remove(&id)
-            .ok_or_else(|| {
-                Error::non_resourcetype_not_found(format!(
-                    "demo saga with id {:?}",
-                    id
-                ))
-            })?
-            .send(())
-            .map_err(|_| {
-                Error::internal_error(
-                    "saga stopped listening (Nexus shutting down?)",
-                )
-            })
+    pub fn preregister(&mut self, id: DemoSagaUuid) {
+        assert!(self.sagas.insert(id, Arc::new(Semaphore::new(0))).is_none());
     }
 
     pub fn subscribe(
         &mut self,
         id: DemoSagaUuid,
-    ) -> Result<oneshot::Receiver<()>, anyhow::Error> {
-        let (tx, rx) = oneshot::channel();
-        ensure!(
-            self.ids.insert(id, tx).is_none(),
-            "multiple subscriptions for the same demo saga"
-        );
-        Ok(rx)
+    ) -> impl Future<Output = Result<(), anyhow::Error>> {
+        let sem =
+            self.sagas.entry(id).or_insert_with(|| Arc::new(Semaphore::new(0)));
+        let sem_clone = sem.clone();
+        async move {
+            sem_clone
+                .acquire()
+                .await
+                // We don't need the Semaphore permit once we've acquired it.
+                .map(|_| ())
+                .context("acquiring demo saga semaphore")
+        }
+    }
+
+    pub fn complete(&mut self, id: DemoSagaUuid) -> Result<(), Error> {
+        let sem = self.sagas.get_mut(&id).ok_or_else(|| {
+            Error::non_resourcetype_not_found(format!(
+                "demo saga with demo saga id {:?}",
+                id
+            ))
+        })?;
+        sem.add_permits(1);
+        Ok(())
     }
 }
 
@@ -115,21 +125,87 @@ async fn demo_wait(sagactx: NexusActionContext) -> Result<(), ActionError> {
             .nexus()
             .demo_sagas()
             .map_err(ActionError::action_failed)?;
-        demo_sagas.subscribe(demo_id).map_err(|e| {
-            ActionError::action_failed(Error::internal_error(&format!(
-                "demo saga subscribe failed: {:#}",
-                e
-            )))
-        })?
+        demo_sagas.subscribe(demo_id)
     };
     match rx.await {
         Ok(_) => {
             info!(log, "demo saga: completing"; "id" => %demo_id);
+            Ok(())
         }
-        Err(_) => {
-            info!(log, "demo saga: waiting failed (Nexus shutting down?)";
-                "id" => %demo_id);
+        Err(error) => {
+            warn!(log, "demo saga: waiting failed (Nexus shutting down?)";
+                "id" => %demo_id,
+                "error" => #?error,
+            );
+            Err(ActionError::action_failed(Error::internal_error(&format!(
+                "demo saga wait failed: {:#}",
+                error
+            ))))
         }
     }
-    Ok(())
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use assert_matches::assert_matches;
+
+    #[tokio::test]
+    async fn test_demo_saga_rendezvous() {
+        let mut hub = CompletingDemoSagas::new();
+
+        // The most straightforward sequence is:
+        // - create (preregister) demo saga
+        // - demo saga starts and waits for completion (subscribe)
+        // - complete demo saga
+        let demo_saga_id = DemoSagaUuid::new_v4();
+        println!("demo saga: {demo_saga_id}");
+        hub.preregister(demo_saga_id);
+        println!("demo saga: {demo_saga_id} preregistered");
+        let subscribe = hub.subscribe(demo_saga_id);
+        println!("demo saga: {demo_saga_id} subscribed");
+        assert!(hub.complete(demo_saga_id).is_ok());
+        println!("demo saga: {demo_saga_id} marked completed");
+        subscribe.await.unwrap();
+        println!("demo saga: {demo_saga_id} done");
+
+        // It's also possible that the completion request arrives before the
+        // saga started waiting.  In that case, the sequence is:
+        //
+        // - create (preregister) demo saga
+        // - complete demo saga
+        // - demo saga starts and waits for completion (subscribe)
+        //
+        // This should work, too, with no errors.
+        let demo_saga_id = DemoSagaUuid::new_v4();
+        println!("demo saga: {demo_saga_id}");
+        hub.preregister(demo_saga_id);
+        println!("demo saga: {demo_saga_id} preregistered");
+        assert!(hub.complete(demo_saga_id).is_ok());
+        println!("demo saga: {demo_saga_id} marked completed");
+        let subscribe = hub.subscribe(demo_saga_id);
+        println!("demo saga: {demo_saga_id} subscribed");
+        subscribe.await.unwrap();
+        println!("demo saga: {demo_saga_id} done");
+
+        // It's also possible to have no preregistration at all.  This happens
+        // if the demo saga was recovered.  That's fine, too, but then it will
+        // only work if the completion arrives after the saga starts waiting.
+        let demo_saga_id = DemoSagaUuid::new_v4();
+        println!("demo saga: {demo_saga_id}");
+        let subscribe = hub.subscribe(demo_saga_id);
+        println!("demo saga: {demo_saga_id} subscribed");
+        assert!(hub.complete(demo_saga_id).is_ok());
+        println!("demo saga: {demo_saga_id} marked completed");
+        subscribe.await.unwrap();
+        println!("demo saga: {demo_saga_id} done");
+
+        // If there's no preregistration and we get a completion request, then
+        // that request should fail.
+        let demo_saga_id = DemoSagaUuid::new_v4();
+        println!("demo saga: {demo_saga_id}");
+        let error = hub.complete(demo_saga_id).unwrap_err();
+        assert_matches!(error, Error::NotFound { .. });
+        println!("demo saga: {demo_saga_id} complete error: {:#}", error);
+    }
 }