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

Start an opentracing span for background processes. (#8567)

Browse source 
This should reduce the number of `There was no active span` errors we
see.

Fixes #8510.
This commit is contained in:
Erik Johnston 2020-10-19 12:26:26 +01:00 committed by GitHub
parent 97647b33c2
commit 1fcdbeb3ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8567.bugfix Normal file
View file

@ -0,0 +1 @@
Fix increase in the number of `There was no active span...` errors logged when using OpenTracing.

11
synapse/metrics/background_process_metrics.py
View file

@ -24,6 +24,7 @@ from prometheus_client.core import REGISTRY, Counter, Gauge
from twisted.internet import defer from twisted.internet import defer
from synapse.logging.context import LoggingContext, PreserveLoggingContext from synapse.logging.context import LoggingContext, PreserveLoggingContext
from synapse.logging.opentracing import start_active_span
if TYPE_CHECKING: if TYPE_CHECKING:
import resource import resource
@ -197,14 +198,14 @@ def run_as_background_process(desc: str, func, *args, **kwargs):
with BackgroundProcessLoggingContext(desc) as context: with BackgroundProcessLoggingContext(desc) as context:
context.request = "%s-%i" % (desc, count) context.request = "%s-%i" % (desc, count)
try: try:
result = func(*args, **kwargs) with start_active_span(desc, tags={"request_id": context.request}):
result = func(*args, **kwargs)
if inspect.isawaitable(result): if inspect.isawaitable(result):
result = await result result = await result
return result return result
except Exception: except Exception:
logger.exception( logger.exception(
"Background process '%s' threw an exception", desc, "Background process '%s' threw an exception", desc,