address: respond to review comments on PR #810

jbachorik · muse · jbachorik · commit 77c11440328a · 2026-05-17T14:36:46.000+02:00
- McpProtocol.java:268/270 — wrap Double.parseDouble and Long.parseLong in try/catch, rethrow as IllegalArgumentException with position context - BTraceMcpServer.java:116 — remove unused params parameter from handleInitialize - README.md:44/62/78/96 — fix class name from org.openjdk.btrace.mcp to io.btrace.mcp.BTraceMcpServer - GpuBridgeServiceImpl.java:207 — remove unused totalNative accumulator variable - ListJvmsHandler.java:26-28,55 — replace sun.jvmstat.monitor.* with VirtualMachine.list(); add @SuppressWarnings on unused arguments param - DeployOnelinerHandler.java:160 — register client with ClientManager after successful submission - DeployScriptHandler.java:160 — register client with ClientManager after successful submission - LlmTrace.java:69 — remove unused @ProbeMethodName String methodName parameter Also apply spotless import ordering to all new btrace-mcp-server source files. Co-Authored-By: muse <muse@noreply>
diff --git a/btrace-dist/src/main/resources/samples/LlmTrace.java b/btrace-dist/src/main/resources/samples/LlmTrace.java
@@ -32,7 +32,6 @@
 import io.btrace.core.annotations.OnMethod;
 import io.btrace.core.annotations.OnTimer;
 import io.btrace.core.annotations.ProbeClassName;
-import io.btrace.core.annotations.ProbeMethodName;
 import io.btrace.llm.LlmTraceService;
 
 import static io.btrace.core.BTraceUtils.*;
