map agent props

Author: zeitlinger

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

@@ -56,8 +56,9 @@ public final class DeclarativeConfigPropertiesBridge implements ConfigProperties
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
+
   // todo
-//  private final DeclarativeConfigProperties instrumentationGeneralNode;
+  //  private final DeclarativeConfigProperties instrumentationGeneralNode;
 
   static {
     MAPPING_RULES.put("otel.instrumentation.common.default-enabled", "common.default.enabled");
@@ -69,7 +70,7 @@ public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider) {
       inst = DeclarativeConfigProperties.empty();
     }
     instrumentationJavaNode = inst.getStructured("java", empty());
-//    instrumentationGeneralNode = inst.getStructured("general", empty());
+    //    instrumentationGeneralNode = inst.getStructured("general", empty());
   }
 
   @Nullable
@@ -145,12 +146,13 @@ public Map<String, String> getMap(String propertyName) {
   @Nullable
   private <T> T getPropertyValue(
       String property, BiFunction<DeclarativeConfigProperties, String, T> extractor) {
-    if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)
-        && !property.startsWith(OTEL_JAVA_AGENT_PREFIX)) {
+    String suffix = getSuffix(property);
+    if (suffix == null) {
       return null;
     }
+
     // Split the remainder of the property on ".", and walk to the N-1 entry
-    String[] segments = getSuffix(property).split("\\.");
+    String[] segments = suffix.split("\\.");
     if (segments.length == 0) {
       return null;
     }
@@ -170,6 +172,11 @@ private static String getSuffix(String property) {
       return special;
     }
 
-    return property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
+    if (property.startsWith(OTEL_INSTRUMENTATION_PREFIX)) {
+      return property.substring(OTEL_INSTRUMENTATION_PREFIX.length()).replace('-', '_');
+    } else if (property.startsWith(OTEL_JAVA_AGENT_PREFIX)) {
+      return "agent." + property.substring(OTEL_JAVA_AGENT_PREFIX.length()).replace('-', '_');
+    }
+    return null;
   }
 }

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

@@ -108,7 +108,6 @@ void getProperties() {
     assertThat(bridge.getMap("otel.instrumentation.other-instrumentation.map_key", expectedMap))
         .isEqualTo(expectedMap);
 
-    // todo agent properties
-    //    assertThat(bridge.getBoolean("otel.javaagent.enabled")).isFalse();
+    assertThat(bridge.getBoolean("otel.javaagent.experimental.indy")).isTrue();
   }
 }

javaagent-extension-api/src/test/resources/config.yaml

@@ -3,6 +3,8 @@ file_format: 0.4
 instrumentation/development:
   java:
     agent:
+      experimental:
+        indy: true
     common:
       default:
         enabled: true