Merge branch 'main' into fix/reduce-noop-warnings-for-jul

Author: adinauer

CHANGELOG.md

@@ -28,6 +28,8 @@
   - This should reduce the number of ANRs seen in `SentryGestureListener`
 - Do not use Sentry logging API in JUL if logs are disabled ([#4574](https://github.com/getsentry/sentry-java/pull/4574))
   - This was causing Sentry SDK to log warnings: "Sentry Log is disabled and this 'logger' call is a no-op."
+- Do not use Sentry logging API in Log4j2 if logs are disabled ([#4573](https://github.com/getsentry/sentry-java/pull/4573))
+  - This was causing Sentry SDK to log warnings: "Sentry Log is disabled and this 'logger' call is a no-op."
 
 ## 8.17.0
 

sentry-log4j2/src/main/java/io/sentry/log4j2/SentryAppender.java

@@ -191,7 +191,8 @@ public void start() {
 
   @Override
   public void append(final @NotNull LogEvent eventObject) {
-    if (eventObject.getLevel().isMoreSpecificThan(minimumLevel)) {
+    if (scopes.getOptions().getLogs().isEnabled()
+        && eventObject.getLevel().isMoreSpecificThan(minimumLevel)) {
       captureLog(eventObject);
     }
     if (eventObject.getLevel().isMoreSpecificThan(minimumEventLevel)) {

sentry-samples/sentry-samples-log4j2/src/main/resources/sentry.properties

@@ -1,2 +1,3 @@
 in-app-includes="io.sentry.samples"
 logs.enabled=true
+debug=true