Rename: ssl_ca_cert -> tls_ca_cert

Author: lym953

bottlecap/src/config/env.rs

@@ -75,11 +75,11 @@ pub struct EnvConfig {
     /// The transport type to use for sending logs. Possible values are "auto" or "http1".
     #[serde(deserialize_with = "deserialize_optional_string")]
     pub http_protocol: Option<String>,
-    /// @env `DD_SSL_CA_CERT`
-    /// The SSL CA certificate path to use for the Datadog Agent.
+    /// @env `DD_CLS_CA_CERT`
+    /// The path to a file of concatenated CA certificates in PEM format.
     /// Example: `/opt/ca-cert.pem`
     #[serde(deserialize_with = "deserialize_optional_string")]
-    pub ssl_ca_cert: Option<String>,
+    pub cls_ca_cert: Option<String>,
 
     // Metrics
     /// @env `DD_DD_URL`
@@ -471,7 +471,7 @@ fn merge_config(config: &mut Config, env_config: &EnvConfig) {
     merge_option!(config, env_config, proxy_https);
     merge_vec!(config, env_config, proxy_no_proxy);
     merge_option!(config, env_config, http_protocol);
-    merge_option!(config, env_config, ssl_ca_cert);
+    merge_option!(config, env_config, cls_ca_cert);
 
     // Endpoints
     merge_string!(config, env_config, dd_url);
@@ -701,7 +701,7 @@ mod tests {
             jail.set_env("DD_PROXY_HTTPS", "https://proxy.example.com");
             jail.set_env("DD_PROXY_NO_PROXY", "localhost,127.0.0.1");
             jail.set_env("DD_HTTP_PROTOCOL", "http1");
-            jail.set_env("DD_SSL_CA_CERT", "/opt/ca-cert.pem");
+            jail.set_env("DD_CLS_CA_CERT", "/opt/ca-cert.pem");
 
             // Metrics
             jail.set_env("DD_DD_URL", "https://metrics.datadoghq.com");
@@ -857,7 +857,7 @@ mod tests {
                 proxy_https: Some("https://proxy.example.com".to_string()),
                 proxy_no_proxy: vec!["localhost".to_string(), "127.0.0.1".to_string()],
                 http_protocol: Some("http1".to_string()),
-                ssl_ca_cert: Some("/opt/ca-cert.pem".to_string()),
+                cls_ca_cert: Some("/opt/ca-cert.pem".to_string()),
                 dd_url: "https://metrics.datadoghq.com".to_string(),
                 url: "https://app.datadoghq.com".to_string(),
                 additional_endpoints: HashMap::from([

bottlecap/src/config/mod.rs

@@ -252,7 +252,7 @@ pub struct Config {
     pub proxy_https: Option<String>,
     pub proxy_no_proxy: Vec<String>,
     pub http_protocol: Option<String>,
-    pub ssl_ca_cert: Option<String>,
+    pub cls_ca_cert: Option<String>,
 
     // Endpoints
     pub dd_url: String,
@@ -367,7 +367,7 @@ impl Default for Config {
             proxy_https: None,
             proxy_no_proxy: vec![],
             http_protocol: None,
-            ssl_ca_cert: None,
+            cls_ca_cert: None,
 
             // Endpoints
             dd_url: String::default(),

bottlecap/src/config/yaml.rs

@@ -54,7 +54,7 @@ pub struct YamlConfig {
     #[serde(deserialize_with = "deserialize_optional_string")]
     pub http_protocol: Option<String>,
     #[serde(deserialize_with = "deserialize_optional_string")]
-    pub ssl_ca_cert: Option<String>,
+    pub cls_ca_cert: Option<String>,
 
     // Endpoints
     #[serde(deserialize_with = "deserialize_additional_endpoints")]
@@ -419,7 +419,7 @@ fn merge_config(config: &mut Config, yaml_config: &YamlConfig) {
     merge_option!(config, proxy_https, yaml_config.proxy, https);
     merge_option_to_value!(config, proxy_no_proxy, yaml_config.proxy, no_proxy);
     merge_option!(config, yaml_config, http_protocol);
-    merge_option!(config, yaml_config, ssl_ca_cert);
+    merge_option!(config, yaml_config, cls_ca_cert);
 
     // Endpoints
     merge_hashmap!(config, yaml_config, additional_endpoints);
@@ -750,7 +750,7 @@ proxy:
   no_proxy: ["localhost", "127.0.0.1"]
 dd_url: "https://metrics.datadoghq.com"
 http_protocol: "http1"
-ssl_ca_cert: "/opt/ca-cert.pem"
+cls_ca_cert: "/opt/ca-cert.pem"
 
 # Endpoints
 additional_endpoints:
@@ -886,7 +886,7 @@ api_security_sample_delay: 60 # Seconds
                 proxy_https: Some("https://proxy.example.com".to_string()),
                 proxy_no_proxy: vec!["localhost".to_string(), "127.0.0.1".to_string()],
                 http_protocol: Some("http1".to_string()),
-                ssl_ca_cert: Some("/opt/ca-cert.pem".to_string()),
+                cls_ca_cert: Some("/opt/ca-cert.pem".to_string()),
                 dd_url: "https://metrics.datadoghq.com".to_string(),
                 url: String::new(), // doesnt exist in yaml
                 additional_endpoints: HashMap::from([

bottlecap/src/traces/stats_flusher.rs

@@ -104,7 +104,7 @@ impl StatsFlusher for ServerlessStatsFlusher {
 
         let Ok(http_client) = ServerlessTraceFlusher::get_http_client(
             self.config.proxy_https.as_ref(),
-            self.config.ssl_ca_cert.as_ref(),
+            self.config.cls_ca_cert.as_ref(),
         ) else {
             error!("STATS_FLUSHER | Failed to create HTTP client");
             return;

bottlecap/src/traces/trace_flusher.rs

@@ -41,7 +41,7 @@ pub trait TraceFlusher {
         traces: Vec<SendData>,
         endpoint: Option<&Endpoint>,
         proxy_https: &Option<String>,
-        ssl_ca_cert: &Option<String>,
+        cls_ca_cert: &Option<String>,
     ) -> Option<Vec<SendData>>;
 
     /// Flushes traces by getting every available batch on the aggregator.
@@ -115,7 +115,7 @@ impl TraceFlusher for ServerlessTraceFlusher {
                     traces,
                     None,
                     &self.config.proxy_https,
-                    &self.config.ssl_ca_cert,
+                    &self.config.cls_ca_cert,
                 )
                 .await;
                 if retry_result.is_some() {
@@ -144,17 +144,17 @@ impl TraceFlusher for ServerlessTraceFlusher {
 
             let traces_clone = traces.clone();
             let proxy_https = self.config.proxy_https.clone();
-            let ssl_ca_cert = self.config.ssl_ca_cert.clone();
+            let cls_ca_cert = self.config.cls_ca_cert.clone();
             batch_tasks.spawn(async move {
-                Self::send(traces_clone, None, &proxy_https, &ssl_ca_cert).await
+                Self::send(traces_clone, None, &proxy_https, &cls_ca_cert).await
             });
 
             for endpoint in self.additional_endpoints.clone() {
                 let traces_clone = traces.clone();
                 let proxy_https = self.config.proxy_https.clone();
-                let ssl_ca_cert = self.config.ssl_ca_cert.clone();
+                let cls_ca_cert = self.config.cls_ca_cert.clone();
                 batch_tasks.spawn(async move {
-                    Self::send(traces_clone, Some(&endpoint), &proxy_https, &ssl_ca_cert).await
+                    Self::send(traces_clone, Some(&endpoint), &proxy_https, &cls_ca_cert).await
                 });
             }
         }
@@ -175,7 +175,7 @@ impl TraceFlusher for ServerlessTraceFlusher {
         traces: Vec<SendData>,
         endpoint: Option<&Endpoint>,
         proxy_https: &Option<String>,
-        ssl_ca_cert: &Option<String>,
+        cls_ca_cert: &Option<String>,
     ) -> Option<Vec<SendData>> {
         if traces.is_empty() {
             return None;
@@ -186,7 +186,7 @@ impl TraceFlusher for ServerlessTraceFlusher {
         debug!("TRACES | Flushing {} traces", coalesced_traces.len());
 
         let Ok(http_client) =
-            ServerlessTraceFlusher::get_http_client(proxy_https.as_ref(), ssl_ca_cert.as_ref())
+            ServerlessTraceFlusher::get_http_client(proxy_https.as_ref(), cls_ca_cert.as_ref())
         else {
             error!("TRACES | Failed to create HTTP client");
             return None;
@@ -227,13 +227,13 @@ fn ensure_crypto_provider_initialized() {
 impl ServerlessTraceFlusher {
     pub fn get_http_client(
         proxy_https: Option<&String>,
-        ssl_ca_cert: Option<&String>,
+        cls_ca_cert: Option<&String>,
     ) -> Result<
         GenericHttpClient<hyper_http_proxy::ProxyConnector<libdd_common::connector::Connector>>,
         Box<dyn Error>,
     > {
         // Create the base connector with optional custom TLS config
-        let connector = if let Some(ca_cert_path) = ssl_ca_cert {
+        let connector = if let Some(ca_cert_path) = cls_ca_cert {
             // Ensure crypto provider is initialized before creating TLS config
             ensure_crypto_provider_initialized();