Changed the duplicate checker to be a plugin!

niemyjski · niemyjski · commit fc9b3abdfa76 · 2015-04-02T12:07:12.000-05:00
diff --git a/Source/Extras/Plugins/ErrorPlugin.cs b/Source/Extras/Plugins/ErrorPlugin.cs
@@ -4,7 +4,7 @@
 using Exceptionless.Models;
 
 namespace Exceptionless.Plugins {
-    [Priority(40)]
+    [Priority(30)]
     public class ErrorPlugin : IEventPlugin {
         private readonly IExceptionlessLog _log;
 
diff --git a/Source/Samples/SampleConsole/Program.cs b/Source/Samples/SampleConsole/Program.cs
@@ -42,6 +42,8 @@ private static void Main() {
             Console.CursorVisible = false;
             StartDisplayingLogMessages();
 
+            ExceptionlessClient.Default.Configuration.UseTraceLogEntriesPlugin();
+            ExceptionlessClient.Default.Configuration.AddPlugin<SystemUptimePlugin>();
             ExceptionlessClient.Default.Configuration.UseFolderStorage("store");
             ExceptionlessClient.Default.Configuration.UseLogger(_log);
             //ExceptionlessClient.Default.Configuration.SubmissionBatchSize = 1;
@@ -62,8 +64,6 @@ private static void Main() {
             if (false)
                 SampleApiUsages();
 
-            ExceptionlessClient.Default.Configuration.UseTraceLogEntriesPlugin();
-            ExceptionlessClient.Default.Configuration.AddPlugin<SystemUptimePlugin>();
 
             ExceptionlessClient.Default.Configuration.AddPlugin(ctx => ctx.Event.Data[RandomData.GetWord()] = RandomData.GetWord());
             ExceptionlessClient.Default.Configuration.AddPlugin(ctx => ctx.Event.Data[RandomData.GetWord()] = RandomData.GetWord());
diff --git a/Source/Shared/Dependency/DependencyResolver.cs b/Source/Shared/Dependency/DependencyResolver.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Exceptionless.Duplicates;
 using Exceptionless.Logging;
 using Exceptionless.Queue;
 using Exceptionless.Serializer;
@@ -50,9 +49,6 @@ public static void RegisterDefaultServices(IDependencyResolver resolver) {
             var lastClientIdManager = new Lazy<ILastReferenceIdManager>(() => resolver.Resolve<DefaultLastReferenceIdManager>());
             resolver.Register(typeof(ILastReferenceIdManager), () => lastClientIdManager.Value);
 
-            var duplicateChecker = new Lazy<IDuplicateChecker>(() => resolver.Resolve<DefaultDuplicateChecker>());
-            resolver.Register(typeof(IDuplicateChecker), () => duplicateChecker.Value);
-
             var persistedClientData = new Lazy<PersistedDictionary>(() => new PersistedDictionary("client-data.json", resolver.Resolve<IObjectStorage>(), resolver.Resolve<IJsonSerializer>()));
             resolver.Register(typeof(PersistedDictionary), () => persistedClientData.Value);
         }
diff --git a/Source/Shared/Dependency/DependencyResolverExtensions.cs b/Source/Shared/Dependency/DependencyResolverExtensions.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Exceptionless.Duplicates;
 using Exceptionless.Logging;
 using Exceptionless.Queue;
 using Exceptionless.Serializer;
@@ -82,9 +81,5 @@ public static IEnvironmentInfoCollector GetEnvironmentInfoCollector(this IDepend
         public static ILastReferenceIdManager GetLastReferenceIdManager(this IDependencyResolver resolver) {
             return resolver.Resolve<ILastReferenceIdManager>() ?? resolver.Resolve<DefaultLastReferenceIdManager>();
         }
-
-        public static IDuplicateChecker GetDuplicateChecker(this IDependencyResolver resolver) {
-            return resolver.Resolve<IDuplicateChecker>() ?? resolver.Resolve<DefaultDuplicateChecker>();
-        }
     }
 }
diff --git a/Source/Shared/Duplicates/IDuplicateChecker.cs b/Source/Shared/Duplicates/IDuplicateChecker.cs
diff --git a/Source/Shared/Duplicates/NoDuplicateChecker.cs b/Source/Shared/Duplicates/NoDuplicateChecker.cs
diff --git a/Source/Shared/Exceptionless.Portable.csproj b/Source/Shared/Exceptionless.Portable.csproj
@@ -48,9 +48,7 @@
     <Compile Include="Dependency\DependencyResolverExtensions.cs" />
     <Compile Include="Dependency\IDependencyResolver.cs" />
     <Compile Include="Dependency\TinyIoC.cs" />
-    <Compile Include="Duplicates\DefaultDuplicateChecker.cs" />
-    <Compile Include="Duplicates\IDuplicateChecker.cs" />
-    <Compile Include="Duplicates\NoDuplicateChecker.cs" />
+    <Compile Include="Plugins\Default\DuplicateCheckerPlugin.cs" />
     <Compile Include="Plugins\ContextData.cs" />
     <Compile Include="Plugins\Default\ActionPlugin.cs" />
     <Compile Include="Plugins\Default\ConfigurationDefaultsPlugin.cs" />
diff --git a/Source/Shared/ExceptionlessClient.cs b/Source/Shared/ExceptionlessClient.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Threading.Tasks;
 using Exceptionless.Dependency;
-using Exceptionless.Duplicates;
 using Exceptionless.Plugins;
 using Exceptionless.Logging;
 using Exceptionless.Models;
@@ -15,7 +14,6 @@ public class ExceptionlessClient : IDisposable {
         private readonly Lazy<IEventQueue> _queue;
         private readonly Lazy<ISubmissionClient> _submissionClient;
         private readonly Lazy<ILastReferenceIdManager> _lastReferenceIdManager;
-        private readonly Lazy<IDuplicateChecker> _duplicateChecker;
 
         public ExceptionlessClient() : this(new ExceptionlessConfiguration(DependencyResolver.CreateDefault())) { }
 
@@ -43,7 +41,6 @@ public ExceptionlessClient(ExceptionlessConfiguration configuration) {
 
             _submissionClient = new Lazy<ISubmissionClient>(() => Configuration.Resolver.GetSubmissionClient());
             _lastReferenceIdManager = new Lazy<ILastReferenceIdManager>(() => Configuration.Resolver.GetLastReferenceIdManager());
-            _duplicateChecker = new Lazy<IDuplicateChecker>(() => Configuration.Resolver.GetDuplicateChecker());
         }
 
         public ExceptionlessConfiguration Configuration { get; private set; }
@@ -144,9 +141,6 @@ public void SubmitEvent(Event ev, ContextData pluginContextData = null) {
             if (context.Cancel)
                 return;
 
-            if (_duplicateChecker.Value != null && _duplicateChecker.Value.IsDuplicate(ev))
-                return;
-
             // ensure all required data
             if (String.IsNullOrEmpty(ev.Type))
                 ev.Type = Event.KnownTypes.Log;
diff --git a/Source/Shared/Plugins/Default/ActionPlugin.cs b/Source/Shared/Plugins/Default/ActionPlugin.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using Exceptionless.Dependency;
 using Exceptionless.Logging;
 
 namespace Exceptionless.Plugins.Default {
@@ -14,7 +13,7 @@ public void Run(EventPluginContext context) {
             try {
                 _pluginAction(context);
             } catch (Exception ex) {
-                context.Resolver.GetLog().FormattedError(typeof(ActionPlugin), ex, "An error occurred while running an custom plugin: {0}", ex.Message);
+                context.Log.FormattedError(typeof(ActionPlugin), ex, "An error occurred while running an custom plugin: {0}", ex.Message);
             }
         }
     }
diff --git a/Source/Shared/Plugins/Default/DuplicateCheckerPlugin.cs b/Source/Shared/Plugins/Default/DuplicateCheckerPlugin.cs
@@ -2,32 +2,28 @@
 using System.Collections.Concurrent;
 using System.Linq;
 using Exceptionless.Logging;
-using Exceptionless.Models;
 using Exceptionless.Models.Data;
 
-namespace Exceptionless.Duplicates {
-    public class DefaultDuplicateChecker : IDuplicateChecker {
+namespace Exceptionless.Plugins.Default {
+    [Priority(40)]
+    public class DuplicateCheckerPlugin : IEventPlugin {
         private readonly ConcurrentQueue<Tuple<int, DateTime>> _recentlyProcessedErrors = new ConcurrentQueue<Tuple<int, DateTime>>();
-        private readonly IExceptionlessLog _log;
 
-        public DefaultDuplicateChecker(IExceptionlessLog log) {
-            _log = log;
-        }
-
-        public bool IsDuplicate(Event ev) {
-            if (!ev.IsError())
-                return false;
+        public void Run(EventPluginContext context) {
+            if (!context.Event.IsError())
+                return;
 
-            InnerError current = ev.GetError();
+            InnerError current = context.Event.GetError();
             DateTime repeatWindow = DateTime.Now.AddSeconds(-2);
 
             while (current != null) {
                 int hashCode = current.GetHashCode();
 
                 // make sure that we don't process the same error multiple times within 2 seconds.
                 if (_recentlyProcessedErrors.Any(s => s.Item1 == hashCode && s.Item2 >= repeatWindow)) {
-                    _log.FormattedInfo(typeof(ExceptionlessClient), "Ignoring duplicate error event: hash={0}", hashCode);
-                    return true;
+                    context.Log.FormattedInfo(typeof(ExceptionlessClient), "Ignoring duplicate error event: hash={0}", hashCode);
+                    context.Cancel = true;
+                    return;
                 }
 
                 // add this exception to our list of recent errors that we have processed.
@@ -40,8 +36,6 @@ public bool IsDuplicate(Event ev) {
 
                 current = current.Inner;
             }
-
-            return false;
         }
     }
-}
+}
diff --git a/Source/Shared/Plugins/Default/EnvironmentInfoPlugin.cs b/Source/Shared/Plugins/Default/EnvironmentInfoPlugin.cs
@@ -20,7 +20,7 @@ public void Run(EventPluginContext context) {
                 info.InstallId = context.Client.Configuration.GetInstallId();
                 context.Event.Data.Add(Event.KnownDataKeys.EnvironmentInfo, info);
             } catch (Exception ex) {
-                context.Resolver.GetLog().FormattedError(typeof(EnvironmentInfoPlugin), ex, "Error adding environment information: {0}", ex.Message);
+                context.Log.FormattedError(typeof(EnvironmentInfoPlugin), ex, "Error adding environment information: {0}", ex.Message);
             }
         }
     }
diff --git a/Source/Shared/Plugins/Default/SimpleErrorPlugin.cs b/Source/Shared/Plugins/Default/SimpleErrorPlugin.cs
@@ -3,7 +3,7 @@
 using Exceptionless.Models;
 
 namespace Exceptionless.Plugins.Default {
-    [Priority(40)]
+    [Priority(30)]
     public class SimpleErrorPlugin : IEventPlugin {
         public void Run(EventPluginContext context) {
             var exception = context.ContextData.GetException();
diff --git a/Source/Shared/Plugins/Default/SubmissionMethodPlugin.cs b/Source/Shared/Plugins/Default/SubmissionMethodPlugin.cs
@@ -2,7 +2,7 @@
 using Exceptionless.Models;
 
 namespace Exceptionless.Plugins.Default {
-    [Priority(30)]
+    [Priority(100)]
     public class SubmissionMethodPlugin : IEventPlugin {
         public void Run(EventPluginContext context) {
             string submissionMethod = context.ContextData.GetSubmissionMethod();
diff --git a/Source/Shared/Plugins/EventPluginManager.cs b/Source/Shared/Plugins/EventPluginManager.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Linq;
-using Exceptionless.Dependency;
 using Exceptionless.Plugins.Default;
 using Exceptionless.Logging;
 
@@ -10,17 +9,16 @@ public static class EventPluginManager {
         /// Called when the event object is created and can be used to add information to the event.
         /// </summary>
         /// <param name="context">Context information.</param>
-        /// <param name="ev">Event that was created.</param>
         public static void Run(EventPluginContext context) {
             foreach (IEventPlugin plugin in context.Client.Configuration.Plugins.Select(e => e.Plugin).ToList()) {
                 try {
                     plugin.Run(context);
                     if (context.Cancel) {
-                        ExceptionlessLogExtensions.FormattedInfo(context.Resolver.GetLog(), plugin.GetType(), "Event submission cancelled by plugin: id={0} type={1}", context.Event.ReferenceId, context.Event.Type);
+                        context.Log.FormattedInfo(plugin.GetType(), "Event submission cancelled by plugin: id={0} type={1}", context.Event.ReferenceId, context.Event.Type);
                         return;
                     }
                 } catch (Exception ex) {
-                    context.Resolver.GetLog().FormattedError(typeof(EventPluginManager), ex, "An error occurred while running {0}.Run(): {1}", plugin.GetType().FullName, ex.Message);
+                    context.Log.FormattedError(typeof(EventPluginManager), ex, "An error occurred while running {0}.Run(): {1}", plugin.GetType().FullName, ex.Message);
                 }
             }
         }
@@ -29,6 +27,7 @@ public static void AddDefaultPlugins(ExceptionlessConfiguration config) {
             config.AddPlugin<ConfigurationDefaultsPlugin>();
             config.AddPlugin<EnvironmentInfoPlugin>();
             config.AddPlugin<SimpleErrorPlugin>();
+            config.AddPlugin<DuplicateCheckerPlugin>();
             config.AddPlugin<SubmissionMethodPlugin>();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using Exceptionless.Duplicates;`
`3`	`2`	`using Exceptionless.Logging;`
`4`	`3`	`using Exceptionless.Queue;`
`5`	`4`	`using Exceptionless.Serializer;`
`@@ -82,9 +81,5 @@ public static IEnvironmentInfoCollector GetEnvironmentInfoCollector(this IDepend`
`82`	`81`	`public static ILastReferenceIdManager GetLastReferenceIdManager(this IDependencyResolver resolver) {`
`83`	`82`	`return resolver.Resolve<ILastReferenceIdManager>() ?? resolver.Resolve<DefaultLastReferenceIdManager>();`
`84`	`83`	`}`
`85`		`-`
`86`		`- public static IDuplicateChecker GetDuplicateChecker(this IDependencyResolver resolver) {`
`87`		`- return resolver.Resolve<IDuplicateChecker>() ?? resolver.Resolve<DefaultDuplicateChecker>();`
`88`		`- }`
`89`	`84`	`}`
`90`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using Exceptionless.Dependency;`
`3`	`2`	`using Exceptionless.Logging;`
`4`	`3`
`5`	`4`	`namespace Exceptionless.Plugins.Default {`
`@@ -14,7 +13,7 @@ public void Run(EventPluginContext context) {`
`14`	`13`	`try {`
`15`	`14`	`_pluginAction(context);`
`16`	`15`	`} catch (Exception ex) {`
`17`		`- context.Resolver.GetLog().FormattedError(typeof(ActionPlugin), ex, "An error occurred while running an custom plugin: {0}", ex.Message);`
	`16`	`+ context.Log.FormattedError(typeof(ActionPlugin), ex, "An error occurred while running an custom plugin: {0}", ex.Message);`
`18`	`17`	`}`
`19`	`18`	`}`
`20`	`19`	`}`