cleanup

Author: zeitlinger

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAksResourceProvider.java

@@ -8,7 +8,6 @@
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AZURE_AKS;
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.K8S_CLUSTER_NAME;
 
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.HashMap;
 import java.util.Map;
@@ -61,7 +60,7 @@ public int order() {
   }
 
   @Override
-  public Resource createResource(ConfigProperties configProperties) {
+  public Resource createResource() {
     if (environment.get(KUBERNETES_SERVICE_HOST) == null) {
       return Resource.empty();
     }

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureAppServiceResourceProvider.java

@@ -17,8 +17,8 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.api.internal.StringUtils;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -60,7 +60,7 @@ public AzureAppServiceResourceProvider() {
   }
 
   @Override
-  public Resource createResource(ConfigProperties config) {
+  public Resource createResource() {
     return Resource.create(getAttributes());
   }
 

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureContainersResourceProvider.java

@@ -12,7 +12,6 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.HashMap;
 import java.util.Map;
@@ -45,7 +44,7 @@ public AzureContainersResourceProvider() {
   }
 
   @Override
-  public Resource createResource(ConfigProperties config) {
+  public Resource createResource() {
     return Resource.create(getAttributes());
   }
 

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureFunctionsResourceProvider.java

@@ -15,7 +15,6 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.HashMap;
 import java.util.Map;
@@ -47,7 +46,7 @@ public AzureFunctionsResourceProvider() {
   }
 
   @Override
-  public Resource createResource(ConfigProperties config) {
+  public Resource createResource() {
     return Resource.create(getAttributes());
   }
 

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureResourceDetector.java

@@ -7,7 +7,6 @@
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
@@ -39,16 +38,14 @@ static class Builder {
     ResourceBuilder builder = Resource.builder();
     int attributesCount = 0;
 
-    @SuppressWarnings("NullAway")
-    private void add(
-        ResourceProvider provider) {
-      Attributes attributes = provider.createResource(null).getAttributes();
+    private void add(CloudResourceProvider provider) {
+      Attributes attributes = provider.createResource().getAttributes();
       builder.putAll(attributes);
       attributesCount += attributes.size();
     }
 
     private void addIfEmpty(
-        ResourceProvider provider) {
+        CloudResourceProvider provider) {
       if (attributesCount == 0) {
         add(provider);
       }

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/AzureVmResourceProvider.java

@@ -22,7 +22,6 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.IOException;
 import java.util.HashMap;
@@ -88,7 +87,7 @@ public int order() {
   }
 
   @Override
-  public Resource createResource(ConfigProperties config) {
+  public Resource createResource() {
     return client
         .get()
         .map(body -> parseMetadata(body, COMPUTE_MAPPING, AZURE_VM))

azure-resources/src/main/java/io/opentelemetry/contrib/azure/resource/CloudResourceProvider.java

@@ -17,4 +17,12 @@ public abstract class CloudResourceProvider implements ConditionalResourceProvid
   public final boolean shouldApply(ConfigProperties config, Resource existing) {
     return existing.getAttribute(CLOUD_PROVIDER) == null;
   }
+
+  @Override
+  public final Resource createResource(ConfigProperties config) {
+    // not using config in any providers
+    return createResource();
+  }
+
+  abstract Resource createResource();
 }