Skip to content

Commit 2b97efd

Browse files
committed
Partially revert changes for CA1873 (Evaluation of this argument may be expensive and unnecessary if logging is disabled), now that it's not so rigid anymore since .NET 10 SDK v10.0.102
1 parent ae82a95 commit 2b97efd

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/JsonApiDotNetCore/QueryStrings/QueryStringReader.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ public void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
4747

4848
if (reader != null)
4949
{
50-
if (_logger.IsEnabled(LogLevel.Debug))
51-
{
52-
string readerType = reader.GetType().Name;
53-
LogParameterAccepted(parameterName, parameterValue, readerType);
54-
}
50+
LogParameterAccepted(parameterName, parameterValue, reader.GetType().Name);
5551

5652
if (!reader.AllowEmptyValue && string.IsNullOrEmpty(parameterValue))
5753
{
@@ -78,8 +74,7 @@ public void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
7874
}
7975
}
8076

81-
[LoggerMessage(Level = LogLevel.Debug, SkipEnabledCheck = true,
82-
Message = "Query string parameter '{ParameterName}' with value '{ParameterValue}' was accepted by {ReaderType}.")]
77+
[LoggerMessage(Level = LogLevel.Debug, Message = "Query string parameter '{ParameterName}' with value '{ParameterValue}' was accepted by {ReaderType}.")]
8378
private partial void LogParameterAccepted(string parameterName, StringValues parameterValue, string readerType);
8479

8580
[LoggerMessage(Level = LogLevel.Debug, Message = "Query string parameter '{ParameterName}' was successfully read.")]

test/TestBuildingBlocks/XUnitLogHttpMessageHandler.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using Microsoft.Extensions.Logging;
22
using Xunit.Abstractions;
33

4-
#pragma warning disable CA1873 // Avoid potentially expensive logging
5-
64
namespace TestBuildingBlocks;
75

86
/// <summary>

0 commit comments

Comments
 (0)