Improve Akka.Cluster.Metrics collected values (akkadotnet#6203)

* Improve collected values * Update API Verify list * Fix metrics collection * Fix documentation * Update API Verify list * Update DefaultCollector.cs * Update DefaultCollector.cs Co-authored-by: Aaron Stannard <[email protected]>
Arkatufus · Oct 28, 2022 · dca908b · dca908b
1 parent 61df6fc
commit dca908b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/Collectors/DefaultCollector.cs b/src/contrib/cluster/Akka.Cluster.Metrics/Collectors/DefaultCollector.cs
@@ -55,13 +55,14 @@ public NodeMetrics Sample()
         {
             using (var process = Process.GetCurrentProcess())
             {
+                process.Refresh();
                 var metrics = new List<NodeMetrics.Types.Metric>()
                 {
                     // Memory
-                    // Forcing garbage collection to keep metrics more resilent to occasional allocations
                     NodeMetrics.Types.Metric.Create(StandardMetrics.MemoryUsed, GC.GetTotalMemory(true)).Value,
-                    // VirtualMemorySize64 is not best idea here...
-                    NodeMetrics.Types.Metric.Create(StandardMetrics.MemoryAvailable, process.VirtualMemorySize64).Value,
+
+                    // total committed process memory = working set + paged
+                    NodeMetrics.Types.Metric.Create(StandardMetrics.MemoryAvailable, process.WorkingSet64 + process.PagedMemorySize64).Value,
                     // CPU Processors
                     NodeMetrics.Types.Metric.Create(StandardMetrics.Processors, Environment.ProcessorCount).Value,
                 };

diff --git a/src/contrib/cluster/Akka.Cluster.Metrics/StandardMetrics.cs b/src/contrib/cluster/Akka.Cluster.Metrics/StandardMetrics.cs
@@ -21,7 +21,7 @@ namespace Akka.Cluster.Metrics
     public static class StandardMetrics
     {
         /// <summary>
-        /// Total memory allocated to the currently running process (<see cref="GC.GetTotalMemory"/>)
+        /// Total memory allocated to the currently running process (<see cref="Process.WorkingSet64"/>)
         /// </summary>
         public const string MemoryUsed = "MemoryUsed";
         /// <summary>
@@ -84,7 +84,7 @@ public sealed class Memory
             /// </summary>
             public long Timestamp { get; }
             /// <summary>
-            /// The current process allocated memory (in bytes) (<see cref="GC.GetTotalMemory"/>)
+            /// The current process allocated memory (in bytes) (<see cref="Process.WorkingSet64"/>)
             /// </summary>
             public double Used { get; }
             /// <summary>

diff --git a/src/core/Akka/Util/Extensions/DateTimeExtensions.cs b/src/core/Akka/Util/Extensions/DateTimeExtensions.cs
@@ -14,12 +14,14 @@ namespace Akka.Util.Extensions
     /// </summary>
     public static class DateTimeExtensions
     {
+        private static readonly DateTime UnixOffset = new DateTime(1970, 1, 1);
+
         /// <summary>
         /// Converts given date and time to UNIX Timestamp - number of milliseconds elapsed since 1 Jan 1970
         /// </summary>
         public static long ToTimestamp(this DateTime dateTime)
         {
-            return (long)(dateTime - new DateTime(1970, 1, 1)).TotalMilliseconds;
+            return (long)(dateTime - UnixOffset).TotalMilliseconds;
         }
     }
 }