From c96628ad498e5b4a09a76afbcde6b2f4e6cc1424 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Wed, 15 Mar 2023 12:19:11 -0600 Subject: [PATCH] do not log parameters --- backend/src/action.rs | 6 ++--- backend/src/auth.rs | 16 ++++++------ backend/src/backup/backup_bulk.rs | 6 ++--- backend/src/backup/mod.rs | 4 +-- backend/src/backup/restore.rs | 8 +++--- backend/src/backup/target/mod.rs | 2 +- backend/src/bin/embassy-init.rs | 4 +-- backend/src/bin/embassyd.rs | 2 +- backend/src/config/action.rs | 6 ++--- backend/src/config/mod.rs | 14 +++++----- backend/src/context/cli.rs | 2 +- backend/src/context/diagnostic.rs | 4 +-- backend/src/context/install.rs | 4 +-- backend/src/context/rpc.rs | 12 ++++----- backend/src/context/sdk.rs | 4 +-- backend/src/context/setup.rs | 8 +++--- backend/src/control.rs | 8 +++--- backend/src/db/mod.rs | 6 ++--- backend/src/dependencies.rs | 12 ++++----- backend/src/developer/mod.rs | 2 +- backend/src/disk/fsck.rs | 4 +-- backend/src/disk/main.rs | 20 +++++++------- backend/src/disk/mount/backup.rs | 10 +++---- backend/src/disk/mount/filesystem/cifs.rs | 2 +- backend/src/disk/mount/guard.rs | 2 +- backend/src/disk/mount/util.rs | 4 +-- backend/src/disk/util.rs | 20 +++++++------- backend/src/hostname.rs | 6 ++--- backend/src/install/cleanup.rs | 12 ++++----- backend/src/install/mod.rs | 16 ++++++------ backend/src/install/update.rs | 2 +- backend/src/logs.rs | 6 ++--- backend/src/manager/health.rs | 2 +- backend/src/manager/mod.rs | 26 +++++++++--------- backend/src/middleware/encrypt.rs | 2 +- backend/src/migration.rs | 6 ++--- backend/src/net/interface.rs | 6 ++--- backend/src/net/net_controller.rs | 4 +-- backend/src/net/ssl.rs | 10 +++---- backend/src/net/tor.rs | 8 +++--- backend/src/net/wifi.rs | 32 +++++++++++------------ backend/src/notifications.rs | 4 +-- backend/src/procedure/docker.rs | 8 +++--- backend/src/procedure/js_scripts.rs | 4 +-- backend/src/procedure/mod.rs | 6 ++--- backend/src/properties.rs | 2 +- backend/src/s9pk/builder.rs | 2 +- backend/src/s9pk/mod.rs | 2 +- backend/src/s9pk/reader.rs | 8 +++--- backend/src/setup.rs | 10 +++---- backend/src/sound.rs | 8 +++--- backend/src/ssh.rs | 8 +++--- backend/src/status/health_check.rs | 4 +-- backend/src/system.rs | 10 +++---- backend/src/update/mod.rs | 8 +++--- backend/src/util/mod.rs | 2 +- backend/src/version/v0_3_2.rs | 8 +++--- backend/src/volume.rs | 6 ++--- 58 files changed, 215 insertions(+), 215 deletions(-) diff --git a/backend/src/action.rs b/backend/src/action.rs index 29ea97826..bf9844ecf 100644 --- a/backend/src/action.rs +++ b/backend/src/action.rs @@ -56,7 +56,7 @@ pub struct Action { pub input_spec: ConfigSpec, } impl Action { - #[instrument] + #[instrument(skip_all)] pub fn validate( &self, container: &Option, @@ -74,7 +74,7 @@ impl Action { }) } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn execute( &self, ctx: &RpcContext, @@ -120,7 +120,7 @@ fn display_action_result(action_result: ActionResult, matches: &ArgMatches) { } #[command(about = "Executes an action", display(display_action_result))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn action( #[context] ctx: RpcContext, #[arg(rename = "id")] pkg_id: PackageId, diff --git a/backend/src/auth.rs b/backend/src/auth.rs index b53190af5..1ccbf81df 100644 --- a/backend/src/auth.rs +++ b/backend/src/auth.rs @@ -90,7 +90,7 @@ fn gen_pwd() { ) } -#[instrument(skip(ctx, password))] +#[instrument(skip_all)] async fn cli_login( ctx: CliContext, password: Option, @@ -145,7 +145,7 @@ where display(display_none), metadata(authenticated = false) )] -#[instrument(skip(ctx, password))] +#[instrument(skip_all)] pub async fn login( #[context] ctx: RpcContext, #[request] req: &RequestParts, @@ -183,7 +183,7 @@ pub async fn login( } #[command(display(display_none), metadata(authenticated = false))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn logout( #[context] ctx: RpcContext, #[request] req: &RequestParts, @@ -250,7 +250,7 @@ fn display_sessions(arg: SessionList, matches: &ArgMatches) { } #[command(display(display_sessions))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn list( #[context] ctx: RpcContext, #[request] req: &RequestParts, @@ -296,7 +296,7 @@ impl AsLogoutSessionId for KillSessionId { } #[command(display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn kill( #[context] ctx: RpcContext, #[arg(parse(parse_comma_separated))] ids: Vec, @@ -305,7 +305,7 @@ pub async fn kill( Ok(()) } -#[instrument(skip(ctx, old_password, new_password))] +#[instrument(skip_all)] async fn cli_reset_password( ctx: CliContext, old_password: Option, @@ -369,7 +369,7 @@ impl SetPasswordReceipt { custom_cli(cli_reset_password(async, context(CliContext))), display(display_none) )] -#[instrument(skip(ctx, old_password, new_password))] +#[instrument(skip_all)] pub async fn reset_password( #[context] ctx: RpcContext, #[arg(rename = "old-password")] old_password: Option, @@ -403,7 +403,7 @@ pub async fn reset_password( display(display_none), metadata(authenticated = false) )] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn get_pubkey(#[context] ctx: RpcContext) -> Result { let secret = ctx.as_ref().clone(); let pub_key = secret.to_public_key()?; diff --git a/backend/src/backup/backup_bulk.rs b/backend/src/backup/backup_bulk.rs index 75bd9584c..0f41b443d 100644 --- a/backend/src/backup/backup_bulk.rs +++ b/backend/src/backup/backup_bulk.rs @@ -35,7 +35,7 @@ fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result, @@ -200,7 +200,7 @@ async fn assure_backing_up( Ok(()) } -#[instrument(skip(ctx, db, backup_guard))] +#[instrument(skip_all)] async fn perform_backup( ctx: &RpcContext, mut db: Db, diff --git a/backend/src/backup/mod.rs b/backend/src/backup/mod.rs index a283b18ce..0125e75b1 100644 --- a/backend/src/backup/mod.rs +++ b/backend/src/backup/mod.rs @@ -92,7 +92,7 @@ impl BackupActions { Ok(()) } - #[instrument(skip(ctx, db))] + #[instrument(skip_all)] pub async fn create( &self, ctx: &RpcContext, @@ -189,7 +189,7 @@ impl BackupActions { }) } - #[instrument(skip(ctx, db))] + #[instrument(skip_all)] pub async fn restore( &self, ctx: &RpcContext, diff --git a/backend/src/backup/restore.rs b/backend/src/backup/restore.rs index f1ae4028b..99b84e747 100644 --- a/backend/src/backup/restore.rs +++ b/backend/src/backup/restore.rs @@ -46,7 +46,7 @@ fn parse_comma_separated(arg: &str, _: &ArgMatches) -> Result, Er } #[command(rename = "restore", display(display_none))] -#[instrument(skip(ctx, password))] +#[instrument(skip_all)] pub async fn restore_packages_rpc( #[context] ctx: RpcContext, #[arg(parse(parse_comma_separated))] ids: Vec, @@ -169,7 +169,7 @@ impl ProgressInfo { } } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn recover_full_embassy( ctx: SetupContext, disk_guid: Arc, @@ -306,7 +306,7 @@ async fn restore_packages( Ok((backup_guard, tasks, progress_info)) } -#[instrument(skip(ctx, db, backup_guard))] +#[instrument(skip_all)] async fn assure_restoring( ctx: &RpcContext, db: &mut PatchDbHandle, @@ -376,7 +376,7 @@ async fn assure_restoring( Ok(guards) } -#[instrument(skip(ctx, guard))] +#[instrument(skip_all)] async fn restore_package<'a>( ctx: RpcContext, manifest: Manifest, diff --git a/backend/src/backup/target/mod.rs b/backend/src/backup/target/mod.rs index e0443160e..971787dc7 100644 --- a/backend/src/backup/target/mod.rs +++ b/backend/src/backup/target/mod.rs @@ -223,7 +223,7 @@ fn display_backup_info(info: BackupInfo, matches: &ArgMatches) { } #[command(display(display_backup_info))] -#[instrument(skip(ctx, password))] +#[instrument(skip_all)] pub async fn info( #[context] ctx: RpcContext, #[arg(rename = "target-id")] target_id: BackupTargetId, diff --git a/backend/src/bin/embassy-init.rs b/backend/src/bin/embassy-init.rs index 7c3608c02..93cbf5960 100644 --- a/backend/src/bin/embassy-init.rs +++ b/backend/src/bin/embassy-init.rs @@ -17,7 +17,7 @@ use embassy::{Error, ErrorKind, ResultExt, IS_RASPBERRY_PI}; use tokio::process::Command; use tracing::instrument; -#[instrument] +#[instrument(skip_all)] async fn setup_or_init(cfg_path: Option) -> Result<(), Error> { if tokio::fs::metadata("/cdrom").await.is_ok() { let ctx = InstallContext::init(cfg_path).await?; @@ -117,7 +117,7 @@ async fn run_script_if_exists>(path: P) { } } -#[instrument] +#[instrument(skip_all)] async fn inner_main(cfg_path: Option) -> Result, Error> { if *IS_RASPBERRY_PI && tokio::fs::metadata(STANDBY_MODE_PATH).await.is_ok() { tokio::fs::remove_file(STANDBY_MODE_PATH).await?; diff --git a/backend/src/bin/embassyd.rs b/backend/src/bin/embassyd.rs index 95134f308..fdf636c25 100644 --- a/backend/src/bin/embassyd.rs +++ b/backend/src/bin/embassyd.rs @@ -12,7 +12,7 @@ use futures::{FutureExt, TryFutureExt}; use tokio::signal::unix::signal; use tracing::instrument; -#[instrument] +#[instrument(skip_all)] async fn inner_main(cfg_path: Option) -> Result, Error> { let (rpc_ctx, server, shutdown) = { let rpc_ctx = RpcContext::init( diff --git a/backend/src/config/action.rs b/backend/src/config/action.rs index 84360b7b1..0684d689e 100644 --- a/backend/src/config/action.rs +++ b/backend/src/config/action.rs @@ -31,7 +31,7 @@ pub struct ConfigActions { pub set: PackageProcedure, } impl ConfigActions { - #[instrument] + #[instrument(skip_all)] pub fn validate( &self, container: &Option, @@ -47,7 +47,7 @@ impl ConfigActions { .with_ctx(|_| (crate::ErrorKind::ValidateS9pk, "Config Set"))?; Ok(()) } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn get( &self, ctx: &RpcContext, @@ -71,7 +71,7 @@ impl ConfigActions { }) } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn set( &self, ctx: &RpcContext, diff --git a/backend/src/config/mod.rs b/backend/src/config/mod.rs index 66d5c52c2..2beef4fa1 100644 --- a/backend/src/config/mod.rs +++ b/backend/src/config/mod.rs @@ -214,7 +214,7 @@ impl ConfigGetReceipts { } #[command(display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn get( #[context] ctx: RpcContext, #[parent_data] id: PackageId, @@ -240,7 +240,7 @@ pub async fn get( display(display_none), metadata(sync_db = true) )] -#[instrument] +#[instrument(skip_all)] pub fn set( #[parent_data] id: PackageId, #[allow(unused_variables)] @@ -413,7 +413,7 @@ impl ConfigReceipts { } #[command(rename = "dry", display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn set_dry( #[context] ctx: RpcContext, #[parent_data] (id, config, timeout): (PackageId, Option, Option), @@ -440,7 +440,7 @@ pub async fn set_dry( Ok(BreakageRes(breakages)) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn set_impl( ctx: RpcContext, (id, config, timeout): (PackageId, Option, Option), @@ -465,7 +465,7 @@ pub async fn set_impl( Ok(()) } -#[instrument(skip(ctx, db, receipts))] +#[instrument(skip_all)] pub async fn configure<'a, Db: DbHandle>( ctx: &RpcContext, db: &'a mut Db, @@ -485,7 +485,7 @@ pub async fn configure<'a, Db: DbHandle>( Ok(()) } -#[instrument(skip(ctx, db, receipts))] +#[instrument(skip_all)] pub fn configure_rec<'a, Db: DbHandle>( ctx: &'a RpcContext, db: &'a mut Db, @@ -771,7 +771,7 @@ pub fn configure_rec<'a, Db: DbHandle>( } .boxed() } -#[instrument] +#[instrument(skip_all)] pub fn not_found() -> Error { Error::new(eyre!("Could not find"), crate::ErrorKind::Incoherent) } diff --git a/backend/src/context/cli.rs b/backend/src/context/cli.rs index 51ec25cff..df200dd86 100644 --- a/backend/src/context/cli.rs +++ b/backend/src/context/cli.rs @@ -68,7 +68,7 @@ const DEFAULT_PORT: u16 = 5959; pub struct CliContext(Arc); impl CliContext { /// BLOCKING - #[instrument(skip(matches))] + #[instrument(skip_all)] pub fn init(matches: &ArgMatches) -> Result { let local_config_path = local_config_path(); let base: CliContextConfig = load_config_from_paths( diff --git a/backend/src/context/diagnostic.rs b/backend/src/context/diagnostic.rs index 9c853a4eb..151948d7c 100644 --- a/backend/src/context/diagnostic.rs +++ b/backend/src/context/diagnostic.rs @@ -18,7 +18,7 @@ pub struct DiagnosticContextConfig { pub datadir: Option, } impl DiagnosticContextConfig { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn load + Send + 'static>(path: Option

) -> Result { tokio::task::spawn_blocking(move || { load_config_from_paths( @@ -52,7 +52,7 @@ pub struct DiagnosticContextSeed { #[derive(Clone)] pub struct DiagnosticContext(Arc); impl DiagnosticContext { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn init + Send + 'static>( path: Option

, disk_guid: Option>, diff --git a/backend/src/context/install.rs b/backend/src/context/install.rs index c5ae8000e..87484b7e5 100644 --- a/backend/src/context/install.rs +++ b/backend/src/context/install.rs @@ -15,7 +15,7 @@ use crate::Error; #[serde(rename_all = "kebab-case")] pub struct InstallContextConfig {} impl InstallContextConfig { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn load + Send + 'static>(path: Option

) -> Result { tokio::task::spawn_blocking(move || { load_config_from_paths( @@ -38,7 +38,7 @@ pub struct InstallContextSeed { #[derive(Clone)] pub struct InstallContext(Arc); impl InstallContext { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn init + Send + 'static>(path: Option

) -> Result { let _cfg = InstallContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?; let (shutdown, _) = tokio::sync::broadcast::channel(1); diff --git a/backend/src/context/rpc.rs b/backend/src/context/rpc.rs index 420fc0bb5..cdb9ec909 100644 --- a/backend/src/context/rpc.rs +++ b/backend/src/context/rpc.rs @@ -86,7 +86,7 @@ impl RpcContextConfig { } Ok(db) } - #[instrument] + #[instrument(skip_all)] pub async fn secret_store(&self) -> Result { init_postgres(self.datadir()).await?; let secret_store = @@ -173,7 +173,7 @@ impl RpcCleanReceipts { #[derive(Clone)] pub struct RpcContext(Arc); impl RpcContext { - #[instrument(skip(cfg_path))] + #[instrument(skip_all)] pub async fn init + Send + 'static>( cfg_path: Option

, disk_guid: Arc, @@ -260,7 +260,7 @@ impl RpcContext { Ok(res) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn shutdown(self) -> Result<(), Error> { self.managers.empty().await?; self.secret_store.close().await; @@ -270,7 +270,7 @@ impl RpcContext { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn cleanup(&self) -> Result<(), Error> { let mut db = self.db.handle(); let receipts = RpcCleanReceipts::new(&mut db).await?; @@ -348,7 +348,7 @@ impl RpcContext { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn clean_continuations(&self) { let mut continuations = self.rpc_stream_continuations.lock().await; let mut to_remove = Vec::new(); @@ -362,7 +362,7 @@ impl RpcContext { } } - #[instrument(skip(self, handler))] + #[instrument(skip_all)] pub async fn add_continuation(&self, guid: RequestGuid, handler: RpcContinuation) { self.clean_continuations().await; self.rpc_stream_continuations diff --git a/backend/src/context/sdk.rs b/backend/src/context/sdk.rs index a4924d1ce..87adaee1f 100644 --- a/backend/src/context/sdk.rs +++ b/backend/src/context/sdk.rs @@ -25,7 +25,7 @@ pub struct SdkContextSeed { pub struct SdkContext(Arc); impl SdkContext { /// BLOCKING - #[instrument(skip(matches))] + #[instrument(skip_all)] pub fn init(matches: &ArgMatches) -> Result { let local_config_path = local_config_path(); let base: SdkContextConfig = load_config_from_paths( @@ -49,7 +49,7 @@ impl SdkContext { }))) } /// BLOCKING - #[instrument] + #[instrument(skip_all)] pub fn developer_key(&self) -> Result { if !self.developer_key_path.exists() { return Err(Error::new(eyre!("Developer Key does not exist! Please run `embassy-sdk init` before running this command."), crate::ErrorKind::Uninitialized)); diff --git a/backend/src/context/setup.rs b/backend/src/context/setup.rs index 0f8cf9641..283ac922f 100644 --- a/backend/src/context/setup.rs +++ b/backend/src/context/setup.rs @@ -47,7 +47,7 @@ pub struct SetupContextConfig { pub datadir: Option, } impl SetupContextConfig { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn load + Send + 'static>(path: Option

) -> Result { tokio::task::spawn_blocking(move || { load_config_from_paths( @@ -92,7 +92,7 @@ impl AsRef for SetupContextSeed { #[derive(Clone)] pub struct SetupContext(Arc); impl SetupContext { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn init + Send + 'static>(path: Option

) -> Result { let cfg = SetupContextConfig::load(path.as_ref().map(|p| p.as_ref().to_owned())).await?; let (shutdown, _) = tokio::sync::broadcast::channel(1); @@ -110,7 +110,7 @@ impl SetupContext { setup_result: RwLock::new(None), }))) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn db(&self, account: &AccountInfo) -> Result { let db_path = self.datadir.join("main").join("embassy.db"); let db = PatchDb::open(&db_path) @@ -122,7 +122,7 @@ impl SetupContext { } Ok(db) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn secret_store(&self) -> Result { init_postgres(&self.datadir).await?; let secret_store = diff --git a/backend/src/control.rs b/backend/src/control.rs index fe105dc04..c0cd6e822 100644 --- a/backend/src/control.rs +++ b/backend/src/control.rs @@ -61,7 +61,7 @@ impl StartReceipts { } #[command(display(display_none), metadata(sync_db = true))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn start(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Result<(), Error> { let mut db = ctx.db.handle(); let mut tx = db.begin().await?; @@ -120,7 +120,7 @@ impl StopReceipts { } } -#[instrument(skip(db))] +#[instrument(skip_all)] pub async fn stop_common( db: &mut Db, id: &PackageId, @@ -154,7 +154,7 @@ pub fn stop(#[arg] id: PackageId) -> Result { } #[command(rename = "dry", display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn stop_dry( #[context] ctx: RpcContext, #[parent_data] id: PackageId, @@ -170,7 +170,7 @@ pub async fn stop_dry( Ok(BreakageRes(breakages)) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn stop_impl(ctx: RpcContext, id: PackageId) -> Result { let mut db = ctx.db.handle(); let mut tx = db.begin().await?; diff --git a/backend/src/db/mod.rs b/backend/src/db/mod.rs index 8da388408..f51c8d156 100644 --- a/backend/src/db/mod.rs +++ b/backend/src/db/mod.rs @@ -27,7 +27,7 @@ use crate::middleware::auth::{HasValidSession, HashSessionToken}; use crate::util::serde::{display_serializable, IoFormat}; use crate::{Error, ResultExt}; -#[instrument(skip(ctx, session, ws_fut))] +#[instrument(skip_all)] async fn ws_handler< WSFut: Future, HyperError>, JoinError>>, >( @@ -73,7 +73,7 @@ async fn subscribe_to_session_kill( recv } -#[instrument(skip(_has_valid_authentication, kill, sub, stream))] +#[instrument(skip_all)] async fn deal_with_messages( _has_valid_authentication: HasValidSession, mut kill: oneshot::Receiver<()>, @@ -205,7 +205,7 @@ pub fn put() -> Result<(), RpcError> { } #[command(display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn ui( #[context] ctx: RpcContext, #[arg] pointer: JsonPointer, diff --git a/backend/src/dependencies.rs b/backend/src/dependencies.rs index 29982bf58..96c1562b2 100644 --- a/backend/src/dependencies.rs +++ b/backend/src/dependencies.rs @@ -191,7 +191,7 @@ impl DependencyError { (DependencyError::Transitive, _) => DependencyError::Transitive, } } - #[instrument(skip(ctx, db, receipts))] + #[instrument(skip_all)] pub fn try_heal<'a, Db: DbHandle>( self, ctx: &'a RpcContext, @@ -693,7 +693,7 @@ pub struct ConfigDryRes { } #[command(rename = "dry", display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn configure_dry( #[context] ctx: RpcContext, #[parent_data] (pkg_id, dependency_id): (PackageId, PackageId), @@ -784,7 +784,7 @@ pub async fn configure_logic( spec, }) } -#[instrument(skip(db, current_dependencies, current_dependent_receipt))] +#[instrument(skip_all)] pub async fn add_dependent_to_current_dependents_lists<'a, Db: DbHandle>( db: &mut Db, dependent_id: &PackageId, @@ -919,7 +919,7 @@ impl BreakTransitiveReceipts { } } -#[instrument(skip(db, receipts))] +#[instrument(skip_all)] pub fn break_transitive<'a, Db: DbHandle>( db: &'a mut Db, id: &'a PackageId, @@ -986,7 +986,7 @@ pub fn break_transitive<'a, Db: DbHandle>( .boxed() } -#[instrument(skip(ctx, db, locks))] +#[instrument(skip_all)] pub async fn heal_all_dependents_transitive<'a, Db: DbHandle>( ctx: &'a RpcContext, db: &'a mut Db, @@ -1004,7 +1004,7 @@ pub async fn heal_all_dependents_transitive<'a, Db: DbHandle>( Ok(()) } -#[instrument(skip(ctx, db, receipts))] +#[instrument(skip_all)] pub fn heal_transitive<'a, Db: DbHandle>( ctx: &'a RpcContext, db: &'a mut Db, diff --git a/backend/src/developer/mod.rs b/backend/src/developer/mod.rs index 7d346aa56..70b40699e 100644 --- a/backend/src/developer/mod.rs +++ b/backend/src/developer/mod.rs @@ -12,7 +12,7 @@ use crate::util::display_none; use crate::{Error, ResultExt}; #[command(cli_only, blocking, display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub fn init(#[context] ctx: SdkContext) -> Result<(), Error> { if !ctx.developer_key_path.exists() { let parent = ctx.developer_key_path.parent().unwrap_or(Path::new("/")); diff --git a/backend/src/disk/fsck.rs b/backend/src/disk/fsck.rs index 1ae0be512..208c5401e 100644 --- a/backend/src/disk/fsck.rs +++ b/backend/src/disk/fsck.rs @@ -35,7 +35,7 @@ impl RepairStrategy { } } -#[instrument] +#[instrument(skip_all)] pub async fn e2fsck_preen( logicalname: impl AsRef + std::fmt::Debug, ) -> Result { @@ -59,7 +59,7 @@ fn backup_existing_undo_file<'a>(path: &'a Path) -> BoxFuture<'a, Result<(), Err .boxed() } -#[instrument] +#[instrument(skip_all)] pub async fn e2fsck_aggressive( logicalname: impl AsRef + std::fmt::Debug, ) -> Result { diff --git a/backend/src/disk/main.rs b/backend/src/disk/main.rs index 8a4712a20..35852505a 100644 --- a/backend/src/disk/main.rs +++ b/backend/src/disk/main.rs @@ -17,7 +17,7 @@ pub const PASSWORD_PATH: &'static str = "/etc/embassy/password"; pub const DEFAULT_PASSWORD: &'static str = "password"; pub const MAIN_FS_SIZE: FsSize = FsSize::Gigabytes(8); -#[instrument(skip(disks, datadir, password))] +#[instrument(skip_all)] pub async fn create( disks: &I, pvscan: &BTreeMap>, @@ -34,7 +34,7 @@ where Ok(guid) } -#[instrument(skip(disks))] +#[instrument(skip_all)] pub async fn create_pool( disks: &I, pvscan: &BTreeMap>, @@ -84,7 +84,7 @@ pub enum FsSize { FreePercentage(usize), } -#[instrument(skip(datadir, password))] +#[instrument(skip_all)] pub async fn create_fs>( guid: &str, datadir: P, @@ -139,7 +139,7 @@ pub async fn create_fs>( Ok(()) } -#[instrument(skip(datadir, password))] +#[instrument(skip_all)] pub async fn create_all_fs>( guid: &str, datadir: P, @@ -157,7 +157,7 @@ pub async fn create_all_fs>( Ok(()) } -#[instrument(skip(datadir))] +#[instrument(skip_all)] pub async fn unmount_fs>(guid: &str, datadir: P, name: &str) -> Result<(), Error> { unmount(datadir.as_ref().join(name)).await?; Command::new("cryptsetup") @@ -170,7 +170,7 @@ pub async fn unmount_fs>(guid: &str, datadir: P, name: &str) -> R Ok(()) } -#[instrument(skip(datadir))] +#[instrument(skip_all)] pub async fn unmount_all_fs>(guid: &str, datadir: P) -> Result<(), Error> { unmount_fs(guid, &datadir, "main").await?; unmount_fs(guid, &datadir, "package-data").await?; @@ -181,7 +181,7 @@ pub async fn unmount_all_fs>(guid: &str, datadir: P) -> Result<() Ok(()) } -#[instrument(skip(datadir))] +#[instrument(skip_all)] pub async fn export>(guid: &str, datadir: P) -> Result<(), Error> { Command::new("sync").invoke(ErrorKind::Filesystem).await?; unmount_all_fs(guid, datadir).await?; @@ -197,7 +197,7 @@ pub async fn export>(guid: &str, datadir: P) -> Result<(), Error> Ok(()) } -#[instrument(skip(datadir, password))] +#[instrument(skip_all)] pub async fn import>( guid: &str, datadir: P, @@ -254,7 +254,7 @@ pub async fn import>( mount_all_fs(guid, datadir, repair, password).await } -#[instrument(skip(datadir, password))] +#[instrument(skip_all)] pub async fn mount_fs>( guid: &str, datadir: P, @@ -285,7 +285,7 @@ pub async fn mount_fs>( Ok(reboot) } -#[instrument(skip(datadir, password))] +#[instrument(skip_all)] pub async fn mount_all_fs>( guid: &str, datadir: P, diff --git a/backend/src/disk/mount/backup.rs b/backend/src/disk/mount/backup.rs index ce9e09784..a3e239b2b 100644 --- a/backend/src/disk/mount/backup.rs +++ b/backend/src/disk/mount/backup.rs @@ -35,7 +35,7 @@ impl BackupMountGuard { } } - #[instrument(skip(password))] + #[instrument(skip_all)] pub async fn mount(backup_disk_mount_guard: G, password: &str) -> Result { let backup_disk_path = backup_disk_mount_guard.as_ref(); let unencrypted_metadata_path = @@ -145,7 +145,7 @@ impl BackupMountGuard { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn mount_package_backup( &self, id: &PackageId, @@ -159,7 +159,7 @@ impl BackupMountGuard { }) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn save(&self) -> Result<(), Error> { let metadata_path = self.as_ref().join("metadata.cbor"); let backup_disk_path = self.backup_disk_path(); @@ -180,7 +180,7 @@ impl BackupMountGuard { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn unmount(mut self) -> Result<(), Error> { if let Some(guard) = self.encrypted_guard.take() { guard.unmount().await?; @@ -191,7 +191,7 @@ impl BackupMountGuard { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn save_and_unmount(self) -> Result<(), Error> { self.save().await?; self.unmount().await?; diff --git a/backend/src/disk/mount/filesystem/cifs.rs b/backend/src/disk/mount/filesystem/cifs.rs index 5eafe2841..7dfcb207d 100644 --- a/backend/src/disk/mount/filesystem/cifs.rs +++ b/backend/src/disk/mount/filesystem/cifs.rs @@ -33,7 +33,7 @@ async fn resolve_hostname(hostname: &str) -> Result { .parse()?) } -#[instrument(skip(path, password, mountpoint))] +#[instrument(skip_all)] pub async fn mount_cifs( hostname: &str, path: impl AsRef, diff --git a/backend/src/disk/mount/guard.rs b/backend/src/disk/mount/guard.rs index 3720a2125..617afeb08 100644 --- a/backend/src/disk/mount/guard.rs +++ b/backend/src/disk/mount/guard.rs @@ -95,7 +95,7 @@ pub struct TmpMountGuard { } impl TmpMountGuard { /// DRAGONS: if you try to mount something as ro and rw at the same time, the ro mount will be upgraded to rw. - #[instrument(skip(filesystem))] + #[instrument(skip_all)] pub async fn mount(filesystem: &impl FileSystem, mount_type: MountType) -> Result { let mountpoint = tmp_mountpoint(filesystem).await?; let mut tmp_mounts = TMP_MOUNTS.lock().await; diff --git a/backend/src/disk/mount/util.rs b/backend/src/disk/mount/util.rs index 803aa3d90..18fbcbe05 100644 --- a/backend/src/disk/mount/util.rs +++ b/backend/src/disk/mount/util.rs @@ -5,7 +5,7 @@ use tracing::instrument; use crate::util::Invoke; use crate::{Error, ResultExt}; -#[instrument(skip(src, dst))] +#[instrument(skip_all)] pub async fn bind, P1: AsRef>( src: P0, dst: P1, @@ -40,7 +40,7 @@ pub async fn bind, P1: AsRef>( Ok(()) } -#[instrument(skip(mountpoint))] +#[instrument(skip_all)] pub async fn unmount>(mountpoint: P) -> Result<(), Error> { tracing::debug!("Unmounting {}.", mountpoint.as_ref().display()); tokio::process::Command::new("umount") diff --git a/backend/src/disk/util.rs b/backend/src/disk/util.rs index 9c98c97c0..46c4f512e 100644 --- a/backend/src/disk/util.rs +++ b/backend/src/disk/util.rs @@ -69,7 +69,7 @@ lazy_static::lazy_static! { static ref PARTITION_REGEX: Regex = Regex::new("-part[0-9]+$").unwrap(); } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_partition_table>(path: P) -> Result, Error> { Ok(String::from_utf8( Command::new("fdisk") @@ -87,7 +87,7 @@ pub async fn get_partition_table>(path: P) -> Result>(path: P) -> Result, Error> { let vendor = tokio::fs::read_to_string( Path::new(SYS_BLOCK_PATH) @@ -110,7 +110,7 @@ pub async fn get_vendor>(path: P) -> Result, Error }) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_model>(path: P) -> Result, Error> { let model = tokio::fs::read_to_string( Path::new(SYS_BLOCK_PATH) @@ -129,7 +129,7 @@ pub async fn get_model>(path: P) -> Result, Error> Ok(if model.is_empty() { None } else { Some(model) }) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_capacity>(path: P) -> Result { Ok(String::from_utf8( Command::new("blockdev") @@ -142,7 +142,7 @@ pub async fn get_capacity>(path: P) -> Result { .parse::()?) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_label>(path: P) -> Result, Error> { let label = String::from_utf8( Command::new("lsblk") @@ -157,7 +157,7 @@ pub async fn get_label>(path: P) -> Result, Error> Ok(if label.is_empty() { None } else { Some(label) }) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_used>(path: P) -> Result { Ok(String::from_utf8( Command::new("df") @@ -175,7 +175,7 @@ pub async fn get_used>(path: P) -> Result { .parse::()?) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_available>(path: P) -> Result { Ok(String::from_utf8( Command::new("df") @@ -193,7 +193,7 @@ pub async fn get_available>(path: P) -> Result { .parse::()?) } -#[instrument(skip(path))] +#[instrument(skip_all)] pub async fn get_percentage>(path: P) -> Result { Ok(String::from_utf8( Command::new("df") @@ -212,7 +212,7 @@ pub async fn get_percentage>(path: P) -> Result { .parse::()?) } -#[instrument] +#[instrument(skip_all)] pub async fn pvscan() -> Result>, Error> { let pvscan_out = Command::new("pvscan") .invoke(crate::ErrorKind::DiskManagement) @@ -248,7 +248,7 @@ pub async fn recovery_info( Ok(None) } -#[instrument] +#[instrument(skip_all)] pub async fn list(os: &OsPartitionInfo) -> Result, Error> { struct DiskIndex { parts: IndexSet, diff --git a/backend/src/hostname.rs b/backend/src/hostname.rs index ed9037968..ec5789910 100644 --- a/backend/src/hostname.rs +++ b/backend/src/hostname.rs @@ -44,7 +44,7 @@ pub fn generate_id() -> String { id.to_string() } -#[instrument] +#[instrument(skip_all)] pub async fn get_current_hostname() -> Result { let out = Command::new("hostname") .invoke(ErrorKind::ParseSysInfo) @@ -53,7 +53,7 @@ pub async fn get_current_hostname() -> Result { Ok(Hostname(out_string.trim().to_owned())) } -#[instrument] +#[instrument(skip_all)] pub async fn set_hostname(hostname: &Hostname) -> Result<(), Error> { let hostname: &String = &hostname.0; let _out = Command::new("hostnamectl") @@ -64,7 +64,7 @@ pub async fn set_hostname(hostname: &Hostname) -> Result<(), Error> { Ok(()) } -#[instrument] +#[instrument(skip_all)] pub async fn sync_hostname(account: &AccountInfo) -> Result<(), Error> { set_hostname(&account.hostname).await?; Command::new("systemctl") diff --git a/backend/src/install/cleanup.rs b/backend/src/install/cleanup.rs index 65de230fb..f56c733c3 100644 --- a/backend/src/install/cleanup.rs +++ b/backend/src/install/cleanup.rs @@ -62,7 +62,7 @@ impl UpdateDependencyReceipts { } } -#[instrument(skip(ctx, db, deps, receipts))] +#[instrument(skip_all)] pub async fn update_dependency_errors_of_dependents<'a, Db: DbHandle>( ctx: &RpcContext, db: &mut Db, @@ -99,7 +99,7 @@ pub async fn update_dependency_errors_of_dependents<'a, Db: DbHandle>( Ok(()) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn cleanup(ctx: &RpcContext, id: &PackageId, version: &Version) -> Result<(), Error> { let mut errors = ErrorCollection::new(); ctx.managers.remove(&(id.clone(), version.clone())).await; @@ -204,7 +204,7 @@ impl CleanupFailedReceipts { } } -#[instrument(skip(ctx, db, receipts))] +#[instrument(skip_all)] pub async fn cleanup_failed( ctx: &RpcContext, db: &mut Db, @@ -272,7 +272,7 @@ pub async fn cleanup_failed( Ok(()) } -#[instrument(skip(db, current_dependencies, current_dependent_receipt))] +#[instrument(skip_all)] pub async fn remove_from_current_dependents_lists<'a, Db: DbHandle>( db: &mut Db, id: &'a PackageId, @@ -340,7 +340,7 @@ impl UninstallReceipts { } } } -#[instrument(skip(ctx, secrets, db))] +#[instrument(skip_all)] pub async fn uninstall( ctx: &RpcContext, db: &mut PatchDbHandle, @@ -404,7 +404,7 @@ where Ok(()) } -#[instrument(skip(secrets))] +#[instrument(skip_all)] pub async fn remove_tor_keys(secrets: &mut Ex, id: &PackageId) -> Result<(), Error> where for<'a> &'a mut Ex: Executor<'a, Database = Postgres>, diff --git a/backend/src/install/mod.rs b/backend/src/install/mod.rs index 4a6a94871..e63cfa52f 100644 --- a/backend/src/install/mod.rs +++ b/backend/src/install/mod.rs @@ -116,7 +116,7 @@ impl std::fmt::Display for MinMax { display(display_none), metadata(sync_db = true) )] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn install( #[context] ctx: RpcContext, #[arg] id: String, @@ -326,7 +326,7 @@ pub async fn install( } #[command(rpc_only, display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn sideload( #[context] ctx: RpcContext, #[arg] manifest: Manifest, @@ -482,7 +482,7 @@ pub async fn sideload( Ok(guid) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] async fn cli_install( ctx: CliContext, target: String, @@ -574,7 +574,7 @@ pub async fn uninstall(#[arg] id: PackageId) -> Result { } #[command(rename = "dry", display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn uninstall_dry( #[context] ctx: RpcContext, #[parent_data] id: PackageId, @@ -597,7 +597,7 @@ pub async fn uninstall_dry( Ok(BreakageRes(breakages)) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn uninstall_impl(ctx: RpcContext, id: PackageId) -> Result<(), Error> { let mut handle = ctx.db.handle(); let mut tx = handle.begin().await?; @@ -700,7 +700,7 @@ impl DownloadInstallReceipts { } } -#[instrument(skip(ctx, temp_manifest, s9pk))] +#[instrument(skip_all)] pub async fn download_install_s9pk( ctx: &RpcContext, temp_manifest: &Manifest, @@ -873,7 +873,7 @@ impl InstallS9Receipts { } } -#[instrument(skip(ctx, rdr))] +#[instrument(skip_all)] pub async fn install_s9pk( ctx: &RpcContext, pkg_id: &PackageId, @@ -1402,7 +1402,7 @@ pub async fn install_s9pk( Ok(()) } -#[instrument(skip(datadir))] +#[instrument(skip_all)] pub fn load_images<'a, P: AsRef + 'a + Send + Sync>( datadir: P, ) -> BoxFuture<'a, Result<(), Error>> { diff --git a/backend/src/install/update.rs b/backend/src/install/update.rs index 9acac4830..6bd062c99 100644 --- a/backend/src/install/update.rs +++ b/backend/src/install/update.rs @@ -60,7 +60,7 @@ pub async fn update() -> Result<(), Error> { Ok(()) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] #[command(display(display_serializable))] pub async fn dry( #[context] ctx: RpcContext, diff --git a/backend/src/logs.rs b/backend/src/logs.rs index 97bd15eaf..af3a6898d 100644 --- a/backend/src/logs.rs +++ b/backend/src/logs.rs @@ -64,7 +64,7 @@ impl Stream for LogStream { } } -#[instrument(skip(logs, ws_fut))] +#[instrument(skip_all)] async fn ws_handler< WSFut: Future, HyperError>, JoinError>>, >( @@ -409,7 +409,7 @@ async fn journalctl( }) } -#[instrument] +#[instrument(skip_all)] pub async fn fetch_logs( id: LogSource, limit: Option, @@ -456,7 +456,7 @@ pub async fn fetch_logs( }) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn follow_logs( ctx: RpcContext, id: LogSource, diff --git a/backend/src/manager/health.rs b/backend/src/manager/health.rs index 9322bdf24..909c4cfc5 100644 --- a/backend/src/manager/health.rs +++ b/backend/src/manager/health.rs @@ -90,7 +90,7 @@ impl HealthCheckStatusReceipt { } } -#[instrument(skip(ctx, db))] +#[instrument(skip_all)] pub async fn check( ctx: &RpcContext, db: &mut Db, diff --git a/backend/src/manager/mod.rs b/backend/src/manager/mod.rs index d42034a1e..518fac41d 100644 --- a/backend/src/manager/mod.rs +++ b/backend/src/manager/mod.rs @@ -39,7 +39,7 @@ pub const HEALTH_CHECK_GRACE_PERIOD_SECONDS: u64 = 5; #[derive(Default)] pub struct ManagerMap(RwLock>>); impl ManagerMap { - #[instrument(skip(self, ctx, db, secrets))] + #[instrument(skip_all)] pub async fn init( &self, ctx: &RpcContext, @@ -78,7 +78,7 @@ impl ManagerMap { Ok(()) } - #[instrument(skip(self, ctx))] + #[instrument(skip_all)] pub async fn add(&self, ctx: RpcContext, manifest: Manifest) -> Result<(), Error> { let mut lock = self.0.write().await; let id = (manifest.id.clone(), manifest.version.clone()); @@ -91,7 +91,7 @@ impl ManagerMap { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn remove(&self, id: &(PackageId, Version)) { if let Some(man) = self.0.write().await.remove(id) { if let Err(e) = man.exit().await { @@ -101,7 +101,7 @@ impl ManagerMap { } } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn empty(&self) -> Result<(), Error> { let res = futures::future::join_all(std::mem::take(&mut *self.0.write().await).into_iter().map( @@ -128,7 +128,7 @@ impl ManagerMap { }) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn get(&self, id: &(PackageId, Version)) -> Option> { self.0.read().await.get(id).cloned() } @@ -174,7 +174,7 @@ pub enum OnStop { Exit, } -#[instrument(skip(state))] +#[instrument(skip_all)] async fn run_main( state: &Arc, ) -> Result, Error> { @@ -232,7 +232,7 @@ async fn start_up_image( } impl Manager { - #[instrument(skip(ctx))] + #[instrument(skip_all)] async fn create(ctx: RpcContext, manifest: Manifest) -> Result { let (on_stop, recv) = channel(OnStop::Sleep); let seed = Arc::new(ManagerSeed { @@ -271,7 +271,7 @@ impl Manager { send_signal(&self.shared, signal).await } - #[instrument(skip(self))] + #[instrument(skip_all)] async fn exit(&self) -> Result<(), Error> { self.shared .commit_health_check_results @@ -433,7 +433,7 @@ pub struct PersistentContainer { } impl PersistentContainer { - #[instrument(skip(seed))] + #[instrument(skip_all)] async fn init(seed: &Arc) -> Result, Error> { Ok(if let Some(containers) = &seed.manifest.containers { let (running_docker, rpc_client) = @@ -722,7 +722,7 @@ fn sigterm_timeout(manifest: &Manifest) -> Option { } } -#[instrument(skip(shared))] +#[instrument(skip_all)] async fn stop(shared: &ManagerSharedState) -> Result<(), Error> { shared .commit_health_check_results @@ -746,7 +746,7 @@ async fn stop(shared: &ManagerSharedState) -> Result<(), Error> { Ok(()) } -#[instrument(skip(shared))] +#[instrument(skip_all)] async fn start(shared: &ManagerSharedState) -> Result<(), Error> { shared.on_stop.send_modify(|status| { if matches!(*status, OnStop::Sleep) { @@ -761,7 +761,7 @@ async fn start(shared: &ManagerSharedState) -> Result<(), Error> { Ok(()) } -#[instrument(skip(shared))] +#[instrument(skip_all)] async fn pause(shared: &ManagerSharedState) -> Result<(), Error> { if let Err(e) = shared .seed @@ -778,7 +778,7 @@ async fn pause(shared: &ManagerSharedState) -> Result<(), Error> { Ok(()) } -#[instrument(skip(shared))] +#[instrument(skip_all)] async fn resume(shared: &ManagerSharedState) -> Result<(), Error> { shared .seed diff --git a/backend/src/middleware/encrypt.rs b/backend/src/middleware/encrypt.rs index e79ceea92..6eb8ed967 100644 --- a/backend/src/middleware/encrypt.rs +++ b/backend/src/middleware/encrypt.rs @@ -47,7 +47,7 @@ pub struct EncryptedWire { encrypted: serde_json::Value, } impl EncryptedWire { - #[instrument(skip(current_secret))] + #[instrument(skip_all)] pub fn decrypt(self, current_secret: impl AsRef) -> Option { let current_secret = current_secret.as_ref(); diff --git a/backend/src/migration.rs b/backend/src/migration.rs index 620433ead..56d3e50e0 100644 --- a/backend/src/migration.rs +++ b/backend/src/migration.rs @@ -24,7 +24,7 @@ pub struct Migrations { pub to: IndexMap, } impl Migrations { - #[instrument] + #[instrument(skip_all)] pub fn validate( &self, container: &Option, @@ -55,7 +55,7 @@ impl Migrations { Ok(()) } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub fn from<'a>( &'a self, container: &'a Option, @@ -95,7 +95,7 @@ impl Migrations { } } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub fn to<'a>( &'a self, ctx: &'a RpcContext, diff --git a/backend/src/net/interface.rs b/backend/src/net/interface.rs index ca8b9719b..c7929ab65 100644 --- a/backend/src/net/interface.rs +++ b/backend/src/net/interface.rs @@ -16,7 +16,7 @@ use crate::{Error, ResultExt}; #[serde(rename_all = "kebab-case")] pub struct Interfaces(pub BTreeMap); // TODO impl Interfaces { - #[instrument] + #[instrument(skip_all)] pub fn validate(&self) -> Result<(), Error> { for (_, interface) in &self.0 { interface.validate().with_ctx(|_| { @@ -28,7 +28,7 @@ impl Interfaces { } Ok(()) } - #[instrument(skip(secrets))] + #[instrument(skip_all)] pub async fn install( &self, secrets: &mut Ex, @@ -90,7 +90,7 @@ pub struct Interface { pub protocols: IndexSet, } impl Interface { - #[instrument] + #[instrument(skip_all)] pub fn validate(&self) -> Result<(), color_eyre::eyre::Report> { if self.tor_config.is_some() && !self.protocols.contains("tcp") { color_eyre::eyre::bail!("must support tcp to set up a tor hidden service"); diff --git a/backend/src/net/net_controller.rs b/backend/src/net/net_controller.rs index 65631e0b5..2bccd99f8 100644 --- a/backend/src/net/net_controller.rs +++ b/backend/src/net/net_controller.rs @@ -31,7 +31,7 @@ pub struct NetController { } impl NetController { - #[instrument] + #[instrument(skip_all)] pub async fn init( tor_control: SocketAddr, dns_bind: &[SocketAddr], @@ -139,7 +139,7 @@ impl NetController { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn create_service( self: &Arc, package: PackageId, diff --git a/backend/src/net/ssl.rs b/backend/src/net/ssl.rs index fd052f18e..16b8cf6f1 100644 --- a/backend/src/net/ssl.rs +++ b/backend/src/net/ssl.rs @@ -143,21 +143,21 @@ pub async fn export_cert(chain: &[&X509], target: &Path) -> Result<(), Error> { Ok(()) } -#[instrument] +#[instrument(skip_all)] fn rand_serial() -> Result { let mut bn = BigNum::new()?; bn.rand(64, MsbOption::MAYBE_ZERO, false)?; let asn1 = Asn1Integer::from_bn(&bn)?; Ok(asn1) } -#[instrument] +#[instrument(skip_all)] pub fn generate_key() -> Result, Error> { let new_key = EcKey::generate(EC_GROUP.as_ref())?; let key = PKey::from_ec_key(new_key)?; Ok(key) } -#[instrument] +#[instrument(skip_all)] pub fn make_root_cert(root_key: &PKey, hostname: &Hostname) -> Result { let mut builder = X509Builder::new()?; builder.set_version(CERTIFICATE_VERSION)?; @@ -208,7 +208,7 @@ pub fn make_root_cert(root_key: &PKey, hostname: &Hostname) -> Result, &X509), applicant: &PKey, @@ -334,7 +334,7 @@ impl std::fmt::Display for SANInfo { } } -#[instrument] +#[instrument(skip_all)] pub fn make_leaf_cert( signer: (&PKey, &X509), applicant: (&PKey, &SANInfo), diff --git a/backend/src/net/tor.rs b/backend/src/net/tor.rs index 526c14c6f..2a7e57c2f 100644 --- a/backend/src/net/tor.rs +++ b/backend/src/net/tor.rs @@ -93,7 +93,7 @@ pub struct TorControllerInner { services: BTreeMap>>>, } impl TorControllerInner { - #[instrument(skip(self))] + #[instrument(skip_all)] async fn add( &mut self, key: &TorSecretKeyV3, @@ -135,7 +135,7 @@ impl TorControllerInner { Ok(rc) } - #[instrument(skip(self))] + #[instrument(skip_all)] async fn gc(&mut self, key: &TorSecretKeyV3, external: u16) -> Result<(), Error> { let onion_base = key .public() @@ -174,7 +174,7 @@ impl TorControllerInner { Ok(()) } - #[instrument] + #[instrument(skip_all)] async fn init(tor_control: SocketAddr) -> Result { let mut conn = torut::control::UnauthenticatedConn::new( TcpStream::connect(tor_control).await?, // TODO @@ -196,7 +196,7 @@ impl TorControllerInner { }) } - #[instrument(skip(self))] + #[instrument(skip_all)] async fn list_services(&mut self) -> Result, Error> { self.connection .get_info("onions/current") diff --git a/backend/src/net/wifi.rs b/backend/src/net/wifi.rs index 5931e26ac..49132b471 100644 --- a/backend/src/net/wifi.rs +++ b/backend/src/net/wifi.rs @@ -47,7 +47,7 @@ pub async fn country() -> Result<(), Error> { } #[command(display(display_none))] -#[instrument(skip(ctx, password))] +#[instrument(skip_all)] pub async fn add( #[context] ctx: RpcContext, #[arg] ssid: String, @@ -103,7 +103,7 @@ pub async fn add( } #[command(display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn connect(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result<(), Error> { let wifi_manager = wifi_manager(&ctx)?; if !ssid.is_ascii() { @@ -155,7 +155,7 @@ pub async fn connect(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result< } #[command(display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn delete(#[context] ctx: RpcContext, #[arg] ssid: String) -> Result<(), Error> { let wifi_manager = wifi_manager(&ctx)?; if !ssid.is_ascii() { @@ -293,7 +293,7 @@ fn display_wifi_list(info: Vec, matches: &ArgMatches) { } #[command(display(display_wifi_info))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn get( #[context] ctx: RpcContext, #[allow(unused_variables)] @@ -347,7 +347,7 @@ pub async fn get( } #[command(rename = "get", display(display_wifi_list))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn get_available( #[context] ctx: RpcContext, #[allow(unused_variables)] @@ -457,7 +457,7 @@ impl WpaCli { WpaCli { interface } } - #[instrument(skip(self, psk))] + #[instrument(skip_all)] pub async fn set_add_network_low(&mut self, ssid: &Ssid, psk: &Psk) -> Result<(), Error> { let _ = Command::new("nmcli") .arg("-a") @@ -473,7 +473,7 @@ impl WpaCli { .await?; Ok(()) } - #[instrument(skip(self, psk))] + #[instrument(skip_all)] pub async fn add_network_low(&mut self, ssid: &Ssid, psk: &Psk) -> Result<(), Error> { if self.find_networks(ssid).await?.is_empty() { Command::new("nmcli") @@ -567,7 +567,7 @@ impl WpaCli { .await?; Ok(()) } - #[instrument] + #[instrument(skip_all)] pub async fn list_networks_low(&self) -> Result, Error> { let r = Command::new("nmcli") .arg("-t") @@ -596,7 +596,7 @@ impl WpaCli { .collect::>()) } - #[instrument] + #[instrument(skip_all)] pub async fn list_wifi_low(&self) -> Result { let r = Command::new("nmcli") .arg("-g") @@ -681,7 +681,7 @@ impl WpaCli { }) .collect()) } - #[instrument(skip(db))] + #[instrument(skip_all)] pub async fn select_network(&mut self, db: impl DbHandle, ssid: &Ssid) -> Result { let m_id = self.check_active_network(ssid).await?; match m_id { @@ -717,7 +717,7 @@ impl WpaCli { } } } - #[instrument] + #[instrument(skip_all)] pub async fn get_current_network(&self) -> Result, Error> { let r = Command::new("iwgetid") .arg(&self.interface) @@ -733,7 +733,7 @@ impl WpaCli { Ok(Some(Ssid(network.to_owned()))) } } - #[instrument(skip(db))] + #[instrument(skip_all)] pub async fn remove_network(&mut self, db: impl DbHandle, ssid: &Ssid) -> Result { let found_networks = self.find_networks(ssid).await?; if found_networks.is_empty() { @@ -745,7 +745,7 @@ impl WpaCli { self.save_config(db).await?; Ok(true) } - #[instrument(skip(psk, db))] + #[instrument(skip_all)] pub async fn set_add_network( &mut self, db: impl DbHandle, @@ -757,7 +757,7 @@ impl WpaCli { self.save_config(db).await?; Ok(()) } - #[instrument(skip(psk, db))] + #[instrument(skip_all)] pub async fn add_network( &mut self, db: impl DbHandle, @@ -771,7 +771,7 @@ impl WpaCli { } } -#[instrument] +#[instrument(skip_all)] pub async fn interface_connected(interface: &str) -> Result { let out = Command::new("ifconfig") .arg(interface) @@ -792,7 +792,7 @@ pub fn country_code_parse(code: &str, _matches: &ArgMatches) -> Result>( main_datadir: P, wifi_iface: &str, diff --git a/backend/src/notifications.rs b/backend/src/notifications.rs index 7f7a08149..962927e90 100644 --- a/backend/src/notifications.rs +++ b/backend/src/notifications.rs @@ -23,7 +23,7 @@ pub async fn notification() -> Result<(), Error> { } #[command(display(display_serializable))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn list( #[context] ctx: RpcContext, #[arg] before: Option, @@ -232,7 +232,7 @@ impl NotificationManager { cache: Mutex::new(HashMap::new()), } } - #[instrument(skip(self, db))] + #[instrument(skip_all)] pub async fn notify( &self, db: &mut Db, diff --git a/backend/src/procedure/docker.rs b/backend/src/procedure/docker.rs index 345b6bc2f..02ef3e69d 100644 --- a/backend/src/procedure/docker.rs +++ b/backend/src/procedure/docker.rs @@ -75,7 +75,7 @@ impl DockerContainer { /// Idea is that we are going to send it command and get the inputs be filtered back from the manager. /// Then we could in theory run commands without the cost of running the docker exec which is known to have /// a dely of > 200ms which is not acceptable. - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn long_running_execute( &self, ctx: &RpcContext, @@ -212,7 +212,7 @@ impl DockerProcedure { Ok(()) } - #[instrument(skip(ctx, input))] + #[instrument(skip_all)] pub async fn execute( &self, ctx: &RpcContext, @@ -393,7 +393,7 @@ impl DockerProcedure { ) } - #[instrument(skip(_ctx, input))] + #[instrument(skip_all)] pub async fn inject( &self, _ctx: &RpcContext, @@ -548,7 +548,7 @@ impl DockerProcedure { ) } - #[instrument(skip(ctx, input))] + #[instrument(skip_all)] pub async fn sandboxed( &self, ctx: &RpcContext, diff --git a/backend/src/procedure/js_scripts.rs b/backend/src/procedure/js_scripts.rs index 9f7af0b8f..3128f4213 100644 --- a/backend/src/procedure/js_scripts.rs +++ b/backend/src/procedure/js_scripts.rs @@ -57,7 +57,7 @@ impl JsProcedure { Ok(()) } - #[instrument(skip(directory, input, rpc_client))] + #[instrument(skip_all)] pub async fn execute( &self, directory: &PathBuf, @@ -111,7 +111,7 @@ impl JsProcedure { Ok(res) } - #[instrument(skip(ctx, input))] + #[instrument(skip_all)] pub async fn sandboxed( &self, ctx: &RpcContext, diff --git a/backend/src/procedure/mod.rs b/backend/src/procedure/mod.rs index e2ab47aeb..1f7af9173 100644 --- a/backend/src/procedure/mod.rs +++ b/backend/src/procedure/mod.rs @@ -40,7 +40,7 @@ impl PackageProcedure { _ => false, } } - #[instrument] + #[instrument(skip_all)] pub fn validate( &self, container: &Option, @@ -58,7 +58,7 @@ impl PackageProcedure { } } - #[instrument(skip(ctx, input))] + #[instrument(skip_all)] pub async fn execute( &self, ctx: &RpcContext, @@ -121,7 +121,7 @@ impl PackageProcedure { } } - #[instrument(skip(ctx, input))] + #[instrument(skip_all)] pub async fn sandboxed( &self, container: &Option, diff --git a/backend/src/properties.rs b/backend/src/properties.rs index acd69adbf..22e57aa2d 100644 --- a/backend/src/properties.rs +++ b/backend/src/properties.rs @@ -18,7 +18,7 @@ pub async fn properties(#[context] ctx: RpcContext, #[arg] id: PackageId) -> Res Ok(fetch_properties(ctx, id).await?) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn fetch_properties(ctx: RpcContext, id: PackageId) -> Result { let mut db = ctx.db.handle(); diff --git a/backend/src/s9pk/builder.rs b/backend/src/s9pk/builder.rs index 28052a086..24869564f 100644 --- a/backend/src/s9pk/builder.rs +++ b/backend/src/s9pk/builder.rs @@ -42,7 +42,7 @@ impl< > S9pkPacker<'a, W, RLicense, RInstructions, RIcon, RDockerImages, RAssets, RScripts> { /// BLOCKING - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn pack(mut self, key: &ed25519_dalek::Keypair) -> Result<(), Error> { let header_pos = self.writer.stream_position().await?; if header_pos != 0 { diff --git a/backend/src/s9pk/mod.rs b/backend/src/s9pk/mod.rs index f0fcddc02..a5fff7e11 100644 --- a/backend/src/s9pk/mod.rs +++ b/backend/src/s9pk/mod.rs @@ -31,7 +31,7 @@ pub mod reader; pub const SIG_CONTEXT: &'static [u8] = b"s9pk"; #[command(cli_only, display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn pack(#[context] ctx: SdkContext, #[arg] path: Option) -> Result<(), Error> { use tokio::fs::File; diff --git a/backend/src/s9pk/reader.rs b/backend/src/s9pk/reader.rs index f3912ec8f..39e6bdf2d 100644 --- a/backend/src/s9pk/reader.rs +++ b/backend/src/s9pk/reader.rs @@ -91,7 +91,7 @@ pub struct ImageTag { pub version: Version, } impl ImageTag { - #[instrument] + #[instrument(skip_all)] pub fn validate(&self, id: &PackageId, version: &Version) -> Result<(), Error> { if id != &self.package_id { return Err(Error::new( @@ -168,7 +168,7 @@ impl S9pkReader S9pkReader { - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn validate(&mut self) -> Result<(), Error> { if self.toc.icon.length > 102_400 { // 100 KiB @@ -286,7 +286,7 @@ impl S9pkReader { Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn image_tags(&mut self) -> Result, Error> { let mut tar = tokio_tar::Archive::new(self.docker_images().await?); let mut entries = tar.entries()?; @@ -314,7 +314,7 @@ impl S9pkReader { crate::ErrorKind::ParseS9pk, )) } - #[instrument(skip(rdr))] + #[instrument(skip_all)] pub async fn from_reader(mut rdr: R, check_sig: bool) -> Result { let header = Header::deserialize(&mut rdr).await?; diff --git a/backend/src/setup.rs b/backend/src/setup.rs index 238d0dafa..a11f07825 100644 --- a/backend/src/setup.rs +++ b/backend/src/setup.rs @@ -303,7 +303,7 @@ pub async fn execute( Ok(()) } -#[instrument(skip(ctx))] +#[instrument(skip_all)] #[command(rpc_only)] pub async fn complete(#[context] ctx: SetupContext) -> Result { let (guid, setup_result) = if let Some((guid, setup_result)) = &*ctx.setup_result.read().await { @@ -320,14 +320,14 @@ pub async fn complete(#[context] ctx: SetupContext) -> Result Result<(), Error> { ctx.shutdown.send(()).expect("failed to shutdown"); Ok(()) } -#[instrument(skip(ctx, embassy_password, recovery_password))] +#[instrument(skip_all)] pub async fn execute_inner( ctx: SetupContext, embassy_logicalname: PathBuf, @@ -380,7 +380,7 @@ async fn fresh_setup( )) } -#[instrument(skip(ctx, embassy_password, recovery_password))] +#[instrument(skip_all)] async fn recover( ctx: SetupContext, guid: Arc, @@ -399,7 +399,7 @@ async fn recover( .await } -#[instrument(skip(ctx, embassy_password))] +#[instrument(skip_all)] async fn migrate( ctx: SetupContext, guid: Arc, diff --git a/backend/src/sound.rs b/backend/src/sound.rs index 0eb383fc1..ca010c7c3 100644 --- a/backend/src/sound.rs +++ b/backend/src/sound.rs @@ -21,19 +21,19 @@ struct SoundInterface { guard: Option, } impl SoundInterface { - #[instrument] + #[instrument(skip_all)] pub async fn lease() -> Result { let guard = FileLock::new(SOUND_LOCK_FILE, true).await?; Ok(SoundInterface { guard: Some(guard) }) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn close(mut self) -> Result<(), Error> { if let Some(lock) = self.guard.take() { lock.unlock().await?; } Ok(()) } - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn play_for_time_slice( &mut self, tempo_qpm: u16, @@ -59,7 +59,7 @@ impl<'a, T> Song where T: IntoIterator, TimeSlice)> + Clone, { - #[instrument(skip(self))] + #[instrument(skip_all)] pub async fn play(&self) -> Result<(), Error> { let mut sound = SoundInterface::lease().await?; for (note, slice) in self.note_sequence.clone() { diff --git a/backend/src/ssh.rs b/backend/src/ssh.rs index ab907e3b3..486a75097 100644 --- a/backend/src/ssh.rs +++ b/backend/src/ssh.rs @@ -57,7 +57,7 @@ pub fn ssh() -> Result<(), Error> { } #[command(display(display_none))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn add(#[context] ctx: RpcContext, #[arg] key: PubKey) -> Result { let pool = &ctx.secret_store; // check fingerprint for duplicates @@ -92,7 +92,7 @@ pub async fn add(#[context] ctx: RpcContext, #[arg] key: PubKey) -> Result Result<(), Error> { let pool = &ctx.secret_store; // check if fingerprint is in DB @@ -142,7 +142,7 @@ fn display_all_ssh_keys(all: Vec, matches: &ArgMatches) { } #[command(display(display_all_ssh_keys))] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn list( #[context] ctx: RpcContext, #[allow(unused_variables)] @@ -172,7 +172,7 @@ pub async fn list( .collect()) } -#[instrument(skip(pool, dest))] +#[instrument(skip_all)] pub async fn sync_keys_from_db>( pool: &Pool, dest: P, diff --git a/backend/src/status/health_check.rs b/backend/src/status/health_check.rs index 7710c00b3..e7b412e8a 100644 --- a/backend/src/status/health_check.rs +++ b/backend/src/status/health_check.rs @@ -18,7 +18,7 @@ use crate::{Error, ResultExt}; #[derive(Clone, Debug, Deserialize, Serialize)] pub struct HealthChecks(pub BTreeMap); impl HealthChecks { - #[instrument] + #[instrument(skip_all)] pub fn validate( &self, container: &Option, @@ -71,7 +71,7 @@ pub struct HealthCheck { pub timeout: Option, } impl HealthCheck { - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn check( &self, ctx: &RpcContext, diff --git a/backend/src/system.rs b/backend/src/system.rs index 6ed0c506f..ae5cc6a21 100644 --- a/backend/src/system.rs +++ b/backend/src/system.rs @@ -510,7 +510,7 @@ async fn launch_disk_task( } } -#[instrument] +#[instrument(skip_all)] async fn get_temp() -> Result { let temp_file = "/sys/class/thermal/thermal_zone0/temp"; let milli = tokio::fs::read_to_string(temp_file) @@ -550,7 +550,7 @@ impl ProcStat { } } -#[instrument] +#[instrument(skip_all)] async fn get_proc_stat() -> Result { use tokio::io::AsyncBufReadExt; let mut cpu_line = String::new(); @@ -592,7 +592,7 @@ async fn get_proc_stat() -> Result { } } -#[instrument] +#[instrument(skip_all)] async fn get_cpu_info(last: &mut ProcStat) -> Result { let new = get_proc_stat().await?; let total_old = last.total(); @@ -619,7 +619,7 @@ pub struct MemInfo { swap_total: Option, swap_free: Option, } -#[instrument] +#[instrument(skip_all)] async fn get_mem_info() -> Result { let contents = tokio::fs::read_to_string("/proc/meminfo").await?; let mut mem_info = MemInfo { @@ -693,7 +693,7 @@ async fn get_mem_info() -> Result { }) } -#[instrument] +#[instrument(skip_all)] async fn get_disk_info() -> Result { let package_used_task = get_used("/embassy-data/package-data"); let package_available_task = get_available("/embassy-data/package-data"); diff --git a/backend/src/update/mod.rs b/backend/src/update/mod.rs index c28ecf079..b9c1f03bd 100644 --- a/backend/src/update/mod.rs +++ b/backend/src/update/mod.rs @@ -41,7 +41,7 @@ lazy_static! { display(display_update_result), metadata(sync_db = true) )] -#[instrument(skip(ctx))] +#[instrument(skip_all)] pub async fn update_system( #[context] ctx: RpcContext, #[arg(rename = "marketplace-url")] marketplace_url: Url, @@ -75,7 +75,7 @@ fn display_update_result(status: UpdateResult, _: &ArgMatches) { } } -#[instrument(skip(ctx))] +#[instrument(skip_all)] async fn maybe_do_update( ctx: RpcContext, marketplace_url: Url, @@ -194,7 +194,7 @@ async fn maybe_do_update( Ok(rev) } -#[instrument(skip(ctx, eos_url))] +#[instrument(skip_all)] async fn do_update(ctx: RpcContext, eos_url: EosUrl) -> Result<(), Error> { let mut rsync = Rsync::new( eos_url.rsync_path()?, @@ -333,7 +333,7 @@ async fn sync_boot() -> Result<(), Error> { Ok(()) } -#[instrument] +#[instrument(skip_all)] async fn swap_boot_label() -> Result<(), Error> { tokio::fs::write("/media/embassy/config/upgrade", b"").await?; Ok(()) diff --git a/backend/src/util/mod.rs b/backend/src/util/mod.rs index 5ddd8b545..acdbb4b02 100644 --- a/backend/src/util/mod.rs +++ b/backend/src/util/mod.rs @@ -282,7 +282,7 @@ impl Drop for FileLock { } } impl FileLock { - #[instrument(skip(path))] + #[instrument(skip_all)] pub async fn new(path: impl AsRef + Send + Sync, blocking: bool) -> Result { lazy_static! { static ref INTERNAL_LOCKS: Mutex>>> = diff --git a/backend/src/version/v0_3_2.rs b/backend/src/version/v0_3_2.rs index 6df2784c2..c252d1518 100644 --- a/backend/src/version/v0_3_2.rs +++ b/backend/src/version/v0_3_2.rs @@ -95,7 +95,7 @@ mod legacy { id.to_string() } - #[instrument] + #[instrument(skip_all)] pub async fn get_current_hostname() -> Result { let out = Command::new("hostname") .invoke(ErrorKind::ParseSysInfo) @@ -104,7 +104,7 @@ mod legacy { Ok(Hostname(out_string.trim().to_owned())) } - #[instrument] + #[instrument(skip_all)] pub async fn set_hostname(hostname: &Hostname) -> Result<(), Error> { let hostname: &String = &hostname.0; let _out = Command::new("hostnamectl") @@ -115,7 +115,7 @@ mod legacy { Ok(()) } - #[instrument(skip(handle))] + #[instrument(skip_all)] pub async fn get_id(handle: &mut Db) -> Result { let id = crate::db::DatabaseModel::new() .server_info() @@ -142,7 +142,7 @@ mod legacy { } return Ok(Hostname(format!("embassy-{}", id))); } - #[instrument(skip(handle))] + #[instrument(skip_all)] pub async fn sync_hostname(handle: &mut Db) -> Result<(), Error> { set_hostname(&get_hostname(handle).await?).await?; Command::new("systemctl") diff --git a/backend/src/volume.rs b/backend/src/volume.rs index 4c0eb4d08..594217980 100644 --- a/backend/src/volume.rs +++ b/backend/src/volume.rs @@ -21,7 +21,7 @@ pub const BACKUP_DIR: &str = "/media/embassy/backups"; #[derive(Clone, Debug, Default, Deserialize, Serialize)] pub struct Volumes(BTreeMap); impl Volumes { - #[instrument] + #[instrument(skip_all)] pub fn validate(&self, interfaces: &Interfaces) -> Result<(), Error> { for (id, volume) in &self.0 { volume @@ -30,7 +30,7 @@ impl Volumes { } Ok(()) } - #[instrument(skip(ctx))] + #[instrument(skip_all)] pub async fn install( &self, ctx: &RpcContext, @@ -142,7 +142,7 @@ pub enum Volume { Backup { readonly: bool }, } impl Volume { - #[instrument] + #[instrument(skip_all)] pub fn validate(&self, interfaces: &Interfaces) -> Result<(), color_eyre::eyre::Report> { match self { Volume::Certificate { interface_id } => {