Updated NLog Version

Co-Authored-By: Robin Dadswell <19610103+RobinDadswell@users.noreply.github.com>

src/Lidarr.Api.V1/Lidarr.Api.V1.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
     <PackageReference Include="FluentValidation" Version="8.6.2" />
     <PackageReference Include="Ical.Net" Version="4.2.0" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
   </ItemGroup>
 </Project>

src/Lidarr.Http/Lidarr.Http.csproj

@@ -5,7 +5,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="8.6.2" />
     <PackageReference Include="ImpromptuInterface" Version="7.0.1" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Core\Lidarr.Core.csproj" />

src/NzbDrone.Common/Instrumentation/Extensions/SentryLoggerExtensions.cs

@@ -1,6 +1,6 @@
-using System.Linq;
+using System.Collections.Generic;
+using System.Linq;
 using NLog;
-using NLog.Fluent;
 
 namespace NzbDrone.Common.Instrumentation.Extensions
 {
@@ -8,47 +8,46 @@ namespace NzbDrone.Common.Instrumentation.Extensions
     {
         public static readonly Logger SentryLogger = LogManager.GetLogger("Sentry");
 
-        public static LogBuilder SentryFingerprint(this LogBuilder logBuilder, params string[] fingerprint)
+        public static LogEventBuilder SentryFingerprint(this LogEventBuilder logBuilder, params string[] fingerprint)
         {
             return logBuilder.Property("Sentry", fingerprint);
         }
 
-        public static LogBuilder WriteSentryDebug(this LogBuilder logBuilder, params string[] fingerprint)
+        public static LogEventBuilder WriteSentryDebug(this LogEventBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Debug, fingerprint);
         }
 
-        public static LogBuilder WriteSentryInfo(this LogBuilder logBuilder, params string[] fingerprint)
+        public static LogEventBuilder WriteSentryInfo(this LogEventBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Info, fingerprint);
         }
 
-        public static LogBuilder WriteSentryWarn(this LogBuilder logBuilder, params string[] fingerprint)
+        public static LogEventBuilder WriteSentryWarn(this LogEventBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Warn, fingerprint);
         }
 
-        public static LogBuilder WriteSentryError(this LogBuilder logBuilder, params string[] fingerprint)
+        public static LogEventBuilder WriteSentryError(this LogEventBuilder logBuilder, params string[] fingerprint)
         {
             return LogSentryMessage(logBuilder, LogLevel.Error, fingerprint);
         }
 
-        private static LogBuilder LogSentryMessage(LogBuilder logBuilder, LogLevel level, string[] fingerprint)
+        private static LogEventBuilder LogSentryMessage(LogEventBuilder logBuilder, LogLevel level, string[] fingerprint)
         {
-            SentryLogger.Log(level)
+            SentryLogger.ForLogEvent(level)
-                        .CopyLogEvent(logBuilder.LogEventInfo)
+                        .CopyLogEvent(logBuilder.LogEvent)
                         .SentryFingerprint(fingerprint)
-                        .Write();
+                        .Log();
 
-            return logBuilder.Property("Sentry", null);
+            return logBuilder.Property<string>("Sentry", null);
         }
 
-        private static LogBuilder CopyLogEvent(this LogBuilder logBuilder, LogEventInfo logEvent)
+        private static LogEventBuilder CopyLogEvent(this LogEventBuilder logBuilder, LogEventInfo logEvent)
         {
-            return logBuilder.LoggerName(logEvent.LoggerName)
+            return logBuilder.TimeStamp(logEvent.TimeStamp)
-                             .TimeStamp(logEvent.TimeStamp)
                              .Message(logEvent.Message, logEvent.Parameters)
-                             .Properties(logEvent.Properties.ToDictionary(v => v.Key, v => v.Value))
+                             .Properties(logEvent.Properties.Select(p => new KeyValuePair<string, object>(p.Key.ToString(), p.Value)))
                              .Exception(logEvent.Exception);
         }
     }

src/NzbDrone.Common/Instrumentation/NzbDroneFileTarget.cs

@@ -1,13 +1,15 @@
-using NLog;
+using System.Text;
+using NLog;
 using NLog.Targets;
 
 namespace NzbDrone.Common.Instrumentation
 {
     public class NzbDroneFileTarget : FileTarget
     {
-        protected override string GetFormattedMessage(LogEventInfo logEvent)
+        protected override void RenderFormattedMessage(LogEventInfo logEvent, StringBuilder target)
         {
-            return CleanseLogMessage.Cleanse(Layout.Render(logEvent));
+            var result = CleanseLogMessage.Cleanse(Layout.Render(logEvent));
+            target.Append(result);
         }
     }
 }

src/NzbDrone.Common/Instrumentation/NzbDroneLogger.cs

@@ -34,6 +34,8 @@ namespace NzbDrone.Common.Instrumentation
 
             var appFolderInfo = new AppFolderInfo(startupContext);
 
+            RegisterGlobalFilters();
+
             if (Debugger.IsAttached)
             {
                 RegisterDebugger();
@@ -101,6 +103,16 @@ namespace NzbDrone.Common.Instrumentation
             LogManager.Configuration.LoggingRules.Add(loggingRule);
         }
 
