Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry

Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/api/auth.py

1 files changed, 7 insertions, 1 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 7071f771a7..61da585ad0 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -31,7 +31,12 @@ from synapse.api.errors import (
 from synapse.appservice import ApplicationService
 from synapse.http import get_request_user_agent
 from synapse.http.site import SynapseRequest
-from synapse.logging.tracing import force_tracing, get_active_span, start_active_span
+from synapse.logging.tracing import (
+    force_tracing,
+    get_active_span,
+    start_active_span,
+    trace,
+)
 from synapse.storage.databases.main.registration import TokenLookupResult
 from synapse.types import Requester, UserID, create_requester
 
@@ -566,6 +571,7 @@ class Auth:
 
             return query_params[0].decode("ascii")
 
+    @trace
     async def check_user_in_room_or_world_readable(
         self, room_id: str, user_id: str, allow_departed_users: bool = False
     ) -> Tuple[str, Optional[str]]: