diff --git a/Cargo.lock b/Cargo.lock index 8ae0c33fa3269..771b816ccee45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5921,8 +5921,6 @@ dependencies = [ "tokio-stream", "tokio-util 0.7.2", "tracing", - "tracing-subscriber 0.3.11", - "tracing-test", "typed-store 0.1.0 (git+https://github.com/MystenLabs/mysten-infra?rev=988cad6aaafac84d52a93227a16867bf27c1ea4c)", "types", "workspace-hack", diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml index 3575323960532..293861c49ddef 100644 --- a/crates/sui-core/Cargo.toml +++ b/crates/sui-core/Cargo.toml @@ -40,7 +40,6 @@ curve25519-dalek = { version = "3", default-features = false } thiserror = "1.0.30" arc-swap = "1.5.0" - sui-adapter = { path = "../sui-adapter" } sui-framework = { path = "../sui-framework" } sui-network = { path = "../sui-network" } @@ -49,8 +48,6 @@ sui-storage = { path = "../sui-storage" } sui-config = { path = "../sui-config" } sui-json = { path = "../sui-json" } -telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0", features = ["jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-opentelemetry"] } - move-binary-format = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b" } move-core-types = { git = "https://github.com/move-language/move", rev = "1b2d3b4274345f5b4b6a1a1bde5aee452003ab5b", features = ["address20"] } @@ -72,8 +69,7 @@ serde_yaml = "0.8.23" pretty_assertions = "1.2.1" temp_testdir = "0.2.3" hex = "0.4.3" -tracing-test = "0.2.1" -tracing-subscriber = "^0.3" +telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "2de1a391654a7ee09d867de2f16627b915ad21f0" } test-fuzz = "3.0.2" test-utils = { path = "../test-utils" } diff --git a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs index b23dc0e8a0a3c..ffc6c5f1c14b2 100644 --- a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs +++ b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs @@ -4,7 +4,6 @@ use std::collections::BTreeMap; use std::sync::Arc; use move_core_types::{account_address::AccountAddress, ident_str}; -use once_cell::sync::Lazy; use signature::Signer; use sui_adapter::genesis; @@ -31,8 +30,6 @@ pub fn authority_genesis_objects( objects } -static LOGGING_INIT: Lazy<()> = Lazy::new(tracing_subscriber::fmt::init); - pub async fn init_local_authorities( genesis_objects: Vec>, ) -> ( @@ -50,8 +47,7 @@ pub async fn init_local_authorities_with_genesis( AuthorityAggregator, Vec>, ) { - #[allow(clippy::no_effect)] - *LOGGING_INIT; // Initialize logging if needed + telemetry_subscribers::init_for_testing(); let mut key_pairs = Vec::new(); let mut voting_rights = BTreeMap::new(); for _ in 0..genesis_objects.len() {