From 63179ef52c93f77e9e4d0ded00d64489b5d2cfd9 Mon Sep 17 00:00:00 2001
From: Jorik Schellekens <joriks@matrix.org>
Date: Wed, 14 Aug 2019 17:58:34 +0100
Subject: [PATCH] Stylish imports

---
 synapse/federation/federation_server.py           |  4 ++--
 .../federation/sender/per_destination_queue.py    |  8 +++-----
 synapse/handlers/devicemessage.py                 | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 734836ac1fe9..de8e0570a6a5 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -25,7 +25,6 @@
 from twisted.internet.abstract import isIPAddress
 from twisted.python import failure
 
-import synapse.logging.opentracing as opentracing
 from synapse.api.constants import EventTypes, Membership
 from synapse.api.errors import (
     AuthError,
@@ -44,6 +43,7 @@
 from synapse.federation.units import Edu, Transaction
 from synapse.http.endpoint import parse_server_name
 from synapse.logging.context import nested_logging_context
+from synapse.logging.opentracing import start_active_span_from_edu
 from synapse.logging.utils import log_function
 from synapse.replication.http.federation import (
     ReplicationFederationSendEduRestServlet,
@@ -809,7 +809,7 @@ def on_edu(self, edu_type, origin, content):
         if not handler:
             logger.warn("No handler registered for EDU type %s", edu_type)
 
-        with opentracing.start_active_span_from_edu(content, "handle_edu"):
+        with start_active_span_from_edu(content, "handle_edu"):
             try:
                 yield handler(origin, content)
             except SynapseError as e:
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py
index e8b49cd709a2..ca39d199b1f1 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -21,7 +21,6 @@
 
 from twisted.internet import defer
 
-import synapse.logging.opentracing as opentracing
 from synapse.api.errors import (
     FederationDeniedError,
     HttpResponseException,
@@ -30,6 +29,7 @@
 from synapse.events import EventBase
 from synapse.federation.units import Edu
 from synapse.handlers.presence import format_user_presence_state
+from synapse.logging.opentracing import extract_text_map, start_active_span_follows_from
 from synapse.metrics import sent_transactions_counter
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.storage import UserPresenceState
@@ -211,7 +211,7 @@ def _transaction_transmission_loop(self):
                 # are never received on the remote the span effectively has no causality.
 
                 span_contexts = [
-                    opentracing.extract_text_map(
+                    extract_text_map(
                         json.loads(
                             edu.get_dict().get("content", {}).get("context", "{}")
                         )
@@ -219,9 +219,7 @@ def _transaction_transmission_loop(self):
                     for edu in pending_edus
                 ]
 
-                with opentracing.start_active_span_follows_from(
-                    "send_transaction", span_contexts
-                ):
+                with start_active_span_follows_from("send_transaction", span_contexts):
                     # BEGIN CRITICAL SECTION
                     #
                     # In order to avoid a race condition, we need to make sure that
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py
index a4b29424f826..6b2309e00453 100644
--- a/synapse/handlers/devicemessage.py
+++ b/synapse/handlers/devicemessage.py
@@ -19,8 +19,13 @@
 
 from twisted.internet import defer
 
-import synapse.logging.opentracing as opentracing
 from synapse.api.errors import SynapseError
+from synapse.logging.opentracing import (
+    get_active_span_text_map,
+    set_tag,
+    start_active_span,
+    whitelisted_homeserver,
+)
 from synapse.types import UserID, get_domain_from_id
 from synapse.util.stringutils import random_string
 
@@ -103,19 +108,19 @@ def send_device_message(self, sender_user_id, message_type, messages):
 
         message_id = random_string(16)
 
-        context = opentracing.get_active_span_text_map()
+        context = get_active_span_text_map()
 
         remote_edu_contents = {}
         for destination, messages in remote_messages.items():
-            with opentracing.start_active_span("to_device_for_user"):
-                opentracing.set_tag("destination", destination)
+            with start_active_span("to_device_for_user"):
+                set_tag("destination", destination)
                 remote_edu_contents[destination] = {
                     "messages": messages,
                     "sender": sender_user_id,
                     "type": message_type,
                     "message_id": message_id,
                     "org.matrix.context": json.dumps(context)
-                    if opentracing.whitelisted_homeserver(destination)
+                    if whitelisted_homeserver(destination)
                     else None,
                 }