diff options
| author | Eric Eastwood <erice@element.io> | 2022-07-27 16:49:00 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-07-27 16:49:00 -0500 |
| commit | f6c3b22a219a96473baf9c770a9b6cdc4fcef5b9 (patch) | |
| tree | 8eb35fc60fbb479048967f051968bd7697be972c | |
| parent | We use the config for the Jaeger exporter now (diff) | |
| download | synapse-f6c3b22a219a96473baf9c770a9b6cdc4fcef5b9.tar.xz | |
Fix some lints
| -rw-r--r-- | synapse/federation/sender/transaction_manager.py | 2 | ||||
| -rw-r--r-- | synapse/http/client.py | 6 | ||||
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 4 | ||||
| -rw-r--r-- | synapse/logging/tracing.py | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/synapse/federation/sender/transaction_manager.py b/synapse/federation/sender/transaction_manager.py index e8c491758f..afa813e77c 100644 --- a/synapse/federation/sender/transaction_manager.py +++ b/synapse/federation/sender/transaction_manager.py @@ -22,10 +22,10 @@ from synapse.events import EventBase from synapse.federation.persistence import TransactionActions from synapse.federation.units import Edu, Transaction from synapse.logging.tracing import ( + StatusCode, extract_text_map, set_status, start_active_span_follows_from, - StatusCode, whitelisted_homeserver, ) from synapse.types import JsonDict diff --git a/synapse/http/client.py b/synapse/http/client.py index b26a7520bf..08f5aa9518 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -76,11 +76,11 @@ from synapse.http.proxyagent import ProxyAgent from synapse.http.types import QueryParams from synapse.logging.context import make_deferred_yieldable from synapse.logging.tracing import ( - set_status, - start_active_span, - SpanKind, SpanAttributes, + SpanKind, StatusCode, + set_status, + start_active_span, ) from synapse.types import ISynapseReactor from synapse.util import json_decoder diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 72e812ff66..5b5f3e9f40 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -75,10 +75,10 @@ from synapse.http.types import QueryParams from synapse.logging import tracing from synapse.logging.context import make_deferred_yieldable, run_in_background from synapse.logging.tracing import ( + SpanAttributes, + SpanKind, set_attribute, start_active_span, - SpanKind, - SpanAttributes, ) from synapse.types import JsonDict from synapse.util import json_decoder diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py index 2bd53f7532..d9e2cde8aa 100644 --- a/synapse/logging/tracing.py +++ b/synapse/logging/tracing.py @@ -217,12 +217,12 @@ class _DummyLookup(object): # and we try: import opentelemetry - import opentelemetry.trace + import opentelemetry.exporter.jaeger.thrift + import opentelemetry.sdk.resources import opentelemetry.sdk.trace import opentelemetry.sdk.trace.export - import opentelemetry.sdk.resources import opentelemetry.semconv.trace - import opentelemetry.exporter.jaeger.thrift + import opentelemetry.trace SpanKind = opentelemetry.trace.SpanKind SpanAttributes = opentelemetry.semconv.trace.SpanAttributes |