daemon/logger/awslogs: avoid user-agent test race - #53438
Open
JasonColapietro wants to merge 1 commit into
Open
Conversation
Signed-off-by: Jason Colapietro <jasoncola1@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Make the AWS logs user-agent unit test inspect the SDK-built request through an injected synchronous HTTP client.
The real
net/httptransport serializes request headers on a separate goroutine, which can race with AWS middleware header mutation — the failure seen on Windows inTestNewAWSLogsClientUserAgentHandler, wherenet/http.(*persistConn).writeLoopwas reading the request header map inHeader.sortedKeyValueswhile the middleware wrote to it.The test only needs to verify the final
User-Agentheader, so replacing thehttptest.Serverwithconfig.WithHTTPClientand asmithyhttp.ClientDoFuncinspects the actual SDK-built request synchronously and avoids the transport concurrency entirely. The AWS middleware path under test is unchanged.Scope
One test file changes. No production code or behavior is touched.
Testing
go test -race -run '^TestNewAWSLogsClientUserAgentHandler$' -count=100 ./daemon/logger/awslogs— okgo test -race ./daemon/logger/awslogs— okGOOS=windows GOARCH=amd64 go test -c ./daemon/logger/awslogs— okgit diff --check— cleanRisks
The revised test no longer exercises Go's real HTTP transport. That transport is outside the behavior under test; the AWS middleware still builds the actual request that the injected client inspects.
Created with: Codex