Add BaggageLogRecordProcessor

Author: cyrille-leclerc

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

@@ -1,42 +1,49 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 package io.opentelemetry.contrib.baggage.processor;
 
 import io.opentelemetry.api.baggage.Baggage;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
 import io.opentelemetry.sdk.logs.ReadWriteLogRecord;
-
 import java.util.function.Predicate;
 
 /**
- * This log record processor copies attributes stored in {@link Baggage} into each newly created log record.
+ * 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);
-    }
+  /**
+   * 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);
+  }
 
-    private final Predicate<String> baggageKeyPredicate;
+  private final Predicate<String> baggageKeyPredicate;
 
-    /**
-     * Creates a new {@link BaggageLogRecordProcessor} that copies only baggage entries with keys that pass
-     * the provided filter into the newly created log record.
-     */
-    public BaggageLogRecordProcessor(Predicate<String> baggageKeyPredicate) {
-        this.baggageKeyPredicate = baggageKeyPredicate;
-    }
+  /**
+   * Creates a new {@link BaggageLogRecordProcessor} that copies only baggage entries with keys that
+   * pass the provided filter into the newly created log record.
+   */
+  public BaggageLogRecordProcessor(Predicate<String> baggageKeyPredicate) {
+    this.baggageKeyPredicate = baggageKeyPredicate;
+  }
 
-    @Override
-    public void onEmit(Context context, ReadWriteLogRecord logRecord) {
-        Baggage.fromContext(context).forEach((s, baggageEntry) -> {
-            if (baggageKeyPredicate.test(s)) {
+  @Override
+  public void onEmit(Context context, ReadWriteLogRecord logRecord) {
+    Baggage.fromContext(context)
+        .forEach(
+            (s, baggageEntry) -> {
+              if (baggageKeyPredicate.test(s)) {
                 logRecord.setAttribute(AttributeKey.stringKey(s), baggageEntry.getValue());
-            }
-        });
-    }
+              }
+            });
+  }
 }

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

@@ -58,6 +58,7 @@ private static void addLogRecordProcessor(
 
     sdkLoggerProviderBuilder.addLogRecordProcessor(createBaggageLogRecordProcessor(keys));
   }
+
   static BaggageLogRecordProcessor createBaggageLogRecordProcessor(List<String> keys) {
     if (keys.size() == 1 && keys.get(0).equals("*")) {
       return BaggageLogRecordProcessor.allowAllBaggageKeys();

baggage-processor/src/test/java/io/opentelemetry/contrib/baggage/processor/BaggageProcessorCustomizerTest.java

@@ -54,10 +54,9 @@ void test_customizer() {
     properties.put("otel.java.experimental.span-attributes.copy-from-baggage.include", "key");
     properties.put("otel.java.experimental.log-attributes.copy-from-baggage.include", "key");
     // TODO try use
-    //  AttributeAssertion attributeAssertion = OpenTelemetryAssertions.equalTo(AttributeKey.stringKey("key"), "value");
-    assertCustomizer(
-        properties,
-        span -> span.hasAttribute(AttributeKey.stringKey("key"), "value"));
+    //  AttributeAssertion attributeAssertion =
+    // OpenTelemetryAssertions.equalTo(AttributeKey.stringKey("key"), "value");
+    assertCustomizer(properties, span -> span.hasAttribute(AttributeKey.stringKey("key"), "value"));
   }
 
   private static void assertCustomizer(
@@ -69,7 +68,7 @@ private static void assertCustomizer(
     OpenTelemetrySdk sdk = getOpenTelemetrySdk(properties, spanExporter, logExporter);
     try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) {
       sdk.getTracer("test").spanBuilder("test").startSpan().end();
-      sdk.getLogsBridge().get("test").logRecordBuilder().setBody ("test").emit();
+      sdk.getLogsBridge().get("test").logRecordBuilder().setBody("test").emit();
     }
     // TODO verify log record attributes
     await()
@@ -82,10 +81,10 @@ private static void assertCustomizer(
   }
 
   private static OpenTelemetrySdk getOpenTelemetrySdk(
-      Map<String, String> properties, InMemorySpanExporter spanExporter,
+      Map<String, String> properties,
+      InMemorySpanExporter spanExporter,
       InMemoryLogRecordExporter logRecordExporter) {
-    SpiHelper spiHelper =
-        SpiHelper.create(BaggageProcessorCustomizerTest.class.getClassLoader());
+    SpiHelper spiHelper = SpiHelper.create(BaggageProcessorCustomizerTest.class.getClassLoader());
 
     AutoConfiguredOpenTelemetrySdkBuilder sdkBuilder =
         AutoConfiguredOpenTelemetrySdk.builder()
@@ -174,9 +173,11 @@ public void test_baggageSpanProcessor_adds_attributes_to_spans_when_key_filter_m
   }
 
   @Test
-  public void test_baggageLogRecordProcessor_adds_attributes_to_logRecord(@Mock ReadWriteLogRecord logRecord) {
+  public void test_baggageLogRecordProcessor_adds_attributes_to_logRecord(
+      @Mock ReadWriteLogRecord logRecord) {
     try (BaggageLogRecordProcessor processor =
-        BaggageProcessorCustomizer.createBaggageLogRecordProcessor(Collections.singletonList("*"))) {
+        BaggageProcessorCustomizer.createBaggageLogRecordProcessor(
+            Collections.singletonList("*"))) {
       try (Scope ignore = Baggage.current().toBuilder().put("key", "value").build().makeCurrent()) {
         processor.onEmit(Context.current(), logRecord);
         verify(logRecord).setAttribute(AttributeKey.stringKey("key"), "value");
@@ -188,7 +189,8 @@ public void test_baggageLogRecordProcessor_adds_attributes_to_logRecord(@Mock Re
   public void test_baggageLogRecordProcessor_adds_attributes_to_spans_when_key_filter_matches(
       @Mock ReadWriteLogRecord logRecord) {
     try (BaggageLogRecordProcessor processor =
-        BaggageProcessorCustomizer.createBaggageLogRecordProcessor(Collections.singletonList("key"))) {
+        BaggageProcessorCustomizer.createBaggageLogRecordProcessor(
+            Collections.singletonList("key"))) {
       try (Scope ignore =
           Baggage.current().toBuilder()
               .put("key", "value")