Skip to content

Commit 80aa565

Browse files
alexander-alderman-webbalexander-alderman-webb
committed
Switch samples to use enums instead of strings and lint
1 parent 6e1b2b0 commit 80aa565

5 files changed

Lines changed: 27 additions & 52 deletions

File tree

‎sentry-samples/sentry-samples-console/src/main/java/io/sentry/samples/console/Main.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public static void main(String[] args) throws InterruptedException {
5959
options.setOnDiscard(
6060
(reason, category, number) -> {
6161
// Only record the number of lost spans due to overflow conditions
62-
if ((reason.equals(DiscardReason.CACHE_OVERFLOW.getReason())
63-
|| reason.equals(DiscardReason.QUEUE_OVERFLOW.getReason()))
64-
&& category.equals(DataCategory.Span.getCategory())) {
62+
if ((reason.equals(DiscardReason.CACHE_OVERFLOW)
63+
|| reason.equals(DiscardReason.QUEUE_OVERFLOW))
64+
&& category.equals(DataCategory.Span)) {
6565
numberOfDiscardedSpansDueToOverflow += number;
6666
}
6767
});

‎sentry-samples/sentry-samples-servlet/src/main/java/io/sentry/samples/servlet/SentryInitializer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public void contextInitialized(ServletContextEvent sce) {
6666
options.setOnDiscard(
6767
(reason, category, number) -> {
6868
// Only record the number of lost spans due to overflow conditions
69-
if ((reason.equals(DiscardReason.CACHE_OVERFLOW.getReason())
70-
|| reason.equals(DiscardReason.QUEUE_OVERFLOW.getReason()))
71-
&& category.equals(DataCategory.Span.getCategory())) {
69+
if ((reason.equals(DiscardReason.CACHE_OVERFLOW)
70+
|| reason.equals(DiscardReason.QUEUE_OVERFLOW))
71+
&& category.equals(DataCategory.Span)) {
7272
numberOfDiscardedSpansDueToOverflow += number;
7373
}
7474
});

‎sentry/src/main/java/io/sentry/clientreport/ClientReportRecorder.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,7 @@ private void executeOnDiscard(
129129
try {
130130
options.getOnDiscard().execute(reason, category, countToAdd);
131131
} catch (Throwable e) {
132-
options
133-
.getLogger()
134-
.log(
135-
SentryLevel.ERROR,
136-
"The onDiscard callback threw an exception.",
137-
e);
132+
options.getLogger().log(SentryLevel.ERROR, "The onDiscard callback threw an exception.", e);
138133
}
139134
}
140135
}

‎sentry/src/test/java/io/sentry/SentryClientTest.kt‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,8 +1012,7 @@ class SentryClientTest {
10121012
),
10131013
)
10141014

1015-
verify(onDiscardMock, times(1))
1016-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
1015+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
10171016
verify(onDiscardMock).execute(DiscardReason.BEFORE_SEND, DataCategory.Span, 2)
10181017
}
10191018

@@ -1040,8 +1039,7 @@ class SentryClientTest {
10401039

10411040
verify(onDiscardMock, times(1))
10421041
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Transaction, 1)
1043-
verify(onDiscardMock)
1044-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Span, 2)
1042+
verify(onDiscardMock).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Span, 2)
10451043
}
10461044

10471045
@Test
@@ -1072,8 +1070,7 @@ class SentryClientTest {
10721070
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Span.category, 2)),
10731071
)
10741072

1075-
verify(onDiscardMock, times(1))
1076-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Span, 2)
1073+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Span, 2)
10771074
}
10781075

10791076
@Test
@@ -1091,8 +1088,7 @@ class SentryClientTest {
10911088
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Error.category, 1)),
10921089
)
10931090

1094-
verify(onDiscardMock, times(1))
1095-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
1091+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
10961092
}
10971093

10981094
@Test
@@ -1117,8 +1113,7 @@ class SentryClientTest {
11171113
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Error.category, 1)),
11181114
)
11191115

1120-
verify(onDiscardMock, times(1))
1121-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
1116+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
11221117
}
11231118

11241119
@Test
@@ -1154,8 +1149,7 @@ class SentryClientTest {
11541149
),
11551150
)
11561151

1157-
verify(onDiscardMock, times(1))
1158-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
1152+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
11591153
verify(onDiscardMock).execute(DiscardReason.BEFORE_SEND, DataCategory.Span, 2)
11601154
}
11611155

@@ -1201,8 +1195,7 @@ class SentryClientTest {
12011195
),
12021196
)
12031197

1204-
verify(onDiscardMock, times(1))
1205-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
1198+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Transaction, 1)
12061199
verify(onDiscardMock).execute(DiscardReason.BEFORE_SEND, DataCategory.Span, 2)
12071200
}
12081201

