baggage is in a separate PR

Author: zeitlinger

baggage-processor/build.gradle.kts

@@ -8,19 +8,11 @@ description = "OpenTelemetry Baggage Span Processor"
 otelJava.moduleName.set("io.opentelemetry.contrib.baggage.processor")
 
 dependencies {
-  implementation(project(":declarative-config-bridge"))
-
-  annotationProcessor("com.google.auto.service:auto-service")
-  compileOnly("com.google.auto.service:auto-service-annotations")
   api("io.opentelemetry:opentelemetry-api")
   api("io.opentelemetry:opentelemetry-sdk")
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 
-  testAnnotationProcessor("com.google.auto.service:auto-service")
-  testCompileOnly("com.google.auto.service:auto-service-annotations")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("org.mockito:mockito-inline")
   testImplementation("com.google.guava:guava")

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

@@ -5,17 +5,14 @@
 
 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;
 
-@AutoService(AutoConfigurationCustomizerProvider.class)
 public class BaggageProcessorCustomizer implements AutoConfigurationCustomizerProvider {
-
   @Override
   public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
     autoConfigurationCustomizer
@@ -33,53 +30,39 @@ public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
 
   private static void addSpanProcessor(
       SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties config) {
-    if (spanKeys(config).isEmpty()) {
+    List<String> keys =
+        config.getList("otel.java.experimental.span-attributes.copy-from-baggage.include");
+
+    if (keys.isEmpty()) {
       return;
     }
 
-    sdkTracerProviderBuilder.addSpanProcessor(createBaggageSpanProcessor(config));
-  }
-
-  static BaggageSpanProcessor createBaggageSpanProcessor(ConfigProperties config) {
-    return createBaggageSpanProcessor(spanKeys(config));
+    sdkTracerProviderBuilder.addSpanProcessor(createBaggageSpanProcessor(keys));
   }
 
   static BaggageSpanProcessor createBaggageSpanProcessor(List<String> keys) {
-    if (matchAll(keys)) {
+    if (keys.size() == 1 && keys.get(0).equals("*")) {
       return BaggageSpanProcessor.allowAllBaggageKeys();
     }
     return new BaggageSpanProcessor(keys::contains);
   }
 
-  static List<String> spanKeys(ConfigProperties config) {
-    return config.getList("otel.java.experimental.span-attributes.copy-from-baggage.include");
-  }
-
   private static void addLogRecordProcessor(
       SdkLoggerProviderBuilder sdkLoggerProviderBuilder, ConfigProperties config) {
-    if (logKeys(config).isEmpty()) {
+    List<String> keys =
+        config.getList("otel.java.experimental.log-attributes.copy-from-baggage.include");
+
+    if (keys.isEmpty()) {
       return;
     }
 
-    sdkLoggerProviderBuilder.addLogRecordProcessor(createBaggageLogRecordProcessor(config));
-  }
-
-  static BaggageLogRecordProcessor createBaggageLogRecordProcessor(ConfigProperties config) {
-    return createBaggageLogRecordProcessor(logKeys(config));
+    sdkLoggerProviderBuilder.addLogRecordProcessor(createBaggageLogRecordProcessor(keys));
   }
 
   static BaggageLogRecordProcessor createBaggageLogRecordProcessor(List<String> keys) {
-    if (matchAll(keys)) {
+    if (keys.size() == 1 && keys.get(0).equals("*")) {
       return BaggageLogRecordProcessor.allowAllBaggageKeys();
     }
     return new BaggageLogRecordProcessor(keys::contains);
   }
-
-  static List<String> logKeys(ConfigProperties config) {
-    return config.getList("otel.java.experimental.log-attributes.copy-from-baggage.include");
-  }
-
-  private static boolean matchAll(List<String> keys) {
-    return keys.size() == 1 && keys.get(0).equals("*");
-  }
 }

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

@@ -0,0 +1 @@
+io.opentelemetry.contrib.baggage.processor.BaggageProcessorCustomizer

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

@@ -103,9 +103,9 @@ private static OpenTelemetrySdk getOpenTelemetrySdk(
                         // We set the export interval of the spans to 10 ms. The default value is 5
                         // seconds.
                         "otel.bsp.schedule.delay", // span exporter
-                        "100",
+                        "10",
                         "otel.blrp.schedule.delay", // log exporter
-                        "100",
+                        "10",
                         "otel.traces.exporter",
                         MEMORY_EXPORTER,
                         "otel.metrics.exporter",