Merge PR #366: Update aws-resources module to follow style guide

trask · trask · commit b93781afce03 · 2025-08-24T19:18:17.000-07:00
diff --git a/aws-resources/build.gradle.kts b/aws-resources/build.gradle.kts
@@ -8,6 +8,9 @@ description = "OpenTelemetry AWS Resources Support"
 otelJava.moduleName.set("io.opentelemetry.contrib.aws.resource")
 
 dependencies {
+  annotationProcessor("com.google.auto.service:auto-service")
+  compileOnly("com.google.auto.service:auto-service")
+
   api("io.opentelemetry:opentelemetry-api")
   compileOnly("io.opentelemetry:opentelemetry-api-incubator")
   api("io.opentelemetry:opentelemetry-sdk")
@@ -23,6 +26,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-api-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
+  testImplementation("com.google.auto.service:auto-service")
 
   testImplementation("com.linecorp.armeria:armeria-junit5")
   testRuntimeOnly("org.bouncycastle:bcpkix-jdk15on")
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResource.java
@@ -12,6 +12,7 @@
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_INSTANCE_ID;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_NAMESPACE;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION;
+import static java.util.logging.Level.WARNING;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -22,7 +23,6 @@
 import io.opentelemetry.semconv.SchemaUrls;
 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -65,7 +65,7 @@ static Resource buildResource(String configPath) {
       parser.nextToken();
 
       if (!parser.isExpectedStartObjectToken()) {
-        logger.log(Level.WARNING, "Invalid Beanstalk config: ", configPath);
+        logger.log(WARNING, "Invalid Beanstalk config: ", configPath);
         return Resource.create(attrBuilders.build(), SchemaUrls.V1_25_0);
       }
 
@@ -87,7 +87,7 @@ static Resource buildResource(String configPath) {
         }
       }
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Could not parse Beanstalk config.", e);
+      logger.log(WARNING, "Could not parse Beanstalk config.", e);
       return Resource.empty();
     }
 
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/BeanstalkResourceProvider.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link BeanstalkResource}. */
+@AutoService(ResourceProvider.class)
 public final class BeanstalkResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/DockerHelper.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/DockerHelper.java
@@ -5,11 +5,12 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import static java.util.logging.Level.WARNING;
+
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 class DockerHelper {
@@ -44,9 +45,9 @@ public String getContainerId() {
         }
       }
     } catch (FileNotFoundException e) {
-      logger.log(Level.WARNING, "Failed to read container id, cgroup file does not exist.");
+      logger.log(WARNING, "Failed to read container id, cgroup file does not exist.");
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Unable to read container id: " + e.getMessage());
+      logger.log(WARNING, "Unable to read container id: " + e.getMessage());
     }
 
     return "";
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2Resource.java
@@ -15,6 +15,7 @@
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_IMAGE_ID;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_NAME;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_TYPE;
+import static java.util.logging.Level.WARNING;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -28,7 +29,6 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -125,7 +125,7 @@ static Resource buildResource(String endpoint) {
         }
       }
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Could not parse identity document, resource not filled.", e);
+      logger.log(WARNING, "Could not parse identity document, resource not filled.", e);
       return Resource.empty();
     }
 
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/Ec2ResourceProvider.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link Ec2Resource}. */
+@AutoService(ResourceProvider.class)
 public final class Ec2ResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java
