GH-391 - network traffic monitoring added

Author: thurka

plugins/jfr.streaming/manifest.mf

@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.graalvm.visualvm.jfr.streaming
+OpenIDE-Module-Install: org/graalvm/visualvm/jfr/streaming/Installer.class
 OpenIDE-Module-Java-Dependencies: Java > 17
 OpenIDE-Module-Localizing-Bundle: org/graalvm/visualvm/jfr/streaming/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.1

plugins/jfr.streaming/nbproject/project.xml

@@ -24,6 +24,15 @@
                         <specification-version>2.1</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.graalvm.visualvm.charts</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <specification-version>2.1</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.graalvm.visualvm.core</code-name-base>
                     <build-prerequisite/>
@@ -33,6 +42,24 @@
                         <specification-version>2.0</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.graalvm.visualvm.host</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <specification-version>2.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.graalvm.visualvm.host.views</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>2</release-version>
+                        <specification-version>2.0</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.graalvm.visualvm.lib.jfluid</code-name-base>
                     <build-prerequisite/>
@@ -51,6 +78,22 @@
                         <specification-version>2.0</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.modules</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.60</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.19</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.openide.util.lookup</code-name-base>
                     <build-prerequisite/>
@@ -59,6 +102,14 @@
                         <specification-version>8.46</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.ui</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>9.20</specification-version>
+                    </run-dependency>
+                </dependency>
             </module-dependencies>
             <public-packages/>
         </data>

plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/Installer.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package org.graalvm.visualvm.jfr.streaming;
+
+import org.graalvm.visualvm.jfr.streaming.network.NetworkViewPluginProvider;
+import org.openide.modules.ModuleInstall;
+
+public class Installer extends ModuleInstall {
+
+    @Override
+    public void restored() {
+        NetworkViewPluginProvider.initialize();
+    }
+
+}

plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/JFRStream.java

@@ -34,40 +34,57 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.management.jfr.RemoteRecordingStream;
 import org.graalvm.visualvm.application.Application;
+import org.graalvm.visualvm.application.jvm.Jvm;
+import org.graalvm.visualvm.application.jvm.JvmFactory;
 import org.graalvm.visualvm.tools.jmx.JmxModel;
 import org.graalvm.visualvm.tools.jmx.JmxModelFactory;
 
 /**
  *
  * @author Tomas Hurka
  */
