pr review

Author: zeitlinger

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

@@ -9,6 +9,7 @@
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
@@ -49,7 +50,12 @@ public Resource createResource(ConfigProperties config) {
     return create();
   }
 
-  public Resource create() {
+  @SuppressWarnings("unused")
+  public Resource createResource(DeclarativeConfigProperties config) {
+    return create();
+  }
+
+  private Resource create() {
     return jarPathSupplier
         .get()
         .map(

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

@@ -8,6 +8,7 @@
 import static java.util.logging.Level.WARNING;
 
 import com.google.auto.service.AutoService;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.ServiceAttributes;
@@ -70,7 +71,8 @@ public void registerAttributes(Builder<Manifest> builder) {
     this(() -> Optional.ofNullable(jarPathFinder.detectJarPath()), manifestReader);
   }
 
-  public Resource create() {
+  @SuppressWarnings("unused")
+  public Resource createResource(DeclarativeConfigProperties config) {
     return createUnconditional();
   }
 

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

@@ -19,6 +19,6 @@
 @AutoService(ComponentProvider.class)
 public class ContainerResourceComponentProvider extends ResourceComponentProvider {
   public ContainerResourceComponentProvider() {
-    super("container", ContainerResource::get);
+    super("container", p -> ContainerResource.get());
   }
 }

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

@@ -21,6 +21,6 @@
 @AutoService(ComponentProvider.class)
 public class HostResourceComponentProvider extends ResourceComponentProvider {
   public HostResourceComponentProvider() {
-    super("host", () -> HostResource.get().merge(HostIdResource.get()).merge(OsResource.get()));
+    super("host", p -> HostResource.get().merge(HostIdResource.get()).merge(OsResource.get()));
   }
 }

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

@@ -19,6 +19,6 @@
 @AutoService(ComponentProvider.class)
 public class JarResourceComponentProvider extends ResourceComponentProvider {
   public JarResourceComponentProvider() {
-    super("jar", () -> new JarServiceNameDetector().create());
+    super("jar", p -> new JarServiceNameDetector().createResource(p));
   }
 }

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().create());
+    super("manifest", p -> new ManifestResourceProvider().createResource(p));
   }
 }

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

@@ -20,6 +20,6 @@
 @AutoService(ComponentProvider.class)
 public class ProcessResourceComponentProvider extends ResourceComponentProvider {
   public ProcessResourceComponentProvider() {
-    super("process", () -> ProcessResource.get().merge(ProcessRuntimeResource.get()));
+    super("process", p -> ProcessResource.get().merge(ProcessRuntimeResource.get()));
   }
 }

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

@@ -8,15 +8,15 @@
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
-import java.util.function.Supplier;
+import java.util.function.Function;
 
 /** Abstract class to simply {@link Resource} {@link ComponentProvider} implementations. */
 abstract class ResourceComponentProvider implements ComponentProvider<Resource> {
 
   private final String name;
-  private final Supplier<Resource> supplier;
+  private final Function<DeclarativeConfigProperties, Resource> supplier;
 
-  ResourceComponentProvider(String name, Supplier<Resource> supplier) {
+  ResourceComponentProvider(String name, Function<DeclarativeConfigProperties, Resource> supplier) {
     this.name = name;
     this.supplier = supplier;
   }
@@ -33,6 +33,6 @@ public String getName() {
 
   @Override
   public Resource create(DeclarativeConfigProperties declarativeConfigProperties) {
-    return supplier.get();
+    return supplier.apply(declarativeConfigProperties);
   }
 }