Metrics collector

crates/smtp/src/queue/spool.rs

@@ -16,7 +16,8 @@ use utils::BlobHash;
 use crate::core::SMTP;
 
 use super::{
-    Domain, Event, Message, QueueEnvelope, QueueId, QuotaKey, Recipient, Schedule, Status,
+    Domain, Event, Message, MessageSource, QueueEnvelope, QueueId, QuotaKey, Recipient, Schedule,
+    Status,
 };
 
 pub const LOCK_EXPIRY: u64 = 300;
@@ -174,6 +175,7 @@ impl Message {
         raw_message: &[u8],
         session_id: u64,
         core: &SMTP,
+        source: MessageSource,
     ) -> bool {
         // Write blob
         let message = if let Some(raw_headers) = raw_headers {
@@ -225,7 +227,13 @@ impl Message {
         }
 
         trc::event!(
-            Queue(trc::QueueEvent::Scheduled),
+            Queue(match source {
+                MessageSource::Authenticated => trc::QueueEvent::QueueMessageSubmission,
+                MessageSource::Unauthenticated => trc::QueueEvent::QueueMessage,
+                MessageSource::Dsn => trc::QueueEvent::QueueDsn,
+                MessageSource::Report => trc::QueueEvent::QueueReport,
+                MessageSource::Sieve => trc::QueueEvent::QueueAutogenerated,
+            }),
             SpanId = session_id,
             QueueId = self.queue_id,
             From = if !self.return_path.is_empty() {