inferred spans

Author: zeitlinger

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansAutoConfig.java

@@ -14,7 +14,6 @@
 import io.opentelemetry.sdk.trace.SpanProcessor;
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -46,20 +45,17 @@ public class InferredSpansAutoConfig implements AutoConfigurationCustomizerProvi
   public void customize(AutoConfigurationCustomizer config) {
     config.addTracerProviderCustomizer(
         (providerBuilder, properties) -> {
-          providerBuilder.addSpanProcessor(create(properties, /* enableByDefault= */ false));
+          if (properties.getBoolean(ENABLED_OPTION, false)) {
+            providerBuilder.addSpanProcessor(create(properties));
+          } else {
+            log.finest(
+                "Not enabling inferred spans processor because " + ENABLED_OPTION + " is not set");
+          }
           return providerBuilder;
         });
   }
 
-  static SpanProcessor create(ConfigProperties properties, boolean enableByDefault) {
-    if (!properties.getBoolean(ENABLED_OPTION, enableByDefault)) {
-      log.finest(
-          "Not creating inferred spans processor because "
-              + ENABLED_OPTION
-              + " is not set to true");
-      return SpanProcessor.composite(Collections.emptyList());
-    }
-
+  static SpanProcessor create(ConfigProperties properties) {
     InferredSpansProcessorBuilder builder = InferredSpansProcessor.builder();
 
     PropertiesApplier applier = new PropertiesApplier(properties);

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansComponentProvider.java

@@ -25,8 +25,7 @@ public String getName() {
   public SpanProcessor create(DeclarativeConfigProperties config) {
     return InferredSpansAutoConfig.create(
         ConfigPropertiesUtil.resolveConfig(
-            config, Collections.singletonMap("otel.inferred.spans.", "")),
-        /* enableByDefault= */ true);
+            config, Collections.singletonMap("otel.inferred.spans.", "")));
   }
 
   @Override

inferred-spans/src/main/java/io/opentelemetry/contrib/inferredspans/InferredSpansCustomizerProvider.java

@@ -5,6 +5,7 @@
 
 package io.opentelemetry.contrib.inferredspans;
 
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.DeclarativeConfiguration;
 import org.junit.jupiter.api.Test;
 
@@ -15,30 +16,32 @@
 
 class InferredSpansCustomizerProviderTest {
 
-  private static final String FQDN =
-      "spanProcessor=io.opentelemetry.contrib.inferredspans.InferredSpansProcessor";
-
-  @Test
-  void enabled() {
-    assertThat(create("")).contains(FQDN);
-  }
-
   @Test
-  void disabled() {
-    assertThat(create("enabled: false")).doesNotContain(FQDN);
-  }
-
-  private static String create(String enabled) {
+  void declarativeConfig() {
     String yaml =
         "file_format: 0.4\n"
             + "tracer_provider:\n"
             + "  processors:\n"
             + "    - inferred_spans:\n"
-            + "        "
-            + enabled
-            + "\n";
-    return DeclarativeConfiguration.parseAndCreate(
-            new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8)))
-        .toString();
+            + "        backup:\n"
+            + "          diagnostic:\n"
+            + "            files: true\n";
+
+    OpenTelemetrySdk sdk =
+        DeclarativeConfiguration.parseAndCreate(
+            new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8)));
+
+    assertThat(sdk)
+        .extracting("tracerProvider")
+        .extracting("delegate")
+        .extracting("sharedState")
+        .extracting("activeSpanProcessor")
+        .extracting("profiler")
+        .extracting("config")
+        .extracting("backupDiagnosticFiles")
+        .isEqualTo(true);
+
+    assertThat(sdk.toString())
+        .contains("spanProcessor=io.opentelemetry.contrib.inferredspans.InferredSpansProcessor");
   }
 }