Performance optimization to only get one method from the stack and simpler method names for logging. NLog bug fix with duplicate logging of diagnostic data. NLog support for NDC

Author: mwatson

Dlls/StackifyLib.ELMAH/StackifyLib.ELMAH.dll

@@ -150,7 +150,7 @@ internal LogMsg Translate(LoggingEvent loggingEvent)
 
                 if (logMethodNames)
                 {
-                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName);
+                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 
                     if (frames.Any())
                     {

Dlls/StackifyLib.log4net.v1_2_10/StackifyLib.log4net.dll

@@ -141,7 +141,7 @@ internal LogMsg Translate(LoggingEvent loggingEvent)
 
                 if (logMethodNames)
                 {
-                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName);
+                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 
                     if (frames.Any())
                     {
@@ -285,7 +285,7 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                 return null;
             }
 
-
+            
             Dictionary<string, object> properties = new Dictionary<string, object>();
 
 

Dlls/StackifyLib.log4net/StackifyLib.log4net.dll

@@ -93,12 +93,23 @@ protected override void Write(LogEventInfo logEvent)
 
         private Dictionary<string, object> GetDiagnosticContextProperties()
         {
-            if (!_HasContextKeys)
+
+
+            Dictionary<string, object> properties = new Dictionary<string, object>();
+
+
+            string ndc = NLog.NestedDiagnosticsContext.TopMessage;
+
+            if (!String.IsNullOrEmpty(ndc))
             {
-                return null;
+                properties["ndc"] = ndc;
             }
 
-            Dictionary<string, object> properties = new Dictionary<string, object>();
+
+            if (!_HasContextKeys)
+            {
+                return properties;
+            }
 
             // GlobalDiagnosticsContext
 
@@ -114,7 +125,6 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                     }
                 }
             }
-
             // MappedDiagnosticsContext
 
             foreach (string mdcKey in _MappedContextKeys)
@@ -185,7 +195,7 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
 
                 if (logMethodNames)
                 {
-                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName);
+                    var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 
                     if (frames.Any())
                     {
@@ -217,14 +227,7 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
             }
 
 
-            if ((loggingEvent.Parameters != null) && (loggingEvent.Parameters.Length > 0))
-            {
-                msg.data = StackifyLib.Utils.HelperFunctions.SerializeDebugData(loggingEvent.Parameters[0], true, diags);
-            }
-            else
-            {
-                msg.data = StackifyLib.Utils.HelperFunctions.SerializeDebugData(null, false, diags);
-            }
+     
 
             string formattedMessage;
 
@@ -239,7 +242,29 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
                 formattedMessage = loggingEvent.FormattedMessage;
             }
 
-            msg.Msg = formattedMessage;
+            msg.Msg = (formattedMessage ?? "").Trim();
+
+            object debugObject = null;
+
+            if ((loggingEvent.Parameters != null) && (loggingEvent.Parameters.Length > 0))
+            {
+                debugObject = loggingEvent.Parameters[0];
+
+                //if the debug param is the same as the logging message itself, suppress it
+                if (debugObject != null && debugObject.ToString() == msg.Msg)
+                {
+                    debugObject = null;
+                }
+            }
+
+            if (debugObject != null)
+            {
+                msg.data = StackifyLib.Utils.HelperFunctions.SerializeDebugData(debugObject, true, diags);
+            }
+            else
+            {
+                msg.data = StackifyLib.Utils.HelperFunctions.SerializeDebugData(null, false, diags);
+            }
 
 
             if (msg.Msg != null && error != null)

Dlls/StackifyLib.nLog/StackifyLib.nLog.dll

@@ -223,7 +223,7 @@ public static void QueueLogObject(StackifyLib.Models.LogMsg msg, Exception excep
         /// </summary>
         /// <param name="declaringClassName"></param>
         /// <returns></returns>
-        public static List<TraceFrame> GetCurrentStackTrace(string declaringClassName)
+        public static List<TraceFrame> GetCurrentStackTrace(string declaringClassName, int maxFrames = 99, bool simpleMethodNames = false)
         {
             List<TraceFrame> frames = new List<TraceFrame>();
 
@@ -257,8 +257,13 @@ public static List<TraceFrame> GetCurrentStackTrace(string declaringClassName)
                         var f2 = new TraceFrame();
                         f2.CodeFileName = frame2.GetFileName();
                         f2.LineNum = frame2.GetFileLineNumber();
-                        f2.Method = ErrorItem.GetMethodFullName(frame2.GetMethod());
+                        f2.Method = ErrorItem.GetMethodFullName(frame2.GetMethod(), simpleMethodNames);
                         frames.Add(f2);
+
+                        if (frames.Count > maxFrames)
+                        {
+                            return frames;
+                        }
                     }
 
                 }