Skip to content

Commit 23f4e16

Browse files
erikjohnstonMic92
authored andcommitted
Fix sentry default tags (element-hq#17251)
This was broken by the sentry 2.0 upgrade Broke in v1.108.0
1 parent b3ce9cb commit 23f4e16

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

changelog.d/17251.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix reporting of default tags to Sentry, such as worker name. Broke in v1.108.0.

synapse/app/_base.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -681,17 +681,17 @@ def setup_sentry(hs: "HomeServer") -> None:
681681
)
682682

683683
# We set some default tags that give some context to this instance
684-
with sentry_sdk.configure_scope() as scope:
685-
scope.set_tag("matrix_server_name", hs.config.server.server_name)
684+
global_scope = sentry_sdk.Scope.get_global_scope()
685+
global_scope.set_tag("matrix_server_name", hs.config.server.server_name)
686686

687-
app = (
688-
hs.config.worker.worker_app
689-
if hs.config.worker.worker_app
690-
else "synapse.app.homeserver"
691-
)
692-
name = hs.get_instance_name()
693-
scope.set_tag("worker_app", app)
694-
scope.set_tag("worker_name", name)
687+
app = (
688+
hs.config.worker.worker_app
689+
if hs.config.worker.worker_app
690+
else "synapse.app.homeserver"
691+
)
692+
name = hs.get_instance_name()
693+
global_scope.set_tag("worker_app", app)
694+
global_scope.set_tag("worker_name", name)
695695

696696

697697
def setup_sdnotify(hs: "HomeServer") -> None:

0 commit comments

Comments
 (0)