Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Instrumentation.Process] Addressed comments on Process.Refresh(). #624

Closed
wants to merge 1 commit into from
Closed

[Instrumentation.Process] Addressed comments on Process.Refresh(). #624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 53 additions & 13 deletions src/OpenTelemetry.Instrumentation.Process/ProcessMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
// limitations under the License.
// </copyright>

using System;
using System.Diagnostics.Metrics;
using System.Reflection;
using Diagnostics = System.Diagnostics;
Expand All @@ -24,31 +25,27 @@ internal class ProcessMetrics
{
internal static readonly AssemblyName AssemblyName = typeof(ProcessMetrics).Assembly.GetName();
internal static readonly Meter MeterInstance = new(AssemblyName.Name, AssemblyName.Version.ToString());
private static readonly Diagnostics.Process CurrentProcess = Diagnostics.Process.GetCurrentProcess();

static ProcessMetrics()
{
// Refer to the spec for instrument details:
// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/process-metrics.md#metric-instruments

InstrumentsValues values = new InstrumentsValues(() => (-1, -1));

// TODO: change to ObservableUpDownCounter
MeterInstance.CreateObservableGauge(
"process.memory.usage",
() =>
{
CurrentProcess.Refresh();
return CurrentProcess.WorkingSet64;
},
() => values.GetMemoryUsage(),
unit: "By",
description: "The amount of physical memory in use.");
description: "The amount of physical memory in use by the current process.");

// TODO: change to ObservableUpDownCounter
MeterInstance.CreateObservableGauge(
"process.memory.virtual",
() =>
{
CurrentProcess.Refresh();
return CurrentProcess.VirtualMemorySize64;
},
() => values.GetVirtualMemoryUsage(),
unit: "By",
description: "The amount of committed virtual memory.");
description: "The amount of committed virtual memory by the current process.");
}

/// <summary>
Expand All @@ -58,4 +55,47 @@ static ProcessMetrics()
public ProcessMetrics(ProcessInstrumentationOptions options)
{
}

private class InstrumentsValues
{
private readonly Diagnostics.Process currentProcess = Diagnostics.Process.GetCurrentProcess();

private double? memoryUsage;
private double? virtualMemoryUsage;

public InstrumentsValues(Func<(double MemoryUsage, double VirtualMemoryUsage)> readValues)
{
this.memoryUsage = null;
this.virtualMemoryUsage = null;

this.currentProcess.Refresh();
this.UpdateValues = readValues;
}

private Func<(double MemoryUsage, double VirtualMemoryUsage)> UpdateValues { get; set; }

public double GetMemoryUsage()
{
if (!this.memoryUsage.HasValue)
{
(this.memoryUsage, this.virtualMemoryUsage) = this.UpdateValues();
}

var value = this.currentProcess.WorkingSet64;
this.memoryUsage = null;
return value;
}

public double GetVirtualMemoryUsage()
{
if (!this.virtualMemoryUsage.HasValue)
{
(this.memoryUsage, this.virtualMemoryUsage) = this.UpdateValues();
}

var value = this.currentProcess.VirtualMemorySize64;
this.virtualMemoryUsage = null;
return value;
}
}
}