diff options
| author | Jorik Schellekens <joriks@matrix.org> | 2019-07-22 11:18:50 +0100 |
|---|---|---|
| committer | Jorik Schellekens <joriks@matrix.org> | 2019-07-22 11:18:50 +0100 |
| commit | 0fd171770a50385cf850d80921f1177940693a45 (patch) | |
| tree | bacff75a844b9baaa123a361c929fc888edb91ba /synapse/config | |
| parent | Revert "Remove deprecated 'verbose' cli arg" (diff) | |
| parent | Opentracing Documentation (#5703) (diff) | |
| download | synapse-0fd171770a50385cf850d80921f1177940693a45.tar.xz | |
Merge branch 'release-v1.2.0' into develop
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/tracer.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/synapse/config/tracer.py b/synapse/config/tracer.py index a2ce9ab3f6..4479454415 100644 --- a/synapse/config/tracer.py +++ b/synapse/config/tracer.py @@ -48,18 +48,8 @@ class TracerConfig(Config): #enabled: true # The list of homeservers we wish to send and receive span contexts and span baggage. - # - # Though it's mostly safe to send and receive span contexts to and from - # untrusted users since span contexts are usually opaque ids it can lead to - # two problems, namely: - # - If the span context is marked as sampled by the sending homeserver the receiver will - # sample it. Therefore two homeservers with wildly disparaging sampling policies - # could incur higher sampling counts than intended. - # - Span baggage can be arbitrary data. For safety this has been disabled in synapse - # but that doesn't prevent another server sending you baggage which will be logged - # to opentracing logs. - # - # This a list of regexes which are matched against the server_name of the + # See docs/opentracing.rst + # This is a list of regexes which are matched against the server_name of the # homeserver. # # By defult, it is empty, so no servers are matched. |