synapse/http/server.py

@@ -334,7 +334,10 @@ class _AsyncResource(resource.Resource, metaclass=abc.ABCMeta):
             request.request_metrics.name = self.__class__.__name__
 
             with trace_servlet(request, self._extract_context):
-                callback_return = await self._async_render(request)
+                callback_return = await measure_coroutine(
+                    request.request_metrics.name, self._async_render(request)
+                )
+
                 if callback_return is not None:
                     code, response = callback_return
                     self._send_response(request, code, response)
@@ -365,9 +368,7 @@ class _AsyncResource(resource.Resource, metaclass=abc.ABCMeta):
 
             # Is it synchronous? We'll allow this for now.
             if isawaitable(raw_callback_return):
-                callback_return = await measure_coroutine(
-                    request.request_metrics.name, raw_callback_return
-                )
+                callback_return = await raw_callback_return
             else:
                 callback_return = raw_callback_return
 
@@ -547,9 +548,7 @@ class JsonResource(DirectServeJsonResource):
 
         # Is it synchronous? We'll allow this for now.
         if isinstance(raw_callback_return, (defer.Deferred, types.CoroutineType)):
-            callback_return = await measure_coroutine(
-                request.request_metrics.name, raw_callback_return
-            )
+            callback_return = await raw_callback_return
         else:
             callback_return = raw_callback_return