diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index 7fa80439b2..61882fb40b 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -737,6 +737,11 @@ class FederationEventHandler:
backfilled: True if this is part of a historical batch of events (inhibits
notification to clients, and validation of device keys.)
"""
+ set_attribute(
+ SynapseTags.FUNC_ARG_PREFIX + f"event_ids ({len(events)})",
+ str([event.event_id for event in events]),
+ )
+ set_attribute(SynapseTags.FUNC_ARG_PREFIX + "backfilled", str(backfilled))
logger.debug(
"processing pulled backfilled=%s events=%s",
backfilled,
@@ -1495,9 +1500,10 @@ class FederationEventHandler:
"""
event_map = {event.event_id: event for event in events}
+ event_ids = event_map.keys()
set_attribute(
- SynapseTags.FUNC_ARG_PREFIX + "event_ids",
- str(event_map.keys()),
+ SynapseTags.FUNC_ARG_PREFIX + f"event_ids ({len(event_ids)})",
+ str(event_ids),
)
# filter out any events we have already seen. This might happen because
@@ -2104,7 +2110,7 @@ class FederationEventHandler:
if not backfilled: # Never notify for backfilled events
with start_active_span("notify_persisted_events"):
set_attribute(
- SynapseTags.FUNC_ARG_PREFIX + "event_ids",
+ SynapseTags.FUNC_ARG_PREFIX + f"event_ids ({len(events)})",
str([ev.event_id for ev in events]),
)
for event in events:
diff --git a/synapse/storage/controllers/persist_events.py b/synapse/storage/controllers/persist_events.py
index 72b4dcef59..7cb69fa4f3 100644
--- a/synapse/storage/controllers/persist_events.py
+++ b/synapse/storage/controllers/persist_events.py
@@ -391,7 +391,7 @@ class EventsPersistenceStorageController:
a room that has been un-partial stated.
"""
set_attribute(
- SynapseTags.FUNC_ARG_PREFIX + "event_ids",
+ SynapseTags.FUNC_ARG_PREFIX + f"event_ids ({len(events_and_contexts)})",
str([e.event_id for e, _ in events_and_contexts]),
)
set_attribute(SynapseTags.FUNC_ARG_PREFIX + "backfilled", str(backfilled))
|