Merge PR #372: Update azure-resources module to follow style guide

Author: trask

azure-resources/build.gradle.kts

@@ -5,8 +5,8 @@ plugins {
   id("maven-publish")
 }
 
-description = "OpenTelemetry GCP Resources Support"
-otelJava.moduleName.set("io.opentelemetry.contrib.gcp.resource")
+description = "OpenTelemetry Azure Resources Support"
+otelJava.moduleName.set("io.opentelemetry.contrib.azure.resource")
 
 // enable publishing to maven local
 java {

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

@@ -14,7 +14,7 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-public class AzureAksResourceProvider extends CloudResourceProvider {
+public final class AzureAksResourceProvider extends CloudResourceProvider {
 
   private static final Map<String, AzureVmResourceProvider.Entry> COMPUTE_MAPPING = new HashMap<>();
 

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

@@ -12,6 +12,7 @@
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.HOST_ID;
 import static io.opentelemetry.contrib.azure.resource.IncubatingAttributes.SERVICE_INSTANCE_ID;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
+import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
@@ -20,10 +21,9 @@
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 import javax.annotation.Nullable;
 
-public class AzureAppServiceResourceProvider extends CloudResourceProvider {
+public final class AzureAppServiceResourceProvider extends CloudResourceProvider {
 
   static final AttributeKey<String> AZURE_APP_SERVICE_STAMP_RESOURCE_ATTRIBUTE =
       AttributeKey.stringKey("azure.app.service.stamp");
@@ -68,7 +68,7 @@ public Attributes getAttributes() {
     if (detect != AzureEnvVarPlatform.APP_SERVICE) {
       return Attributes.empty();
     }
-    String name = Objects.requireNonNull(env.get(WEBSITE_SITE_NAME));
+    String name = requireNonNull(env.get(WEBSITE_SITE_NAME));
     AttributesBuilder builder = AzureVmResourceProvider.azureAttributeBuilder(AZURE_APP_SERVICE);
     builder.put(SERVICE_NAME, name);
 

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

@@ -16,7 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class AzureContainersResourceProvider extends CloudResourceProvider {
+public final class AzureContainersResourceProvider extends CloudResourceProvider {
 
   static final String CONTAINER_APP_NAME = "CONTAINER_APP_NAME";
 

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

@@ -19,7 +19,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class AzureFunctionsResourceProvider extends CloudResourceProvider {
+public final class AzureFunctionsResourceProvider extends CloudResourceProvider {
 
   static final String FUNCTIONS_VERSION = "FUNCTIONS_EXTENSION_VERSION";
   private static final String FUNCTIONS_MEM_LIMIT = "WEBSITE_MEMORY_LIMIT_MB";

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

@@ -5,12 +5,13 @@
 
 package io.opentelemetry.contrib.azure.resource;
 
+import static java.util.Objects.requireNonNull;
+
 import com.fasterxml.jackson.core.JsonFactory;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.time.Duration;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.logging.Level;
@@ -19,9 +20,11 @@
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class AzureMetadataService {
+public final class AzureMetadataService {
   static final JsonFactory JSON_FACTORY = new JsonFactory();
   private static final URL METADATA_URL;
+  private static final Duration TIMEOUT = Duration.ofSeconds(5);
+  private static final Logger logger = Logger.getLogger(AzureMetadataService.class.getName());
 
   static {
     try {
@@ -31,12 +34,6 @@ public class AzureMetadataService {
     }
   }
 
-  private AzureMetadataService() {}
-
-  private static final Duration TIMEOUT = Duration.ofSeconds(5);
-
-  private static final Logger logger = Logger.getLogger(AzureMetadataService.class.getName());
-
   static Supplier<Optional<String>> defaultClient() {
     return () -> fetchMetadata(METADATA_URL);
   }
@@ -66,10 +63,12 @@ static Optional<String> fetchMetadata(URL url) {
         return Optional.empty();
       }
 
-      return Optional.of(Objects.requireNonNull(response.body()).string());
+      return Optional.of(requireNonNull(response.body()).string());
     } catch (IOException e) {
       logger.log(Level.FINE, "Failed to fetch Azure VM metadata", e);
       return Optional.empty();
     }
   }
+
+  private AzureMetadataService() {}
 }

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

@@ -11,7 +11,7 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
-public class AzureResourceDetector implements ComponentProvider<Resource> {
+public final class AzureResourceDetector implements ComponentProvider<Resource> {
 
   @Override
   public Class<Resource> getType() {

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

@@ -34,21 +34,7 @@
 import java.util.logging.Logger;
 import org.jetbrains.annotations.NotNull;
 
-public class AzureVmResourceProvider extends CloudResourceProvider {
-
-  static class Entry {
-    final AttributeKey<String> key;
-    final Function<String, String> transform;
-
-    Entry(AttributeKey<String> key) {
-      this(key, Function.identity());
-    }
-
-    Entry(AttributeKey<String> key, Function<String, String> transform) {
-      this.key = key;
-      this.transform = transform;
-    }
-  }
+public final class AzureVmResourceProvider extends CloudResourceProvider {
 
   private static final Map<String, Entry> COMPUTE_MAPPING = new HashMap<>();
 
@@ -161,4 +147,18 @@ private static void consumeJson(JsonParser parser, BiConsumer<String, String> co
       consumer.accept(parser.currentName(), parser.nextTextValue());
     }
   }
+
+  static class Entry {
+    final AttributeKey<String> key;
+    final Function<String, String> transform;
+
+    Entry(AttributeKey<String> key) {
+      this(key, Function.identity());
+    }
+
+    Entry(AttributeKey<String> key, Function<String, String> transform) {
+      this.key = key;
+      this.transform = transform;
+    }
+  }
 }

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.azure.resource;
 
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
@@ -16,7 +17,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
-import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import java.util.HashMap;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
@@ -98,7 +98,7 @@ void isFunction() {
 
   @NotNull
   private static AttributesAssert createResource(Map<String, String> map) {
-    return OpenTelemetryAssertions.assertThat(
+    return assertThat(
         new AzureAppServiceResourceProvider(map).createResource(null).getAttributes());
   }
 }

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

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.azure.resource;
 
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION;
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
@@ -13,7 +14,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.sdk.testing.assertj.AttributesAssert;
-import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import java.util.HashMap;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
@@ -50,7 +50,7 @@ void isNotContainer() {
 
   @NotNull
   private static AttributesAssert createResource(Map<String, String> map) {
-    return OpenTelemetryAssertions.assertThat(
+    return assertThat(
         new AzureContainersResourceProvider(map).createResource(null).getAttributes());
   }
 }