diff --git a/Cargo.lock b/Cargo.lock index afcfbacb826b..50ffae92fc03 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2631,7 +2631,6 @@ dependencies = [ "criterion", "dashmap", "dotenvy", - "env_logger", "flagset", "futures", "hdrs", diff --git a/core/Cargo.toml b/core/Cargo.toml index b0cf8fedc232..899dd8b0986f 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -217,7 +217,6 @@ uuid = { version = "1", features = ["serde", "v4"] } [dev-dependencies] criterion = { version = "0.4", features = ["async", "async_tokio"] } dotenvy = "0.15" -env_logger = "0.10" opentelemetry = { version = "0.19", default-features = false, features = [ "trace", ] } diff --git a/core/examples/object.rs b/core/examples/object.rs index 6ca6c7e200fe..2eae1abc2ae8 100644 --- a/core/examples/object.rs +++ b/core/examples/object.rs @@ -26,8 +26,8 @@ use opendal::Result; /// Visit [`opendal::Object`] for more object level APIs. #[tokio::main] async fn main() -> Result<()> { - let _ = env_logger::builder() - .filter_level(log::LevelFilter::Debug) + let _ = tracing_subscriber::fmt() + .with_env_filter("debug") .try_init(); // Pick a builder and configure it. diff --git a/core/src/layers/immutable_index.rs b/core/src/layers/immutable_index.rs index d41e8b6d0a2a..881008c2252e 100644 --- a/core/src/layers/immutable_index.rs +++ b/core/src/layers/immutable_index.rs @@ -284,7 +284,7 @@ mod tests { #[tokio::test] async fn test_list() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mut iil = ImmutableIndexLayer::default(); for i in ["file", "dir/", "dir/file", "dir_without_prefix/file"] { @@ -322,7 +322,7 @@ mod tests { #[tokio::test] async fn test_scan() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mut iil = ImmutableIndexLayer::default(); for i in ["file", "dir/", "dir/file", "dir_without_prefix/file"] { @@ -362,7 +362,7 @@ mod tests { #[tokio::test] async fn test_list_dir() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mut iil = ImmutableIndexLayer::default(); for i in [ @@ -423,7 +423,7 @@ mod tests { #[tokio::test] async fn test_walk_top_down_dir() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mut iil = ImmutableIndexLayer::default(); for i in [ diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs index 22bc472da085..276e4b8ab227 100644 --- a/core/src/layers/retry.rs +++ b/core/src/layers/retry.rs @@ -1012,7 +1012,7 @@ mod tests { #[tokio::test] async fn test_retry_read() { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let builder = MockBuilder::default(); let op = Operator::new(builder.clone()) @@ -1034,7 +1034,7 @@ mod tests { #[tokio::test] async fn test_retry_list() { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let builder = MockBuilder::default(); let op = Operator::new(builder.clone()) @@ -1058,7 +1058,7 @@ mod tests { #[tokio::test] async fn test_retry_batch() { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let builder = MockBuilder::default(); // set to a lower delay to make it run faster diff --git a/core/src/raw/oio/to_flat_pager.rs b/core/src/raw/oio/to_flat_pager.rs index 11352d6b18e0..f985464de1c2 100644 --- a/core/src/raw/oio/to_flat_pager.rs +++ b/core/src/raw/oio/to_flat_pager.rs @@ -299,7 +299,7 @@ mod tests { #[test] fn test_blocking_list() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let acc = MockService::new(); let mut pager = to_flat_pager(acc, "x/", 10); diff --git a/core/src/raw/oio/to_hierarchy_pager.rs b/core/src/raw/oio/to_hierarchy_pager.rs index bd77ed57c8fe..e301155f7619 100644 --- a/core/src/raw/oio/to_hierarchy_pager.rs +++ b/core/src/raw/oio/to_hierarchy_pager.rs @@ -198,7 +198,7 @@ mod tests { #[test] fn test_blocking_list() -> Result<()> { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let pager = MockPager::new(&["x/x/", "x/y/", "y/", "x/x/x", "y/y", "xy/", "z", "y/a"]); let mut pager = to_hierarchy_pager(pager, ""); diff --git a/core/src/services/http/backend.rs b/core/src/services/http/backend.rs index 99f02ba8a1e3..3aa608780595 100644 --- a/core/src/services/http/backend.rs +++ b/core/src/services/http/backend.rs @@ -406,7 +406,7 @@ mod tests { #[tokio::test] async fn test_read() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mock_server = MockServer::start().await; Mock::given(method("GET")) @@ -432,7 +432,7 @@ mod tests { #[tokio::test] async fn test_read_via_basic_auth() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let (username, password) = ("your_username", "your_password"); @@ -462,7 +462,7 @@ mod tests { #[tokio::test] async fn test_read_via_bearer_auth() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let token = "your_token"; @@ -492,7 +492,7 @@ mod tests { #[tokio::test] async fn test_stat() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mock_server = MockServer::start().await; Mock::given(method("HEAD")) @@ -514,7 +514,7 @@ mod tests { #[tokio::test] async fn test_read_with() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mock_server = MockServer::start().await; Mock::given(method("GET")) @@ -543,7 +543,7 @@ mod tests { #[tokio::test] async fn test_stat_with() -> Result<()> { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let mock_server = MockServer::start().await; Mock::given(method("HEAD")) diff --git a/core/src/services/s3/backend.rs b/core/src/services/s3/backend.rs index 75cc2af15f09..54f3c581ae8d 100644 --- a/core/src/services/s3/backend.rs +++ b/core/src/services/s3/backend.rs @@ -1223,7 +1223,7 @@ mod tests { #[test] fn test_build_endpoint() { - let _ = env_logger::try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let endpoint_cases = vec![ Some("s3.amazonaws.com"), diff --git a/core/tests/behavior/utils.rs b/core/tests/behavior/utils.rs index 3661f5f276d7..6343015b9813 100644 --- a/core/tests/behavior/utils.rs +++ b/core/tests/behavior/utils.rs @@ -39,7 +39,7 @@ use sha2::Sha256; /// - If `opendal_{schema}_test` is on, construct a new Operator with given root. /// - Else, returns a `None` to represent no valid config for operator. pub fn init_service() -> Option { - let _ = env_logger::builder().is_test(true).try_init(); + let _ = tracing_subscriber::fmt().with_test_writer().try_init(); let _ = dotenvy::dotenv(); let prefix = format!("opendal_{}_", B::SCHEME);