chore: use the new datadog-serverless-fips crate

Author: apiarian-datadog

bottlecap/Cargo.lock

@@ -17,6 +17,7 @@ datadog-trace-normalization = { git = "https://github.com/DataDog/libdatadog",
 datadog-trace-obfuscation = { git = "https://github.com/DataDog/libdatadog", rev = "d6a2da32c6b92d6865a7e7987c8a1df2203fb1ae"  }
 dogstatsd = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection", default-features = false }
 datadog-trace-agent = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection" }
+datadog-serverless-fips = { git = "https://github.com/DataDog/serverless-components", branch = "aleksandr.pasechnik/svls-6242-reqwest-fips-tls-injection", default-features = false }
 figment = { version = "0.10", default-features = false, features = ["yaml", "env"] }
 hyper = { version = "1.6", default-features = false, features = ["server"] }
 hyper-util = { version = "0.1.10", features = [
@@ -80,11 +81,12 @@ inherits = "release"
 opt-level = 3
 
 [features]
-default = ["reqwest/rustls-tls", "dogstatsd/default"]
+default = ["reqwest/rustls-tls", "dogstatsd/default", "datadog-serverless-fips/default" ]
 fips = [
     "ddcommon/fips",
     "datadog-trace-utils/fips",
     "dogstatsd/fips",
+    "datadog-serverless-fips/fips",
     "reqwest/rustls-tls-native-roots-no-provider",
     "rustls/fips",
     "rustls-native-certs",

bottlecap/Cargo.toml

@@ -18,7 +18,6 @@ use bottlecap::{
     },
     event_bus::bus::EventBus,
     events::Event,
-    fips::create_reqwest_client_builder,
     lifecycle::{
         flush_control::FlushControl, invocation::processor::Processor as InvocationProcessor,
         listener::Listener as LifecycleListener,
@@ -48,6 +47,7 @@ use bottlecap::{
     EXTENSION_ID_HEADER, EXTENSION_NAME, EXTENSION_NAME_HEADER, EXTENSION_ROUTE,
     LAMBDA_RUNTIME_SLUG, TELEMETRY_PORT,
 };
+use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
 use datadog_trace_obfuscation::obfuscation_config;
 use datadog_trace_utils::send_data::SendData;
 use decrypt::resolve_secrets;

bottlecap/src/bin/bottlecap/main.rs

@@ -1,6 +1,6 @@
 use crate::config;
-use crate::fips::create_reqwest_client_builder;
 use core::time::Duration;
+use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
 use std::error::Error;
 use std::sync::Arc;
 use tracing::error;

bottlecap/src/fips.rs

@@ -20,7 +20,6 @@
 pub mod config;
 pub mod event_bus;
 pub mod events;
-pub mod fips;
 pub mod http_client;
 pub mod lifecycle;
 pub mod logger;

bottlecap/src/http_client.rs

@@ -1,7 +1,7 @@
 use crate::config::{aws::AwsConfig, Config};
-use crate::fips::create_reqwest_client_builder;
 use base64::prelude::*;
 use chrono::{DateTime, Utc};
+use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
 use hmac::{Hmac, Mac};
 use reqwest::header::{HeaderMap, HeaderValue};
 use reqwest::Client;

bottlecap/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::fips::create_reqwest_client_builder;
+use datadog_serverless_fips::reqwest_adapter::create_reqwest_client_builder;
 use reqwest::Response;
 use serde_json;
 use std::error::Error;