Skip to content

Commit 0636c7a

Browse files
committed
fix(RequestTraceHelper): update MatchesPatterns to handle empty patterns result
1 parent 0374229 commit 0636c7a

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/BE/web/Services/RequestTracing/RequestTraceHelper.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static bool MatchFilters(RequestTraceFilters filters, string? source, str
2222
{
2323
if (!MatchesPatterns(source, filters.SourcePatterns)) return false;
2424
if (!MatchesPatterns(url, filters.IncludeUrlPatterns)) return false;
25-
if (MatchesPatterns(url, filters.ExcludeUrlPatterns)) return false;
25+
if (MatchesPatterns(url, filters.ExcludeUrlPatterns, emptyPatternsResult: false)) return false;
2626

2727
if (filters.Methods is { Length: > 0 } && !filters.Methods.Any(x => string.Equals(x, method, StringComparison.OrdinalIgnoreCase)))
2828
{
@@ -112,7 +112,7 @@ public static bool MatchRequestStageFilters(RequestTraceFilters filters, string?
112112
{
113113
if (!MatchesPatterns(source, filters.SourcePatterns)) return false;
114114
if (!MatchesPatterns(url, filters.IncludeUrlPatterns)) return false;
115-
if (MatchesPatterns(url, filters.ExcludeUrlPatterns)) return false;
115+
if (MatchesPatterns(url, filters.ExcludeUrlPatterns, emptyPatternsResult: false)) return false;
116116
if (filters.Methods is { Length: > 0 } && !filters.Methods.Any(x => string.Equals(x, method, StringComparison.OrdinalIgnoreCase)))
117117
{
118118
return false;
@@ -160,11 +160,11 @@ private static bool MatchStatus(short code, string[] patterns)
160160
return false;
161161
}
162162

163-
private static bool MatchesPatterns(string? value, string[]? patterns)
163+
private static bool MatchesPatterns(string? value, string[]? patterns, bool emptyPatternsResult = true)
164164
{
165165
if (patterns == null || patterns.Length == 0)
166166
{
167-
return true;
167+
return emptyPatternsResult;
168168
}
169169

170170
if (string.IsNullOrEmpty(value))

0 commit comments

Comments
 (0)