-class JFRStream {
+public class JFRStream {
 
     private final RemoteRecordingStream rs;
 
-    JFRStream(Application app) throws IOException {
-        JmxModel jmx = JmxModelFactory.getJmxModelFor(app);
+    public static JFRStream getFor(Application app) throws IOException {
+        Jvm jvm = JvmFactory.getJVMFor(app);
+        String ver = jvm.getJavaVersion();
+        if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18") || isJavaVersion(ver, "19")) {
+            JmxModel jmxModel = JmxModelFactory.getJmxModelFor(app);
+            if (jmxModel != null && jmxModel.getConnectionState() == JmxModel.ConnectionState.CONNECTED) {
+                return new JFRStream(jmxModel);
+            }
+        }
+        return null;
+    }
+
+    private JFRStream(JmxModel jmx) throws IOException {
         rs = new RemoteRecordingStream(jmx.getMBeanServerConnection());
     }
 
-    void close() {
+    public void close() {
         rs.close();
     }
 
-    JFREventSettings enable(String eventName) {
+    public JFREventSettings enable(String eventName) {
         EventSettings s = rs.enable(eventName);
         return new JFREventSettings(eventName, s);
     }
 
-    void onEvent(String eventName, Consumer<RecordedEvent> action) {
+    public void onEvent(String eventName, Consumer<RecordedEvent> action) {
         rs.onEvent(eventName, action);
     }
 
-    void startAsync() {
+    public void onFlush(Runnable action) {
+        rs.onFlush(action);
+    }
+
+    public void startAsync() {
         rs.startAsync();
     }
 
-    class JFREventSettings {
+    public class JFREventSettings {
 
         private final String eventName;
         private final EventSettings delegate;
@@ -77,27 +94,27 @@ private JFREventSettings(String eventName, EventSettings s) {
             delegate = s;
         }
 
-        JFREventSettings withStackTrace() {
+        public JFREventSettings withStackTrace() {
             return with(StackTrace.NAME, "true");
         }
 
-        JFREventSettings withoutStackTrace() {
+        public JFREventSettings withoutStackTrace() {
             return with(StackTrace.NAME, "false");
         }
 
-        JFREventSettings withoutThreshold() {
+        public JFREventSettings withoutThreshold() {
             return withThreshold(null);
         }
 
-        JFREventSettings withPeriod(Duration duration) {
+        public JFREventSettings withPeriod(Duration duration) {
             return with(Period.NAME, getString(duration));
         }
 
-        JFREventSettings withThreshold(Duration duration) {
+        public JFREventSettings withThreshold(Duration duration) {
             return with(Threshold.NAME, getString(duration));
         }
 
-        JFREventSettings with(String name, String value) {
+        public JFREventSettings with(String name, String value) {
             delegate.with(eventName + "#" + name, value);
             return this;
         }
@@ -109,4 +126,20 @@ private static String getString(Duration duration) {
             return duration.toNanos() + " ns";
         }
     }
+
+    private static final boolean isJavaVersion(String javaVersionProperty, String releaseVersion) {
+        if (javaVersionProperty.equals(releaseVersion)) {
+            return true;
+        }
+        if (javaVersionProperty.equals(releaseVersion + "-ea")) {
+            return true;
+        }
+        if (javaVersionProperty.equals(releaseVersion + "-internal")) {
+            return true;
+        }
+        if (javaVersionProperty.startsWith(releaseVersion + ".")) {
+            return true;
+        }
+        return false;
+    }
 }

plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/ThreadMonitoringProvider.java

@@ -29,8 +29,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.graalvm.visualvm.application.Application;
-import org.graalvm.visualvm.application.jvm.Jvm;
-import org.graalvm.visualvm.application.jvm.JvmFactory;
 import org.graalvm.visualvm.application.views.ApplicationThreadsResponseProvider;
 import org.openide.util.lookup.ServiceProvider;
 
@@ -51,10 +49,8 @@ public class ThreadMonitoringProvider implements ApplicationThreadsResponseProvi
     @Override
     public ThreadMonitoredDataResponseProvider getMonitoredDataResponseProvider(Application app, ThreadMXBean threadMXBean) {
         try {
-            Jvm jvm = JvmFactory.getJVMFor(app);
-            String ver = jvm.getJavaVersion();
-            if (isJavaVersion(ver, "17") || isJavaVersion(ver, "18")) {
-                JFRStream rs = new JFRStream(app);
+            JFRStream rs = JFRStream.getFor(app);
+            if (rs != null) {
                 JFRThreadDataProvider rp = new JFRThreadDataProvider(rs, threadMXBean);
                 rs.enable(JFR_THREAD_START);
                 rs.enable(JFR_THREAD_END);
@@ -76,17 +72,4 @@ public ThreadMonitoredDataResponseProvider getMonitoredDataResponseProvider(Appl
         }
         return null;
     }
-
-    private static final boolean isJavaVersion(String javaVersionProperty, String releaseVersion) {
-        if (javaVersionProperty.equals(releaseVersion)) {
-            return true;
-        }
-        if (javaVersionProperty.equals(releaseVersion + "-ea")) {
-            return true;
-        }
-        if (javaVersionProperty.startsWith(releaseVersion + ".")) {
-            return true;
-        }
-        return false;
-    }
 }

plugins/jfr.streaming/src/org/graalvm/visualvm/jfr/streaming/network/Bundle.properties

@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+
+# HTML-formatted: <unknown> (&lt; and &gt; must remain!)
+LBL_Unknown=&lt;unknown&gt;
+
+
+LBL_Network=Network
+
+LBL_Heap=Heap
+
+LBL_Format_Kibps={0} Kibit/s
+
+LBL_Read_rate=Read rate
+
+LBL_Write_rate=Write rate
+
+LBL_Read_rate_leg=Read rate
+
+LBL_Write_rate_leg=Write rate