Skip to content

Optimize TimestampTokenRenderer #134

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
merged 2 commits into from
Jan 6, 2023
Merged

Optimize TimestampTokenRenderer #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5fdb8
Optimize TimestampTokenRenderer
sungam3r Dec 2, 2022
212ad03
FEATURE_SPAN
sungam3r Jan 5, 2023
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
4 changes: 4 additions & 0 deletions src/Serilog.Sinks.Console/Serilog.Sinks.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
<DefineConstants>$(DefineConstants);RUNTIME_INFORMATION</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
<DefineConstants>$(DefineConstants);FEATURE_SPAN</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
Expand Down
35 changes: 32 additions & 3 deletions src/Serilog.Sinks.Console/Sinks/SystemConsole/Output/TimestampTokenRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

using System;
using System.Globalization;
using System.IO;
using Serilog.Events;
using Serilog.Parsing;
Expand All @@ -36,9 +37,7 @@ public TimestampTokenRenderer(ConsoleTheme theme, PropertyToken token, IFormatPr

public override void Render(LogEvent logEvent, TextWriter output)
{
// We need access to ScalarValue.Render() to avoid this alloc; just ensures
// that custom format providers are supported properly.
var sv = new ScalarValue(logEvent.Timestamp);
var sv = new DateTimeOffsetValue(logEvent.Timestamp);

var _ = 0;
using (_theme.Apply(output, ConsoleThemeStyle.SecondaryText, ref _))
Expand All @@ -56,5 +55,35 @@ public override void Render(LogEvent logEvent, TextWriter output)
}
}
}

readonly struct DateTimeOffsetValue
{
public DateTimeOffsetValue(DateTimeOffset value)
{
Value = value;
}

public DateTimeOffset Value { get; }

public void Render(TextWriter output, string? format = null, IFormatProvider? formatProvider = null)
{
var custom = (ICustomFormatter?)formatProvider?.GetFormat(typeof(ICustomFormatter));
if (custom != null)
{
output.Write(custom.Format(format, Value, formatProvider));
return;
}

#if FEATURE_SPAN
Span<char> buffer = stackalloc char[32];
if (Value.TryFormat(buffer, out int written, format, formatProvider ?? CultureInfo.InvariantCulture))
output.Write(buffer.Slice(0, written));
else
output.Write(Value.ToString(format, formatProvider ?? CultureInfo.InvariantCulture));
#else
output.Write(Value.ToString(format, formatProvider ?? CultureInfo.InvariantCulture));
#endif
}
}
}
}