fix: adapt bottlecap to libdatadog v32.0.0 breaking changes

Adopts the new HttpClientTrait architecture from libdatadog v32.0.0
(PR DataDog/libdatadog#1555) and the restructured ObfuscationConfig.

- Wraps the proxy/TLS-aware hyper client in a struct that implements
  libdd_capabilities::HttpClientTrait so it can be passed to
  SendData::send and other libdd-trace-utils APIs.
- Replaces the removed stats_utils::send_stats_payload_with_client
  with an inline POST helper that reuses the configured client,
  preserving Lambda's pool_max_idle_per_host(0) tuning, proxy, and
  custom CA support.
- Updates obfuscation_config::ObfuscationConfig construction for the
  new nested HttpConfig/MemcachedConfig/RedisConfig layout.
- Adds libdd-capabilities and http as direct dependencies.

Author: duncanista

bottlecap/Cargo.lock

@@ -12,6 +12,7 @@ chrono = { version = "0.4", features = ["serde", "std", "now"], default-features
 cookie = { version = "0.18", default-features = false }
 figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
 fnv = { version = "1.0", default-features = false }
+http = { version = "1" }
 hyper = { version = "1.6", default-features = false, features = ["server"] }
 hyper-util = { version = "0.1.16", features = ["http1", "client", "client-legacy"] }
 http-body = { version = "1", default-features = false }
@@ -73,6 +74,7 @@ indexmap = {version = "2.11.0", default-features = false}
 # be found in the clippy.toml file adjacent to this Cargo.toml.
 datadog-protos = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
 ddsketch-agent = { version = "0.1.0", default-features = false, git = "https://github.com/DataDog/saluki/", rev = "f863626dbfe3c59bb390985fa6530b0621c2a0a2"}
+libdd-capabilities = { git = "https://github.com/DataDog/libdatadog", rev = "989e11a2bfe68ae669493d726262c424e2cc04a9" }
 libdd-common = { git = "https://github.com/DataDog/libdatadog", rev = "989e11a2bfe68ae669493d726262c424e2cc04a9" }
 libdd-trace-protobuf = { git = "https://github.com/DataDog/libdatadog", rev = "989e11a2bfe68ae669493d726262c424e2cc04a9"  }
 libdd-trace-utils = { git = "https://github.com/DataDog/libdatadog", rev = "989e11a2bfe68ae669493d726262c424e2cc04a9" , features = ["mini_agent"] }

bottlecap/Cargo.toml

@@ -19,6 +19,7 @@ bit-set,https://github.com/contain-rs/bit-set,Apache-2.0 OR MIT,Alexis Beingessn
 bit-vec,https://github.com/contain-rs/bit-vec,Apache-2.0 OR MIT,Alexis Beingessner <a.beingessner@gmail.com>
 bitflags,https://github.com/bitflags/bitflags,MIT OR Apache-2.0,The Rust Project Developers
 block-buffer,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
+borrow-or-share,https://github.com/yescallop/borrow-or-share,MIT-0,Scallop Ye <yescallop@gmail.com>
 buf_redux,https://github.com/abonander/buf_redux,MIT OR Apache-2.0,Austin Bonander <austin.bonander@gmail.com>
 bumpalo,https://github.com/fitzgen/bumpalo,MIT OR Apache-2.0,Nick Fitzgerald <fitzgen@gmail.com>
 bytemuck,https://github.com/Lokathor/bytemuck,Zlib OR Apache-2.0 OR MIT,Lokathor <zefria@gmail.com>
@@ -57,6 +58,7 @@ figment,https://github.com/SergioBenitez/Figment,MIT OR Apache-2.0,Sergio Benite
 find-msvc-tools,https://github.com/rust-lang/cc-rs,MIT OR Apache-2.0,The find-msvc-tools Authors
 flate2,https://github.com/rust-lang/flate2-rs,MIT OR Apache-2.0,"Alex Crichton <alex@alexcrichton.com>, Josh Triplett <josh@joshtriplett.org>"
 float-cmp,https://github.com/mikedilger/float-cmp,MIT,Mike Dilger <mike@mikedilger.com>
+fluent-uri,https://github.com/yescallop/fluent-uri-rs,MIT,Scallop Ye <yescallop@gmail.com>
 fnv,https://github.com/servo/rust-fnv,Apache-2.0  OR  MIT,Alex Crichton <alex@alexcrichton.com>
 foldhash,https://github.com/orlp/foldhash,Zlib,Orson Peters <orsonpeters@gmail.com>
 form_urlencoded,https://github.com/servo/rust-url,MIT OR Apache-2.0,The rust-url developers
@@ -109,10 +111,13 @@ js-sys,https://github.com/wasm-bindgen/wasm-bindgen/tree/master/crates/js-sys,MI
 lazy_static,https://github.com/rust-lang-nursery/lazy-static.rs,MIT OR Apache-2.0,Marvin Löbel <loebel.marvin@gmail.com>
 leb128fmt,https://github.com/bluk/leb128fmt,MIT OR Apache-2.0,Bryant Luk <code@bryantluk.com>
 libc,https://github.com/rust-lang/libc,MIT OR Apache-2.0,The Rust Project Developers
+libdd-capabilities,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities,Apache-2.0,The libdd-capabilities Authors
+libdd-capabilities-impl,https://github.com/DataDog/libdatadog/tree/main/libdd-capabilities-impl,Apache-2.0,The libdd-capabilities-impl Authors
 libdd-common,https://github.com/DataDog/libdatadog/tree/main/datadog-common,Apache-2.0,The libdd-common Authors
 libdd-data-pipeline,https://github.com/DataDog/libdatadog/tree/main/libdd-data-pipeline,Apache-2.0,The libdd-data-pipeline Authors
 libdd-ddsketch,https://github.com/DataDog/libdatadog/tree/main/libdd-ddsketch,Apache-2.0,The libdd-ddsketch Authors
 libdd-dogstatsd-client,https://github.com/DataDog/libdatadog/tree/main/libdd-dogstatsd-client,Apache-2.0,The libdd-dogstatsd-client Authors
+libdd-shared-runtime,https://github.com/DataDog/libdatadog/tree/main/libdd-shared-runtime,Apache-2.0,The libdd-shared-runtime Authors
 libdd-telemetry,https://github.com/DataDog/libdatadog/tree/main/libdd-telemetry,Apache-2.0,The libdd-telemetry Authors
 libdd-tinybytes,https://github.com/DataDog/libdatadog/tree/main/libdd-tinybytes,Apache-2.0,The libdd-tinybytes Authors
 libdd-trace-normalization,https://github.com/DataDog/libdatadog/tree/main/libdd-trace-normalization,Apache-2.0,David Lee <david.lee@datadoghq.com>
@@ -179,6 +184,8 @@ rand_chacha,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Proj
 rand_core,https://github.com/rust-random/rand,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers"
 rand_xorshift,https://github.com/rust-random/rngs,MIT OR Apache-2.0,"The Rand Project Developers, The Rust Project Developers"
 redox_syscall,https://gitlab.redox-os.org/redox-os/syscall,MIT,Jeremy Soller <jackpot51@gmail.com>
+ref-cast,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
+ref-cast-impl,https://github.com/dtolnay/ref-cast,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
 regex,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-automata,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"
 regex-syntax,https://github.com/rust-lang/regex,MIT OR Apache-2.0,"The Rust Project Developers, Andrew Gallant <jamslam@gmail.com>"

bottlecap/LICENSE-3rdparty.csv

@@ -1148,11 +1148,11 @@ fn start_trace_agent(
 
     let obfuscation_config = obfuscation_config::ObfuscationConfig {
         tag_replace_rules: config.apm_replace_tags.clone(),
-        http_remove_path_digits: config.apm_config_obfuscation_http_remove_paths_with_digits,
-        http_remove_query_string: config.apm_config_obfuscation_http_remove_query_string,
-        obfuscate_memcached: false,
-        obfuscation_redis_enabled: false,
-        obfuscation_redis_remove_all_args: false,
+        http: obfuscation_config::HttpConfig {
+            remove_paths_with_digits: config.apm_config_obfuscation_http_remove_paths_with_digits,
+            remove_query_string: config.apm_config_obfuscation_http_remove_query_string,
+        },
+        ..Default::default()
     };
 
     let trace_processor = Arc::new(trace_processor::ServerlessTraceProcessor {

bottlecap/src/bin/bottlecap/main.rs

@@ -6,23 +6,79 @@
 //! This module provides the HTTP client type required by `libdd_trace_utils`
 //! for sending traces and stats to Datadog intake endpoints.
 
+use http_body_util::BodyExt;
 use hyper_http_proxy;
 use hyper_rustls::HttpsConnectorBuilder;
-use libdd_common::{GenericHttpClient, http_common};
+use libdd_capabilities::{
+    MaybeSend,
+    http::{HttpClientTrait, HttpError},
+};
+use libdd_common::http_common::{self, Body, GenericHttpClient};
 use rustls::RootCertStore;
 use rustls_pki_types::CertificateDer;
 use std::error::Error;
 use std::fs::File;
+use std::future::Future;
 use std::io::BufReader;
 use std::sync::{Arc, LazyLock};
 use tracing::debug;
 
-/// Type alias for the HTTP client used by trace and stats flushers.
-///
-/// This is the client type expected by `libdd_trace_utils::SendData::send()`.
-pub type HttpClient =
+type InnerClient =
     GenericHttpClient<hyper_http_proxy::ProxyConnector<libdd_common::connector::Connector>>;
 
+/// HTTP client used by trace and stats flushers.
+///
+/// Wraps a hyper client preconfigured with optional proxy and TLS settings, and
+/// implements [`HttpClientTrait`] so it can be passed to `libdd_trace_utils`
+/// senders such as `SendData::send`.
+#[derive(Clone, Debug)]
+pub struct HttpClient {
+    inner: InnerClient,
+}
+
+impl HttpClient {
+    fn new(inner: InnerClient) -> Self {
+        Self { inner }
+    }
+}
+
+impl HttpClientTrait for HttpClient {
+    fn new_client() -> Self {
+        // Used by libdd APIs that construct a default client when no
+        // pre-configured one is supplied. Bottlecap's production code paths
+        // build the client via `create_client` so this fallback only matches
+        // libdatadog's `new_default_client` shape.
+        let connector = libdd_common::connector::Connector::default();
+        let proxy_connector = hyper_http_proxy::ProxyConnector::new(connector)
+            .expect("failed to build default proxy connector");
+        let inner = http_common::client_builder()
+            .pool_max_idle_per_host(0)
+            .build(proxy_connector);
+        HttpClient { inner }
+    }
+
+    fn request(
+        &self,
+        req: http::Request<bytes::Bytes>,
+    ) -> impl Future<Output = Result<http::Response<bytes::Bytes>, HttpError>> + MaybeSend {
+        let client = self.inner.clone();
+        async move {
+            let hyper_req = req.map(Body::from_bytes);
+            let response = client
+                .request(hyper_req)
+                .await
+                .map_err(|e| HttpError::Network(e.into()))?;
+            let (parts, body) = response.into_parts();
+            let collected = body
+                .collect()
+                .await
+                .map_err(|e| HttpError::ResponseBody(e.into()))?
+                .to_bytes();
+            Ok(http::Response::from_parts(parts, collected))
+        }
+    }
+}
+
 /// Initialize the crypto provider needed for setting custom root certificates.
 fn ensure_crypto_provider_initialized() {
     static INIT_CRYPTO_PROVIDER: LazyLock<()> = LazyLock::new(|| {
@@ -185,13 +241,15 @@ pub fn create_client(
             "HTTP_CLIENT | Proxy connector created with proxy: {:?}",
             proxy_https
         );
-        Ok(client)
+        Ok(HttpClient::new(client))
     } else {
         let proxy_connector = hyper_http_proxy::ProxyConnector::new(connector)?;
         // Disable connection pooling to avoid stale connections after Lambda freeze/resume.
         // See comment above for detailed explanation.
-        Ok(http_common::client_builder()
-            .pool_max_idle_per_host(0)
-            .build(proxy_connector))
+        Ok(HttpClient::new(
+            http_common::client_builder()
+                .pool_max_idle_per_host(0)
+                .build(proxy_connector),
+        ))
     }
 }

bottlecap/src/traces/http_client.rs

@@ -11,7 +11,9 @@ use crate::config;
 use crate::lifecycle::invocation::processor::S_TO_MS;
 use crate::traces::http_client::HttpClient;
 use crate::traces::stats_aggregator::StatsAggregator;
+use bytes::Bytes;
 use dogstatsd::api_key::ApiKeyFactory;
+use libdd_capabilities::http::HttpClientTrait;
 use libdd_common::Endpoint;
 use libdd_trace_protobuf::pb;
 use libdd_trace_utils::{config_utils::trace_stats_url, stats_utils};
@@ -96,11 +98,11 @@ impl StatsFlusher {
 
         for attempt in 1..=FLUSH_RETRY_COUNT {
             let start = std::time::Instant::now();
-            let resp = stats_utils::send_stats_payload_with_client(
-                serialized_stats_payload.clone(),
+            let resp = send_stats_payload(
+                &self.http_client,
                 endpoint,
                 api_key.as_str(),
-                Some(&self.http_client),
+                serialized_stats_payload.clone(),
             )
             .await;
             let elapsed = start.elapsed();
@@ -167,3 +169,33 @@ impl StatsFlusher {
         }
     }
 }
+
+/// Posts a serialized stats payload using the supplied client.
+///
+/// Equivalent to libdatadog's `stats_utils::send_stats_payload`, but uses the
+/// caller-provided client so bottlecap's proxy/TLS configuration is preserved.
+async fn send_stats_payload(
+    client: &HttpClient,
+    target: &Endpoint,
+    api_key: &str,
+    data: Vec<u8>,
+) -> anyhow::Result<()> {
+    let req = http::Request::builder()
+        .method(http::Method::POST)
+        .uri(target.url.clone())
+        .header("Content-Type", "application/msgpack")
+        .header("Content-Encoding", "gzip")
+        .header("DD-API-KEY", api_key)
+        .body(Bytes::from(data))?;
+
+    let response = client
+        .request(req)
+        .await
+        .map_err(|e| anyhow::anyhow!("Failed to send trace stats: {e}"))?;
+
+    if response.status() != http::StatusCode::ACCEPTED {
+        let response_body = String::from_utf8(response.into_body().to_vec()).unwrap_or_default();
+        anyhow::bail!("Server did not accept trace stats: {response_body}");
+    }
+    Ok(())
+}