After merge followup

Author: robsunday

custom/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfigureUtil.java

@@ -26,10 +26,13 @@
 import io.opentelemetry.instrumentation.config.bridge.ConfigPropertiesBackedConfigProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalInstrumentationModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.InstrumentationModel;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.resources.Resource;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
@@ -85,7 +88,7 @@ public static DeclarativeConfigProperties getDistributionConfig(
 
   public static DeclarativeConfigProperties getDistributionConfig(
       OpenTelemetryConfigurationModel model) {
-    InstrumentationModel instrumentationModel = model.getInstrumentationDevelopment();
+    ExperimentalInstrumentationModel instrumentationModel = model.getInstrumentationDevelopment();
     if (instrumentationModel == null) {
       return empty();
     }
@@ -97,9 +100,14 @@ public static DeclarativeConfigProperties getDistributionConfig(
 
     ComponentLoader componentLoader =
         ComponentLoader.forClassLoader(DeclarativeConfigProperties.class.getClassLoader());
+    Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> original =
+        javaModel.getAdditionalProperties();
+    Map<String, Object> properties = new HashMap<>();
+    ExperimentalLanguageSpecificInstrumentationPropertyModel distribution = original.get(
+        "distribution");
+    properties.put("distribution", distribution != null ? distribution.getAdditionalProperties() : null);
     DeclarativeConfigProperties config =
-        YamlDeclarativeConfigProperties.create(
-            javaModel.getAdditionalProperties(), componentLoader);
+        YamlDeclarativeConfigProperties.create(properties, componentLoader);
 
     return config.getStructured("distribution", empty()); // Should this empty() be there?
   }

profiler/src/main/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfiguration.java

@@ -27,6 +27,8 @@ public class ProfilerDeclarativeConfiguration implements ProfilerConfiguration {
   private static final Logger logger =
       Logger.getLogger(ProfilerDeclarativeConfiguration.class.getName());
 
+  private static final String ROOT_NODE_NAME = "always_on";
+
   private static final String DEFAULT_PROFILER_DIRECTORY = System.getProperty("java.io.tmpdir");
   private static final long DEFAULT_RECORDING_DURATION = Duration.ofSeconds(20).toMillis();
   private static final long DEFAULT_SAMPLING_INTERVAL = Duration.ofSeconds(10).toMillis();
@@ -42,7 +44,7 @@ public ProfilerDeclarativeConfiguration(DeclarativeConfigProperties profilingCon
 
   @Override
   public boolean isEnabled() {
-    return !getConfigRoot().equals(empty());
+    return (profilingConfig != null) && profilingConfig.getPropertyKeys().contains(ROOT_NODE_NAME);
   }
 
   @Override
@@ -151,7 +153,7 @@ public DeclarativeConfigProperties getConfigProperties() {
   }
 
   private DeclarativeConfigProperties getConfigRoot() {
-    return profilingConfig.getStructured("always_on", empty());
+    return profilingConfig.getStructured(ROOT_NODE_NAME, empty());
   }
 
   private DeclarativeConfigProperties getMemoryProfilerConfig() {

profiler/src/test/java/com/splunk/opentelemetry/profiler/LogExporterBuilderTest.java

@@ -37,8 +37,6 @@
 import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporterBuilder;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import java.util.Map;

profiler/src/test/java/com/splunk/opentelemetry/profiler/ProfilerDeclarativeConfigurationTest.java

@@ -22,9 +22,6 @@
 
 import com.splunk.opentelemetry.testing.declarativeconfig.DeclarativeConfigTestUtil;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.common.ComponentLoader;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.time.Duration;
 import org.junit.jupiter.api.Test;

profiler/src/test/java/com/splunk/opentelemetry/profiler/snapshot/SnapshotProfilingDeclarativeConfigurationTest.java

@@ -23,6 +23,7 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.time.Duration;
 import java.util.Map;
@@ -174,8 +175,10 @@ void shouldReturnValidSelectionInterval_tooLow() {
 
   private static DeclarativeConfigProperties getProfilingConfig(
       OpenTelemetryConfigurationModel model) {
-    Map<String, Object> properties =
+    Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> original =
         model.getInstrumentationDevelopment().getJava().getAdditionalProperties();
+    Map<String, Object> properties =
+        Map.of("distribution", original.get("distribution").getAdditionalProperties());
     ComponentLoader componentLoader =
         ComponentLoader.forClassLoader(DeclarativeConfigProperties.class.getClassLoader());
     DeclarativeConfigProperties declarativeConfigProperties =

testing/common/src/main/java/com/splunk/opentelemetry/testing/declarativeconfig/DeclarativeConfigTestUtil.java

@@ -30,6 +30,7 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationBuilder;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.YamlDeclarativeConfigProperties;
+import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.ExperimentalLanguageSpecificInstrumentationPropertyModel;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -109,8 +110,10 @@ public static AutoConfiguredOpenTelemetrySdk createAutoConfiguredSdk(String yaml
   public static DeclarativeConfigProperties getProfilingConfig(
       OpenTelemetryConfigurationModel model) {
 
-    Map<String, Object> properties =
+    Map<String, ExperimentalLanguageSpecificInstrumentationPropertyModel> original =
         model.getInstrumentationDevelopment().getJava().getAdditionalProperties();
+    Map<String, Object> properties =
+        Map.of("distribution", original.get("distribution").getAdditionalProperties());
     ComponentLoader componentLoader =
         ComponentLoader.forClassLoader(DeclarativeConfigProperties.class.getClassLoader());
     DeclarativeConfigProperties declarativeConfigProperties =