Fix merge

trask · trask · commit e72966da6faf · 2025-11-03T19:24:01.000-08:00
diff --git a/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestResourceDetector.java b/sdk-extensions/autoconfigure/src/testDeclarativeConfigSpi/java/io/opentelemetry/sdk/autoconfigure/TestResourceDetector.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-public class TestResourceDetector implements ComponentProvider<Resource>, AutoConfigureListener {
+public class TestResourceDetector implements ComponentProvider, AutoConfigureListener {
 
   @SuppressWarnings("NonFinalStaticField")
   static boolean initialized = false;
@@ -22,7 +22,7 @@ public void afterAutoConfigure(OpenTelemetrySdk sdk) {
   }
 
   @Override
-  public Class<Resource> getType() {
+  public Class<?> getType() {
     return Resource.class;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;`
`12`	`12`	`import io.opentelemetry.sdk.resources.Resource;`
`13`	`13`
`14`		`-public class TestResourceDetector implements ComponentProvider<Resource>, AutoConfigureListener {`
	`14`	`+public class TestResourceDetector implements ComponentProvider, AutoConfigureListener {`
`15`	`15`
`16`	`16`	`@SuppressWarnings("NonFinalStaticField")`
`17`	`17`	`static boolean initialized = false;`
`@@ -22,7 +22,7 @@ public void afterAutoConfigure(OpenTelemetrySdk sdk) {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public Class<Resource> getType() {`
	`25`	`+ public Class<?> getType() {`
`26`	`26`	`return Resource.class;`
`27`	`27`	`}`
`28`	`28`