Skip to content

Update RaygunLogger.cs to use null coalesce operator because scope data item value can be null #563

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
miquelbeltran merged 3 commits into from
Apr 25, 2025
Merged

Update RaygunLogger.cs to use null coalesce operator because scope data item value can be null #563

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5338ad
Update RaygunLogger.cs
teneko Apr 11, 2025
48ec429
Update RaygunLogger.cs making scope data item values of scope data di…
teneko Apr 11, 2025
0092c82
make scopedData object nullable
miquelbeltran Apr 25, 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
14 changes: 7 additions & 7 deletions Mindscape.Raygun4Net.Extensions.Logging/RaygunLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class RaygunLogger : ILogger
private readonly string _category;
private readonly RaygunClientBase _client;
private readonly RaygunLoggerSettings _settings;
private readonly AsyncLocal<Dictionary<string, object>> _scopeData = new();
private readonly AsyncLocal<Dictionary<string, object?>> _scopeData = new();

/// <summary>
/// Initializes a new instance of the RaygunLogger.
Expand Down Expand Up @@ -67,7 +67,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
{
foreach (var item in _scopeData.Value)
{
customData[$"Scope{item.Key}"] = item.Value.ToString() ?? string.Empty;
customData[$"Scope{item.Key}"] = item.Value?.ToString() ?? string.Empty;
}
}

Expand Down Expand Up @@ -134,14 +134,14 @@ public IDisposable BeginScope<TState>(TState state)
var scopeData = _scopeData.Value;
if (scopeData == null)
{
scopeData = new Dictionary<string, object>();
scopeData = new Dictionary<string, object?>();
_scopeData.Value = scopeData;
}

// Handle different types of state
switch (state)
{
case IEnumerable<KeyValuePair<string, object>> properties:
case IEnumerable<KeyValuePair<string, object?>> properties:
foreach (var prop in properties)
{
scopeData[$"[{scopeData.Count}].{prop.Key}"] = prop.Value;
Expand All @@ -157,9 +157,9 @@ public IDisposable BeginScope<TState>(TState state)

private class RaygunLoggerScope : IDisposable
{
private readonly AsyncLocal<Dictionary<string, object>> _scopeData;
private readonly AsyncLocal<Dictionary<string, object?>> _scopeData;

public RaygunLoggerScope(AsyncLocal<Dictionary<string, object>> scopeData)
public RaygunLoggerScope(AsyncLocal<Dictionary<string, object?>> scopeData)
{
_scopeData = scopeData;
}
Expand All @@ -169,4 +169,4 @@ public void Dispose()
_scopeData.Value?.Clear();
}
}
}
}