Revert 1 commits

0cf0c6b 'feat(log): unhide `tracing::instrument` from behind `feature = "otel"`'

Author: rami3l

doc/dev-guide/src/tracing.md

@@ -52,7 +52,7 @@ when enabled. Instrumenting a currently uninstrumented function is mostly simply
 done like so:
 
 ```rust
-#[tracing::instrument(level = "trace", err, skip_all)]
+#[cfg_attr(feature = "otel", tracing::instrument(err, skip_all))]
 ```
 
 `skip_all` is not required, but some core structs don't implement Debug yet, and

rustup-macros/src/lib.rs

@@ -98,7 +98,7 @@ fn test_inner(mod_path: String, mut input: ItemFn) -> syn::Result<TokenStream> {
             #before_ident().await;
             // Define a function with same name we can instrument inside the
             // tracing enablement logic.
-            #[tracing::instrument(level = "trace", skip_all)]
+            #[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
             async fn #name() { #inner }
             // Thunk through a new thread to permit catching the panic
             // without grabbing the entire state machine defined by the

src/bin/rustup-init.rs

@@ -67,7 +67,8 @@ async fn maybe_trace_rustup() -> Result<utils::ExitCode> {
     result
 }
 
-#[tracing::instrument(level = "trace")]
+// FIXME: Make `tracing::instrument` always run
+#[cfg_attr(feature = "otel", tracing::instrument)]
 async fn run_rustup() -> Result<utils::ExitCode> {
     if let Ok(dir) = process().var("RUSTUP_TRACE_DIR") {
         open_trace_file!(dir)?;
@@ -79,7 +80,7 @@ async fn run_rustup() -> Result<utils::ExitCode> {
     result
 }
 
-#[tracing::instrument(level = "trace", err)]
+#[cfg_attr(feature = "otel", tracing::instrument(err))]
 async fn run_rustup_inner() -> Result<utils::ExitCode> {
     // Guard against infinite proxy recursion. This mostly happens due to
     // bugs in rustup.

src/cli/common.rs

@@ -179,7 +179,7 @@ impl Notifier {
     }
 }
 
-#[tracing::instrument(level = "trace")]
+#[cfg_attr(feature = "otel", tracing::instrument)]
 pub(crate) fn set_globals(current_dir: PathBuf, verbose: bool, quiet: bool) -> Result<Cfg> {
     let notifier = Notifier::new(verbose, quiet);
     Cfg::from_env(current_dir, Arc::new(move |n| notifier.handle(n)))

src/cli/proxy_mode.rs

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

src/cli/rustup_mode.rs

@@ -535,7 +535,7 @@ enum SetSubcmd {
     },
 }
 
-#[tracing::instrument(level = "trace", fields(args = format!("{:?}", process().args_os().collect::<Vec<_>>())))]
+#[cfg_attr(feature = "otel", tracing::instrument(fields(args = format!("{:?}", process().args_os().collect::<Vec<_>>()))))]
 pub async fn main(current_dir: PathBuf) -> Result<utils::ExitCode> {
     self_update::cleanup_self_updater()?;
 
@@ -550,7 +550,7 @@ pub async fn main(current_dir: PathBuf) -> Result<utils::ExitCode> {
             write!(process().stdout().lock(), "{err}")?;
             info!("This is the version for the rustup toolchain manager, not the rustc compiler.");
 
-            #[tracing::instrument(level = "trace")]
+            #[cfg_attr(feature = "otel", tracing::instrument)]
             async fn rustc_version(
                 current_dir: PathBuf,
             ) -> std::result::Result<String, Box<dyn std::error::Error>> {
@@ -938,7 +938,7 @@ async fn which(
     Ok(utils::ExitCode(0))
 }
 
-#[tracing::instrument(level = "trace", skip_all)]
+#[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
 fn show(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     common::warn_if_host_is_emulated();
 
@@ -1075,7 +1075,7 @@ fn show(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     Ok(utils::ExitCode(0))
 }
 
-#[tracing::instrument(level = "trace", skip_all)]
+#[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
 fn show_active_toolchain(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     match cfg.find_active_toolchain()? {
         Some((toolchain_name, reason)) => {
@@ -1099,7 +1099,7 @@ fn show_active_toolchain(cfg: &Cfg, verbose: bool) -> Result<utils::ExitCode> {
     Ok(utils::ExitCode(0))
 }
 
-#[tracing::instrument(level = "trace", skip_all)]
+#[cfg_attr(feature = "otel", tracing::instrument(skip_all))]
 fn show_rustup_home(cfg: &Cfg) -> Result<utils::ExitCode> {
     writeln!(process().stdout().lock(), "{}", cfg.rustup_dir.display())?;
     Ok(utils::ExitCode(0))

src/cli/self_update.rs

@@ -1321,7 +1321,7 @@ pub(crate) async fn check_rustup_update() -> Result<()> {
     Ok(())
 }
 
-#[tracing::instrument(level = "trace")]
+#[cfg_attr(feature = "otel", tracing::instrument)]
 pub(crate) fn cleanup_self_updater() -> Result<()> {
     let cargo_home = utils::cargo_home()?;
     let setup = cargo_home.join(format!("bin/rustup-init{EXE_SUFFIX}"));

src/cli/self_update/windows.rs

@@ -264,7 +264,7 @@ fn has_windows_sdk_libs() -> bool {
 }
 
 /// Run by rustup-gc-$num.exe to delete CARGO_HOME
-#[tracing::instrument(level = "trace")]
+#[cfg_attr(feature = "otel", tracing::instrument)]
 pub fn complete_windows_uninstall() -> Result<utils::ExitCode> {
     use std::process::Stdio;
 

src/cli/setup_mode.rs

@@ -75,7 +75,7 @@ struct RustupInit {
     dump_testament: bool,
 }
 
-#[tracing::instrument(level = "trace")]
+#[cfg_attr(feature = "otel", tracing::instrument)]
 pub async fn main(current_dir: PathBuf) -> Result<utils::ExitCode> {
     use clap::error::ErrorKind;
 

src/command.rs

@@ -9,7 +9,7 @@ use anyhow::{Context, Result};
 
 use crate::errors::*;
 
-#[tracing::instrument(level = "trace", err)]
+#[cfg_attr(feature = "otel", tracing::instrument(err))]
 pub(crate) fn run_command_for_dir<S: AsRef<OsStr> + Debug>(
     mut cmd: Command,
     arg0: &str,