summary refs log tree commit diff
path: root/synapse/logging/opentracing.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
committerRichard van der Hoff <richard@matrix.org>2020-09-07 13:44:54 +0100
commitd74e8f28753e0fca8ae6c9f47f248a2abf9d998a (patch)
treee3df12529ee5480daed23131d58fa8cbe77b70c9 /synapse/logging/opentracing.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentAdd cross-signing sigs to the `keys` object (#8234) (diff)
downloadsynapse-d74e8f28753e0fca8ae6c9f47f248a2abf9d998a.tar.xz
Merge branch 'release-v1.20.0' 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 d39ac62168..7df0aa197d 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py
@@ -185,7 +185,7 @@ if TYPE_CHECKING: # Helper class -class _DummyTagNames(object): +class _DummyTagNames: """wrapper of opentracings tags. We need to have them if we want to reference them without opentracing around. Clearly they should never actually show up in a trace. `set_tags` overwrites