Avoid repeated globals in tracing events

Author: djc

src/bin/rustup-init.rs

@@ -60,7 +60,7 @@ async fn main() -> Result<ExitCode> {
     }
 }
 
-#[tracing::instrument(level = "trace")]
+#[tracing::instrument(level = "trace", skip_all)]
 async fn run_rustup(
     process: &Process,
     console_filter: Handle<EnvFilter, Registry>,
@@ -75,7 +75,7 @@ async fn run_rustup(
     result
 }
 
-#[tracing::instrument(level = "trace", err(level = "trace"))]
+#[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
 async fn run_rustup_inner(
     process: &Process,
     console_filter: Handle<EnvFilter, Registry>,

src/cli/common.rs

@@ -177,7 +177,7 @@ impl Notifier {
     }
 }
 
-#[tracing::instrument(level = "trace")]
+#[tracing::instrument(level = "trace", skip(process))]
 pub(crate) fn set_globals(current_dir: PathBuf, quiet: bool, process: &Process) -> Result<Cfg<'_>> {
     let notifier = Notifier::new(quiet, process);
     Cfg::from_env(current_dir, Arc::new(move |n| notifier.handle(n)), process)

src/cli/proxy_mode.rs

@@ -9,7 +9,7 @@ use crate::{
     toolchain::ResolvableLocalToolchainName,
 };
 
-#[tracing::instrument(level = "trace")]
+#[tracing::instrument(level = "trace", skip(process))]
 pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result<ExitStatus> {
     self_update::cleanup_self_updater(process)?;
 

src/cli/rustup_mode.rs

@@ -549,7 +549,7 @@ enum SetSubcmd {
     },
 }
 
-#[tracing::instrument(level = "trace", fields(args = format!("{:?}", process.args_os().collect::<Vec<_>>())))]
+#[tracing::instrument(level = "trace", fields(args = format!("{:?}", process.args_os().collect::<Vec<_>>())), skip(process, console_filter))]
 pub async fn main(
     current_dir: PathBuf,
     process: &Process,

src/cli/setup_mode.rs

@@ -73,7 +73,7 @@ struct RustupInit {
     dump_testament: bool,
 }
 
-#[tracing::instrument(level = "trace")]
+#[tracing::instrument(level = "trace", skip(process, console_filter))]
 pub async fn main(
     current_dir: PathBuf,
     process: &Process,