Skip to content

Commit 3cf45bb

Browse files
committed
8154: Some JMX attributes are missing unit specifications in the Console
Reviewed-by: clanger
1 parent 8635f41 commit 3cf45bb

File tree

1 file changed

+28
-3
lines changed
  • application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/subscription/internal

1 file changed

+28
-3
lines changed

application/org.openjdk.jmc.rjmx/src/main/resources/org/openjdk/jmc/rjmx/subscription/internal/mrimetadata.xml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="ISO-8859-1"?>
22
<!--
3-
Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
3+
Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
44
55
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
66
@@ -5625,7 +5625,7 @@
56255625
</arguments>
56265626
</metadata>
56275627
<metadata>
5628-
<mri.dataPath>FreePhysicalMemorySize</mri.dataPath>
5628+
<mri.dataPath>FreeMemorySize</mri.dataPath>
56295629
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
56305630
<displayname>Free Physical Memory</displayname>
56315631
<description>The amount of free physical memory.</description>
@@ -5634,6 +5634,16 @@
56345634
<color>#a0c0ff</color>
56355635
</arguments>
56365636
</metadata>
5637+
<metadata>
5638+
<mri.dataPath>FreePhysicalMemorySize</mri.dataPath>
5639+
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
5640+
<displayname>Free Physical Memory (deprecated)</displayname>
5641+
<description>The amount of free physical memory - deprecated since JDK 14. Use FreeMemorySize instead.</description>
5642+
<unitstring>memory:B</unitstring>
5643+
<arguments>
5644+
<color>#a0c0ff</color>
5645+
</arguments>
5646+
</metadata>
56375647
<metadata>
56385648
<mri.dataPath>FreeSwapSpaceSize</mri.dataPath>
56395649
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
@@ -5730,12 +5740,19 @@
57305740
<unitstring>percentage:</unitstring>
57315741
</metadata>
57325742
<metadata>
5733-
<mri.dataPath>TotalPhysicalMemorySize</mri.dataPath>
5743+
<mri.dataPath>TotalMemorySize</mri.dataPath>
57345744
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
57355745
<displayname>Total Physical Memory</displayname>
57365746
<description>The total amount of physical memory.</description>
57375747
<unitstring>memory:B</unitstring>
57385748
</metadata>
5749+
<metadata>
5750+
<mri.dataPath>TotalPhysicalMemorySize</mri.dataPath>
5751+
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
5752+
<displayname>Total Physical Memory (deprecated)</displayname>
5753+
<description>The total amount of physical memory - deprecated since JDK 14. Use TotalMemorySize.</description>
5754+
<unitstring>memory:B</unitstring>
5755+
</metadata>
57395756
<metadata>
57405757
<mri.dataPath>TotalSwapSpaceSize</mri.dataPath>
57415758
<mri.objectName>java.lang:type=OperatingSystem</mri.objectName>
@@ -5943,6 +5960,14 @@
59435960
<unitstring/>
59445961
<persistent>false</persistent>
59455962
</metadata>
5963+
<metadata>
5964+
<mri.dataPath>CurrentThreadAllocatedBytes</mri.dataPath>
5965+
<mri.objectName>java.lang:type=Threading</mri.objectName>
5966+
<displayname>Current Thread Allocated Bytes</displayname>
5967+
<description>An approximation of the total amount of memory, in bytes, allocated in heap memory for the current thread.</description>
5968+
<unitstring>memory:B</unitstring>
5969+
<persistent>false</persistent>
5970+
</metadata>
59465971
<metadata>
59475972
<mri.dataPath>CurrentThreadCpuTime</mri.dataPath>
59485973
<mri.objectName>java.lang:type=Threading</mri.objectName>

0 commit comments

Comments
 (0)