forked from MirrorHub/synapse
31b554c297
`start_active_span` was inconsistent as to whether it would activate the span immediately, or wait for `scope.__enter__` to happen (it depended on whether the current logcontext already had an associated scope). The inconsistency was rather confusing if you were hoping to set up a couple of separate spans before activating either. Looking at the other implementations of opentracing `ScopeManager`s, the intention is that it *should* be activated immediately, as the name implies. Indeed, the idea is that you don't have to use the scope as a contextmanager at all - you can just call `.close` on the result. Hence, our cleanup has to happen in `.close` rather than `.__exit__`. So, the main change here is to ensure that `start_active_span` does activate the span, and that `scope.close()` does close the scope. We also add some tests, which requires a `tracer` param so that we don't have to rely on the global variable in unit tests. |
||
---|---|---|
.. | ||
api | ||
app | ||
appservice | ||
config | ||
crypto | ||
events | ||
federation | ||
handlers | ||
http | ||
logging | ||
module_api | ||
push | ||
replication | ||
rest | ||
scripts | ||
server_notices | ||
state | ||
storage | ||
test_utils | ||
util | ||
__init__.py | ||
server.py | ||
test_distributor.py | ||
test_event_auth.py | ||
test_federation.py | ||
test_mau.py | ||
test_metrics.py | ||
test_phone_home.py | ||
test_server.py | ||
test_state.py | ||
test_terms_auth.py | ||
test_test_utils.py | ||
test_types.py | ||
test_visibility.py | ||
unittest.py | ||
utils.py |