Merge branch 'master' into deduplication

Author: srijken

Source/Tests/Plugins/DeduplicationBenchmarks.cs

@@ -23,7 +23,6 @@ public DeduplicationBenchmarks() {
         }
 
         [Benchmark]
-        [Fact]
         public void LargeEventsFromFiles() {
             foreach (var ev in _events) {
                 var pluginContextData = new ContextData();
@@ -37,22 +36,29 @@ public void LargeEventsFromFiles() {
             }
         }
 
+        private EventBuilder _randomEventBuilder;
+        private EventBuilder _fixedEventBuilder;
+
+        [Setup]
+        public void Setup() {
+            _randomEventBuilder = GetException(Guid.NewGuid().ToString()).ToExceptionless();
+            _fixedEventBuilder = GetException().ToExceptionless();
+        }
+
         [Benchmark]
-        [Fact]
         public void RandomExceptions() {
-            var builder = GetException(Guid.NewGuid().ToString()).ToExceptionless();
-            var context = new EventPluginContext(_client, builder.Target, builder.PluginContextData);
+            var context = new EventPluginContext(_client, _randomEventBuilder.Target, _randomEventBuilder.PluginContextData);
 
             _errorPlugin.Run(context);
             _duplicateCheckerPlugin.Run(context);
         }
 
+
+
         [Benchmark]
-        [Fact]
         public void IdenticalExceptions()
         {
-            var builder = GetException().ToExceptionless();
-            var context = new EventPluginContext(_client, builder.Target, builder.PluginContextData);
+            var context = new EventPluginContext(_client, _fixedEventBuilder.Target, _fixedEventBuilder.PluginContextData);
 
             _errorPlugin.Run(context);
             _duplicateCheckerPlugin.Run(context);

Source/Tests/Utility/ErrorDataReader.cs

@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Exceptionless.Extensions;
 using Exceptionless.Models;
+using Exceptionless.Models.Data;
 using Exceptionless.Serializer;
 
 namespace Exceptionless.Tests.Utility
@@ -21,7 +22,9 @@ static Event GetEvent(string fileName)
         {
             var json = File.ReadAllText(fileName);
             var serializer = GetSerializer();
-            return serializer.Deserialize<Event>(json);
+            var ev = serializer.Deserialize<Event>(json);
+            ev.Data[Event.KnownDataKeys.Error] = ev.Data.GetValue<Error>(Event.KnownDataKeys.Error);
+            return ev;
         }
         public static IEnumerable<Event> GetEvents() {
             return Directory.EnumerateFiles(@"..\..\ErrorData", "*.json").Select(GetEvent);