From 7772f50e60baa9ba3b1f29efe20152b4ba22cdd5 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Sat, 30 Jul 2022 02:07:46 -0500 Subject: [PATCH] Use HTTP_HOST attribute --- synapse/http/matrixfederationclient.py | 2 +- synapse/logging/tracing.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 3b5ce72c28..e360c04cb0 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -524,7 +524,7 @@ class MatrixFederationHttpClient: "outgoing-federation-request", kind=SpanKind.CLIENT, attributes={ - SpanAttributes.PEER_ADDRESS: request.destination, + SpanAttributes.HTTP_HOST: request.destination, SpanAttributes.HTTP_METHOD: request.method, SpanAttributes.HTTP_URL: request.path, }, diff --git a/synapse/logging/tracing.py b/synapse/logging/tracing.py index 8c8b713dd5..ca9d3ba3cd 100644 --- a/synapse/logging/tracing.py +++ b/synapse/logging/tracing.py @@ -822,8 +822,7 @@ def trace_servlet( SynapseTags.REQUEST_ID: request.get_request_id(), SpanAttributes.HTTP_METHOD: request.get_method(), SpanAttributes.HTTP_URL: request.get_redacted_uri(), - # TODO: Is this the correct attribute to use for this? - SpanAttributes.NET_PEER_IP: request.getClientAddress().host, + SpanAttributes.HTTP_HOST: request.getClientAddress().host, } request_name = request.request_metrics.name