Fix declarative config bridge mapping and add tests (#15697)

Author: trask

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java

@@ -29,20 +29,20 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
 
   private static final String GENERAL_PEER_SERVICE_MAPPING = "general.peer.service_mapping";
 
-  private static final Map<String, String> LIST_MAPPINGS;
+  private static final Map<String, String> SPECIAL_MAPPINGS;
 
   static {
-    LIST_MAPPINGS = new HashMap<>();
-    LIST_MAPPINGS.put(
+    SPECIAL_MAPPINGS = new HashMap<>();
+    SPECIAL_MAPPINGS.put(
         "general.http.client.request_captured_headers",
         "otel.instrumentation.http.client.capture-request-headers");
-    LIST_MAPPINGS.put(
+    SPECIAL_MAPPINGS.put(
         "general.http.client.response_captured_headers",
         "otel.instrumentation.http.client.capture-response-headers");
-    LIST_MAPPINGS.put(
+    SPECIAL_MAPPINGS.put(
         "general.http.server.request_captured_headers",
         "otel.instrumentation.http.server.capture-request-headers");
-    LIST_MAPPINGS.put(
+    SPECIAL_MAPPINGS.put(
         "general.http.server.response_captured_headers",
         "otel.instrumentation.http.server.capture-response-headers");
   }
@@ -65,36 +65,31 @@ private ConfigPropertiesBackedDeclarativeConfigProperties(
   @Nullable
   @Override
   public String getString(String name) {
-    String fullPath = pathWithName(name);
-    return configProperties.getString(toPropertyKey(fullPath));
+    return configProperties.getString(resolvePropertyKey(name));
   }
 
   @Nullable
   @Override
   public Boolean getBoolean(String name) {
-    String fullPath = pathWithName(name);
-    return configProperties.getBoolean(toPropertyKey(fullPath));
+    return configProperties.getBoolean(resolvePropertyKey(name));
   }
 
   @Nullable
   @Override
   public Integer getInt(String name) {
-    String fullPath = pathWithName(name);
-    return configProperties.getInt(toPropertyKey(fullPath));
+    return configProperties.getInt(resolvePropertyKey(name));
   }
 
   @Nullable
   @Override
   public Long getLong(String name) {
-    String fullPath = pathWithName(name);
-    return configProperties.getLong(toPropertyKey(fullPath));
+    return configProperties.getLong(resolvePropertyKey(name));
   }
 
   @Nullable
   @Override
   public Double getDouble(String name) {
-    String fullPath = pathWithName(name);
-    return configProperties.getDouble(toPropertyKey(fullPath));
+    return configProperties.getDouble(resolvePropertyKey(name));
   }
 
   /**
@@ -117,20 +112,7 @@ public <T> List<T> getScalarList(String name, Class<T> scalarType) {
     if (scalarType != String.class) {
       return null;
     }
-    String fullPath = pathWithName(name);
-
-    // Check explicit list mappings first
-    String mappedKey = LIST_MAPPINGS.get(fullPath);
-    if (mappedKey != null) {
-      List<String> list = configProperties.getList(mappedKey);
-      if (!list.isEmpty()) {
-        return (List<T>) list;
-      }
-      return null;
-    }
-
-    // Standard mapping
-    List<String> list = configProperties.getList(toPropertyKey(fullPath));
+    List<String> list = configProperties.getList(resolvePropertyKey(name));
     if (list.isEmpty()) {
       return null;
     }
@@ -158,49 +140,59 @@ public ComponentLoader getComponentLoader() {
     return configProperties.getComponentLoader();
   }
 
-  private String pathWithName(String name) {
-    if (path.isEmpty()) {
-      return name;
+  private String resolvePropertyKey(String name) {
+    String fullPath = pathWithName(name);
+
+    // Check explicit property mappings first
+    String mappedKey = SPECIAL_MAPPINGS.get(fullPath);
+    if (mappedKey != null) {
+      return mappedKey;
     }
-    return String.join(".", path) + "." + name;
-  }
 
-  private static String toPropertyKey(String fullPath) {
-    String translatedPath = translatePath(fullPath);
+    if (!fullPath.startsWith("java.")) {
+      return "";
+    }
+
+    // Remove "java." prefix and translate the remaining path
+    String[] segments = fullPath.substring(5).split("\\.");
+    StringBuilder translatedPath = new StringBuilder();
+
+    for (int i = 0; i < segments.length; i++) {
+      if (i > 0) {
+        translatedPath.append(".");
+      }
+      translatedPath.append(translateName(segments[i]));
+    }
+
+    String translated = translatedPath.toString();
 
     // Handle agent prefix: java.agent.* → otel.javaagent.*
-    if (translatedPath.startsWith("agent.")) {
-      return "otel.java" + translatedPath;
+    if (translated.startsWith("agent.")) {
+      return "otel.java" + translated;
     }
 
     // Handle jmx prefix: java.jmx.* → otel.jmx.*
-    if (translatedPath.startsWith("jmx.")) {
-      return "otel." + translatedPath;
+    if (translated.startsWith("jmx.")) {
+      return "otel." + translated;
     }
 
     // Standard mapping
-    return "otel.instrumentation." + translatedPath;
+    return "otel.instrumentation." + translated;
   }
 
-  private static String translatePath(String path) {
-    StringBuilder result = new StringBuilder();
-    for (String segment : path.split("\\.")) {
-      // Skip "java" segment - it doesn't exist in system properties
-      if ("java".equals(segment)) {
-        continue;
-      }
-      if (result.length() > 0) {
-        result.append(".");
-      }
-      result.append(translateName(segment));
+  private String pathWithName(String name) {
+    if (path.isEmpty()) {
+      return name;
     }
-    return result.toString();
+    return String.join(".", path) + "." + name;
   }
 
   private static String translateName(String name) {
     if (name.endsWith("/development")) {
-      return "experimental."
-          + name.substring(0, name.length() - "/development".length()).replace('_', '-');
+      name = name.substring(0, name.length() - "/development".length());
+      if (!name.contains("experimental")) {
+        name = "experimental." + name;
+      }
     }
     return name.replace('_', '-');
   }