@@ -16,7 +16,9 @@ import io.sentry.transport.ITransport
1616import java.time.Instant
1717import java.time.LocalDateTime
1818import java.time.ZoneId
19+ import java.util.ListResourceBundle
1920import java.util.logging.Level
21+ import java.util.logging.LogRecord
2022import java.util.logging.Logger
2123import kotlin.test.AfterTest
2224import kotlin.test.BeforeTest
@@ -485,6 +487,65 @@ class SentryHandlerTest {
485487 verify(fixture.transport, never()).send(checkLogs {})
486488 }
487489
490+ @Test
491+ fun `captures null message as event and breadcrumb when logs are enabled` () {
492+ fixture =
493+ Fixture (
494+ minimumBreadcrumbLevel = Level .INFO ,
495+ minimumEventLevel = Level .SEVERE ,
496+ enableLogs = true ,
497+ )
498+
499+ fixture.logger.info(null as String? )
500+ fixture.logger.severe(null as String? )
501+ Sentry .flush(10 )
502+
503+ verify(fixture.transport)
504+ .send(
505+ checkEvent { event ->
506+ assertNull(event.message?.message)
507+ assertEquals(1 , event.breadcrumbs?.size)
508+ assertNull(event.breadcrumbs?.single()?.message)
509+ },
510+ anyOrNull(),
511+ )
512+ verify(fixture.transport, never()).send(checkLogs {})
513+ }
514+
515+ @Test
516+ fun `captures null message as event and breadcrumb when resource bundle is set` () {
517+ fixture =
518+ Fixture (
519+ minimumBreadcrumbLevel = Level .INFO ,
520+ minimumEventLevel = Level .SEVERE ,
521+ enableLogs = true ,
522+ )
523+ val resourceBundle =
524+ object : ListResourceBundle () {
525+ override fun getContents (): Array <Array <Any >> =
526+ arrayOf(arrayOf<Any >(" message" , " localized message" ))
527+ }
528+
529+ fixture.handler.publish(
530+ LogRecord (Level .INFO , null ).apply { this .resourceBundle = resourceBundle }
531+ )
532+ fixture.handler.publish(
533+ LogRecord (Level .SEVERE , null ).apply { this .resourceBundle = resourceBundle }
534+ )
535+ Sentry .flush(10 )
536+
537+ verify(fixture.transport)
538+ .send(
539+ checkEvent { event ->
540+ assertNull(event.message?.message)
541+ assertEquals(1 , event.breadcrumbs?.size)
542+ assertNull(event.breadcrumbs?.single()?.message)
543+ },
544+ anyOrNull(),
545+ )
546+ verify(fixture.transport, never()).send(checkLogs {})
547+ }
548+
488549 @Test
489550 fun `converts finest log level to Sentry log level` () {
490551 fixture = Fixture (minimumLevel = Level .FINEST )
0 commit comments