Skip to content
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

[dotnet] Fix logging issue when log context level conflicts with logger already captured level #15057

Merged
merged 11 commits into from
Jan 10, 2025
Merged

[dotnet] Fix logging issue when log context level conflicts with logger already captured level #15057

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
636b523
Add test to highlight the issue with captured log level by logger
nvborisenko Apr 19, 2024
55027c3
Merge remote-tracking branch 'upstream/trunk' into dotnet-logging-issue
nvborisenko Apr 22, 2024
029d0d6
Merge remote-tracking branch 'upstream/trunk' into dotnet-logging-issue
nvborisenko Jan 9, 2025
dae7454
Determine IsEnabled across local loggers
nvborisenko Jan 10, 2025
77e8a05
Loggers per context
nvborisenko Jan 10, 2025
7250bbf
Merge branch 'trunk' into dotnet-logging-issue
nvborisenko Jan 10, 2025
e3d1ba1
Fix possible NRE
nvborisenko Jan 10, 2025
df09141
Convert to TryGetValue
nvborisenko Jan 10, 2025
6efac84
Move logic to clone loggers
nvborisenko Jan 10, 2025
437594e
Merge branch 'trunk' into dotnet-logging-issue
nvborisenko Jan 10, 2025
5057ec0
Clone in CreateContext method
nvborisenko Jan 10, 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
24 changes: 24 additions & 0 deletions dotnet/test/common/Internal/Logging/LogTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,27 @@ public class LogTest
private TestLogHandler testLogHandler;
private ILogger logger;

private void ResetGlobalLog()
nvborisenko marked this conversation as resolved.
Show resolved Hide resolved
{
Log.SetLevel(LogEventLevel.Info);
Log.Handlers.Clear().Handlers.Add(new ConsoleLogHandler());
}

[SetUp]
public void SetUp()
{
ResetGlobalLog();

testLogHandler = new TestLogHandler();
logger = Log.GetLogger<LogTest>();
}

[TearDown]
public void TearDown()
{
ResetGlobalLog();
}

[Test]
public void LoggerShouldEmitEvent()
{
Expand Down Expand Up @@ -160,6 +174,16 @@ public void ContextShouldChangeLevel()
Assert.That(logger.Level, Is.EqualTo(LogEventLevel.Warn));
}

[Test]
public void ContextShouldEmitMessages()
{
using var context = Log.CreateContext(LogEventLevel.Trace).Handlers.Add(testLogHandler);

logger.Trace("test message");

Assert.That(testLogHandler.Events.Count, Is.EqualTo(1));
}

[Test]
public void ShouldCreateContextWithCustomHandler()
{
Expand Down
Loading