make console subscriber opt in with --console flag

Author: dyc3

Cargo.toml

@@ -18,7 +18,7 @@ humantime-serde = "1.1"
 hyper = { version = "1.2.0", features = ["full"] }
 hyper-util = { version = "0.1.3", features = ["full"] }
 http-body-util = "0.1.0"
-jemallocator = "0.5.4"
+jemallocator = { version = "0.5.4" }
 once_cell = "1.17.1"
 ott-common = { path = "crates/ott-common" }
 ott-balancer = { path = "crates/ott-balancer" }

crates/ott-balancer/src/config.rs

@@ -79,10 +79,14 @@ pub struct Cli {
     #[clap(short, long, default_value_t = LogLevel::Info, value_enum)]
     pub log_level: LogLevel,
 
+    /// Enable the console-subscriber for debugging via tokio-console.
+    #[clap(long)]
+    pub console: bool,
+
     /// Allow remote connections via tokio-console for debugging. By default, only local connections are allowed.
     ///
     /// The default port for tokio-console is 6669.
-    #[clap(long)]
+    #[clap(long, requires("console"))]
     pub remote_console: bool,
 
     /// Validate the configuration file.

crates/ott-balancer/src/lib.rs

@@ -56,17 +56,22 @@ pub async fn run() -> anyhow::Result<()> {
 
     let config = BalancerConfig::get();
 
-    let console_layer = if args.remote_console {
-        console_subscriber::ConsoleLayer::builder()
-            .server_addr((
-                Ipv6Addr::UNSPECIFIED,
-                console_subscriber::Server::DEFAULT_PORT,
-            ))
-            .spawn()
+    let console_layer = if args.console {
+        let console_layer = if args.remote_console {
+            console_subscriber::ConsoleLayer::builder()
+                .server_addr((
+                    Ipv6Addr::UNSPECIFIED,
+                    console_subscriber::Server::DEFAULT_PORT,
+                ))
+                .spawn()
+        } else {
+            console_subscriber::ConsoleLayer::builder().spawn()
+        }
+        .with_filter(EnvFilter::try_new("tokio=trace,runtime=trace")?);
+        Some(console_layer)
     } else {
-        console_subscriber::ConsoleLayer::builder().spawn()
+        None
     };
-    let console_layer = console_layer.with_filter(EnvFilter::try_new("tokio=trace,runtime=trace")?);
     let filter = args.build_tracing_filter();
     let filter_layer = EnvFilter::try_from_default_env().or_else(|_| EnvFilter::try_new(filter))?;
     let fmt_layer = tracing_subscriber::fmt::layer().with_filter(filter_layer);