Avoid using DateTime - Switch to DateTimeOffset (dotnet#39916)

sean4492 · Jul 25, 2020 · f3f23b4 · f3f23b4
1 parent 90989b4
commit f3f23b4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/JsonConsoleFormatter.cs
@@ -45,8 +45,8 @@ public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeP
                     var timestampFormat = FormatterOptions.TimestampFormat;
                     if (timestampFormat != null)
                     {
-                        var dateTime = FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now;
-                        timestamp = dateTime.ToString(timestampFormat);
+                        DateTimeOffset dateTimeOffset = FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now;
+                        timestamp = dateTimeOffset.ToString(timestampFormat);
                     }
                     writer.WriteString("Timestamp", timestamp);
                     writer.WriteNumber(nameof(logEntry.EventId), eventId);

diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/SimpleConsoleFormatter.cs
@@ -53,8 +53,8 @@ public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeP
             string timestampFormat = FormatterOptions.TimestampFormat;
             if (timestampFormat != null)
             {
-                DateTime dateTime = GetCurrentDateTime();
-                timestamp = dateTime.ToString(timestampFormat);
+                DateTimeOffset dateTimeOffset = GetCurrentDateTime();
+                timestamp = dateTimeOffset.ToString(timestampFormat);
             }
             if (timestamp != null)
             {
@@ -126,9 +126,9 @@ static void WriteReplacing(TextWriter writer, string oldValue, string newValue,
             }
         }
 
-        private DateTime GetCurrentDateTime()
+        private DateTimeOffset GetCurrentDateTime()
         {
-            return FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now;
+            return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now;
         }
 
         private static string GetLogLevelString(LogLevel logLevel)

diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs b/src/libraries/Microsoft.Extensions.Logging.Console/src/SystemdConsoleFormatter.cs
@@ -57,8 +57,8 @@ public override void Write<TState>(in LogEntry<TState> logEntry, IExternalScopeP
             string timestampFormat = FormatterOptions.TimestampFormat;
             if (timestampFormat != null)
             {
-                DateTime dateTime = GetCurrentDateTime();
-                textWriter.Write(dateTime.ToString(timestampFormat));
+                DateTimeOffset dateTimeOffset = GetCurrentDateTime();
+                textWriter.Write(dateTimeOffset.ToString(timestampFormat));
             }
 
             // category and event id
@@ -96,9 +96,9 @@ static void WriteReplacingNewLine(TextWriter writer, string message)
             }
         }
 
-        private DateTime GetCurrentDateTime()
+        private DateTimeOffset GetCurrentDateTime()
         {
-            return FormatterOptions.UseUtcTimestamp ? DateTime.UtcNow : DateTime.Now;
+            return FormatterOptions.UseUtcTimestamp ? DateTimeOffset.UtcNow : DateTimeOffset.Now;
         }
 
         private static string GetSyslogSeverityString(LogLevel logLevel)