diff options
| author | Will Hunt <will@half-shot.uk> | 2020-07-05 16:32:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 16:32:02 +0100 |
| commit | 62b1ce85398f52e7d6137e77083294d0c90af459 (patch) | |
| tree | 8bb59226c2abea66fccfd42068a608a88eeaae8c /synapse/logging/opentracing.py | |
| parent | Merge different Resource implementation classes (#7732) (diff) | |
| download | synapse-62b1ce85398f52e7d6137e77083294d0c90af459.tar.xz | |
isort 5 compatibility (#7786)
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
Diffstat (limited to 'synapse/logging/opentracing.py')
| -rw-r--r-- | synapse/logging/opentracing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 1676771ef0..c6c0e623c1 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -164,7 +164,6 @@ Gotchas than one caller? Will all of those calling functions have be in a context with an active span? """ - import contextlib import inspect import logging @@ -180,8 +179,8 @@ from twisted.internet import defer from synapse.config import ConfigError if TYPE_CHECKING: - from synapse.server import HomeServer from synapse.http.site import SynapseRequest + from synapse.server import HomeServer # Helper class @@ -227,6 +226,7 @@ except ImportError: tags = _DummyTagNames try: from jaeger_client import Config as JaegerConfig + from synapse.logging.scopecontextmanager import LogContextScopeManager except ImportError: JaegerConfig = None # type: ignore |