diff options
| author | Eric Eastwood <erice@element.io> | 2022-07-28 19:43:43 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-07-28 19:43:43 -0500 |
| commit | 1b0840e3aad5171e9462c3f3937ea292e18ed4be (patch) | |
| tree | 5aaebe6d3685818f6d2e380e226a2288590ebd63 | |
| parent | Fixup some todos (diff) | |
| download | synapse-1b0840e3aad5171e9462c3f3937ea292e18ed4be.tar.xz | |
Fix some lints
| -rw-r--r-- | synapse/api/auth.py | 2 | ||||
| -rw-r--r-- | synapse/logging/tracing.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 2633bd9264..06e3f2f7a9 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -30,7 +30,7 @@ from synapse.api.errors import ( from synapse.appservice import ApplicationService from synapse.http import get_request_user_agent from synapse.http.site import SynapseRequest -from synapse.logging.tracing import get_active_span, force_tracing, start_active_span +from synapse.logging.tracing import force_tracing, get_active_span, start_active_span from synapse.storage.databases.main.registration import TokenLookupResult from synapse.types import Requester, UserID, create_requester diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py index 6c5c231c08..81ada25396 100644 --- a/synapse/logging/tracing.py +++ b/synapse/logging/tracing.py @@ -218,12 +218,12 @@ class _DummyLookup(object): try: import opentelemetry import opentelemetry.exporter.jaeger.thrift + import opentelemetry.propagate import opentelemetry.sdk.resources import opentelemetry.sdk.trace import opentelemetry.sdk.trace.export import opentelemetry.semconv.trace import opentelemetry.trace - import opentelemetry.propagate SpanKind = opentelemetry.trace.SpanKind SpanAttributes = opentelemetry.semconv.trace.SpanAttributes |