Cleanup, reduce dependencies to compileOnly

Author: jack-berg

api/incubator/build.gradle.kts

@@ -14,10 +14,8 @@ dependencies {
 
   annotationProcessor("com.google.auto.value:auto-value")
 
-  // To use parsed config file as input for YamlStructuredConfigPropertiesTest
+  // To use parsed config file as input for InstrumentationConfigUtilTest
   testImplementation(project(":sdk-extensions:incubator"))
-  // TODO (jack-berg): Why is this dependency not brought in as transitive dependency of :sdk-extensions:incubator?
-  testImplementation("com.fasterxml.jackson.core:jackson-databind")
 
   testImplementation(project(":sdk:testing"))
   testImplementation(project(":api:testing-internal"))

exporters/common/build.gradle.kts

@@ -12,8 +12,8 @@ val versions: Map<String, String> by project
 dependencies {
   api(project(":api:all"))
   api(project(":sdk-extensions:autoconfigure-spi"))
-  implementation(project(":api:incubator"))
 
+  compileOnly(project(":api:incubator"))
   compileOnly(project(":sdk:common"))
   compileOnly(project(":exporters:common:compile-stub"))
 

exporters/logging/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   api(project(":sdk:all"))
 
   implementation(project(":sdk-extensions:autoconfigure-spi"))
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 
   testImplementation(project(":sdk:testing"))
 }

exporters/otlp/all/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
   implementation(project(":exporters:otlp:common"))
   implementation(project(":exporters:sender:okhttp"))
   implementation(project(":sdk-extensions:autoconfigure-spi"))
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 
   compileOnly("io.grpc:grpc-stub")
 

exporters/prometheus/build.gradle.kts

@@ -9,7 +9,7 @@ otelJava.moduleName.set("io.opentelemetry.exporter.prometheus")
 dependencies {
   api(project(":sdk:metrics"))
 
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
   implementation(project(":exporters:common"))
   implementation(project(":sdk-extensions:autoconfigure-spi"))
   implementation("io.prometheus:prometheus-metrics-exporter-httpserver")

exporters/zipkin/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
 
   implementation(project(":exporters:common"))
   implementation(project(":sdk-extensions:autoconfigure-spi"))
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 
   implementation("io.zipkin.reporter2:zipkin-sender-okhttp3")
 

sdk-extensions/autoconfigure-spi/build.gradle.kts

@@ -8,5 +8,5 @@ otelJava.moduleName.set("io.opentelemetry.sdk.autoconfigure.spi")
 
 dependencies {
   api(project(":sdk:all"))
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 }

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfiguration.java

@@ -184,15 +184,15 @@ static DeclarativeConfigProperties toConfigProperties(
   public static io.opentelemetry.sdk.trace.samplers.Sampler createSampler(
       DeclarativeConfigProperties genericSamplerModel) {
     YamlDeclarativeConfigProperties yamlDeclarativeConfigProperties =
-        requireYamlStructuredConfigProperties(genericSamplerModel);
+        requireYamlDeclarativeConfigProperties(genericSamplerModel);
     SamplerModel samplerModel = convertToModel(yamlDeclarativeConfigProperties, SamplerModel.class);
     return createAndMaybeCleanup(
         SamplerFactory.getInstance(),
         SpiHelper.create(yamlDeclarativeConfigProperties.getComponentLoader()),
         samplerModel);
   }
 
-  private static YamlDeclarativeConfigProperties requireYamlStructuredConfigProperties(
+  private static YamlDeclarativeConfigProperties requireYamlDeclarativeConfigProperties(
       DeclarativeConfigProperties declarativeConfigProperties) {
     if (!(declarativeConfigProperties instanceof YamlDeclarativeConfigProperties)) {
       throw new DeclarativeConfigException(
@@ -202,8 +202,8 @@ private static YamlDeclarativeConfigProperties requireYamlStructuredConfigProper
   }
 
   static <T> T convertToModel(
-      YamlDeclarativeConfigProperties structuredConfigProperties, Class<T> modelType) {
-    return MAPPER.convertValue(structuredConfigProperties.toMap(), modelType);
+      YamlDeclarativeConfigProperties yamlDeclarativeConfigProperties, Class<T> modelType) {
+    return MAPPER.convertValue(yamlDeclarativeConfigProperties.toMap(), modelType);
   }
 
   static <M, R> R createAndMaybeCleanup(Factory<M, R> factory, SpiHelper spiHelper, M model) {

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigProperties.java

@@ -46,19 +46,16 @@ public final class YamlDeclarativeConfigProperties implements DeclarativeConfigP
 
   private final Map<String, List<YamlDeclarativeConfigProperties>> listEntries;
   private final Map<String, YamlDeclarativeConfigProperties> mapEntries;
-  private final Set<String> nullKeys;
   private final ComponentLoader componentLoader;
 
   private YamlDeclarativeConfigProperties(
       Map<String, Object> simpleEntries,
       Map<String, List<YamlDeclarativeConfigProperties>> listEntries,
       Map<String, YamlDeclarativeConfigProperties> mapEntries,
-      Set<String> nullKeys,
       ComponentLoader componentLoader) {
     this.simpleEntries = simpleEntries;
     this.listEntries = listEntries;
     this.mapEntries = mapEntries;
-    this.nullKeys = nullKeys;
     this.componentLoader = componentLoader;
   }
 
@@ -72,12 +69,11 @@ private YamlDeclarativeConfigProperties(
    * @see DeclarativeConfiguration#toConfigProperties(OpenTelemetryConfigurationModel)
    */
   @SuppressWarnings("unchecked")
-  public static YamlDeclarativeConfigProperties create(
+  static YamlDeclarativeConfigProperties create(
       Map<String, Object> properties, ComponentLoader componentLoader) {
     Map<String, Object> simpleEntries = new LinkedHashMap<>();
     Map<String, List<YamlDeclarativeConfigProperties>> listEntries = new LinkedHashMap<>();
     Map<String, YamlDeclarativeConfigProperties> mapEntries = new LinkedHashMap<>();
-    Set<String> nullKeys = new LinkedHashSet<>();
     for (Map.Entry<String, Object> entry : properties.entrySet()) {
       String key = entry.getKey();
       Object value = entry.getValue();
@@ -104,18 +100,14 @@ public static YamlDeclarativeConfigProperties create(
         mapEntries.put(key, configProperties);
         continue;
       }
-      if (value == null) {
-        nullKeys.add(key);
-        continue;
-      }
       throw new DeclarativeConfigException(
           "Unable to initialize ExtendedConfigProperties. Key \""
               + key
               + "\" has unrecognized object type "
               + value.getClass().getName());
     }
     return new YamlDeclarativeConfigProperties(
-        simpleEntries, listEntries, mapEntries, nullKeys, componentLoader);
+        simpleEntries, listEntries, mapEntries, componentLoader);
   }
 
   private static boolean isPrimitiveList(Object object) {
@@ -290,17 +282,15 @@ public Set<String> getPropertyKeys() {
     keys.addAll(simpleEntries.keySet());
     keys.addAll(listEntries.keySet());
     keys.addAll(mapEntries.keySet());
-    keys.addAll(nullKeys);
     return Collections.unmodifiableSet(keys);
   }
 
   @Override
   public String toString() {
-    StringJoiner joiner = new StringJoiner(", ", "YamlStructuredConfigProperties{", "}");
+    StringJoiner joiner = new StringJoiner(", ", "YamlDeclarativeConfigProperties{", "}");
     simpleEntries.forEach((key, value) -> joiner.add(key + "=" + value));
     listEntries.forEach((key, value) -> joiner.add(key + "=" + value));
     mapEntries.forEach((key, value) -> joiner.add(key + "=" + value));
-    nullKeys.forEach((key) -> joiner.add(key + "=null"));
     return joiner.toString();
   }
 
@@ -312,7 +302,6 @@ public Map<String, Object> toMap() {
             result.put(
                 key, value.stream().map(YamlDeclarativeConfigProperties::toMap).collect(toList())));
     mapEntries.forEach((key, value) -> result.put(key, value.toMap()));
-    nullKeys.forEach(key -> result.put(key, null));
     return Collections.unmodifiableMap(result);
   }
 

…YamlDeclarativeConfigPropertiesTest.java …YamlDeclarativeConfigPropertiesTest.javaapi/incubator/src/test/java/io/opentelemetry/api/incubator/config/internal/YamlDeclarativeConfigPropertiesTest.java renamed to sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java api/incubator/src/test/java/io/opentelemetry/api/incubator/config/internal/YamlDeclarativeConfigPropertiesTest.java renamed to sdk-extensions/incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/fileconfig/YamlDeclarativeConfigPropertiesTest.java

@@ -3,14 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.api.incubator.config.internal;
+package io.opentelemetry.sdk.extension.incubator.fileconfig;
 
 import static io.opentelemetry.api.incubator.config.DeclarativeConfigProperties.empty;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.common.collect.ImmutableSet;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;