Use Microsoft.Bcl.TimeProvider in FileLogger

Author: DavidZidar

src/Directory.Packages.props

@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="10.0.5" />
+    <PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.5" />
     <PackageVersion Include="System.Threading.Channels" Version="10.0.5" />

src/TinyLogger/IO/FileRenderer.cs

@@ -1,11 +1,9 @@
-using System.Diagnostics;
-
 namespace TinyLogger.IO;
 
 /// <summary>
 /// Render messages in plain text to a file, optionally with a rolling filename.
 /// </summary>
-public class FileRenderer(Func<string> getFileName, LogFileMode logFileMode)
+public class FileRenderer(Func<string> getFileName, LogFileMode logFileMode, TimeProvider timeProvider)
 	: StreamRendererBase
 {
 	private static readonly TimeSpan FileExistsCheckInterval = TimeSpan.FromSeconds(2);
@@ -17,17 +15,22 @@ public class FileRenderer(Func<string> getFileName, LogFileMode logFileMode)
 	private long lastFileExistsCheckTick = long.MinValue;
 
 	public FileRenderer(string fileName)
-		: this(() => fileName, LogFileMode.Append)
+		: this(() => fileName, LogFileMode.Append, TimeProvider.System)
 	{
 	}
 
 	public FileRenderer(string fileName, LogFileMode logFileMode)
-		: this(() => fileName, logFileMode)
+		: this(() => fileName, logFileMode, TimeProvider.System)
 	{
 	}
 
 	public FileRenderer(Func<string> getFileName)
-		: this(getFileName, LogFileMode.Append)
+		: this(getFileName, LogFileMode.Append, TimeProvider.System)
+	{
+	}
+
+	public FileRenderer(Func<string> getFileName, LogFileMode logFileMode)
+		: this(getFileName, logFileMode, TimeProvider.System)
 	{
 	}
 
@@ -78,7 +81,7 @@ protected override async Task<StreamWriter> GetStreamWriterAsync()
 		{
 			streamWriter = new StreamWriter(LogFile.OpenFile(fileName, logFileMode));
 
-			lastFileExistsCheckTick = Stopwatch.GetTimestamp();
+			lastFileExistsCheckTick = timeProvider.GetTimestamp();
 
 			TrySetupFileWatcher(fileName);
 		}
@@ -88,13 +91,8 @@ protected override async Task<StreamWriter> GetStreamWriterAsync()
 
 	private bool IsFileExistsCheckDue()
 	{
-		var now = Stopwatch.GetTimestamp();
-#if NET
-		var elapsedTime = Stopwatch.GetElapsedTime(lastFileExistsCheckTick, now);
-#else
-		var elapsedTicks = now - lastFileExistsCheckTick;
-		var elapsedTime = TimeSpan.FromTicks((long)(elapsedTicks * (double)TimeSpan.TicksPerSecond / Stopwatch.Frequency));
-#endif
+		var now = timeProvider.GetTimestamp();
+		var elapsedTime = timeProvider.GetElapsedTime(lastFileExistsCheckTick, now);
 
 		if (elapsedTime > FileExistsCheckInterval)
 		{

src/TinyLogger/TinyLogger.csproj

@@ -16,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.TimeProvider" />
     <PackageReference Include="Microsoft.Extensions.Logging" />
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
   </ItemGroup>