Merge PR #245: Update cloudfoundry-resources module to follow style guide

Author: trask

cloudfoundry-resources/build.gradle.kts

@@ -14,6 +14,8 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  compileOnly("com.google.auto.service:auto-service-annotations")
+  annotationProcessor("com.google.auto.service:auto-service")
 
   implementation("com.fasterxml.jackson.core:jackson-core")
   implementation("io.opentelemetry.semconv:opentelemetry-semconv")

cloudfoundry-resources/src/main/java/io/opentelemetry/contrib/cloudfoundry/resources/CloudFoundryResource.java

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.contrib.cloudfoundry.resources;
 
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
+
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
@@ -22,24 +24,22 @@ public final class CloudFoundryResource {
   private static final String ENV_VCAP_APPLICATION = "VCAP_APPLICATION";
 
   // copied from CloudfoundryIncubatingAttributes
-  private static final AttributeKey<String> CLOUDFOUNDRY_APP_ID =
-      AttributeKey.stringKey("cloudfoundry.app.id");
+  private static final AttributeKey<String> CLOUDFOUNDRY_APP_ID = stringKey("cloudfoundry.app.id");
   private static final AttributeKey<String> CLOUDFOUNDRY_APP_INSTANCE_ID =
-      AttributeKey.stringKey("cloudfoundry.app.instance.id");
+      stringKey("cloudfoundry.app.instance.id");
   private static final AttributeKey<String> CLOUDFOUNDRY_APP_NAME =
-      AttributeKey.stringKey("cloudfoundry.app.name");
-  private static final AttributeKey<String> CLOUDFOUNDRY_ORG_ID =
-      AttributeKey.stringKey("cloudfoundry.org.id");
+      stringKey("cloudfoundry.app.name");
+  private static final AttributeKey<String> CLOUDFOUNDRY_ORG_ID = stringKey("cloudfoundry.org.id");
   private static final AttributeKey<String> CLOUDFOUNDRY_ORG_NAME =
-      AttributeKey.stringKey("cloudfoundry.org.name");
+      stringKey("cloudfoundry.org.name");
   private static final AttributeKey<String> CLOUDFOUNDRY_PROCESS_ID =
-      AttributeKey.stringKey("cloudfoundry.process.id");
+      stringKey("cloudfoundry.process.id");
   private static final AttributeKey<String> CLOUDFOUNDRY_PROCESS_TYPE =
-      AttributeKey.stringKey("cloudfoundry.process.type");
+      stringKey("cloudfoundry.process.type");
   private static final AttributeKey<String> CLOUDFOUNDRY_SPACE_ID =
-      AttributeKey.stringKey("cloudfoundry.space.id");
+      stringKey("cloudfoundry.space.id");
   private static final AttributeKey<String> CLOUDFOUNDRY_SPACE_NAME =
-      AttributeKey.stringKey("cloudfoundry.space.name");
+      stringKey("cloudfoundry.space.name");
   private static final Logger LOG = Logger.getLogger(CloudFoundryResource.class.getName());
   private static final JsonFactory JSON_FACTORY = new JsonFactory();
   private static final Resource INSTANCE = buildResource(System::getenv);

cloudfoundry-resources/src/main/java/io/opentelemetry/contrib/cloudfoundry/resources/CloudFoundryResourceDetector.java

@@ -5,11 +5,14 @@
 
 package io.opentelemetry.contrib.cloudfoundry.resources;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-public class CloudFoundryResourceDetector implements ComponentProvider<Resource> {
+@SuppressWarnings("rawtypes")
+@AutoService(ComponentProvider.class)
+public final class CloudFoundryResourceDetector implements ComponentProvider<Resource> {
 
   @Override
   public Class<Resource> getType() {

cloudfoundry-resources/src/main/java/io/opentelemetry/contrib/cloudfoundry/resources/CloudFoundryResourceProvider.java

@@ -5,11 +5,13 @@
 
 package io.opentelemetry.contrib.cloudfoundry.resources;
 
+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;
 
-public class CloudFoundryResourceProvider implements ResourceProvider {
+@AutoService(ResourceProvider.class)
+public final class CloudFoundryResourceProvider implements ResourceProvider {
 
   @Override
   public Resource createResource(ConfigProperties configProperties) {

cloudfoundry-resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider

@@ -5,7 +5,11 @@
 
 package io.opentelemetry.contrib.cloudfoundry.resources;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.joining;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.semconv.SchemaUrls;
@@ -14,12 +18,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 class CloudFoundryResourceTest {
@@ -34,20 +34,18 @@ private static String loadVcapApplicationSample(String filename) {
     try (InputStream is =
         CloudFoundryResourceTest.class.getClassLoader().getResourceAsStream(filename)) {
       if (is != null) {
-        return new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8))
-            .lines()
-            .collect(Collectors.joining());
+        return new BufferedReader(new InputStreamReader(is, UTF_8)).lines().collect(joining());
       }
-      Assertions.fail("Cannot load resource " + filename);
+      fail("Cannot load resource " + filename);
     } catch (IOException e) {
-      Assertions.fail("Error reading " + filename);
+      fail("Error reading " + filename);
     }
     return "";
   }
 
   @Test
   void noVcapApplication() {
-    Map<String, String> env = Collections.emptyMap();
+    Map<String, String> env = emptyMap();
     Resource resource = CloudFoundryResource.buildResource(env::get);
     assertThat(resource).isEqualTo(Resource.empty());
   }