map agent enabled

Author: zeitlinger

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

@@ -51,7 +51,6 @@ 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.";
-  private static final String OTEL_JAVA_AGENT_ENABLED = "otel.javaagent.enabled";
 
   private static final Map<String, String> MAPPING_RULES = new HashMap<>();
 
@@ -82,10 +81,6 @@ 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);
   }
 

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

@@ -79,8 +79,6 @@ public class AgentInstaller {
 
   private static final Logger logger = Logger.getLogger(AgentInstaller.class.getName());
 
-  static final String JAVAAGENT_ENABLED_CONFIG = "otel.javaagent.enabled";
-
   // This property may be set to force synchronous AgentListener#afterAgent() execution: the
   // condition for delaying the AgentListener initialization is pretty broad and in case it covers
   // too much javaagent users can file a bug, force sync execution by setting this property to true
@@ -106,7 +104,7 @@ public static void installBytebuddyAgent(
     }
 
     logVersionInfo();
-    if (earlyConfig.getBoolean(JAVAAGENT_ENABLED_CONFIG, true)) {
+    if (earlyConfig.isAgentEnabled()) {
       setupUnsafe(inst);
       List<AgentListener> agentListeners = loadOrdered(AgentListener.class, extensionClassLoader);
       installBytebuddyAgent(inst, extensionClassLoader, agentListeners, earlyConfig);

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

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.tooling.config;
 
-import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.javaagent.extension.DeclarativeConfigPropertiesBridge;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
@@ -21,25 +20,17 @@
  */
 public final class DeclarativeConfigEarlyInitAgentConfig implements EarlyInitAgentConfig {
   private final OpenTelemetryConfigurationModel configurationModel;
-  private final ConfigProvider configProvider;
   private final ConfigProperties declarativeConfigProperties;
 
   DeclarativeConfigEarlyInitAgentConfig(String configurationFile) {
     this.configurationModel = loadConfigurationModel(configurationFile);
-    this.configProvider = SdkConfigProvider.create(configurationModel);
-    this.declarativeConfigProperties = new DeclarativeConfigPropertiesBridge(this.configProvider);
+    this.declarativeConfigProperties =
+        new DeclarativeConfigPropertiesBridge(SdkConfigProvider.create(configurationModel));
   }
 
-  public OpenTelemetryConfigurationModel getConfigurationModel() {
-    return configurationModel;
-  }
-
-  public ConfigProvider getConfigProvider() {
-    return configProvider;
-  }
-
-  public ConfigProperties getDeclarativeConfigProperties() {
-    return declarativeConfigProperties;
+  @Override
+  public boolean isAgentEnabled() {
+    return configurationModel.getDisabled() != Boolean.TRUE;
   }
 
   @Nullable
@@ -55,8 +46,8 @@ public boolean getBoolean(String propertyName, boolean defaultValue) {
 
   @Override
   public int getInt(String propertyName, int defaultValue) {
-      return declarativeConfigProperties.getInt(propertyName, defaultValue);
-   }
+    return declarativeConfigProperties.getInt(propertyName, defaultValue);
+  }
 
   @Override
   public void logEarlyConfigErrorsIfAny() {

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

@@ -5,6 +5,8 @@
 import java.util.Collections;
 
 public interface EarlyInitAgentConfig {
+  boolean isAgentEnabled();
+
   @Nullable
   String getString(String propertyName);
 

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

@@ -15,12 +15,19 @@
  */
 public final class LegacyConfigFileEarlyInitAgentConfig implements EarlyInitAgentConfig {
 
+  static final String JAVAAGENT_ENABLED_CONFIG = "otel.javaagent.enabled";
+
   private final Map<String, String> configFileContents;
 
   LegacyConfigFileEarlyInitAgentConfig() {
     this.configFileContents = ConfigurationFile.getProperties();
   }
 
+  @Override
+  public boolean isAgentEnabled() {
+    return getBoolean(JAVAAGENT_ENABLED_CONFIG, true);
+  }
+
   @Nullable
   @Override
   public String getString(String propertyName) {