agent properties, part 1

Author: zeitlinger

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

@@ -6,7 +6,6 @@
 package io.opentelemetry.javaagent.extension;
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
-import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -41,11 +40,7 @@ static ConfigProperties resolveConfigProperties(
     ConfigProvider configProvider =
         AutoConfigureUtil.getConfigProvider(autoConfiguredOpenTelemetrySdk);
     if (configProvider != null) {
-      DeclarativeConfigProperties instrumentationConfig = configProvider.getInstrumentationConfig();
-
-      if (instrumentationConfig != null) {
-        return new DeclarativeConfigPropertiesBridge(instrumentationConfig);
-      }
+      return new DeclarativeConfigPropertiesBridge(configProvider);
     }
     // Should never happen
     throw new IllegalStateException(

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

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import java.time.Duration;
@@ -49,18 +50,27 @@
 final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
+  private static final String OTEL_JAVA_AGENT_PREFIX = "otel.javaagent.";
+  private static final String OTEL_JAVA_AGENT_ENABLED = "otel.javaagent.enabled";
 
   private static final Map<String, String> MAPPING_RULES = new HashMap<>();
 
   // The node at .instrumentation.java
   private final DeclarativeConfigProperties instrumentationJavaNode;
+  // todo
+//  private final DeclarativeConfigProperties instrumentationGeneralNode;
 
   static {
     MAPPING_RULES.put("otel.instrumentation.common.default-enabled", "common.default.enabled");
   }
 
-  DeclarativeConfigPropertiesBridge(DeclarativeConfigProperties instrumentationNode) {
-    instrumentationJavaNode = instrumentationNode.getStructured("java", empty());
+  DeclarativeConfigPropertiesBridge(ConfigProvider configProvider) {
+    DeclarativeConfigProperties inst = configProvider.getInstrumentationConfig();
+    if (inst == null) {
+      inst = DeclarativeConfigProperties.empty();
+    }
+    instrumentationJavaNode = inst.getStructured("java", empty());
+//    instrumentationGeneralNode = inst.getStructured("general", empty());
   }
 
   @Nullable
@@ -72,6 +82,10 @@ public String getString(String propertyName) {
   @Nullable
   @Override
   public Boolean getBoolean(String propertyName) {
+    if (OTEL_JAVA_AGENT_ENABLED.equals(propertyName)) {
+      // todo
+    }
+
     return getPropertyValue(propertyName, DeclarativeConfigProperties::getBoolean);
   }
 
@@ -136,7 +150,8 @@ 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)) {
+    if (!property.startsWith(OTEL_INSTRUMENTATION_PREFIX)
+        && !property.startsWith(OTEL_JAVA_AGENT_PREFIX)) {
       return null;
     }
     // Split the remainder of the property on ".", and walk to the N-1 entry

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

@@ -33,17 +33,14 @@ void setup() {
                 .getClassLoader()
                 .getResourceAsStream("config.yaml"));
     SdkConfigProvider configProvider = SdkConfigProvider.create(model);
-    bridge =
-        new DeclarativeConfigPropertiesBridge(
-            Objects.requireNonNull(configProvider.getInstrumentationConfig()));
+    bridge = new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(configProvider));
 
     OpenTelemetryConfigurationModel emptyModel =
         new OpenTelemetryConfigurationModel()
             .withAdditionalProperty("instrumentation/development", new InstrumentationModel());
     SdkConfigProvider emptyConfigProvider = SdkConfigProvider.create(emptyModel);
     emptyBridge =
-        new DeclarativeConfigPropertiesBridge(
-            Objects.requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
+        new DeclarativeConfigPropertiesBridge(Objects.requireNonNull(emptyConfigProvider));
   }
 
   @Test
@@ -110,5 +107,8 @@ void getProperties() {
         .isEqualTo(Arrays.asList("value1", "value2"));
     assertThat(bridge.getMap("otel.instrumentation.other-instrumentation.map_key", expectedMap))
         .isEqualTo(expectedMap);
+
+    // todo agent properties
+    //    assertThat(bridge.getBoolean("otel.javaagent.enabled")).isFalse();
   }
 }

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

@@ -1,3 +1,4 @@
+disabled: true
 file_format: 0.4
 instrumentation/development:
   java: