From 3ceeb8655fe6d0b286e37eb574843cc5f401762f Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Tue, 10 Mar 2026 07:09:41 +0000
Subject: [PATCH] Add spans for parse_incoming/gen_event_id for alloc
 instruments

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/matrix/event/id.rs                      | 16 ++++++++++++++++
 .../rooms/event_handler/parse_incoming_pdu.rs    |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/src/core/matrix/event/id.rs b/src/core/matrix/event/id.rs
index 15f365c6..d5f34ae2 100644
--- a/src/core/matrix/event/id.rs
+++ b/src/core/matrix/event/id.rs
@@ -7,6 +7,14 @@ use crate::{Result, debug_error, err, matrix::room_version};
 ///
 /// Returns a tuple of the new `EventId` and the PDU as a `BTreeMap<String,
 /// CanonicalJsonValue>`.
+#[tracing::instrument(
+	name = "gen_event_id",
+	level = "debug",
+	skip_all,
+	fields(
+		len = pdu.get().len(),
+	)
+)]
 pub fn gen_event_id_canonical_json(
 	pdu: &RawJsonValue,
 	room_version_id: &RoomVersionId,
@@ -23,6 +31,14 @@ pub fn gen_event_id_canonical_json(
 /// Generates a correct eventId for the PDU. For v1/v2 incoming PDU's the
 /// value's event_id is passed through. For all outgoing PDU's and for v3+
 /// incoming PDU's it is generated.
+#[tracing::instrument(
+	level = "debug",
+	skip_all,
+	fields(
+		members = value.len(),
+		room_version = ?room_version_id,
+	)
+)]
 pub fn gen_event_id(
 	value: &CanonicalJsonObject,
 	room_version_id: &RoomVersionId,
diff --git a/src/service/rooms/event_handler/parse_incoming_pdu.rs b/src/service/rooms/event_handler/parse_incoming_pdu.rs
index 52438f11..64611614 100644
--- a/src/service/rooms/event_handler/parse_incoming_pdu.rs
+++ b/src/service/rooms/event_handler/parse_incoming_pdu.rs
@@ -5,6 +5,14 @@ use tuwunel_core::{Result, err, implement, matrix::event::gen_event_id, result::
 type Parsed = (OwnedRoomId, OwnedEventId, CanonicalJsonObject);
 
 #[implement(super::Service)]
+#[tracing::instrument(
+    name = "parse_incoming",
+    level = "trace",
+    skip_all,
+    fields(
+        len = pdu.get().len(),
+    )
+)]
 pub async fn parse_incoming_pdu(&self, pdu: &RawJsonValue) -> Result<Parsed> {
 	let value: CanonicalJsonObject = serde_json::from_str(pdu.get()).map_err(|e| {
 		err!(BadServerResponse(debug_error!("Error parsing incoming event: {e} {pdu:#?}")))