@@ -26,6 +26,9 @@
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_NAME;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ECS;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
+import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonList;
+import static java.util.logging.Level.WARNING;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -35,11 +38,9 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.SchemaUrls;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -88,7 +89,7 @@ static Resource buildResource(Map<String, String> sysEnv, SimpleHttpClient httpC
 
   static void fetchMetadata(
       SimpleHttpClient httpClient, String url, AttributesBuilder attrBuilders) {
-    String json = httpClient.fetchString("GET", url, Collections.emptyMap(), null);
+    String json = httpClient.fetchString("GET", url, emptyMap(), null);
     if (json.isEmpty()) {
       return;
     }
@@ -103,17 +104,17 @@ static void fetchMetadata(
           .getLogGroupArn()
           .ifPresent(
               logGroupArn -> {
-                attrBuilders.put(AWS_LOG_GROUP_ARNS, Collections.singletonList(logGroupArn));
+                attrBuilders.put(AWS_LOG_GROUP_ARNS, singletonList(logGroupArn));
               });
 
       logArnBuilder
           .getLogStreamArn()
           .ifPresent(
               logStreamArn -> {
-                attrBuilders.put(AWS_LOG_STREAM_ARNS, Collections.singletonList(logStreamArn));
+                attrBuilders.put(AWS_LOG_STREAM_ARNS, singletonList(logStreamArn));
               });
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Can't get ECS metadata", e);
+      logger.log(WARNING, "Can't get ECS metadata", e);
     }
   }
 
@@ -156,7 +157,7 @@ static void parseResponse(
       JsonParser parser, AttributesBuilder attrBuilders, LogArnBuilder logArnBuilder)
       throws IOException {
     if (!parser.isExpectedStartObjectToken()) {
-      logger.log(Level.WARNING, "Couldn't parse ECS metadata, invalid JSON");
+      logger.log(WARNING, "Couldn't parse ECS metadata, invalid JSON");
       return;
     }
 
@@ -339,7 +340,7 @@ static DockerImage parse(@Nullable String image) {
       }
       Matcher matcher = imagePattern.matcher(image);
       if (!matcher.matches()) {
-        logger.log(Level.WARNING, "Couldn't parse image '" + image + "'");
+        logger.log(WARNING, "Couldn't parse image '" + image + "'");
         return null;
       }
       String repository = matcher.group("repository");
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResourceProvider.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link EcsResource}. */
+@AutoService(ResourceProvider.class)
 public final class EcsResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResource.java
@@ -11,6 +11,8 @@
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EKS;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.K8S_CLUSTER_NAME;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -26,7 +28,6 @@
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -91,7 +92,7 @@ static Resource buildResource(
   private static boolean isEks(
       String k8sTokenPath, String k8sKeystorePath, SimpleHttpClient httpClient) {
     if (!isK8s(k8sTokenPath, k8sKeystorePath)) {
-      logger.log(Level.FINE, "Not running on k8s.");
+      logger.log(FINE, "Not running on k8s.");
       return false;
     }
 
@@ -145,7 +146,7 @@ private static String getClusterName(SimpleHttpClient httpClient) {
         }
       }
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Can't get cluster name on EKS.", e);
+      logger.log(WARNING, "Can't get cluster name on EKS.", e);
     }
     return "";
   }
@@ -156,7 +157,7 @@ private static String getK8sCredHeader() {
           new String(Files.readAllBytes(Paths.get(K8S_TOKEN_PATH)), StandardCharsets.UTF_8);
       return "Bearer " + content;
     } catch (IOException e) {
-      logger.log(Level.WARNING, "Unable to load K8s client token.", e);
+      logger.log(WARNING, "Unable to load K8s client token.", e);
     }
     return "";
   }
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EksResourceProvider.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link EksResource}. */
+@AutoService(ResourceProvider.class)
 public final class EksResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/LambdaResourceProvider.java
@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
 /** {@link ResourceProvider} for automatically configuring {@link LambdaResource}. */
