PR feedback

Author: zeitlinger

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

@@ -16,13 +16,13 @@
  *
  * <p>An example of how to use this interface can be found in {@link ManifestResourceProvider}.
  */
-public interface AttributeProvider<D> {
+interface AttributeProvider<D> {
   Optional<D> readData();
 
   void registerAttributes(Builder<D> builder);
 
-  public interface Builder<D> {
+  interface Builder<D> {
     @CanIgnoreReturnValue
-    public <T> Builder<D> add(AttributeKey<T> key, Function<D, Optional<T>> getter);
+    <T> Builder<D> add(AttributeKey<T> key, Function<D, Optional<T>> getter);
   }
 }

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarFileDetector.java renamed to instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/JarPathFinder.java

@@ -21,24 +21,24 @@
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
-class JarFileDetector {
+class JarPathFinder {
   private final Supplier<String[]> getProcessHandleArguments;
   private final Function<String, String> getSystemProperty;
   private final Predicate<Path> fileExists;
   private final Function<Path, Optional<Manifest>> manifestReader;
 
-  private static final Logger logger = Logger.getLogger(JarFileDetector.class.getName());
+  private static final Logger logger = Logger.getLogger(JarPathFinder.class.getName());
 
-  public JarFileDetector() {
+  public JarPathFinder() {
     this(
         ProcessArguments::getProcessArguments,
         System::getProperty,
         Files::isRegularFile,
-        JarFileDetector::readManifest);
+        JarPathFinder::readManifest);
   }
 
   // visible for tests
-  JarFileDetector(
+  JarPathFinder(
       Supplier<String[]> getProcessHandleArguments,
       Function<String, String> getSystemProperty,
       Predicate<Path> fileExists,

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

@@ -26,21 +26,21 @@ public final class JarServiceNameDetector implements ConditionalResourceProvider
 
   private static final Logger logger = Logger.getLogger(JarServiceNameDetector.class.getName());
 
-  private final JarFileDetector jarFileDetector;
+  private final JarPathFinder jarPathFinder;
 
   @SuppressWarnings("unused") // SPI
   public JarServiceNameDetector() {
-    this(new JarFileDetector());
+    this(new JarPathFinder());
   }
 
   // visible for tests
-  JarServiceNameDetector(JarFileDetector jarFileDetector) {
-    this.jarFileDetector = jarFileDetector;
+  JarServiceNameDetector(JarPathFinder jarPathFinder) {
+    this.jarPathFinder = jarPathFinder;
   }
 
   @Override
   public Resource createResource(ConfigProperties config) {
-    Path jarPath = jarFileDetector.getJarPath();
+    Path jarPath = jarPathFinder.getJarPath();
     if (jarPath == null) {
       return Resource.empty();
     }

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

@@ -20,16 +20,16 @@ public final class ManifestResourceProvider extends AttributeResourceProvider<Ma
 
   @SuppressWarnings("unused") // SPI
   public ManifestResourceProvider() {
-    this(new JarFileDetector());
+    this(new JarPathFinder());
   }
 
   // Visible for testing
-  ManifestResourceProvider(JarFileDetector jarFileDetector) {
+  ManifestResourceProvider(JarPathFinder jarPathFinder) {
     super(
         new AttributeProvider<Manifest>() {
           @Override
           public Optional<Manifest> readData() {
-            return jarFileDetector.getManifestFromJarFile();
+            return jarPathFinder.getManifestFromJarFile();
           }
 
           @Override

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

@@ -8,7 +8,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-public class ResourceDiscoveryCache {
+class ResourceDiscoveryCache {
   private static final ConcurrentHashMap<String, Object> cache = new ConcurrentHashMap<>();
 
   private ResourceDiscoveryCache() {}

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/JarServiceNameDetectorTest.java

@@ -54,7 +54,7 @@ void createResource_empty() {
   private static JarServiceNameDetector getDetector(
       String[] processArgs, Function<String, String> getProperty, Predicate<Path> fileExists) {
     return new JarServiceNameDetector(
-        new JarFileDetector(() -> processArgs, getProperty, fileExists, p -> Optional.empty()));
+        new JarPathFinder(() -> processArgs, getProperty, fileExists, p -> Optional.empty()));
   }
 
   @Test

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java

@@ -60,7 +60,7 @@ Collection<DynamicTest> createResource() {
                     () -> {
                       ManifestResourceProvider provider =
                           new ManifestResourceProvider(
-                              new JarFileDetector(
+                              new JarPathFinder(
                                   () -> JarServiceNameDetectorTest.getArgs("app.jar"),
                                   prop -> null,
                                   JarServiceNameDetectorTest::failPath,