use declarative config properties

Author: zeitlinger

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

@@ -7,7 +7,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import org.springframework.core.env.Environment;
 
 /**
@@ -39,11 +38,39 @@ public static Boolean isDeclarativeConfig(Environment environment) {
 
   public static String translatePropertyName(Environment environment, String name) {
     if (isDeclarativeConfig(environment)) {
-      return Objects.requireNonNull(
-          DECLARATIVE_CONFIG_PROPERTY_MAPPING.get(name),
+      String value = DECLARATIVE_CONFIG_PROPERTY_MAPPING.get(name);
+      if (value != null) {
+        return value;
+      }
+      if (name.startsWith("otel.instrumentation.")) {
+        return String.format(
+            "otel.instrumentation/development.java.%s",
+            name.substring("otel.instrumentation.".length()));
+      }
+
+      throw new IllegalStateException(
           "No mapping found for property name: " + name + ". Please report this bug.");
     } else {
       return name;
     }
   }
+
+  public static boolean isInstrumentationEnabled(
+      Environment environment, String name, boolean defaultValue) {
+    Boolean explicit =
+        environment.getProperty(
+            String.format(
+                translatePropertyName(environment, "otel.instrumentation.%s.enabled"), name),
+            Boolean.class);
+    if (explicit != null) {
+      return explicit;
+    }
+    if (!defaultValue) {
+      return false;
+    }
+    return environment.getProperty(
+        translatePropertyName(environment, "otel.instrumentation.common.default-enabled"),
+        Boolean.class,
+        true);
+  }
 }

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

@@ -5,13 +5,10 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
-import static io.opentelemetry.instrumentation.spring.autoconfigure.internal.EarlyConfig.translatePropertyName;
-
 import java.util.Map;
 import java.util.Objects;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
-import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 /**
@@ -26,23 +23,9 @@ public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata)
         Objects.requireNonNull(
             metadata.getAnnotationAttributes(ConditionalOnEnabledInstrumentation.class.getName()));
 
-    Environment environment = context.getEnvironment();
-
-    String name =
-        String.format(
-            translatePropertyName(environment, "otel.instrumentation.%s.enabled"),
-            attributes.get("module"));
-    Boolean explicit = environment.getProperty(name, Boolean.class);
-    if (explicit != null) {
-      return explicit;
-    }
-    boolean defaultValue = (boolean) attributes.get("enabledByDefault");
-    if (!defaultValue) {
-      return false;
-    }
-    return environment.getProperty(
-        translatePropertyName(environment, "otel.instrumentation.common.default-enabled"),
-        Boolean.class,
-        true);
+    return EarlyConfig.isInstrumentationEnabled(
+        context.getEnvironment(),
+        attributes.get("module").toString(),
+        (boolean) attributes.get("enabledByDefault"));
   }
 }

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

@@ -16,6 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
+import org.springframework.core.env.ConfigurableEnvironment;
 
 class LogbackAppenderInstaller {
 
@@ -41,25 +42,18 @@ static void install(ApplicationEnvironmentPreparedEvent applicationEnvironmentPr
     }
   }
 
-  private static boolean isLogbackAppenderAddable(
-      ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {
-    return isAppenderAddable(
-        applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-appender.enabled");
+  private static boolean isLogbackAppenderAddable(ApplicationEnvironmentPreparedEvent event) {
+    return isAppenderAddable(event, "logback-appender");
   }
 
-  private static boolean isLogbackMdcAppenderAddable(
-      ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {
-    return isAppenderAddable(
-        applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-mdc.enabled");
+  private static boolean isLogbackMdcAppenderAddable(ApplicationEnvironmentPreparedEvent event) {
+    return isAppenderAddable(event, "logback-mdc");
   }
 
-  private static boolean isAppenderAddable(
-      ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent, String property) {
-    boolean otelEnabled =
-        EarlyConfig.otelEnabled(applicationEnvironmentPreparedEvent.getEnvironment());
-    boolean logbackInstrumentationEnabled =
-        evaluateBooleanProperty(applicationEnvironmentPreparedEvent, property, true);
-    return otelEnabled && logbackInstrumentationEnabled;
+  private static boolean isAppenderAddable(ApplicationEnvironmentPreparedEvent event, String name) {
+    ConfigurableEnvironment environment = event.getEnvironment();
+    return EarlyConfig.otelEnabled(environment)
+        && EarlyConfig.isInstrumentationEnabled(environment, name, true);
   }
 
   private static void reInitializeOpenTelemetryAppender(
@@ -225,18 +219,9 @@ private static void initializeMdcAppenderFromProperties(
 
   private static Boolean evaluateBooleanProperty(
       ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent, String property) {
-    return applicationEnvironmentPreparedEvent
-        .getEnvironment()
-        .getProperty(property, Boolean.class);
-  }
-
-  private static boolean evaluateBooleanProperty(
-      ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent,
-      String property,
-      boolean defaultValue) {
-    return applicationEnvironmentPreparedEvent
-        .getEnvironment()
-        .getProperty(property, Boolean.class, defaultValue);
+    ConfigurableEnvironment environment = applicationEnvironmentPreparedEvent.getEnvironment();
+    return environment.getProperty(
+        EarlyConfig.translatePropertyName(environment, property), Boolean.class);
   }
 
   private static <T> Optional<T> findAppender(Class<T> appenderClass) {