make temp dir more reliable

Author: zeitlinger

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

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

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

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

inferred-spans/src/test/java/io/opentelemetry/contrib/inferredspans/internal/SamplingProfilerTest.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,19 +46,14 @@ class SamplingProfilerTest {
 
   private ProfilerTestSetup setup;
 
-  @BeforeEach
-  void setup() {
-    // avoids any test failure to make other tests to fail
-    getProfilerTempFiles().forEach(SamplingProfilerTest::silentDeleteFile);
-  }
+  @TempDir private Path tempDir;
 
   @AfterEach
   void tearDown() {
     if (setup != null) {
       setup.close();
       setup = null;
     }
-    getProfilerTempFiles().forEach(SamplingProfilerTest::silentDeleteFile);
   }
 
   @Test
@@ -117,8 +112,8 @@ void shouldNotDeleteProvidedFiles() throws Exception {
       defaultConfig = ProfilerTestSetup.extractProfilerImpl(profiler1).getConfig();
     }
 
-    Path tempFile1 = Files.createTempFile("otel-inferred-provided", "test.bin");
-    Path tempFile2 = Files.createTempFile("otel-inferred-provided", "test.jfr");
+    Path tempFile1 = Files.createTempFile(tempDir, "otel-inferred-provided", "test.bin");
+    Path tempFile2 = Files.createTempFile(tempDir, "otel-inferred-provided", "test.jfr");
 
     try (OpenTelemetrySdk sdk = OpenTelemetrySdk.builder().build()) {
 
@@ -128,7 +123,8 @@ void shouldNotDeleteProvidedFiles() throws Exception {
               new FixedClock(),
               () -> sdk.getTracer("my-tracer"),
               tempFile1.toFile(),
-              tempFile2.toFile());
+              tempFile2.toFile(),
+              tempDir.toFile());
 
       otherProfiler.start();
       awaitProfilerStarted(otherProfiler);
@@ -333,20 +329,4 @@ private void setupProfiler(Consumer<InferredSpansProcessorBuilder> configCustomi
               configCustomizer.accept(config);
             });
   }
-
-  private static void awaitProfilerStarted(SamplingProfiler profiler) {
-    // ensure profiler is initialized
-    await()
-        .pollDelay(Duration.ofMillis(10))
-        .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);
-    }
-  }
 }