Update ComponentProvider

Author: trask

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

@@ -11,7 +11,7 @@
 import java.util.function.Function;
 
 /** Abstract class to simply {@link Resource} {@link ComponentProvider} implementations. */
-abstract class ResourceComponentProvider implements ComponentProvider<Resource> {
+abstract class ResourceComponentProvider implements ComponentProvider {
 
   private final String name;
   private final Function<DeclarativeConfigProperties, Resource> supplier;
@@ -32,7 +32,7 @@ public String getName() {
   }
 
   @Override
-  public Resource create(DeclarativeConfigProperties declarativeConfigProperties) {
+  public Object create(DeclarativeConfigProperties declarativeConfigProperties) {
     return supplier.apply(declarativeConfigProperties);
   }
 }

instrumentation/spring/spring-boot-resources/javaagent/src/main/java/io/opentelemetry/instrumentation/spring/resources/SpringResourceComponentProvider.java

@@ -16,9 +16,8 @@
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class SpringResourceComponentProvider implements ComponentProvider<Resource> {
+public class SpringResourceComponentProvider implements ComponentProvider {
 
   @Override
   public Class<Resource> getType() {
@@ -31,7 +30,7 @@ public String getName() {
   }
 
   @Override
-  public Resource create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return new SpringBootServiceVersionDetector()
         .createResource(config)
         .merge(new SpringBootServiceNameDetector().createResource(config));

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

@@ -10,9 +10,8 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class DistroComponentProvider implements ComponentProvider<Resource> {
+public class DistroComponentProvider implements ComponentProvider {
 
   @Override
   public Class<Resource> getType() {
@@ -25,7 +24,7 @@ public String getName() {
   }
 
   @Override
-  public Resource create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return DistroResourceProvider.get("opentelemetry-javaagent");
   }
 }

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestLogRecordExporterComponentProvider.java

@@ -11,7 +11,7 @@
 import java.util.Objects;
 
 public class TestLogRecordExporterComponentProvider
-    implements ComponentProvider<LogRecordExporter> {
+    implements ComponentProvider {
 
   private static LogRecordExporter logRecordExporter;
 
@@ -26,7 +26,7 @@ public String getName() {
   }
 
   @Override
-  public LogRecordExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(logRecordExporter, "logRecordExporter must not be null");
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestMetricExporterComponentProvider.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import java.util.Objects;
 
-public class TestMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
+public class TestMetricExporterComponentProvider implements ComponentProvider {
 
   private static MetricExporter metricExporter;
 
@@ -25,7 +25,7 @@ public String getName() {
   }
 
   @Override
-  public MetricExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(metricExporter, "metricExporter must not be null");
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/provider/TestSpanExporterComponentProvider.java

@@ -10,7 +10,7 @@
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.util.Objects;
 
-public class TestSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
+public class TestSpanExporterComponentProvider implements ComponentProvider {
 
   private static SpanExporter spanExporter;
 
@@ -25,7 +25,7 @@ public String getName() {
   }
 
   @Override
-  public SpanExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(spanExporter, "spanExporter must not be null");
   }
 

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestLogRecordExporterComponentProvider.java

@@ -11,10 +11,9 @@
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
 import java.util.Objects;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
 public class AgentTestLogRecordExporterComponentProvider
-    implements ComponentProvider<LogRecordExporter> {
+    implements ComponentProvider {
 
   private static LogRecordExporter logRecordExporter;
 
@@ -29,7 +28,7 @@ public String getName() {
   }
 
   @Override
-  public LogRecordExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(logRecordExporter, "logRecordExporter must not be null");
   }
 

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestMetricExporterComponentProvider.java

@@ -11,9 +11,8 @@
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import java.util.Objects;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class AgentTestMetricExporterComponentProvider implements ComponentProvider<MetricExporter> {
+public class AgentTestMetricExporterComponentProvider implements ComponentProvider {
 
   private static MetricExporter metricExporter;
 
@@ -28,7 +27,7 @@ public String getName() {
   }
 
   @Override
-  public MetricExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(metricExporter, "metricExporter must not be null");
   }
 

testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/provider/AgentTestSpanExporterComponentProvider.java

@@ -11,9 +11,8 @@
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import java.util.Objects;
 
-@SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
-public class AgentTestSpanExporterComponentProvider implements ComponentProvider<SpanExporter> {
+public class AgentTestSpanExporterComponentProvider implements ComponentProvider {
 
   private static SpanExporter spanExporter;
 
@@ -28,7 +27,7 @@ public String getName() {
   }
 
   @Override
-  public SpanExporter create(DeclarativeConfigProperties config) {
+  public Object create(DeclarativeConfigProperties config) {
     return Objects.requireNonNull(spanExporter, "spanExporter must not be null");
   }