Merge branch 'autonomys:main' into tmp/opt/optimize-cluster-identific…

…ation

crates/subspace-farmer/Cargo.toml

@@ -56,21 +56,20 @@ subspace-data-retrieval = { version = "0.1.0", path = "../../shared/subspace-dat
 subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding" }
 subspace-farmer-components = { version = "0.1.0", path = "../subspace-farmer-components" }
 subspace-kzg = { version = "0.1.0", path = "../../shared/subspace-kzg" }
+subspace-logging = { version = "0.0.1", path = "../../shared/subspace-logging", optional = true }
 subspace-metrics = { version = "0.1.0", path = "../../shared/subspace-metrics", optional = true }
 subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
 subspace-proof-of-space = { version = "0.1.0", path = "../subspace-proof-of-space" }
 subspace-proof-of-space-gpu = { version = "0.1.0", path = "../../shared/subspace-proof-of-space-gpu", optional = true }
 subspace-rpc-primitives = { version = "0.1.0", path = "../subspace-rpc-primitives" }
 subspace-verification = { version = "0.1.0", path = "../subspace-verification" }
 substrate-bip39 = "0.6.0"
-supports-color = { version = "3.0.1", optional = true }
 tempfile = "3.13.0"
 thiserror = "2.0.0"
 thread-priority = "1.1.0"
 tokio = { version = "1.40.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = { version = "0.1.16", features = ["sync"] }
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"], optional = true }
 ulid = { version = "1.1.3", features = ["serde"] }
 zeroize = "1.8.1"
 
@@ -97,6 +96,5 @@ binary = [
     "dep:fdlimit",
     "dep:mimalloc",
     "dep:subspace-metrics",
-    "dep:supports-color",
-    "dep:tracing-subscriber",
+    "dep:subspace-logging",
 ]

crates/subspace-farmer/src/bin/subspace-farmer/main.rs

@@ -8,11 +8,9 @@ use std::path::PathBuf;
 use std::process::exit;
 use std::{fs, panic};
 use subspace_farmer::single_disk_farm::{ScrubTarget, SingleDiskFarm};
+use subspace_logging::init_logger;
 use subspace_proof_of_space::chia::ChiaTable;
 use tracing::info;
-use tracing_subscriber::filter::LevelFilter;
-use tracing_subscriber::prelude::*;
-use tracing_subscriber::{fmt, EnvFilter};
 
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
@@ -77,23 +75,7 @@ async fn main() -> anyhow::Result<()> {
         exit(1);
     }));
 
-    tracing_subscriber::registry()
-        .with(
-            fmt::layer()
-                // TODO: Workaround for https://github.com/tokio-rs/tracing/issues/2214, also on
-                //  Windows terminal doesn't support the same colors as bash does
-                .with_ansi(if cfg!(windows) {
-                    false
-                } else {
-                    supports_color::on(supports_color::Stream::Stderr).is_some()
-                })
-                .with_filter(
-                    EnvFilter::builder()
-                        .with_default_directive(LevelFilter::INFO.into())
-                        .from_env_lossy(),
-                ),
-        )
-        .init();
+    init_logger();
     utils::raise_fd_limit();
 
     let command = Command::parse();

crates/subspace-gateway-rpc/src/lib.rs

@@ -9,7 +9,7 @@ use subspace_core_primitives::hashes::{blake3_hash, Blake3Hash};
 use subspace_core_primitives::objects::GlobalObjectMapping;
 use subspace_data_retrieval::object_fetcher::{self, ObjectFetcher};
 use subspace_data_retrieval::piece_getter::PieceGetter;
-use tracing::debug;
+use tracing::{debug, error, trace};
 
 const SUBSPACE_ERROR: i32 = 9000;
 
