pr review

Author: zeitlinger

instrumentation/resources/library/build.gradle.kts

@@ -8,12 +8,13 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   implementation("io.opentelemetry:opentelemetry-sdk-common")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
+  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")
 
   annotationProcessor("com.google.auto.service:auto-service")
   compileOnly("com.google.auto.service:auto-service-annotations")
   testCompileOnly("com.google.auto.service:auto-service-annotations")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 
   testImplementation("org.junit.jupiter:junit-jupiter-api")
 }

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/AttributeResourceProvider.java

@@ -70,7 +70,7 @@ public final Resource createResource(ConfigProperties config) {
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
-  public final Resource createUnconditional() {
+  protected final Resource createUnconditional() {
     return create((Set) attributeGetters.keySet());
   }
 

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ManifestResourceProvider.java

@@ -9,6 +9,7 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
+import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.ServiceAttributes;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -69,6 +70,10 @@ public void registerAttributes(Builder<Manifest> builder) {
     this(() -> Optional.ofNullable(jarPathFinder.detectJarPath()), manifestReader);
   }
 
+  public Resource create() {
+    return createUnconditional();
+  }
+
   private static Optional<Manifest> readManifest(Path jarPath) {
     try (JarFile jarFile = new JarFile(jarPath.toFile(), false)) {
       return Optional.of(jarFile.getManifest());

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/internal/ManifestResourceComponentProvider.java

@@ -19,6 +19,6 @@
 @AutoService(ComponentProvider.class)
 public class ManifestResourceComponentProvider extends ResourceComponentProvider {
   public ManifestResourceComponentProvider() {
-    super("manifest", () -> new ManifestResourceProvider().createUnconditional());
+    super("manifest", () -> new ManifestResourceProvider().create());
   }
 }

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/resources/ResourceCustomizerProvider.java

@@ -27,7 +27,7 @@
 @AutoService(DeclarativeConfigurationCustomizerProvider.class)
 public class ResourceCustomizerProvider implements DeclarativeConfigurationCustomizerProvider {
 
-  private static final List<String> NEEDED_DETECTORS = Arrays.asList("distribution", "service");
+  private static final List<String> REQUIRED_DETECTORS = Arrays.asList("distribution", "service");
 
   @Override
   public void customize(DeclarativeConfigurationCustomizer customizer) {
@@ -50,7 +50,7 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
                   .flatMap(detector -> detector.getAdditionalProperties().keySet().stream())
                   .collect(Collectors.toSet());
 
-          for (String name : NEEDED_DETECTORS) {
+          for (String name : REQUIRED_DETECTORS) {
             if (!names.contains(name)) {
               ExperimentalResourceDetectorModel detector = new ExperimentalResourceDetectorModel();
               detector.getAdditionalProperties().put(name, null);