chore(antithesis): Migrate Antithesis SDK to saluki-antithesis

We've found the bare SDK use to be untidy. This commit attempts to
tidy up the use of the Antithesis SDK by hiding behind a macro which

* takes care of the cfg flagging on/off
* does not expose the need for serde_json
* remains no-op

Author: blt

Cargo.lock

@@ -18,6 +18,7 @@ members = [
   "lib/protos/datadog",
   "lib/protos/otlp",
   "lib/resource-accounting",
+  "lib/saluki-antithesis",
   "lib/saluki-api",
   "lib/saluki-app",
   "lib/saluki-common",
@@ -54,6 +55,7 @@ ddsketch = { path = "lib/ddsketch" }
 resource-accounting = { path = "lib/resource-accounting" }
 process-memory = { path = "lib/process-memory" }
 prometheus-exposition = { path = "lib/prometheus-exposition" }
+saluki-antithesis = { path = "lib/saluki-antithesis" }
 saluki-api = { path = "lib/saluki-api" }
 saluki-app = { path = "lib/saluki-app" }
 saluki-common = { path = "lib/saluki-common" }

Cargo.toml

@@ -11,11 +11,10 @@ workspace = true
 [features]
 default = []
 fips = ["saluki-app/tls-fips", "saluki-components/fips"]
-antithesis = ["dep:antithesis_sdk", "antithesis_sdk/full", "dep:antithesis-instrumentation", "saluki-components/antithesis"]
+antithesis = ["saluki-antithesis/antithesis", "dep:antithesis-instrumentation"]
 
 [dependencies]
 antithesis-instrumentation = { workspace = true, optional = true }
-antithesis_sdk = { workspace = true, optional = true }
 argh = { workspace = true, features = ["help"] }
 async-trait = { workspace = true }
 bytesize = { workspace = true }
@@ -36,6 +35,7 @@ ottl = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
 resource-accounting = { workspace = true }
+saluki-antithesis = { workspace = true }
 saluki-api = { workspace = true }
 saluki-app = { workspace = true }
 saluki-common = { workspace = true }

bin/agent-data-plane/Cargo.toml

@@ -88,8 +88,7 @@ async fn main() -> Result<(), GenericError> {
 
     // Bootstrap-integration probe: proves the Antithesis SDK is linked, cataloging works, and the
     // instrumentation path is wired.
-    #[cfg(feature = "antithesis")]
-    antithesis_sdk::assert_reachable!("agent-data-plane completed bootstrap", &serde_json::json!({}));
+    saluki_antithesis::reachable!("agent-data-plane completed bootstrap");
 
     // Run the given subcommand. The bootstrap supervisor is forwarded by value; only the long-lived `run`
     // subcommand actually drives it (it is added as a child of the internal supervisor inside
@@ -118,7 +117,7 @@ async fn main() -> Result<(), GenericError> {
 /// ideally before any panics are possible.
 #[cfg(feature = "antithesis")]
 fn initialize_antithesis() {
-    antithesis_sdk::antithesis_init();
+    saluki_antithesis::init();
 
     let default_hook = std::panic::take_hook();
     std::panic::set_hook(Box::new(move |info| {
@@ -129,9 +128,9 @@ fn initialize_antithesis() {
             .map(|s| (*s).to_string())
             .or_else(|| payload.downcast_ref::<String>().cloned())
             .unwrap_or_else(|| "<non-string panic payload>".to_string());
-        antithesis_sdk::assert_unreachable!(
+        saluki_antithesis::unreachable!(
             "agent-data-plane panicked",
-            &serde_json::json!({ "message": message, "location": location })
+            { "message": message, "location": location }
         );
         default_hook(info);
     }));
@@ -151,11 +150,10 @@ fn load_bootstrap_config(bootstrap_config_path: &Path) -> Result<ConfigurationLo
                 .error_context("Environment variable prefix should not be empty.")
         });
     // A graceful config rejection exits 1 rather than crashing; classify that against a clean boot.
-    #[cfg(feature = "antithesis")]
-    antithesis_sdk::assert_always_or_unreachable!(
+    saluki_antithesis::always_or_unreachable!(
         loaded.is_ok(),
         "agent-data-plane boots under sampled config",
-        &serde_json::json!({ "phase": "config_load", "error": loaded.as_ref().err().map(|e| format!("{e:?}")) })
+        { "phase": "config_load", "error": loaded.as_ref().err().map(|e| format!("{e:?}")) }
     );
     loaded
 }
@@ -196,11 +194,10 @@ async fn run_inner(
                     Err(e) => {
                         error!("{:?}", e);
                         // Same boot property as the config-load gate, distinguished by `phase` in the details.
-                        #[cfg(feature = "antithesis")]
-                        antithesis_sdk::assert_always_or_unreachable!(
+                        saluki_antithesis::always_or_unreachable!(
                             false,
                             "agent-data-plane boots under sampled config",
-                            &serde_json::json!({ "phase": "run_setup", "error": format!("{e:?}") })
+                            { "phase": "run_setup", "error": format!("{e:?}") }
                         );
                         Some(1)
                     }

bin/agent-data-plane/src/main.rs

@@ -9,16 +9,15 @@ repository = { workspace = true }
 workspace = true
 
 [features]
-antithesis = ["dep:antithesis_sdk", "antithesis_sdk/full"]
 ddsketch_extended = []
 serde = ["dep:serde", "smallvec/serde"]
 
 [dependencies]
-antithesis_sdk = { workspace = true, optional = true }
 datadog-protos = { workspace = true }
 float-cmp = { workspace = true, features = ["ratio"] }
 ordered-float = { workspace = true }
 protobuf = { workspace = true }
+saluki-antithesis = { workspace = true }
 serde = { workspace = true, optional = true }
 smallvec = { workspace = true, features = ["union"] }
 

lib/ddsketch/Cargo.toml

@@ -188,8 +188,7 @@ impl DDSketch {
     fn adjust_basic_stats(&mut self, v: f64, n: u64) {
         // Every insert path funnels through here, so this is where we guard that the incoming sample is finite. If
         // this is not true something has gone wrong with the DogStatsD codec.
-        #[cfg(feature = "antithesis")]
-        antithesis_sdk::assert_always!(v.is_finite(), "DDSketch sample is finite at insert");
+        saluki_antithesis::always!(v.is_finite(), "DDSketch sample is finite at insert");
 
         if v < self.min {
             self.min = v;
@@ -722,15 +721,8 @@ fn trim_left(bins: &mut SmallVec<[Bin; 4]>, bin_limit: u16) {
 
     // This is the one place every mutating method routes through, so asserting here guards the bin-count bound for
     // all of them.
-    #[cfg(feature = "antithesis")]
-    {
-        antithesis_sdk::assert_reachable!("DDSketch bin collapse reached");
-        antithesis_sdk::assert_always_less_than_or_equal_to!(
-            bins.len(),
-            bin_limit,
-            "DDSketch bin count within bin_limit"
-        );
-    }
+    saluki_antithesis::reachable!("DDSketch bin collapse reached");
+    saluki_antithesis::always_le!(bins.len(), bin_limit, "DDSketch bin count within bin_limit");
 }
 
 #[allow(clippy::cast_possible_truncation)]

lib/ddsketch/src/agent/sketch.rs

@@ -0,0 +1,16 @@
+[package]
+name = "saluki-antithesis"
+version = "0.1.0"
+edition = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+[lints]
+workspace = true
+
+[features]
+antithesis = ["dep:antithesis_sdk", "antithesis_sdk/full", "dep:serde_json"]
+
+[dependencies]
+antithesis_sdk = { workspace = true, optional = true }
+serde_json = { workspace = true, optional = true }