Skip to content
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.

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

Fix System.Net.Sockets telemetry #42188

Merged
merged 28 commits into from
Sep 25, 2020
Merged

Conversation

MihaZupan
Copy link
Member

@MihaZupan MihaZupan commented Sep 14, 2020

Includes:

Before, we were logging Start events after capturing the execution context and calling Stop before restoring it.
The PR creates a common point OnCompletedInternal that is called when the execution context is restored from both sync and async completions.

Fixes #41670

@MihaZupan MihaZupan added this to the 6.0.0 milestone Sep 14, 2020
@ghost
Copy link

ghost commented Sep 14, 2020

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

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan MihaZupan requested a review from a team September 14, 2020 03:51
@MihaZupan
Copy link
Member Author

CC @josalem for TestEventListener code changes

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@josalem
Copy link
Contributor

josalem commented Sep 14, 2020

Changes RE: #42128 look good to me 👍

@MihaZupan
Copy link
Member Author

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines

This comment has been minimized.

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan

This comment has been minimized.

@azure-pipelines

This comment has been minimized.

@MihaZupan
Copy link
Member Author

/azp run runtime-libraries-coreclr outerloop

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@MihaZupan
Copy link
Member Author

Test failures unrelated:
#40798, #41531, #41953, #41929, #42722, #41606, #42724

@MihaZupan MihaZupan merged commit e17d818 into dotnet:master Sep 25, 2020
@MihaZupan

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@MihaZupan
Copy link
Member Author

/backport to release/5.0-rc2

@github-actions
Copy link
Contributor

Started backporting to release/5.0-rc2: https://github.com/dotnet/runtime/actions/runs/272073672

@github-actions
Copy link
Contributor

@MihaZupan backporting to release/5.0-rc2 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Correct NameResolutionTelemetry logic
Applying: Enable listening to multiple sources with TestEventListener
Applying: Workaround EventWrittenEventArgs bug when the EventArgs are stored
Applying: Correct System.Net.Sockets Telemetry
Applying: Avoid using value tuple in TestEventListener
Applying: Remove unnecessary argument to OnCompletedInternal
Applying: Remove redundant Telemetry.IsEnabled check
Applying: Log Connect/Accept start before the initial context capture
Applying: Use SocketHelperBase in Accept tests
Applying: Avoid duplicate events for BeginConnect without ConnextEx support
Applying: Enable Sync Socket tests
Applying: Revert unrelated SocketPal change
Applying: Log the correct ErrorCode in case of socket disposal
Applying: Add more info on TelemetryTest timeout
Applying: Add PlatformSpecific attribute to ConnectFailure test
Applying: Add missing BeginConnect AfterConnect call on sync failure
error: sha1 information is lacking or useless (src/libraries/System.Net.Sockets/src/System/Net/Sockets/Socket.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0016 Add missing BeginConnect AfterConnect call on sync failure
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Socket.Connect(Start|Stop) activity ID missmatch on Windows
6 participants