diff options
| author | Erik Johnston <erikj@element.io> | 2024-05-31 11:27:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 11:27:47 +0100 |
| commit | 7dd14fadb12c33841df30d4668ff9b24f5f23631 (patch) | |
| tree | f7e4ceb480b9b0668fcf9bb96a554f222c97ce78 | |
| parent | In sync wait for worker to catch up since token (#17215) (diff) | |
| download | synapse-7dd14fadb12c33841df30d4668ff9b24f5f23631.tar.xz | |
Fix sentry default tags (#17251)
This was broken by the sentry 2.0 upgrade Broke in v1.108.0
| -rw-r--r-- | changelog.d/17251.bugfix | 1 | ||||
| -rw-r--r-- | synapse/app/_base.py | 20 |
2 files changed, 11 insertions, 10 deletions
diff --git a/changelog.d/17251.bugfix b/changelog.d/17251.bugfix new file mode 100644 index 0000000000..f573e01e87 --- /dev/null +++ b/changelog.d/17251.bugfix @@ -0,0 +1 @@ +Fix reporting of default tags to Sentry, such as worker name. Broke in v1.108.0. diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 67e0df1459..4cc260d551 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -681,17 +681,17 @@ 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 - if hs.config.worker.worker_app - else "synapse.app.homeserver" - ) - name = hs.get_instance_name() - scope.set_tag("worker_app", app) - scope.set_tag("worker_name", name) + app = ( + hs.config.worker.worker_app + if hs.config.worker.worker_app + else "synapse.app.homeserver" + ) + name = hs.get_instance_name() + global_scope.set_tag("worker_app", app) + global_scope.set_tag("worker_name", name) def setup_sdnotify(hs: "HomeServer") -> None: |