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. |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| 11215.feature | ||
| 11615.misc | ||
| 11655.feature | ||
| 11832.misc | ||
| 11868.feature | ||
| 11869.misc | ||
| 11876.misc | ||
| 11878.misc | ||
| 11880.misc | ||
| 11884.misc | ||
| 11888.misc | ||
| 11890.bugfix | ||