OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Tag /send_join responses to detect faster joins (#14950) 

* Tag /send_join responses to detect faster joins

* Changelog

* Define a proper SynapseTag

* isort
pull/14952/head
David Robertson 2023-01-31 12:43:20 +00:00 committed by GitHub
parent 805b641fb6
commit 3b8574b4f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/14950.misc Normal file
View File

@ -0,0 +1 @@
Faster joins: tag `v2/send_join/` requests to indicate if they served a partial join response.

6
synapse/federation/federation_server.py
View File

@ -62,7 +62,9 @@ from synapse.logging.context import (
run_in_background, run_in_background,
) )
from synapse.logging.opentracing import ( from synapse.logging.opentracing import (
SynapseTags,
log_kv, log_kv,
set_tag,
start_active_span_from_edu, start_active_span_from_edu,
tag_args, tag_args,
trace, trace,
@ -678,6 +680,10 @@ class FederationServer(FederationBase):
room_id: str, room_id: str,
caller_supports_partial_state: bool = False, caller_supports_partial_state: bool = False,
) -> Dict[str, Any]: ) -> Dict[str, Any]:
set_tag(
SynapseTags.SEND_JOIN_RESPONSE_IS_PARTIAL_STATE,
caller_supports_partial_state,
)
await self._room_member_handler._join_rate_per_room_limiter.ratelimit( # type: ignore[has-type] await self._room_member_handler._join_rate_per_room_limiter.ratelimit( # type: ignore[has-type]
requester=None, requester=None,
key=room_id, key=room_id,

5
synapse/logging/opentracing.py
View File

@ -322,6 +322,11 @@ class SynapseTags:
# The name of the external cache # The name of the external cache
CACHE_NAME = "cache.name" CACHE_NAME = "cache.name"
# Boolean. Present on /v2/send_join requests, omitted from all others.
# True iff partial state was requested and we provided (or intended to provide)
# partial state in the response.
SEND_JOIN_RESPONSE_IS_PARTIAL_STATE = "send_join.partial_state_response"
# Used to tag function arguments # Used to tag function arguments
# #
# Tag a named arg. The name of the argument should be appended to this prefix. # Tag a named arg. The name of the argument should be appended to this prefix.