proper name for exectuable under windows os

grafana · Feb 2, 2024 · 8928419 · 8928419
1 parent bcb02ff
commit 8928419
Showing 1 changed file with 26 additions and 7 deletions.
diff --git a/agent/src/main/java/io/pyroscope/javaagent/JFRProfilerDelegate.java b/agent/src/main/java/io/pyroscope/javaagent/JFRProfilerDelegate.java
@@ -8,7 +8,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
@@ -18,6 +21,8 @@
 public final class JFRProfilerDelegate implements ProfilerDelegate {
     private static final String RECORDING_NAME = "pyroscope";
     private static final String JFR_SETTINGS_RESOURCE = "/jfr/pyroscope.jfc";
+
+    private static final String OS_NAME = "os.name";
     private Config config;
     private File tempJFRFile;
     private Path jcmdBin;
@@ -85,10 +90,8 @@ public synchronized void stop() {
             if (exitCode != 0) {
                 throw new RuntimeException("Invalid exit code: " + exitCode);
             }
-        } catch (IOException e) {
-            throw new IllegalStateException(e);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+        } catch (IOException | InterruptedException e) {
+            throw new RuntimeException("cannot stop JFR recording", e);
         }
     }
 
@@ -123,17 +126,26 @@ private Snapshot dumpImpl(Instant started, Instant ended) {
 
     private static Path findJcmdBin() {
         Path javaHome = Paths.get(System.getProperty("java.home"));
+        String jcmd = jcmdExecutable();
+        Path jcmdBin = javaHome.resolve("bin").resolve(jcmd);
         //find jcmd binary
-        Path jcmdBin = javaHome.resolve("bin/jcmd");
         if (!Files.isExecutable(jcmdBin)) {
-            jcmdBin = javaHome.getParent().resolve("bin/jcmd");
+            jcmdBin = javaHome.getParent().resolve("bin").resolve(jcmd);
             if (!Files.isExecutable(jcmdBin)) {
                 throw new RuntimeException("cannot find executable jcmd in Java home");
             }
         }
         return jcmdBin;
     }
 
+    private static String jcmdExecutable() {
+        String jcmd = "jcmd";
+        if (isWindowsOS()) {
+            jcmd = "jcmd.exe";
+        }
+        return jcmd;
+    }
+
     private static Path findJfrSettingsPath() {
         try (InputStream inputStream = JFRProfilerDelegate.class.getResourceAsStream(JFR_SETTINGS_RESOURCE)) {
             Path jfrSettingsPath = Files.createTempFile("pyroscope", ".jfc");
@@ -144,5 +156,12 @@ private static Path findJfrSettingsPath() {
         }
     }
 
+    private static boolean isWindowsOS() {
+        String osName = System.getProperty(OS_NAME);
+        if (osName.contains("Windows")) {
+            return true;
+        }
+        return false;
+    }
 
 }