From ffc042540b798d4590fe5223d29cd740f1b3f896 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 26 Jun 2025 09:32:03 +0200 Subject: [PATCH 1/4] Fix Logback with Spring Boot --- .../src/main/java/io/sentry/logback/SentryAppender.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index dfc2465571..dedf5f808a 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -83,7 +83,7 @@ public void start() { @Override protected void append(@NotNull ILoggingEvent eventObject) { - if (options.getLogs().isEnabled() && eventObject.getLevel().isGreaterOrEqual(minimumLevel)) { + if (ScopesAdapter.getInstance().getOptions().getLogs().isEnabled() && eventObject.getLevel().isGreaterOrEqual(minimumLevel)) { captureLog(eventObject); } if (eventObject.getLevel().isGreaterOrEqual(minimumEventLevel)) { @@ -113,7 +113,7 @@ protected void append(@NotNull ILoggingEvent eventObject) { final Message message = new Message(); // if encoder is set we treat message+params as PII as encoders may be used to mask/strip PII - if (encoder == null || options.isSendDefaultPii()) { + if (encoder == null || ScopesAdapter.getInstance().getOptions().isSendDefaultPii()) { message.setMessage(loggingEvent.getMessage()); message.setParams(toParams(loggingEvent.getArgumentArray())); } @@ -184,7 +184,7 @@ protected void captureLog(@NotNull ILoggingEvent loggingEvent) { final @NotNull SentryAttributes attributes = SentryAttributes.of(); // if encoder is set we treat message+params as PII as encoders may be used to mask/strip PII - if (encoder == null || options.isSendDefaultPii()) { + if (encoder == null || ScopesAdapter.getInstance().getOptions().isSendDefaultPii()) { attributes.add( SentryAttribute.stringAttribute("sentry.message.template", loggingEvent.getMessage())); arguments = loggingEvent.getArgumentArray(); From 1e09e8177d250284023c0fcbe92bc3f516d0acfc Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 26 Jun 2025 09:34:40 +0200 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4af53ff20..99f1d8c2e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## Unreleased + +### Fixes + +- Fix Logback with Spring Boot ([#4523](https://github.com/getsentry/sentry-java/pull/4523)) + - Enabling Sentry Logs in Spring Boot config did not work in 3.15.0 + ## 8.15.0 ### Features From 4bc8fab40a6e122366e7582e94b761f6d0c737b0 Mon Sep 17 00:00:00 2001 From: Sentry Github Bot Date: Thu, 26 Jun 2025 07:36:00 +0000 Subject: [PATCH 3/4] Format code --- .../src/main/java/io/sentry/logback/SentryAppender.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java index dedf5f808a..394087c688 100644 --- a/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java +++ b/sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java @@ -83,7 +83,8 @@ public void start() { @Override protected void append(@NotNull ILoggingEvent eventObject) { - if (ScopesAdapter.getInstance().getOptions().getLogs().isEnabled() && eventObject.getLevel().isGreaterOrEqual(minimumLevel)) { + if (ScopesAdapter.getInstance().getOptions().getLogs().isEnabled() + && eventObject.getLevel().isGreaterOrEqual(minimumLevel)) { captureLog(eventObject); } if (eventObject.getLevel().isGreaterOrEqual(minimumEventLevel)) { From 1c714292cbc3aacf2fb3f7978e019de06fe4e224 Mon Sep 17 00:00:00 2001 From: Alexander Dinauer Date: Thu, 26 Jun 2025 10:33:01 +0200 Subject: [PATCH 4/4] trigger ci --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99f1d8c2e1..2f445892e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,7 @@ ### Fixes -- Fix Logback with Spring Boot ([#4523](https://github.com/getsentry/sentry-java/pull/4523)) - - Enabling Sentry Logs in Spring Boot config did not work in 3.15.0 +- Enabling Sentry Logs through Logback in Spring Boot config did not work in 3.15.0 ([#4523](https://github.com/getsentry/sentry-java/pull/4523)) ## 8.15.0