Merge PR #243: Update baggage-processor module to follow style guide

Author: trask

baggage-processor/build.gradle.kts

@@ -12,9 +12,13 @@ dependencies {
   api("io.opentelemetry:opentelemetry-sdk")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
 
+  compileOnly("com.google.auto.service:auto-service-annotations")
+  annotationProcessor("com.google.auto.service:auto-service")
+
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("org.mockito:mockito-inline")
   testImplementation("com.google.guava:guava")
   testImplementation("org.awaitility:awaitility")
+  testCompileOnly("com.google.auto.service:auto-service-annotations")
 }

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

@@ -16,15 +16,7 @@
  * This log record processor copies attributes stored in {@link Baggage} into each newly created log
  * record.
  */
-public class BaggageLogRecordProcessor implements LogRecordProcessor {
-
-  /**
-   * Creates a new {@link BaggageLogRecordProcessor} that copies all baggage entries into the newly
-   * created log record.
-   */
-  public static BaggageLogRecordProcessor allowAllBaggageKeys() {
-    return new BaggageLogRecordProcessor(baggageKey -> true);
-  }
+public final class BaggageLogRecordProcessor implements LogRecordProcessor {
 
   private final Predicate<String> baggageKeyPredicate;
 
@@ -36,6 +28,14 @@ public BaggageLogRecordProcessor(Predicate<String> baggageKeyPredicate) {
     this.baggageKeyPredicate = baggageKeyPredicate;
   }
 
+  /**
+   * Creates a new {@link BaggageLogRecordProcessor} that copies all baggage entries into the newly
+   * created log record.
+   */
+  public static BaggageLogRecordProcessor allowAllBaggageKeys() {
+    return new BaggageLogRecordProcessor(baggageKey -> true);
+  }
+
   @Override
   public void onEmit(Context context, ReadWriteLogRecord logRecord) {
     Baggage.fromContext(context)

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

@@ -5,14 +5,16 @@
 
 package io.opentelemetry.contrib.baggage.processor;
 
+import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
 import java.util.List;
 
-public class BaggageProcessorCustomizer implements AutoConfigurationCustomizerProvider {
+@AutoService(AutoConfigurationCustomizerProvider.class)
+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;
 
   /**

baggage-processor/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider

@@ -5,6 +5,9 @@
 
 package io.opentelemetry.contrib.baggage.processor;
 
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
@@ -13,24 +16,23 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class BaggageSpanProcessorTest {
+class BaggageSpanProcessorTest {
 
   @Test
-  public void test_baggageSpanProcessor_adds_attributes_to_spans(@Mock ReadWriteSpan span) {
+  void test_baggageSpanProcessor_adds_attributes_to_spans(@Mock ReadWriteSpan span) {
     try (BaggageSpanProcessor processor = BaggageSpanProcessor.allowAllBaggageKeys()) {
       try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) {
         processor.onStart(Context.current(), span);
-        Mockito.verify(span).setAttribute("key", "value");
+        verify(span).setAttribute("key", "value");
       }
     }
   }
 
   @Test
-  public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_matches(
+  void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_matches(
       @Mock ReadWriteSpan span) {
     try (BaggageSpanProcessor processor = new BaggageSpanProcessor(key -> key.startsWith("k"))) {
       try (Scope ignore =
@@ -40,14 +42,14 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m
               .build()
               .makeCurrent()) {
         processor.onStart(Context.current(), span);
-        Mockito.verify(span).setAttribute("key", "value");
-        Mockito.verify(span, Mockito.never()).setAttribute("other", "value");
+        verify(span).setAttribute("key", "value");
+        verify(span, never()).setAttribute("other", "value");
       }
     }
   }
 
   @Test
-  public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_matches_regex(
+  void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_matches_regex(
       @Mock ReadWriteSpan span) {
     Pattern pattern = Pattern.compile("k.*");
     try (BaggageSpanProcessor processor =
@@ -59,8 +61,8 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m
               .build()
               .makeCurrent()) {
         processor.onStart(Context.current(), span);
-        Mockito.verify(span).setAttribute("key", "value");
-        Mockito.verify(span, Mockito.never()).setAttribute("other", "value");
+        verify(span).setAttribute("key", "value");
+        verify(span, never()).setAttribute("other", "value");
       }
     }
   }