pr feedback

Author: zeitlinger

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/config/internal/InstrumentationConfig.java

@@ -126,7 +126,7 @@ default List<String> getList(String name) {
   DeclarativeConfigProperties getDeclarativeConfig(String node);
 
   /**
-   * Returns the {@link ConfigProvider} if declarative configuration is available,
+   * Returns the {@link ConfigProvider} if declarative configuration is used.
    *
    * @return the {@link ConfigProvider} or {@code null} if no provider is available
    */

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

@@ -14,6 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.BiFunction;
 import javax.annotation.Nullable;
 
@@ -53,17 +54,17 @@ final class DeclarativeConfigPropertiesBridge implements ConfigProperties {
 
   private static final String OTEL_INSTRUMENTATION_PREFIX = "otel.instrumentation.";
 
-  @Nullable private final DeclarativeConfigProperties baseNode;
+  private final DeclarativeConfigProperties baseNode;
 
   // lookup order matters - we choose the first match
   private final Map<String, String> mappings;
   private final Map<String, Object> overrideValues;
 
   DeclarativeConfigPropertiesBridge(
-      @Nullable DeclarativeConfigProperties baseNode,
+      DeclarativeConfigProperties baseNode,
       Map<String, String> mappings,
       Map<String, Object> overrideValues) {
-    this.baseNode = baseNode;
+    this.baseNode = Objects.requireNonNull(baseNode);
     this.mappings = mappings;
     this.overrideValues = overrideValues;
   }
@@ -154,10 +155,6 @@ private <T> T getPropertyValue(
       return override;
     }
 
-    if (baseNode == null) {
-      return null;
-    }
-
     String[] segments = getSegments(translateProperty(property));
     if (segments.length == 0) {
       return null;