Http url string obfuscation (#228)

Author: thedavl

src/config.rs

@@ -2,12 +2,11 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2023-Present Datadog, Inc.
 
 use ddcommon::Endpoint;
-use log::{debug, error};
 use std::borrow::Cow;
 use std::env;
 use std::str::FromStr;
 
-use datadog_trace_obfuscation::replacer::{self, ReplaceRule};
+use datadog_trace_obfuscation::obfuscation_config;
 use datadog_trace_utils::config_utils::{
     read_cloud_env, trace_intake_url, trace_intake_url_prefixed, trace_stats_url,
     trace_stats_url_prefixed,
@@ -29,7 +28,7 @@ pub struct Config {
     pub trace_intake: Endpoint,
     pub trace_stats_intake: Endpoint,
     pub dd_site: String,
-    pub tag_replace_rules: Option<Vec<ReplaceRule>>,
+    pub obfuscation_config: obfuscation_config::ObfuscationConfig,
 }
 
 impl Config {
@@ -55,19 +54,11 @@ impl Config {
             trace_stats_intake_url = trace_stats_url_prefixed(&endpoint_prefix);
         };
 
-        let tag_replace_rules: Option<Vec<ReplaceRule>> = match env::var("DD_APM_REPLACE_TAGS") {
-            Ok(replace_rules_str) => match replacer::parse_rules_from_string(&replace_rules_str) {
-                Ok(res) => {
-                    debug!("Successfully parsed DD_APM_REPLACE_TAGS: {res:?}");
-                    Some(res)
-                }
-                Err(e) => {
-                    error!("Failed to parse DD_APM_REPLACE_TAGS: {e}");
-                    None
-                }
-            },
-            Err(_) => None,
-        };
+        let obfuscation_config = obfuscation_config::ObfuscationConfig::new().map_err(|err| {
+            anyhow::anyhow!(
+                "Error creating obfuscation config, Mini Agent will not start. Error: {err}",
+            )
+        })?;
 
         Ok(Config {
             function_name: Some(function_name),
@@ -86,7 +77,7 @@ impl Config {
                 url: hyper::Uri::from_str(&trace_stats_intake_url).unwrap(),
                 api_key: Some(api_key),
             },
-            tag_replace_rules,
+            obfuscation_config,
         })
     }
 }

src/trace_processor.rs

@@ -8,7 +8,7 @@ use hyper::{http, Body, Request, Response, StatusCode};
 use log::info;
 use tokio::sync::mpsc::Sender;
 
-use datadog_trace_obfuscation::replacer;
+use datadog_trace_obfuscation::obfuscate::obfuscate_span;
 use datadog_trace_utils::trace_utils;
 use datadog_trace_utils::trace_utils::SendData;
 
@@ -76,10 +76,7 @@ impl TraceProcessor for ServerlessTraceProcessor {
                 );
                 for span in chunk.spans.iter_mut() {
                     trace_utils::enrich_span_with_mini_agent_metadata(span, &mini_agent_metadata);
-                }
-
-                if let Some(rules) = &config.tag_replace_rules {
-                    replacer::replace_trace_tags(&mut chunk.spans, rules)
+                    obfuscate_span(span, &config.obfuscation_config);
                 }
             },
         );
@@ -106,6 +103,7 @@ impl TraceProcessor for ServerlessTraceProcessor {
 
 #[cfg(test)]
 mod tests {
+    use datadog_trace_obfuscation::obfuscation_config::ObfuscationConfig;
     use hyper::Request;
     use std::{
         collections::HashMap,
@@ -150,7 +148,7 @@ mod tests {
             dd_site: "datadoghq.com".to_string(),
             env_type: trace_utils::EnvironmentType::CloudFunction,
             os: "linux".to_string(),
-            tag_replace_rules: None,
+            obfuscation_config: ObfuscationConfig::new().unwrap(),
         }
     }