Expanded duplicate checking logic to all events

Author: pc9795

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

@@ -30,7 +30,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,8 +3,6 @@
 import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
 import com.exceptionless.exceptionlessclient.models.Event;
 import com.exceptionless.exceptionlessclient.models.EventPluginContext;
-import com.exceptionless.exceptionlessclient.models.services.error.Error;
-import com.exceptionless.exceptionlessclient.models.services.error.InnerError;
 import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
 import com.exceptionless.exceptionlessclient.plugins.MergedEvent;
 import lombok.Builder;
@@ -14,8 +12,8 @@
 
 import java.util.*;
 
-public class DuplicateErrorCheckerPlugin implements EventPluginIF {
-  private static final Logger LOG = LoggerFactory.getLogger(DuplicateErrorCheckerPlugin.class);
+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;
@@ -29,7 +27,7 @@ public class DuplicateErrorCheckerPlugin implements EventPluginIF {
   private final Integer mergedEventsResubmissionInSecs;
 
   @Builder
-  public DuplicateErrorCheckerPlugin(
+  public DuplicateCheckerPlugin(
       Integer mergedEventsResubmissionInSecs, Integer maxHashesCount) {
     this.maxHashesCount = maxHashesCount == null ? DEFAULT_MAX_HASHES_COUNT : maxHashesCount;
     this.mergedEvents = new ArrayDeque<>();
@@ -70,13 +68,7 @@ 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()) {
@@ -119,13 +111,14 @@ 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());
   }
 
   @Builder

…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

@@ -7,7 +7,6 @@
 import com.exceptionless.exceptionlessclient.models.enums.EventPropertyKey;
 import com.exceptionless.exceptionlessclient.models.services.error.Error;
 import com.exceptionless.exceptionlessclient.models.services.error.StackFrame;
-import com.exceptionless.exceptionlessclient.plugins.preconfigured.DuplicateErrorCheckerPlugin;
 import com.exceptionless.exceptionlessclient.queue.DefaultEventQueue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -22,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() {
@@ -56,7 +55,7 @@ public void setup() {
   @Test
   public void itCanDetectAPotentialToBeMergedEvent() throws InterruptedException {
     plugin =
-        DuplicateErrorCheckerPlugin.builder()
+        DuplicateCheckerPlugin.builder()
             .mergedEventsResubmissionInSecs(1)
             .build();
     plugin.run(context, configurationManager);
@@ -74,7 +73,7 @@ public void itCanDetectAPotentialToBeMergedEvent() throws InterruptedException {
   @Test
   public void itCanMergeEventsWithSameHash() throws InterruptedException {
     plugin =
-        DuplicateErrorCheckerPlugin.builder()
+        DuplicateCheckerPlugin.builder()
             .mergedEventsResubmissionInSecs(1)
             .build();
     plugin.run(context, configurationManager);