Merge pull request #114 from exceptionless/bug/exclusions

Wpf Error handler fixes and Null Reference checks

Author: niemyjski

Exceptionless.Net.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{728C18BC-4085-4492-B0B2-8211CA209A50}"
 	ProjectSection(SolutionItems) = preProject

README.md

@@ -16,7 +16,7 @@ All of our [.NET clients can be installed](https://www.nuget.org/profiles/except
 
 **This section is for development purposes only! If you are trying to use the Exceptionless .NET libraries, please get them from NuGet.**
 
-1. You will need to have [Visual Studio 2015](http://www.visualstudio.com/products/visual-studio-community-vs) installed.
+1. You will need to have [Visual Studio 2015](http://www.visualstudio.com/products/visual-studio-community-vs) and [.NET Core SDK with VS Tooling](https://www.microsoft.com/net/core) installed.
 2. Open the `Exceptionless.Net.sln` Visual Studio solution file.
 3. Select `Exceptionless.SampleConsole` as the startup project.
 4. Run the project by pressing `F5` to start the console.

src/Exceptionless.Tests/Plugins/PluginTests.cs

@@ -289,7 +289,28 @@ public void HandleAggregateExceptionsPlugin_SingleInnerException() {
             plugin.Run(context);
             Assert.True(context.Cancel);
         }
+        
+        [Fact (Skip = "There is a bug in the .NET Framework where non thrown exceptions with non custom stack traces cannot be computed #116")]
+        public void CanHandleExceptionWithOverriddenStackTrace() {
+            var client = CreateClient();
+            var plugin = new ErrorPlugin();
+            
+            var context = new EventPluginContext(client, new Event());
+            context.ContextData.SetException(GetExceptionWithOverriddenStackTrace());
+            plugin.Run(context);
+            Assert.False(context.Cancel);
+
+            var error = context.Event.GetError();
+            Assert.True(error.StackTrace.Count > 0);
+            
+            context.ContextData.SetException(new ExceptionWithOverriddenStackTrace("test"));
+            plugin.Run(context);
+            Assert.False(context.Cancel);
 
+            error = context.Event.GetError();
+            Assert.True(error.StackTrace.Count > 0);
+        }
+        
         [Fact]
         public void HandleAggregateExceptionsPlugin_MultipleInnerException() {
             var submissionClient = new InMemorySubmissionClient();
@@ -703,6 +724,30 @@ public void VerifyDeduplication() {
             Thread.Sleep(50);
             Assert.Equal(9, mergedContext.Event.Count.GetValueOrDefault());
         }
+        
+        [Fact]
+        public void VerifyDeduplicationPluginWillCallSubmittingHandler() {
+            var client = CreateClient();
+            foreach (var plugin in client.Configuration.Plugins)
+                client.Configuration.RemovePlugin(plugin.Key);
+            client.Configuration.AddPlugin(new DuplicateCheckerPlugin(TimeSpan.FromMilliseconds(75)));
+
+            int submittingEventHandlerCalls = 0;
+            client.SubmittingEvent += (sender, args) => {
+                Interlocked.Increment(ref submittingEventHandlerCalls);
+            };
+
+            for (int index = 0; index < 3; index++) {
+                client.SubmitLog("test");
+                if (index > 0)
+                    continue;
+
+                Assert.Equal(1, submittingEventHandlerCalls);
+            }
+
+            Thread.Sleep(100);
+            Assert.Equal(2, submittingEventHandlerCalls);
+        }
 
         [Fact]
         public void VerifyDeduplicationMultithreaded() {
@@ -758,6 +803,14 @@ public void VerifyDeduplicationFromFiles() {
             }
         }
 
+        private ExceptionWithOverriddenStackTrace GetExceptionWithOverriddenStackTrace(string message = "Test") {
+            try {
+                throw new ExceptionWithOverriddenStackTrace(message);
+            } catch (ExceptionWithOverriddenStackTrace ex) {
+                return ex;
+            }
+        }
+
         private Exception GetException(string message = "Test") {
             try {
                 throw new Exception(message);
@@ -816,5 +869,12 @@ public MyApplicationException(string message) : base(message) {
 
             public override IDictionary Data { get { return SetsDataProperty; }  }
         }
+
+        [Serializable]
+        public class ExceptionWithOverriddenStackTrace : Exception {
+            private readonly string _stackTrace = Environment.StackTrace;
+            public ExceptionWithOverriddenStackTrace(string message) : base(message) { }
+            public override string StackTrace => _stackTrace;
+        }
     }
 }

src/Exceptionless/ExceptionlessClient.cs

@@ -233,7 +233,7 @@ public string GetLastReferenceId() {
         /// </summary>
         public event EventHandler<EventSubmittingEventArgs> SubmittingEvent;
 
-        private bool OnSubmittingEvent(Event ev, ContextData pluginContextData) {
+        protected internal bool OnSubmittingEvent(Event ev, ContextData pluginContextData) {
             var args = new EventSubmittingEventArgs(this, ev, pluginContextData);
             OnSubmittingEvent(args);
             return !args.Cancel;
@@ -243,7 +243,7 @@ private bool OnSubmittingEvent(Event ev, ContextData pluginContextData) {
         /// Raises the <see cref="SubmittingEvent" /> event.
         /// </summary>
         /// <param name="e">The <see cref="EventSubmittingEventArgs" /> instance containing the event data.</param>
-        protected void OnSubmittingEvent(EventSubmittingEventArgs e) {
+        protected internal void OnSubmittingEvent(EventSubmittingEventArgs e) {
             if (SubmittingEvent == null)
                 return;
 
@@ -268,7 +268,7 @@ protected void OnSubmittingEvent(EventSubmittingEventArgs e) {
         /// Raises the <see cref="SubmittedEvent" /> event.
         /// </summary>
         /// <param name="e">The <see cref="EventSubmittedEventArgs" /> instance containing the event data.</param>
-        protected void OnSubmittedEvent(EventSubmittedEventArgs e) {
+        protected internal void OnSubmittedEvent(EventSubmittedEventArgs e) {
             if (SubmittedEvent == null)
                 return;
 

src/Exceptionless/Extensions/CollectionEqualityExtensions.cs

@@ -75,7 +75,7 @@ public static int GetCollectionHashCode<TValue>(this IDictionary<string, TValue>
                 var item = source[key];
                 unchecked {
                     var kvpHash = key.GetHashCode();
-                    kvpHash = (kvpHash * 397) ^ item.GetHashCode();
+                    kvpHash = (kvpHash * 397) ^ (item == null ? 0 : item.GetHashCode());
                     keyValuePairHashes.Add(kvpHash);
                 }
             }