Skip to content

Commit 070f3db

Browse files
committed
1 parent 2790c60 commit 070f3db

3 files changed

Lines changed: 2 additions & 21 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ protected void MarkConnectionAsEstablished(Activity? connectionSetupActivity, IP
7575
protocol,
7676
_pool.IsSecure ? "https" : "http",
7777
_pool.TelemetryServerAddress,
78-
_pool.OriginAuthority.Port,
79-
remoteEndPoint?.Address?.ToString());
78+
_pool.OriginAuthority.Port);
8079

8180
_connectionMetrics.ConnectionEstablished();
8281
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ internal sealed class ConnectionMetrics
1414
private readonly object _schemeTag;
1515
private readonly object _hostTag;
1616
private readonly object _portTag;
17-
private readonly object? _peerAddressTag;
1817
private bool _currentlyIdle;
1918

20-
public ConnectionMetrics(SocketsHttpHandlerMetrics metrics, string protocolVersion, string scheme, string host, int port, string? peerAddress)
19+
public ConnectionMetrics(SocketsHttpHandlerMetrics metrics, string protocolVersion, string scheme, string host, int port)
2120
{
2221
_metrics = metrics;
2322
_openConnectionsEnabled = _metrics.OpenConnections.Enabled;
2423
_protocolVersionTag = protocolVersion;
2524
_schemeTag = scheme;
2625
_hostTag = host;
2726
_portTag = DiagnosticsHelper.GetBoxedInt32(port);
28-
_peerAddressTag = peerAddress;
2927
}
3028

3129
// TagList is a huge struct, so we avoid storing it in a field to reduce the amount we allocate on the heap.
@@ -38,11 +36,6 @@ private TagList GetTags()
3836
tags.Add("server.address", _hostTag);
3937
tags.Add("server.port", _portTag);
4038

41-
if (_peerAddressTag is not null)
42-
{
43-
tags.Add("network.peer.address", _peerAddressTag);
44-
}
45-
4639
return tags;
4740
}
4841

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,6 @@ protected HttpMetricsTestBase(ITestOutputHelper output) : base(output)
7373
}
7474

7575

76-
private static void VerifyPeerAddress(KeyValuePair<string, object?>[] tags, IPAddress[] validPeerAddresses = null)
77-
{
78-
string ipString = (string)tags.Single(t => t.Key == "network.peer.address").Value;
79-
validPeerAddresses ??= [IPAddress.Loopback.MapToIPv6(), IPAddress.Loopback, IPAddress.IPv6Loopback];
80-
IPAddress ip = IPAddress.Parse(ipString);
81-
Assert.Contains(ip, validPeerAddresses);
82-
}
83-
84-
8576
protected static void VerifyRequestDuration(Measurement<double> measurement,
8677
Uri uri,
8778
Version? protocolVersion = null,
@@ -134,7 +125,6 @@ protected static void VerifyOpenConnections(string actualName, object measuremen
134125
VerifySchemeHostPortTags(tags, uri);
135126
VerifyTag(tags, "network.protocol.version", GetVersionString(protocolVersion));
136127
VerifyTag(tags, "http.connection.state", state);
137-
VerifyPeerAddress(tags, validPeerAddresses);
138128
}
139129

140130
protected static void VerifyConnectionDuration(string instrumentName, object measurement, KeyValuePair<string, object?>[] tags, Uri uri, Version? protocolVersion, IPAddress[] validPeerAddresses = null)
@@ -149,7 +139,6 @@ protected static void VerifyConnectionDuration(string instrumentName, object mea
149139
}
150140
VerifySchemeHostPortTags(tags, uri);
151141
VerifyTag(tags, "network.protocol.version", GetVersionString(protocolVersion));
152-
VerifyPeerAddress(tags, validPeerAddresses);
153142
}
154143

155144
protected static void VerifyTimeInQueue(string instrumentName, object measurement, KeyValuePair<string, object?>[] tags, Uri uri, Version? protocolVersion, string method = "GET")

0 commit comments

Comments
 (0)