diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-05-28 16:14:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-28 16:14:08 +0100 |
| commit | ed53bf314fee25d79d349beae409caf81a2d677f (patch) | |
| tree | f2acb4524ceac8860daa2ef71e1d98a97d9e80ad /synapse/api/auth.py | |
| parent | Log method and path when dropping request due to size limit (#10091) (diff) | |
| download | synapse-ed53bf314fee25d79d349beae409caf81a2d677f.tar.xz | |
Set opentracing priority before setting other tags (#10092)
... because tags on spans which aren't being sampled get thrown away.
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 458306eba5..26a3b38918 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -206,11 +206,11 @@ class Auth: requester = create_requester(user_id, app_service=app_service) request.requester = user_id + if user_id in self._force_tracing_for_users: + opentracing.set_tag(opentracing.tags.SAMPLING_PRIORITY, 1) opentracing.set_tag("authenticated_entity", user_id) opentracing.set_tag("user_id", user_id) opentracing.set_tag("appservice_id", app_service.id) - if user_id in self._force_tracing_for_users: - opentracing.set_tag(opentracing.tags.SAMPLING_PRIORITY, 1) return requester @@ -259,12 +259,12 @@ class Auth: ) request.requester = requester + if user_info.token_owner in self._force_tracing_for_users: + opentracing.set_tag(opentracing.tags.SAMPLING_PRIORITY, 1) opentracing.set_tag("authenticated_entity", user_info.token_owner) opentracing.set_tag("user_id", user_info.user_id) if device_id: opentracing.set_tag("device_id", device_id) - if user_info.token_owner in self._force_tracing_for_users: - opentracing.set_tag(opentracing.tags.SAMPLING_PRIORITY, 1) return requester except KeyError: |