VisualVM is not showing V1 gRPC Connections

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java

@@ -491,7 +491,7 @@ public List<Entry<Object, Data>> getData(RequestSender requestSender, Class<?> c
                                 // manual check as version numbering changed after 35
                                 nVersion = 353;
                                 }
-                            else if (sCoherenceVersion.startsWith("2"))
+                            else if (sCoherenceVersion.startsWith("2") || sCoherenceVersion.startsWith("3"))
                                 {
                                 // check for versions such as 20.06 or 20.06.01 and convert them to an ever-increasing number
                                 // 20.06    -> 2006000

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/helper/JMXRequestSender.java

@@ -454,6 +454,13 @@ public void dumpClusterHeap(String sRole) throws Exception
                     new String[] {String.class.getName()});
         }
 
+    public Set<ObjectName> getV1GrpcProxyMBean()
+            throws Exception
+        {
+        return f_connection.queryNames(new ObjectName("Coherence:type=GrpcProxy,*"), null);
+        }
+
+
     @Override
     public String[] getSnapshots(String sService, String sDomainPartition)
             throws Exception

coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/GrpcProxyData.java

@@ -27,12 +27,15 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.SortedMap;
 import java.util.logging.Logger;
 
 import com.oracle.coherence.plugin.visualvm.VisualVMModel;
 import com.oracle.coherence.plugin.visualvm.helper.HttpRequestSender;
+import com.oracle.coherence.plugin.visualvm.helper.JMXRequestSender;
 import com.oracle.coherence.plugin.visualvm.helper.RequestSender;
+import javax.management.ObjectName;
 
 /**
  * A class to hold basic gRPC Proxy data.
@@ -79,11 +82,38 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
         data.setColumn(RESPONSES_SENT_COUNT, Long.valueOf(getNumberValue(aoColumns[nStart++].toString())));
         data.setColumn(MESSAGES_RECEIVED_COUNT, Long.valueOf(getNumberValue(aoColumns[nStart++].toString())));
         data.setColumn(REQUEST_DURATION_MEAN, Float.parseFloat(aoColumns[nStart++].toString()));
-        data.setColumn(MESSAGE_DURATION_MEAN, Float.parseFloat(aoColumns[nStart++].toString()));
+        data.setColumn(MESSAGE_DURATION_MEAN, Float.parseFloat(aoColumns[nStart].toString()));
 
         return data;
         }
 
+    @Override
+    public String preProcessReporterXML(VisualVMModel model, String sReporterXML)
+        {
+        String sMBeanName = "GrpcNamedCacheProxy"; // v0 default
+
+        try {
+            // determine if v0 or v1 of gRPC proxy is being used.
+            RequestSender requestSender = model.getRequestSender();
+            if (requestSender instanceof JMXRequestSender)
+                {
+                // check for JMX MBean of type Coherence:type=GrpcProxy
+                JMXRequestSender jmxRequestSender = (JMXRequestSender) requestSender;
+                Set<ObjectName>  setNames         = jmxRequestSender.getV1GrpcProxyMBean();
+                if (setNames != null && !setNames.isEmpty())
+                    {
+                    sMBeanName = "GrpcProxy";
+                    }
+                }
+            }
+        catch (Exception eIgnore)
+            {
+            // ignore
+            }
+
+        return sReporterXML.replaceAll("%MBEAN%", escape(sMBeanName));
+        }
+
     @Override
     public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel     model,
                                                                      HttpRequestSender requestSender)

coherence-visualvm-plugin/src/main/resources/reports/visualvm/grpc-proxy-stats.xml

@@ -36,7 +36,7 @@
         <delim>{tab}</delim>
 
         <query>
-            <pattern>Coherence:type=GrpcNamedCacheProxy,*</pattern>
+            <pattern>Coherence:type=%MBEAN%,*</pattern>
             <filter-ref>equals</filter-ref>
         </query>