From d021bf0dc92d047d2e956583bc3f541222c23e6d Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Tue, 19 Nov 2024 13:14:56 -0700
Subject: [PATCH] trace_smtp_client: adopt parking_lot::Mutex, streamline debug

Really, I just wanted the debug output in CI to be less overwhelming,
but while I'm in here, might as well switch to parking_lot.

This commit switches from the derived Debug impl to just serializing
the metadata as json, which is much more compact.
---
 .../http_server/admin_trace_smtp_client_v1.rs | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/crates/kumod/src/http_server/admin_trace_smtp_client_v1.rs b/crates/kumod/src/http_server/admin_trace_smtp_client_v1.rs
index 4278eaa7..ff2940ef 100644
--- a/crates/kumod/src/http_server/admin_trace_smtp_client_v1.rs
+++ b/crates/kumod/src/http_server/admin_trace_smtp_client_v1.rs
@@ -3,9 +3,10 @@ use axum::response::IntoResponse;
 use chrono::{DateTime, Utc};
 use kumo_api_types::{TraceSmtpClientV1Event, TraceSmtpClientV1Payload, TraceSmtpClientV1Request};
 use kumo_server_common::http_server::auth::TrustedIpRequired;
+use parking_lot::Mutex;
 use rfc5321::DeferredTracer;
 use std::net::{IpAddr, SocketAddr};
-use std::sync::{LazyLock, Mutex};
+use std::sync::LazyLock;
 use tokio::sync::broadcast::{channel, Sender};
 use tracing::Level;
 
@@ -32,11 +33,23 @@ impl SmtpClientTraceManager {
     }
 }
 
-#[derive(Debug)]
 pub struct SmtpClientTracerImpl {
     meta: Mutex<serde_json::Value>,
 }
 
+impl std::fmt::Debug for SmtpClientTracerImpl {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+        let meta = self.meta.lock();
+        match serde_json::to_string(&*meta) {
+            Ok(s) => write!(fmt, "SmtpClientTracerImpl(meta={s})"),
+            Err(_) => fmt
+                .debug_struct("SmtpClientTracerImpl")
+                .field("meta", &meta)
+                .finish(),
+        }
+    }
+}
+
 impl SmtpClientTracerImpl {
     pub fn new(meta: serde_json::Value) -> Self {
         SmtpClientTraceManager::submit(|| SmtpClientTraceEvent {
@@ -51,11 +64,11 @@ impl SmtpClientTracerImpl {
     }
 
     pub fn set_meta<V: Into<serde_json::Value>>(&self, key: &str, value: V) {
-        self.meta.lock().unwrap()[key] = value.into();
+        self.meta.lock()[key] = value.into();
     }
 
     pub fn unset_meta(&self, key: &str) {
-        let mut map = self.meta.lock().unwrap();
+        let mut map = self.meta.lock();
         match &mut *map {
             serde_json::Value::Object(map) => {
                 map.remove(key);
@@ -65,7 +78,7 @@ impl SmtpClientTracerImpl {
     }
 
     fn clone_meta(&self) -> serde_json::Value {
-        self.meta.lock().unwrap().clone()
+        self.meta.lock().clone()
     }
 
     pub fn submit<F: FnOnce() -> SmtpClientTraceEventPayload>(&self, f: F) {
@@ -101,7 +114,7 @@ impl rfc5321::SmtpClientTracer for SmtpClientTracerImpl {
         SmtpClientTraceManager::submit(|| {
             let payload = port_payload(event);
             SmtpClientTraceEvent {
-                conn_meta: self.meta.lock().unwrap().clone(),
+                conn_meta: self.meta.lock().clone(),
                 payload,
                 when: Utc::now(),
             }
@@ -112,7 +125,7 @@ impl rfc5321::SmtpClientTracer for SmtpClientTracerImpl {
         SmtpClientTraceManager::submit(|| {
             let payload = port_payload(deferred.trace());
             SmtpClientTraceEvent {
-                conn_meta: self.meta.lock().unwrap().clone(),
+                conn_meta: self.meta.lock().clone(),
                 payload,
                 when: Utc::now(),
             }