fix rebase

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

@@ -37,7 +37,6 @@
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
-import io.opentelemetry.sdk.resources.Resource;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -200,7 +199,7 @@ public DeclarativeConfigurationCustomizerProvider distroConfigurationCustomizerP
       }
 
       @Bean
-      public ComponentProvider<Resource> distroComponentProvider() {
+      public ComponentProvider distroComponentProvider() {
         return new DistroComponentProvider();
       }
     }

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/resources/DistroComponentProvider.java

@@ -14,7 +14,7 @@
  * any time.
  */
 @SuppressWarnings("rawtypes")
-public class DistroComponentProvider implements ComponentProvider<Resource> {
+public class DistroComponentProvider implements ComponentProvider {
 
   @Override
   public Class<Resource> getType() {