Merge remote-tracking branch 'origin/develop' into joriks/opentracing_trace_sendtime github/joriks/opentracing_trace_sendtime joriks/opentracing_trace_sendtime

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/federation/units.py b/synapse/federation/units.py

index aa84621206..b4d743cde7 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -41,6 +41,9 @@ class Edu(JsonEncodedObject):
     def get_context(self):
         return getattr(self, "content", {}).get("org.matrix.opentracing_context", "{}")
 
+    def strip_context(self):
+        getattr(self, "content", {})["org.matrix.opentracing_context"] = "{}"
+
 
 class Transaction(JsonEncodedObject):
     """ A transaction is a list of Pdus and Edus to be sent to a remote home