Merge branch 'main' into aj/proxy-configs-yaml

DataDog · Jan 24, 2025 · 3b05823 · 3b05823
2 parents e17df51 + fff85cc
commit 3b05823
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/bottlecap/src/config/mod.rs b/bottlecap/src/config/mod.rs
@@ -14,6 +14,7 @@ use figment::{providers::Env, Figment};
 use serde::{Deserialize, Deserializer};
 use serde_json::Value;
 use trace_propagation_style::{deserialize_trace_propagation_style, TracePropagationStyle};
+use tracing::debug;
 
 use crate::config::{
     flush_strategy::FlushStrategy,
@@ -575,6 +576,7 @@ pub mod tests {
     }
 
     #[test]
+<<<<<<< HEAD
     fn test_proxy_yaml() {
         figment::Jail::expect_with(|jail| {
             jail.clear_env();
@@ -616,6 +618,8 @@ pub mod tests {
     }
 
     #[test]
+=======
+>>>>>>> main
     fn test_parse_flush_strategy_end() {
         figment::Jail::expect_with(|jail| {
             jail.clear_env();