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

Jump to bottom

MicrosoftConsoleLayoutRenderer - Skip string-allocation for EventId when possible on platform #572

Merged
merged 1 commit into from
Feb 8, 2022
Merged

MicrosoftConsoleLayoutRenderer - Skip string-allocation for EventId when possible on platform #572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 16 additions & 17 deletions src/NLog.Extensions.Logging/LayoutRenderers/MicrosoftConsoleLayoutRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent)
builder.Append(": ");
builder.Append(logEvent.LoggerName);
builder.Append('[');
var eventId = LookupEventId(logEvent);
builder.Append(eventId);
AppendEventId(LookupEventId(logEvent), builder);
builder.Append(']');
builder.Append(System.Environment.NewLine);
builder.Append(" ");
Expand All @@ -63,35 +62,35 @@ protected override void Append(StringBuilder builder, LogEventInfo logEvent)
}
}

private static string LookupEventId(LogEventInfo logEvent)
private static void AppendEventId(int eventId, StringBuilder builder)
{
if (eventId == 0)
builder.Append('0');
else if (eventId > 0 && eventId < EventIdMapper.Length)
builder.Append(EventIdMapper[eventId]);
else
builder.Append(eventId); // .NET5 (and newer) can append integer without string-allocation (using span)
}

private static int LookupEventId(LogEventInfo logEvent)
{
if (logEvent.HasProperties)
{
if (logEvent.Properties.TryGetValue(nameof(EventIdCaptureType.EventId), out var eventObject))
{
if (eventObject is int eventId)
return ConvertEventId(eventId);
return eventId;
else if (eventObject is Microsoft.Extensions.Logging.EventId eventIdStruct)
return ConvertEventId(eventIdStruct.Id);
return eventIdStruct.Id;
}

if (logEvent.Properties.TryGetValue(nameof(EventIdCaptureType.EventId_Id), out var eventid) && eventid is int)
{
return ConvertEventId((int)eventid);
return (int)eventid;
}
}

return "0";
}

private static string ConvertEventId(int eventId)
{
if (eventId == 0)
return "0";
else if (eventId > 0 && eventId < EventIdMapper.Length)
return EventIdMapper[eventId];
else
return eventId.ToString(System.Globalization.CultureInfo.InvariantCulture);
return 0;
}

private static string ConvertLogLevel(LogLevel logLevel)
Expand Down