From bd0b89b1658a816bbcfac0996ef15fcfeb0d1cf7 Mon Sep 17 00:00:00 2001 From: asonix Date: Fri, 15 Dec 2023 22:34:45 -0600 Subject: [PATCH] Clean spans a bit --- src/details.rs | 2 +- src/discover.rs | 1 + src/discover/exiftool.rs | 4 +- src/discover/ffmpeg.rs | 4 +- src/discover/magick.rs | 5 ++- src/generate/ffmpeg.rs | 2 +- src/repo/postgres.rs | 96 ++++++++++++++++++++-------------------- src/store/file_store.rs | 4 +- src/validate.rs | 2 +- src/validate/exiftool.rs | 2 +- 10 files changed, 63 insertions(+), 59 deletions(-) diff --git a/src/details.rs b/src/details.rs index 1c3d7b6..184d62d 100644 --- a/src/details.rs +++ b/src/details.rs @@ -79,7 +79,7 @@ impl Details { self.inner.created_at.timestamp } - #[tracing::instrument(level = "DEBUG")] + #[tracing::instrument(level = "debug", skip_all)] pub(crate) async fn from_bytes( tmp_dir: &TmpDir, timeout: u64, diff --git a/src/discover.rs b/src/discover.rs index 481112d..e97ebb7 100644 --- a/src/discover.rs +++ b/src/discover.rs @@ -26,6 +26,7 @@ pub(crate) enum DiscoverError { UnsupportedFileType(String), } +#[tracing::instrument(level = "trace", skip_all)] pub(crate) async fn discover_bytes( tmp_dir: &TmpDir, timeout: u64, diff --git a/src/discover/exiftool.rs b/src/discover/exiftool.rs index 96184cd..1e7a514 100644 --- a/src/discover/exiftool.rs +++ b/src/discover/exiftool.rs @@ -9,7 +9,7 @@ use crate::{ use super::Discovery; -#[tracing::instrument(level = "DEBUG", skip_all)] +#[tracing::instrument(level = "debug", skip_all)] pub(super) async fn check_reorient( Discovery { input, @@ -40,7 +40,7 @@ pub(super) async fn check_reorient( }) } -#[tracing::instrument(level = "trace", skip(input))] +#[tracing::instrument(level = "trace", skip_all)] async fn needs_reorienting(input: Bytes, timeout: u64) -> Result { let process = Process::run("exiftool", &["-n", "-Orientation", "-"], &[], timeout)?; let mut reader = process.bytes_read(input); diff --git a/src/discover/ffmpeg.rs b/src/discover/ffmpeg.rs index b5c8b99..54c9676 100644 --- a/src/discover/ffmpeg.rs +++ b/src/discover/ffmpeg.rs @@ -158,6 +158,7 @@ struct Flags { alpha: usize, } +#[tracing::instrument(skip_all)] pub(super) async fn discover_bytes( tmp_dir: &TmpDir, timeout: u64, @@ -190,7 +191,7 @@ async fn allows_alpha(pixel_format: &str, timeout: u64) -> Result( tmp_dir: &TmpDir, timeout: u64, @@ -259,6 +260,7 @@ where Ok(Some(discovery)) } +#[tracing::instrument(level = "debug", skip_all)] async fn alpha_pixel_formats(timeout: u64) -> Result, FfMpegError> { let process = Process::run( "ffprobe", diff --git a/src/discover/magick.rs b/src/discover/magick.rs index 46ba507..accc09e 100644 --- a/src/discover/magick.rs +++ b/src/discover/magick.rs @@ -31,6 +31,7 @@ struct Geometry { height: u16, } +#[tracing::instrument(skip_all)] pub(super) async fn confirm_bytes( tmp_dir: &TmpDir, discovery: Option, @@ -93,7 +94,7 @@ pub(super) async fn confirm_bytes( .await } -#[tracing::instrument(level = "DEBUG", skip(f))] +#[tracing::instrument(level = "debug", skip_all)] async fn count_avif_frames(tmp_dir: &TmpDir, timeout: u64, f: F) -> Result where F: FnOnce(crate::file::File) -> Fut, @@ -156,7 +157,7 @@ where Ok(lines) } -#[tracing::instrument(level = "DEBUG", skip(f))] +#[tracing::instrument(level = "debug", skip_all)] async fn discover_file( tmp_dir: &TmpDir, timeout: u64, diff --git a/src/generate/ffmpeg.rs b/src/generate/ffmpeg.rs index 082b987..4c0fc9b 100644 --- a/src/generate/ffmpeg.rs +++ b/src/generate/ffmpeg.rs @@ -45,7 +45,7 @@ impl ThumbnailFormat { } } -#[tracing::instrument(skip(store))] +#[tracing::instrument(skip(tmp_dir, store, timeout))] pub(super) async fn thumbnail( tmp_dir: &TmpDir, store: S, diff --git a/src/repo/postgres.rs b/src/repo/postgres.rs index 4a22efa..2250ceb 100644 --- a/src/repo/postgres.rs +++ b/src/repo/postgres.rs @@ -243,7 +243,7 @@ impl Drop for GetConnectionMetricsGuard { } impl Inner { - #[tracing::instrument(level = "TRACE", skip(self))] + #[tracing::instrument(level = "trace", skip(self))] async fn get_connection(&self) -> Result, PostgresError> { let guard = GetConnectionMetricsGuard::guard(); @@ -446,7 +446,7 @@ impl BaseRepo for PostgresRepo {} #[async_trait::async_trait(?Send)] impl HashRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn size(&self) -> Result { use schema::hashes::dsl::*; @@ -464,7 +464,7 @@ impl HashRepo for PostgresRepo { Ok(count.try_into().expect("non-negative count")) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn bound(&self, input_hash: Hash) -> Result, RepoError> { use schema::hashes::dsl::*; @@ -488,7 +488,7 @@ impl HashRepo for PostgresRepo { })) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn hash_page_by_date( &self, date: time::OffsetDateTime, @@ -519,7 +519,7 @@ impl HashRepo for PostgresRepo { self.hashes_ordered(ordered_hash, limit).await } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn hashes_ordered( &self, bound: Option, @@ -592,7 +592,7 @@ impl HashRepo for PostgresRepo { }) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn create_hash_with_timestamp( &self, input_hash: Hash, @@ -627,7 +627,7 @@ impl HashRepo for PostgresRepo { } } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn update_identifier( &self, input_hash: Hash, @@ -650,7 +650,7 @@ impl HashRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn identifier(&self, input_hash: Hash) -> Result>, RepoError> { use schema::hashes::dsl::*; @@ -670,7 +670,7 @@ impl HashRepo for PostgresRepo { Ok(opt.map(Arc::from)) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn relate_variant_identifier( &self, input_hash: Hash, @@ -703,7 +703,7 @@ impl HashRepo for PostgresRepo { } } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn variant_identifier( &self, input_hash: Hash, @@ -729,7 +729,7 @@ impl HashRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn variants(&self, input_hash: Hash) -> Result)>, RepoError> { use schema::variants::dsl::*; @@ -751,7 +751,7 @@ impl HashRepo for PostgresRepo { Ok(vec) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn remove_variant( &self, input_hash: Hash, @@ -774,7 +774,7 @@ impl HashRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn relate_motion_identifier( &self, input_hash: Hash, @@ -797,7 +797,7 @@ impl HashRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn motion_identifier(&self, input_hash: Hash) -> Result>, RepoError> { use schema::hashes::dsl::*; @@ -819,7 +819,7 @@ impl HashRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn cleanup_hash(&self, input_hash: Hash) -> Result<(), RepoError> { let mut conn = self.get_connection().await?; @@ -847,7 +847,7 @@ impl HashRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl AliasRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn create_alias( &self, input_alias: &Alias, @@ -880,7 +880,7 @@ impl AliasRepo for PostgresRepo { } } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn delete_token(&self, input_alias: &Alias) -> Result, RepoError> { use schema::aliases::dsl::*; @@ -900,7 +900,7 @@ impl AliasRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn hash(&self, input_alias: &Alias) -> Result, RepoError> { use schema::aliases::dsl::*; @@ -920,7 +920,7 @@ impl AliasRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn aliases_for_hash(&self, input_hash: Hash) -> Result, RepoError> { use schema::aliases::dsl::*; @@ -939,7 +939,7 @@ impl AliasRepo for PostgresRepo { Ok(vec) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn cleanup_alias(&self, input_alias: &Alias) -> Result<(), RepoError> { use schema::aliases::dsl::*; @@ -960,7 +960,7 @@ impl AliasRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl SettingsRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self, input_value))] + #[tracing::instrument(level = "debug", skip(self, input_value))] async fn set(&self, input_key: &'static str, input_value: Arc<[u8]>) -> Result<(), RepoError> { use schema::settings::dsl::*; @@ -983,7 +983,7 @@ impl SettingsRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn get(&self, input_key: &'static str) -> Result>, RepoError> { use schema::settings::dsl::*; @@ -1007,7 +1007,7 @@ impl SettingsRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn remove(&self, input_key: &'static str) -> Result<(), RepoError> { use schema::settings::dsl::*; @@ -1028,7 +1028,7 @@ impl SettingsRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl DetailsRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self, input_details))] + #[tracing::instrument(level = "debug", skip(self, input_details))] async fn relate_details( &self, input_identifier: &Arc, @@ -1053,7 +1053,7 @@ impl DetailsRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn details(&self, input_identifier: &Arc) -> Result, RepoError> { use schema::details::dsl::*; @@ -1077,7 +1077,7 @@ impl DetailsRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn cleanup_details(&self, input_identifier: &Arc) -> Result<(), RepoError> { use schema::details::dsl::*; @@ -1098,7 +1098,7 @@ impl DetailsRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl QueueRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self, job_json))] + #[tracing::instrument(level = "debug", skip(self, job_json))] async fn push( &self, queue_name: &'static str, @@ -1125,7 +1125,7 @@ impl QueueRepo for PostgresRepo { Ok(JobId(job_id)) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn pop( &self, queue_name: &'static str, @@ -1223,7 +1223,7 @@ impl QueueRepo for PostgresRepo { } } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn heartbeat( &self, queue_name: &'static str, @@ -1253,7 +1253,7 @@ impl QueueRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn complete_job( &self, queue_name: &'static str, @@ -1283,7 +1283,7 @@ impl QueueRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl StoreMigrationRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn is_continuing_migration(&self) -> Result { use schema::store_migrations::dsl::*; @@ -1301,7 +1301,7 @@ impl StoreMigrationRepo for PostgresRepo { Ok(count > 0) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn mark_migrated( &self, input_old_identifier: &Arc, @@ -1328,7 +1328,7 @@ impl StoreMigrationRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn is_migrated(&self, input_old_identifier: &Arc) -> Result { use schema::store_migrations::dsl::*; @@ -1347,7 +1347,7 @@ impl StoreMigrationRepo for PostgresRepo { Ok(b) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn clear(&self) -> Result<(), RepoError> { use schema::store_migrations::dsl::*; @@ -1367,7 +1367,7 @@ impl StoreMigrationRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl ProxyRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn relate_url(&self, input_url: Url, input_alias: Alias) -> Result<(), RepoError> { use schema::proxies::dsl::*; @@ -1385,7 +1385,7 @@ impl ProxyRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn related(&self, input_url: Url) -> Result, RepoError> { use schema::proxies::dsl::*; @@ -1405,7 +1405,7 @@ impl ProxyRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn remove_relation(&self, input_alias: Alias) -> Result<(), RepoError> { use schema::proxies::dsl::*; @@ -1426,7 +1426,7 @@ impl ProxyRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl AliasAccessRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn set_accessed_alias( &self, input_alias: Alias, @@ -1451,7 +1451,7 @@ impl AliasAccessRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn alias_accessed_at( &self, input_alias: Alias, @@ -1475,7 +1475,7 @@ impl AliasAccessRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn older_aliases( &self, timestamp: time::OffsetDateTime, @@ -1513,7 +1513,7 @@ impl AliasAccessRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl VariantAccessRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn set_accessed_variant( &self, input_hash: Hash, @@ -1539,7 +1539,7 @@ impl VariantAccessRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn variant_accessed_at( &self, input_hash: Hash, @@ -1564,7 +1564,7 @@ impl VariantAccessRepo for PostgresRepo { Ok(opt) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn older_variants( &self, timestamp: time::OffsetDateTime, @@ -1638,7 +1638,7 @@ impl From for UploadResult { #[async_trait::async_trait(?Send)] impl UploadRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn create_upload(&self) -> Result { use schema::uploads::dsl::*; @@ -1657,7 +1657,7 @@ impl UploadRepo for PostgresRepo { Ok(UploadId { id: uuid }) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn wait(&self, upload_id: UploadId) -> Result { let guard = WaitMetricsGuard::guard(); use schema::uploads::dsl::*; @@ -1714,7 +1714,7 @@ impl UploadRepo for PostgresRepo { } } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn claim(&self, upload_id: UploadId) -> Result<(), RepoError> { use schema::uploads::dsl::*; @@ -1732,7 +1732,7 @@ impl UploadRepo for PostgresRepo { Ok(()) } - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn complete_upload( &self, upload_id: UploadId, @@ -1762,7 +1762,7 @@ impl UploadRepo for PostgresRepo { #[async_trait::async_trait(?Send)] impl FullRepo for PostgresRepo { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn health_check(&self) -> Result<(), RepoError> { let next = self.inner.health_count.fetch_add(1, Ordering::Relaxed); diff --git a/src/store/file_store.rs b/src/store/file_store.rs index e208261..a38f353 100644 --- a/src/store/file_store.rs +++ b/src/store/file_store.rs @@ -57,7 +57,7 @@ pub(crate) struct FileStore { #[async_trait::async_trait(?Send)] impl Store for FileStore { - #[tracing::instrument(level = "DEBUG", skip(self))] + #[tracing::instrument(level = "debug", skip(self))] async fn health_check(&self) -> Result<(), StoreError> { tokio::fs::metadata(&self.root_dir) .await @@ -227,7 +227,7 @@ impl FileStore { Ok(target_path.join(filename)) } - #[tracing::instrument(level = "DEBUG", skip(self, path), fields(path = ?path.as_ref()))] + #[tracing::instrument(level = "debug", skip(self, path), fields(path = ?path.as_ref()))] async fn safe_remove_file>(&self, path: P) -> Result<(), FileError> { tokio::fs::remove_file(&path).await?; self.try_remove_parents(path.as_ref()).await; diff --git a/src/validate.rs b/src/validate.rs index 70f2247..a53ccba 100644 --- a/src/validate.rs +++ b/src/validate.rs @@ -121,7 +121,7 @@ pub(crate) async fn validate_bytes( } } -#[tracing::instrument(skip(bytes, validations))] +#[tracing::instrument(skip(tmp_dir, bytes, validations))] async fn process_image( tmp_dir: &TmpDir, bytes: Bytes, diff --git a/src/validate/exiftool.rs b/src/validate/exiftool.rs index eae08f9..7d7dba5 100644 --- a/src/validate/exiftool.rs +++ b/src/validate/exiftool.rs @@ -2,7 +2,7 @@ use actix_web::web::Bytes; use crate::{exiftool::ExifError, process::Process, read::BoxRead}; -#[tracing::instrument(level = "trace", skip(input))] +#[tracing::instrument(level = "trace", skip_all)] pub(crate) fn clear_metadata_bytes_read( input: Bytes, timeout: u64,