+        private static void RegisterGlobalFilters()
+        {
+            LogManager.Setup().LoadConfiguration(c =>
+            {
+                c.ForLogger("Microsoft.Hosting.Lifetime*").WriteToNil(LogLevel.Info);
+                c.ForLogger("System*").WriteToNil(LogLevel.Warn);
+                c.ForLogger("Microsoft*").WriteToNil(LogLevel.Warn);
+            });
+        }
+
         private static void RegisterConsole()
         {
             var level = LogLevel.Trace;

src/NzbDrone.Common/Lidarr.Common.csproj

@@ -8,7 +8,7 @@
     <PackageReference Include="DryIoc.dll" Version="5.1.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
     <PackageReference Include="Sentry" Version="3.19.0" />
     <PackageReference Include="SharpZipLib" Version="1.3.3" />

src/NzbDrone.Core/Download/CompletedDownloadService.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -206,14 +205,14 @@ namespace NzbDrone.Core.Download
                 }
                 else
                 {
-                    _logger.Debug()
+                    _logger.ForDebugEvent()
                            .Message("No albums were just imported, but all albums were previously imported, possible issue with download history.")
                            .Property("ArtistId", trackedDownload.RemoteAlbum.Artist.Id)
                            .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
                            .Property("Title", trackedDownload.DownloadItem.Title)
                            .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
                            .WriteSentryWarn("DownloadHistoryIncomplete")
-                           .Write();
+                           .Log();
                 }
 
                 trackedDownload.State = TrackedDownloadState.Imported;

src/NzbDrone.Core/Instrumentation/ReconfigureLogging.cs

@@ -117,7 +117,6 @@ namespace NzbDrone.Core.Instrumentation
             syslogTarget.MessageSend.Protocol = ProtocolType.Udp;
             syslogTarget.MessageSend.Udp.Port = syslogPort;
             syslogTarget.MessageSend.Udp.Server = syslogServer;
-            syslogTarget.MessageSend.Udp.ReconnectInterval = 500;
             syslogTarget.MessageCreation.Rfc = RfcNumber.Rfc5424;
             syslogTarget.MessageCreation.Rfc5424.AppName = _configFileProvider.InstanceName;
 

src/NzbDrone.Core/Lidarr.Core.csproj

@@ -14,9 +14,9 @@
     <PackageReference Include="FluentValidation" Version="8.6.2" />
     <PackageReference Include="MailKit" Version="2.15.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
-    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="5.0.4" />
-    <PackageReference Include="NLog.Targets.Syslog" Version="6.0.2" />
+    <PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
     <PackageReference Include="TagLibSharp-Lidarr" Version="2.2.0.27" />
     <PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />

src/NzbDrone.Core/MediaFiles/AudioTag.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -441,11 +440,11 @@ namespace NzbDrone.Core.MediaFiles
             }
             catch (Exception ex)
             {
-                Logger.Warn()
+                Logger.ForWarnEvent()
-                    .Exception(ex)
+                      .Exception(ex)
-                    .Message($"Tag writing failed for {path}")
+                      .Message($"Tag writing failed for {path}")
-                    .WriteSentryWarn("Tag writing failed")
+                      .WriteSentryWarn("Tag writing failed")
-                    .Write();
+                      .Log();
             }
             finally
             {

src/NzbDrone.Core/MediaFiles/AudioTagService.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Configuration;
@@ -161,11 +160,11 @@ namespace NzbDrone.Core.MediaFiles
             }
             catch (Exception ex)
             {
-                _logger.Warn()
+                _logger.ForWarnEvent()
-                    .Exception(ex)
+                       .Exception(ex)
-                    .Message($"Tag removal failed for {path}")
+                       .Message($"Tag removal failed for {path}")
-                    .WriteSentryWarn("Tag removal failed")
+                       .WriteSentryWarn("Tag removal failed")
-                    .Write();
+                       .Log();
             }
             finally
             {

src/NzbDrone.Core/MediaFiles/MediaInfoFormatter.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using NLog;
-using NLog.Fluent;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Common.Instrumentation.Extensions;
 using NzbDrone.Core.Parser;
@@ -65,10 +64,10 @@ namespace NzbDrone.Core.MediaFiles
             }
             else
             {
-                Logger.Debug()
+                Logger.ForDebugEvent()
-                    .Message("Unknown audio format: '{0}'.", string.Join(", ", mediaInfo.AudioFormat))
+                      .Message("Unknown audio format: '{0}'.", string.Join(", ", mediaInfo.AudioFormat))
-                    .WriteSentryWarn("UnknownAudioFormat", mediaInfo.AudioFormat)
+                      .WriteSentryWarn("UnknownAudioFormat", mediaInfo.AudioFormat)
-                    .Write();
+                      .Log();
 
                 return "Unknown";
             }

src/NzbDrone.Mono/Lidarr.Mono.csproj

@@ -4,7 +4,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="System.IO.Abstractions" Version="17.0.24" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="5.20.1.34-servarr20" />
   </ItemGroup>

src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj

@@ -7,7 +7,7 @@
     <PackageReference Include="FluentValidation" Version="8.6.2" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="RestSharp" Version="106.15.0" />
     <PackageReference Include="RestSharp.Serializers.SystemTextJson" Version="106.15.0" />

src/NzbDrone.Update/Lidarr.Update.csproj

@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageReference Include="DryIoc.dll" Version="5.1.0" />
     <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.0.2" />
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NzbDrone.Common\Lidarr.Common.csproj" />

src/NzbDrone.Windows/Lidarr.Windows.csproj

@@ -4,7 +4,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="5.0.4" />
     <PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>