summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-05 15:22:24 +0100
committerGitHub <noreply@github.com>2019-09-05 15:22:24 +0100
commit1a6ae333090c5b34ab6a3e0427dfc87ed99d6a9c (patch)
tree0c1b096f70c9d7743049765fdc31639001fa84ea /synapse/handlers
parentAdd opentracing to all client servlets (#5983) (diff)
parentuse access methods (duh..) (diff)
downloadsynapse-1a6ae333090c5b34ab6a3e0427dfc87ed99d6a9c.tar.xz
Merge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_contexts
Link the send loop with the edus contexts
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/devicemessage.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/synapse/handlers/devicemessage.py b/synapse/handlers/devicemessage.py
index 01731cb2d0..0043cbea17 100644
--- a/synapse/handlers/devicemessage.py
+++ b/synapse/handlers/devicemessage.py
@@ -25,7 +25,6 @@ from synapse.logging.opentracing import (
     log_kv,
     set_tag,
     start_active_span,
-    whitelisted_homeserver,
 )
 from synapse.types import UserID, get_domain_from_id
 from synapse.util.stringutils import random_string
@@ -121,9 +120,7 @@ class DeviceMessageHandler(object):
                     "sender": sender_user_id,
                     "type": message_type,
                     "message_id": message_id,
-                    "org.matrix.opentracing_context": json.dumps(context)
-                    if whitelisted_homeserver(destination)
-                    else None,
+                    "org.matrix.opentracing_context": json.dumps(context),
                 }
 
         log_kv({"local_messages": local_messages})