map "common-enabled"

Author: zeitlinger

javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java

@@ -50,9 +50,15 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
+  private static final Map<String, String> MAPPING_RULES = new HashMap<>();
+
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
 
+  static {
+    MAPPING_RULES.put("otel.instrumentation.common.default-enabled", "common.default.enabled");
+  }
+
   DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties instrumentationNode) {
     instrumentationJavaNode = instrumentationNode.getStructured("java", empty());
   }
@@ -133,9 +139,8 @@ private <T> T getPropertyValue(
     if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
       return null;
     }
-    String suffix = property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
     // Split the remainder of the property on ".", and walk to the N-1 entry
-    String[] segments = suffix.split("\\.");
+    String[] segments = getSuffix(property).split("\\.");
     if (segments.length == 0) {
       return null;
     }
@@ -148,4 +153,13 @@ private <T> T getPropertyValue(
     String lastPart = segments[segments.length - 1];
     return extractor.apply(target, lastPart);
   }
+
+  private static String getSuffix(String property) {
+    String special = MAPPING_RULES.get(property);
+    if (special != null) {
+      return special;
+    }
+
+    return property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
+  }
 }

javaagent-extension-api/src/test/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridgeTest.java

@@ -29,7 +29,8 @@ class DeclarativeConfigPropertiesBridgeTest {
           + "instrumentation/development:\n"
           + "  java:\n"
           + "    common:\n"
-          + "      default_enabled: true\n"
+          + "      default:\n"
+          + "        enabled: true\n"
           + "    runtime_telemetry:\n"
           + "      enabled: false\n"
           + "    example_instrumentation:\n"

javaagent-tooling/src/test/resources/config.yaml

@@ -1,7 +1,8 @@
 instrumentation:
   java:
     common:
-      default_enabled: true
+      default:
+        enabled: true
     runtime_telemetry:
       enabled: false
     external_annotations: