diff --git a/Cargo.lock b/Cargo.lock index 5f2b44fcfc..748816d82e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1483,43 +1483,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "console-api" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" -dependencies = [ - "futures-core", - "prost", - "prost-types", - "tonic", - "tracing-core", -] - -[[package]] -name = "console-subscriber" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e" -dependencies = [ - "console-api", - "crossbeam-channel", - "crossbeam-utils", - "futures-task", - "hdrhistogram", - "humantime", - "prost-types", - "serde", - "serde_json", - "thread_local", - "tokio", - "tokio-stream", - "tonic", - "tracing", - "tracing-core", - "tracing-subscriber 0.3.18", -] - [[package]] name = "const-crc32" version = "1.3.0" @@ -1649,15 +1612,6 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" -[[package]] -name = "crossbeam-channel" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-deque" version = "0.8.5" @@ -2805,10 +2759,7 @@ version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.21.7", "byteorder", - "flate2", - "nom", "num-traits", ] @@ -2992,12 +2943,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "hyper" version = "0.14.28" @@ -4540,7 +4485,6 @@ dependencies = [ "chrono", "clap", "cnidarium", - "console-subscriber", "csv", "decaf377 0.5.0", "decaf377-rdsa", @@ -7599,7 +7543,6 @@ dependencies = [ "camino", "chrono", "clap", - "console-subscriber", "decaf377 0.5.0", "futures", "hex", diff --git a/Cargo.toml b/Cargo.toml index 971a549bb3..a7dc78e149 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -129,7 +129,6 @@ chrono = { default-features = false, version = "0.4" } clap = { version = "3.2" } cnidarium = { default-features = false, path = "crates/cnidarium" } cnidarium-component = { default-features = false, path = "crates/cnidarium-component" } -console-subscriber = { version = "0.2" } criterion = { version = "0.4" } decaf377 = { default-features = false, version = "0.5" } decaf377-fmd = { path = "crates/crypto/decaf377-fmd" } diff --git a/crates/bin/pd/Cargo.toml b/crates/bin/pd/Cargo.toml index b729d89fd5..b7358d4bf3 100644 --- a/crates/bin/pd/Cargo.toml +++ b/crates/bin/pd/Cargo.toml @@ -44,7 +44,6 @@ bytes = { workspace = true } chrono = { workspace = true, default-features = false, features = ["serde"] } clap = { workspace = true, features = ["derive", "env"] } cnidarium = { workspace = true, features = ["migration", "rpc"], default-features = true } -console-subscriber = { workspace = true } csv = "1.1" decaf377 = { workspace = true, features = ["parallel"], default-features = true } decaf377-rdsa = { workspace = true } diff --git a/crates/bin/pd/src/main.rs b/crates/bin/pd/src/main.rs index 48bdec77c3..e59c4d5fae 100644 --- a/crates/bin/pd/src/main.rs +++ b/crates/bin/pd/src/main.rs @@ -4,7 +4,6 @@ use std::error::Error; use std::io::IsTerminal as _; -use console_subscriber::ConsoleLayer; use metrics_tracing_context::{MetricsLayer, TracingContextLayer}; use metrics_util::layers::Stack; @@ -32,7 +31,7 @@ use url::Url; #[tokio::main] async fn main() -> anyhow::Result<()> { // Validate options immediately. - let Opt { tokio_console, cmd } = ::parse(); + let Opt { cmd } = ::parse(); // Instantiate tracing layers. // The MetricsLayer handles enriching metrics output with labels from tracing spans. @@ -49,14 +48,7 @@ async fn main() -> anyhow::Result<()> { .with(filter_layer) .with(fmt_layer) .with(metrics_layer); - if tokio_console { - // The ConsoleLayer enables collection of data for `tokio-console`. - // The `spawn` call will panic if AddrInUse, so we only spawn if enabled. - let console_layer = ConsoleLayer::builder().with_default_env().spawn(); - registry.with(console_layer).init(); - } else { - registry.init(); - } + registry.init(); tracing::info!(?cmd, version = env!("CARGO_PKG_VERSION"), "running command"); match cmd { diff --git a/tools/summonerd/Cargo.toml b/tools/summonerd/Cargo.toml index 4c34d38064..0a2806f637 100644 --- a/tools/summonerd/Cargo.toml +++ b/tools/summonerd/Cargo.toml @@ -21,7 +21,6 @@ bytes = {workspace = true} camino = {workspace = true} chrono = {workspace = true} clap = {workspace = true, features = ["derive", "env", "color"]} -console-subscriber = {workspace = true} decaf377 = {workspace = true} futures = {workspace = true} hex = {workspace = true} diff --git a/tools/summonerd/src/main.rs b/tools/summonerd/src/main.rs index 4307eadbe6..c051af56af 100644 --- a/tools/summonerd/src/main.rs +++ b/tools/summonerd/src/main.rs @@ -14,7 +14,6 @@ use ark_serialize::CanonicalSerialize; use camino::Utf8Path; use camino::Utf8PathBuf; use clap::Parser; -use console_subscriber::ConsoleLayer; use coordinator::Coordinator; use decaf377::Bls12_377; use metrics_tracing_context::MetricsLayer; @@ -86,9 +85,6 @@ operating the orchestration. version, )] struct Opt { - /// Enable Tokio Console support. - #[clap(long)] - tokio_console: bool, /// Command to run. #[clap(subcommand)] pub cmd: Command, @@ -356,8 +352,6 @@ async fn main() -> Result<()> { // Instantiate tracing layers. // The MetricsLayer handles enriching metrics output with labels from tracing spans. let metrics_layer = MetricsLayer::new(); - // The ConsoleLayer enables collection of data for `tokio-console`. - let console_layer = ConsoleLayer::builder().with_default_env().spawn(); // The `FmtLayer` is used to print to the console. let fmt_layer = tracing_subscriber::fmt::layer() .with_ansi(io::stdout().is_terminal()) @@ -369,16 +363,12 @@ async fn main() -> Result<()> { let opt = Opt::parse(); - // Register the tracing subscribers, conditionally enabling tokio console support + // Register the tracing subscribers. let registry = tracing_subscriber::registry() .with(filter_layer) .with(fmt_layer) .with(metrics_layer); - if opt.tokio_console { - registry.with(console_layer).init(); - } else { - registry.init(); - } + registry.init(); opt.exec().await }