Merge pull request #6003 from matrix-org/erikj/push_opentracing

matrix-org · Feb 25, 2020 · f7ae2c7 · f7ae2c7
2 parents 87856c6 + ea6956c
commit f7ae2c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/changelog.d/6003.misc b/changelog.d/6003.misc
@@ -0,0 +1 @@
+Add opentracing span over HTTP push processing.
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py
@@ -22,6 +22,7 @@
 from twisted.internet import defer
 from twisted.internet.error import AlreadyCalled, AlreadyCancelled
 
+from synapse.logging import opentracing
 from synapse.metrics.background_process_metrics import run_as_background_process
 from synapse.push import PusherConfigException
 
@@ -194,7 +195,17 @@ def _unsafe_process(self):
         )
 
         for push_action in unprocessed:
-            processed = yield self._process_one(push_action)
+            with opentracing.start_active_span(
+                "http-push",
+                tags={
+                    "authenticated_entity": self.user_id,
+                    "event_id": push_action["event_id"],
+                    "app_id": self.app_id,
+                    "app_display_name": self.app_display_name,
+                },
+            ):
+                processed = yield self._process_one(push_action)
+
             if processed:
                 http_push_processed_counter.inc()
                 self.backoff_delay = HttpPusher.INITIAL_BACKOFF_SEC
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add opentracing span over HTTP push processing.