Skip to content

Commit aacb9a3

Browse files
pc9795pc9795
authored
Merge pull request #45 from exceptionless/slf4j-annotation
Added Slf4j to remove clutter
2 parents 4f10de0 + 9a12da0 commit aacb9a3

13 files changed

Lines changed: 70 additions & 84 deletions

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
import com.exceptionless.exceptionlessclient.utils.VisibleForTesting;
1414
import lombok.Builder;
1515
import lombok.Getter;
16-
import org.slf4j.Logger;
17-
import org.slf4j.LoggerFactory;
16+
import lombok.extern.slf4j.Slf4j;
1817

1918
import java.time.LocalDate;
2019
import java.util.Timer;
@@ -23,8 +22,8 @@
2322
import java.util.concurrent.ExecutorService;
2423
import java.util.concurrent.Executors;
2524

25+
@Slf4j
2626
public class ExceptionlessClient {
27-
private static final Logger LOG = LoggerFactory.getLogger(ExceptionlessClient.class);
2827
private static final String UPDATE_SETTINGS_TIMER_NAME = "update-settings-timer";
2928
private static final int UPDATE_SETTINGS_TIMER_INITIAL_DELAY = 5000;
3029
private static final Integer DEFAULT_NTHREADS = 10;
@@ -63,7 +62,7 @@ public void run() {
6362
try {
6463
configurationManager.getSettingsManager().updateSettings();
6564
} catch (Exception e) {
66-
LOG.error("Error in updating settings", e);
65+
log.error("Error in updating settings", e);
6766
}
6867
}
6968
},
@@ -252,7 +251,7 @@ public CompletableFuture<Void> submitSessionEndAsync(String sessionOrUserId) {
252251
}
253252

254253
public void submitSessionEnd(String sessionOrUserId) {
255-
LOG.info(String.format("Submitting session end: %s", sessionOrUserId));
254+
log.info(String.format("Submitting session end: %s", sessionOrUserId));
256255
configurationManager.getSubmissionClient().sendHeartBeat(sessionOrUserId, true);
257256
}
258257

