feat(obfuscation)!: feature parity on span obfuscation [APMSP-2671] (#1788)

# What does this PR do?

Integrate the work that has been done on specific string obfuscation (sql, redis, json, etc...) in `obfuscate_span` which is the high level function that can be used externally.

# Motivation

Reach 100% parity between obfuscation libs.

# Additional Notes

Anything else we should know when reviewing?

# How to test the change?

- [x] Add tests from parity checker

Co-authored-by: oscar.ledauphin <oscar.ledauphin@datadoghq.com>

Author: Eldolfin

Cargo.lock

@@ -5024,7 +5024,7 @@ third_party_libraries:
       IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
       DEALINGS IN THE SOFTWARE.
 - package_name: bolero
-  package_version: 0.13.0
+  package_version: 0.13.4
   repository: https://github.com/camshaft/bolero
   license: MIT
   licenses:
@@ -5038,21 +5038,21 @@ third_party_libraries:
   - license: MIT
     text: NOT FOUND
 - package_name: bolero-engine
-  package_version: 0.13.0
+  package_version: 0.13.4
   repository: https://github.com/camshaft/bolero
   license: MIT
   licenses:
   - license: MIT
     text: NOT FOUND
 - package_name: bolero-generator
-  package_version: 0.13.1
+  package_version: 0.13.5
   repository: https://github.com/camshaft/bolero
   license: MIT
   licenses:
   - license: MIT
     text: NOT FOUND
 - package_name: bolero-generator-derive
-  package_version: 0.13.0
+  package_version: 0.13.4
   repository: https://github.com/camshaft/bolero
   license: MIT
   licenses:
@@ -30600,9 +30600,9 @@ third_party_libraries:
 - package_name: stringmetrics
   package_version: 2.2.2
   repository: https://github.com/pluots/stringmetrics
-  license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
+  license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
   licenses:
-  - license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-6f17d22bba15001f/stringmetrics-2.2.2/LICENSE)
+  - license: License specified in file ($CARGO_HOME/registry/src/index.crates.io-1949cf8c6b5b557f/stringmetrics-2.2.2/LICENSE)
     text: |
       Copyright 2022 Trevor Gross
 

LICENSE-3rdparty.yml

@@ -1,11 +1,8 @@
 // Copyright 2026-Present Datadog, Inc. https://www.datadoghq.com/
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::HashSet;
-
 use crate::json_scanner::{Op, Scanner};
-
-type Transformer = Box<dyn Fn(&str) -> String + Send + Sync>;
+use crate::obfuscation_config::{JsonObfuscatorConfig, JsonStringTransformer};
 
 /// Obfuscates a JSON string by replacing all leaf values with `"?"`, unless the value
 /// belongs to a key listed in `keep_keys`, in which case it is left verbatim.
@@ -15,9 +12,7 @@ type Transformer = Box<dyn Fn(&str) -> String + Send + Sync>;
 /// Multiple concatenated JSON objects in the input are each obfuscated independently.
 /// On a parse error the output so far is returned with `"..."` appended.
 pub struct JsonObfuscator {
-    keep_keys: HashSet<String>,
-    transform_keys: HashSet<String>,
-    transformer: Option<Transformer>,
+    config: JsonObfuscatorConfig,
 }
 
 enum ClosureKind {
@@ -26,16 +21,8 @@ enum ClosureKind {
 }
 
 impl JsonObfuscator {
-    pub fn new(
-        keep_keys: impl IntoIterator<Item = String>,
-        transform_keys: impl IntoIterator<Item = String>,
-        transformer: Option<Transformer>,
-    ) -> Self {
-        Self {
-            keep_keys: keep_keys.into_iter().collect(),
-            transform_keys: transform_keys.into_iter().collect(),
-            transformer,
-        }
+    pub fn new(config: JsonObfuscatorConfig) -> Self {
+        Self { config }
     }
 
     /// Obfuscates json string and return an optional error on malformatted json
@@ -80,7 +67,7 @@ impl JsonObfuscator {
                         &mut transforming_value,
                         &mut keep_depth,
                         depth,
-                        self.transformer.as_deref(),
+                        self.config.transformer.as_ref(),
                     );
                 }
                 Op::ObjectValue | Op::ArrayValue => {
@@ -92,7 +79,7 @@ impl JsonObfuscator {
                         &mut transforming_value,
                         &mut keep_depth,
                         depth,
-                        self.transformer.as_deref(),
+                        self.config.transformer.as_ref(),
                     );
                 }
                 Op::BeginLiteral | Op::Continue => {
@@ -111,12 +98,12 @@ impl JsonObfuscator {
                 }
                 Op::ObjectKey => {
                     let k = buf.trim_matches('"');
-                    if !keeping && self.keep_keys.contains(k) {
+                    if !keeping && self.config.keep_keys.contains(k) {
                         keeping = true;
                         keep_depth = depth + 1;
                     } else if !transforming_value
-                        && self.transformer.is_some()
-                        && self.transform_keys.contains(k)
+                        && self.config.transformer.is_some()
+                        && self.config.transform_keys.contains(k)
                     {
                         transforming_value = true;
                     }
@@ -158,7 +145,7 @@ fn handle_value_done(
     transforming_value: &mut bool,
     keep_depth: &mut usize,
     depth: usize,
-    transformer: Option<&(dyn Fn(&str) -> String + Send + Sync)>,
+    transformer: Option<&JsonStringTransformer>,
 ) {
     if *transforming_value {
         if let Some(t) = transformer {
@@ -183,18 +170,23 @@ mod tests {
     use serde_json::json;
 
     use super::JsonObfuscator;
-    use crate::sql::obfuscate_sql_string;
+    use crate::{obfuscation_config::JsonObfuscatorConfig, sql::obfuscate_sql_string};
 
     fn obf(keep_keys: &[&str]) -> JsonObfuscator {
-        JsonObfuscator::new(keep_keys.iter().map(|s| s.to_string()), [], None)
+        JsonObfuscator::new(JsonObfuscatorConfig {
+            enabled: true,
+            keep_keys: keep_keys.iter().map(|key| key.to_string()).collect(),
+            ..Default::default()
+        })
     }
 
     fn obf_sql(keep_keys: &[&str], transform_keys: &[&str]) -> JsonObfuscator {
-        JsonObfuscator::new(
-            keep_keys.iter().map(|s| s.to_string()),
-            transform_keys.iter().map(|s| s.to_string()),
-            Some(Box::new(obfuscate_sql_string)),
-        )
+        JsonObfuscator::new(JsonObfuscatorConfig {
+            enabled: true,
+            keep_keys: keep_keys.iter().map(|s| s.to_string()).collect(),
+            transform_keys: transform_keys.iter().map(|s| s.to_string()).collect(),
+            transformer: Some(obfuscate_sql_string),
+        })
     }
 
     fn assert_json_eq(result: &str, expected: &str) {