NLog.Targets.Stackify - LogEvent Properties are different from LogEvent Context

Author: snakefoot

Src/NLog.Targets.Stackify/StackifyTarget.cs

@@ -25,6 +25,7 @@ public class StackifyTarget : TargetWithLayout
         public string uri { get; set; }
         public string globalContextKeys { get; set; }
         public string mappedContextKeys { get; set; }
+        public string mappedLogicalContextKeys { get; set; }
         public string callContextKeys { get; set; }
         public bool? logMethodNames { get; set; }
         public bool? logAllParams { get; set; }
@@ -33,6 +34,7 @@ public class StackifyTarget : TargetWithLayout
 
         private List<string> _GlobalContextKeys = new List<string>();
         private List<string> _MappedContextKeys = new List<string>();
+        private List<string> _MappedLogicalContextKeys = new List<string>();
         private List<string> _CallContextKeys = new List<string>();
 
         private LogClient _logClient = null;
@@ -66,13 +68,17 @@ protected override void InitializeTarget()
                 _MappedContextKeys = mappedContextKeys.Split(',').Select(s => s.Trim()).ToList();
             }
 
+            if (!String.IsNullOrEmpty(mappedLogicalContextKeys))
+            {
+                _MappedLogicalContextKeys = mappedLogicalContextKeys.Split(',').Select(s => s.Trim()).ToList();
+            }
+
             if (!String.IsNullOrEmpty(callContextKeys))
             {
                 _CallContextKeys = callContextKeys.Split(',').Select(s => s.Trim()).ToList();
             }
 
-
-            _HasContextKeys = _GlobalContextKeys.Any() || _MappedContextKeys.Any() || _CallContextKeys.Any();
+            _HasContextKeys = _GlobalContextKeys.Any() || _MappedContextKeys.Any() || _MappedLogicalContextKeys.Any() || _CallContextKeys.Any();
         }
 
         protected override void Write(LogEventInfo logEvent)
@@ -143,10 +149,10 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                         properties.Add(mdcKey.ToLower(), mdcValue);
                     }
                 }
-            }
-
-            // MappedDiagnosticsLogicalContext (Async CallContext)
-            foreach (string mdlcKey in _MappedContextKeys)
+            }
+
+            // MappedDiagnosticsLogicalContext (Async CallContext)
+            foreach (string mdlcKey in _MappedLogicalContextKeys)
             {
                 if (NLog.MappedDiagnosticsLogicalContext.Contains(mdlcKey))
                 {
@@ -242,8 +248,21 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
 
             object debugObject = null;
 
-            if ((loggingEvent.Parameters != null) && (loggingEvent.Parameters.Length > 0))
-            {
+            if ((logAllProperties ?? true) && loggingEvent.Properties.Count > 0)
+            {
+                Dictionary<string, object> args = new Dictionary<string, object>();
+                foreach (KeyValuePair<object, object> eventProperty in loggingEvent.Properties)
+                {
+                    string propertyKey = eventProperty.Key.ToString();
+                    if (!string.IsNullOrEmpty(propertyKey))
+                    {
+                        args[propertyKey] = eventProperty.Value;
+                    }
+                }
+                debugObject = args;
+            }
+            else if (loggingEvent.Parameters != null && loggingEvent.Parameters.Length > 0)
+            {
                 Dictionary<string, object> args = (logAllParams ?? true) ? new Dictionary<string, object>() : null;
                 if (args != null || (logLastParameter ?? true))
                 {
@@ -284,7 +303,6 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
                 }
             }
 
-
             StackifyError error = null;
 
             if (loggingEvent.Exception != null && loggingEvent.Exception is StackifyError)
@@ -297,22 +315,6 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
             }
 
             var diags = GetDiagnosticContextProperties();
-
-            if (logAllProperties ?? true)
-            {
-                if (loggingEvent.Properties.Count > 0)
-                {
-                    foreach (KeyValuePair<object, object> eventProperty in loggingEvent.Properties)
-                    {
-                        string propertyKey = eventProperty.Key.ToString();
-                        if (!string.IsNullOrEmpty(propertyKey))
-                        {
-                            diags[propertyKey.ToLower()] = eventProperty.Value;
-                        }
-                    }
-                }
-            }
-
             if (diags != null && diags.ContainsKey("transid"))
             {
                 msg.TransID = diags["transid"].ToString();

Src/StackifyLib/Utils/HelperFunctions.cs

@@ -127,21 +127,22 @@ public static string SerializeDebugData(object logObject, bool serializeSimpleTy
                             }
                             else
                             {
-
                                 if (!typeInfo.ContainsGenericParameters)
                                 {
                                     jObject.Add("objectType", type.FullName);
                                 }
-#if NET451 || NET45 || NET40
                                 else
                                 {
-
+#if NET451 || NET45 || NET40
                                     var genericArgs = typeInfo.GetGenericArguments();
-
-                                    if (genericArgs.Any())
+#else
+                                    var genericArgs = typeInfo.IsGenericTypeDefinition ?
+                                        type.GetTypeInfo().GenericTypeParameters :
+                                        type.GetTypeInfo().GenericTypeArguments;
+#endif
+                                    if (genericArgs != null && genericArgs.Length > 0)
                                     {
                                         var childtype = genericArgs.First();
-
 #if NET40
                                         var childtypeinfo = childtype;
 #else
@@ -162,7 +163,6 @@ public static string SerializeDebugData(object logObject, bool serializeSimpleTy
                                         jObject.Add("objectType", type.FullName);
                                     }
                                 }
-#endif
                             }
                         }
                         else if (token is JValue)
@@ -186,7 +186,7 @@ public static string SerializeDebugData(object logObject, bool serializeSimpleTy
             }
 
             string data = null;
-            if (properties != null && properties.Any())
+            if (properties != null && properties.Count > 0)
             {
 
                 if (jObject == null)