use component loader

Author: zeitlinger

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).containsExactly("aws");
   }

azure-resources/src/test/java/io/opentelemetry/contrib/azure/resource/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).containsExactly("azure");
   }

cloudfoundry-resources/src/test/java/io/opentelemetry/contrib/cloudfoundry/resources/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).containsExactly("cloud_foundry");
   }

gcp-resources/src/test/java/io/opentelemetry/contrib/gcp/resource/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).containsExactly("gcp");
   }

maven-extension/src/test/java/io/opentelemetry/maven/resources/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).contains("maven");
   }

resource-providers/src/test/java/io/opentelemetry/contrib/resourceproviders/ResourceComponentProviderTest.java

@@ -7,18 +7,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
+import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
-import java.util.List;
 import org.junit.jupiter.api.Test;
 
 public class ResourceComponentProviderTest {
 
   @Test
   @SuppressWarnings("rawtypes")
   void providerIsLoaded() {
-    List<ComponentProvider> providers =
-        SpiHelper.create(ResourceComponentProviderTest.class.getClassLoader())
+    Iterable<ComponentProvider> providers =
+        ComponentLoader.forClassLoader(ResourceComponentProviderTest.class.getClassLoader())
             .load(ComponentProvider.class);
     assertThat(providers).extracting(ComponentProvider::getName).contains("app_server");
   }