Profiler output dir is only used by the keep files setting

Author: laurit

profiler/src/main/java/com/splunk/opentelemetry/profiler/JfrActivator.java

@@ -64,17 +64,15 @@ public void afterAgent(AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetr
     }
 
     configurationLogger.log(config);
-    logger.info("JFR profiler is active.");
+    logger.info("Profiler is active.");
     executor.submit(
         logUncaught(
             () -> activateJfrAndRunForever(config, autoConfiguredOpenTelemetrySdk.getResource())));
   }
 
   private boolean notClearForTakeoff(ConfigProperties config) {
     if (!config.getBoolean(CONFIG_KEY_ENABLE_PROFILER, false)) {
-      logger.fine("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
-      logger.fine("xxxxxxxxx  JFR PROFILER DISABLED!  xxxxxxxxx");
-      logger.fine("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
+      logger.fine("Profiler is not enabled.");
       return true;
     }
     if (!JFR.instance.isAvailable()) {
@@ -83,35 +81,42 @@ private boolean notClearForTakeoff(ConfigProperties config) {
       return true;
     }
 
-    Path outputDir = Paths.get(config.getString(CONFIG_KEY_PROFILER_DIRECTORY));
+    return false;
+  }
+
+  private boolean checkOutputDir(Path outputDir) {
     if (!Files.exists(outputDir)) {
       // Try creating the directory for the user...
       try {
         Files.createDirectories(outputDir);
       } catch (IOException e) {
-        return outdirWarn(outputDir, "does not exist and could not be created");
+        outdirWarn(outputDir, "does not exist and could not be created");
+        return false;
       }
     }
     if (!Files.isDirectory(outputDir)) {
-      return outdirWarn(outputDir, "exists but is not a directory");
+      outdirWarn(outputDir, "exists but is not a directory");
+      return false;
     }
 
     if (!Files.isWritable(outputDir)) {
-      return outdirWarn(outputDir, "exists but is not writable.");
+      outdirWarn(outputDir, "exists but is not writable.");
+      return false;
     }
-    return false;
-  }
 
-  private boolean outdirWarn(Path dir, String suffix) {
-    logger.log(
-        WARNING,
-        "PROFILER WILL NOT BE STARTED: The configured output directory {0} {1}.",
-        new Object[] {dir, suffix});
     return true;
   }
 
+  private void outdirWarn(Path dir, String suffix) {
+    logger.log(WARNING, "The configured output directory {0} {1}.", new Object[] {dir, suffix});
+  }
+
   private void activateJfrAndRunForever(ConfigProperties config, Resource resource) {
+    boolean keepFiles = keepFiles(config);
     Path outputDir = Paths.get(config.getString(CONFIG_KEY_PROFILER_DIRECTORY));
+    if (keepFiles && !checkOutputDir(outputDir)) {
+      keepFiles = false;
+    }
     RecordingFileNamingConvention namingConvention = new RecordingFileNamingConvention(outputDir);
 
     int stackDepth = Configuration.getStackDepth(config);
@@ -167,7 +172,7 @@ private void activateJfrAndRunForever(ConfigProperties config, Resource resource
             .jfr(JFR.instance)
             .onNewRecording(jfrRecordingHandler)
             .namingConvention(namingConvention)
-            .keepRecordingFiles(keepFiles(config))
+            .keepRecordingFiles(keepFiles)
             .build();
 
     RecordingSequencer sequencer =

profiler/src/main/java/com/splunk/opentelemetry/profiler/RecordingFileNamingConvention.java

@@ -47,18 +47,4 @@ Path newOutputPath(LocalDateTime dateTime) throws IOException {
     return Files.createTempFile(
         outputDir, PREFIX + "-" + timestamp.replace(':', '_') + "-", ".jfr");
   }
-
-  /** Determines if the path represents a file that we would have recorded to. */
-  boolean matches(Path path) {
-    return outputDir.equals(path.getParent()) && filenameMatches(path);
-  }
-
-  private boolean filenameMatches(Path path) {
-    String filename = path.getFileName().toString();
-    return filenamePattern.matcher(filename).matches();
-  }
-
-  Path getOutputPath() {
-    return outputDir;
-  }
 }

profiler/src/test/java/com/splunk/opentelemetry/profiler/RecordingFileNamingConventionTest.java

@@ -17,12 +17,9 @@
 package com.splunk.opentelemetry.profiler;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.Month;
 import org.junit.jupiter.api.Test;
@@ -42,16 +39,4 @@ void testNewPath() throws IOException {
 
     assertThat(path.toString()).startsWith(expected.toString()).endsWith(".jfr");
   }
-
-  @Test
-  void testMatches() {
-    RecordingFileNamingConvention convention = new RecordingFileNamingConvention(outputDir);
-    Path doesMatch = outputDir.resolve("otel-profiler-1999-02-12T17_03_21-123.jfr");
-    Path differentDir = Paths.get("/no/way/out/otel-profiler-1999-02-12T17_03_21-123.jfr");
-    Path badFilename = outputDir.resolve("tugboat-1999-02-12T17_03_21-123.jfr");
-
-    assertTrue(convention.matches(doesMatch));
-    assertFalse(convention.matches(differentDir));
-    assertFalse(convention.matches(badFilename));
-  }
 }