Skip to content

Force entrylock on matcher value #11515

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

Merged
scbedd merged 4 commits into from
Aug 4, 2025
Merged

Force entrylock on matcher value #11515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cda7d22
ensure that when we set a custom matcher for a recording, we force a …
scbedd Aug 4, 2025
3b9a29b
add missing await
scbedd Aug 4, 2025
c110618
ensure we will never hit this issue on the global matcher as well
scbedd Aug 4, 2025
0439480
missed an await
scbedd Aug 4, 2025
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
2 changes: 1 addition & 1 deletion tools/test-proxy/Azure.Sdk.Tools.TestProxy.Tests/InfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public async Task TestReflectionModelWithTargetRecordSession()

await testRecordingHandler.RegisterSanitizer(new UriRegexSanitizer(regex: "ABC123"), recordingId);
await testRecordingHandler.RegisterSanitizer(new BodyRegexSanitizer(regex: ".+?"), recordingId);
testRecordingHandler.SetMatcherForRecording(recordingId, new CustomDefaultMatcher(compareBodies: false, excludedHeaders: "an-excluded-header"));
await testRecordingHandler.SetMatcherForRecording(recordingId, new CustomDefaultMatcher(compareBodies: false, excludedHeaders: "an-excluded-header"));

var model = new ActiveMetadataModel(testRecordingHandler, recordingId);
var descriptions = model.Descriptions.ToList();
Expand Down
13 changes: 11 additions & 2 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy/Admin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,11 +197,20 @@ public async Task SetMatcher()

if (recordingId != null)
{
_recordingHandler.SetMatcherForRecording(recordingId, m);
await _recordingHandler.SetMatcherForRecording(recordingId, m);
}
else
{
_recordingHandler.Matcher = m;
await _recordingHandler.SanitizerRegistry.SessionSanitizerLock.WaitAsync();

try
{
_recordingHandler.Matcher = m;
}
finally
{
_recordingHandler.SanitizerRegistry.SessionSanitizerLock.Release();
}
}
}

Expand Down
11 changes: 9 additions & 2 deletions tools/test-proxy/Azure.Sdk.Tools.TestProxy/RecordingHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,14 +1093,21 @@ public void AddTransformToRecording(string recordingId, ResponseTransform transf
}


public void SetMatcherForRecording(string recordingId, RecordMatcher matcher)
public async Task SetMatcherForRecording(string recordingId, RecordMatcher matcher)
{
if (!PlaybackSessions.TryGetValue(recordingId, out var session))
{
throw new HttpException(HttpStatusCode.BadRequest, $"{recordingId} is not an active playback session. Check the value being passed and try again.");
}

session.CustomMatcher = matcher;
await session.Session.EntryLock.WaitAsync();
try {
session.CustomMatcher = matcher;
}
finally
{
session.Session.EntryLock.Release();
}
}

public async Task SetDefaultExtensions(string recordingId = null)
Expand Down