Introducing Environment.CpuUsage

src/libraries/System.Diagnostics.DiagnosticSource/src/System/Diagnostics/Metrics/RuntimeMetrics.cs

@@ -146,12 +146,11 @@ static RuntimeMetrics()
             unit: "{cpu}",
             description: "The number of processors available to the process.");
 
-        // TODO - Uncomment once an implementation for https://github.com/dotnet/runtime/issues/104844 is available.
-        //private static readonly ObservableCounter<double> s_processCpuTime = s_meter.CreateObservableCounter(
-        //    "dotnet.process.cpu.time",
-        //    GetCpuTime,
-        //    unit: "s",
-        //    description: "CPU time used by the process as reported by the CLR.");
+        private static readonly ObservableCounter<double> s_processCpuTime = s_meter.CreateObservableCounter(
+           "dotnet.process.cpu.time",
+           GetCpuTime,
+           unit: "s",
+           description: "CPU time used by the process as reported by the CLR.");
 
         public static bool IsEnabled()
         {
@@ -172,8 +171,8 @@ public static bool IsEnabled()
                 || s_threadPoolQueueLength.Enabled
                 || s_assembliesCount.Enabled
                 || s_exceptions.Enabled
-                || s_processCpuCount.Enabled;
-            //|| s_processCpuTime.Enabled;
+                || s_processCpuCount.Enabled
+                || s_processCpuTime.Enabled;
         }
 
         private static IEnumerable<Measurement<long>> GetGarbageCollectionCounts()
@@ -188,17 +187,16 @@ private static IEnumerable<Measurement<long>> GetGarbageCollectionCounts()
             }
         }
 
-        // TODO - Uncomment once an implementation for https://github.com/dotnet/runtime/issues/104844 is available.
-        //private static IEnumerable<Measurement<double>> GetCpuTime()
-        //{
-        //    if (OperatingSystem.IsBrowser() || OperatingSystem.IsTvOS() || OperatingSystem.IsIOS())
-        //        yield break;
+        private static IEnumerable<Measurement<double>> GetCpuTime()
+        {
+           if (OperatingSystem.IsBrowser() || OperatingSystem.IsTvOS() || OperatingSystem.IsIOS())
+               yield break;
 
-        //    ProcessCpuUsage processCpuUsage = Environment.CpuUsage;
+           Environment.ProcessCpuUsage processCpuUsage = Environment.CpuUsage;
 
-        //    yield return new(processCpuUsage.UserTime.TotalSeconds, [new KeyValuePair<string, object?>("cpu.mode", "user")]);
-        //    yield return new(processCpuUsage.PrivilegedTime.TotalSeconds, [new KeyValuePair<string, object?>("cpu.mode", "system")]);
-        //}
+           yield return new(processCpuUsage.UserTime.TotalSeconds, [new KeyValuePair<string, object?>("cpu.mode", "user")]);
+           yield return new(processCpuUsage.PrivilegedTime.TotalSeconds, [new KeyValuePair<string, object?>("cpu.mode", "system")]);
+        }
 
         private static IEnumerable<Measurement<long>> GetHeapSizes()
         {

src/libraries/System.Diagnostics.DiagnosticSource/tests/RuntimeMetricsTests.cs

@@ -112,48 +112,47 @@ public void GcCollectionsCount()
             }
         }
 
-        // TODO - Uncomment once an implementation for https://github.com/dotnet/runtime/issues/104844 is available.
-        //[Fact]
-        //public void CpuTime()
-        //{
-        //    using InstrumentRecorder<double> instrumentRecorder = new("dotnet.process.cpu.time");
-
-        //    instrumentRecorder.RecordObservableInstruments();
-
-        //    bool[] foundCpuModes = [false, false];
-
-        //    foreach (Measurement<double> measurement in instrumentRecorder.GetMeasurements().Where(m => m.Value >= 0))
-        //    {
-        //        var tags = measurement.Tags.ToArray();
-        //        var tag = tags.SingleOrDefault(k => k.Key == "cpu.mode");
-
-        //        if (tag.Key is not null)
-        //        {
-        //            Assert.True(tag.Value is string, "Expected CPU mode tag to be a string.");
-
-        //            string tagValue = (string)tag.Value;
-
-        //            switch (tagValue)
-        //            {
-        //                case "user":
-        //                    foundCpuModes[0] = true;
-        //                    break;
-        //                case "system":
-        //                    foundCpuModes[1] = true;
-        //                    break;
-        //                default:
-        //                    Assert.Fail($"Unexpected CPU mode tag value '{tagValue}'.");
-        //                    break;
-        //            }
-        //        }
-        //    }
-
-        //    for (int i = 0; i < foundCpuModes.Length; i++)
-        //    {
-        //        var mode = i == 0 ? "user" : "system";
-        //        Assert.True(foundCpuModes[i], $"Expected to find a measurement for '{mode}' CPU mode.");
-        //    }
-        //}
+        [Fact]
+        public void CpuTime()
+        {
+           using InstrumentRecorder<double> instrumentRecorder = new("dotnet.process.cpu.time");
+
+           instrumentRecorder.RecordObservableInstruments();
+
+           bool[] foundCpuModes = [false, false];
+
+           foreach (Measurement<double> measurement in instrumentRecorder.GetMeasurements().Where(m => m.Value >= 0))
+           {
+               var tags = measurement.Tags.ToArray();
+               var tag = tags.SingleOrDefault(k => k.Key == "cpu.mode");
+
+               if (tag.Key is not null)
+               {
+                   Assert.True(tag.Value is string, "Expected CPU mode tag to be a string.");
+
+                   string tagValue = (string)tag.Value;
+
+                   switch (tagValue)
+                   {
+                       case "user":
+                           foundCpuModes[0] = true;
+                           break;
+                       case "system":
+                           foundCpuModes[1] = true;
+                           break;
+                       default:
+                           Assert.Fail($"Unexpected CPU mode tag value '{tagValue}'.");
+                           break;
+                   }
+               }
+           }
+
+           for (int i = 0; i < foundCpuModes.Length; i++)
+           {
+               var mode = i == 0 ? "user" : "system";
+               Assert.True(foundCpuModes[i], $"Expected to find a measurement for '{mode}' CPU mode.");
+           }
+        }
 
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))]
         public void ExceptionsCount()

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.FreeBSD.cs

