generated default reference id for events

Author: pc9795

src/main/java/com/prashantchaubey/exceptionlessclient/ExceptionlessClient.java

@@ -15,7 +15,6 @@
 import java.time.LocalDate;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.function.Consumer;
 
 public class ExceptionlessClient {
   private static final int UPDATE_SETTINGS_TIMER_INITIAL_DELAY = 5000;
@@ -62,49 +61,47 @@ public static ExceptionlessClient from(String apiKey, String serverUrl) {
         .build();
   }
 
-  public void submitException(Exception exception, Consumer<EventPluginContext> handler) {
+  public void submitException(Exception exception) {
     Event event = createException().build();
     PluginContext pluginContext = PluginContext.builder().exception(exception).build();
-    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build(), handler);
+    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
   }
 
   private Event.EventBuilder createException() {
     return createEvent().type(EventType.ERROR.value());
   }
 
-  public void submitUnhandledException(
-      Exception exception, String submissionMethod, Consumer<EventPluginContext> handler) {
+  public void submitUnhandledException(Exception exception, String submissionMethod) {
     Event event = createException().build();
     PluginContext pluginContext =
         PluginContext.builder()
             .exception(exception)
             .unhandledError(true)
             .submissionMethod(submissionMethod)
             .build();
-    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build(), handler);
+    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
   }
 
-  public void submitFeatureUsage(String feature, Consumer<EventPluginContext> handler) {
+  public void submitFeatureUsage(String feature) {
     Event event = createFeatureUsage(feature).build();
-    submitEvent(EventPluginContext.from(event), handler);
+    submitEvent(EventPluginContext.from(event));
   }
 
   private Event.EventBuilder createFeatureUsage(String feature) {
     return createEvent().type(EventType.USAGE.value()).source(feature);
   }
 
-  public void submitLog(String message, Consumer<EventPluginContext> handler) {
-    submitLog(message, null, null, handler);
+  public void submitLog(String message) {
+    submitLog(message, null, null);
   }
 
-  public void submitLog(String message, String source, Consumer<EventPluginContext> handler) {
-    submitLog(message, source, null, handler);
+  public void submitLog(String message, String source) {
+    submitLog(message, source, null);
   }
 
-  public void submitLog(
-      String message, String source, String level, Consumer<EventPluginContext> handler) {
+  public void submitLog(String message, String source, String level) {
     Event event = createLog(message, source, level).build();
-    submitEvent(EventPluginContext.from(event), handler);
+    submitEvent(EventPluginContext.from(event));
   }
 
   private Event.EventBuilder createLog(String message, String source, String level) {
@@ -122,18 +119,18 @@ private Event.EventBuilder createLog(String message, String source, String level
     return builder.property(EventPropertyKey.LOG_LEVEL.value(), level);
   }
 
-  public void submitNotFound(String resource, Consumer<EventPluginContext> handler) {
+  public void submitNotFound(String resource) {
     Event event = createNotFound(resource).build();
-    submitEvent(EventPluginContext.from(event), handler);
+    submitEvent(EventPluginContext.from(event));
   }
 
   private Event.EventBuilder createNotFound(String resource) {
     return createEvent().type(EventType.NOT_FOUND.value()).source(resource);
   }
 
-  public void submitSessionStart(Consumer<EventPluginContext> handler) {
+  public void submitSessionStart() {
     Event event = createSessionStart().build();
-    submitEvent(EventPluginContext.from(event), handler);
+    submitEvent(EventPluginContext.from(event));
   }
 
   private Event.EventBuilder createSessionStart() {
@@ -146,23 +143,9 @@ private Event.EventBuilder createEvent() {
         .date(LocalDate.now());
   }
 
-  //todo this should be async
-  private void submitEvent(
-      EventPluginContext eventPluginContext, Consumer<EventPluginContext> handler) {
-    eventPluginRunner.run(
-        eventPluginContext,
-        evc -> {
-          if (evc.getContext().isEventCancelled()) {
-            return;
-          }
-          configurationManager.getQueue().enqueue(evc.getEvent());
-          if (evc.getEvent().getReferenceId() != null) {
-            configurationManager
-                .getLastReferenceIdManager()
-                .setLast(evc.getEvent().getReferenceId());
-          }
-          handler.accept(evc);
-        });
+  // todo this should be async
+  private void submitEvent(EventPluginContext eventPluginContext) {
+    eventPluginRunner.run(eventPluginContext);
   }
 
   public void submitSessionEnd(String sessionOrUserId) {

src/main/java/com/prashantchaubey/exceptionlessclient/configuration/ConfigurationManager.java

@@ -10,7 +10,6 @@
 import com.prashantchaubey.exceptionlessclient.models.enums.EventPropertyKey;
 import com.prashantchaubey.exceptionlessclient.plugins.EventPluginIF;
 import com.prashantchaubey.exceptionlessclient.plugins.preconfigured.HeartbeatPlugin;
-import com.prashantchaubey.exceptionlessclient.plugins.preconfigured.ReferenceIdPlugin;
 import com.prashantchaubey.exceptionlessclient.queue.DefaultEventQueue;
 import com.prashantchaubey.exceptionlessclient.queue.EventQueueIF;
 import com.prashantchaubey.exceptionlessclient.services.*;
@@ -214,10 +213,6 @@ public void useSessions(int heartbeatInterval) {
     addPlugin(HeartbeatPlugin.builder().heartbeatInterval(heartbeatInterval).build());
   }
 
-  public void useReferenceIds() {
-    addPlugin(ReferenceIdPlugin.builder().build());
-  }
-
   public void onChanged(Consumer<ConfigurationManager> onChangedHandler) {
     onChangedHandlers.add(onChangedHandler);
   }

src/main/java/com/prashantchaubey/exceptionlessclient/models/Event.java

@@ -53,7 +53,10 @@ public Event(
     this.message = message;
     this.geo = geo;
     this.value = value;
-    this.referenceId = referenceId;
+    this.referenceId =
+        referenceId == null
+            ? String.format("%s-%s", Thread.currentThread().getId(), UUID.randomUUID())
+            : referenceId;
     this.count = count;
     initData(data == null ? new HashMap<>() : data, dataExclusions);
   }

src/main/java/com/prashantchaubey/exceptionlessclient/plugins/EventPluginRunner.java

@@ -4,9 +4,6 @@
 import com.prashantchaubey.exceptionlessclient.models.EventPluginContext;
 import lombok.Builder;
 
-import java.util.List;
-import java.util.function.Consumer;
-
 public class EventPluginRunner {
   private ConfigurationManager configurationManager;
 
@@ -15,48 +12,43 @@ public EventPluginRunner(ConfigurationManager configurationManager) {
     this.configurationManager = configurationManager;
   }
 
-  public void run(EventPluginContext eventPluginContext, Consumer<EventPluginContext> handler) {
-    List<EventPluginIF> plugins = configurationManager.getPlugins();
-    // Handler will run first
-    plugins.add(
-        0,
-        new EventPluginIF() {
-          @Override
-          public int getPriority() {
-            return Integer.MAX_VALUE;
-          }
-
-          @Override
-          public String getName() {
-            return "handler";
-          }
-
-          @Override
-          public void run(
-              EventPluginContext eventPluginContext, ConfigurationManager configurationManager) {
-            handler.accept(eventPluginContext);
-          }
-        });
-
-    plugins.forEach(
-        plugin -> {
-          if (eventPluginContext.getContext().isEventCancelled()) {
-            return;
-          }
-
-          try {
-            plugin.run(eventPluginContext, configurationManager);
-
-          } catch (Exception e) {
-            configurationManager
-                .getLog()
-                .error(
-                    String.format(
-                        "Error running plugin: %s: %s. Discarding event",
-                        plugin.getName(), e.getMessage()),
-                    e);
-            eventPluginContext.getContext().setEventCancelled(true);
-          }
-        });
+  public void run(EventPluginContext eventPluginContext) {
+    configurationManager
+        .getPlugins()
+        .forEach(
+            plugin -> {
+              if (eventPluginContext.getContext().isEventCancelled()) {
+                return;
+              }
+
+              try {
+                plugin.run(eventPluginContext, configurationManager);
+
+              } catch (Exception e) {
+                configurationManager
+                    .getLog()
+                    .error(
+                        String.format(
+                            "Error running plugin: %s: %s. Discarding event",
+                            plugin.getName(), e.getMessage()),
+                        e);
+                eventPluginContext.getContext().setEventCancelled(true);
+              }
+            });
+
+    if (eventPluginContext.getContext().isEventCancelled()) {
+      configurationManager
+          .getLog()
+          .info(
+              String.format(
+                  "Event cancelled during plugin runs; Not submitting: %s",
+                  eventPluginContext.getEvent().getReferenceId()));
+      return;
+    }
+
+    configurationManager.getQueue().enqueue(eventPluginContext.getEvent());
+    configurationManager
+        .getLastReferenceIdManager()
+        .setLast(eventPluginContext.getEvent().getReferenceId());
   }
 }