Skip to content
Snippets Groups Projects
Unverified Commit c7131bae authored by Richard van der Hoff's avatar Richard van der Hoff Committed by GitHub
Browse files

Merge pull request #3892 from matrix-org/rav/decode_bytes_in_request_logs

Fix some b'abcd' noise in logs and metrics
parents c9c50284 0cb7afff
Branches
Tags
No related merge requests found
Fix some b'abcd' noise in logs and metrics
...@@ -244,7 +244,10 @@ class MatrixFederationHttpClient(object): ...@@ -244,7 +244,10 @@ class MatrixFederationHttpClient(object):
request_deferred, request_deferred,
) )
log_result = "%d %s" % (response.code, response.phrase,) log_result = "%d %s" % (
response.code,
response.phrase.decode('ascii', errors='replace'),
)
break break
except Exception as e: except Exception as e:
if not retry_on_dns_fail and isinstance(e, DNSLookupError): if not retry_on_dns_fail and isinstance(e, DNSLookupError):
......
...@@ -82,7 +82,7 @@ class SynapseRequest(Request): ...@@ -82,7 +82,7 @@ class SynapseRequest(Request):
) )
def get_request_id(self): def get_request_id(self):
return "%s-%i" % (self.method, self.request_seq) return "%s-%i" % (self.method.decode('ascii'), self.request_seq)
def get_redacted_uri(self): def get_redacted_uri(self):
uri = self.uri uri = self.uri
...@@ -119,7 +119,7 @@ class SynapseRequest(Request): ...@@ -119,7 +119,7 @@ class SynapseRequest(Request):
# dispatching to the handler, so that the handler # dispatching to the handler, so that the handler
# can update the servlet name in the request # can update the servlet name in the request
# metrics # metrics
requests_counter.labels(self.method, requests_counter.labels(self.method.decode('ascii'),
self.request_metrics.name).inc() self.request_metrics.name).inc()
@contextlib.contextmanager @contextlib.contextmanager
...@@ -280,9 +280,9 @@ class SynapseRequest(Request): ...@@ -280,9 +280,9 @@ class SynapseRequest(Request):
int(usage.db_txn_count), int(usage.db_txn_count),
self.sentLength, self.sentLength,
code, code,
self.method, self.method.decode('ascii'),
self.get_redacted_uri(), self.get_redacted_uri(),
self.clientproto, self.clientproto.decode('ascii', errors='replace'),
user_agent, user_agent,
usage.evt_db_fetch_count, usage.evt_db_fetch_count,
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment