tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Improve opentracing annotations for Notifier (#10111)

Browse source 
The existing tracing reports an error each time there is a timeout, which isn't
really representative.

Additionally, we log things about the way `wait_for_events` works
(eg, the result of the callback) to the *parent* span, which is confusing.
This commit is contained in:
Richard van der Hoff 2021-06-03 16:01:30 +01:00 committed by GitHub
parent 73636cab69
commit 1d143074c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/10111.misc Normal file
View file

@ -0,0 +1 @@
Improve opentracing annotations for `Notifier`.

2
synapse/notifier.py
View file

@ -485,6 +485,7 @@ class Notifier:
end_time = self.clock.time_msec() + timeout end_time = self.clock.time_msec() + timeout
while not result: while not result:
with start_active_span("wait_for_events"):
try: try:
now = self.clock.time_msec() now = self.clock.time_msec()
if end_time <= now: if end_time <= now:
@ -499,7 +500,6 @@ class Notifier:
self.hs.get_reactor(), self.hs.get_reactor(),
) )
with start_active_span("wait_for_events.deferred"):
log_kv( log_kv(
{ {
"wait_for_events": "sleep", "wait_for_events": "sleep",