use Distribution node

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigProperties.java

@@ -30,12 +30,6 @@ public final class ConfigPropertiesBackedDeclarativeConfigProperties
 
   private static final String JAVA_COMMON_SERVICE_PEER_MAPPING = "java.common.service_peer_mapping";
 
-  private static final String AGENT_INSTRUMENTATION_MODE = "java.agent.instrumentation_mode";
-  private static final String SPRING_STARTER_INSTRUMENTATION_MODE =
-      "java.spring_starter.instrumentation_mode";
-  private static final String COMMON_DEFAULT_ENABLED =
-      "otel.instrumentation.common.default-enabled";
-
   private static final Map<String, String> SPECIAL_MAPPINGS;
 
   static {
@@ -115,17 +109,6 @@ private ConfigPropertiesBackedDeclarativeConfigProperties(
   @Nullable
   @Override
   public String getString(String name) {
-    String fullPath = pathWithName(name);
-
-    if (fullPath.equals(AGENT_INSTRUMENTATION_MODE)
-        || fullPath.equals(SPRING_STARTER_INSTRUMENTATION_MODE)) {
-      Boolean value = configProperties.getBoolean(COMMON_DEFAULT_ENABLED);
-      if (value != null) {
-        return value ? "default" : "none";
-      }
-      return null;
-    }
-
     return configProperties.getString(resolvePropertyKey(name));
   }
 
@@ -241,15 +224,7 @@ private String resolvePropertyKey(String name) {
       translatedPath.append(translateName(segments[i]));
     }
 
-    String translated = translatedPath.toString();
-
-    // Handle agent prefix: java.agent.* → otel.javaagent.*
-    if (translated.startsWith("agent.")) {
-      return "otel.java" + translated;
-    }
-
-    // Standard mapping
-    return "otel.instrumentation." + translated;
+    return "otel.instrumentation." + translatedPath;
   }
 
   private String pathWithName(String name) {

declarative-config-bridge/src/main/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridge.java

@@ -5,7 +5,6 @@
 
 package io.opentelemetry.instrumentation.config.bridge;
 
-import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
@@ -169,7 +168,7 @@ private <T> T getPropertyValue(
     DeclarativeConfigProperties target = baseNode;
     if (segments.length > 1) {
       for (int i = 0; i < segments.length - 1; i++) {
-        target = target.getStructured(segments[i], empty());
+        target = target.get(segments[i]);
       }
     }
     String lastPart = segments[segments.length - 1];

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/ConfigPropertiesBackedDeclarativeConfigPropertiesTest.java

@@ -76,15 +76,6 @@ void testTranslateName_withExperimentalInMiddle() {
         .isTrue();
   }
 
-  @Test
-  void testAgentPrefix() {
-    DeclarativeConfigProperties config = createConfig("otel.javaagent.experimental.indy", "true");
-
-    assertThat(config.getStructured("java").getStructured("agent").getBoolean("indy/development"))
-        .isNotNull()
-        .isTrue();
-  }
-
   @Test
   void testJmxPrefix() {
     DeclarativeConfigProperties config = createConfig("otel.jmx.enabled", "true");
@@ -243,61 +234,6 @@ void testWithoutJavaPrefix_doesNotMatch() {
         .isNull();
   }
 
-  @Test
-  void testAgentInstrumentationMode_getString_booleanTrue() {
-    DeclarativeConfigProperties config =
-        createConfig("otel.instrumentation.common.default-enabled", "true");
-
-    assertThat(
-            config.getStructured("java").getStructured("agent").getString("instrumentation_mode"))
-        .isEqualTo("default");
-  }
-
-  @Test
-  void testAgentInstrumentationMode_getString_booleanFalse() {
-    DeclarativeConfigProperties config =
-        createConfig("otel.instrumentation.common.default-enabled", "false");
-
-    assertThat(
-            config.getStructured("java").getStructured("agent").getString("instrumentation_mode"))
-        .isEqualTo("none");
-  }
-
-  @Test
-  void testSpringStarterInstrumentationMode_getString_booleanTrue() {
-    DeclarativeConfigProperties config =
-        createConfig("otel.instrumentation.common.default-enabled", "true");
-
-    assertThat(
-            config
-                .getStructured("java")
-                .getStructured("spring_starter")
-                .getString("instrumentation_mode"))
-        .isEqualTo("default");
-  }
-
-  @Test
-  void testSpringStarterInstrumentationMode_getString_booleanFalse() {
-    DeclarativeConfigProperties config =
-        createConfig("otel.instrumentation.common.default-enabled", "false");
-
-    assertThat(
-            config
-                .getStructured("java")
-                .getStructured("spring_starter")
-                .getString("instrumentation_mode"))
-        .isEqualTo("none");
-  }
-
-  @Test
-  void testAgentInstrumentationMode_notSet() {
-    DeclarativeConfigProperties config = createConfig("some.other.property", "value");
-
-    assertThat(
-            config.getStructured("java").getStructured("agent").getString("instrumentation_mode"))
-        .isNull();
-  }
-
   private static DeclarativeConfigProperties createConfig(String key, String value) {
     Map<String, String> properties = new HashMap<>();
     properties.put(key, value);

declarative-config-bridge/src/test/java/io/opentelemetry/instrumentation/config/bridge/DeclarativeConfigPropertiesBridgeTest.java

@@ -5,12 +5,10 @@
 
 package io.opentelemetry.instrumentation.config.bridge;
 
-import static java.util.Objects.requireNonNull;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.internal.SdkConfigProvider;
 import java.time.Duration;
@@ -23,22 +21,10 @@
 class DeclarativeConfigPropertiesBridgeTest {
 
   private ConfigProperties bridge;
-  private ConfigProperties emptyBridge;
 
   @BeforeEach
   void setup() {
     bridge = create(new DeclarativeConfigPropertiesBridgeBuilder());
-
-    OpenTelemetryConfigurationModel emptyModel =
-        new OpenTelemetryConfigurationModel()
-            .withAdditionalProperty(
-                "instrumentation/development", new ExperimentalInstrumentationModel());
-    SdkConfigProvider emptyConfigProvider =
-        SdkConfigProvider.create(DeclarativeConfiguration.toConfigProperties(emptyModel));
-    emptyBridge =
-        new DeclarativeConfigPropertiesBridgeBuilder()
-            .buildFromInstrumentationConfig(
-                requireNonNull(emptyConfigProvider.getInstrumentationConfig()));
   }
 
   private static ConfigProperties create(DeclarativeConfigPropertiesBridgeBuilder builder) {
@@ -58,9 +44,6 @@ void getProperties() {
     // asking for properties which don't exist or inaccessible shouldn't result in an error
     assertThat(bridge.getString("file_format")).isNull();
     assertThat(bridge.getString("file_format", "foo")).isEqualTo("foo");
-    assertThat(emptyBridge.getBoolean("otel.instrumentation.common.default-enabled")).isNull();
-    assertThat(emptyBridge.getBoolean("otel.instrumentation.common.default-enabled", true))
-        .isTrue();
 
     // common cases
     assertThat(bridge.getBoolean("otel.instrumentation.runtime-telemetry.enabled")).isFalse();

instrumentation/oshi/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/oshi/OshiMetricsInstaller.java

@@ -6,9 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.oshi;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.api.incubator.config.internal.DeclarativeConfigUtil;
 import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.javaagent.tooling.config.AgentConfig;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.AgentDistributionConfig;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 import java.lang.reflect.Method;
 
@@ -21,11 +20,8 @@ public class OshiMetricsInstaller implements AgentListener {
 
   @Override
   public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
-    boolean enabled =
-        DeclarativeConfigUtil.getInstrumentationConfig(
-                autoConfiguredSdk.getOpenTelemetrySdk(), "oshi")
-            .getBoolean("enabled", AgentConfig.instrumentationMode().equals("default"));
-    if (!enabled) {
+    AgentDistributionConfig config = AgentDistributionConfig.get();
+    if (!config.isInstrumentationEnabled("oshi")) {
       return;
     }
 

instrumentation/runtime-telemetry/runtime-telemetry-java17/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java17/Java17RuntimeMetricsInstaller.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.runtimemetrics.java17.RuntimeMetrics;
 import io.opentelemetry.instrumentation.runtimemetrics.java17.internal.RuntimeMetricsConfigUtil;
 import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.javaagent.tooling.config.AgentConfig;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.AgentDistributionConfig;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 
 /** An {@link AgentListener} that enables runtime metrics during agent startup. */
@@ -23,7 +23,7 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
         RuntimeMetricsConfigUtil.configure(
             RuntimeMetrics.builder(GlobalOpenTelemetry.get()),
             GlobalOpenTelemetry.get(),
-            AgentConfig.instrumentationMode());
+            AgentDistributionConfig.get().isInstrumentationDefaultEnabled());
     if (runtimeMetrics != null) {
       Runtime.getRuntime()
           .addShutdownHook(

instrumentation/runtime-telemetry/runtime-telemetry-java17/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java17/internal/RuntimeMetricsConfigUtil.java

@@ -20,7 +20,7 @@ private RuntimeMetricsConfigUtil() {}
 
   @Nullable
   public static RuntimeMetrics configure(
-      RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, String instrumentationMode) {
+      RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, boolean defaultEnabled) {
     /*
     By default, don't use any JFR metrics. May change this once semantic conventions are updated.
     If enabled, default to only the metrics not already covered by runtime-telemetry-java8
@@ -33,7 +33,7 @@ public static RuntimeMetrics configure(
         .getBoolean("enabled", false)) {
       // default configuration
     } else if (DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry")
-        .getBoolean("enabled", instrumentationMode.equals("default"))) {
+        .getBoolean("enabled", defaultEnabled)) {
       // This only uses metrics gathered by JMX
       builder.disableAllFeatures();
     } else {

instrumentation/runtime-telemetry/runtime-telemetry-java8/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/runtimemetrics/java8/Java8RuntimeMetricsInstaller.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.instrumentation.runtimemetrics.java8.RuntimeMetrics;
 import io.opentelemetry.instrumentation.runtimemetrics.java8.internal.RuntimeMetricsConfigUtil;
 import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.javaagent.tooling.config.AgentConfig;
+import io.opentelemetry.javaagent.extension.instrumentation.internal.AgentDistributionConfig;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
 
 /** An {@link AgentListener} that enables runtime metrics during agent startup. */
@@ -27,7 +27,7 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredSdk) {
         RuntimeMetricsConfigUtil.configure(
             RuntimeMetrics.builder(GlobalOpenTelemetry.get()),
             GlobalOpenTelemetry.get(),
-            AgentConfig.instrumentationMode());
+            AgentDistributionConfig.get().isInstrumentationDefaultEnabled());
     if (runtimeMetrics != null) {
       Runtime.getRuntime()
           .addShutdownHook(

instrumentation/runtime-telemetry/runtime-telemetry-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/internal/RuntimeMetricsConfigUtil.java

@@ -21,10 +21,10 @@ private RuntimeMetricsConfigUtil() {}
 
   @Nullable
   public static RuntimeMetrics configure(
-      RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, String instrumentationMode) {
+      RuntimeMetricsBuilder builder, OpenTelemetry openTelemetry, boolean defaultEnabled) {
     DeclarativeConfigProperties config =
         DeclarativeConfigUtil.getInstrumentationConfig(openTelemetry, "runtime_telemetry");
-    if (!config.getBoolean("enabled", instrumentationMode.equals("default"))) {
+    if (!config.getBoolean("enabled", defaultEnabled)) {
       // nothing is enabled
       return null;
     }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/EarlyConfig.java

@@ -5,7 +5,9 @@
 
 package io.opentelemetry.instrumentation.spring.autoconfigure.internal;
 
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
+import static java.util.Collections.emptyList;
+
+import java.util.List;
 import org.springframework.core.env.Environment;
 
 /**
@@ -18,7 +20,7 @@ private EarlyConfig() {}
   public static boolean otelEnabled(Environment environment) {
     boolean disabled =
         environment.getProperty(
-            getPropertyName(environment, "otel.sdk.disabled", "otel.disabled"),
+            isDeclarativeConfig(environment) ? "otel.disabled" : "otel.sdk.disabled",
             Boolean.class,
             false);
     return !disabled;
@@ -28,48 +30,43 @@ public static boolean isDeclarativeConfig(Environment environment) {
     return environment.getProperty("otel.file_format", String.class) != null;
   }
 
-  public static boolean isDefaultEnabled(Environment environment) {
+  @SuppressWarnings("unchecked") // Spring's Environment.getProperty with List.class returns raw
+  public static boolean isInstrumentationEnabled(
+      Environment environment, String name, boolean enabledByDefault) {
     if (isDeclarativeConfig(environment)) {
-      String mode =
+      String snakeCase = name.replace('-', '_');
+
+      List<String> disabled =
+          environment.getProperty(
+              "otel.distribution.spring_starter.instrumentation.disabled", List.class, emptyList());
+      if (disabled.contains(snakeCase)) {
+        return false;
+      }
+
+      List<String> enabled =
           environment.getProperty(
-              "otel.instrumentation/development.java.spring_starter.instrumentation_mode",
-              String.class,
-              "default");
+              "otel.distribution.spring_starter.instrumentation.enabled", List.class, emptyList());
+      if (enabled.contains(snakeCase)) {
+        return true;
+      }
 
-      switch (mode) {
-        case "none":
-          return false;
-        case "default":
-          return true;
-        default:
-          throw new ConfigurationException("Unknown instrumentation mode: " + mode);
+      if (!enabledByDefault) {
+        return false;
       }
-    } else {
       return environment.getProperty(
-          "otel.instrumentation.common.default-enabled", Boolean.class, true);
+          "otel.distribution.spring_starter.instrumentation.default_enabled", Boolean.class, true);
     }
-  }
 
-  public static boolean isInstrumentationEnabled(
-      Environment environment, String name, boolean defaultValue) {
-    String property =
-        getPropertyName(
-            environment,
-            String.format("otel.instrumentation.%s.enabled", name),
-            String.format(
-                "otel.instrumentation/development.java.%s.enabled", name.replace('-', '_')));
-    Boolean explicit = environment.getProperty(property, Boolean.class);
+    Boolean explicit =
+        environment.getProperty(
+            String.format("otel.instrumentation.%s.enabled", name), Boolean.class);
     if (explicit != null) {
       return explicit;
     }
-    if (!defaultValue) {
+    if (!enabledByDefault) {
       return false;
     }
-    return isDefaultEnabled(environment);
-  }
-
-  private static String getPropertyName(
-      Environment environment, String propertyBased, String declarative) {
-    return isDeclarativeConfig(environment) ? declarative : propertyBased;
+    return environment.getProperty(
+        "otel.instrumentation.common.default-enabled", Boolean.class, true);
   }
 }