do not report socket.address tag

Author: antonfirsov

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionBase.cs

@@ -59,8 +59,7 @@ public HttpConnectionBase(HttpConnectionPool pool, IPEndPoint? remoteEndPoint)
                     protocol,
                     pool.IsSecure ? "https" : "http",
                     pool.OriginAuthority.HostValue,
-                    port == defaultPort ? null : port,
-                    remoteEndPoint?.Address?.ToString());
+                    port == defaultPort ? null : port);
 
                 _connectionMetrics.ConnectionEstablished();
 

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Metrics/ConnectionMetrics.cs

@@ -14,10 +14,9 @@ internal sealed class ConnectionMetrics
         private readonly object _schemeTag;
         private readonly object _hostTag;
         private readonly object? _portTag;
-        private readonly string? _socketAddress;
         private bool _currentlyIdle;
 
-        public ConnectionMetrics(SocketsHttpHandlerMetrics metrics, string protocol, string scheme, string host, int? port, string? socketAddress)
+        public ConnectionMetrics(SocketsHttpHandlerMetrics metrics, string protocol, string scheme, string host, int? port)
         {
             _metrics = metrics;
             _currentConnectionsEnabled = _metrics.CurrentConnections.Enabled;
@@ -26,7 +25,6 @@ public ConnectionMetrics(SocketsHttpHandlerMetrics metrics, string protocol, str
             _schemeTag = scheme;
             _hostTag = host;
             _portTag = port;
-            _socketAddress = socketAddress;
         }
 
         // TagList is a huge struct, so we avoid storing it in a field to reduce the amount we allocate on the heap.
@@ -43,11 +41,6 @@ private TagList GetTags()
                 tags.Add("port", _portTag);
             }
 
-            if (_socketAddress is not null)
-            {
-                tags.Add("socket.address", _socketAddress);
-            }
-
             return tags;
         }
 

src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs

@@ -46,20 +46,11 @@ protected static void VerifyOptionalTag<T>(KeyValuePair<string, object?>[] tags,
             }
         }
 
-        private static void VerifySchemeHostPortSocketAddressTags(KeyValuePair<string, object?>[] tags, Uri uri, bool verifySocketAddress = false)
+        private static void VerifySchemeHostPort(KeyValuePair<string, object?>[] tags, Uri uri)
         {
             VerifyOptionalTag(tags, "scheme", uri.Scheme);
             VerifyOptionalTag(tags, "host", uri.Host);
             VerifyOptionalTag(tags, "port", uri.Port);
-
-            if (verifySocketAddress)
-            {
-                string socketAddress = (string)tags.Single(t => t.Key == "socket.address").Value;
-                IPAddress ip = IPAddress.Parse(socketAddress);
-                Assert.True(ip.Equals(IPAddress.Loopback.MapToIPv6()) ||
-                    ip.Equals(IPAddress.Loopback) ||
-                    ip.Equals(IPAddress.IPv6Loopback));
-            }
         }
 
         protected static void VerifyRequestDuration(Measurement<double> measurement, Uri uri, string? protocol, int? statusCode, string method = "GET") =>
@@ -69,7 +60,7 @@ protected static void VerifyRequestDuration(string instrumentName, double measur
         {
             Assert.Equal(InstrumentNames.RequestDuration, instrumentName);
             Assert.InRange(measurement, double.Epsilon, 60);
-            VerifySchemeHostPortSocketAddressTags(tags, uri);
+            VerifySchemeHostPort(tags, uri);
             VerifyOptionalTag(tags, "method", method);
             VerifyOptionalTag(tags, "protocol", protocol);
             VerifyOptionalTag(tags, "status-code", statusCode);
@@ -82,7 +73,7 @@ protected static void VerifyCurrentRequest(string instrumentName, long measureme
         {
             Assert.Equal(InstrumentNames.CurrentRequests, instrumentName);
             Assert.Equal(expectedValue, measurement);
-            VerifySchemeHostPortSocketAddressTags(tags, uri);
+            VerifySchemeHostPort(tags, uri);
         }
 
         protected static void VerifyFailedRequests(Measurement<long> measurement, long expectedValue, Uri uri, string? protocol, int? statusCode, string method = "GET")
@@ -91,7 +82,7 @@ protected static void VerifyFailedRequests(Measurement<long> measurement, long e
 
             KeyValuePair<string, object?>[] tags = measurement.Tags.ToArray();
 
-            VerifySchemeHostPortSocketAddressTags(tags, uri);
+            VerifySchemeHostPort(tags, uri);
 
             Assert.Equal(method, tags.Single(t => t.Key == "method").Value);
             VerifyOptionalTag(tags, "protocol", protocol);
@@ -102,15 +93,15 @@ protected static void VerifyConnectionCounter(string expectedName, string actual
         {
             Assert.Equal(expectedName, actualName);
             Assert.Equal(expectedValue, Assert.IsType<long>(measurement));
-            VerifySchemeHostPortSocketAddressTags(tags, uri, verifySocketAddress: true);
+            VerifySchemeHostPort(tags, uri);
             VerifyOptionalTag(tags, "protocol", protocol);
         }
 
         protected static void VerifyConnectionDuration(string instrumentName, double measurement, KeyValuePair<string, object?>[] tags, Uri uri, string protocol)
         {
             Assert.InRange(measurement, double.Epsilon, 60);
             Assert.Equal(InstrumentNames.ConnectionDuration, instrumentName);
-            VerifySchemeHostPortSocketAddressTags(tags, uri, verifySocketAddress: true);
+            VerifySchemeHostPort(tags, uri);
             VerifyOptionalTag(tags, "protocol", protocol);
         }