NLogLogger - Skip enumerating Properties when empty collection

Author: snakefoot

src/Akka.Logger.NLog/NLogLogger.cs

@@ -11,6 +11,7 @@
 using Akka.Dispatch;
 using Akka.Event;
 using NLog;
+using NLog.MessageTemplates;
 using NLogger = global::NLog.Logger;
 using NLogLevel = global::NLog.LogLevel;
 
@@ -62,23 +63,25 @@ private static void LogEvent(LogEvent logEvent, NLogLevel logLevel)
                 logEventInfo.Properties["actorPath"] = actorPath;   // Same as Serilog
             logEventInfo.Properties["threadId"] = logEvent.Thread.ManagedThreadId;  // ThreadId of the original LogEvent (instead of async Logger threadid)
 
-            // Add structured logging properties from semantic logging
-            // This enables NLog layouts and targets to access structured properties by name
-            if (logEvent.TryGetProperties(out var properties))
-            {
-                foreach (var prop in properties)
-                {
-                    logEventInfo.Properties[prop.Key] = prop.Value;
-                }
-            }
-
             logger.Log(logEventInfo);
         }
 
         private static LogEventInfo CreateLogEventInfo(NLogger logger, NLogLevel level, LogEvent logEvent)
         {
             if (logEvent.Message is LogMessage logMessage)
             {
+                var properties = logMessage.GetProperties();
+                if (properties?.Count > 0)
+                {
+                    var formattedMessage = logMessage.ToString();
+                    var logEventInfo = new LogEventInfo(level, logger.Name, formattedMessage, logMessage.Format, Array.Empty<MessageTemplateParameter>());
+                    foreach (var prop in properties)
+                    {
+                        logEventInfo.Properties[prop.Key] = prop.Value;
+                    }
+                    return logEventInfo;
+                }
+
                 var parameters = logMessage.Parameters();
                 var parameterArray = parameters as object[] ?? parameters?.ToArray();
                 return new LogEventInfo(level, logger.Name, null, logMessage.Format, parameterArray, logEvent.Cause);