Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Diagnostics;

Check failure on line 5 in src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs

View check run for this annotation

Azure Pipelines / extensions-ci (Correctness WarningsCheck)

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs#L5

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs(5,1): error S1128: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove this unnecessary 'using'. (https://rules.sonarsource.com/csharp/RSPEC-1128)

Check failure on line 5 in src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs

View check run for this annotation

Azure Pipelines / extensions-ci

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs#L5

src/Libraries/Microsoft.Extensions.Diagnostics.ResourceMonitoring/Windows/WindowsSnapshotProvider.cs(5,1): error S1128: (NETCORE_ENGINEERING_TELEMETRY=Build) Remove this unnecessary 'using'. (https://rules.sonarsource.com/csharp/RSPEC-1128)
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Metrics;
using Microsoft.Extensions.Diagnostics.ResourceMonitoring.Windows.Interop;
Expand Down Expand Up @@ -95,18 +95,32 @@

public Snapshot GetSnapshot()
{
#if NET9_0_OR_GREATER
var cpuUsage = Environment.CpuUsage;
return new Snapshot(
totalTimeSinceStart: TimeSpan.FromTicks(_timeProvider.GetUtcNow().Ticks),
kernelTimeSinceStart: cpuUsage.PrivilegedTime,
userTimeSinceStart: cpuUsage.UserTime,
memoryUsageInBytes: (ulong)Environment.WorkingSet);
#else
using var process = Process.GetCurrentProcess();

return new Snapshot(totalTimeSinceStart: TimeSpan.FromTicks(_timeProvider.GetUtcNow().Ticks),
return new Snapshot(
totalTimeSinceStart: TimeSpan.FromTicks(_timeProvider.GetUtcNow().Ticks),
kernelTimeSinceStart: process.PrivilegedProcessorTime,
userTimeSinceStart: process.UserProcessorTime,
memoryUsageInBytes: (ulong)Environment.WorkingSet);
#endif
}

internal static long GetCpuTicks()
{
#if NET9_0_OR_GREATER
var cpuUsage = Environment.CpuUsage;
return (cpuUsage.PrivilegedTime + cpuUsage.UserTime).Ticks;
#else
using var process = Process.GetCurrentProcess();
return process.TotalProcessorTime.Ticks;
#endif
}

internal static int GetCpuUnits() => Environment.ProcessorCount;
Expand Down
Loading