Sidecar: isolate downstream API options per request#3919
Merged
Conversation
bgavrilMS
approved these changes
Jul 3, 2026
iarekk
approved these changes
Jul 3, 2026
This was referenced Jul 3, 2026
Closed
This was referenced Jul 15, 2026
Closed
Closed
Closed
Open
Open
Closed
Open
This was referenced Jul 22, 2026
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.
Sidecar: isolate downstream API options per request
Summary of the changes (Less than 80 chars)
Description
The sidecar resolves
DownstreamApiOptionsfromIOptionsMonitor.Get(apiName), which is aprocess-wide singleton. Both the
AuthorizationHeader*andDownstreamApi*endpoints couldapply request-scoped values onto that shared instance:
MergeOptions) performs a shallowClone()and then writes intothe shared
ExtraParameters/ExtraHeaderParameters/ExtraQueryParametersdictionaries, andAgentIdentity/AgentUsername/AgentUserId) are appliedin place.
Because
Clone()is a shallow member copy, those dictionaries are shared with the singleton, sorequest-scoped values could persist onto the shared options and affect subsequent requests, or
race under concurrency.
This change isolates the options up front. Both endpoints now call a new
DownstreamApiOptionsMerger.CloneForRequestimmediately after resolving the options — before anymerge or agent-identity mutation.
CloneForRequestclones the options and allocates freshExtraParameters,ExtraHeaderParameters, andExtraQueryParametersdictionaries when present,so every request operates on a fully private copy and the singleton is never mutated.
Override-gating and logging behavior are unchanged, and
MergeOptionsis untouched.ScopesandManagedIdentityare only reassigned (never mutated in place) and are documented as such.Testing
Adds
SidecarOptionsIsolationTestscovering: per-request isolation on both endpoints, the mergepath with pre-existing non-null singleton collections, concurrency with distinct agent identities,
and shallow-clone-vs-fresh-dictionary characterization. Full
Sidecar.Testssuite passes (thepre-existing cert/live-AAD integration tests remain environment-gated).