fix

Author: zeitlinger

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

@@ -9,6 +9,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ConditionalResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
@@ -69,8 +70,8 @@ public final Resource createResource(ConfigProperties config) {
     return create(filteredKeys);
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  protected final Resource createUnconditional() {
+  @SuppressWarnings({"unchecked", "rawtypes", "unused"})
+  public final Resource createResource(DeclarativeConfigProperties config) {
     return create((Set) attributeGetters.keySet());
   }
 

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

@@ -8,9 +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;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -71,11 +69,6 @@ public void registerAttributes(Builder<Manifest> builder) {
     this(() -> Optional.ofNullable(jarPathFinder.detectJarPath()), manifestReader);
   }
 
-  @SuppressWarnings("unused")
-  public Resource createResource(DeclarativeConfigProperties config) {
-    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/test/java/io/opentelemetry/instrumentation/resources/ManifestResourceProviderTest.java

@@ -10,6 +10,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 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.internal.DefaultConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
@@ -99,7 +100,10 @@ Collection<DynamicTest> createResource() {
 
                       if (t.existing.getAttributes().isEmpty()) {
                         // component provider does not consider existing resource
-                        assertThat(provider.createUnconditional().getAttributes())
+                        assertThat(
+                                provider
+                                    .createResource(DeclarativeConfigProperties.empty())
+                                    .getAttributes())
                             .isEqualTo(resource.getAttributes());
                       }
                     }))