Skip to content

fix(jul): [Logs and Metrics Enable Flags 17] Preserve null-message records #5960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adinauer wants to merge 4 commits into
base: perf/metrics-batch-thread-first-use
Choose a base branch
from
+33 −3
Open

fix(jul): [Logs and Metrics Enable Flags 17] Preserve null-message records #5960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f13618
fix(jul): Preserve null-message events and breadcrumbs
adinauer Aug 13, 2026
831e343
Merge branch 'perf/metrics-batch-thread-first-use' into fix/jul-null-…
adinauer Aug 13, 2026
937e886
Merge branch 'perf/metrics-batch-thread-first-use' into fix/jul-null-…
adinauer Aug 13, 2026
3f9466a
Merge branch 'perf/metrics-batch-thread-first-use' into fix/jul-null-…
adinauer Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions sentry-jul/src/main/java/io/sentry/jul/SentryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,15 @@ protected void captureLog(@NotNull LogRecord loggingEvent) {
final @Nullable Object[] arguments = loggingEvent.getParameters();
final @NotNull SentryAttributes attributes = SentryAttributes.of();

@NotNull String message = loggingEvent.getMessage();
final @Nullable String messageTemplate = loggingEvent.getMessage();
if (messageTemplate == null) {
return;
}

@NotNull String message = messageTemplate;
if (loggingEvent.getResourceBundle() != null
&& loggingEvent.getResourceBundle().containsKey(loggingEvent.getMessage())) {
message = loggingEvent.getResourceBundle().getString(loggingEvent.getMessage());
&& loggingEvent.getResourceBundle().containsKey(messageTemplate)) {
message = loggingEvent.getResourceBundle().getString(messageTemplate);
}

final @NotNull String formattedMessage = maybeFormatted(arguments, message);
Expand Down
25 changes: 25 additions & 0 deletions sentry-jul/src/test/kotlin/io/sentry/jul/SentryHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,31 @@ class SentryHandlerTest {
verify(fixture.transport, never()).send(checkLogs {})
}

@Test
fun `captures null message as event and breadcrumb when logs are enabled`() {
fixture =
Fixture(
minimumBreadcrumbLevel = Level.INFO,
minimumEventLevel = Level.SEVERE,
enableLogs = true,
)

fixture.logger.info(null as String?)
fixture.logger.severe(null as String?)
Sentry.flush(10)

verify(fixture.transport)
.send(
checkEvent { event ->
assertNull(event.message?.message)
assertEquals(1, event.breadcrumbs?.size)
assertNull(event.breadcrumbs?.single()?.message)
},
anyOrNull(),
)
verify(fixture.transport, never()).send(checkLogs {})
}

@Test
fun `converts finest log level to Sentry log level`() {
fixture = Fixture(minimumLevel = Level.FINEST)
Expand Down
Loading