Moved HTTP request telemetry to HttpClient.SendAsync #41022

ManickaP · 2020-08-19T10:18:22Z

Moved HTTP request telemetry to HttpClient.SendAsync
Added events for ResponseContent
Added helper methods events

Contributes to #40776

ghost · 2020-08-19T10:18:24Z

Tagging subscribers to this area: @dotnet/ncl
See info in area-owners.md if you want to be subscribed.

src/libraries/System.Net.Http/src/Resources/Strings.resx

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs

stephentoub · 2020-08-19T10:37:15Z

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs

                {
-                    throw CreateTimeoutException(operationException);
+                    HttpTelemetry.Log.RequestStart(


So now you only get the telemetry if you use HtrpClient, but not if you use HttpMessageInvoker?

Yes. Though in the previous state of things, you got the telemetry only with SocketsHandler and not with any custom handler...

However, we can introduce child events to cover HttpMessageInvoker etc. This event pair should be the main, all encompassing one. And in case a user wants to use the invoker directly, we should provide them with examples how to plug in their own telemetry to achieve the same.

I've some thoughts about this and I'm trying to put it all in writing in #40776 (not yet finished though).

MihaZupan · 2020-08-26T16:32:07Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-26T16:32:22Z

Azure Pipelines successfully started running 1 pipeline(s).

MihaZupan · 2020-08-26T17:31:25Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-26T17:31:38Z

Azure Pipelines successfully started running 1 pipeline(s).

MihaZupan · 2020-08-27T15:22:49Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-27T15:23:03Z

Azure Pipelines successfully started running 1 pipeline(s).

ManickaP · 2020-08-28T10:57:35Z

This also fixes: #40896

ManickaP

Two things in HttpMessageInvoker otherwise LGTM. However, I cannot approve since it's my PR originally. @dotnet/ncl could anyone approve once all is addressed?

And thank you for taking this over and finishing ❤️

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs

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

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs

src/libraries/System.Net.Http/src/System/Net/Http/HttpMessageInvoker.cs

alnikola

Please, resolve all the Marie's comments.
Otherwise, LGTM

MihaZupan · 2020-08-28T13:56:39Z

I pushed more changes here:

Changing the RequestStart signature (versionMajor, Minor from int to byte), adding the version policy field
Changing ResponseContentBegin to Start/Stop
Renaming RequestAborted to RequestFailed
Adding Telemetry tests for non-async Sends

@ManickaP @alnikola Please re-review (should be simple to review on a commit-by-commit basis)

MihaZupan · 2020-08-28T14:04:12Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-28T14:04:27Z

Azure Pipelines successfully started running 1 pipeline(s).

alnikola

LGTM

ManickaP

Single comment, otherwise LGTM.

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs

MihaZupan · 2020-08-28T17:14:00Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-28T17:14:31Z

Azure Pipelines successfully started running 1 pipeline(s).

ManickaP · 2020-08-28T19:22:40Z

Runtime CI failure: #41511

ManickaP · 2020-08-28T19:39:14Z

Outerloop CI Failures:
3x #40798
5x SyncHttpHandler_HttpClientHandler_Cancellation_Test.Expect100Continue_WaitsExpectedPeriodOfTimeBeforeSendingContent --> #41530
4x SocketsHttpHandler_HttpClientHandler_Cancellation_Test_Http2.PostAsync_Cancel_CancellationTokenPassedToContent(content: StreamContent { Headers = [] }, cancellationTokenSource: CancellationTokenSource { IsCancellationRequested = False, Token = System.Threading.CancellationToken }) --> #41531
1x SocketsHttpHandler_HttpClientHandler_ClientCertificates_Test.Manual_CertificateSentMatchesCertificateReceived_Success(numberOfRequests: 6, reuseClient: False)
1x SocketsHttpHandlerTest_Http2.SocketSendQueueFull_RequestCanceled_ThrowsOperationCanceled

All of them are timout related and do not seem to be related to the changes made in this PR.

MihaZupan · 2020-08-29T06:01:43Z

/azp run runtime-libraries outerloop

azure-pipelines · 2020-08-29T06:01:57Z

Azure Pipelines successfully started running 1 pipeline(s).

* Moved HTTP request telemetry to HttpClient.SendAsync * Added ResponseContent and helper methods events. * Rework helper method activity nesting * Expand Telemetry tests * Also log RequestStart/Stop in HttpMessageInvoker * Update RequestStart signature * RequestAborted => RequestFailed rename * ResponseContent Begin => Start/Stop * Fix HttpMessageInvoker implementation * Add Synchronous request Telemetry tests * Check telemetryStarted before ResponseContentStart Co-authored-by: MihaZupan <mihazupan.zupan1@gmail.com>

* System.Net Telemetry style changes (#41527) * Change HandshakeStop SslProtocols parameter to enum * Parameterize Http11/Http20 events * Add dummy request to ensure Http2 settings are received * Moved HTTP request telemetry to HttpClient.SendAsync (#41022) * Moved HTTP request telemetry to HttpClient.SendAsync * Added ResponseContent and helper methods events. * Rework helper method activity nesting * Expand Telemetry tests * Also log RequestStart/Stop in HttpMessageInvoker * Update RequestStart signature * RequestAborted => RequestFailed rename * ResponseContent Begin => Start/Stop * Fix HttpMessageInvoker implementation * Add Synchronous request Telemetry tests * Check telemetryStarted before ResponseContentStart Co-authored-by: MihaZupan <mihazupan.zupan1@gmail.com> * Add Request/Response Headers/Content Start/Stop events (#41590) Co-authored-by: Marie Píchová <11718369+ManickaP@users.noreply.github.com>

ManickaP added the area-System.Net.Http label Aug 19, 2020

ManickaP requested a review from a team August 19, 2020 10:18

stephentoub reviewed Aug 19, 2020

View reviewed changes

src/libraries/System.Net.Http/src/Resources/Strings.resx Outdated Show resolved Hide resolved

ManickaP commented Aug 19, 2020

View reviewed changes

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs Outdated Show resolved Hide resolved

stephentoub reviewed Aug 19, 2020

View reviewed changes

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs Show resolved Hide resolved

stephentoub reviewed Aug 19, 2020

View reviewed changes

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs Outdated Show resolved Hide resolved

stephentoub reviewed Aug 19, 2020

View reviewed changes

ManickaP mentioned this pull request Aug 19, 2020

ActivityId missing in a newly added HttpTelemetry Stop events. #40776

Closed

11 tasks

ManickaP force-pushed the mapichov/40776_activity_id branch 2 times, most recently from 150322e to 508b24e Compare August 19, 2020 11:30

ManickaP added 2 commits August 24, 2020 14:36

Moved HTTP request telemetry to HttpClient.SendAsync

3f00240

Added ResponseContent and helper methods events.

ec189d4

ManickaP force-pushed the mapichov/40776_activity_id branch from 508b24e to ec189d4 Compare August 24, 2020 12:39

Rework helper method activity nesting

1fe0f60

Expand Telemetry tests

56190b5

karelz added this to the 6.0.0 milestone Aug 27, 2020

Also log RequestStart/Stop in HttpMessageInvoker

7cba4cf

ManickaP commented Aug 28, 2020

View reviewed changes

alnikola approved these changes Aug 28, 2020

View reviewed changes

MihaZupan added 3 commits August 28, 2020 14:16

Update RequestStart signature

d1ad906

RequestAborted => RequestFailed rename

7575172

ResponseContent Begin => Start/Stop

72e2f42

MihaZupan added 2 commits August 28, 2020 15:19

Fix HttpMessageInvoker implementation

726cac7

Add Synchronous request Telemetry tests

0a82deb

alnikola approved these changes Aug 28, 2020

View reviewed changes

ManickaP commented Aug 28, 2020

View reviewed changes

src/libraries/System.Net.Http/src/System/Net/Http/HttpClient.cs Show resolved Hide resolved

Check telemetryStarted before ResponseContentStart

dffda18

MihaZupan mentioned this pull request Aug 28, 2020

System.Net Telemetry style changes #41527

Merged

Merge master

bf5fc3f

MihaZupan merged commit 05efa9b into dotnet:master Aug 31, 2020

ManickaP deleted the mapichov/40776_activity_id branch August 31, 2020 09:33

MihaZupan mentioned this pull request Aug 31, 2020

[release/5.0] Http telemetry changes backport #41610

Merged

karelz mentioned this pull request Sep 1, 2020

Test failure: System.Net.Http.Functional.Tests.TelemetryTest_Http11.EventSource_ConnectionPoolAtMaxConnections_LogsRequestLeftQueue #40926

Closed

ghost locked as resolved and limited conversation to collaborators Dec 7, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Moved HTTP request telemetry to HttpClient.SendAsync #41022

Moved HTTP request telemetry to HttpClient.SendAsync #41022

ManickaP commented Aug 19, 2020 •

edited

Loading

ghost commented Aug 19, 2020

stephentoub Aug 19, 2020

ManickaP Aug 19, 2020

MihaZupan commented Aug 26, 2020

azure-pipelines bot commented Aug 26, 2020

MihaZupan commented Aug 26, 2020

azure-pipelines bot commented Aug 26, 2020

MihaZupan commented Aug 27, 2020

azure-pipelines bot commented Aug 27, 2020

ManickaP commented Aug 28, 2020

ManickaP left a comment

alnikola left a comment

MihaZupan commented Aug 28, 2020 •

edited

Loading

MihaZupan commented Aug 28, 2020

azure-pipelines bot commented Aug 28, 2020

alnikola left a comment

ManickaP left a comment

MihaZupan commented Aug 28, 2020

azure-pipelines bot commented Aug 28, 2020

ManickaP commented Aug 28, 2020

ManickaP commented Aug 28, 2020 •

edited

Loading

MihaZupan commented Aug 29, 2020

azure-pipelines bot commented Aug 29, 2020

Moved HTTP request telemetry to HttpClient.SendAsync #41022

Moved HTTP request telemetry to HttpClient.SendAsync #41022

Conversation

ManickaP commented Aug 19, 2020 • edited Loading

ghost commented Aug 19, 2020

stephentoub Aug 19, 2020

Choose a reason for hiding this comment

ManickaP Aug 19, 2020

Choose a reason for hiding this comment

MihaZupan commented Aug 26, 2020

azure-pipelines bot commented Aug 26, 2020

MihaZupan commented Aug 26, 2020

azure-pipelines bot commented Aug 26, 2020

MihaZupan commented Aug 27, 2020

azure-pipelines bot commented Aug 27, 2020

ManickaP commented Aug 28, 2020

ManickaP left a comment

Choose a reason for hiding this comment

alnikola left a comment

Choose a reason for hiding this comment

MihaZupan commented Aug 28, 2020 • edited Loading

MihaZupan commented Aug 28, 2020

azure-pipelines bot commented Aug 28, 2020

alnikola left a comment

Choose a reason for hiding this comment

ManickaP left a comment

Choose a reason for hiding this comment

MihaZupan commented Aug 28, 2020

azure-pipelines bot commented Aug 28, 2020

ManickaP commented Aug 28, 2020

ManickaP commented Aug 28, 2020 • edited Loading

MihaZupan commented Aug 29, 2020

azure-pipelines bot commented Aug 29, 2020

ManickaP commented Aug 19, 2020 •

edited

Loading

MihaZupan commented Aug 28, 2020 •

edited

Loading

ManickaP commented Aug 28, 2020 •

edited

Loading