@@ -66,7 +65,6 @@ public class LlmTrace {
       location = @Location(Kind.RETURN))
   public static void onLangchain4jGenerate(
       @ProbeClassName String className,
-      @ProbeMethodName String methodName,
       @Duration long duration) {
     // Model name extracted from the class; token counts need return value parsing
     // For a production script, parse the Response<AiMessage> return value
diff --git a/btrace-extensions/btrace-gpu-bridge/src/main/java/io/btrace/gpu/GpuBridgeServiceImpl.java b/btrace-extensions/btrace-gpu-bridge/src/main/java/io/btrace/gpu/GpuBridgeServiceImpl.java
@@ -204,11 +204,9 @@ public String getSummary() {
     // Native calls
     if (!nativeStats.isEmpty()) {
       sb.append("--- Native Calls ---\n");
-      long totalNative = 0;
       for (Map.Entry<String, NativeCallStats> entry : nativeStats.entrySet()) {
         NativeCallStats ns = entry.getValue();
         long calls = ns.calls.get();
-        totalNative += calls;
         long avgUs = calls > 0 ? (ns.totalDurationNanos.get() / calls) / 1000 : 0;
         sb.append("  ")
             .append(entry.getKey())
diff --git a/btrace-mcp-server/README.md b/btrace-mcp-server/README.md
@@ -41,7 +41,7 @@ Add to `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS)
       "command": "java",
       "args": [
         "-cp", "/path/to/btrace/lib/*",
-        "org.openjdk.btrace.mcp.BTraceMcpServer"
+        "io.btrace.mcp.BTraceMcpServer"
       ]
     }
   }
@@ -59,7 +59,7 @@ Add to your project's `.mcp.json`:
       "command": "java",
       "args": [
         "-cp", "/path/to/btrace/lib/*",
-        "org.openjdk.btrace.mcp.BTraceMcpServer"
+        "io.btrace.mcp.BTraceMcpServer"
       ]
     }
   }
@@ -75,7 +75,7 @@ Or configure globally in `~/.claude/settings.json`:
       "command": "java",
       "args": [
         "-cp", "/path/to/btrace/lib/*",
-        "org.openjdk.btrace.mcp.BTraceMcpServer"
+        "io.btrace.mcp.BTraceMcpServer"
       ]
     }
   }
@@ -93,7 +93,7 @@ If you have BTrace installed (e.g. via SDKMAN), you can reference the distributi
       "command": "java",
       "args": [
         "-cp", "$BTRACE_HOME/lib/*:$BTRACE_HOME/build/btrace-mcp-server.jar",
-        "org.openjdk.btrace.mcp.BTraceMcpServer"
+        "io.btrace.mcp.BTraceMcpServer"
       ]
     }
   }
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/BTraceMcpServer.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/BTraceMcpServer.java
@@ -16,6 +16,12 @@
  */
 package io.btrace.mcp;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 import io.btrace.mcp.prompts.DiagnosticPrompts;
 import io.btrace.mcp.tools.DeployOnelinerHandler;
 import io.btrace.mcp.tools.DeployScriptHandler;
@@ -24,11 +30,7 @@
 import io.btrace.mcp.tools.ListJvmsHandler;
 import io.btrace.mcp.tools.ListProbesHandler;
 import io.btrace.mcp.tools.SendEventHandler;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,7 +88,7 @@ void run() throws IOException {
       try {
         switch (method) {
           case "initialize":
-            handleInitialize(id, params);
+            handleInitialize(id);
             break;
           case "notifications/initialized":
             // Client acknowledgement — no response needed
@@ -113,7 +115,7 @@ void run() throws IOException {
     }
   }
 
-  private void handleInitialize(Object id, Map<String, Object> params) throws IOException {
+  private void handleInitialize(Object id) throws IOException {
     Map<String, Object> serverInfo = new LinkedHashMap<>();
     serverInfo.put("name", SERVER_NAME);
     serverInfo.put("version", SERVER_VERSION);
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/ClientManager.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/ClientManager.java
@@ -16,9 +16,11 @@
  */
 package io.btrace.mcp;
 
-import io.btrace.client.Client;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+
+import io.btrace.client.Client;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/McpProtocol.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/McpProtocol.java
@@ -26,6 +26,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -265,9 +266,18 @@ Object parseNumber() {
       }
       String numStr = src.substring(start, pos);
       if (isFloat) {
-        return Double.parseDouble(numStr);
+        try {
+          return Double.parseDouble(numStr);
+        } catch (NumberFormatException e) {
+          throw new IllegalArgumentException("Invalid number at " + start + ": " + numStr, e);
+        }
+      }
+      long val;
+      try {
+        val = Long.parseLong(numStr);
+      } catch (NumberFormatException e) {
+        throw new IllegalArgumentException("Invalid number at " + start + ": " + numStr, e);
       }
-      long val = Long.parseLong(numStr);
       if (val >= Integer.MIN_VALUE && val <= Integer.MAX_VALUE) {
         return (int) val;
       }
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DeployOnelinerHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DeployOnelinerHandler.java
@@ -16,14 +16,6 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.compiler.oneliner.OnelinerAST.OnelinerNode;
-import io.btrace.compiler.oneliner.OnelinerCodeGenerator;
-import io.btrace.compiler.oneliner.OnelinerParser;
-import io.btrace.compiler.oneliner.OnelinerValidator;
-import io.btrace.core.comm.Command;
-import io.btrace.core.comm.PrintableCommand;
-import io.btrace.mcp.ClientManager;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -33,6 +25,16 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.btrace.client.Client;
+import io.btrace.compiler.oneliner.OnelinerAST.OnelinerNode;
+import io.btrace.compiler.oneliner.OnelinerCodeGenerator;
+import io.btrace.compiler.oneliner.OnelinerParser;
+import io.btrace.compiler.oneliner.OnelinerValidator;
+import io.btrace.core.comm.Command;
+import io.btrace.core.comm.PrintableCommand;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,6 +167,8 @@ public static Map<String, Object> execute(Map<String, Object> arguments) {
         return toolResult("Probe exited with error:\n" + output.toString(), true);
       }
 
+      ClientManager.registerClient(pid, port, client);
+
       String resultText =
           "Probe deployed successfully to PID "
               + pid
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DeployScriptHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DeployScriptHandler.java
@@ -16,10 +16,6 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.core.comm.Command;
-import io.btrace.core.comm.PrintableCommand;
-import io.btrace.mcp.ClientManager;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -29,6 +25,12 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.btrace.client.Client;
+import io.btrace.core.comm.Command;
+import io.btrace.core.comm.PrintableCommand;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -169,6 +171,8 @@ public static Map<String, Object> execute(Map<String, Object> arguments) {
         return toolResult("Probe exited with error:\n" + output.toString(), true);
       }
 
+      ClientManager.registerClient(pid, port, client);
+
       String resultText = "Script deployed successfully to PID " + pid + ".\nPort: " + port + "\n";
       if (output.length() > 0) {
         resultText += "\nInitial output:\n" + output.toString();
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DetachProbeHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/DetachProbeHandler.java
@@ -16,12 +16,14 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.mcp.ClientManager;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.btrace.client.Client;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ExitProbeHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ExitProbeHandler.java
@@ -16,12 +16,14 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.mcp.ClientManager;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.btrace.client.Client;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ListJvmsHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ListJvmsHandler.java
@@ -21,12 +21,11 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.sun.tools.attach.VirtualMachine;
+import com.sun.tools.attach.VirtualMachineDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sun.jvmstat.monitor.MonitoredHost;
-import sun.jvmstat.monitor.MonitoredVm;
-import sun.jvmstat.monitor.MonitoredVmUtil;
-import sun.jvmstat.monitor.VmIdentifier;
 
 /** Handles the list_jvms MCP tool - lists all attachable Java VMs. */
 public final class ListJvmsHandler {
@@ -52,14 +51,14 @@ public static Map<String, Object> schema() {
   }
 
   /** Executes the list_jvms tool. */
-  public static Map<String, Object> execute(Map<String, Object> arguments) {
+  public static Map<String, Object> execute(@SuppressWarnings("unused") Map<String, Object> arguments) {
     try {
       Collection<Map<String, Object>> vms = listVms();
       StringBuilder sb = new StringBuilder();
       if (vms.isEmpty()) {
-        sb.append("No attachable Java VMs found.");
+        sb.append("No Java VMs found.");
       } else {
-        sb.append("Attachable Java VMs:\n\n");
+        sb.append("Discovered Java VMs:\n\n");
         for (Map<String, Object> vm : vms) {
           sb.append(
               String.format(
@@ -77,17 +76,22 @@ public static Map<String, Object> execute(Map<String, Object> arguments) {
   private static Collection<Map<String, Object>> listVms() {
     List<Map<String, Object>> result = new ArrayList<>();
     try {
-      MonitoredHost vmHost = MonitoredHost.getMonitoredHost((String) null);
-      for (Integer vmPid : MonitoredHost.getMonitoredHost("localhost").activeVms()) {
-        VmIdentifier id = new VmIdentifier(vmPid.toString());
-        MonitoredVm mvm = vmHost.getMonitoredVm(id);
-        if (MonitoredVmUtil.isAttachable(mvm)) {
-          Map<String, Object> vmInfo = new LinkedHashMap<>();
-          vmInfo.put("pid", vmPid);
-          vmInfo.put("mainClass", MonitoredVmUtil.mainClass(mvm, false));
-          vmInfo.put("btraceAttached", hasBTraceServer(vmPid) ? "attached" : "not attached");
-          result.add(vmInfo);
+      for (VirtualMachineDescriptor vmd : VirtualMachine.list()) {
+        String pid = vmd.id();
+        int numericPid;
+        try {
+          numericPid = Integer.parseInt(pid);
+        } catch (NumberFormatException e) {
+          log.debug("Skipping JVM with non-numeric PID: {}", pid);
+          continue;
         }
+        String mainClass = vmd.displayName();
+        if (mainClass == null || mainClass.isBlank()) mainClass = "<unknown>";
+        Map<String, Object> vmInfo = new LinkedHashMap<>();
+        vmInfo.put("pid", pid);
+        vmInfo.put("mainClass", mainClass);
+        vmInfo.put("btraceAttached", hasBTraceServer(numericPid) ? "attached" : "not attached");
+        result.add(vmInfo);
       }
     } catch (Exception e) {
       log.warn("Error listing VMs", e);
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ListProbesHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/ListProbesHandler.java
@@ -16,17 +16,19 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.core.comm.Command;
-import io.btrace.core.comm.PrintableCommand;
-import io.btrace.mcp.ClientManager;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
+import io.btrace.client.Client;
+import io.btrace.core.comm.Command;
+import io.btrace.core.comm.PrintableCommand;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/SendEventHandler.java b/btrace-mcp-server/src/main/java/io/btrace/mcp/tools/SendEventHandler.java
@@ -16,12 +16,14 @@
  */
 package io.btrace.mcp.tools;
 
-import io.btrace.client.Client;
-import io.btrace.mcp.ClientManager;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.btrace.client.Client;
+import io.btrace.mcp.ClientManager;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Original file line number	Diff line number	Diff line change
@@ -41,7 +41,7 @@ Add to `~/Library/Application Support/Claude/claude_desktop_config.json` (macOS)
`41`	`41`	`"command": "java",`
`42`	`42`	`"args": [`
`43`	`43`	`"-cp", "/path/to/btrace/lib/*",`
`44`		`- "org.openjdk.btrace.mcp.BTraceMcpServer"`
	`44`	`+ "io.btrace.mcp.BTraceMcpServer"`
`45`	`45`	`]`
`46`	`46`	`}`
`47`	`47`	`}`
@@ -59,7 +59,7 @@ Add to your project's `.mcp.json`:
`59`	`59`	`"command": "java",`
`60`	`60`	`"args": [`
`61`	`61`	`"-cp", "/path/to/btrace/lib/*",`
`62`		`- "org.openjdk.btrace.mcp.BTraceMcpServer"`
	`62`	`+ "io.btrace.mcp.BTraceMcpServer"`
`63`	`63`	`]`
`64`	`64`	`}`
`65`	`65`	`}`
@@ -75,7 +75,7 @@ Or configure globally in `~/.claude/settings.json`:
`75`	`75`	`"command": "java",`
`76`	`76`	`"args": [`
`77`	`77`	`"-cp", "/path/to/btrace/lib/*",`
`78`		`- "org.openjdk.btrace.mcp.BTraceMcpServer"`
	`78`	`+ "io.btrace.mcp.BTraceMcpServer"`
`79`	`79`	`]`
`80`	`80`	`}`
`81`	`81`	`}`
`@@ -93,7 +93,7 @@ If you have BTrace installed (e.g. via SDKMAN), you can reference the distributi`
`93`	`93`	`"command": "java",`
`94`	`94`	`"args": [`
`95`	`95`	`"-cp", "$BTRACE_HOME/lib/*:$BTRACE_HOME/build/btrace-mcp-server.jar",`
`96`		`- "org.openjdk.btrace.mcp.BTraceMcpServer"`
	`96`	`+ "io.btrace.mcp.BTraceMcpServer"`
`97`	`97`	`]`
`98`	`98`	`}`
`99`	`99`	`}`