diff options
| author | David Robertson <davidr@element.io> | 2023-02-09 22:33:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-09 22:33:39 +0000 |
| commit | a5a799722db0c33dc61fb2c6c7282ff7e82eb2e9 (patch) | |
| tree | f2da789f419ec35341cde1c305c6778b88f85429 | |
| parent | Add a class UnpersistedEventContext to allow for the batching up of storing s... (diff) | |
| download | synapse-a5a799722db0c33dc61fb2c6c7282ff7e82eb2e9.tar.xz | |
Tag federation request spans with the worker name (#15042)
* Systematically include worker name as process info * Changelog * don't bother with inner setdefault
| -rw-r--r-- | changelog.d/15042.feature | 1 | ||||
| -rw-r--r-- | synapse/api/auth.py | 7 | ||||
| -rw-r--r-- | synapse/logging/opentracing.py | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/changelog.d/15042.feature b/changelog.d/15042.feature new file mode 100644 index 0000000000..7a4de89f00 --- /dev/null +++ b/changelog.d/15042.feature @@ -0,0 +1 @@ +Tag opentracing spans for federation requests with the name of the worker serving the request. diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 3d7f986ac7..66e869bc2d 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -32,7 +32,6 @@ from synapse.appservice import ApplicationService from synapse.http import get_request_user_agent from synapse.http.site import SynapseRequest from synapse.logging.opentracing import ( - SynapseTags, active_span, force_tracing, start_active_span, @@ -162,12 +161,6 @@ class Auth: parent_span.set_tag( "authenticated_entity", requester.authenticated_entity ) - # We tag the Synapse instance name so that it's an easy jumping - # off point into the logs. Can also be used to filter for an - # instance that is under load. - parent_span.set_tag( - SynapseTags.INSTANCE_NAME, self.hs.get_instance_name() - ) parent_span.set_tag("user_id", requester.user.to_string()) if requester.device_id is not None: parent_span.set_tag("device_id", requester.device_id) diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 8ef9a0dda8..6c7cf1b294 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -466,8 +466,16 @@ def init_tracer(hs: "HomeServer") -> None: STRIP_INSTANCE_NUMBER_SUFFIX_REGEX, "", hs.get_instance_name() ) + jaeger_config = hs.config.tracing.jaeger_config + tags = jaeger_config.setdefault("tags", {}) + + # tag the Synapse instance name so that it's an easy jumping + # off point into the logs. Can also be used to filter for an + # instance that is under load. + tags[SynapseTags.INSTANCE_NAME] = hs.get_instance_name() + config = JaegerConfig( - config=hs.config.tracing.jaeger_config, + config=jaeger_config, service_name=f"{hs.config.server.server_name} {instance_name_by_type}", scope_manager=LogContextScopeManager(), metrics_factory=PrometheusMetricsFactory(), |