Merge pull request #9 from smiklosovic/CASSANDRA-20854

few nits

Author: bbotella

.attach_pid1466907

@@ -91,7 +91,7 @@ public static String parseEvents(String rawString)
 
     public enum AsyncProfilerFormat
     {
-        flat, traces, collapsed, flamegraph, tree, jfr, otlp;
+        flat, traces, collapsed, flamegraph, tree, jfr;
 
         public static String parseFormat(String rawFormat)
         {
@@ -148,10 +148,6 @@ public synchronized AsyncProfiler maybeInitialize()
             {
                 profilerInstance = one.profiler.AsyncProfiler.getInstance();
             }
-            catch (ConfigurationException ex)
-            {
-                throw ex;
-            }
             catch (Throwable t)
             {
                 throw new IllegalStateException("Unable to get an instance of Async-Profiler", t);

src/java/org/apache/cassandra/service/AsyncProfilerService.java

@@ -27,9 +27,9 @@
 import org.apache.cassandra.io.util.File;
 import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.profiler.AsyncProfilerMBean;
-import org.apache.cassandra.tools.NodeProbe;
 import org.apache.cassandra.service.AsyncProfilerService.AsyncProfilerEvent;
 import org.apache.cassandra.service.AsyncProfilerService.AsyncProfilerFormat;
+import org.apache.cassandra.tools.NodeProbe;
 import org.apache.cassandra.utils.FBUtilities;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
@@ -64,7 +64,7 @@ public void execute(NodeProbe probe)
         cmd.run();
     }
 
-    public static void doWithProfiler(NodeProbe probe, Consumer<AsyncProfilerMBean> consumer, boolean requiresEnabledProfiler)
+    private static void doWithProfiler(NodeProbe probe, Consumer<AsyncProfilerMBean> consumer, boolean requiresEnabledProfiler)
     {
         AsyncProfilerMBean profiler = probe.getAsyncProfilerProxy();
 
@@ -77,6 +77,19 @@ public static void doWithProfiler(NodeProbe probe, Consumer<AsyncProfilerMBean>
         consumer.accept(profiler);
     }
 
+    private static String getOutputFileName(AsyncProfilerFormat outputFormat)
+    {
+        String filename = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")
+                                           .withZone(ZoneId.systemDefault()).format(FBUtilities.now());
+
+        if (outputFormat == AsyncProfilerFormat.jfr)
+            filename += ".jfr";
+        else
+            filename += ".html";
+
+        return filename;
+    }
+
     public static void doWithProfiler(NodeProbe probe, Consumer<AsyncProfilerMBean> consumer)
     {
         doWithProfiler(probe, consumer, true);
@@ -92,15 +105,14 @@ public static class AsyncProfileStartCommand extends AbstractCommand
 
         @Option(names = { "-o", "--output" }, description = "File name to save profiling results into, defaults to a " +
                                                             "file of name 'yyyy-MM-dd-HH-mm-ss.html'")
-        public String filename = DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")
-                                                  .withZone(ZoneId.systemDefault()).format(FBUtilities.now()) + ".html";
+        public String filename;
 
         @Option(names = { "-d", "--duration" }, description = "Duration of profiling, defaults to '60s'. Accepts string values " +
                                                               "in the form of '5m', '30s' and similar.")
         public String duration = "60s";
 
         @Option(names = { "-f", "--format" },
-        description = "Output format, one of 'flat', 'traces', 'collapsed', 'flamegraph', 'tree', 'jfr', 'otlp', defaults to 'flamegraph'")
+        description = "Output format, one of 'flat', 'traces', 'collapsed', 'flamegraph', 'tree', 'jfr', defaults to 'flamegraph'")
         public AsyncProfilerFormat outputFormat = AsyncProfilerFormat.flamegraph;
 
         @Override
@@ -109,6 +121,9 @@ public void execute(NodeProbe probe)
             // make sure it is valid
             parseDuration(duration);
 
+            if (filename == null)
+                filename = AsyncProfileCommandGroup.getOutputFileName(outputFormat);
+
             doWithProfiler(probe, profiler -> {
                 if (!profiler.start(event.stream().map(Enum::name).collect(joining(",")),
                                     outputFormat.name(),