Export WireIO version as a system property

btraceio · Dec 6, 2020 · ecbb3ab · ecbb3ab
1 parent 401e692
commit ecbb3ab
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 2 deletions.
diff --git a/btrace-agent/src/main/java/org/openjdk/btrace/agent/Main.java b/btrace-agent/src/main/java/org/openjdk/btrace/agent/Main.java
@@ -83,6 +83,7 @@
 import org.openjdk.btrace.core.comm.ErrorCommand;
 import org.openjdk.btrace.core.comm.InstrumentCommand;
 import org.openjdk.btrace.core.comm.StatusCommand;
+import org.openjdk.btrace.core.comm.WireIO;
 import org.openjdk.btrace.instr.BTraceTransformer;
 import org.openjdk.btrace.instr.Constants;
 import org.openjdk.btrace.runtime.BTraceRuntimes;
@@ -836,6 +837,8 @@ private static void startServer() {
         debugPrint("starting server at " + port);
       }
       System.setProperty("btrace.port", String.valueOf(port));
+      System.setProperty("btrace.wireio", String.valueOf(WireIO.VERSION));
+
       String scriptOutputFile = settings.getOutputFile();
       if (scriptOutputFile != null && scriptOutputFile.length() > 0) {
         System.setProperty("btrace.output", scriptOutputFile);

diff --git a/btrace-client/src/main/java/org/openjdk/btrace/client/JpsUtils.java b/btrace-client/src/main/java/org/openjdk/btrace/client/JpsUtils.java
@@ -45,9 +45,9 @@ static Collection<String> listVms() {
           String mainClass = MonitoredVmUtil.mainClass(mvm, false);
 
           vms.add(
-              "["
+              "("
                   + (hasBTraceServer(vmPid) ? "+" : "-")
-                  + "] "
+                  + ") "
                   + vmPid
                   + " "
                   + mainClass

diff --git a/btrace-core/src/main/java/org/openjdk/btrace/core/comm/DisconnectCommand.java b/btrace-core/src/main/java/org/openjdk/btrace/core/comm/DisconnectCommand.java
@@ -5,6 +5,7 @@
 import java.io.ObjectOutput;
 import java.io.PrintWriter;
 
+/** @since WireIO v.1 */
 public final class DisconnectCommand extends Command implements PrintableCommand {
   private String probeId = "";
 

diff --git a/btrace-core/src/main/java/org/openjdk/btrace/core/comm/ListProbesCommand.java b/btrace-core/src/main/java/org/openjdk/btrace/core/comm/ListProbesCommand.java
@@ -8,6 +8,7 @@
 import java.util.Collection;
 import java.util.List;
 
+/** @since WireIO v.1 */
 public class ListProbesCommand extends Command implements PrintableCommand {
   private final List<String> probes = new ArrayList<>();
 

diff --git a/btrace-core/src/main/java/org/openjdk/btrace/core/comm/ReconnectCommand.java b/btrace-core/src/main/java/org/openjdk/btrace/core/comm/ReconnectCommand.java
@@ -4,6 +4,7 @@
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
 
+/** @since WireIO v.1 */
 public class ReconnectCommand extends Command {
   public static final int STATUS_FLAG = 8;
 

diff --git a/btrace-core/src/main/java/org/openjdk/btrace/core/comm/WireIO.java b/btrace-core/src/main/java/org/openjdk/btrace/core/comm/WireIO.java
@@ -29,6 +29,7 @@
 import java.io.ObjectOutput;
 
 public class WireIO {
+  public static final int VERSION = 1;
 
   private WireIO() {}
 

diff --git a/btrace-ui/build.gradle b/btrace-ui/build.gradle
@@ -0,0 +1,26 @@
+plugins {
+    id 'net.nemerosa.versioning' version '2.6.1'
+}
+
+sourceCompatibility = '11'
+targetCompatibility = '11'
+
+dependencies {
+    compile project(':btrace-core')
+    compile project(':btrace-compiler')
+    compile project(':btrace-instr')
+}
+
+jar {
+    manifest {
+        attributes(
+                'Built-By'       : System.properties['user.name'],
+                'Build-Timestamp': new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
+                'Build-Revision' : versioning.info.commit,
+                'Created-By'     : "Gradle ${gradle.gradleVersion}",
+                'Build-Jdk'      : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
+                'Build-OS'       : "${System.properties['os.name']} ${System.properties['os.arch']} ${System.properties['os.version']}",
+                'Main-Class'     : "org.openjdk.btrace.client.Main"
+        )
+    }
+}