cleanup/reduce some tracing spans.

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-06-04 20:16:36 +00:00
parent 73718a1208
commit 427aa4645c

View file

@ -159,7 +159,7 @@ impl Service {
} }
} }
#[tracing::instrument(skip(self, dest, new_events, statuses))] #[tracing::instrument(skip_all)]
fn select_events( fn select_events(
&self, &self,
dest: &Destination, dest: &Destination,
@ -206,7 +206,7 @@ impl Service {
Ok(Some(events)) Ok(Some(events))
} }
#[tracing::instrument(skip(self, dest, statuses))] #[tracing::instrument(skip_all)]
fn select_events_current(&self, dest: Destination, statuses: &mut CurTransactionStatus) -> Result<(bool, bool)> { fn select_events_current(&self, dest: Destination, statuses: &mut CurTransactionStatus) -> Result<(bool, bool)> {
let (mut allow, mut retry) = (true, false); let (mut allow, mut retry) = (true, false);
statuses statuses
@ -234,7 +234,7 @@ impl Service {
Ok((allow, retry)) Ok((allow, retry))
} }
#[tracing::instrument(skip(self, server_name))] #[tracing::instrument(skip_all)]
fn select_edus(&self, server_name: &ServerName) -> Result<(Vec<Vec<u8>>, u64)> { fn select_edus(&self, server_name: &ServerName) -> Result<(Vec<Vec<u8>>, u64)> {
// u64: count of last edu // u64: count of last edu
let since = self.db.get_latest_educount(server_name)?; let since = self.db.get_latest_educount(server_name)?;
@ -285,7 +285,6 @@ impl Service {
} }
/// Look for presence /// Look for presence
#[tracing::instrument(skip(server_name, since, max_edu_count, events))]
fn select_edus_presence( fn select_edus_presence(
server_name: &ServerName, since: u64, max_edu_count: &mut u64, events: &mut Vec<Vec<u8>>, server_name: &ServerName, since: u64, max_edu_count: &mut u64, events: &mut Vec<Vec<u8>>,
) -> Result<bool> { ) -> Result<bool> {
@ -330,7 +329,6 @@ fn select_edus_presence(
} }
/// Look for read receipts in this room /// Look for read receipts in this room
#[tracing::instrument(skip(room_id, since, max_edu_count, events))]
fn select_edus_receipts( fn select_edus_receipts(
room_id: &RoomId, since: u64, max_edu_count: &mut u64, events: &mut Vec<Vec<u8>>, room_id: &RoomId, since: u64, max_edu_count: &mut u64, events: &mut Vec<Vec<u8>>,
) -> Result<bool> { ) -> Result<bool> {