From 7eee88160a8c42d44fddb394a0274e5e45841347 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 17 Jun 2024 06:32:53 +0000 Subject: [PATCH] truncate other span names and fields Signed-off-by: Jason Volk --- src/service/rooms/auth_chain/mod.rs | 4 ++-- src/service/sending/sender.rs | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/service/rooms/auth_chain/mod.rs b/src/service/rooms/auth_chain/mod.rs index 84e423e3..b93ea8c5 100644 --- a/src/service/rooms/auth_chain/mod.rs +++ b/src/service/rooms/auth_chain/mod.rs @@ -8,7 +8,7 @@ use data::Data; use ruma::{api::client::error::ErrorKind, EventId, RoomId}; use tracing::{debug, error, trace, warn}; -use crate::{services, utils::debug_slice_truncated, Error, Result}; +use crate::{services, Error, Result}; pub struct Service { pub db: Arc, @@ -30,7 +30,7 @@ impl Service { .filter_map(move |sid| services().rooms.short.get_eventid_from_short(sid).ok())) } - #[tracing::instrument(skip(self), fields(starting_events = debug_slice_truncated(starting_events, 5)))] + #[tracing::instrument(skip_all, name = "auth_chain")] pub async fn get_auth_chain(&self, room_id: &RoomId, starting_events: &[&EventId]) -> Result> { const NUM_BUCKETS: usize = 50; //TODO: change possible w/o disrupting db? const BUCKET: BTreeSet<(u64, &EventId)> = BTreeSet::new(); diff --git a/src/service/sending/sender.rs b/src/service/sending/sender.rs index 7efe3c72..8479a869 100644 --- a/src/service/sending/sender.rs +++ b/src/service/sending/sender.rs @@ -541,7 +541,7 @@ async fn send_events_dest_push( #[tracing::instrument(skip(dest, events), name = "")] async fn send_events_dest_normal( - dest: &Destination, server_name: &OwnedServerName, events: Vec, + dest: &Destination, server: &OwnedServerName, events: Vec, ) -> SendingResult { let mut edu_jsons = Vec::new(); let mut pdu_jsons = Vec::new(); @@ -557,12 +557,7 @@ async fn send_events_dest_normal( .get_pdu_json_from_id(pdu_id) .map_err(|e| (dest.clone(), e))? .ok_or_else(|| { - error!( - dest = ?dest, - server_name = ?server_name, - pdu_id = ?pdu_id, - "event not found" - ); + error!(?dest, ?server, ?pdu_id, "event not found"); ( dest.clone(), Error::bad_database("[Normal] Event in servernameevent_data not found in db."), @@ -587,7 +582,7 @@ async fn send_events_dest_normal( // transaction"); send::send( client, - server_name, + server, send_transaction_message::v1::Request { origin: services().globals.server_name().to_owned(), pdus: pdu_jsons,