early init config

Author: zeitlinger

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

@@ -47,7 +47,7 @@
  *         string_key: value
  * </pre>
  */
-final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
+public final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
   private static final String OTEL_JAVA_AGENT_PREFIX = "otel.javaagent.";
@@ -64,7 +64,7 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
     MAPPING_RULES.put("otel.instrumentation.common.default-enabled", "common.default.enabled");
   }
 
-  DeclarativeConfigPropertiesBridge(ConfigProvider configProvider) {
+  public DeclarativeConfigPropertiesBridge(ConfigProvider configProvider) {
     DeclarativeConfigProperties inst = configProvider.getInstrumentationConfig();
     if (inst == null) {
       inst = DeclarativeConfigProperties.empty();

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

@@ -164,7 +164,7 @@ private static void installBytebuddyAgent(
     // If noop OpenTelemetry is enabled, autoConfiguredSdk will be null and AgentListeners are not
     // called
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        installOpenTelemetrySdk(extensionClassLoader);
+        installOpenTelemetrySdk(extensionClassLoader, earlyConfig.getConfigurationModel());
 
     ConfigProperties sdkConfig = AgentListener.resolveConfigProperties(autoConfiguredSdk);
     AgentInstrumentationConfig.internalInitializeConfig(

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java

@@ -9,6 +9,8 @@
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import javax.annotation.Nullable;
 import java.util.Arrays;
 
 public final class OpenTelemetryInstaller {
@@ -20,7 +22,11 @@ public final class OpenTelemetryInstaller {
    * @return the {@link AutoConfiguredOpenTelemetrySdk}
    */
   public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
-      ClassLoader extensionClassLoader) {
+      ClassLoader extensionClassLoader,
+      @Nullable OpenTelemetryConfigurationModel configurationModel) {
+
+    // todo load from configurationModel if not null
+
 
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
         AutoConfiguredOpenTelemetrySdk.builder()

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/config/EarlyInitAgentConfig.java

@@ -5,8 +5,19 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
+import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.instrumentation.api.internal.ConfigPropertiesUtil;
+import io.opentelemetry.javaagent.extension.DeclarativeConfigPropertiesBridge;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.SdkConfigProvider;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Collections;
 import java.util.Map;
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /**
@@ -16,17 +27,54 @@
 public final class EarlyInitAgentConfig {
 
   public static EarlyInitAgentConfig create() {
-    return new EarlyInitAgentConfig(ConfigurationFile.getProperties());
+    String configurationFile =
+        DefaultConfigProperties.create(Collections.emptyMap())
+            .getString("otel.experimental.config.file");
+
+    return configurationFile != null
+        ? new EarlyInitAgentConfig(loadConfigurationModel(configurationFile))
+        : new EarlyInitAgentConfig(ConfigurationFile.getProperties());
   }
 
   private final Map<String, String> configFileContents;
+  private final @Nullable OpenTelemetryConfigurationModel configurationModel;
+  private final @Nullable ConfigProvider configProvider;
+  private final @Nullable ConfigProperties declarativeConfigProperties;
 
   private EarlyInitAgentConfig(Map<String, String> configFileContents) {
     this.configFileContents = configFileContents;
+    this.configurationModel = null;
+    this.configProvider = null;
+    this.declarativeConfigProperties = null;
+  }
+
+  private EarlyInitAgentConfig(@Nonnull OpenTelemetryConfigurationModel configurationModel) {
+    this.configFileContents = null;
+    this.configurationModel = configurationModel;
+    this.configProvider = SdkConfigProvider.create(configurationModel);
+    this.declarativeConfigProperties = new DeclarativeConfigPropertiesBridge(this.configProvider);
+  }
+
+  @Nullable
+  public OpenTelemetryConfigurationModel getConfigurationModel() {
+    return configurationModel;
+  }
+
+  @Nullable
+  public ConfigProvider getConfigProvider() {
+    return configProvider;
+  }
+
+  @Nullable
+  public ConfigProperties getDeclarativeConfigProperties() {
+    return declarativeConfigProperties;
   }
 
   @Nullable
   public String getString(String propertyName) {
+    if (declarativeConfigProperties != null) {
+      return declarativeConfigProperties.getString(propertyName);
+    }
     String value = ConfigPropertiesUtil.getString(propertyName);
     if (value != null) {
       return value;
@@ -35,13 +83,20 @@ public String getString(String propertyName) {
   }
 
   public boolean getBoolean(String propertyName, boolean defaultValue) {
+    if (declarativeConfigProperties != null) {
+      return declarativeConfigProperties.getBoolean(propertyName, defaultValue);
+    }
+
     String configFileValueStr = configFileContents.get(propertyName);
     boolean configFileValue =
         configFileValueStr == null ? defaultValue : Boolean.parseBoolean(configFileValueStr);
     return ConfigPropertiesUtil.getBoolean(propertyName, configFileValue);
   }
 
   public int getInt(String propertyName, int defaultValue) {
+    if (declarativeConfigProperties != null) {
+      return declarativeConfigProperties.getInt(propertyName, defaultValue);
+    }
     try {
       String configFileValueStr = configFileContents.get(propertyName);
       int configFileValue =
@@ -55,4 +110,12 @@ public int getInt(String propertyName, int defaultValue) {
   public void logEarlyConfigErrorsIfAny() {
     ConfigurationFile.logErrorIfAny();
   }
+
+  private static OpenTelemetryConfigurationModel loadConfigurationModel(String configurationFile) {
+    try (FileInputStream fis = new FileInputStream(configurationFile)) {
+      return DeclarativeConfiguration.parse(fis);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }

javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/OpenTelemetryInstallerTest.groovy

@@ -21,7 +21,7 @@ class OpenTelemetryInstallerTest extends Specification {
 
   def "should initialize GlobalOpenTelemetry"() {
     when:
-    def autoConfiguredSdk = OpenTelemetryInstaller.installOpenTelemetrySdk(OpenTelemetryInstaller.classLoader)
+    def autoConfiguredSdk = OpenTelemetryInstaller.installOpenTelemetrySdk(OpenTelemetryInstaller.classLoader, null)
 
     then:
     autoConfiguredSdk != null

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/ConfigurationPropertiesSupplierTest.java

@@ -46,7 +46,7 @@ void fileConfigOverwritesUserPropertiesSupplier(@TempDir Path tempDir) throws IO
 
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader(), null);
 
     // then
     assertThat(AutoConfigureUtil.getConfig(autoConfiguredSdk).getString("custom.key"))

javaagent-tooling/src/test/java/io/opentelemetry/javaagent/tooling/config/OtlpProtocolPropertiesSupplierTest.java

@@ -29,7 +29,7 @@ void cleanUp() {
   void keepUserOtlpProtocolConfiguration() {
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader(), null);
 
     // then
     assertThat(
@@ -41,7 +41,7 @@ void keepUserOtlpProtocolConfiguration() {
   void defaultHttpProtobufOtlpProtocolConfiguration() {
     // when
     AutoConfiguredOpenTelemetrySdk autoConfiguredSdk =
-        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader());
+        OpenTelemetryInstaller.installOpenTelemetrySdk(this.getClass().getClassLoader(), null);
 
     // then
     assertThat(