Minor consmetic updates to Federation and Caches panels

oracle · Oct 24, 2024 · dc681db · dc681db
1 parent 15e1dcd
commit dc681db
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/...nce-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java b/...nce-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/VisualVMModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024 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
@@ -624,7 +624,7 @@ public SortedMap<String, Integer> getInitialMachineMap()
             {
             for (Entry<Object, Data> entry : m_mapCollectedData.get(DataType.MEMBER))
                 {
-                initialMachineMap.putIfAbsent(((String) entry.getValue().getColumn(MemberData.ADDRESS)),
+                initialMachineMap.putIfAbsent(((String) entry.getValue().getColumn(MemberData.MACHINE_NAME)),
                         (Integer) entry.getValue().getColumn(MemberData.NODE_ID));
                 }
             }

diff --git a/...c/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceClusterSnapshotPanel.java b/...c/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceClusterSnapshotPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024 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
@@ -332,7 +332,7 @@ private String membersOverview()
             {
             sb.append("<tr>")
                     .append(td(entry.getValue().getColumn(MemberData.NODE_ID).toString()))
-                    .append(td(entry.getValue().getColumn(MemberData.ADDRESS).toString()))
+                    .append(td(entry.getValue().getColumn(MemberData.MACHINE_NAME).toString()))
                     .append(td(entry.getValue().getColumn(MemberData.PORT).toString()))
                     .append(td(entry.getValue().getColumn(MemberData.ROLE_NAME).toString()))
                     .append(td(getPublisherValue(entry.getValue().getColumn(MemberData.PUBLISHER_SUCCESS).toString())))

diff --git a/...plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java b/...plugin/src/main/java/com/oracle/coherence/plugin/visualvm/panel/CoherenceMemberPanel.java
@@ -677,8 +677,8 @@ private String generateHeader(int nNode)
                 // this is the node
                 sb.append(asColumns[MemberData.NODE_ID]).append(": ")
                     .append(entry.getValue().getColumn(MemberData.NODE_ID).toString()).append("\n")
-                    .append(asColumns[MemberData.ADDRESS]).append(": ")
-                    .append(entry.getValue().getColumn(MemberData.ADDRESS).toString()).append("\n")
+                    .append(asColumns[MemberData.MACHINE_NAME]).append(": ")
+                    .append(entry.getValue().getColumn(MemberData.MACHINE_NAME).toString()).append("\n")
                     .append(asColumns[MemberData.PORT]).append(": ")
                     .append(entry.getValue().getColumn(MemberData.PORT).toString()).append("\n")
                     .append(asColumns[MemberData.ROLE_NAME]).append(": ")

diff --git a/...lugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/MemberData.java b/...lugin/src/main/java/com/oracle/coherence/plugin/visualvm/tablemodel/model/MemberData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2024 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
@@ -88,7 +88,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
 
                 AttributeList listAttr = requestSender.getAttributes(nodeNameObjName,
                   new String[] { ATTR_PUB_SUCCESS_RATE, ATTR_REC_SUCCESS_RATE, ATTR_MEM_MAX_MB,
-                                 ATTR_MEM_AVAIL_MB, ATTR_SEND_Q_SIZE, ATTR_UNICAST_ADDR,
+                                 ATTR_MEM_AVAIL_MB, ATTR_SEND_Q_SIZE, ATTR_MACHINE_NAME,
                                  ATTR_ROLE_NAME, ATTR_UNICAST_PORT, ATTR_PRODUCT_EDITION });
 
                 data.setColumn(MemberData.NODE_ID, nodeId);
@@ -102,7 +102,7 @@ public List<Map.Entry<Object, Data>> getJMXData(RequestSender requestSender, Vis
                                (Integer) data.getColumn(MemberData.MAX_MEMORY)
                                - (Integer) data.getColumn(MemberData.FREE_MEMORY));
 
-                data.setColumn(MemberData.ADDRESS, (String) getAttributeValueAsString(listAttr, ATTR_UNICAST_ADDR));
+                data.setColumn(MemberData.MACHINE_NAME, (String) getAttributeValueAsString(listAttr, ATTR_MACHINE_NAME));
 
                 data.setColumn(MemberData.ROLE_NAME, (String) getAttributeValueAsString(listAttr, ATTR_ROLE_NAME));
                 data.setColumn(MemberData.PRODUCT_EDITION, (String) getAttributeValueAsString(listAttr, ATTR_PRODUCT_EDITION));
@@ -146,7 +146,7 @@ public Data processReporterData(Object[] aoColumns, VisualVMModel model)
                        (Integer) data.getColumn(MemberData.MAX_MEMORY)
                        - (Integer) data.getColumn(MemberData.FREE_MEMORY));
 
-        data.setColumn(MemberData.ADDRESS, aoColumns[8].toString());
+        data.setColumn(MemberData.MACHINE_NAME, aoColumns[8].toString());
 
         data.setColumn(MemberData.ROLE_NAME, aoColumns[9].toString());
         data.setColumn(MemberData.PORT, Integer.valueOf(getNumberValue(aoColumns[10].toString())));
@@ -189,7 +189,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel m
                 data.setColumn(MemberData.USED_MEMORY,
                         (Integer) data.getColumn(MemberData.MAX_MEMORY)
                                 - (Integer) data.getColumn(MemberData.FREE_MEMORY));
-                data.setColumn(MemberData.ADDRESS, clusterMember.get("unicastAddress").asText());
+                data.setColumn(MemberData.MACHINE_NAME, clusterMember.get("machineName").asText());
                 data.setColumn(MemberData.ROLE_NAME, clusterMember.get("roleName").asText());
                 data.setColumn(MemberData.PRODUCT_EDITION, clusterMember.get("productEdition").asText());
                 data.setColumn(MemberData.PORT, Integer.valueOf(getNumberValue(clusterMember.get("unicastPort").asText())));
@@ -212,7 +212,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel m
     /**
      * Array index for address.
      */
-    public static int ADDRESS = 1;
+    public static int MACHINE_NAME = 1;
 
     /**
      * Array index for port.
@@ -302,7 +302,7 @@ public SortedMap<Object, Data> getAggregatedDataFromHttpQuerying(VisualVMModel m
     /**
      * JMX attribute name for Unicast Address.
      */
-    private static final String ATTR_UNICAST_ADDR = "UnicastAddress";
+    private static final String ATTR_MACHINE_NAME = "MachineName";
 
     /**
      * JMX attribute name for Role Name.

diff --git a/...visualvm/tracer/cache/CacheSizeProbe.java → ...isualvm/tracer/cache/CacheCountProbe.java b/...visualvm/tracer/cache/CacheSizeProbe.java → ...isualvm/tracer/cache/CacheCountProbe.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
+ *  Copyright (c) 2023, 2024, 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
@@ -42,7 +42,7 @@
  *
  * @author tam 2024.03.03
  */
-public class CacheSizeProbe
+public class CacheCountProbe
         extends AbstractCoherenceMonitorProbe
     {
     // ----- constructors ---------------------------------------------------
@@ -51,7 +51,7 @@ public class CacheSizeProbe
      * Construct the probe.
      * @param resolver {@link MonitoredDataResolver}.
      */
-    public CacheSizeProbe(MonitoredDataResolver resolver)
+    public CacheCountProbe(MonitoredDataResolver resolver)
         {
         super(1, createItemDescriptors(), resolver);
         }

diff --git a/.../src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMonitorPackage.java b/.../src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMonitorPackage.java
@@ -65,7 +65,7 @@ public CacheMonitorPackage(Application application)
     @Override
     public TracerProbeDescriptor[] getProbeDescriptors() {
         m_memorySizeProbeDescriptor = CacheMemorySizeProbe.createDescriptor(f_model != null);
-        m_SizeProbeDescriptor       = CacheSizeProbe.createDescriptor(f_model != null);
+        m_SizeProbeDescriptor       = CacheCountProbe.createDescriptor(f_model != null);
 
         return new TracerProbeDescriptor[] {
             m_memorySizeProbeDescriptor,
@@ -88,7 +88,7 @@ else if (descriptor == m_SizeProbeDescriptor)
             {
             if (m_SizeProbe == null)
                 {
-                m_SizeProbe = new CacheSizeProbe(this);
+                m_SizeProbe = new CacheCountProbe(this);
                 }
             return m_SizeProbe;
             }

diff --git a/.../tracer/cache/SelectedCacheSizeProbe.java → ...tracer/cache/SelectedCacheCountProbe.java b/.../tracer/cache/SelectedCacheSizeProbe.java → ...tracer/cache/SelectedCacheCountProbe.java
@@ -43,7 +43,7 @@
  *
  * @author tam 2024.03.13
  */
-public class SelectedCacheSizeProbe
+public class SelectedCacheCountProbe
         extends AbstractCoherenceMonitorProbe
     {
     // ----- constructors ---------------------------------------------------
@@ -52,7 +52,7 @@ public class SelectedCacheSizeProbe
      * Construct the probe.
      * @param resolver {@link MonitoredDataResolver}.
      */
-    public SelectedCacheSizeProbe(MonitoredDataResolver resolver)
+    public SelectedCacheCountProbe(MonitoredDataResolver resolver)
         {
         super(1, createItemDescriptors(), resolver);
         }

diff --git a/...n/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMonitorPackage.java b/...n/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMonitorPackage.java
@@ -63,7 +63,7 @@ public SelectedCacheMonitorPackage(Application application)
 
     @Override
     public TracerProbeDescriptor[] getProbeDescriptors() {
-        m_sizeProbeDescriptor      = SelectedCacheSizeProbe.createDescriptor(f_model != null);
+        m_sizeProbeDescriptor      = SelectedCacheCountProbe.createDescriptor(f_model != null);
         m_memoryProbeDescriptor    = SelectedCacheMemoryProbe.createDescriptor(f_model != null);
         m_listenersProbeDescriptor = SelectedCacheListenersProbe.createDescriptor(f_model != null);
         m_queryProbeDescriptor     = SelectedCacheQueryProbe.createDescriptor(f_model != null);
@@ -83,7 +83,7 @@ public TracerProbe<Application> getProbe(TracerProbeDescriptor descriptor)
             {
             if (m_sizeProbe == null)
                 {
-                m_sizeProbe = new SelectedCacheSizeProbe(this);
+                m_sizeProbe = new SelectedCacheCountProbe(this);
                 }
             return m_sizeProbe;
             }

diff --git a/...visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties b/...visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties
@@ -250,8 +250,8 @@ LBL_total_applications=Total Applications
 LBL_max_reap_duration=Maximum Reap Duration (ms)
 
 # CoherenceFederationPanel
-TAB_inbound=Inbound
-TAB_outbound=Outbound
+TAB_inbound=Incoming
+TAB_outbound=Outgoing
 LBL_max_bandwidth=Maximum Bandwidth (Mbps)
 LBL_send_time_out=Send Timeout Millis (ms)
 LBL_geo_ip=Geo IP
@@ -424,9 +424,9 @@ LBL_reconnect_timeout=Reconnect Timeout
 LBL_reconnect_wait=Reconnect Wait
 LBL_subscribers=Subscribers
 LBL_service_cache_name=Service / Cache Name
-LBL_size=Size
-LBL_memory_bytes=Memory (bytes)
-LBL_memory_mb=Memory (MB)
+LBL_size=Count
+LBL_memory_bytes=Memory Size (bytes)
+LBL_memory_mb=Memory Size (MB)
 LBL_average_object_size=Avg object Size (bytes)
 LBL_unit_calculator=Unit Calculator
 LBL_view_cache=View Cache
@@ -744,7 +744,7 @@ LBL_ramjournal_memory_desc=Monitors the committed and used ram journal memory.
 LBL_ramjournal_files_desc=Monitors the used and committed ram journal files.
 LBL_flashjournal_files_desc=Monitors the used and committed flash journal files.
 LBL_flashjournal_size_desc=Monitors the committed and used ram journal space.
-LBL_cache_size_desc=Monitors the total number of cache entries in all caches across all partitioned services and participants.
+LBL_cache_size_desc=Monitors the total number of cache entries in all caches across all partitioned services.
 LBL_federation_bytes_sent_desc=Monitors the current bytes sent/ second across all federated services and participants.
 LBL_federation_bytes_rec_desc=Monitors the current bytes received/ second across all federated services and participants.
 LBL_federation_msgs_sent_desc=Monitors the current msgs sent/ second across all federated services and participants.
@@ -773,8 +773,8 @@ LBL_selected_service_task_backlog=Selected Service - Task Backlog
 LBL_selected_service_task_backlog_desc=Monitors the total task backlog for the currently selected service.
 LBL_selected_service_partitions=Selected Service - Partitions
 LBL_selected_service_partitions_desc=Monitors the partition information for the currently selected service.
-LBL_selected_cache_size=Selected Cache - Size
-LBL_selected_cache_size_desc=Monitors the cache size for the currently selected cache.
+LBL_selected_cache_size=Selected Cache - Count
+LBL_selected_cache_size_desc=Monitors the number of entries for the currently selected cache.
 LBL_selected_cache_memory=Selected Cache - Memory
 LBL_selected_cache_memory_desc=Monitors the total cache memory and index memory for the currently selected cache for all members.
 LBL_selected_cache_index=Selected Cache - Index