Heartbeat can be explicitly disabled for a JMX connection

Author: jisedlac

visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/JmxApplicationProvider.java

@@ -108,6 +108,7 @@ public class JmxApplicationProvider {
                                                 CURRENT_SNAPSHOT_VERSION_MINOR;
 
     public static final String PROPERTY_RETRY_WITHOUT_SSL = "prop_retry_without_ssl"; // NOI18N
+    static final String PROPERTY_DISABLE_HEARTBEAT = "prop_disable_heartbeat"; // NOI18N
     private static final String PROPERTY_CONNECTION_STRING = "prop_conn_string";    // NOI18N
     private static final String PROPERTY_HOSTNAME = "prop_conn_hostname";   // NOI18N
     private static final String PROPERTY_ENV_PROVIDER_ID = "prop_env_provider_id"; // NOI18N
@@ -384,8 +385,7 @@ private void scheduleHeartbeatImpl(boolean immediately) {
             unavailableApps.clear();
         }
 
-        Iterator<JmxApplication> appsI = apps.iterator();
-        while (appsI.hasNext()) if (appsI.next().isRemoved()) appsI.remove();
+        cleanupUnavailableApps(apps);
         if (apps.isEmpty()) {
             heartbeatRunning = false;
             if (anotherHeartbeatPending) { // just a safe fallback, likely not needed at all
@@ -443,8 +443,7 @@ public void propertyChange(PropertyChangeEvent evt) {
                             boolean pendingApps;
 
                             synchronized (unavailableApps) {
-                                Iterator<JmxApplication> appsI = unavailableApps.iterator();
-                                while (appsI.hasNext()) if (appsI.next().isRemoved()) appsI.remove();
+                                cleanupUnavailableApps(unavailableApps);
                                 pendingApps = !unavailableApps.isEmpty();
                                 heartbeatRunning = false;
                             }
@@ -461,6 +460,16 @@ public void propertyChange(PropertyChangeEvent evt) {
     }
 
 
+    private void cleanupUnavailableApps(Set<JmxApplication> apps) {
+        String trueS = Boolean.TRUE.toString();
+        Iterator<JmxApplication> appsI = apps.iterator();
+        while (appsI.hasNext()) {
+            JmxApplication app = appsI.next();
+            if (app.isRemoved() || trueS.equals(app.getStorage().getCustomProperty(PROPERTY_DISABLE_HEARTBEAT)))
+                appsI.remove();
+        }
+    }
+    
 
     private void cleanupCreatedHost(Set<Host> hosts, Host host) {
         // NOTE: this is not absolutely failsafe, if resolving the JMX application

visualvm/jmx/src/org/graalvm/visualvm/jmx/impl/ProxyClient.java

@@ -214,10 +214,9 @@ void connect() {
     CredentialsConfigurator supplyCredentials() {
         String displayName = app.getStorage().getCustomProperty(DataSourceDescriptor.PROPERTY_NAME);
         if (displayName == null) displayName = getUrl().toString();
-        CredentialsConfigurator jsc =
-                CredentialsConfigurator.supplyCredentials(displayName);
-        if (jsc != null)
-            setCredentials(jsc.getUsername(), jsc.getPassword());
+        CredentialsConfigurator jsc = CredentialsConfigurator.supplyCredentials(displayName);
+        if (jsc != null) setCredentials(jsc.getUsername(), jsc.getPassword());
+        else app.getStorage().setCustomProperty(JmxApplicationProvider.PROPERTY_DISABLE_HEARTBEAT, Boolean.TRUE.toString());
         return jsc;
     }