Fixed #45 Data Exclusions was being ignored on extra exception properties.

Author: niemyjski

Source/Extras/Extensions/ToErrorModelExtensions.cs

@@ -28,11 +28,12 @@ internal static class ToErrorModelExtensions {
         /// </summary>
         /// <param name="exception">The exception to populate properties from.</param>
         /// <param name="log">The log implementation used for diagnostic information.</param>
-        public static Error ToErrorModel(this Exception exception, IExceptionlessLog log) {
-            return ToErrorModelInternal(exception, log);
+        /// <param name="dataExclusions">Data exclusions that get run on extra exception properties.</param>
+        public static Error ToErrorModel(this Exception exception, IExceptionlessLog log, IEnumerable<string> dataExclusions) {
+            return ToErrorModelInternal(exception, log, dataExclusions);
         }
 
-        private static Error ToErrorModelInternal(Exception exception, IExceptionlessLog log, bool isInner = false) {
+        private static Error ToErrorModelInternal(Exception exception, IExceptionlessLog log, IEnumerable<string> dataExclusions, bool isInner = false) {
             Type type = exception.GetType();
 
             var error = new Error {
@@ -61,7 +62,8 @@ private static Error ToErrorModelInternal(Exception exception, IExceptionlessLog
             }
 
             try {
-                Dictionary<string, object> extraProperties = type.GetPublicProperties().Where(p => !_exceptionExclusions.Contains(p.Name)).ToDictionary(p => p.Name, p => {
+                var exclusions = _exceptionExclusions.Union(dataExclusions ?? new List<string>());
+                var extraProperties = type.GetPublicProperties().Where(p => !exclusions.Contains(p.Name)).ToDictionary(p => p.Name, p => {
                     try {
                         return p.GetValue(exception, null);
                     } catch { }
@@ -81,7 +83,7 @@ private static Error ToErrorModelInternal(Exception exception, IExceptionlessLog
             } catch { }
 
             if (exception.InnerException != null)
-                error.Inner = ToErrorModelInternal(exception.InnerException, log, true);
+                error.Inner = ToErrorModelInternal(exception.InnerException, log, dataExclusions, true);
 
             return error;
         }
@@ -173,8 +175,12 @@ private static void PopulateStackTrace(this Error error, Error root, Exception e
                     FileName = frame.GetFileName()
                 };
 
-                stackFrame.Data["ILOffset"] = frame.GetILOffset();
-                stackFrame.Data["NativeOffset"] = frame.GetNativeOffset();
+                try {
+                    stackFrame.Data["ILOffset"] = frame.GetILOffset();
+                    stackFrame.Data["NativeOffset"] = frame.GetNativeOffset();
+                } catch (Exception ex) {
+                    log.Error(typeof(ExceptionlessClient), ex, "Error populating StackFrame offset info: " + ex.Message);
+                }
 
                 try {
                     stackFrame.PopulateMethod(root, frame.GetMethod());

Source/Extras/Plugins/ErrorPlugin.cs

@@ -11,7 +11,7 @@ public void Run(EventPluginContext context) {
                 return;
 
             context.Event.Type = Event.KnownTypes.Error;
-            context.Event.Data[Event.KnownDataKeys.Error] = exception.ToErrorModel(context.Log);
+            context.Event.Data[Event.KnownDataKeys.Error] = exception.ToErrorModel(context.Log, context.Client.Configuration.DataExclusions);
         }
     }
 }

Source/Shared/Extensions/ToSimpleErrorModelExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Exceptionless.Logging;
 using Exceptionless.Models.Data;
 
 namespace Exceptionless.Extensions {
@@ -12,7 +13,13 @@ internal static class ToSimpleErrorModelExtensions {
             "Entries", "StateEntries",  "PersistedState", "Results"
         };
 
-        public static SimpleError ToSimpleErrorModel(this Exception exception) {
+        /// <summary>
+        /// Sets the properties from an exception.
+        /// </summary>
+        /// <param name="exception">The exception to populate properties from.</param>
+        /// <param name="log">The log implementation used for diagnostic information.</param>
+        /// <param name="dataExclusions">Data exclusions that get run on extra exception properties.</param>
+        public static SimpleError ToSimpleErrorModel(this Exception exception, IExceptionlessLog log, IEnumerable<string> dataExclusions) {
             Type type = exception.GetType();
 
             var error = new SimpleError {
@@ -22,7 +29,8 @@ public static SimpleError ToSimpleErrorModel(this Exception exception) {
             };
 
             try {
-                Dictionary<string, object> extraProperties = type.GetPublicProperties().Where(p => !_exceptionExclusions.Contains(p.Name)).ToDictionary(p => p.Name, p => {
+                var exclusions = _exceptionExclusions.Union(dataExclusions ?? new List<string>());
+                var extraProperties = type.GetPublicProperties().Where(p => !exclusions.Contains(p.Name)).ToDictionary(p => p.Name, p => {
                     try {
                         return p.GetValue(exception, null);
                     } catch {}
@@ -42,7 +50,7 @@ public static SimpleError ToSimpleErrorModel(this Exception exception) {
             } catch {}
 
             if (exception.InnerException != null)
-                error.Inner = exception.InnerException.ToSimpleErrorModel();
+                error.Inner = exception.InnerException.ToSimpleErrorModel(log, dataExclusions);
 
             return error;
         }

Source/Shared/Plugins/Default/EnvironmentInfoPlugin.cs

@@ -18,7 +18,7 @@ public void Run(EventPluginContext context) {
 
                 var info = collector.GetEnvironmentInfo();
                 info.InstallId = context.Client.Configuration.GetInstallId();
-                context.Event.Data.Add(Event.KnownDataKeys.EnvironmentInfo, info);
+                context.Event.Data[Event.KnownDataKeys.EnvironmentInfo] = info;
             } catch (Exception ex) {
                 context.Log.FormattedError(typeof(EnvironmentInfoPlugin), ex, "Error adding environment information: {0}", ex.Message);
             }

Source/Shared/Plugins/Default/SimpleErrorPlugin.cs

@@ -11,7 +11,7 @@ public void Run(EventPluginContext context) {
                 return;
 
             context.Event.Type = Event.KnownTypes.Error;
-            context.Event.Data[Event.KnownDataKeys.SimpleError] = exception.ToSimpleErrorModel();
+            context.Event.Data[Event.KnownDataKeys.SimpleError] = exception.ToSimpleErrorModel(context.Log, context.Client.Configuration.DataExclusions);
         }
     }
 }

Source/Shared/Plugins/Default/SubmissionMethodPlugin.cs

@@ -7,7 +7,7 @@ public class SubmissionMethodPlugin : IEventPlugin {
         public void Run(EventPluginContext context) {
             string submissionMethod = context.ContextData.GetSubmissionMethod();
             if (!String.IsNullOrEmpty(submissionMethod))
-                context.Event.AddObject(submissionMethod, Event.KnownDataKeys.SubmissionMethod);
+                context.Event.Data[Event.KnownDataKeys.SubmissionMethod] = submissionMethod;
         }
     }
 }