diff options
| author | Erik Johnston <erik@matrix.org> | 2019-09-27 10:02:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 10:02:57 +0100 |
| commit | 67ee18daeadf9505c1a562483c4ea5b0315fa84d (patch) | |
| tree | c63ae77c21c07205dc8035c049ee3d24893c4883 /synapse/api/auth.py | |
| parent | Kill off half-implemented password-reset via sms (#6101) (diff) | |
| parent | isort (diff) | |
| download | synapse-67ee18daeadf9505c1a562483c4ea5b0315fa84d.tar.xz | |
Merge pull request #6108 from matrix-org/erikj/remove_get_user_by_req-span
Add some helpful opentracing tags and remove get_user_by_req span
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 9e445cd808..cb50579fd2 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -179,7 +179,6 @@ class Auth(object): def get_public_keys(self, invite_event): return event_auth.get_public_keys(invite_event) - @opentracing.trace @defer.inlineCallbacks def get_user_by_req( self, request, allow_guest=False, rights="access", allow_expired=False @@ -212,6 +211,7 @@ class Auth(object): if user_id: request.authenticated_entity = user_id opentracing.set_tag("authenticated_entity", user_id) + opentracing.set_tag("appservice_id", app_service.id) if ip_addr and self.hs.config.track_appservice_user_ips: yield self.store.insert_client_ip( @@ -263,6 +263,8 @@ class Auth(object): request.authenticated_entity = user.to_string() opentracing.set_tag("authenticated_entity", user.to_string()) + if device_id: + opentracing.set_tag("device_id", device_id) return synapse.types.create_requester( user, token_id, is_guest, device_id, app_service=app_service |