Use oxide-tokio-rt rather than #[tokio::main]

Cargo.toml

@@ -72,6 +72,7 @@ libc = "0.2"
 mockall = "0.13.1"
 omicron-zone-package = "0.12"
 openssl = "0.10"
+oxide-tokio-rt = "0.1.2"
 parking_lot = "0.12"
 pretty_assertions = "1.4"
 proc-macro2 = "1.0"

clippy.toml

@@ -0,0 +1,4 @@
+[[disallowed-macros]]
+path = "tokio::main"
+reason = "prefer `oxide_tokio_rt` for production software"
+replacement = "oxide_tokio_rt::run"

dpd/Cargo.toml

@@ -59,6 +59,7 @@ internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
 nexus-client.workspace = true
 omicron-common.workspace = true
+oxide-tokio-rt.workspace = true
 oximeter.workspace = true
 oximeter-producer.workspace = true
 smf.workspace = true

dpd/src/main.rs

@@ -797,13 +797,12 @@ async fn sidecar_main(mut switch: Switch) -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::main(flavor = "multi_thread")]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
     let args = Args::from_args();
 
     match args {
         Args::Openapi => print_openapi(),
-        Args::Run(opt) => run_dpd(opt).await,
+        Args::Run(opt) => oxide_tokio_rt::run(run_dpd(opt)),
     }
 }
 

swadm/Cargo.toml

@@ -12,6 +12,7 @@ colored.workspace = true
 common.workspace = true
 dpd-client.workspace = true
 futures.workspace = true
+oxide-tokio-rt.workspace = true
 oxnet.workspace = true
 slog.workspace = true
 structopt.workspace = true

swadm/src/main.rs

@@ -170,8 +170,14 @@ async fn build_info(client: &Client) -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::main(flavor = "current_thread")]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
+    oxide_tokio_rt::run_builder(
+        &mut oxide_tokio_rt::Builder::new_current_thread(),
+        main_impl(),
+    )
+}
+
+async fn main_impl() -> anyhow::Result<()> {
     let opts = GlobalOpts::from_args();
     let port = opts.port.unwrap_or_else(default_port);
     let host = opts.host.unwrap_or_else(|| "localhost".to_string());

tfportd/Cargo.toml

@@ -32,6 +32,7 @@ tokio.workspace = true
 uuid.workspace = true
 
 omicron-common.workspace = true
+oxide-tokio-rt.workspace = true
 oximeter.workspace = true
 oximeter-instruments.workspace = true
 oximeter-producer.workspace = true

tfportd/src/main.rs

@@ -252,8 +252,11 @@ fn pcap_open(log: &slog::Logger, pkt_src: &str) -> anyhow::Result<pcap::Pcap> {
     Ok(pcap)
 }
 
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
+    oxide_tokio_rt::run(main_impl())
+}
+
+async fn main_impl() -> anyhow::Result<()> {
     let opts = Opt::from_args();
     let config = config::build_config(&opts)?;
 

uplinkd/Cargo.toml

@@ -10,6 +10,7 @@ common.workspace = true
 
 anyhow.workspace = true
 libc.workspace = true
+oxide-tokio-rt.workspace = true
 oxnet.workspace = true
 signal-hook.workspace = true
 slog.workspace = true

uplinkd/src/main.rs

@@ -564,8 +564,11 @@ fn handle_signals(log: slog::Logger, tx: mpsc::Sender<Messages>) {
     }
 }
 
-#[tokio::main]
-async fn main() -> anyhow::Result<()> {
+fn main() -> anyhow::Result<()> {
+    oxide_tokio_rt::run(main_impl())
+}
+
+async fn main_impl() -> anyhow::Result<()> {
     let opts = Opt::from_args();
 
     let mut global = Global {

xtask/src/main.rs

@@ -241,6 +241,11 @@ fn collect_binaries<T: ToString>(
     collect(src, dst, binaries)
 }
 
+#[expect(
+    clippy::disallowed_macros,
+    reason = "using `#[tokio::main]` in xtasks is fine, as they are not \
+     deployed in production"
+)]
 #[tokio::main]
 async fn main() {
     let task = Xtasks::from_args();