Skip to content

Commit 86007fb

Browse files
stefanosianostefanosiano
committed
merged main
1 parent 53507b2 commit 86007fb

File tree

4 files changed

+91
-110
lines changed

4 files changed

+91
-110
lines changed

‎sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberIntegration.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import timber.log.Timber
1616
public class SentryTimberIntegration(
1717
public val minEventLevel: SentryLevel = SentryLevel.ERROR,
1818
public val minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
19-
public val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO
19+
public val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
2020
) : Integration, Closeable {
2121
private lateinit var tree: SentryTimberTree
2222
private lateinit var logger: ILogger

‎sentry-android-timber/src/main/java/io/sentry/android/timber/SentryTimberTree.kt‎

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class SentryTimberTree(
1515
private val scopes: IScopes,
1616
private val minEventLevel: SentryLevel,
1717
private val minBreadcrumbLevel: SentryLevel,
18-
private val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO
18+
private val minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
1919
) : Timber.Tree() {
2020
private val pendingTag = ThreadLocal<String?>()
2121

@@ -170,7 +170,7 @@ public class SentryTimberTree(
170170
}
171171

172172
val level = getSentryLevel(priority)
173-
val logLevel = getSentryLogLevel(priority)
173+
val logLevel = getSentryLogLevel(priority)
174174
val sentryMessage =
175175
Message().apply {
176176
this.message = message
@@ -182,18 +182,16 @@ public class SentryTimberTree(
182182

183183
captureEvent(level, tag, sentryMessage, throwable)
184184
addBreadcrumb(level, sentryMessage, throwable)
185-
addLog(logLevel, message, throwable, *args)
185+
addLog(logLevel, message, throwable, *args)
186186
}
187187

188188
/** do not log if it's lower than min. required level. */
189189
private fun isLoggable(level: SentryLevel, minLevel: SentryLevel): Boolean =
190190
level.ordinal >= minLevel.ordinal
191191

192-
/** do not log if it's lower than min. required level. */
193-
private fun isLoggable(
194-
level: SentryLogLevel,
195-
minLevel: SentryLogLevel
196-
): Boolean = level.ordinal >= minLevel.ordinal
192+
/** do not log if it's lower than min. required level. */
193+
private fun isLoggable(level: SentryLogLevel, minLevel: SentryLogLevel): Boolean =
194+
level.ordinal >= minLevel.ordinal
197195

198196
/** Captures an event with the given attributes */
199197
private fun captureEvent(
@@ -237,22 +235,22 @@ public class SentryTimberTree(
237235
}
238236
}
239237

240-
/** Send a Sentry Logs */
241-
private fun addLog(
242-
sentryLogLevel: SentryLogLevel,
243-
msg: String?,
244-
throwable: Throwable?,
245-
vararg args: Any?
246-
) {
247-
// checks the log level
248-
if (isLoggable(sentryLogLevel, minLogsLevel)) {
249-
val throwableMsg = throwable?.message
250-
when {
251-
msg != null -> scopes.logger().log(sentryLogLevel, msg, *args)
252-
throwableMsg != null -> scopes.logger().log(sentryLogLevel, throwableMsg, *args)
253-
}
254-
}
238+
/** Send a Sentry Logs */
239+
private fun addLog(
240+
sentryLogLevel: SentryLogLevel,
241+
msg: String?,
242+
throwable: Throwable?,
243+
vararg args: Any?,
244+
) {
245+
// checks the log level
246+
if (isLoggable(sentryLogLevel, minLogsLevel)) {
247+
val throwableMsg = throwable?.message
248+
when {
249+
msg != null -> scopes.logger().log(sentryLogLevel, msg, *args)
250+
throwableMsg != null -> scopes.logger().log(sentryLogLevel, throwableMsg, *args)
251+
}
255252
}
253+
}
256254

257255
/** Converts from Timber priority to SentryLevel. Fallback to SentryLevel.DEBUG. */
258256
private fun getSentryLevel(priority: Int): SentryLevel =
@@ -266,19 +264,16 @@ public class SentryTimberTree(
266264
else -> SentryLevel.DEBUG
267265
}
268266

269-
/**
270-
* Converts from Timber priority to SentryLogLevel.
271-
* Fallback to SentryLogLevel.DEBUG.
272-
*/
273-
private fun getSentryLogLevel(priority: Int): SentryLogLevel {
274-
return when (priority) {
275-
Log.ASSERT -> SentryLogLevel.FATAL
276-
Log.ERROR -> SentryLogLevel.ERROR
277-
Log.WARN -> SentryLogLevel.WARN
278-
Log.INFO -> SentryLogLevel.INFO
279-
Log.DEBUG -> SentryLogLevel.DEBUG
280-
Log.VERBOSE -> SentryLogLevel.TRACE
281-
else -> SentryLogLevel.DEBUG
282-
}
267+
/** Converts from Timber priority to SentryLogLevel. Fallback to SentryLogLevel.DEBUG. */
268+
private fun getSentryLogLevel(priority: Int): SentryLogLevel {
269+
return when (priority) {
270+
Log.ASSERT -> SentryLogLevel.FATAL
271+
Log.ERROR -> SentryLogLevel.ERROR
272+
Log.WARN -> SentryLogLevel.WARN
273+
Log.INFO -> SentryLogLevel.INFO
274+
Log.DEBUG -> SentryLogLevel.DEBUG
275+
Log.VERBOSE -> SentryLogLevel.TRACE
276+
else -> SentryLogLevel.DEBUG
283277
}
278+
}
284279
}

‎sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberIntegrationTest.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class SentryTimberIntegrationTest {
2222
fun getSut(
2323
minEventLevel: SentryLevel = SentryLevel.ERROR,
2424
minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
25-
minLogsLevel: SentryLogLevel = SentryLogLevel.INFO
25+
minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
2626
): SentryTimberIntegration =
2727
SentryTimberIntegration(
2828
minEventLevel = minEventLevel,
2929
minBreadcrumbLevel = minBreadcrumbLevel,
30-
minLogsLevel = minLogsLevel
30+
minLogsLevel = minLogsLevel,
3131
)
3232
}
3333

@@ -82,9 +82,9 @@ class SentryTimberIntegrationTest {
8282
fun `Integrations pass the right min levels`() {
8383
val sut =
8484
fixture.getSut(
85-
minEventLevel = SentryLevel.INFO,
86-
minBreadcrumbLevel = SentryLevel.DEBUG,
87-
minLogsLevel = SentryLogLevel.TRACE
85+
minEventLevel = SentryLevel.INFO,
86+
minBreadcrumbLevel = SentryLevel.DEBUG,
87+
minLogsLevel = SentryLogLevel.TRACE,
8888
)
8989
sut.register(fixture.scopes, fixture.options)
9090

‎sentry-android-timber/src/test/java/io/sentry/android/timber/SentryTimberTreeTest.kt‎

Lines changed: 53 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ import timber.log.Timber
2323
class SentryTimberTreeTest {
2424
private class Fixture {
2525
val scopes = mock<Scopes>()
26-
val logs = mock<ILoggerApi>()
26+
val logs = mock<ILoggerApi>()
2727

28-
init {
29-
whenever(scopes.logger()).thenReturn(logs)
30-
}
28+
init {
29+
whenever(scopes.logger()).thenReturn(logs)
30+
}
3131

3232
fun getSut(
3333
minEventLevel: SentryLevel = SentryLevel.ERROR,
3434
minBreadcrumbLevel: SentryLevel = SentryLevel.INFO,
35-
minLogsLevel: SentryLogLevel = SentryLogLevel.INFO
35+
minLogsLevel: SentryLogLevel = SentryLogLevel.INFO,
3636
): SentryTimberTree = SentryTimberTree(scopes, minEventLevel, minBreadcrumbLevel, minLogsLevel)
3737
}
3838

@@ -243,77 +243,63 @@ class SentryTimberTreeTest {
243243
sut.d("test %s, %s", 1, 1)
244244
}
245245

246-
@Test
247-
fun `Tree adds a log with message and arguments, when provided`() {
248-
val sut = fixture.getSut()
249-
sut.e("test count: %d %d", 32, 5)
246+
@Test
247+
fun `Tree adds a log with message and arguments, when provided`() {
248+
val sut = fixture.getSut()
249+
sut.e("test count: %d %d", 32, 5)
250250

251-
verify(fixture.logs).log(
252-
eq(SentryLogLevel.ERROR),
253-
eq("test count: %d %d"),
254-
eq(32),
255-
eq(5)
256-
)
257-
}
251+
verify(fixture.logs).log(eq(SentryLogLevel.ERROR), eq("test count: %d %d"), eq(32), eq(5))
252+
}
258253

259-
@Test
260-
fun `Tree adds a log if min level is equal`() {
261-
val sut = fixture.getSut()
262-
sut.i(Throwable("test"))
263-
verify(fixture.logs).log(any(), any())
264-
}
254+
@Test
255+
fun `Tree adds a log if min level is equal`() {
256+
val sut = fixture.getSut()
257+
sut.i(Throwable("test"))
258+
verify(fixture.logs).log(any(), any())
259+
}
265260

266-
@Test
267-
fun `Tree adds a log if min level is higher`() {
268-
val sut = fixture.getSut()
269-
sut.e(Throwable("test"))
270-
verify(fixture.logs).log(any(), any<String>(), any())
271-
}
261+
@Test
262+
fun `Tree adds a log if min level is higher`() {
263+
val sut = fixture.getSut()
264+
sut.e(Throwable("test"))
265+
verify(fixture.logs).log(any(), any<String>(), any())
266+
}
272267

273-
@Test
274-
fun `Tree won't add a log if min level is lower`() {
275-
val sut = fixture.getSut(minLogsLevel = SentryLogLevel.ERROR)
276-
sut.i(Throwable("test"))
277-
verifyNoInteractions(fixture.logs)
278-
}
268+
@Test
269+
fun `Tree won't add a log if min level is lower`() {
270+
val sut = fixture.getSut(minLogsLevel = SentryLogLevel.ERROR)
271+
sut.i(Throwable("test"))
272+
verifyNoInteractions(fixture.logs)
273+
}
279274

280-
@Test
281-
fun `Tree adds an info log`() {
282-
val sut = fixture.getSut()
283-
sut.i("message")
275+
@Test
276+
fun `Tree adds an info log`() {
277+
val sut = fixture.getSut()
278+
sut.i("message")
284279

285-
verify(fixture.logs).log(
286-
eq(SentryLogLevel.INFO),
287-
eq("message")
288-
)
289-
}
280+
verify(fixture.logs).log(eq(SentryLogLevel.INFO), eq("message"))
281+
}
290282

291-
@Test
292-
fun `Tree adds an error log`() {
293-
val sut = fixture.getSut()
294-
sut.e(Throwable("test"))
283+
@Test
284+
fun `Tree adds an error log`() {
285+
val sut = fixture.getSut()
286+
sut.e(Throwable("test"))
295287

296-
verify(fixture.logs).log(
297-
eq(SentryLogLevel.ERROR),
298-
eq("test")
299-
)
300-
}
288+
verify(fixture.logs).log(eq(SentryLogLevel.ERROR), eq("test"))
289+
}
301290

302-
@Test
303-
fun `Tree does not add a log, if no message or throwable is provided`() {
304-
val sut = fixture.getSut()
305-
sut.e(null as String?)
306-
verifyNoInteractions(fixture.logs)
307-
}
291+
@Test
292+
fun `Tree does not add a log, if no message or throwable is provided`() {
293+
val sut = fixture.getSut()
294+
sut.e(null as String?)
295+
verifyNoInteractions(fixture.logs)
296+
}
308297

309-
@Test
310-
fun `Tree logs throwable`() {
311-
val sut = fixture.getSut()
312-
sut.e(Throwable("throwable message"))
298+
@Test
299+
fun `Tree logs throwable`() {
300+
val sut = fixture.getSut()
301+
sut.e(Throwable("throwable message"))
313302

314-
verify(fixture.logs).log(
315-
eq(SentryLogLevel.ERROR),
316-
eq("throwable message")
317-
)
318-
}
303+
verify(fixture.logs).log(eq(SentryLogLevel.ERROR), eq("throwable message"))
304+
}
319305
}

0 commit comments

Comments
 (0)