@@ -154,7 +154,13 @@ where
 
             let data_hash = blake3_hash(&data);
             if data_hash != mapping.hash {
-                debug!(?data_hash, ?mapping.hash, "Retrieved data did not match mapping hash");
+                error!(
+                    ?data_hash,
+                    data_size = %data.len(),
+                    ?mapping.hash,
+                    "Retrieved data did not match mapping hash",
+                );
+                trace!(data = %hex::encode(data), "Retrieved data");
                 return Err(Error::InvalidObjectHash {
                     mapping_hash: mapping.hash,
                     data_hash,

crates/subspace-gateway/Cargo.toml

@@ -38,10 +38,9 @@ subspace-data-retrieval = { version = "0.1.0", path = "../../shared/subspace-dat
 subspace-erasure-coding = { version = "0.1.0", path = "../subspace-erasure-coding" }
 subspace-gateway-rpc = { version = "0.1.0", path = "../subspace-gateway-rpc" }
 subspace-kzg = { version = "0.1.0", path = "../../shared/subspace-kzg" }
+subspace-logging = { version = "0.0.1", path = "../../shared/subspace-logging" }
 subspace-networking = { version = "0.1.0", path = "../subspace-networking" }
 subspace-rpc-primitives = { version = "0.1.0", path = "../subspace-rpc-primitives" }
 subspace-verification = { version = "0.1.0", path = "../subspace-verification", default-features = false }
-supports-color = "3.0.1"
 tokio = { version = "1.40.0", features = ["rt-multi-thread", "signal", "macros"] }
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

crates/subspace-gateway/src/commands.rs

@@ -24,11 +24,7 @@ use subspace_kzg::Kzg;
 use subspace_networking::utils::piece_provider::PieceProvider;
 use subspace_networking::NodeRunner;
 use tokio::signal;
-use tracing::level_filters::LevelFilter;
 use tracing::{debug, warn};
-use tracing_subscriber::layer::SubscriberExt;
-use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::{fmt, EnvFilter, Layer};
 
 /// The default size limit, based on the maximum block size in some domains.
 pub const DEFAULT_MAX_SIZE: usize = 5 * 1024 * 1024;
@@ -75,25 +71,6 @@ pub(crate) fn set_exit_on_panic() {
     }));
 }
 
-pub(crate) fn init_logger() {
-    // TODO: Workaround for https://github.com/tokio-rs/tracing/issues/2214, also on
-    //  Windows terminal doesn't support the same colors as bash does
-    let enable_color = if cfg!(windows) {
-        false
-    } else {
-        supports_color::on(supports_color::Stream::Stderr).is_some()
-    };
-    tracing_subscriber::registry()
-        .with(
-            fmt::layer().with_ansi(enable_color).with_filter(
-                EnvFilter::builder()
-                    .with_default_directive(LevelFilter::INFO.into())
-                    .from_env_lossy(),
-            ),
-        )
-        .init();
-}
-
 pub(crate) fn raise_fd_limit() {
     match fdlimit::raise_fd_limit() {
         Ok(fdlimit::Outcome::LimitRaised { from, to }) => {

crates/subspace-gateway/src/main.rs

@@ -5,8 +5,9 @@ mod node_client;
 mod piece_getter;
 mod piece_validator;
 
-use crate::commands::{init_logger, raise_fd_limit, set_exit_on_panic, Command};
+use crate::commands::{raise_fd_limit, set_exit_on_panic, Command};
 use clap::Parser;
+use subspace_logging::init_logger;
 use tracing::info;
 
 #[global_allocator]

crates/subspace-networking/Cargo.toml

@@ -40,15 +40,16 @@ schnellru = "0.2.3"
 serde = { version = "1.0.110", features = ["derive"] }
 serde_json = "1.0.128"
 subspace-core-primitives = { version = "0.1.0", path = "../subspace-core-primitives" }
+subspace-logging = { version = "0.0.1", path = "../../shared/subspace-logging" }
 subspace-metrics = { version = "0.1.0", path = "../../shared/subspace-metrics" }
 thiserror = "2.0.0"
 tokio = { version = "1.40.0", features = ["macros", "parking_lot", "rt-multi-thread", "signal", "sync", "time"] }
 tokio-stream = "0.1.16"
 tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 unsigned-varint = { version = "0.8.0", features = ["futures", "asynchronous_codec"] }
 void = "1.0.2"
 
+
 [dependencies.libp2p]
 # TODO: Replace with upstream once https://github.com/libp2p/rust-libp2p/issues/5626 and
 #  https://github.com/libp2p/rust-libp2p/issues/5634 are resolved

crates/subspace-networking/examples/benchmark.rs

@@ -15,13 +15,11 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use subspace_core_primitives::pieces::{Piece, PieceIndex};
+use subspace_logging::init_logger;
 use subspace_networking::protocols::request_response::handlers::piece_by_index::PieceByIndexRequestHandler;
 use subspace_networking::utils::piece_provider::{NoPieceValidator, PieceProvider, PieceValidator};
 use subspace_networking::{Config, Node};
-use tracing::{debug, error, info, trace, warn, Level};
-use tracing_subscriber::fmt::Subscriber;
-use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::EnvFilter;
+use tracing::{debug, error, info, trace, warn};
 
 /// Defines initial duration between get_piece calls.
 const GET_PIECE_INITIAL_INTERVAL: Duration = Duration::from_secs(5);
@@ -128,8 +126,7 @@ enum Command {
 
 #[tokio::main]
 async fn main() {
-    init_logging();
-
+    init_logger();
     let args: Args = Args::parse();
 
     info!(?args, "Benchmark started.");
@@ -396,14 +393,3 @@ pub async fn configure_dsn(
 
     node
 }
-
-fn init_logging() {
-    // set default log to info if the RUST_LOG is not set.
-    let env_filter = EnvFilter::builder()
-        .with_default_directive(Level::INFO.into())
-        .from_env_lossy();
-
-    let builder = Subscriber::builder().with_env_filter(env_filter).finish();
-
-    builder.init()
-}

crates/subspace-networking/examples/get-peers.rs

@@ -4,11 +4,12 @@ use libp2p::multiaddr::Protocol;
 use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::Duration;
+use subspace_logging::init_logger;
 use subspace_networking::Config;
 
 #[tokio::main]
 async fn main() {
-    tracing_subscriber::fmt::init();
+    init_logger();
 
     let config_1 = Config {
         listen_on: vec!["/ip4/0.0.0.0/tcp/0".parse().unwrap()],

crates/subspace-networking/examples/metrics.rs

@@ -7,6 +7,7 @@ use parking_lot::Mutex;
 use prometheus_client::registry::Registry;
 use std::sync::Arc;
 use std::time::Duration;
+use subspace_logging::init_logger;
 use subspace_metrics::{start_prometheus_metrics_server, RegistryAdapter};
 use subspace_networking::{Config, Node};
 use tokio::signal;
@@ -15,7 +16,7 @@ use tracing::{error, info};
 
 #[tokio::main]
 async fn main() {
-    tracing_subscriber::fmt::init();
+    init_logger();
     let mut metric_registry = Registry::default();
     let metrics = Metrics::new(&mut metric_registry);
 

crates/subspace-networking/examples/networking.rs

@@ -7,13 +7,14 @@ use libp2p::multiaddr::Protocol;
 use parking_lot::Mutex;
 use std::sync::Arc;
 use std::time::Duration;
+use subspace_logging::init_logger;
 use subspace_networking::Config;
 
 const TOPIC: &str = "Foo";
 
 #[tokio::main]
 async fn main() {
-    tracing_subscriber::fmt::init();
+    init_logger();
 
     let config_1 = Config {
         listen_on: vec!["/ip4/0.0.0.0/tcp/0".parse().unwrap()],

crates/subspace-networking/examples/random-walker.rs

@@ -10,14 +10,12 @@ use std::collections::HashMap;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 use subspace_core_primitives::pieces::PieceIndex;
+use subspace_logging::init_logger;
 use subspace_networking::protocols::request_response::handlers::piece_by_index::{
     PieceByIndexRequest, PieceByIndexRequestHandler, PieceByIndexResponse,
 };
 use subspace_networking::{Config, Multihash, Node, PeerDiscovered, SendRequestError};
-use tracing::{debug, error, info, warn, Level};
-use tracing_subscriber::fmt::Subscriber;
-use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::EnvFilter;
+use tracing::{debug, error, info, warn};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -47,7 +45,7 @@ struct Args {
 
 #[tokio::main]
 async fn main() {
-    init_logging();
+    init_logger();
 
     let args: Args = Args::parse();
 
@@ -416,14 +414,3 @@ async fn configure_dsn(
 
     node
 }
-
-fn init_logging() {
-    // set default log to info if the RUST_LOG is not set.
-    let env_filter = EnvFilter::builder()
-        .with_default_directive(Level::INFO.into())
-        .from_env_lossy();
-
-    let builder = Subscriber::builder().with_env_filter(env_filter).finish();
-
-    builder.init()
-}