revert inferred spans (flaky)

Author: zeitlinger

inferred-spans/build.gradle.kts

@@ -9,13 +9,10 @@ description = "OpenTelemetry Java profiling based inferred spans module"
 otelJava.moduleName.set("io.opentelemetry.contrib.inferredspans")
 
 dependencies {
-  implementation(project(":declarative-config-bridge"))
-
   annotationProcessor("com.google.auto.service:auto-service")
   compileOnly("com.google.auto.service:auto-service-annotations")
   compileOnly("io.opentelemetry:opentelemetry-sdk")
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-  compileOnly("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
   implementation("com.lmax:disruptor")
   implementation("org.jctools:jctools-core")
@@ -28,7 +25,6 @@ dependencies {
   testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
   testImplementation("io.opentelemetry:opentelemetry-sdk")
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
   testImplementation("io.opentelemetry:opentelemetry-api-incubator")
   testImplementation("io.opentelemetry:opentelemetry-exporter-logging")

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

@@ -11,7 +11,6 @@
 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.trace.SpanProcessor;
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
@@ -46,7 +45,29 @@ public void customize(AutoConfigurationCustomizer config) {
     config.addTracerProviderCustomizer(
         (providerBuilder, properties) -> {
           if (properties.getBoolean(ENABLED_OPTION, false)) {
-            providerBuilder.addSpanProcessor(create(properties));
+            InferredSpansProcessorBuilder builder = InferredSpansProcessor.builder();
+
+            PropertiesApplier applier = new PropertiesApplier(properties);
+
+            applier.applyBool(LOGGING_OPTION, builder::profilerLoggingEnabled);
+            applier.applyBool(DIAGNOSTIC_FILES_OPTION, builder::backupDiagnosticFiles);
+            applier.applyInt(SAFEMODE_OPTION, builder::asyncProfilerSafeMode);
+            applier.applyBool(POSTPROCESSING_OPTION, builder::postProcessingEnabled);
+            applier.applyDuration(SAMPLING_INTERVAL_OPTION, builder::samplingInterval);
+            applier.applyDuration(MIN_DURATION_OPTION, builder::inferredSpansMinDuration);
+            applier.applyWildcards(INCLUDED_CLASSES_OPTION, builder::includedClasses);
+            applier.applyWildcards(EXCLUDED_CLASSES_OPTION, builder::excludedClasses);
+            applier.applyDuration(INTERVAL_OPTION, builder::profilerInterval);
+            applier.applyDuration(DURATION_OPTION, builder::profilingDuration);
+            applier.applyString(LIB_DIRECTORY_OPTION, builder::profilerLibDirectory);
+
+            String parentOverrideHandlerName = properties.getString(PARENT_OVERRIDE_HANDLER_OPTION);
+            if (parentOverrideHandlerName != null && !parentOverrideHandlerName.isEmpty()) {
+              builder.parentOverrideHandler(
+                  constructParentOverrideHandler(parentOverrideHandlerName));
+            }
+
+            providerBuilder.addSpanProcessor(builder.build());
           } else {
             log.finest(
                 "Not enabling inferred spans processor because " + ENABLED_OPTION + " is not set");
@@ -55,31 +76,6 @@ public void customize(AutoConfigurationCustomizer config) {
         });
   }
 
-  static SpanProcessor create(ConfigProperties properties) {
-    InferredSpansProcessorBuilder builder = InferredSpansProcessor.builder();
-
-    PropertiesApplier applier = new PropertiesApplier(properties);
-
-    applier.applyBool(LOGGING_OPTION, builder::profilerLoggingEnabled);
-    applier.applyBool(DIAGNOSTIC_FILES_OPTION, builder::backupDiagnosticFiles);
-    applier.applyInt(SAFEMODE_OPTION, builder::asyncProfilerSafeMode);
-    applier.applyBool(POSTPROCESSING_OPTION, builder::postProcessingEnabled);
-    applier.applyDuration(SAMPLING_INTERVAL_OPTION, builder::samplingInterval);
-    applier.applyDuration(MIN_DURATION_OPTION, builder::inferredSpansMinDuration);
-    applier.applyWildcards(INCLUDED_CLASSES_OPTION, builder::includedClasses);
-    applier.applyWildcards(EXCLUDED_CLASSES_OPTION, builder::excludedClasses);
-    applier.applyDuration(INTERVAL_OPTION, builder::profilerInterval);
-    applier.applyDuration(DURATION_OPTION, builder::profilingDuration);
-    applier.applyString(LIB_DIRECTORY_OPTION, builder::profilerLibDirectory);
-
-    String parentOverrideHandlerName = properties.getString(PARENT_OVERRIDE_HANDLER_OPTION);
-    if (parentOverrideHandlerName != null && !parentOverrideHandlerName.isEmpty()) {
-      builder.parentOverrideHandler(constructParentOverrideHandler(parentOverrideHandlerName));
-    }
-
-    return builder.build();
-  }
-
   @SuppressWarnings("unchecked")
   private static BiConsumer<SpanBuilder, SpanContext> constructParentOverrideHandler(String name) {
     try {

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

@@ -49,8 +49,7 @@ public class InferredSpansProcessor implements SpanProcessor {
       boolean startScheduledProfiling,
       @Nullable File activationEventsFile,
       @Nullable File jfrFile) {
-    profiler =
-        new SamplingProfiler(config, clock, this::getTracer, activationEventsFile, jfrFile, null);
+    profiler = new SamplingProfiler(config, clock, this::getTracer, activationEventsFile, jfrFile);
     if (startScheduledProfiling) {
       profiler.start();
     }

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

@@ -149,7 +149,6 @@ public class SamplingProfiler implements Runnable {
   private final ProfilingActivationListener activationListener;
 
   private final Supplier<Tracer> tracerProvider;
-  @Nullable private final File tempDir;
 
   private final AsyncProfiler profiler;
 
@@ -169,11 +168,9 @@ public SamplingProfiler(
       SpanAnchoredClock nanoClock,
       Supplier<Tracer> tracerProvider,
       @Nullable File activationEventsFile,
-      @Nullable File jfrFile,
-      @Nullable File tempDir) {
+      @Nullable File jfrFile) {
     this.config = config;
     this.tracerProvider = tracerProvider;
-    this.tempDir = tempDir;
     this.scheduler =
         Executors.newSingleThreadScheduledExecutor(
             r -> {
@@ -253,13 +250,12 @@ boolean isProfilingActiveOnThread(Thread thread) {
 
   private synchronized void createFilesIfRequired() throws IOException {
     if (jfrFile == null || !jfrFile.exists()) {
-      jfrFile = File.createTempFile("otel-inferred-traces-", ".jfr", tempDir);
+      jfrFile = File.createTempFile("otel-inferred-traces-", ".jfr");
       jfrFile.deleteOnExit();
       canDeleteJfrFile = true;
     }
     if (activationEventsFile == null || !activationEventsFile.exists()) {
-      activationEventsFile =
-          File.createTempFile("otel-inferred-activation-events-", ".bin", tempDir);
+      activationEventsFile = File.createTempFile("otel-inferred-activation-events-", ".bin");
       activationEventsFile.deleteOnExit();
       canDeleteActivationEventsFile = true;
     }

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

@@ -32,12 +32,12 @@
 import java.util.stream.Stream;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledForJreRange;
 import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.condition.OS;
-import org.junit.jupiter.api.io.TempDir;
 
 // async-profiler doesn't work on Windows
 @DisabledOnOs(OS.WINDOWS)
@@ -46,14 +46,19 @@ class SamplingProfilerTest {
 
   private ProfilerTestSetup setup;
 
-  @TempDir private Path tempDir;
+  @BeforeEach
+  void setup() {
+    // avoids any test failure to make other tests to fail
+    getProfilerTempFiles().forEach(SamplingProfilerTest::silentDeleteFile);
+  }
 
   @AfterEach
   void tearDown() {
     if (setup != null) {
       setup.close();
       setup = null;
     }
+    getProfilerTempFiles().forEach(SamplingProfilerTest::silentDeleteFile);
   }
 
   @Test
@@ -112,8 +117,8 @@ void shouldNotDeleteProvidedFiles() throws Exception {
       defaultConfig = ProfilerTestSetup.extractProfilerImpl(profiler1).getConfig();
     }
 
-    Path tempFile1 = Files.createTempFile(tempDir, "otel-inferred-provided", "test.bin");
-    Path tempFile2 = Files.createTempFile(tempDir, "otel-inferred-provided", "test.jfr");
+    Path tempFile1 = Files.createTempFile("otel-inferred-provided", "test.bin");
+    Path tempFile2 = Files.createTempFile("otel-inferred-provided", "test.jfr");
 
     try (OpenTelemetrySdk sdk = OpenTelemetrySdk.builder().build()) {
 
@@ -123,8 +128,7 @@ void shouldNotDeleteProvidedFiles() throws Exception {
               new FixedClock(),
               () -> sdk.getTracer("my-tracer"),
               tempFile1.toFile(),
-              tempFile2.toFile(),
-              tempDir.toFile());
+              tempFile2.toFile());
 
       otherProfiler.start();
       awaitProfilerStarted(otherProfiler);
@@ -337,4 +341,12 @@ private static void awaitProfilerStarted(SamplingProfiler profiler) {
         .timeout(Duration.ofSeconds(6))
         .until(() -> profiler.getProfilingSessions() > 1);
   }
+
+  private static void silentDeleteFile(Path f) {
+    try {
+      Files.delete(f);
+    } catch (IOException e) {
+      throw new IllegalStateException(e);
+    }
+  }
 }