Merge remote-tracking branch 'refs/remotes/origin/master' into deduplication

Author: niemyjski

Source/Shared/Models/Client/Data/Method.cs

@@ -39,7 +39,7 @@ public override int GetHashCode() {
                 hashCode = (hashCode * 397) ^ (DeclaringNamespace == null ? 0 : DeclaringNamespace.GetHashCode());
                 hashCode = (hashCode * 397) ^ (DeclaringType == null ? 0 : DeclaringType.GetHashCode());
                 hashCode = (hashCode * 397) ^ (Name == null ? 0 : Name.GetHashCode());
-                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode(new[] { "ILOffset" }));
+                hashCode = (hashCode * 397) ^ (Data == null ? 0 : Data.GetCollectionHashCode(new[] { "ILOffset", "NativeOffset" }));
                 hashCode = (hashCode * 397) ^ (GenericArguments == null ? 0 : GenericArguments.GetCollectionHashCode());
                 hashCode = (hashCode * 397) ^ (Parameters == null ? 0 : Parameters.GetCollectionHashCode());
                 return hashCode;

Source/Shared/Models/Client/Data/StackFrame.cs

@@ -7,7 +7,7 @@ public class StackFrame : Method {
         public int Column { get; set; }
 
         protected bool Equals(StackFrame other) {
-            return base.Equals(other) && string.Equals(FileName, other.FileName) && LineNumber == other.LineNumber && Column == other.Column;
+            return base.Equals(other) && string.Equals(FileName, other.FileName);
         }
 
         public override bool Equals(object obj) {
@@ -24,8 +24,6 @@ public override int GetHashCode() {
             unchecked {
                 int hashCode = base.GetHashCode();
                 hashCode = (hashCode * 397) ^ (FileName == null ? 0 : FileName.GetHashCode());
-                hashCode = (hashCode * 397) ^ LineNumber;
-                hashCode = (hashCode * 397) ^ Column;
                 return hashCode;
             }
         }

Source/Shared/Plugins/Default/1010_DuplicateCheckerPlugin.cs

@@ -1,15 +1,15 @@
 using System;
-using System.Collections.Concurrent;
-using System.Linq;
 using System.Threading;
 using Exceptionless.Logging;
 using Exceptionless.Dependency;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Exceptionless.Plugins.Default {
     [Priority(1010)]
     public class DuplicateCheckerPlugin : IEventPlugin, IDisposable {
-        private readonly ConcurrentQueue<Tuple<int, DateTimeOffset>> _processed = new ConcurrentQueue<Tuple<int, DateTimeOffset>>();
-        private readonly ConcurrentQueue<MergedEvent> _mergedEvents = new ConcurrentQueue<MergedEvent>();
+        private readonly Queue<Tuple<int, DateTimeOffset>> _processed = new Queue<Tuple<int, DateTimeOffset>>();
+        private readonly Queue<MergedEvent> _mergedEvents = new Queue<MergedEvent>();
         private readonly object _lock = new object();
         private readonly TimeSpan _interval;
         private Timer _timer;
@@ -55,10 +55,9 @@ public void Run(EventPluginContext context) {
 
                 context.Log.FormattedInfo(typeof(DuplicateCheckerPlugin), String.Concat("Enqueueing event with hash:", hashCode, " to cache."));
                 _processed.Enqueue(Tuple.Create(hashCode, DateTimeOffset.UtcNow));
-
-                Tuple<int, DateTimeOffset> temp;
+                
                 while (_processed.Count > 50)
-                    _processed.TryDequeue(out temp);
+                    _processed.Dequeue();
             }
         }
 
@@ -68,9 +67,8 @@ private void OnTimer(object state) {
 
         private void EnqueueMergedEvents() {
             lock (_lock) {
-                MergedEvent mergedEvent;
-                while (_mergedEvents.TryDequeue(out mergedEvent))
-                    mergedEvent.Enqueue();
+                while (_mergedEvents.Count > 0)
+                    _mergedEvents.Dequeue().Resubmit();
             }
         }
 
@@ -100,7 +98,7 @@ public void IncrementCount(int value) {
                 Interlocked.Add(ref _count, value);
             }
 
-            public void Enqueue() {
+            public void Resubmit() {
                 _context.Event.Count = _count;
                 _context.Resolver.GetEventQueue().Enqueue(_context.Event);
             }

appveyor.yml

@@ -1,6 +1,7 @@
 version: 3.4.{build}
 clone_depth: 2
 configuration: Release
+os: Previous Visual Studio 2015
 
 #environment:
 #  VERSION_SUFFIX: -preview