Add context to iteration errors

stalwartlabs · Oct 17, 2024 · 9e78aaa · 9e78aaa
1 parent a1c5be0
commit 9e78aaa
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 12 deletions.
diff --git a/crates/common/src/core.rs b/crates/common/src/core.rs
@@ -168,6 +168,7 @@ impl Server {
                 },
             )
             .await
+            .caused_by(trc::location!())
             .map(|_| total)
     }
 

diff --git a/crates/common/src/manager/config.rs b/crates/common/src/manager/config.rs
@@ -16,6 +16,7 @@ use store::{
     write::{BatchBuilder, ValueClass},
     Deserialize, IterateParams, Store, ValueKey,
 };
+use trc::AddContext;
 use utils::{
     config::{Config, ConfigKey},
     glob::GlobPattern,
@@ -166,7 +167,8 @@ impl ConfigManager {
                     Ok(true)
                 },
             )
-            .await?;
+            .await
+            .caused_by(trc::location!())?;
 
         Ok(results)
     }

diff --git a/crates/directory/src/backend/internal/lookup.rs b/crates/directory/src/backend/internal/lookup.rs
@@ -135,7 +135,7 @@ impl DirectoryStore for Store {
                     Ok(true)
                 },
             )
-            .await?;
+            .await.caused_by(trc::location!())?;
         }
 
         Ok(results)

diff --git a/crates/jmap/src/api/management/queue.rs b/crates/jmap/src/api/management/queue.rs
@@ -257,7 +257,8 @@ impl QueueManagement for Server {
                             Ok(max_total == 0 || total < max_total)
                         },
                     )
-                    .await?;
+                    .await
+                    .caused_by(trc::location!())?;
 
                 Ok(if values {
                     JsonResponse::new(json!({
@@ -512,7 +513,8 @@ impl QueueManagement for Server {
                             Ok(max_total == 0 || total < max_total)
                         },
                     )
-                    .await?;
+                    .await
+                    .caused_by(trc::location!())?;
 
                 Ok(JsonResponse::new(json!({
                         "data": {

diff --git a/crates/jmap/src/api/management/report.rs b/crates/jmap/src/api/management/report.rs
@@ -227,7 +227,7 @@ impl ManageReports for Server {
                             Ok(max_total == 0 || total < max_total)
                         },
                     )
-                    .await?;
+                    .await.caused_by(trc::location!())?;
 
                 Ok(JsonResponse::new(json!({
                         "data": {

diff --git a/crates/jmap/src/services/index.rs b/crates/jmap/src/services/index.rs
@@ -118,7 +118,7 @@ impl Indexer for Server {
             )
             .await
             .map_err(|err| {
-                trc::error!(err.details("Failed to iterate over index emails"));
+                trc::error!(err.caused_by(trc::location!()).details("Failed to iterate over index emails"));
             });
 
         // Add entries to the index

diff --git a/crates/smtp/src/reporting/dmarc.rs b/crates/smtp/src/reporting/dmarc.rs
@@ -24,7 +24,7 @@ use store::{
     write::{now, BatchBuilder, Bincode, QueueClass, ReportEvent, ValueClass},
     Deserialize, IterateParams, Serialize, ValueKey,
 };
-use trc::OutgoingReportEvent;
+use trc::{AddContext, OutgoingReportEvent};
 use utils::config::Rate;
 
 use crate::{
@@ -559,7 +559,7 @@ impl DmarcReporting for Server {
                     }
                 },
             )
-            .await?;
+            .await.caused_by(trc::location!())?;
 
         for (record, count) in record_map {
             report = report.with_record(record.with_count(count));

diff --git a/crates/smtp/src/reporting/tls.rs b/crates/smtp/src/reporting/tls.rs
@@ -30,7 +30,7 @@ use store::{
     write::{now, BatchBuilder, Bincode, QueueClass, ReportEvent, ValueClass},
     Deserialize, IterateParams, Serialize, ValueKey,
 };
-use trc::OutgoingReportEvent;
+use trc::{AddContext, OutgoingReportEvent};
 
 use crate::{queue::RecipientDomain, reporting::SmtpReporting};
 
@@ -366,7 +366,7 @@ impl TlsReporting for Server {
                         Ok(true)
                     }
                 })
-                .await?;
+                .await.caused_by(trc::location!())?;
 
             // Add policy
             report.policies.push(Policy {

diff --git a/crates/store/src/fts/index.rs b/crates/store/src/fts/index.rs
@@ -15,6 +15,7 @@ use nlp::{
     },
     tokenizers::word::WordTokenizer,
 };
+use trc::AddContext;
 
 use crate::{
     backend::MAX_TOKEN_LENGTH,
@@ -294,7 +295,8 @@ impl Store {
                 Ok(true)
             },
         )
-        .await?;
+        .await
+        .caused_by(trc::location!())?;
 
         // Remove keys
         let mut batch = BatchBuilder::new();

diff --git a/crates/store/src/fts/query.rs b/crates/store/src/fts/query.rs
@@ -12,6 +12,7 @@ use std::{
 use ahash::AHashMap;
 use nlp::language::stemmer::Stemmer;
 use roaring::RoaringBitmap;
+use trc::AddContext;
 
 use crate::{
     backend::MAX_TOKEN_LENGTH,
@@ -381,7 +382,8 @@ impl Store {
                     Ok(true)
                 },
             )
-            .await?;
+            .await
+            .caused_by(trc::location!())?;
 
             if is_intersect {
                 if is_first {

diff --git a/crates/store/src/write/mod.rs b/crates/store/src/write/mod.rs
@@ -703,12 +703,14 @@ impl<T: serde::Serialize + serde::de::DeserializeOwned + Sized + Sync + Send> De
         lz4_flex::decompress_size_prepended(bytes)
             .map_err(|err| {
                 trc::StoreEvent::DecompressError
+                    .ctx(trc::Key::Value, bytes)
                     .caused_by(trc::location!())
                     .reason(err)
             })
             .and_then(|result| {
                 bincode::deserialize(&result).map_err(|err| {
                     trc::StoreEvent::DataCorruption
+                        .ctx(trc::Key::Value, bytes)
                         .caused_by(trc::location!())
                         .reason(err)
                 })