@@ -271,7 +270,7 @@ public SubmissionResponse updateEmailAndDescription(
271270
referenceId,
272271
UserDescription.builder().description(description).emailAddress(email).build());
273272
if (!response.isSuccess()) {
274-
LOG.error(
273+
log.error(
275274
String.format("Failed to submit user email and description for event: %s", referenceId));
276275
}
277276

‎src/main/java/com/exceptionless/exceptionlessclient/configuration/ConfigurationManager.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@
2222
import com.exceptionless.exceptionlessclient.submission.SubmissionClientIF;
2323
import lombok.Builder;
2424
import lombok.Getter;
25+
import lombok.extern.slf4j.Slf4j;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728

2829
import java.util.*;
2930
import java.util.function.BiConsumer;
3031
import java.util.function.Consumer;
3132

33+
@Slf4j
3234
public class ConfigurationManager {
33-
private static final Logger LOG = LoggerFactory.getLogger(ConfigurationManager.class);
3435
private static final Integer API_KEY_MIN_LENGTH = 11;
3536
private static final Integer DEFAULT_HEART_BEAT_INTERVAL_IN_SECS = 30;
3637

@@ -177,7 +178,7 @@ public Set<String> getUserAgentBotPatterns() {
177178
}
178179

179180
public void submitSessionHeartbeat(String sessionOrUserId) {
180-
LOG.info(String.format("Submitting session heartbeat: %s", sessionOrUserId));
181+
log.info(String.format("Submitting session heartbeat: %s", sessionOrUserId));
181182
submissionClient.sendHeartBeat(sessionOrUserId, false);
182183
}
183184

@@ -237,7 +238,7 @@ private void changed() {
237238
try {
238239
onChangedHandler.accept(this);
239240
} catch (Exception e) {
240-
LOG.error(String.format("Error calling on changed handler: %s", e.getMessage()), e);
241+
log.error(String.format("Error calling on changed handler: %s", e.getMessage()), e);
241242
}
242243
}
243244
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
import com.exceptionless.exceptionlessclient.plugins.preconfigured.*;
66
import lombok.Builder;
77
import lombok.Getter;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
8+
import lombok.extern.slf4j.Slf4j;
109

1110
import java.util.ArrayList;
1211
import java.util.List;
1312
import java.util.UUID;
1413
import java.util.function.BiConsumer;
1514
import java.util.stream.Collectors;
1615

16+
@Slf4j
1717
public class PluginManager {
18-
private static final Logger LOG = LoggerFactory.getLogger(PluginManager.class);
1918
private static final Integer DEFAULT_PLUGIN_PRIORITY = 0;
2019

2120
@Getter private List<EventPluginIF> plugins;
@@ -40,7 +39,7 @@ private void configureDefaultPlugins() {
4039

4140
public void addPlugin(EventPluginIF eventPlugin) {
4241
if (plugins.stream().anyMatch(plugin -> plugin.getName().equals(eventPlugin.getName()))) {
43-
LOG.info(
42+
log.info(
4443
String.format(
4544
"Can't add plugin, name: %s, priority: %s as a plugin with this name already configured",
4645
eventPlugin.getName(), eventPlugin.getPriority()));

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/EventPluginRunner.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
import com.exceptionless.exceptionlessclient.configuration.ConfigurationManager;
44
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
55
import lombok.Builder;
6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
6+
import lombok.extern.slf4j.Slf4j;
87

8+
@Slf4j
99
public class EventPluginRunner {
10-
private static final Logger LOG = LoggerFactory.getLogger(EventPluginRunner.class);
11-
1210
private final ConfigurationManager configurationManager;
1311

1412
@Builder
@@ -29,7 +27,7 @@ public void run(EventPluginContext eventPluginContext) {
2927
plugin.run(eventPluginContext, configurationManager);
3028

3129
} catch (Exception e) {
32-
LOG.error(
30+
log.error(
3331
String.format(
3432
"Error running plugin: %s: %s. Discarding event",
3533
plugin.getName(), e.getMessage()),
@@ -39,7 +37,7 @@ public void run(EventPluginContext eventPluginContext) {
3937
});
4038

4139
if (eventPluginContext.getContext().isEventCancelled()) {
42-
LOG.info(
40+
log.info(
4341
String.format(
4442
"Event cancelled during plugin runs; Not submitting: %s",
4543
eventPluginContext.getEvent().getReferenceId()));

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/DuplicateErrorCheckerPlugin.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
import com.exceptionless.exceptionlessclient.plugins.MergedEvent;
1010
import lombok.Builder;
1111
import lombok.Getter;
12-
import org.slf4j.Logger;
13-
import org.slf4j.LoggerFactory;
12+
import lombok.extern.slf4j.Slf4j;
1413

1514
import java.util.*;
1615

16+
@Slf4j
1717
public class DuplicateErrorCheckerPlugin implements EventPluginIF {
18-
private static final Logger LOG = LoggerFactory.getLogger(DuplicateErrorCheckerPlugin.class);
1918
private static final String MERGED_EVENTS_RESUBMISSION_TIMER_NAME =
2019
"merged-events-resubmission-timer";
2120
private static final Integer DEFAULT_PRIORITY = 1010;
@@ -53,7 +52,7 @@ public void run() {
5352
event.resubmit();
5453
}
5554
} catch (Exception e) {
56-
LOG.error("Error in resubmitting merged events", e);
55+
log.error("Error in resubmitting merged events", e);
5756
}
5857
}
5958
},
@@ -83,7 +82,7 @@ public void run(
8382
MergedEvent mergedEvent = maybeMergedEvent.get();
8483
mergedEvent.incrementCount(event.getCount());
8584
mergedEvent.updateDate(event.getDate());
86-
LOG.info(String.format("Ignoring duplicate event with hash: %s", hash));
85+
log.info(String.format("Ignoring duplicate event with hash: %s", hash));
8786
eventPluginContext.getContext().setEventCancelled(true);
8887
return;
8988
}
@@ -97,7 +96,7 @@ public void run(
9796
timeStampedHash.getHash() == hash
9897
&& timeStampedHash.getTimestamp()
9998
>= (now - mergedEventsResubmissionInSecs * 1000))) {
100-
LOG.trace(String.format("Adding event with hash :%s", hash));
99+
log.trace(String.format("Adding event with hash :%s", hash));
101100
mergedEvents.add(
102101
MergedEvent.builder()
103102
.event(event)

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/EventExclusionPlugin.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55
import com.exceptionless.exceptionlessclient.models.EventPluginContext;
66
import com.exceptionless.exceptionlessclient.models.enums.EventType;
77
import com.exceptionless.exceptionlessclient.models.services.error.Error;
8-
import com.exceptionless.exceptionlessclient.settings.ServerSettings;
98
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
9+
import com.exceptionless.exceptionlessclient.settings.ServerSettings;
1010
import lombok.Builder;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
11+
import lombok.extern.slf4j.Slf4j;
1312

1413
import java.util.Optional;
1514
import java.util.OptionalInt;
1615

16+
@Slf4j
1717
public class EventExclusionPlugin implements EventPluginIF {
18-
private static final Logger LOG = LoggerFactory.getLogger(EventExclusionPlugin.class);
1918
private static final Integer DEFAULT_PRIORITY = 0;
2019

2120
@Builder
@@ -44,7 +43,7 @@ public void run(
4443
if (maybeSetting.isEmpty() || ServerSettings.getAsBoolean(maybeSetting.get())) {
4544
return;
4645
}
47-
LOG.info(
46+
log.info(
4847
String.format(
4948
"Cancelling event from excluded type: %s and source :%s",
5049
event.getType(), event.getSource()));
@@ -117,7 +116,7 @@ private void handleErrorEvent(
117116
Optional<String> maybeSetting =
118117
serverSettings.getTypeAndSourceSetting(EventType.ERROR.value(), error.getType());
119118
if (maybeSetting.isPresent() && !ServerSettings.getAsBoolean(maybeSetting.get())) {
120-
LOG.info(
119+
log.info(
121120
String.format("Cancelling error from excluded exception type: %s", error.getType()));
122121
eventPluginContext.getContext().setEventCancelled(true);
123122
break;

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/HeartbeatPlugin.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@
55
import com.exceptionless.exceptionlessclient.models.UserInfo;
66
import com.exceptionless.exceptionlessclient.plugins.EventPluginIF;
77
import lombok.Builder;
8-
import org.slf4j.Logger;
9-
import org.slf4j.LoggerFactory;
8+
import lombok.extern.slf4j.Slf4j;
109

1110
import java.util.Optional;
1211
import java.util.Timer;
1312
import java.util.TimerTask;
1413

14+
@Slf4j
1515
public class HeartbeatPlugin implements EventPluginIF {
16-
private static final Logger LOG = LoggerFactory.getLogger(HeartbeatPlugin.class);
1716
private static final String HEART_BEAT_TIMER_NAME = "heart-beat-timer";
1817
private static final Integer DEFAULT_PRIORITY = 100;
1918
private static final Integer DEFAULT_HEART_BEAT_INTERVAL_IN_SECS = 1;
@@ -57,7 +56,7 @@ public void run() {
5756
try {
5857
configurationManager.submitSessionHeartbeat(prevIdentity);
5958
} catch (Exception e) {
60-
LOG.error(
59+
log.error(
6160
String.format("Error in submitting hearbeat for identity: %s", prevIdentity), e);
6261
}
6362
}

‎src/main/java/com/exceptionless/exceptionlessclient/plugins/preconfigured/RequestInfoPlugin.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
import com.exceptionless.exceptionlessclient.services.RequestInfoGetArgs;
99
import com.exceptionless.exceptionlessclient.utils.Utils;
1010
import lombok.Builder;
11-
import org.slf4j.Logger;
12-
import org.slf4j.LoggerFactory;
11+
import lombok.extern.slf4j.Slf4j;
1312

1413
import java.net.http.HttpRequest;
1514

15+
@Slf4j
1616
public class RequestInfoPlugin implements EventPluginIF {
17-
private static final Logger LOG = LoggerFactory.getLogger(RequestInfoPlugin.class);
1817
private static final Integer DEFAULT_PRIORITY = 70;
1918

2019
@Builder
@@ -55,7 +54,7 @@ public void run(
5554

5655
if (configurationManager.getUserAgentBotPatterns().stream()
5756
.anyMatch(pattern -> Utils.match(requestInfo.getUserAgent(), pattern))) {
58-
LOG.info("Cancelling event as the request user agent matches a known bot pattern");
57+
log.info("Cancelling event as the request user agent matches a known bot pattern");
5958
eventPluginContext.getContext().setEventCancelled(true);
6059
return;
6160
}

0 commit comments

Comments
 (0)