Skip to content

Commit 9a12da0

Browse files
committed
Merge branch 'main' into slf4j-annotation
2 parents e175b8e + 4f10de0 commit 9a12da0

File tree

19 files changed

+53
-60
lines changed

19 files changed

+53
-60
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,12 @@ public static void sampleEventSubmissions() {
2020

2121
public static void sampleUseOfSessions() {
2222
client.getConfigurationManager().useSessions();
23-
client.submitEvent(
24-
EventPluginContext.from(client.createSessionStart().userIdentity("test-user").build()));
23+
client.submitEvent(client.createSessionStart().userIdentity("test-user").build());
2524
client.submitSessionEnd("test-user");
2625
}
2726

2827
public static void sampleUseOfUpdatingEmailAndDescription() {
29-
client.submitEvent(
30-
EventPluginContext.from(
31-
client.createLog("test-log").referenceId("test-reference-id").build()));
28+
client.submitEvent(client.createLog("test-log").referenceId("test-reference-id").build());
3229
client.updateEmailAndDescription("test-reference-id", "[email protected]", "test-description");
3330
}
3431

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

Lines changed: 46 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,26 @@ public CompletableFuture<Void> submitExceptionAsync(Exception exception) {
9191
}
9292

9393
public void submitException(Exception exception) {
94-
Event event = createException().build();
94+
submitException(null, exception);
95+
}
96+
97+
public CompletableFuture<Void> submitExceptionAsync(String message, Exception exception) {
98+
return CompletableFuture.runAsync(() -> submitException(message, exception), executorService);
99+
}
100+
101+
public void submitException(String message, Exception exception) {
102+
Event event;
103+
if (message == null) {
104+
event = createError().build();
105+
} else {
106+
event = createError().message(message).build();
107+
}
95108
PluginContext pluginContext = PluginContext.builder().exception(exception).build();
96-
submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
109+
submitEventWithContext(
110+
EventPluginContext.builder().event(event).context(pluginContext).build());
97111
}
98112

99-
public Event.EventBuilder createException() {
113+
public Event.EventBuilder createError() {
100114
return createEvent().type(EventType.ERROR.value());
101115
}
102116

@@ -107,23 +121,23 @@ public CompletableFuture<Void> submitUnhandledExceptionAsync(
107121
}
108122

109123
public void submitUnhandledException(Exception exception, String submissionMethod) {
110-
Event event = createException().build();
124+
Event event = createError().build();
111125
PluginContext pluginContext =
112126
PluginContext.builder()
113127
.exception(exception)
114128
.unhandledError(true)
115129
.submissionMethod(submissionMethod)
116130
.build();
117-
submitEvent(EventPluginContext.builder().event(event).context(pluginContext).build());
131+
submitEventWithContext(
132+
EventPluginContext.builder().event(event).context(pluginContext).build());
118133
}
119134

120135
public CompletableFuture<Void> submitFeatureUsageAsync(String feature) {
121136
return CompletableFuture.runAsync(() -> submitFeatureUsage(feature), executorService);
122137
}
123138

124139
public void submitFeatureUsage(String feature) {
125-
Event event = createFeatureUsage(feature).build();
126-
submitEvent(EventPluginContext.from(event));
140+
submitEvent(createFeatureUsage(feature).build());
127141
}
128142

129143
public Event.EventBuilder createFeatureUsage(String feature) {
@@ -151,8 +165,7 @@ public CompletableFuture<Void> submitLogAsync(String message, String source, Str
151165
}
152166

153167
public void submitLog(String message, String source, String level) {
154-
Event event = createLog(message, source, level).build();
155-
submitEvent(EventPluginContext.from(event));
168+
submitEvent(createLog(message, source, level).build());
156169
}
157170

158171
public Event.EventBuilder createLog(String message) {
@@ -165,13 +178,7 @@ public Event.EventBuilder createLog(String message, String source) {
165178

166179
public Event.EventBuilder createLog(String message, String source, String level) {
167180
if (source == null) {
168-
// Calling method
169-
StackTraceElement[] traceElements = Thread.currentThread().getStackTrace();
170-
source = traceElements[2].getMethodName();
171-
// Came from the overrided method
172-
if (source.equals("createLog")) {
173-
source = traceElements[3].getMethodName();
174-
}
181+
source = getCallingMethod();
175182
}
176183

177184
Event.EventBuilder builder =
@@ -183,13 +190,20 @@ public Event.EventBuilder createLog(String message, String source, String level)
183190
return builder.property(EventPropertyKey.LOG_LEVEL.value(), level);
184191
}
185192

193+
private String getCallingMethod() {
194+
StackTraceElement[] traceElements = Thread.currentThread().getStackTrace();
195+
String source = traceElements[3].getMethodName();
196+
boolean cameFromOverridenMethod = source.equals("createLog");
197+
198+
return cameFromOverridenMethod ? traceElements[4].getMethodName() : source;
199+
}
200+
186201
public CompletableFuture<Void> submitNotFoundAsync(String resource) {
187202
return CompletableFuture.runAsync(() -> submitNotFound(resource), executorService);
188203
}
189204

190205
public void submitNotFound(String resource) {
191-
Event event = createNotFound(resource).build();
192-
submitEvent(EventPluginContext.from(event));
206+
submitEvent(createNotFound(resource).build());
193207
}
194208

195209
public Event.EventBuilder createNotFound(String resource) {
@@ -201,8 +215,7 @@ public CompletableFuture<Void> submitSessionStartAsync() {
201215
}
202216

203217
public void submitSessionStart() {
204-
Event event = createSessionStart().build();
205-
submitEvent(EventPluginContext.from(event));
218+
submitEvent(createSessionStart().build());
206219
}
207220

208221
public Event.EventBuilder createSessionStart() {
@@ -215,11 +228,21 @@ public Event.EventBuilder createEvent() {
215228
.date(LocalDate.now());
216229
}
217230

218-
public CompletableFuture<Void> submitEventAsync(EventPluginContext eventPluginContext) {
219-
return CompletableFuture.runAsync(() -> submitEvent(eventPluginContext), executorService);
231+
public CompletableFuture<Void> submitEventAsync(Event event) {
232+
return CompletableFuture.runAsync(() -> submitEvent(event), executorService);
233+
}
234+
235+
public void submitEvent(Event event) {
236+
eventPluginRunner.run(EventPluginContext.from(event));
237+
}
238+
239+
public CompletableFuture<Void> submitEventWithContextAsync(
240+
EventPluginContext eventPluginContext) {
241+
return CompletableFuture.runAsync(
242+
() -> submitEventWithContext(eventPluginContext), executorService);
220243
}
221244

222-
public void submitEvent(EventPluginContext eventPluginContext) {
245+
public void submitEventWithContext(EventPluginContext eventPluginContext) {
223246
eventPluginRunner.run(eventPluginContext);
224247
}
225248

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import lombok.Builder;
44
import lombok.Value;
5-
import lombok.experimental.NonFinal;
65

76
@Builder
87
@Value
9-
@NonFinal
108
public class EventPluginContext {
119
Event event;
1210
PluginContext context;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22

33
import lombok.Builder;
44
import lombok.Value;
5-
import lombok.experimental.NonFinal;
65

76
import java.util.Map;
87

98
@Builder
109
@Value
11-
@NonFinal
1210
public class ManualStackingInfo {
1311
String title;
1412
Map<String, String> signatureData;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;
55
import lombok.Value;
6-
import lombok.experimental.NonFinal;
76
import lombok.experimental.SuperBuilder;
87

98
@SuperBuilder
109
@Value
11-
@NonFinal
1210
@EqualsAndHashCode(callSuper = true)
1311
public class UserDescription extends Model {
1412
String emailAddress;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;
55
import lombok.Value;
6-
import lombok.experimental.NonFinal;
76
import lombok.experimental.SuperBuilder;
87

98
@SuperBuilder
109
@Value
11-
@NonFinal
1210
@EqualsAndHashCode(callSuper = true)
1311
public class UserInfo extends Model {
1412
String identity;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;
55
import lombok.Value;
6-
import lombok.experimental.NonFinal;
76
import lombok.experimental.SuperBuilder;
87

98
@SuperBuilder
109
@Value
11-
@NonFinal
1210
@EqualsAndHashCode(callSuper = true)
1311
public class EnvironmentInfo extends Model {
1412
Integer processorCount;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;
55
import lombok.Value;
6-
import lombok.experimental.NonFinal;
76
import lombok.experimental.SuperBuilder;
87

98
import java.time.LocalDate;
109

1110
@SuperBuilder
1211
@Value
13-
@NonFinal
1412
@EqualsAndHashCode(callSuper = true)
1513
public class Module extends Model {
1614
Long moduleId;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.Builder;
55
import lombok.EqualsAndHashCode;
66
import lombok.Value;
7-
import lombok.experimental.NonFinal;
87
import lombok.experimental.SuperBuilder;
98

109
import java.util.HashMap;
@@ -13,7 +12,6 @@
1312

1413
@SuperBuilder
1514
@Value
16-
@NonFinal
1715
@EqualsAndHashCode(callSuper = true)
1816
public class RequestInfo extends Model {
1917
String userAgent;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@
33
import com.exceptionless.exceptionlessclient.models.base.Model;
44
import lombok.EqualsAndHashCode;
55
import lombok.Value;
6-
import lombok.experimental.NonFinal;
76
import lombok.experimental.SuperBuilder;
87

98
import java.util.List;
109

1110
@SuperBuilder
1211
@Value
13-
@NonFinal
1412
@EqualsAndHashCode(callSuper = true)
1513
public class Parameter extends Model {
1614
List<String> genericArguments;

0 commit comments

Comments
 (0)