Merge branch 'main' into slf4j-annotation

Author: pc9795

samples/example-app/src/main/java/com/exceptionless/example/app/ExampleApp.java

@@ -20,15 +20,12 @@ public static void sampleEventSubmissions() {
 
   public static void sampleUseOfSessions() {
     client.getConfigurationManager().useSessions();
-    client.submitEvent(
-        EventPluginContext.from(client.createSessionStart().userIdentity("test-user").build()));
+    client.submitEvent(client.createSessionStart().userIdentity("test-user").build());
     client.submitSessionEnd("test-user");
   }
 
   public static void sampleUseOfUpdatingEmailAndDescription() {
-    client.submitEvent(
-        EventPluginContext.from(
-            client.createLog("test-log").referenceId("test-reference-id").build()));
+    client.submitEvent(client.createLog("test-log").referenceId("test-reference-id").build());
     client.updateEmailAndDescription("test-reference-id", "test@email.com", "test-description");
   }
 

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

@@ -91,12 +91,26 @@ public CompletableFuture<Void> submitExceptionAsync(Exception exception) {
   }
 
   public void submitException(Exception exception) {
-    Event event = createException().build();
+    submitException(null, exception);
+  }
+
+  public CompletableFuture<Void> submitExceptionAsync(String message, Exception exception) {
+    return CompletableFuture.runAsync(() -> submitException(message, exception), executorService);
+  }
+
+  public void submitException(String message, Exception exception) {
+    Event event;
+    if (message == null) {
+      event = createError().build();
+    } else {
+      event = createError().message(message).build();
+    }
     PluginContext pluginContext = PluginContext.builder().exception(exception).build();
-    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
+    submitEventWithContext(
+        EventPluginContext.builder().event(event).context(pluginContext).build());
   }
 
-  public Event.EventBuilder createException() {
+  public Event.EventBuilder createError() {
     return createEvent().type(EventType.ERROR.value());
   }
 
@@ -107,23 +121,23 @@ public CompletableFuture<Void> submitUnhandledExceptionAsync(
   }
 
   public void submitUnhandledException(Exception exception, String submissionMethod) {
-    Event event = createException().build();
+    Event event = createError().build();
     PluginContext pluginContext =
         PluginContext.builder()
             .exception(exception)
             .unhandledError(true)
             .submissionMethod(submissionMethod)
             .build();
-    submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
+    submitEventWithContext(
+        EventPluginContext.builder().event(event).context(pluginContext).build());
   }
 
   public CompletableFuture<Void> submitFeatureUsageAsync(String feature) {
     return CompletableFuture.runAsync(() -> submitFeatureUsage(feature), executorService);
   }
 
   public void submitFeatureUsage(String feature) {
-    Event event = createFeatureUsage(feature).build();
-    submitEvent(EventPluginContext.from(event));
+    submitEvent(createFeatureUsage(feature).build());
   }
 
   public Event.EventBuilder createFeatureUsage(String feature) {
@@ -151,8 +165,7 @@ public CompletableFuture<Void> submitLogAsync(String message, String source, Str
   }
 
   public void submitLog(String message, String source, String level) {
-    Event event = createLog(message, source, level).build();
-    submitEvent(EventPluginContext.from(event));
+    submitEvent(createLog(message, source, level).build());
   }
 
   public Event.EventBuilder createLog(String message) {
@@ -165,13 +178,7 @@ public Event.EventBuilder createLog(String message, String source) {
 
   public Event.EventBuilder createLog(String message, String source, String level) {
     if (source == null) {
-      // Calling method
-      StackTraceElement[] traceElements = Thread.currentThread().getStackTrace();
-      source = traceElements[2].getMethodName();
-      // Came from the overrided method
-      if (source.equals("createLog")) {
-        source = traceElements[3].getMethodName();
-      }
+      source = getCallingMethod();
     }
 
     Event.EventBuilder builder =
@@ -183,13 +190,20 @@ public Event.EventBuilder createLog(String message, String source, String level)
     return builder.property(EventPropertyKey.LOG_LEVEL.value(), level);
   }
 
+  private String getCallingMethod() {
+    StackTraceElement[] traceElements = Thread.currentThread().getStackTrace();
+    String source = traceElements[3].getMethodName();
+    boolean cameFromOverridenMethod = source.equals("createLog");
+
+    return cameFromOverridenMethod ? traceElements[4].getMethodName() : source;
+  }
+
   public CompletableFuture<Void> submitNotFoundAsync(String resource) {
     return CompletableFuture.runAsync(() -> submitNotFound(resource), executorService);
   }
 
   public void submitNotFound(String resource) {
-    Event event = createNotFound(resource).build();
-    submitEvent(EventPluginContext.from(event));
+    submitEvent(createNotFound(resource).build());
   }
 
   public Event.EventBuilder createNotFound(String resource) {
@@ -201,8 +215,7 @@ public CompletableFuture<Void> submitSessionStartAsync() {
   }
 
   public void submitSessionStart() {
-    Event event = createSessionStart().build();
-    submitEvent(EventPluginContext.from(event));
+    submitEvent(createSessionStart().build());
   }
 
   public Event.EventBuilder createSessionStart() {
@@ -215,11 +228,21 @@ public Event.EventBuilder createEvent() {
         .date(LocalDate.now());
   }
 
-  public CompletableFuture<Void> submitEventAsync(EventPluginContext eventPluginContext) {
-    return CompletableFuture.runAsync(() -> submitEvent(eventPluginContext), executorService);
+  public CompletableFuture<Void> submitEventAsync(Event event) {
+    return CompletableFuture.runAsync(() -> submitEvent(event), executorService);
+  }
+
+  public void submitEvent(Event event) {
+    eventPluginRunner.run(EventPluginContext.from(event));
+  }
+
+  public CompletableFuture<Void> submitEventWithContextAsync(
+      EventPluginContext eventPluginContext) {
+    return CompletableFuture.runAsync(
+        () -> submitEventWithContext(eventPluginContext), executorService);
   }
 
-  public void submitEvent(EventPluginContext eventPluginContext) {
+  public void submitEventWithContext(EventPluginContext eventPluginContext) {
     eventPluginRunner.run(eventPluginContext);
   }
 

src/main/java/com/exceptionless/exceptionlessclient/models/EventPluginContext.java

@@ -2,11 +2,9 @@
 
 import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 
 @Builder
 @Value
-@NonFinal
 public class EventPluginContext {
   Event event;
   PluginContext context;

src/main/java/com/exceptionless/exceptionlessclient/models/ManualStackingInfo.java

@@ -2,13 +2,11 @@
 
 import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 
 import java.util.Map;
 
 @Builder
 @Value
-@NonFinal
 public class ManualStackingInfo {
   String title;
   Map<String, String> signatureData;

src/main/java/com/exceptionless/exceptionlessclient/models/UserDescription.java

@@ -3,12 +3,10 @@
 import com.exceptionless.exceptionlessclient.models.base.Model;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class UserDescription extends Model {
     String emailAddress;

src/main/java/com/exceptionless/exceptionlessclient/models/UserInfo.java

@@ -3,12 +3,10 @@
 import com.exceptionless.exceptionlessclient.models.base.Model;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class UserInfo extends Model {
   String identity;

src/main/java/com/exceptionless/exceptionlessclient/models/services/EnvironmentInfo.java

@@ -3,12 +3,10 @@
 import com.exceptionless.exceptionlessclient.models.base.Model;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class EnvironmentInfo extends Model {
   Integer processorCount;

src/main/java/com/exceptionless/exceptionlessclient/models/services/Module.java

@@ -3,14 +3,12 @@
 import com.exceptionless.exceptionlessclient.models.base.Model;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDate;
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class Module extends Model {
     Long moduleId;

src/main/java/com/exceptionless/exceptionlessclient/models/services/RequestInfo.java

@@ -4,7 +4,6 @@
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 import java.util.HashMap;
@@ -13,7 +12,6 @@
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class RequestInfo extends Model {
   String userAgent;

src/main/java/com/exceptionless/exceptionlessclient/models/services/error/Parameter.java

@@ -3,14 +3,12 @@
 import com.exceptionless.exceptionlessclient.models.base.Model;
 import lombok.EqualsAndHashCode;
 import lombok.Value;
-import lombok.experimental.NonFinal;
 import lombok.experimental.SuperBuilder;
 
 import java.util.List;
 
 @SuperBuilder
 @Value
-@NonFinal
 @EqualsAndHashCode(callSuper = true)
 public class Parameter extends Model {
     List<String> genericArguments;