@@ -34,6 +34,11 @@ public TimeSpan TotalProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.TotalTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
                 Interop.Process.proc_stats stat = Interop.Process.GetThreadInfo(_processId, 0);
                 return Process.TicksToTimeSpan(stat.userTime + stat.systemTime);
@@ -51,6 +56,11 @@ public TimeSpan UserProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.UserTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
 
                 Interop.Process.proc_stats stat = Interop.Process.GetThreadInfo(_processId, 0);
@@ -66,6 +76,11 @@ public TimeSpan PrivilegedProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.PrivilegedTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
 
                 Interop.Process.proc_stats stat = Interop.Process.GetThreadInfo(_processId, 0);

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Linux.cs

@@ -53,10 +53,7 @@
         [SupportedOSPlatform("maccatalyst")]
         public TimeSpan PrivilegedProcessorTime
         {
-            get
-            {
-                return TicksToTimeSpan(GetStat().stime);
-            }
+            get => IsCurrentProcess ? Environment.CpuUsage.PrivilegedTime : TicksToTimeSpan(GetStat().stime);
         }
 
         /// <summary>Gets the time the associated process was started.</summary>
@@ -132,6 +129,11 @@
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    Environment.CpuUsage.TotalTime;
+                }
+
                 Interop.procfs.ParsedStat stat = GetStat();
                 return TicksToTimeSpan(stat.utime + stat.stime);
             }
@@ -146,10 +148,7 @@
         [SupportedOSPlatform("maccatalyst")]
         public TimeSpan UserProcessorTime
         {
-            get
-            {
-                return TicksToTimeSpan(GetStat().utime);
-            }
+            get => IsCurrentProcess ? Environment.CpuUsage.UserTime : TicksToTimeSpan(GetStat().utime);
         }
 
         partial void EnsureHandleCountPopulated()

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.OSX.cs

@@ -22,6 +22,11 @@ public TimeSpan PrivilegedProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.PrivilegedTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
                 Interop.libproc.rusage_info_v3 info = Interop.libproc.proc_pid_rusage(_processId);
                 return MapTime(info.ri_system_time);
@@ -64,6 +69,11 @@ public TimeSpan TotalProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.TotalTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
                 Interop.libproc.rusage_info_v3 info = Interop.libproc.proc_pid_rusage(_processId);
                 return MapTime(info.ri_system_time + info.ri_user_time);
@@ -81,6 +91,11 @@ public TimeSpan UserProcessorTime
         {
             get
             {
+                if (IsCurrentProcess)
+                {
+                    return Environment.CpuUsage.UserTime;
+                }
+
                 EnsureState(State.HaveNonExitedId);
                 Interop.libproc.rusage_info_v3 info = Interop.libproc.proc_pid_rusage(_processId);
                 return MapTime(info.ri_user_time);

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.Windows.cs

@@ -232,7 +232,7 @@ private DateTime ExitTimeCore
         [SupportedOSPlatform("maccatalyst")]
         public TimeSpan PrivilegedProcessorTime
         {
-            get { return GetProcessTimes().PrivilegedProcessorTime; }
+            get => IsCurrentProcess ? Environment.CpuUsage.PrivilegedTime : GetProcessTimes().TotalProcessorTime;
         }
 
         /// <summary>Gets the time the associated process was started.</summary>
@@ -251,7 +251,7 @@ internal DateTime StartTimeCore
         [SupportedOSPlatform("maccatalyst")]
         public TimeSpan TotalProcessorTime
         {
-            get { return GetProcessTimes().TotalProcessorTime; }
+            get => IsCurrentProcess ? Environment.CpuUsage.TotalTime : GetProcessTimes().TotalProcessorTime;
         }
 
         /// <summary>
@@ -263,7 +263,7 @@ public TimeSpan TotalProcessorTime
         [SupportedOSPlatform("maccatalyst")]
         public TimeSpan UserProcessorTime
         {
-            get { return GetProcessTimes().UserProcessorTime; }
+            get => IsCurrentProcess ? Environment.CpuUsage.UserTime : GetProcessTimes().UserProcessorTime;
         }
 
         /// <summary>

src/libraries/System.Diagnostics.Process/src/System/Diagnostics/Process.cs

@@ -1106,6 +1106,8 @@ public static Process[] GetProcesses(string machineName)
             return processes;
         }
 
+        private bool IsCurrentProcess => _processId == Environment.ProcessId;
+
         /// <devdoc>
         ///    <para>
         ///       Returns a new <see cref='System.Diagnostics.Process'/>

src/libraries/System.Private.CoreLib/src/Resources/Strings.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->