refactor: minor modification for initialization of tracing options

GreptimeTeam · May 12, 2024 · abbc463 · abbc463
1 parent a9e3509
commit abbc463
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 27 deletions.
diff --git a/src/cmd/src/datanode.rs b/src/cmd/src/datanode.rs
@@ -19,7 +19,6 @@ use async_trait::async_trait;
 use catalog::kvbackend::MetaKvBackend;
 use clap::Parser;
 use common_telemetry::info;
-#[cfg(feature = "tokio-console")]
 use common_telemetry::logging::TracingOptions;
 use common_wal::config::DatanodeWalConfig;
 use datanode::config::DatanodeOptions;
@@ -148,12 +147,10 @@ impl StartCommand {
             opts.logging.level.clone_from(&global_options.log_level);
         }
 
-        #[cfg(feature = "tokio-console")]
-        if global_options.tokio_console_addr.is_some() {
-            opts.tracing = TracingOptions {
-                tokio_console_addr: global_options.tokio_console_addr.clone(),
-            };
-        }
+        opts.tracing = TracingOptions {
+            #[cfg(feature = "tokio-console")]
+            tokio_console_addr: global_options.tokio_console_addr.clone(),
+        };
 
         if let Some(addr) = &self.rpc_addr {
             opts.rpc_addr.clone_from(addr);

diff --git a/src/cmd/src/frontend.rs b/src/cmd/src/frontend.rs
@@ -23,7 +23,6 @@ use client::client_manager::DatanodeClients;
 use common_meta::heartbeat::handler::parse_mailbox_message::ParseMailboxMessageHandler;
 use common_meta::heartbeat::handler::HandlerGroupExecutor;
 use common_telemetry::info;
-#[cfg(feature = "tokio-console")]
 use common_telemetry::logging::TracingOptions;
 use common_time::timezone::set_default_timezone;
 use frontend::frontend::FrontendOptions;
@@ -164,12 +163,10 @@ impl StartCommand {
             opts.logging.level.clone_from(&global_options.log_level);
         }
 
-        #[cfg(feature = "tokio-console")]
-        if global_options.tokio_console_addr.is_some() {
-            opts.tracing = TracingOptions {
-                tokio_console_addr: global_options.tokio_console_addr.clone(),
-            };
-        }
+        opts.tracing = TracingOptions {
+            #[cfg(feature = "tokio-console")]
+            tokio_console_addr: global_options.tokio_console_addr.clone(),
+        };
 
         let tls_opts = TlsOption::new(
             self.tls_mode.clone(),

diff --git a/src/cmd/src/metasrv.rs b/src/cmd/src/metasrv.rs
@@ -17,7 +17,6 @@ use std::time::Duration;
 use async_trait::async_trait;
 use clap::Parser;
 use common_telemetry::info;
-#[cfg(feature = "tokio-console")]
 use common_telemetry::logging::TracingOptions;
 use meta_srv::bootstrap::MetasrvInstance;
 use meta_srv::metasrv::MetasrvOptions;
@@ -143,12 +142,10 @@ impl StartCommand {
             opts.logging.level.clone_from(&global_options.log_level);
         }
 
-        #[cfg(feature = "tokio-console")]
-        if global_options.tokio_console_addr.is_some() {
-            opts.tracing = TracingOptions {
-                tokio_console_addr: global_options.tokio_console_addr.clone(),
-            };
-        }
+        opts.tracing = TracingOptions {
+            #[cfg(feature = "tokio-console")]
+            tokio_console_addr: global_options.tokio_console_addr.clone(),
+        };
 
         if let Some(addr) = &self.bind_addr {
             opts.bind_addr.clone_from(addr);

diff --git a/src/cmd/src/standalone.rs b/src/cmd/src/standalone.rs
@@ -304,12 +304,10 @@ impl StartCommand {
             opts.logging.level.clone_from(&global_options.log_level);
         }
 
-        #[cfg(feature = "tokio-console")]
-        if global_options.tokio_console_addr.is_some() {
-            opts.tracing = TracingOptions {
-                tokio_console_addr: global_options.tokio_console_addr.clone(),
-            };
-        }
+        opts.tracing = TracingOptions {
+            #[cfg(feature = "tokio-console")]
+            tokio_console_addr: global_options.tokio_console_addr.clone(),
+        };
 
         let tls_opts = TlsOption::new(
             self.tls_mode.clone(),