@@ -28,6 +28,7 @@ import kotlin.test.assertNull
2828import kotlin.test.assertTrue
2929import org.mockito.kotlin.anyOrNull
3030import org.mockito.kotlin.mock
31+ import org.mockito.kotlin.never
3132import org.mockito.kotlin.verify
3233import org.slf4j.MDC
3334
@@ -40,6 +41,8 @@ class SentryHandlerTest {
4041 val transport : ITransport = mock(),
4142 contextTags : List <String >? = null ,
4243 printfStyle : Boolean? = null ,
44+ enableLogs : Boolean? = true ,
45+ enableGlobalLogs : Boolean = true ,
4346 ) {
4447 var logger: Logger
4548 var handler: SentryHandler
@@ -48,6 +51,7 @@ class SentryHandlerTest {
4851 val options = SentryOptions ()
4952 options.dsn = " http://key@localhost/proj"
5053 options.setTransportFactory { _, _ -> transport }
54+ options.logs.isEnabled = enableGlobalLogs
5155 options.logs.loggerBatchProcessorFactory = ILoggerBatchProcessorFactory { options, client ->
5256 LoggerBatchProcessor (options, client, ImmediateExecutorService ())
5357 }
@@ -58,6 +62,9 @@ class SentryHandlerTest {
5862 handler.setMinimumBreadcrumbLevel(minimumBreadcrumbLevel)
5963 handler.setMinimumEventLevel(minimumEventLevel)
6064 handler.setMinimumLevel(minimumLevel)
65+ if (enableLogs != null ) {
66+ handler.setEnableLogs(enableLogs)
67+ }
6168 if (printfStyle == true ) {
6269 handler.setPrintfStyle(printfStyle)
6370 }
@@ -318,11 +325,22 @@ class SentryHandlerTest {
318325
319326 @Test
320327 fun `fetches configuration from logging dot properties` () {
321- fixture = Fixture (configureWithLogManager = true )
328+ fixture = Fixture (configureWithLogManager = true , enableLogs = null )
322329 assertEquals(Level .CONFIG , fixture.handler.minimumBreadcrumbLevel)
323330 assertEquals(Level .WARNING , fixture.handler.minimumEventLevel)
324331 assertEquals(Level .ALL , fixture.handler.level)
325332 assertTrue(fixture.handler.isPrintfStyle)
333+ assertTrue(fixture.handler.isEnableLogs)
334+
335+ fixture.logger.info(" this should be captured as a log" )
336+ Sentry .flush(10 )
337+
338+ verify(fixture.transport)
339+ .send(
340+ checkLogs { logs ->
341+ assertEquals(" this should be captured as a log" , logs.items.first().body)
342+ }
343+ )
326344 }
327345
328346 @Test
@@ -418,6 +436,58 @@ class SentryHandlerTest {
418436 )
419437 }
420438
439+ @Test
440+ fun `does not capture logs by default` () {
441+ fixture = Fixture (enableLogs = null , enableGlobalLogs = true )
442+
443+ assertFalse(fixture.handler.isEnableLogs)
444+ fixture.logger.info(" this should not be captured as a log" )
445+ Sentry .flush(10 )
446+
447+ verify(fixture.transport, never()).send(checkLogs {})
448+ }
449+
450+ @Test
451+ fun `captures logs when enabled through Java` () {
452+ fixture = Fixture (enableLogs = true , enableGlobalLogs = true )
453+
454+ assertTrue(fixture.handler.isEnableLogs)
455+ fixture.logger.info(" this should be captured as a log" )
456+ Sentry .flush(10 )
457+
458+ verify(fixture.transport)
459+ .send(
460+ checkLogs { logs ->
461+ assertEquals(" this should be captured as a log" , logs.items.first().body)
462+ }
463+ )
464+ }
465+
466+ @Test
467+ fun `captures events and breadcrumbs when logs are disabled` () {
468+ fixture =
469+ Fixture (
470+ minimumBreadcrumbLevel = Level .INFO ,
471+ minimumEventLevel = Level .SEVERE ,
472+ enableLogs = false ,
473+ enableGlobalLogs = true ,
474+ )
475+
476+ fixture.logger.info(" this should be a breadcrumb" )
477+ fixture.logger.severe(" this should be an event" )
478+ Sentry .flush(10 )
479+
480+ verify(fixture.transport)
481+ .send(
482+ checkEvent { event ->
483+ assertEquals(" this should be an event" , event.message?.message)
484+ assertEquals(" this should be a breadcrumb" , event.breadcrumbs?.single()?.message)
485+ },
486+ anyOrNull(),
487+ )
488+ verify(fixture.transport, never()).send(checkLogs {})
489+ }
490+
421491 @Test
422492 fun `converts finest log level to Sentry log level` () {
423493 fixture = Fixture (minimumLevel = Level .FINEST )
0 commit comments