Swap getClientAddress().host call for the UNIXAddress compatible replacment, allowing tracing to correctly tag spans.

realtyem · realtyem · commit d8a60d722ffc · 2023-07-10T18:28:03.000-05:00
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py
@@ -1070,7 +1070,7 @@ def trace_servlet(
         tags.SPAN_KIND: tags.SPAN_KIND_RPC_SERVER,
         tags.HTTP_METHOD: request.get_method(),
         tags.HTTP_URL: request.get_redacted_uri(),
-        tags.PEER_HOST_IPV6: request.getClientAddress().host,
+        tags.PEER_HOST_IPV6: request.get_client_ip_if_available(),
     }
 
     request_name = request.request_metrics.name

Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ def trace_servlet(`
`1070`	`1070`	`tags.SPAN_KIND: tags.SPAN_KIND_RPC_SERVER,`
`1071`	`1071`	`tags.HTTP_METHOD: request.get_method(),`
`1072`	`1072`	`tags.HTTP_URL: request.get_redacted_uri(),`
`1073`		`- tags.PEER_HOST_IPV6: request.getClientAddress().host,`
	`1073`	`+ tags.PEER_HOST_IPV6: request.get_client_ip_if_available(),`
`1074`	`1074`	`}`
`1075`	`1075`
`1076`	`1076`	`request_name = request.request_metrics.name`