Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix sentry default tags (#17251)

Browse Source 
This was broken by the sentry 2.0 upgrade

Broke in v1.108.0
This commit is contained in:
Erik Johnston 2024-05-31 11:27:47 +01:00 committed by GitHub
parent 5624c8b961
commit 7dd14fadb1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/17251.bugfix Normal file
View File

@ -0,0 +1 @@
Fix reporting of default tags to Sentry, such as worker name. Broke in v1.108.0.

8
synapse/app/_base.py
View File

@ -681,8 +681,8 @@ def setup_sentry(hs: "HomeServer") -> None:
)
# We set some default tags that give some context to this instance
with sentry_sdk.configure_scope() as scope:
scope.set_tag("matrix_server_name", hs.config.server.server_name)
global_scope = sentry_sdk.Scope.get_global_scope()
global_scope.set_tag("matrix_server_name", hs.config.server.server_name)
app = (
hs.config.worker.worker_app
@ -690,8 +690,8 @@ def setup_sentry(hs: "HomeServer") -> None:
else "synapse.app.homeserver"
)
name = hs.get_instance_name()
scope.set_tag("worker_app", app)
scope.set_tag("worker_name", name)
global_scope.set_tag("worker_app", app)
global_scope.set_tag("worker_name", name)
def setup_sdnotify(hs: "HomeServer") -> None: