Ability to disable the automatic Logback appender addition (#10629)

open-telemetry · Feb 26, 2024 · edf64c5 · edf64c5
1 parent 13caa70
commit edf64c5
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...tion/spring/autoconfigure/instrumentation/logging/LogbackAppenderApplicationListener.java b/...tion/spring/autoconfigure/instrumentation/logging/LogbackAppenderApplicationListener.java
@@ -63,12 +63,25 @@ public void onApplicationEvent(ApplicationEvent event) {
       if (existingOpenTelemetryAppender.isPresent()) {
         reInitializeOpenTelemetryAppender(
             existingOpenTelemetryAppender, applicationEnvironmentPreparedEvent);
-      } else {
+      } else if (isLogbackAppenderAddable(applicationEnvironmentPreparedEvent)) {
         addOpenTelemetryAppender(applicationEnvironmentPreparedEvent);
       }
     }
   }
 
+  private static boolean isLogbackAppenderAddable(
+      ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {
+    Boolean otelSdkDisableProperty =
+        evaluateBooleanProperty(applicationEnvironmentPreparedEvent, "otel.sdk.disabled");
+    Boolean logbackInstrumentationEnabledProperty =
+        evaluateBooleanProperty(
+            applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-appender.enabled");
+    return otelSdkDisableProperty == null
+        || !otelSdkDisableProperty.booleanValue()
+        || logbackInstrumentationEnabledProperty == null
+        || logbackInstrumentationEnabledProperty.booleanValue();
+  }
+
   private static void reInitializeOpenTelemetryAppender(
       Optional<OpenTelemetryAppender> existingOpenTelemetryAppender,
       ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {