simplify

Author: zeitlinger

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

@@ -6,9 +6,6 @@
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-import java.util.HashMap;
-import java.util.Map;
-import javax.annotation.Nullable;
 import org.springframework.core.env.Environment;
 
 /**
@@ -18,17 +15,13 @@
 public class EarlyConfig {
   private EarlyConfig() {}
 
-  private static final Map<String, String> DECLARATIVE_CONFIG_PROPERTY_MAPPING = new HashMap<>();
-
-  static {
-    DECLARATIVE_CONFIG_PROPERTY_MAPPING.put("otel.sdk.disabled", "otel.disabled");
-    DECLARATIVE_CONFIG_PROPERTY_MAPPING.put(
-        "otel.instrumentation.%s.enabled", "otel.instrumentation/development.java.%s.enabled");
-  }
-
   public static boolean otelEnabled(Environment environment) {
-    return !environment.getProperty(
-        translatePropertyName(environment, "otel.sdk.disabled", null), Boolean.class, false);
+    boolean disabled =
+        environment.getProperty(
+            getPropertyName(environment, "otel.sdk.disabled", "otel.disabled"),
+            Boolean.class,
+            false);
+    return !disabled;
   }
 
   public static boolean isDeclarativeConfig(Environment environment) {
@@ -57,44 +50,33 @@ public static boolean isDefaultEnabled(Environment environment) {
     }
   }
 
-  public static String translatePropertyName(
-      Environment environment, String name, @Nullable String arg) {
+  public static String translatePropertyName(Environment environment, String name) {
     if (isDeclarativeConfig(environment)) {
-      String key = declarativeConfigKey(name);
-      if (arg != null) {
-        key = String.format(key, arg);
+      if (name.startsWith("otel.instrumentation.")) {
+        return String.format(
+                "otel.instrumentation/development.java.%s",
+                name.substring("otel.instrumentation.".length()))
+            .replace('-', '_');
       }
-      return key.replace('-', '_');
-    } else {
-      String key = name;
-      if (arg != null) {
-        key = String.format(key, arg);
-      }
-      return key;
-    }
-  }
 
-  private static String declarativeConfigKey(String 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;
     }
-
-    throw new IllegalStateException(
-        "No mapping found for property name: " + name + ". Please report this bug.");
   }
 
   public static boolean isInstrumentationEnabled(
       Environment environment, String name, boolean defaultValue) {
-    Boolean explicit =
+    String property =
         environment.getProperty(
-            translatePropertyName(environment, "otel.instrumentation.%s.enabled", name),
-            Boolean.class);
+            String.format(
+                getPropertyName(
+                    environment,
+                    "otel.instrumentation.%s.enabled",
+                    "otel.instrumentation/development.java.%s.enabled")),
+            name);
+    Boolean explicit = environment.getProperty(property, Boolean.class);
     if (explicit != null) {
       return explicit;
     }
@@ -103,4 +85,9 @@ public static boolean isInstrumentationEnabled(
     }
     return isDefaultEnabled(environment);
   }
+
+  private static String getPropertyName(
+      Environment environment, String propertyBased, String declarative) {
+    return isDeclarativeConfig(environment) ? declarative : propertyBased;
+  }
 }

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

@@ -221,7 +221,7 @@ private static Boolean evaluateBooleanProperty(
       ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent, String property) {
     ConfigurableEnvironment environment = applicationEnvironmentPreparedEvent.getEnvironment();
     return environment.getProperty(
-        EarlyConfig.translatePropertyName(environment, property, null), Boolean.class);
+        EarlyConfig.translatePropertyName(environment, property), Boolean.class);
   }
 
   private static <T> Optional<T> findAppender(Class<T> appenderClass) {