Skip to content

Extend SocketsHttpHandler Connection and Request telemetry #88853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonfirsov merged 17 commits into from
Jul 18, 2023
Merged

Extend SocketsHttpHandler Connection and Request telemetry #88853

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4409013
introduce & log connectionId
antonfirsov Jul 10, 2023
e8dfe2b
ConnectionEstablished: log more
antonfirsov Jul 12, 2023
2c5136c
RequestHeadersStart: long PaddedFlag
antonfirsov Jul 13, 2023
bb85d16
EventSource_ParallelRequests_LogsNewConnectionIdForEachRequest
antonfirsov Jul 13, 2023
cdca548
implement Redirect(redirectUri)
antonfirsov Jul 13, 2023
80353d0
ready to go
antonfirsov Jul 13, 2023
e4e88e2
validate payload names in tests
antonfirsov Jul 13, 2023
bf5d1a7
Merge branch 'main' into extend-request-telemetry-01
antonfirsov Jul 16, 2023
d6ac30f
adjust logic to current main, log socketaddress to metrics
antonfirsov Jul 16, 2023
68a9e74
update Version on events with signature change
antonfirsov Jul 16, 2023
8a3fa5f
review feedback
antonfirsov Jul 16, 2023
e2d86be
do not report socket.address tag
antonfirsov Jul 17, 2023
36e30df
revert method name change in tests
antonfirsov Jul 17, 2023
066391d
detect non-ssl proxy tunnel
antonfirsov Jul 17, 2023
91c54ed
socketAddress -> remoteAddress
antonfirsov Jul 17, 2023
0fa803e
address CI failures
antonfirsov Jul 17, 2023
86006f4
oops
antonfirsov Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert method name change in tests
  • Loading branch information
@antonfirsov
antonfirsov committed Jul 17, 2023
commit 36e30df05ed42900e6f9e53f4f866cdc30aebc74
12 changes: 6 additions & 6 deletions src/libraries/System.Net.Http/tests/FunctionalTests/MetricsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected static void VerifyOptionalTag<T>(KeyValuePair<string, object?>[] tags,
}
}

private static void VerifySchemeHostPort(KeyValuePair<string, object?>[] tags, Uri uri)
private static void VerifySchemeHostPortTags(KeyValuePair<string, object?>[] tags, Uri uri)
{
VerifyOptionalTag(tags, "scheme", uri.Scheme);
VerifyOptionalTag(tags, "host", uri.Host);
Expand All @@ -60,7 +60,7 @@ protected static void VerifyRequestDuration(string instrumentName, double measur
{
Assert.Equal(InstrumentNames.RequestDuration, instrumentName);
Assert.InRange(measurement, double.Epsilon, 60);
VerifySchemeHostPort(tags, uri);
VerifySchemeHostPortTags(tags, uri);
VerifyOptionalTag(tags, "method", method);
VerifyOptionalTag(tags, "protocol", protocol);
VerifyOptionalTag(tags, "status-code", statusCode);
Expand All @@ -73,7 +73,7 @@ protected static void VerifyCurrentRequest(string instrumentName, long measureme
{
Assert.Equal(InstrumentNames.CurrentRequests, instrumentName);
Assert.Equal(expectedValue, measurement);
VerifySchemeHostPort(tags, uri);
VerifySchemeHostPortTags(tags, uri);
}

protected static void VerifyFailedRequests(Measurement<long> measurement, long expectedValue, Uri uri, string? protocol, int? statusCode, string method = "GET")
Expand All @@ -82,7 +82,7 @@ protected static void VerifyFailedRequests(Measurement<long> measurement, long e

KeyValuePair<string, object?>[] tags = measurement.Tags.ToArray();

VerifySchemeHostPort(tags, uri);
VerifySchemeHostPortTags(tags, uri);

Assert.Equal(method, tags.Single(t => t.Key == "method").Value);
VerifyOptionalTag(tags, "protocol", protocol);
Expand All @@ -93,15 +93,15 @@ protected static void VerifyConnectionCounter(string expectedName, string actual
{
Assert.Equal(expectedName, actualName);
Assert.Equal(expectedValue, Assert.IsType<long>(measurement));
VerifySchemeHostPort(tags, uri);
VerifySchemeHostPortTags(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);
VerifySchemeHostPort(tags, uri);
VerifySchemeHostPortTags(tags, uri);
VerifyOptionalTag(tags, "protocol", protocol);
}

Expand Down