Merge pull request #50 from exceptionless/duplicate-checker-fix

Expanded duplicate checking logic to all events

Author: pc9795

src/main/java/com/exceptionless/exceptionlessclient/configuration/PluginManager.java

@@ -29,7 +29,7 @@ public PluginManager() {
   private void configureDefaultPlugins() {
     addPlugin(ConfigurationDefaultsPlugin.builder().build());
     addPlugin(ErrorPlugin.builder().build());
-    addPlugin(DuplicateErrorCheckerPlugin.builder().build());
+    addPlugin(DuplicateCheckerPlugin.builder().build());
     addPlugin(EventExclusionPlugin.builder().build());
     addPlugin(ModuleInfoPlugin.builder().build());
     addPlugin(RequestInfoPlugin.builder().build());

…figured/DuplicateErrorCheckerPlugin.java …reconfigured/DuplicateCheckerPlugin.javasrc/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPlugin.java renamed to src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPlugin.java src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPlugin.java renamed to src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPlugin.java

@@ -3,18 +3,17 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.error.Error;
-import com.exceptionless.exceptionlessclient.models.error.InnerError;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import com.exceptionless.exceptionlessclient.plugins.MergedEvent;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 
-@Slf4j
-public class DuplicateErrorCheckerPlugin implements EventPluginIF {
+public class DuplicateCheckerPlugin implements EventPluginIF {
+  private static final Logger LOG = LoggerFactory.getLogger(DuplicateCheckerPlugin.class);
   private static final String MERGED_EVENTS_RESUBMISSION_TIMER_NAME =
       "merged-events-resubmission-timer";
   private static final Integer DEFAULT_PRIORITY = 1010;
@@ -28,8 +27,7 @@ public class DuplicateErrorCheckerPlugin implements EventPluginIF {
   private final Integer mergedEventsResubmissionInSecs;
 
   @Builder
-  public DuplicateErrorCheckerPlugin(
-      Integer mergedEventsResubmissionInSecs, Integer maxHashesCount) {
+  public DuplicateCheckerPlugin(Integer mergedEventsResubmissionInSecs, Integer maxHashesCount) {
     this.maxHashesCount = maxHashesCount == null ? DEFAULT_MAX_HASHES_COUNT : maxHashesCount;
     this.mergedEvents = new ArrayDeque<>();
     this.mergedEventsResubmissionTimer = new Timer(MERGED_EVENTS_RESUBMISSION_TIMER_NAME);
@@ -52,7 +50,7 @@ public void run() {
                 event.resubmit();
               }
             } catch (Exception e) {
-              log.error("Error in resubmitting merged events", e);
+              LOG.error("Error in resubmitting merged events", e);
             }
           }
         },
@@ -69,20 +67,14 @@ public int getPriority() {
   public void run(
       EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
     Event event = eventPluginContext.getEvent();
-    Optional<Error> maybeError = event.getError();
-    if (maybeError.isEmpty()) {
-      return;
-    }
-    Error error = maybeError.get();
-
-    long hash = getHashCode(error);
+    long hash = getHash(event);
     Optional<MergedEvent> maybeMergedEvent =
         mergedEvents.stream().filter(mergedEvent -> mergedEvent.getHash() == hash).findFirst();
     if (maybeMergedEvent.isPresent()) {
       MergedEvent mergedEvent = maybeMergedEvent.get();
       mergedEvent.incrementCount(event.getCount());
       mergedEvent.updateDate(event.getDate());
-      log.info(String.format("Ignoring duplicate event with hash: %s", hash));
+      LOG.info(String.format("Ignoring duplicate event with hash: %s", hash));
       eventPluginContext.getContext().setEventCancelled(true);
       return;
     }
@@ -96,7 +88,7 @@ public void run(
                 timeStampedHash.getHash() == hash
                     && timeStampedHash.getTimestamp()
                         >= (now - mergedEventsResubmissionInSecs * 1000))) {
-      log.trace(String.format("Adding event with hash :%s", hash));
+      LOG.trace(String.format("Adding event with hash :%s", hash));
       mergedEvents.add(
           MergedEvent.builder()
               .event(event)
@@ -118,13 +110,16 @@ private void addNewHashIfPossible(long hash, long now) {
     hashes.add(TimeStampedHash.builder().hash(hash).timestamp(now).build());
   }
 
-  private long getHashCode(InnerError error) {
-    long hash = 0L;
-    while (error != null) {
-      hash += Objects.hash(error.getMessage(), error.getStackTrace());
-      error = error.getInner();
-    }
-    return hash;
+  private long getHash(Event event) {
+    return Objects.hash(
+        event.getType(),
+        event.getSource(),
+        event.getDate(),
+        event.getTags(),
+        event.getMessage(),
+        event.getData(),
+        event.getGeo(),
+        event.getValue());
   }
 
   @Builder

src/test/java/com/exceptionless/exceptionlessclient/configuration/PluginManagerTest.java

@@ -24,7 +24,7 @@ public void itCanConfigureDefaultPlugins() {
         List.of(
             "ConfigurationDefaultsPlugin",
             "ErrorPlugin",
-            "DuplicateErrorCheckerPlugin",
+            "DuplicateCheckerPlugin",
             "EventExclusionPlugin",
             "ModuleInfoPlugin",
             "RequestInfoPlugin",

…red/DuplicateErrorCheckerPluginTest.java …nfigured/DuplicateCheckerPluginTest.javasrc/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPluginTest.java renamed to src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPluginTest.java src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPluginTest.java renamed to src/test/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateCheckerPluginTest.java

@@ -21,15 +21,15 @@
 import static org.mockito.Mockito.verify;
 
 @ExtendWith(MockitoExtension.class)
-public class DuplicateErrorCheckerPluginTest {
+public class DuplicateCheckerPluginTest {
   private static final String EVENT_REF_ID = "test-event";
   private static final Long EVENT_COUNT = 100L;
 
   @Mock private DefaultEventQueue eventQueue;
 
   private EventPluginContext context;
   private ConfigurationManager configurationManager;
-  private DuplicateErrorCheckerPlugin plugin;
+  private DuplicateCheckerPlugin plugin;
 
   @BeforeEach
   public void setup() {
@@ -54,10 +54,7 @@ public void setup() {
 
   @Test
   public void itCanDetectAPotentialToBeMergedEvent() throws InterruptedException {
-    plugin =
-        DuplicateErrorCheckerPlugin.builder()
-            .mergedEventsResubmissionInSecs(1)
-            .build();
+    plugin = DuplicateCheckerPlugin.builder().mergedEventsResubmissionInSecs(1).build();
     plugin.run(context, configurationManager);
     plugin.run(context, configurationManager);
     Thread.sleep(1500);
@@ -72,10 +69,7 @@ public void itCanDetectAPotentialToBeMergedEvent() throws InterruptedException {
 
   @Test
   public void itCanMergeEventsWithSameHash() throws InterruptedException {
-    plugin =
-        DuplicateErrorCheckerPlugin.builder()
-            .mergedEventsResubmissionInSecs(1)
-            .build();
+    plugin = DuplicateCheckerPlugin.builder().mergedEventsResubmissionInSecs(1).build();
     plugin.run(context, configurationManager);
     plugin.run(context, configurationManager);
     plugin.run(context, configurationManager);