Skip to content

Fix flaky SendAsync_Success_ConnectionSetupActivityGraphRecorded test (Http1.1 + Http2) #129822

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

Closed
Copilot wants to merge 3 commits into from
Closed

Fix flaky SendAsync_Success_ConnectionSetupActivityGraphRecorded test (Http1.1 + Http2) #129822

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52570bf
Initial plan
Copilot Jun 24, 2026
86b1d9f
Fix flaky SendAsync_Success_ConnectionSetupActivityGraphRecorded test…
Copilot Jun 24, 2026
ac0de6b
Revert test change: DiagnosticsTests.cs restored to original state
Copilot Jun 24, 2026
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
12 changes: 12 additions & 0 deletions src/libraries/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,10 @@ static async Task RunTest(string useVersion, string testAsync, string useTlsStri
VerifyParent = false
};

// Synchronize client and server: server waits for client to finish req1 assertions before reading req2.
// This prevents a race where the server tries to read req2 before the client sends it.
TaskCompletionSource req1AssertionsDone = new(TaskCreationOptions.RunContinuationsAsynchronously);

await GetFactoryForVersion(useVersion).CreateClientAndServerAsync(
async uri =>
{
Expand Down Expand Up @@ -694,6 +698,9 @@ await GetFactoryForVersion(useVersion).CreateClientAndServerAsync(
ActivityAssert.HasTag(conn, "server.port", uri.Port);
ActivityAssert.HasTag(conn, "url.scheme", useTls ? "https" : "http");

// Signal the server to read the second request now that all req1 assertions have passed.
req1AssertionsDone.SetResult();

// The second request should reuse the first connection, connection_setup and wait_for_connection should not be recorded again.
await client.SendAsync(CreateRequest(HttpMethod.Get, uri, Version.Parse(useVersion), exactVersion: true));
requestRecorder.VerifyActivityRecorded(2);
Expand All @@ -713,6 +720,11 @@ await server.AcceptConnectionAsync(async connection =>
await connection.SendResponseAsync(HttpStatusCode.OK);
connection.CompleteRequestProcessing();

// Wait for the client to finish asserting the first request before reading the second.
// This prevents a race where a client assertion failure closes the connection before
// the second request is sent, causing a spurious server-side EOF exception.
await req1AssertionsDone.Task;

await connection.ReadRequestDataAsync();
await connection.SendResponseAsync(HttpStatusCode.OK);
});
Expand Down