feat(log): unhide tracing::instrument from behind feature = "otel"

doc/dev-guide/src/tracing.md

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

src/bin/rustup-init.rs

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

src/command.rs

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

src/dist/mod.rs

@@ -823,7 +823,7 @@ pub(crate) struct DistOptions<'a> {
 // an upgrade then all the existing components will be upgraded.
 //
 // Returns the manifest's hash if anything changed.
-#[tracing::instrument(level = "trace", err, skip_all, fields(profile=format!("{:?}", opts.profile), prefix=prefix.path().to_string_lossy().to_string()))]
+#[tracing::instrument(level = "trace", err(level = "trace"), skip_all, fields(profile=format!("{:?}", opts.profile), prefix=prefix.path().to_string_lossy().to_string()))]
 pub(crate) async fn update_from_dist(
  prefix: &InstallPrefix,
  opts: &DistOptions<'_>,

src/install.rs

@@ -37,7 +37,7 @@ pub(crate) enum InstallMethod<'a> {
 
 impl<'a> InstallMethod<'a> {
  // Install a toolchain
- #[tracing::instrument(level = "trace", err, skip_all)]
+ #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
  pub(crate) async fn install(&self) -> Result<UpdateStatus> {
  let nh = &self.cfg().notify_handler;
  match self {

src/toolchain/distributable.rs

@@ -324,7 +324,7 @@ impl<'a> DistributableToolchain<'a> {
  InstallPrefix::from(self.toolchain.path().to_owned()).guess_v1_manifest()
  }
 
- #[tracing::instrument(level = "trace", err, skip_all)]
+ #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
  pub(crate) async fn install(
  cfg: &'a Cfg<'a>,
  toolchain: &ToolchainDesc,
@@ -354,7 +354,7 @@ impl<'a> DistributableToolchain<'a> {
  Ok((status, Self::new(cfg, toolchain.clone())?))
  }
 
- #[tracing::instrument(level = "trace", err, skip_all)]
+ #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
  pub async fn install_if_not_installed(
  cfg: &'a Cfg<'a>,
  desc: &ToolchainDesc,
@@ -372,7 +372,7 @@ impl<'a> DistributableToolchain<'a> {
  }
  }
 
- #[tracing::instrument(level = "trace", err, skip_all)]
+ #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
  pub(crate) async fn update(
  &mut self,
  components: &[&str],
@@ -384,7 +384,7 @@ impl<'a> DistributableToolchain<'a> {
  }
 
  /// Update a toolchain with control over the channel behaviour
- #[tracing::instrument(level = "trace", err, skip_all)]
+ #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)]
  pub(crate) async fn update_extra(
  &mut self,
  components: &[&str],