summary refs log tree commit diff
path: root/synapse/logging/opentracing.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-07-20 11:48:03 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-07-20 11:48:03 +0100
commitc0121d69e7578feecfcc3e3e83971adc34ca51ee (patch)
treed15d5d6c7b65a915db8b75844e4057bca8ddf171 /synapse/logging/opentracing.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentAdd a github actions job recording success of other jobs. (#10430) (diff)
downloadsynapse-c0121d69e7578feecfcc3e3e83971adc34ca51ee.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/logging/opentracing.py')
-rw-r--r--synapse/logging/opentracing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py

index 185844f188..ecd51f1b4a 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py
@@ -374,7 +374,7 @@ def init_tracer(hs: "HomeServer"): config = JaegerConfig( config=hs.config.jaeger_config, - service_name="{} {}".format(hs.config.server_name, hs.get_instance_name()), + service_name=f"{hs.config.server_name} {hs.get_instance_name()}", scope_manager=LogContextScopeManager(hs.config), metrics_factory=PrometheusMetricsFactory(), )