fix: Don't repeat already-included metadata in fetch_state instrument

src/service/rooms/event_handler/fetch_and_handle_outliers.rs

@@ -29,7 +29,7 @@ const GET_MISSING_EVENTS_MAX_BATCH_SIZE: u16 = 50; // matches src/server/get_mis
 /// dependencies, however it is ultimately the sender's responsibility to send
 /// them in a processable order, so this is just a best effort attempt. It does
 /// not account for power levels or other tie breaks.
-pub async fn build_local_dag<S: std::hash::BuildHasher>(
+pub async fn build_local_dag<S: std::hash::BuildHasher + Send + Sync>(
 	pdu_map: &HashMap<OwnedEventId, CanonicalJsonObject, S>,
 ) -> conduwuit::Result<Vec<OwnedEventId>> {
 	debug_assert!(pdu_map.len() >= 2, "needless call to build_local_dag with less than 2 PDUs");

src/service/rooms/event_handler/fetch_state.rs

@@ -22,7 +22,7 @@ impl super::Service {
 	///
 	/// The end result is a result containing a map of shortstatekeys to event
 	/// IDs. The underlying `Option` is always `Some`.
-	#[tracing::instrument(skip(self, create_event))]
+	#[tracing::instrument(skip_all)]
 	pub(super) async fn fetch_state(
 		&self,
 		origin: &ServerName,