+@AutoService(ResourceProvider.class)
 public final class LambdaResourceProvider extends CloudResourceProvider {
   @Override
   public Resource createResource(ConfigProperties config) {
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClient.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/SimpleHttpClient.java
@@ -5,6 +5,9 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.KeyStore;
@@ -13,7 +16,6 @@
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.Nullable;
 import javax.net.ssl.SSLContext;
@@ -72,7 +74,7 @@ public String fetchString(
       int responseCode = response.code();
       if (responseCode != 200) {
         logger.log(
-            Level.FINE,
+            FINE,
             "Error response from "
                 + urlStr
                 + " code ("
@@ -84,7 +86,7 @@ public String fetchString(
       ResponseBody body = response.body();
       return body != null ? body.string() : "";
     } catch (IOException e) {
-      logger.log(Level.FINE, "SimpleHttpClient fetch string failed.", e);
+      logger.log(FINE, "SimpleHttpClient fetch string failed.", e);
     }
 
     return "";
@@ -101,7 +103,7 @@ private static X509TrustManager buildTrustManager(@Nullable KeyStore keyStore) {
       tmf.init(keyStore);
       return (X509TrustManager) tmf.getTrustManagers()[0];
     } catch (Exception e) {
-      logger.log(Level.WARNING, "Build SslSocketFactory for K8s restful client exception.", e);
+      logger.log(WARNING, "Build SslSocketFactory for K8s restful client exception.", e);
       return null;
     }
   }
@@ -117,7 +119,7 @@ private static SSLSocketFactory buildSslSocketFactory(@Nullable TrustManager tru
       return context.getSocketFactory();
 
     } catch (Exception e) {
-      logger.log(Level.WARNING, "Build SslSocketFactory for K8s restful client exception.", e);
+      logger.log(WARNING, "Build SslSocketFactory for K8s restful client exception.", e);
     }
     return null;
   }
@@ -138,7 +140,7 @@ private static KeyStore getKeystoreForTrustedCert(String certPath) {
       }
       return trustStore;
     } catch (Exception e) {
-      logger.log(Level.WARNING, "Cannot load KeyStore from " + certPath);
+      logger.log(WARNING, "Cannot load KeyStore from " + certPath);
       return null;
     }
   }
diff --git a/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java b/aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/internal/AwsResourceDetector.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.aws.resource.internal;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.contrib.aws.resource.BeanstalkResource;
 import io.opentelemetry.contrib.aws.resource.Ec2Resource;
@@ -15,6 +16,8 @@
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.resources.ResourceBuilder;
 
+@SuppressWarnings("rawtypes")
+@AutoService(ComponentProvider.class)
 public class AwsResourceDetector implements ComponentProvider<Resource> {
 
   @Override
diff --git a/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider b/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider
diff --git a/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider b/aws-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EKS;`
`12`	`12`	`import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;`
`13`	`13`	`import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.K8S_CLUSTER_NAME;`
	`14`	`+import static java.util.logging.Level.FINE;`
	`15`	`+import static java.util.logging.Level.WARNING;`
`14`	`16`
`15`	`17`	`import com.fasterxml.jackson.core.JsonFactory;`
`16`	`18`	`import com.fasterxml.jackson.core.JsonParser;`
`@@ -26,7 +28,6 @@`
`26`	`28`	`import java.nio.file.Paths;`
`27`	`29`	`import java.util.HashMap;`
`28`	`30`	`import java.util.Map;`
`29`		`-import java.util.logging.Level;`
`30`	`31`	`import java.util.logging.Logger;`
`31`	`32`
`32`	`33`	`/**`
`@@ -91,7 +92,7 @@ static Resource buildResource(`
`91`	`92`	`private static boolean isEks(`
`92`	`93`	`String k8sTokenPath, String k8sKeystorePath, SimpleHttpClient httpClient) {`
`93`	`94`	`if (!isK8s(k8sTokenPath, k8sKeystorePath)) {`
`94`		`- logger.log(Level.FINE, "Not running on k8s.");`
	`95`	`+ logger.log(FINE, "Not running on k8s.");`
`95`	`96`	`return false;`
`96`	`97`	`}`
`97`	`98`
`@@ -145,7 +146,7 @@ private static String getClusterName(SimpleHttpClient httpClient) {`
`145`	`146`	`}`
`146`	`147`	`}`
`147`	`148`	`} catch (IOException e) {`
`148`		`- logger.log(Level.WARNING, "Can't get cluster name on EKS.", e);`
	`149`	`+ logger.log(WARNING, "Can't get cluster name on EKS.", e);`
`149`	`150`	`}`
`150`	`151`	`return "";`
`151`	`152`	`}`
`@@ -156,7 +157,7 @@ private static String getK8sCredHeader() {`
`156`	`157`	`new String(Files.readAllBytes(Paths.get(K8S_TOKEN_PATH)), StandardCharsets.UTF_8);`
`157`	`158`	`return "Bearer " + content;`
`158`	`159`	`} catch (IOException e) {`
`159`		`- logger.log(Level.WARNING, "Unable to load K8s client token.", e);`
	`160`	`+ logger.log(WARNING, "Unable to load K8s client token.", e);`
`160`	`161`	`}`
`161`	`162`	`return "";`
`162`	`163`	`}`