pr review

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java

@@ -91,71 +91,71 @@ private static void initializeOpenTelemetryAppenderFromProperties(
     // org.springframework.boot.context.logging.LoggingApplicationListener, config properties not
     // available
     Boolean codeAttribute =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-code-attributes");
     if (codeAttribute != null) {
       openTelemetryAppender.setCaptureCodeAttributes(codeAttribute);
     }
 
     Boolean markerAttribute =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-marker-attribute");
     if (markerAttribute != null) {
       openTelemetryAppender.setCaptureMarkerAttribute(markerAttribute);
     }
 
     Boolean keyValuePairAttributes =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes");
     if (keyValuePairAttributes != null) {
       openTelemetryAppender.setCaptureKeyValuePairAttributes(keyValuePairAttributes);
     }
 
     Boolean logAttributes =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental-log-attributes");
     if (logAttributes != null) {
       openTelemetryAppender.setCaptureExperimentalAttributes(logAttributes);
     }
 
     Boolean loggerContextAttributes =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-logger-context-attributes");
     if (loggerContextAttributes != null) {
       openTelemetryAppender.setCaptureLoggerContext(loggerContextAttributes);
     }
 
     Boolean captureTemplate =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-template");
     if (captureTemplate != null) {
       openTelemetryAppender.setCaptureTemplate(captureTemplate);
     }
 
     Boolean captureArguments =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-arguments");
     if (captureArguments != null) {
       openTelemetryAppender.setCaptureArguments(captureArguments);
     }
 
     Boolean captureLogstashMarkerAttributes =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-logstash-marker-attributes");
     if (captureLogstashMarkerAttributes != null) {
       openTelemetryAppender.setCaptureLogstashMarkerAttributes(captureLogstashMarkerAttributes);
     }
 
     Boolean captureLogstashStructuredArguments =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent,
             "otel.instrumentation.logback-appender.experimental.capture-logstash-structured-arguments");
     if (captureLogstashStructuredArguments != null) {
@@ -203,7 +203,7 @@ private static void initializeMdcAppenderFromProperties(
     // org.springframework.boot.context.logging.LoggingApplicationListener, config properties not
     // available
     Boolean addBaggage =
-        evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+        evaluateBooleanProperty(
             applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-mdc.add-baggage");
     if (addBaggage != null) {
       openTelemetryAppender.setAddBaggage(addBaggage);
@@ -234,7 +234,8 @@ private static void initializeMdcAppenderFromProperties(
     }
   }
 
-  private static Boolean evaluateBooleanPropertyDeclarativeConfigOrLegacy(
+  /** Evaluates a boolean property, taking into account whether declarative config is in use. */
+  private static Boolean evaluateBooleanProperty(
       ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent, String property) {
     ConfigurableEnvironment environment = applicationEnvironmentPreparedEvent.getEnvironment();
     String key = property;