OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Code style

pull/5544/head
Jorik Schellekens 2019-06-25 10:28:46 +01:00
parent 889afc11a0
commit db10eeb267
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/http/site.py
View File

@ -239,7 +239,7 @@ class SynapseRequest(Request):
# Start a span # Start a span
span_context = extract_span_context(self.requestHeaders) span_context = extract_span_context(self.requestHeaders)
span = opentracing.tracer.start_active_span( opentracing.tracer.start_active_span(
"incoming-federation-request", "incoming-federation-request",
tags={ tags={
"request_id": self.get_request_id(), "request_id": self.get_request_id(),

4
synapse/util/scopecontextmanager.py
View File

@ -15,8 +15,8 @@ class LogContextScopeManager(ScopeManager):
def __init__(self, config): def __init__(self, config):
# Set the whitelists # Set the whitelists
logger.info(config.tracer_config) logger.info(config.tracer_config)
_homeserver_whitelist = config.tracer_config["homeserver_whitelist"] self._homeserver_whitelist = config.tracer_config["homeserver_whitelist"]
_user_whitelist = config.tracer_config["user_whitelist"] self._user_whitelist = config.tracer_config["user_whitelist"]
@property @property
def active(self): def active(self):

2
synapse/util/tracerutils.py
View File

@ -1,8 +1,6 @@
import opentracing import opentracing
from opentracing.propagation import Format from opentracing.propagation import Format
from .logcontext import LoggingContext
def extract_span_context(headers): def extract_span_context(headers):
""" """