From 88bb2ea6004c8d578eafd8a078701588ea250148 Mon Sep 17 00:00:00 2001
From: Lambda <csgl@xiretza.xyz>
Date: Fri, 24 May 2024 16:18:10 +0000
Subject: [PATCH] Remove redundant span attributes

There's no need to record attributes that are already present in all
callers.
---
 src/api/server_server.rs           |  2 +-
 src/service/rooms/event_handler.rs | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/api/server_server.rs b/src/api/server_server.rs
index 09cc0799..c2e22ac7 100644
--- a/src/api/server_server.rs
+++ b/src/api/server_server.rs
@@ -361,7 +361,7 @@ fn add_port_to_hostname(destination_str: &str) -> FedDest {
 /// Numbers in comments below refer to bullet points in linked section of
 /// specification
 #[allow(clippy::too_many_lines)]
-#[tracing::instrument(ret(level = "debug"))]
+#[tracing::instrument(skip(destination), ret(level = "debug"))]
 async fn find_actual_destination(
     destination: &'_ ServerName,
 ) -> (FedDest, FedDest) {
diff --git a/src/service/rooms/event_handler.rs b/src/service/rooms/event_handler.rs
index 5710259c..ad30f938 100644
--- a/src/service/rooms/event_handler.rs
+++ b/src/service/rooms/event_handler.rs
@@ -308,7 +308,7 @@ impl Service {
     }
 
     #[allow(clippy::type_complexity, clippy::too_many_arguments)]
-    #[tracing::instrument(skip(self, create_event, value, pub_key_map))]
+    #[tracing::instrument(skip(self, origin, room_id, value, pub_key_map))]
     fn handle_outlier_pdu<'a>(
         &'a self,
         origin: &'a ServerName,
@@ -512,12 +512,9 @@ impl Service {
         })
     }
 
-    #[tracing::instrument(skip(
-        self,
-        incoming_pdu,
-        val,
-        create_event,
-        pub_key_map
+    #[tracing::instrument(skip_all, fields(
+        incoming_pdu = %incoming_pdu.event_id,
+        create_event = %create_event.event_id,
     ))]
     pub(crate) async fn upgrade_outlier_to_timeline_pdu(
         &self,