diff --git a/.github/workflows/test-against-released.yml b/.github/workflows/test-against-released.yml index 99b99263..0db1a944 100644 --- a/.github/workflows/test-against-released.yml +++ b/.github/workflows/test-against-released.yml @@ -45,9 +45,9 @@ jobs: - 14.1.1-0-16 - 22.06.7 - 22.06.6 - - 23.09 - 23.09.1 - 23.09.2 + - 24.03 steps: - name: Checkout diff --git a/README.md b/README.md index 7eaf361f..65a6c7eb 100644 --- a/README.md +++ b/README.md @@ -33,9 +33,9 @@ NOTE: The most current version of the Plugin requires VisualVM release 2.1 or la The Plugin will connect to and display data for the following Coherence versions: -* **Community Editions**: 24.03.x, 23.09.x, 22.06.x, 21.12.x (*), 14.1.1.0.x +* **Community Editions**: 24.03.x, 23.09.x, 22.06.x, 14.1.1.0.x -* **Commercial Editions**: 14.1.1.2206.x, 14.1.1.0.x, 12.2.1.5.x, 12.2.1.4.x 12.1.3.x and 12.1.2.x +* **Commercial Editions**: 14.1.1.2206.x, 14.1.1.0.x and 12.2.1.4.x >Note: If you wish to connect to Coherence version 12.2.1.4.x via REST you should have Coherence version 12.2.1.4.7 or greater. @@ -195,18 +195,37 @@ Depending upon the edition and functionality you are using, the following option ## Using Coherence with the Tracer framework -Version 1.7.0 of the Coherence VisualVM Plugin introduces initial integration with the VisualVM Tracer framework. +Version 1.7.0 of the Coherence VisualVM Plugin introduces initial integration with the +VisualVM Tracer framework. -From the VisualVM website +From the VisualVM website: > The VisualVM Tracer framework provides detailed monitoring and analyzing Java applications. Using various probes, > the Tracer gathers metrics from an application and displays the data in a timeline. The data are > displayed both graphically and in a table and can be exported to common formats for further processing > by external tools. -When you connect to a cluster via JMX, you will see the `Tracer` tab as shown below: +After installation, when you connect to a cluster via JMX, you will see the `Tracer` tab as shown below: -TBC. +![Tracer Tab](assets/visualvm-tracer.png) + +There are a number of expandable groups allowing you to choose Coherence related probes to display on the timeline including: + +* Coherence Cluster Overview - shows general cluster data such as members, heap, package publisher/receive rates and load averages +* Coherence Services - Overall - shows overall service partition data +* Coherence Services - Selected - shows data for the selected service only +* Coherence Caches - Overall - shows overall cache data such as total cache sizes and memory usage +* Coherence Caches - Selected - shows data for the selected cache only +* Coherence Proxy Servers - shows proxy connection details and outgoing backlogs +* Coherence Persistence - shows active and backup persistence data as well as maximum latency +* Coherence Federation - shows send and receive rates +* Coherence Elastic Data - shows elastic data flash a ram journal usage + +To start recording tracer data, select the tracer probes that you wish to display and click `Start`. + +> Note: The data displayed is the same as is display on the various Coherence tabs. + +![Tracer Tab](assets/visualvm-tracer-timeline.png) ## Building the Plugin diff --git a/assets/visualvm-tracer-timeline.png b/assets/visualvm-tracer-timeline.png new file mode 100644 index 00000000..dfb80d60 Binary files /dev/null and b/assets/visualvm-tracer-timeline.png differ diff --git a/assets/visualvm-tracer.png b/assets/visualvm-tracer.png new file mode 100644 index 00000000..51e0faed Binary files /dev/null and b/assets/visualvm-tracer.png differ diff --git a/coherence-visualvm-plugin/pom.xml b/coherence-visualvm-plugin/pom.xml index 75d4222b..3c74d7b1 100644 --- a/coherence-visualvm-plugin/pom.xml +++ b/coherence-visualvm-plugin/pom.xml @@ -169,10 +169,6 @@ ${java.version} ${java.version} ${java.version.release} - - --add-opens - jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED - diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMemorySizeProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMemorySizeProbe.java index d2106da1..325dc3bf 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMemorySizeProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheMemorySizeProbe.java @@ -27,12 +27,17 @@ import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; + import com.oracle.coherence.plugin.visualvm.tablemodel.model.CacheData; + import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; + import org.graalvm.visualvm.modules.tracer.ItemValueFormatter; import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.MB; + /** * Tracer probe to return the total memory size of all caches across all services. * @@ -68,7 +73,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, MB), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheSizeProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheSizeProbe.java index 91f6230a..b7737e76 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheSizeProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/CacheSizeProbe.java @@ -25,7 +25,6 @@ package com.oracle.coherence.plugin.visualvm.tracer.cache; -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.CacheData; @@ -36,6 +35,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the total number of cache entries across all services. * @@ -61,17 +62,17 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText(LBL), - Localization.getLocalText("LBL_cache_size_desc"), ICON, 10, available); + return new TracerProbeDescriptor(getLocalText(LBL), + getLocalText("LBL_cache_size_desc"), ICON, 10, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), + ProbeItemDescriptor.continuousLineFillItem(getLocalText("LBL_all_caches") + " - " + getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheListenersProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheListenersProbe.java index f90fa04f..eb039b5a 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheListenersProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheListenersProbe.java @@ -74,10 +74,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMemoryProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMemoryProbe.java index 548dccbc..1d500f65 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMemoryProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheMemoryProbe.java @@ -75,10 +75,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheQueryProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheQueryProbe.java index 62c33472..00d007ca 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheQueryProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheQueryProbe.java @@ -73,13 +73,13 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), + 1000d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), + 1000d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL3), getMonitorsString(LBL3), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), + 1000d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheSizeProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheSizeProbe.java index 4e6bf4a1..81c0cef4 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheSizeProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cache/SelectedCacheSizeProbe.java @@ -25,15 +25,19 @@ package com.oracle.coherence.plugin.visualvm.tracer.cache; -import com.oracle.coherence.plugin.visualvm.Localization; + import com.oracle.coherence.plugin.visualvm.VisualVMModel; -import com.oracle.coherence.plugin.visualvm.tablemodel.model.CacheData; + import com.oracle.coherence.plugin.visualvm.tablemodel.model.CacheDetailData; + import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; + import org.graalvm.visualvm.modules.tracer.ItemValueFormatter; import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the total number of cache entries across all services. * @@ -59,17 +63,17 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("LBL_selected_cache_size"), - Localization.getLocalText("LBL_selected_cache_size_desc"), ICON, 10, available); + return new TracerProbeDescriptor(getLocalText("LBL_selected_cache_size"), + getLocalText("LBL_selected_cache_size_desc"), ICON, 10, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), + ProbeItemDescriptor.continuousLineFillItem(getLocalText("LBL_cache") + " - " + getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/ClusterSizeProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/ClusterSizeProbe.java index ba250b7a..1c6ff5c6 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/ClusterSizeProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/ClusterSizeProbe.java @@ -88,10 +88,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/DepartureCountProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/DepartureCountProbe.java index 400f5cc9..5d93d08a 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/DepartureCountProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/DepartureCountProbe.java @@ -69,7 +69,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/LoadAverageProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/LoadAverageProbe.java index accd272d..ea74339c 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/LoadAverageProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/LoadAverageProbe.java @@ -28,17 +28,18 @@ import java.util.List; import java.util.Map; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_CURRENT_AVERAGE; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_MAXIMUM; -import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getClusterLoadAverage; - -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.Data; import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_CURRENT_AVERAGE; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_MAXIMUM; +import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getClusterLoadAverage; + + /** * Tracer probe to return average and max load average. * @@ -73,27 +74,31 @@ public long[] getValues(VisualVMModel model) return new long[] { - (long) ((cTotalLoadAverage / (cCount * 1.0f)) * 1000), - (long) (cMax * 1000) + (long) (cMax * 1000), + (long) ((cTotalLoadAverage / (cCount * 1.0f)) * 1000) }; } public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("GRPH_load_average"), - Localization.getLocalText("LBL_load_average_desc"), ICON, 15, available); + return new TracerProbeDescriptor(getLocalText("GRPH_load_average"), + getLocalText("LBL_load_average_desc"), ICON, 15, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(GRPH_CURRENT_AVERAGE), - getMonitorsString(GRPH_CURRENT_AVERAGE), CUSTOM_FORMATTER, - 1000, 0, 1), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(GRPH_MAXIMUM), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(LBL) + " - " + getLocalText(GRPH_MAXIMUM), getMonitorsString(GRPH_MAXIMUM), CUSTOM_FORMATTER, - 1000, 0, 1) + 1000, 0, 0), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(LBL) + " - " + getLocalText(GRPH_CURRENT_AVERAGE), + getMonitorsString(GRPH_CURRENT_AVERAGE), CUSTOM_FORMATTER, + 1000, 0, 0) }; } + + // ----- constants ------------------------------------------------------ + + private static final String LBL = "LBL_load_average"; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketPublisherProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketPublisherProbe.java index 1342c373..c1b4aaa2 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketPublisherProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketPublisherProbe.java @@ -28,11 +28,6 @@ import java.util.List; import java.util.Map; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_CURRENT_AVERAGE; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_MINIMUM; -import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getMemberMemoryRateData; - -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.Data; import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; @@ -40,6 +35,12 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_CURRENT_AVERAGE; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_MINIMUM; +import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getMemberMemoryRateData; + + /** * Tracer probe to return average and minimum package publisher. * @@ -52,7 +53,7 @@ public class PacketPublisherProbe public PacketPublisherProbe(MonitoredDataResolver resolver) { - super(2, createItemDescriptors(), resolver); + super(2, createItemDescriptors("LBL_publisher"), resolver); } // ---- TracerProbe methods --------------------------------------------- @@ -82,18 +83,18 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("GRPH_packet_publisher"), - Localization.getLocalText("LBL_packet_publisher_desc"), ICON, 15, available); + return new TracerProbeDescriptor(getLocalText("GRPH_packet_publisher"), + getLocalText("LBL_packet_publisher_desc"), ICON, 15, available); } - protected static ProbeItemDescriptor[] createItemDescriptors() + protected static ProbeItemDescriptor[] createItemDescriptors(String sLabel) { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(GRPH_CURRENT_AVERAGE), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(sLabel) + " - " + getLocalText(GRPH_CURRENT_AVERAGE), getMonitorsString(GRPH_CURRENT_AVERAGE), CUSTOM_FORMATTER, 1, 0, 1000), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(GRPH_MINIMUM), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(sLabel) + " - " + getLocalText(GRPH_MINIMUM), getMonitorsString(GRPH_MINIMUM), CUSTOM_FORMATTER, 1, 0, 1000) }; diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketReceiverProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketReceiverProbe.java index bd80d8fe..a4b8ea8d 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketReceiverProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/PacketReceiverProbe.java @@ -28,18 +28,16 @@ import java.util.List; import java.util.Map; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_CURRENT_AVERAGE; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GRPH_MINIMUM; -import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getMemberMemoryRateData; - -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.Data; import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; -import org.graalvm.visualvm.modules.tracer.ItemValueFormatter; -import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; + import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; +import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getMemberMemoryRateData; + + /** * Tracer probe to return average and minimum package receiver. * @@ -52,7 +50,7 @@ public class PacketReceiverProbe public PacketReceiverProbe(MonitoredDataResolver resolver) { - super(2, PacketPublisherProbe.createItemDescriptors(), resolver); + super(2, PacketPublisherProbe.createItemDescriptors("LBL_receiver"), resolver); } // ---- TracerProbe methods --------------------------------------------- @@ -82,7 +80,7 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("GRPH_packet_receiver"), - Localization.getLocalText("LBL_packet_receiver_desc"), ICON, 15, available); + return new TracerProbeDescriptor(getLocalText("GRPH_packet_receiver"), + getLocalText("LBL_packet_receiver_desc"), ICON, 15, available); } } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/StorageMembersHeapProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/StorageMembersHeapProbe.java index 8310b214..d69fd944 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/StorageMembersHeapProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/cluster/StorageMembersHeapProbe.java @@ -25,10 +25,9 @@ package com.oracle.coherence.plugin.visualvm.tracer.cluster; -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.Data; -import com.oracle.coherence.plugin.visualvm.tablemodel.model.MemberData; + import com.oracle.coherence.plugin.visualvm.tracer.AbstractCoherenceMonitorProbe; import org.graalvm.visualvm.modules.tracer.ItemValueFormatter; @@ -38,7 +37,7 @@ import java.util.List; import java.util.Map; -import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.GB; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.MB; import static com.oracle.coherence.plugin.visualvm.panel.AbstractCoherencePanel.getMemberMemoryRateData; @@ -81,20 +80,20 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("GRPH_cluster_memory_details"), - Localization.getLocalText("LBL_storage_members_heap_desc"), ICON, 15, available); + return new TracerProbeDescriptor(getLocalText("GRPH_cluster_memory_details"), + getLocalText("LBL_storage_members_heap_desc"), ICON, 15, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText("GRPH_total_cluster_memory"), + ProbeItemDescriptor.continuousLineFillItem(getLocalText("GRPH_total_cluster_memory"), getMonitorsString("GRPH_total_cluster_memory"), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, GB), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText("GRPH_used_cluster_memory"), + 1d, 0, MB), + ProbeItemDescriptor.continuousLineFillItem(getLocalText("GRPH_used_cluster_memory"), getMonitorsString("GRPH_used_cluster_memory"), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, GB) + 1d, 0, MB) }; } } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalFilesProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalFilesProbe.java index 33a956ec..1afe5119 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalFilesProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalFilesProbe.java @@ -25,7 +25,6 @@ package com.oracle.coherence.plugin.visualvm.tracer.elasticdata; -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.AbstractElasticData; @@ -36,6 +35,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the flash journal files used. * @@ -58,30 +59,31 @@ public long[] getValues(VisualVMModel model) { long nRamJournalFileCount = getSingValueSum(model, VisualVMModel.DataType.FLASHJOURNAL, AbstractElasticData.FILE_COUNT, ZERO_VALUES1)[0]; long nRamJournaMaxFiles = getSingValueSum(model, VisualVMModel.DataType.FLASHJOURNAL, AbstractElasticData.MAX_FILES, ZERO_VALUES1)[0]; - return new long[] {nRamJournalFileCount, nRamJournaMaxFiles}; + return new long[] {nRamJournaMaxFiles, nRamJournalFileCount}; } public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("LBL_flash_journal_files"), - Localization.getLocalText("LBL_flashjournal_files_desc"), ICON, 25, available); + return new TracerProbeDescriptor(getLocalText("LBL_flash_journal_files"), + getLocalText("LBL_flashjournal_files_desc"), ICON, 25, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), - getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " + getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, 1d, 0, 1), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " +getLocalText(LBL1), + getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, + 1d, 0, 1), }; } // ----- constants ------------------------------------------------------ - private static final String LBL1 = "LBL_journal_files_used"; - private static final String LBL2 = "LBL_max_journal_files"; + private static final String LBL1 = "LBL_journal_files_used"; + private static final String LBL2 = "LBL_max_journal_files"; + private static final String PREFIX = "LBL_flash"; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalSpaceProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalSpaceProbe.java index e23013d0..c82f6ef1 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalSpaceProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/FlashJournalSpaceProbe.java @@ -73,10 +73,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalFilesProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalFilesProbe.java index 20d461d5..564fe5e9 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalFilesProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalFilesProbe.java @@ -36,6 +36,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the ram journal files used. * @@ -58,30 +60,31 @@ public long[] getValues(VisualVMModel model) { long nRamJournalFileCount = getSingValueSum(model, VisualVMModel.DataType.RAMJOURNAL, AbstractElasticData.FILE_COUNT, ZERO_VALUES1)[0]; long nRamJournaMaxFiles = getSingValueSum(model, VisualVMModel.DataType.RAMJOURNAL, AbstractElasticData.MAX_FILES, ZERO_VALUES1)[0]; - return new long[] {nRamJournalFileCount, nRamJournaMaxFiles}; - } - - public static TracerProbeDescriptor createDescriptor(boolean available) - { - return new TracerProbeDescriptor(Localization.getLocalText("LBL_ram_journal_files"), - Localization.getLocalText("LBL_ramjournal_files_desc"), ICON, 15, available); + return new long[] {nRamJournaMaxFiles, nRamJournalFileCount}; } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), - getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " +getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " +getLocalText(LBL1), + getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, + 1d, 0, 0), }; } + public static TracerProbeDescriptor createDescriptor(boolean available) + { + return new TracerProbeDescriptor(getLocalText("LBL_ram_journal_files"), + getLocalText("LBL_ramjournal_files_desc"), ICON, 15, available); + } + // ----- constants ------------------------------------------------------ - private static final String LBL1 = "LBL_journal_files_used"; - private static final String LBL2 = "LBL_max_journal_files"; + private static final String LBL1 = "LBL_journal_files_used"; + private static final String LBL2 = "LBL_max_journal_files"; + private static final String PREFIX = "LBL_ram"; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalMemoryProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalMemoryProbe.java index 8085a97f..5dc8d8ee 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalMemoryProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/elasticdata/RamJournalMemoryProbe.java @@ -36,6 +36,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.helper.GraphHelper.MB; + /** * Tracer probe to return the ram journal memory committed and used. * @@ -73,10 +75,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, MB), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, MB), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesReceivedSecProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesReceivedSecProbe.java index 5d7b5b8f..845aea68 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesReceivedSecProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesReceivedSecProbe.java @@ -68,7 +68,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_BYTES_PER_SEC, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesSentSecProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesSentSecProbe.java index 791b414f..eaf6079a 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesSentSecProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/BytesSentSecProbe.java @@ -71,7 +71,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_BYTES_PER_SEC, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsReceivedSecProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsReceivedSecProbe.java index 742a3a49..dc39653b 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsReceivedSecProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsReceivedSecProbe.java @@ -69,7 +69,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1, "msg/ s"), - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsSentSecProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsSentSecProbe.java index 67de4f63..8a074241 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsSentSecProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/federation/MsgsSentSecProbe.java @@ -69,7 +69,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1, "msg/ s"), - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/ActiveSpaceProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/ActiveSpaceProbe.java index 3e074ee7..730e604e 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/ActiveSpaceProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/ActiveSpaceProbe.java @@ -73,7 +73,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, MB), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/BackupSpaceProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/BackupSpaceProbe.java index 9255cc75..e06d7465 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/BackupSpaceProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/BackupSpaceProbe.java @@ -75,7 +75,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_BYTES, - 1d, 0, 1), + 1d, 0, MB), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/MaximumLatencyProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/MaximumLatencyProbe.java index 957ecb85..f89d6236 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/MaximumLatencyProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/persistence/MaximumLatencyProbe.java @@ -73,7 +73,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1, "ms"), - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyConnectionCountProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyConnectionCountProbe.java index 812db463..31b763d8 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyConnectionCountProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyConnectionCountProbe.java @@ -71,7 +71,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyOutgoingMsgBacklogProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyOutgoingMsgBacklogProbe.java index 3f4e6578..b4b885c4 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyOutgoingMsgBacklogProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/proxy/ProxyOutgoingMsgBacklogProbe.java @@ -71,7 +71,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/EndangeredPartitionsProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/EndangeredPartitionsProbe.java index 47ac7ff2..c7a86474 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/EndangeredPartitionsProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/EndangeredPartitionsProbe.java @@ -68,7 +68,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/PartitionedPendingRequestsProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/PartitionedPendingRequestsProbe.java index 90a4ef41..ff7f638f 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/PartitionedPendingRequestsProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/PartitionedPendingRequestsProbe.java @@ -71,7 +71,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServicePartitionsProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServicePartitionsProbe.java index 2bba28d7..b11eb027 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServicePartitionsProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServicePartitionsProbe.java @@ -88,16 +88,16 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL1), getMonitorsString(LBL1), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL3), getMonitorsString(LBL3), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL4), getMonitorsString(LBL4), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1) + 1d, 0, 0) }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceRequestAverageProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceRequestAverageProbe.java index 248614a6..6f8b0866 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceRequestAverageProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceRequestAverageProbe.java @@ -37,6 +37,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the maximum and average request average for the currently selected service. * @@ -64,25 +66,26 @@ public long[] getValues(VisualVMModel model) public static TracerProbeDescriptor createDescriptor(boolean available) { - return new TracerProbeDescriptor(Localization.getLocalText("LBL_selected_service_request_avg"), - Localization.getLocalText("LBL_selected_service_request_avg_desc"), ICON, 20, available); + return new TracerProbeDescriptor(getLocalText("LBL_selected_service_request_avg"), + getLocalText("LBL_selected_service_request_avg_desc"), ICON, 20, available); } private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " + getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), + 1000d, 0, 0), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " + getLocalText(LBL2), getMonitorsString(LBL2), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), + 1000d, 0, 0), }; } // ----- constants ------------------------------------------------------ - private static final String LBL = "GRPH_current_maximum"; - private static final String LBL2 = "GRPH_current_average"; + private static final String LBL = "GRPH_current_maximum"; + private static final String LBL2 = "GRPH_current_average"; + private static final String PREFIX = "LBL_request_average_duration"; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskAverageProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskAverageProbe.java index 9b8813b6..eedf49d4 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskAverageProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskAverageProbe.java @@ -25,7 +25,6 @@ package com.oracle.coherence.plugin.visualvm.tracer.service; -import com.oracle.coherence.plugin.visualvm.Localization; import com.oracle.coherence.plugin.visualvm.VisualVMModel; import com.oracle.coherence.plugin.visualvm.tablemodel.model.ServiceMemberData; @@ -37,6 +36,8 @@ import org.graalvm.visualvm.modules.tracer.ProbeItemDescriptor; import org.graalvm.visualvm.modules.tracer.TracerProbeDescriptor; +import static com.oracle.coherence.plugin.visualvm.Localization.getLocalText; + /** * Tracer probe to return the maximum and average task average for the currently selected service. * @@ -62,27 +63,28 @@ public long[] getValues(VisualVMModel model) return new long[]{aoResults[0], aoResults[1]}; } - public static TracerProbeDescriptor createDescriptor(boolean available) - { - return new TracerProbeDescriptor(Localization.getLocalText("LBL_selected_service_task_avg"), - Localization.getLocalText("LBL_selected_service_task_avg_desc"), ICON, 15, available); - } - private static ProbeItemDescriptor[] createItemDescriptors() { return new ProbeItemDescriptor[] { - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " + getLocalText(LBL), getMonitorsString(LBL), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), - ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), + 1000d, 0, 0), + ProbeItemDescriptor.continuousLineFillItem(getLocalText(PREFIX) + " - " + getLocalText(LBL2), getMonitorsString(LBL2), new CustomFormatter(1000, "ms"), - 1000d, 0, 1), + 1000d, 0, 0), }; } + public static TracerProbeDescriptor createDescriptor(boolean available) + { + return new TracerProbeDescriptor(getLocalText("LBL_selected_service_task_avg"), + getLocalText("LBL_selected_service_task_avg_desc"), ICON, 15, available); + } + // ----- constants ------------------------------------------------------ - private static final String LBL = "GRPH_current_maximum"; - private static final String LBL2 = "GRPH_current_average"; + private static final String LBL = "GRPH_current_maximum"; + private static final String LBL2 = "GRPH_current_average"; + private static final String PREFIX = "LBL_task_average_duration"; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskBackLogProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskBackLogProbe.java index 01669555..bd281e4f 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskBackLogProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceTaskBackLogProbe.java @@ -72,7 +72,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1) + 1d, 0, 0) }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadCountProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadCountProbe.java index 68009165..d98ec621 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadCountProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadCountProbe.java @@ -72,10 +72,10 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL2), getMonitorsString(LBL2), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadUtilizationProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadUtilizationProbe.java index ecb65b52..6fcab2cd 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadUtilizationProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/SelectedServiceThreadUtilizationProbe.java @@ -72,7 +72,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_PERCENT, - 1d, 0, 1000) + 1d, 0, 0) }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/UnbalancedPartitionsProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/UnbalancedPartitionsProbe.java index 2f0eb6cd..d199f959 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/UnbalancedPartitionsProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/UnbalancedPartitionsProbe.java @@ -68,7 +68,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/VulnerablePartitionsProbe.java b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/VulnerablePartitionsProbe.java index 5eb06e25..dc6f68b6 100644 --- a/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/VulnerablePartitionsProbe.java +++ b/coherence-visualvm-plugin/src/main/java/com/oracle/coherence/plugin/visualvm/tracer/service/VulnerablePartitionsProbe.java @@ -68,7 +68,7 @@ private static ProbeItemDescriptor[] createItemDescriptors() { ProbeItemDescriptor.continuousLineFillItem(Localization.getLocalText(LBL), getMonitorsString(LBL), ItemValueFormatter.DEFAULT_DECIMAL, - 1d, 0, 1), + 1d, 0, 0), }; } diff --git a/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties b/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties index 31671b94..360b77bd 100644 --- a/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties +++ b/coherence-visualvm-plugin/src/main/resources/com/oracle/coherence/plugin/visualvm/Bundle.properties @@ -781,4 +781,10 @@ LBL_index_memory=Total Index Memory LBL_selected_cache_listeners=Selected Cache - Listeners LBL_selected_cache_listeners_desc=Monitors the total key and filter listeners for the currently selected cache for all members. LBL_selected_cache_query=Selected Cache - Queries -LBL_selected_cache_query_desc=Monitors the max query duration, optimized and non-optimized queries for the currently selected cache for all members. \ No newline at end of file +LBL_selected_cache_query_desc=Monitors the max query duration, optimized and non-optimized queries for the currently selected cache for all members. +LBL_publisher=Publisher +LBL_receiver=Receiver +LBL_cache=Cache +LBL_ram=RAM +LBL_flash=Flash +LBL_all_caches=All Caches \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5b93b57d..d5b2bd88 100644 --- a/pom.xml +++ b/pom.xml @@ -65,9 +65,9 @@ 3.0.12 2.13.5 ${jackson.version} - 11 + 1.8 1.8 - 11 + 8 1.2.0 4.13.1 2.1 @@ -267,10 +267,6 @@ ${java.version} ${java.version} ${java.version.release} - - --add-opens - jdk.internal.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -