diff --git a/Cargo.lock b/Cargo.lock index 208e53ec7..d2bd8ee56 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14828,6 +14828,7 @@ dependencies = [ "aptos-crypto 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", "aptos-framework-biarritz-rc1-to-pre-l1-merge-migration", "aptos-framework-elsa-to-biarritz-rc1-migration", + "aptos-logger 0.1.0 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", "aptos-sdk 0.0.3 (git+https://github.com/movementlabsxyz/aptos-core?rev=1d1cdbbd7fabb80dcb95ba5e23213faa072fab67)", "bcs 0.1.6 (git+https://github.com/movementlabsxyz/bcs.git?rev=bc16d2d39cabafaabd76173dd1b04b2aa170cf0c)", "clap 4.5.21", @@ -14869,7 +14870,6 @@ dependencies = [ "tokio-stream", "tonic 0.12.3", "tracing", - "tracing-subscriber 0.3.18", "url", "zstd 0.13.2", ] @@ -14917,6 +14917,7 @@ dependencies = [ "futures", "godfig", "maptos-execution-util", + "movement-config", "movement-health", "movement-tracing", "num_cpus", diff --git a/networks/movement/indexer-v2/Cargo.toml b/networks/movement/indexer-v2/Cargo.toml index 20139af76..081607d77 100644 --- a/networks/movement/indexer-v2/Cargo.toml +++ b/networks/movement/indexer-v2/Cargo.toml @@ -28,6 +28,7 @@ tracing-subscriber = { workspace = true } maptos-execution-util = { workspace = true } clap = { workspace = true } reqwest = { workspace = true, features = ["json"] } +movement-config = { workspace = true } serde_json = { workspace = true } tempfile = { workspace = true } processor-v2 = { workspace = true } diff --git a/networks/movement/indexer-v2/src/main.rs b/networks/movement/indexer-v2/src/main.rs index 8b1690b97..99444b938 100644 --- a/networks/movement/indexer-v2/src/main.rs +++ b/networks/movement/indexer-v2/src/main.rs @@ -1,6 +1,6 @@ use aptos_indexer_processor_sdk::server_framework::RunnableConfig; use godfig::{backend::config_file::ConfigFile, Godfig}; -use maptos_execution_util::config::Config; +use movement_config::Config; use movement_health::run_service; use movement_tracing::simple_metrics::start_metrics_server; use processor_v2::config::indexer_processor_config::IndexerProcessorConfig; @@ -13,25 +13,21 @@ fn main() -> Result<(), anyhow::Error> { let runtime = get_maptos_runtime(); runtime.block_on(async move { - let maptos_config = load_maptos_config().await.expect("Failed to load maptos config"); - let runnable_processor_config: IndexerProcessorConfig = - maptos_config.indexer_processor_v2.clone().into(); - + let config = load_maptos_config().await.expect("Failed to load maptos config"); + let indexer_config = config.execution_config.maptos_config.indexer_processor_v2; + let runnable_processor_config: IndexerProcessorConfig = indexer_config.clone().into(); + let metrics_config = indexer_config.metrics_config.clone(); let metrics_handle = tokio::spawn(async move { - let res = start_metrics_server( - maptos_config.indexer_processor_v2.metrics_config.listen_hostname, - maptos_config.indexer_processor_v2.metrics_config.listen_port, - ) - .await; + let res = + start_metrics_server(metrics_config.listen_hostname, metrics_config.listen_port) + .await; tracing::info!("Metrics server started: {:?}", res); res }); + + let health_config = indexer_config.health_config.clone(); let health_handle = tokio::spawn(async move { - let res = run_service( - maptos_config.indexer_processor_v2.health_config.hostname, - maptos_config.indexer_processor_v2.health_config.port, - ) - .await; + let res = run_service(health_config.hostname, health_config.port).await; tracing::info!("Health server started: {:?}", res); res }); @@ -94,13 +90,12 @@ async fn load_maptos_config() -> anyhow::Result { // get the config file let dot_movement = dot_movement::DotMovement::try_from_env()?; - // Load Maptos config - let maptos_config = { + // Load config + let config = { let config_file = dot_movement.try_get_or_create_config_file().await?; - let godfig: Godfig = - Godfig::new(ConfigFile::new(config_file), vec!["maptos_config".to_string()]); + let godfig: Godfig = Godfig::new(ConfigFile::new(config_file), vec![]); godfig.try_wait_for_ready().await }?; - Ok(maptos_config) + Ok(config) } diff --git a/networks/movement/movement-full-node/Cargo.toml b/networks/movement/movement-full-node/Cargo.toml index a86b421ad..db4f5575e 100644 --- a/networks/movement/movement-full-node/Cargo.toml +++ b/networks/movement/movement-full-node/Cargo.toml @@ -31,7 +31,7 @@ movement-tracing = { workspace = true } movement-config = { workspace = true } dot-movement = { workspace = true } godfig = { workspace = true } -tracing-subscriber = { workspace = true } +aptos-logger = { workspace = true } console-subscriber = { workspace = true } rocksdb = { workspace = true } tracing = { workspace = true } diff --git a/networks/movement/movement-full-node/src/main.rs b/networks/movement/movement-full-node/src/main.rs index f10633ced..4d1d781a0 100644 --- a/networks/movement/movement-full-node/src/main.rs +++ b/networks/movement/movement-full-node/src/main.rs @@ -1,16 +1,11 @@ #![forbid(unsafe_code)] use clap::*; use movement_full_node::MovementFullNode; -use tracing_subscriber::EnvFilter; #[tokio::main] async fn main() -> Result<(), anyhow::Error> { - // Initialize default tracing - tracing_subscriber::fmt() - .with_env_filter( - EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")), - ) - .init(); + // Initialize aptos logger + aptos_logger::Logger::builder().level(aptos_logger::Level::Info).build(); // Initialize telemetry if MOVEMENT_METRICS_ADDR is set if std::env::var("MOVEMENT_METRICS_ADDR").is_ok() {