diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py
index f40b071a74..a3bd04b712 100644
--- a/synapse/handlers/federation_event.py
+++ b/synapse/handlers/federation_event.py
@@ -59,9 +59,9 @@ from synapse.events import EventBase
from synapse.events.snapshot import EventContext
from synapse.federation.federation_client import InvalidResponseError
from synapse.logging.context import nested_logging_context
-from synapse.logging.opentracing import (
+from synapse.logging.tracing import (
SynapseTags,
- set_tag,
+ set_attribute,
start_active_span,
tag_args,
trace,
@@ -758,15 +758,15 @@ class FederationEventHandler:
backfilled: True if this is part of a historical batch of events (inhibits
notification to clients, and validation of device keys.)
"""
- set_tag(
+ set_attribute(
SynapseTags.FUNC_ARG_PREFIX + "event_ids",
str([event.event_id for event in events]),
)
- set_tag(
+ set_attribute(
SynapseTags.FUNC_ARG_PREFIX + "event_ids.length",
str(len(events)),
)
- set_tag(SynapseTags.FUNC_ARG_PREFIX + "backfilled", str(backfilled))
+ set_attribute(SynapseTags.FUNC_ARG_PREFIX + "backfilled", str(backfilled))
logger.debug(
"processing pulled backfilled=%s events=%s",
backfilled,
@@ -1073,19 +1073,19 @@ class FederationEventHandler:
missing_event_ids = missing_desired_event_ids | missing_auth_event_ids
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "missing_auth_event_ids",
str(missing_auth_event_ids),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "missing_auth_event_ids.length",
str(len(missing_auth_event_ids)),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "missing_desired_event_ids",
str(missing_desired_event_ids),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "missing_desired_event_ids.length",
str(len(missing_desired_event_ids)),
)
@@ -1162,11 +1162,11 @@ class FederationEventHandler:
event_id,
failed_to_fetch,
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "failed_to_fetch",
str(failed_to_fetch),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "failed_to_fetch.length",
str(len(failed_to_fetch)),
)
@@ -1551,11 +1551,11 @@ class FederationEventHandler:
event_map = {event.event_id: event for event in events}
event_ids = event_map.keys()
- set_tag(
+ set_attribute(
SynapseTags.FUNC_ARG_PREFIX + "event_ids",
str(event_ids),
)
- set_tag(
+ set_attribute(
SynapseTags.FUNC_ARG_PREFIX + "event_ids.length",
str(len(event_ids)),
)
@@ -1715,11 +1715,11 @@ class FederationEventHandler:
claimed_auth_events = await self._load_or_fetch_auth_events_for_event(
origin, event
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "claimed_auth_events",
str([ev.event_id for ev in claimed_auth_events]),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "claimed_auth_events.length",
str(len(claimed_auth_events)),
)
@@ -2168,11 +2168,11 @@ class FederationEventHandler:
if not backfilled: # Never notify for backfilled events
with start_active_span("notify_persisted_events"):
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "event_ids",
str([ev.event_id for ev in events]),
)
- set_tag(
+ set_attribute(
SynapseTags.RESULT_PREFIX + "event_ids.length",
str(len(events)),
)
|
