Improved tracing (closes #180 closes #417 closes #376 closes #418 closes #517)

crates/jmap/src/api/management/queue.rs

@@ -500,7 +500,7 @@ impl From<&queue::Message> for Message {
         let now = now();
 
         Message {
-            id: message.id,
+            id: message.queue_id,
             return_path: message.return_path.clone(),
             created: DateTime::from_timestamp(message.created as i64),
             size: message.size,

crates/jmap/src/api/management/reload.rs

@@ -58,6 +58,11 @@ impl JMAP {
                         self.inner.increment_config_version();
                     }
 
+                    if let Some(tracers) = result.tracers {
+                        // Update tracers
+                        tracers.update();
+                    }
+
                     // Reload ACME
                     self.inner
                         .housekeeper_tx

crates/jmap/src/email/ingest.rs

@@ -4,7 +4,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-SEL
  */
 
-use std::{borrow::Cow, time::Duration};
+use std::{
+    borrow::Cow,
+    time::{Duration, Instant},
+};
 
 use jmap_proto::{
     object::Object,
@@ -78,6 +81,7 @@ impl JMAP {
     #[allow(clippy::blocks_in_conditions)]
     pub async fn email_ingest(&self, mut params: IngestEmail<'_>) -> trc::Result<IngestedEmail> {
         // Check quota
+        let start_time = Instant::now();
         let mut raw_message_len = params.raw_message.len() as i64;
         self.has_available_quota(params.account_id, params.account_quota, raw_message_len)
             .await
@@ -334,6 +338,7 @@ impl JMAP {
             BlobId = blob_id.hash.to_hex(),
             ChangeId = change_id,
             Size = raw_message_len as u64,
+            Elapsed = start_time.elapsed(),
         );
 
         Ok(IngestedEmail {