Ability to flush metrics queue on shutdown. NLog collect all params, ability to configure that.

Author: mwatson

Dlls/StackifyLib.ELMAH/StackifyLib.ELMAH.dll

@@ -30,7 +30,7 @@ public class StackifyAppender : AppenderSkeleton
         public string threadContextKeys { get; set; }
         public string logicalThreadContextKeys { get; set; }
         public string callContextKeys { get; set; }
-        public bool logMethodNames { get; set; }
+        public bool? logMethodNames { get; set; }
 
         private List<string> _GlobalContextKeys = new List<string>();
         private List<string> _ThreadContextKeys = new List<string>();
@@ -46,6 +46,8 @@ protected override void OnClose()
             try
             {
                 _logClient.Close();
+                StackifyLib.Internal.Metrics.MetricClient.StopMetricsQueue();
+
             }
             catch
             {
@@ -148,7 +150,7 @@ internal LogMsg Translate(LoggingEvent loggingEvent)
             {
                 msg.SrcMethod = loggingEvent.LoggerName;
 
-                if (logMethodNames)
+                if (logMethodNames ?? false)
                 {
                     var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 

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

@@ -21,7 +21,7 @@ public class StackifyAppender : AppenderSkeleton
         public string threadContextKeys { get; set; }
         public string logicalThreadContextKeys { get; set; }
         public string callContextKeys { get; set; }
-        public bool logMethodNames { get; set; }
+        public bool? logMethodNames { get; set; }
 
         private List<string> _GlobalContextKeys = new List<string>();
         private List<string> _ThreadContextKeys = new List<string>();
@@ -37,6 +37,8 @@ protected override void OnClose()
             try
             {
                 _logClient.Close();
+                StackifyLib.Internal.Metrics.MetricClient.StopMetricsQueue();
+
             }
             catch
             {
@@ -139,7 +141,7 @@ internal LogMsg Translate(LoggingEvent loggingEvent)
             {
                 msg.SrcMethod = loggingEvent.LoggerName;
 
-                if (logMethodNames)
+                if (logMethodNames ?? false)
                 {
                     var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 

Dlls/StackifyLib.log4net/StackifyLib.log4net.dll

@@ -28,7 +28,8 @@ public class StackifyTarget : TargetWithLayout
         public string globalContextKeys { get; set; }
         public string mappedContextKeys { get; set; }
         public string callContextKeys { get; set; }
-        public bool logMethodNames { get; set; }
+        public bool? logMethodNames { get; set; }
+        public bool? logAllParams { get; set; }
 
         private List<string> _GlobalContextKeys = new List<string>();
         private List<string> _MappedContextKeys = new List<string>();
@@ -38,8 +39,15 @@ public class StackifyTarget : TargetWithLayout
 
         protected override void CloseTarget()
         {
-            _logClient.Close();
-            
+            try
+            {
+                _logClient.Close();
+                StackifyLib.Internal.Metrics.MetricClient.StopMetricsQueue();
+
+            }
+            catch 
+            {
+            }
         }
 
         protected override void InitializeTarget()
@@ -193,7 +201,7 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
             {
                 msg.SrcMethod = loggingEvent.LoggerName;
 
-                if (logMethodNames)
+                if ((logMethodNames ?? false))
                 {
                     var frames = StackifyLib.Logger.GetCurrentStackTrace(loggingEvent.LoggerName, 1, true);
 
@@ -255,6 +263,17 @@ internal LogMsg Translate(LogEventInfo loggingEvent)
                 {
                     debugObject = null;
                 }
+                else if (logAllParams ?? true)
+                {
+                    Dictionary<string, object> args = new Dictionary<string, object>();
+
+                    for (int i = 0; i < loggingEvent.Parameters.Length; i++)
+                    {
+                        args["arg" + i] = loggingEvent.Parameters[i];
+                    }
+
+                    debugObject = args;
+                }
             }
 
             if (debugObject != null)

Dlls/StackifyLib.nLog/StackifyLib.nLog.dll

@@ -103,6 +103,7 @@ public void Close()
             {
                 if (_LogQueue != null)
                 {
+                    //stop will flush the queue
                     _LogQueue.Stop();
                 }
             }

Dlls/StackifyLib/StackifyLib.dll

@@ -10,7 +10,7 @@
 
 namespace StackifyLib.Internal.Metrics
 {
-    internal static class MetricClient
+    public static class MetricClient
     {
         private static HttpClient _httpClient = new HttpClient(null, null);
 
@@ -23,6 +23,7 @@ internal static class MetricClient
         private static ConcurrentDictionary<string, MetricAggregate> _LastAggregates = new ConcurrentDictionary<string, MetricAggregate>();
         private static ConcurrentDictionary<string, MetricSetting> _MetricSettings = new ConcurrentDictionary<string, MetricSetting>();
 
+        private static bool _StopRequested = false;
 
         static MetricClient()
         {
@@ -271,10 +272,49 @@ private static void UploadMetricsCheck(object state)
             StackifyAPILogger.Log("Upload metrics check");
 
             _Timer.Change(-1, -1);
-            bool allSuccess = false;
-            DateTime purgeOlderThan = DateTime.UtcNow.AddMinutes(-10);
-            DateTime currentMinute = DateTime.UtcNow.Floor(TimeSpan.FromMinutes(1));
-            List<KeyValuePair<string, MetricAggregate>> metrics = new List<KeyValuePair<string, MetricAggregate>>();
+
+            double seconds = 15;
+
+            if (!_StopRequested)
+            {
+                bool allSuccess = false;
+                DateTime purgeOlderThan = DateTime.UtcNow.AddMinutes(-10);
+
+                DateTime currentMinute = DateTime.UtcNow.Floor(TimeSpan.FromMinutes(1));
+
+                allSuccess = UploadMetrics(currentMinute);
+
+                PurgeOldMetrics(purgeOlderThan);
+
+                if (_AggregateMetrics.Count > 0 && allSuccess)
+                {
+                    seconds = .1;
+                }
+            }
+
+
+
+            _Timer.Change(TimeSpan.FromSeconds(seconds), TimeSpan.FromSeconds(seconds));
+     
+        }
+
+        public static void StopMetricsQueue()
+        {
+            //don't let t his method run more than once
+            if (_StopRequested)
+                return;
+
+            _StopRequested = true;
+
+            DateTime currentMinute = DateTime.UtcNow.AddMinutes(2).Floor(TimeSpan.FromMinutes(1));
+
+            UploadMetrics(currentMinute);
+        }
+
+        public static bool UploadMetrics(DateTime currentMinute)
+        {
+            bool success = false;
+             List<KeyValuePair<string, MetricAggregate>> metrics = new List<KeyValuePair<string, MetricAggregate>>();
             try
             {
                 //read everything up to the start of the current minute
@@ -317,7 +357,7 @@ private static void UploadMetricsCheck(object state)
 
                         //only getting metrics less than 10 minutes old to drop old data in case we get backed up
                         //they are removed from the _AggregateMetrics in the upload function upon success
-                        allSuccess =
+                        success =
                             UploadAggregates(
                                 metrics.Where(x => x.Value.OccurredUtc > DateTime.UtcNow.AddMinutes(-10)).ToList());
 
@@ -332,7 +372,7 @@ private static void UploadMetricsCheck(object state)
             }
             catch (Exception ex)
             {
-                allSuccess = false;
+                success = false;
                 StackifyAPILogger.Log("Error uploading metrics " + ex.ToString());
 
                 //if an error put them back in
@@ -347,14 +387,20 @@ private static void UploadMetricsCheck(object state)
                 }
             }
 
+            return success;
+
+        }
+
+        private static void PurgeOldMetrics(DateTime purgeOlderThan)
+        {
             try
             {
                 //beginning of this method we save off latest aggregates before upload or purge
 
                 //purge old stuff
                 //if uploading disabled it purges everything
                 //if success uploading then should be nothing to purge as that is already done above
-               
+
                 var oldMetrics = _AggregateMetrics.Where(x => x.Value.OccurredUtc < purgeOlderThan).ToList();
                 MetricAggregate oldval;
                 oldMetrics.ForEach(x => _AggregateMetrics.TryRemove(x.Key, out oldval));
@@ -365,16 +411,6 @@ private static void UploadMetricsCheck(object state)
                 StackifyAPILogger.Log("Error purging metrics " + ex.ToString());
             }
 
-           
-            double seconds = 15;
-
-            if (_AggregateMetrics.Count > 0 && allSuccess)
-            {
-                seconds = .1;
-            }
-
-            _Timer.Change(TimeSpan.FromSeconds(seconds), TimeSpan.FromSeconds(seconds));
-     
         }
 
         private static void SetLatestAggregates(List<MetricAggregate> aggregates)