Add final keyword to public API classes and convert JUnit assertions to AssertJ

Co-authored-by: trask <[email protected]>

Author: Copilot

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() {

baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizer.java

@@ -12,7 +12,7 @@
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import java.util.List;
 
-public class BaggageProcessorCustomizer implements AutoConfigurationCustomizerProvider {
+public final class BaggageProcessorCustomizer implements AutoConfigurationCustomizerProvider {
   @Override
   public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
     autoConfigurationCustomizer

baggage-processor/src/main/java/io/opentelemetry/contrib/baggage/processor/BaggageSpanProcessor.java

@@ -16,7 +16,7 @@
  * This span processor copies attributes stored in {@link Baggage} into each newly created {@link
  * io.opentelemetry.api.trace.Span}.
  */
-public class BaggageSpanProcessor implements SpanProcessor {
+public final class BaggageSpanProcessor implements SpanProcessor {
   private final Predicate<String> baggageKeyPredicate;
 
   /**

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

@@ -9,7 +9,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-public class CloudFoundryResourceDetector implements ComponentProvider<Resource> {
+public final class CloudFoundryResourceDetector implements ComponentProvider<Resource> {
 
   @Override
   public Class<Resource> getType() {

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

@@ -9,7 +9,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
 import io.opentelemetry.sdk.resources.Resource;
 
-public class CloudFoundryResourceProvider implements ResourceProvider {
+public final class CloudFoundryResourceProvider implements ResourceProvider {
 
   @Override
   public Resource createResource(ConfigProperties configProperties) {

consistent-sampling/src/test/java/io/opentelemetry/contrib/sampler/consistent56/OtelTraceStateTest.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.contrib.sampler.consistent56;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -20,56 +20,54 @@ private static String getXString(int len) {
   @Test
   public void test() {
 
-    assertEquals("", OtelTraceState.parse("").serialize());
-    assertEquals("", OtelTraceState.parse("").serialize());
+    assertThat(OtelTraceState.parse("").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("").serialize()).isEqualTo("");
 
-    assertEquals("", OtelTraceState.parse("a").serialize());
-    assertEquals("", OtelTraceState.parse("#").serialize());
-    assertEquals("", OtelTraceState.parse(" ").serialize());
+    assertThat(OtelTraceState.parse("a").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("#").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse(" ").serialize()).isEqualTo("");
 
-    assertEquals("rv:1234567890abcd", OtelTraceState.parse("rv:1234567890abcd").serialize());
-    assertEquals("rv:01020304050607", OtelTraceState.parse("rv:01020304050607").serialize());
-    assertEquals("", OtelTraceState.parse("rv:1234567890abcde").serialize());
+    assertThat(OtelTraceState.parse("rv:1234567890abcd").serialize()).isEqualTo("rv:1234567890abcd");
+    assertThat(OtelTraceState.parse("rv:01020304050607").serialize()).isEqualTo("rv:01020304050607");
+    assertThat(OtelTraceState.parse("rv:1234567890abcde").serialize()).isEqualTo("");
 
-    assertEquals("th:1234567890abcd", OtelTraceState.parse("th:1234567890abcd").serialize());
-    assertEquals("th:01020304050607", OtelTraceState.parse("th:01020304050607").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10000000000000").serialize());
-    assertEquals("th:12345", OtelTraceState.parse("th:1234500000000").serialize());
-    assertEquals("th:0", OtelTraceState.parse("th:0").serialize()); // TODO
-    assertEquals("", OtelTraceState.parse("th:100000000000000").serialize());
-    assertEquals("", OtelTraceState.parse("th:1234567890abcde").serialize());
+    assertThat(OtelTraceState.parse("th:1234567890abcd").serialize()).isEqualTo("th:1234567890abcd");
+    assertThat(OtelTraceState.parse("th:01020304050607").serialize()).isEqualTo("th:01020304050607");
+    assertThat(OtelTraceState.parse("th:10000000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1234500000000").serialize()).isEqualTo("th:12345");
+    assertThat(OtelTraceState.parse("th:0").serialize()).isEqualTo("th:0"); // TODO
+    assertThat(OtelTraceState.parse("th:100000000000000").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("th:1234567890abcde").serialize()).isEqualTo("");
 
-    assertEquals(
-        "th:1234567890abcd;rv:1234567890abcd;a:" + getXString(214) + ";x:3",
+    assertThat(
         OtelTraceState.parse("a:" + getXString(214) + ";rv:1234567890abcd;th:1234567890abcd;x:3")
-            .serialize());
-    assertEquals(
-        "",
+            .serialize()).isEqualTo("th:1234567890abcd;rv:1234567890abcd;a:" + getXString(214) + ";x:3");
+    assertThat(
         OtelTraceState.parse("a:" + getXString(215) + ";rv:1234567890abcd;th:1234567890abcd;x:3")
-            .serialize());
+            .serialize()).isEqualTo("");
 
-    assertEquals("", OtelTraceState.parse("th:x").serialize());
-    assertEquals("", OtelTraceState.parse("th:100000000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10000000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:1000000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:100000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:1000000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:100000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:1000000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:100000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:1000").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:100").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:10").serialize());
-    assertEquals("th:1", OtelTraceState.parse("th:1").serialize());
+    assertThat(OtelTraceState.parse("th:x").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("th:100000000000000").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("th:10000000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1000000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:100000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:10000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1000000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:100000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:10000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1000000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:100000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:10000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1000").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:100").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:10").serialize()).isEqualTo("th:1");
+    assertThat(OtelTraceState.parse("th:1").serialize()).isEqualTo("th:1");
 
-    assertEquals("th:10000000000001", OtelTraceState.parse("th:10000000000001").serialize());
-    assertEquals("th:1000000000001", OtelTraceState.parse("th:10000000000010").serialize());
-    assertEquals("", OtelTraceState.parse("rv:x").serialize());
-    assertEquals("", OtelTraceState.parse("rv:100000000000000").serialize());
-    assertEquals("rv:10000000000000", OtelTraceState.parse("rv:10000000000000").serialize());
-    assertEquals("", OtelTraceState.parse("rv:1000000000000").serialize());
+    assertThat(OtelTraceState.parse("th:10000000000001").serialize()).isEqualTo("th:10000000000001");
+    assertThat(OtelTraceState.parse("th:10000000000010").serialize()).isEqualTo("th:1000000000001");
+    assertThat(OtelTraceState.parse("rv:x").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("rv:100000000000000").serialize()).isEqualTo("");
+    assertThat(OtelTraceState.parse("rv:10000000000000").serialize()).isEqualTo("rv:10000000000000");
+    assertThat(OtelTraceState.parse("rv:1000000000000").serialize()).isEqualTo("");
   }
 }

gcp-resources/src/main/java/io/opentelemetry/contrib/gcp/resource/GCPResourceProvider.java

@@ -62,7 +62,7 @@
 import java.util.logging.Logger;
 
 @SuppressWarnings("MemberName")
-public class GCPResourceProvider implements ConditionalResourceProvider {
+public final class GCPResourceProvider implements ConditionalResourceProvider {
 
   private static final Logger LOGGER = Logger.getLogger(GCPResourceProvider.class.getSimpleName());
   private final GCPPlatformDetector detector;