add enabled

Author: zeitlinger

inferred-spans/README.md

@@ -53,7 +53,7 @@ file_format: 1.0-rc.1
 tracer_provider:
   processors:
     - experimental_inferred_spans:
-        enabled: true
+        enabled: true # true by default unlike autoconfiguration described above
         sampling_interval: 25ms
         included_classes: "org.example.myapp.*"
         excluded_classes: "java.*"

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

@@ -8,13 +8,18 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
 import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.trace.SpanProcessor;
+import java.util.logging.Logger;
 
 @SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
 public class InferredSpansSpanProcessorProvider implements ComponentProvider<SpanProcessor> {
 
+  private static final Logger log =
+      Logger.getLogger(InferredSpansSpanProcessorProvider.class.getName());
+
   private static final String PREFIX = "otel.inferred.spans.";
 
   @Override
@@ -23,7 +28,7 @@ public String getName() {
   }
 
   @Override
-  public SpanProcessor create(DeclarativeConfigProperties config) {
+  public SpanProcessor create(DeclarativeConfigProperties declarativeConfigProperties) {
     DeclarativeConfigPropertiesBridgeBuilder builder =
         new DeclarativeConfigPropertiesBridgeBuilder();
 
@@ -33,7 +38,13 @@ public SpanProcessor create(DeclarativeConfigProperties config) {
       builder.addMapping(property, property.substring(PREFIX.length()).replace('.', '_'));
     }
 
-    return InferredSpansConfig.createSpanProcessor(builder.build(config));
+    ConfigProperties properties = builder.build(declarativeConfigProperties);
+    if (properties.getBoolean(InferredSpansConfig.ENABLED_OPTION, true)) {
+      return InferredSpansConfig.createSpanProcessor(properties);
+    } else {
+      log.finest("Not enabling inferred spans processor because enabled=false");
+      return SpanProcessor.composite();
+    }
   }
 
   @Override

inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansCustomizerProviderTest.java renamed to inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/InferredSpansSpanProcessorProviderTest.java

@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.condition.DisabledOnOs;
 
 @DisabledOnOs(WINDOWS) // Uses async-profiler, which is not supported on Windows
-class InferredSpansCustomizerProviderTest {
+class InferredSpansSpanProcessorProviderTest {
 
   @BeforeEach
   @AfterEach
@@ -36,7 +36,6 @@ void declarativeConfig() {
             + "tracer_provider:\n"
             + "  processors:\n"
             + "    - experimental_inferred_spans:\n"
-            + "        enabled: false\n"
             + "        backup_diagnostic_files: true\n";
 
     OpenTelemetrySdk sdk =
@@ -53,4 +52,28 @@ void declarativeConfig() {
         .extracting("backupDiagnosticFiles")
         .isEqualTo(true);
   }
+
+  @Test
+  void declarativeConfigDisabled() {
+    String yaml =
+        "file_format: 1.0-rc.1\n"
+            + "tracer_provider:\n"
+            + "  processors:\n"
+            + "    - experimental_inferred_spans:\n"
+            + "        enabled: false\n";
+
+    OpenTelemetrySdk sdk =
+        DeclarativeConfiguration.parseAndCreate(
+            new ByteArrayInputStream(yaml.getBytes(StandardCharsets.UTF_8)));
+
+    assertThat(sdk)
+        .extracting("tracerProvider")
+        .extracting("delegate")
+        .extracting("sharedState")
+        .extracting("activeSpanProcessor")
+        .satisfies(
+            p ->
+                assertThat(p.getClass().getName())
+                    .isEqualTo("io.opentelemetry.sdk.trace.NoopSpanProcessor"));
+  }
 }