Use extracted fork

Cargo.toml

@@ -1,15 +1,14 @@
 [workspace]
 members = [
   "dropshot-authorization-header",
+  "parse-rfd",
   "rfd-api",
   "rfd-cli",
   "rfd-data",
   "rfd-model",
   "rfd-processor",
   "rfd-redirect",
   "rfd-sdk",
-  "parse-rfd",
-  "slog-tracing-bridge",
   "trace-request",
   "xtask"
 ]
@@ -69,7 +68,7 @@ tokio = "1.25.0"
 toml = "0.5.10"
 tracing = "0.1.37"
 tracing-core = "0.1.30"
-tracing-slog = "0.2.0"
+tracing-slog = { git = "https://github.com/oxidecomputer/tracing-slog" }
 tracing-subscriber = "0.3.16"
 uuid = "1.2.2"
 valuable = "0.1.0"

rfd-api/Cargo.toml

@@ -36,13 +36,13 @@ serde_json = { workspace = true }
 serde_urlencoded = { workspace = true }
 slog = { workspace = true }
 slog-async = { workspace = true }
-slog-tracing-bridge = { path = "../slog-tracing-bridge" }
 tap = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 toml = { workspace = true }
 trace-request = { path = "../trace-request" }
 tracing = { workspace = true }
+tracing-slog = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "json"] }
 uuid = { workspace = true, features = ["v4", "serde"]  }
 yup-oauth2 = { workspace = true }

rfd-api/src/server.rs

@@ -1,7 +1,7 @@
 use dropshot::{ApiDescription, ConfigDropshot, EndpointTagPolicy, HttpServerStarter, TagConfig, TagDetails};
 use serde::Deserialize;
 use slog::Drain;
-use slog_tracing_bridge::BridgeDrain;
+use tracing_slog::TracingSlogDrain;
 use std::{error::Error, fs::File, net::SocketAddr, path::PathBuf, collections::HashMap};
 
 use crate::{
@@ -44,7 +44,7 @@ pub fn server(
 
     // Construct a shim to pipe dropshot logs into the global tracing logger
     let dropshot_logger = {
-        let level_drain = slog::LevelFilter(BridgeDrain, slog::Level::Debug).fuse();
+        let level_drain = slog::LevelFilter(TracingSlogDrain, slog::Level::Debug).fuse();
         let async_drain = slog_async::Async::new(level_drain).build().fuse();
         slog::Logger::root(async_drain, slog::o!())
     };

rfd-redirect/Cargo.toml

@@ -14,8 +14,8 @@ schemars = { workspace = true }
 serde = { workspace = true }
 slog = { workspace = true }
 slog-async = { workspace = true }
-slog-tracing-bridge = { path = "../slog-tracing-bridge" }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
 thiserror = { workspace = true }
 tracing = { workspace = true }
+tracing-slog = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt", "json"] }

rfd-redirect/src/server.rs

@@ -1,6 +1,6 @@
 use dropshot::{ApiDescription, ConfigDropshot, EndpointTagPolicy, HttpServerStarter, TagConfig};
 use slog::Drain;
-use slog_tracing_bridge::BridgeDrain;
+use tracing_slog::TracingSlogDrain;
 use std::{error::Error, net::SocketAddr};
 
 use crate::{
@@ -21,7 +21,7 @@ pub fn server(
 
     // Construct a shim to pipe dropshot logs into the global tracing logger
     let dropshot_logger = {
-        let level_drain = slog::LevelFilter(BridgeDrain, slog::Level::Debug).fuse();
+        let level_drain = slog::LevelFilter(TracingSlogDrain, slog::Level::Debug).fuse();
         let async_drain = slog_async::Async::new(level_drain).build().fuse();
         slog::Logger::root(async_drain, slog::o!())
     };