@@ -2164,8 +2157,7 @@ class SentryClientTest {
21642157
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Error.category, 1)),
21652158
)
21662159

2167-
verify(onDiscardMock, times(1))
2168-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
2160+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
21692161
}
21702162

21712163
@Test
@@ -2292,8 +2284,7 @@ class SentryClientTest {
22922284
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Error.category, 1)),
22932285
)
22942286

2295-
verify(onDiscardMock, times(1))
2296-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
2287+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
22972288
}
22982289

22992290
@Test
@@ -2334,8 +2325,7 @@ class SentryClientTest {
23342325
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Error.category, 1)),
23352326
)
23362327

2337-
verify(onDiscardMock, times(1))
2338-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
2328+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Error, 1)
23392329
}
23402330

23412331
@Test
@@ -2993,8 +2983,7 @@ class SentryClientTest {
29932983
listOf(DiscardedEvent(DiscardReason.EVENT_PROCESSOR.reason, DataCategory.Replay.category, 1)),
29942984
)
29952985

2996-
verify(onDiscardMock, times(1))
2997-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Replay, 1)
2986+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Replay, 1)
29982987
}
29992988

30002989
@Test
@@ -3336,8 +3325,7 @@ class SentryClientTest {
33363325
listOf(DiscardedEvent(DiscardReason.BEFORE_SEND.reason, DataCategory.Feedback.category, 1)),
33373326
)
33383327

3339-
verify(onDiscardMock, times(1))
3340-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Feedback, 1)
3328+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Feedback, 1)
33413329
}
33423330

33433331
@Test
@@ -3375,8 +3363,7 @@ class SentryClientTest {
33753363
listOf(DiscardedEvent(DiscardReason.BEFORE_SEND.reason, DataCategory.Feedback.category, 1)),
33763364
)
33773365

3378-
verify(onDiscardMock, times(1))
3379-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Feedback, 1)
3366+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Feedback, 1)
33803367
}
33813368

33823369
@Test
@@ -3395,8 +3382,7 @@ class SentryClientTest {
33953382
),
33963383
)
33973384

3398-
verify(onDiscardMock, times(1))
3399-
.execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Feedback, 1)
3385+
verify(onDiscardMock, times(1)).execute(DiscardReason.EVENT_PROCESSOR, DataCategory.Feedback, 1)
34003386
}
34013387

34023388
// endregion

‎sentry/src/test/java/io/sentry/clientreport/ClientReportTest.kt‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,9 @@ class ClientReportTest {
321321

322322
verify(onDiscardMock, times(2))
323323
.execute(DiscardReason.CACHE_OVERFLOW, DataCategory.Attachment, 1)
324-
verify(onDiscardMock, times(1))
325-
.execute(DiscardReason.RATELIMIT_BACKOFF, DataCategory.Error, 1)
326-
verify(onDiscardMock, times(1))
327-
.execute(DiscardReason.QUEUE_OVERFLOW, DataCategory.Error, 1)
328-
verify(onDiscardMock, times(1))
329-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Profile, 1)
324+
verify(onDiscardMock, times(1)).execute(DiscardReason.RATELIMIT_BACKOFF, DataCategory.Error, 1)
325+
verify(onDiscardMock, times(1)).execute(DiscardReason.QUEUE_OVERFLOW, DataCategory.Error, 1)
326+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Profile, 1)
330327
}
331328

332329
@Test
@@ -345,12 +342,9 @@ class ClientReportTest {
345342

346343
verify(onDiscardMock, times(2))
347344
.execute(DiscardReason.CACHE_OVERFLOW, DataCategory.Attachment, 1)
348-
verify(onDiscardMock, times(1))
349-
.execute(DiscardReason.RATELIMIT_BACKOFF, DataCategory.Error, 1)
350-
verify(onDiscardMock, times(1))
351-
.execute(DiscardReason.QUEUE_OVERFLOW, DataCategory.Error, 1)
352-
verify(onDiscardMock, times(1))
353-
.execute(DiscardReason.BEFORE_SEND, DataCategory.Profile, 1)
345+
verify(onDiscardMock, times(1)).execute(DiscardReason.RATELIMIT_BACKOFF, DataCategory.Error, 1)
346+
verify(onDiscardMock, times(1)).execute(DiscardReason.QUEUE_OVERFLOW, DataCategory.Error, 1)
347+
verify(onDiscardMock, times(1)).execute(DiscardReason.BEFORE_SEND, DataCategory.Profile, 1)
354348
}
355349

356350
private fun givenClientReportRecorder(

0 commit comments

Comments
 (0)