fix

Author: forsaken628

Cargo.lock

@@ -478,8 +478,6 @@ self_cell = "1.2.0"
 semver = "1.0.14"
 seq-marked = { version = "0.3.1", features = ["seq-marked-serde", "seq-marked-bincode", "seqv-serde"] }
 serde = { version = "1.0.164", features = ["derive", "rc"] }
-serde-bridge = "0.0.3"
-serde-env = { git = "https://github.com/Xuanwo/serde-env", rev = "085d4b1" }
 serde_derive = "1"
 serde_ignored = "0.1.10"
 serde_json = { version = "1.0.85", default-features = false, features = ["preserve_order", "unbounded_depth"] }
@@ -489,7 +487,7 @@ serde_test = "1.0"
 serde_urlencoded = "0.7.1"
 serde_with = { version = "3.8.1" }
 serde_yaml = { version = "0.9.34" }
-serfig = "0.1.0"
+serfig = { git = "https://github.com/datafuse-extras/serfig", rev = "610ac6d" }
 sha1 = "0.10.5"
 sha2 = "0.10.8"
 simdutf8 = "0.1.4"

Cargo.toml

@@ -26,8 +26,6 @@ databend-common-storage = { workspace = true }
 databend-common-tracing = { workspace = true }
 log = { workspace = true }
 serde = { workspace = true }
-serde-bridge = { workspace = true }
-serde-env = { workspace = true }
 serde_ignored = { workspace = true }
 serde_with = { workspace = true }
 serfig = { workspace = true }

src/query/config/Cargo.toml

@@ -59,10 +59,10 @@ use databend_common_tracing::CONFIG_DEFAULT_LOG_LEVEL;
 use serde::Deserialize;
 use serde::Serialize;
 use serde_with::with_prefix;
+use serfig::collectors::from_env;
 use serfig::collectors::from_file;
 use serfig::collectors::from_self;
 
-use super::env::from_env;
 use super::inner;
 use super::inner::CatalogConfig as InnerCatalogConfig;
 use super::inner::CatalogHiveConfig as InnerCatalogHiveConfig;
@@ -3840,4 +3840,19 @@ mod test {
             "default setting is different from default config, please check again"
         )
     }
+
+    #[test]
+    fn test_env() {
+        unsafe {
+            std::env::set_var("LOG_TRACING_OTLP_ENDPOINT", "http://127.0.2.1:1111");
+            std::env::set_var("LOG_TRACING_CAPTURE_LOG_LEVEL", "DebuG");
+        }
+
+        let cfg = Config::load_with_config_file("").unwrap();
+        assert_eq!(
+            cfg.log.tracing.tracing_otlp.endpoint,
+            "http://127.0.2.1:1111"
+        );
+        assert_eq!(cfg.log.tracing.tracing_capture_log_level, "DebuG");
+    }
 }

src/query/config/src/config.rs

@@ -29,7 +29,6 @@ mod builtin;
 /// - `TryInto<inner::InnerConfig> for config::Config`
 /// - `From<inner::InnerConfig> for config::Config`
 mod config;
-mod env;
 mod global;
 mod inner;
 mod mask;