stack trace span processor

Author: zeitlinger

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

@@ -23,23 +23,17 @@ public class BaggageLogRecordProcessor implements LogRecordProcessor {
    * created log record.
    */
   public static BaggageLogRecordProcessor allowAllBaggageKeys() {
-    return new BaggageLogRecordProcessor(baggageKey -> true, false);
+    return new BaggageLogRecordProcessor(baggageKey -> true);
   }
 
   private final Predicate<String> baggageKeyPredicate;
-  private boolean empty;
 
   /**
    * 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, false); // we don't know if the predicate matches any keys
-  }
-
-  BaggageLogRecordProcessor(Predicate<String> baggageKeyPredicate, boolean empty) {
     this.baggageKeyPredicate = baggageKeyPredicate;
-    this.empty = empty;
   }
 
   @Override
@@ -52,8 +46,4 @@ public void onEmit(Context context, ReadWriteLogRecord logRecord) {
               }
             });
   }
-
-  boolean isEmpty() {
-    return empty;
-  }
 }

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

@@ -35,43 +35,50 @@ public void customize(AutoConfigurationCustomizer autoConfigurationCustomizer) {
 
   private static void addSpanProcessor(
       SdkTracerProviderBuilder sdkTracerProviderBuilder, ConfigProperties config) {
-    BaggageSpanProcessor processor = createBaggageSpanProcessor(config);
-    if (processor.isEmpty()) {
+    if (spanKeys(config).isEmpty()) {
       return;
     }
-    sdkTracerProviderBuilder.addSpanProcessor(processor);
+
+    sdkTracerProviderBuilder.addSpanProcessor(createBaggageSpanProcessor(config));
   }
 
   static BaggageSpanProcessor createBaggageSpanProcessor(ConfigProperties config) {
-    return createBaggageSpanProcessor(config.getList(SPAN_PREFIX + "copy-from-baggage.include"));
+    return createBaggageSpanProcessor(spanKeys(config));
+  }
+
+  static List<String> spanKeys(ConfigProperties config) {
+    return config.getList(SPAN_PREFIX + "copy-from-baggage.include");
   }
 
   static BaggageSpanProcessor createBaggageSpanProcessor(List<String> keys) {
     if (matchAll(keys)) {
       return BaggageSpanProcessor.allowAllBaggageKeys();
     }
-    return new BaggageSpanProcessor(keys::contains, keys.isEmpty());
+    return new BaggageSpanProcessor(keys::contains);
   }
 
   private static void addLogRecordProcessor(
       SdkLoggerProviderBuilder sdkLoggerProviderBuilder, ConfigProperties config) {
-    BaggageLogRecordProcessor processor = createBaggageLogRecordProcessor(config);
-    if (processor.isEmpty()) {
+    if (logKeys(config).isEmpty()) {
       return;
     }
-    sdkLoggerProviderBuilder.addLogRecordProcessor(processor);
+
+    sdkLoggerProviderBuilder.addLogRecordProcessor(createBaggageLogRecordProcessor(config));
   }
 
   static BaggageLogRecordProcessor createBaggageLogRecordProcessor(ConfigProperties config) {
-    return createBaggageLogRecordProcessor(
-        config.getList(LOG_PREFIX + "copy-from-baggage.include"));
+    return createBaggageLogRecordProcessor(logKeys(config));
+  }
+
+  static List<String> logKeys(ConfigProperties config) {
+    return config.getList(LOG_PREFIX + "copy-from-baggage.include");
   }
 
   static BaggageLogRecordProcessor createBaggageLogRecordProcessor(List<String> keys) {
     if (matchAll(keys)) {
       return BaggageLogRecordProcessor.allowAllBaggageKeys();
     }
-    return new BaggageLogRecordProcessor(keys::contains, keys.isEmpty());
+    return new BaggageLogRecordProcessor(keys::contains);
   }
 
   private static boolean matchAll(List<String> keys) {

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

@@ -18,27 +18,21 @@
  */
 public class BaggageSpanProcessor implements SpanProcessor {
   private final Predicate<String> baggageKeyPredicate;
-  private boolean empty;
 
   /**
    * Creates a new {@link BaggageSpanProcessor} that copies only baggage entries with keys that pass
    * the provided filter into the newly created {@link io.opentelemetry.api.trace.Span}.
    */
   public BaggageSpanProcessor(Predicate<String> baggageKeyPredicate) {
-    this(baggageKeyPredicate, false); // we don't know if the predicate matches any keys
-  }
-
-  BaggageSpanProcessor(Predicate<String> baggageKeyPredicate, boolean empty) {
     this.baggageKeyPredicate = baggageKeyPredicate;
-    this.empty = empty;
   }
 
   /**
    * Creates a new {@link BaggageSpanProcessor} that copies all baggage entries into the newly
    * created {@link io.opentelemetry.api.trace.Span}.
    */
   public static BaggageSpanProcessor allowAllBaggageKeys() {
-    return new BaggageSpanProcessor(baggageKey -> true, false);
+    return new BaggageSpanProcessor(baggageKey -> true);
   }
 
   @Override
@@ -64,8 +58,4 @@ public void onEnd(ReadableSpan span) {}
   public boolean isEndRequired() {
     return false;
   }
-
-  boolean isEmpty() {
-    return empty;
-  }
 }

span-stacktrace/build.gradle.kts

@@ -7,6 +7,8 @@ description = "OpenTelemetry Java span stacktrace capture module"
 otelJava.moduleName.set("io.opentelemetry.contrib.stacktrace")
 
 dependencies {
+  implementation(project(":declarative-config-bridge"))
+
   annotationProcessor("com.google.auto.service:auto-service")
   compileOnly("com.google.auto.service:auto-service-annotations")
 
@@ -15,8 +17,10 @@ dependencies {
 
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
+  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
 
   compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")

span-stacktrace/src/main/java/io/opentelemetry/contrib/stacktrace/StackTraceAutoConfig.java

@@ -23,25 +23,26 @@ public class StackTraceAutoConfig implements AutoConfigurationCustomizerProvider
 
   private static final Logger log = Logger.getLogger(StackTraceAutoConfig.class.getName());
 
-  private static final String CONFIG_MIN_DURATION =
-      "otel.java.experimental.span-stacktrace.min.duration";
+  static final String PREFIX = "otel.java.experimental.span-stacktrace.";
+  private static final String CONFIG_MIN_DURATION = PREFIX + "min.duration";
   private static final Duration CONFIG_MIN_DURATION_DEFAULT = Duration.ofMillis(5);
-
-  private static final String CONFIG_FILTER = "otel.java.experimental.span-stacktrace.filter";
+  private static final String CONFIG_FILTER = PREFIX + "filter";
 
   @Override
   public void customize(AutoConfigurationCustomizer config) {
     config.addTracerProviderCustomizer(
         (providerBuilder, properties) -> {
-          long minDuration = getMinDuration(properties);
-          if (minDuration >= 0) {
-            Predicate<ReadableSpan> filter = getFilterPredicate(properties);
-            providerBuilder.addSpanProcessor(new StackTraceSpanProcessor(minDuration, filter));
+          if (getMinDuration(properties) >= 0) {
+            providerBuilder.addSpanProcessor(create(properties));
           }
           return providerBuilder;
         });
   }
 
+  static StackTraceSpanProcessor create(ConfigProperties properties) {
+    return new StackTraceSpanProcessor(getMinDuration(properties), getFilterPredicate(properties));
+  }
+
   // package-private for testing
   static long getMinDuration(ConfigProperties properties) {
     long minDuration =

span-stacktrace/src/main/java/io/opentelemetry/contrib/stacktrace/StackTraceComponentProvider.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.stacktrace;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.contrib.sdk.autoconfigure.ConfigPropertiesUtil;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
+import io.opentelemetry.sdk.trace.SpanProcessor;
+import java.util.Collections;
+
+@SuppressWarnings("rawtypes")
+@AutoService(ComponentProvider.class)
+public class StackTraceComponentProvider implements ComponentProvider<SpanProcessor> {
+  @Override
+  public String getName() {
+    return "stacktrace";
+  }
+
+  @Override
+  public SpanProcessor create(DeclarativeConfigProperties config) {
+    return StackTraceAutoConfig.create(
+        ConfigPropertiesUtil.resolveConfig(
+            config, Collections.singletonMap(StackTraceAutoConfig.PREFIX, "")));
+  }
+
+  @Override
+  public Class<SpanProcessor> getType() {
+    return SpanProcessor.class;
+  }
+}