From 007a915a29bdf07c8fd63b526f79788f498860f4 Mon Sep 17 00:00:00 2001 From: Soheil Alizadeh Date: Fri, 10 Dec 2021 15:36:41 +0100 Subject: [PATCH 1/3] Use correct counter name for RPS metrics --- src/StackExchange.Metrics/Metrics/AspNetMetricSource.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/StackExchange.Metrics/Metrics/AspNetMetricSource.cs b/src/StackExchange.Metrics/Metrics/AspNetMetricSource.cs index f7ad5f8..1c11ad9 100644 --- a/src/StackExchange.Metrics/Metrics/AspNetMetricSource.cs +++ b/src/StackExchange.Metrics/Metrics/AspNetMetricSource.cs @@ -46,7 +46,7 @@ void AddGaugeCallback(string eventName, string name, string unit, string descrip diagnosticsCollector.AddGaugeCallback(MicrosoftAspNetCoreHostingEventSourceName, eventName, gauge.Record); } - AddCounterCallback("requests-per-sec", "dotnet.kestrel.requests.per_sec", "requests/sec", "Requests per second"); + AddCounterCallback("requests-per-second", "dotnet.kestrel.requests.per_sec", "requests/sec", "Requests per second"); AddGaugeCallback("total-requests", "dotnet.kestrel.requests.total", "requests", "Total requests"); AddGaugeCallback("current-requests", "dotnet.kestrel.requests.current", "requests", "Currently executing requests"); AddGaugeCallback("failed-requests", "dotnet.kestrel.requests.failed", "requests", "Failed requests"); From e8fb26964ed599b9a6d7fb1e9af5cb2d9328f669 Mon Sep 17 00:00:00 2001 From: Soheil Alizadeh Date: Mon, 13 Dec 2021 11:19:02 +0100 Subject: [PATCH 2/3] Use correct runtime units --- src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs b/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs index 8ccde2c..f27bb90 100644 --- a/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs +++ b/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs @@ -58,7 +58,7 @@ void AddGaugeCallback(string eventName, string name, string unit, string descrip } AddGaugeCallback("cpu-usage", "dotnet.cpu.usage", "percent", "% CPU usage"); - AddGaugeCallback("working-set", "dotnet.mem.working_set", "bytes", "Working set for the process"); + AddGaugeCallback("working-set", "dotnet.mem.working_set", "megabytes", "Working set for the process"); // GC AddCounterCallback("gen-0-gc-count", "dotnet.mem.collections.gen0", "collections", "Number of gen-0 collections"); @@ -67,7 +67,7 @@ void AddGaugeCallback(string eventName, string name, string unit, string descrip AddGaugeCallback("gen-0-size", "dotnet.mem.size.gen0", "bytes", "Total number of bytes in gen-0"); AddGaugeCallback("gen-1-size", "dotnet.mem.size.gen1", "bytes", "Total number of bytes in gen-1"); AddGaugeCallback("gen-2-size", "dotnet.mem.size.gen2", "bytes", "Total number of bytes in gen-2"); - AddGaugeCallback("gc-heap-size", "dotnet.mem.size.heap", "bytes", "Total number of bytes across all heaps"); + AddGaugeCallback("gc-heap-size", "dotnet.mem.size.heap", "megabytes", "Total number of bytes across all heaps"); AddGaugeCallback("loh-size", "dotnet.mem.size.loh", "bytes", "Total number of bytes in the LOH"); AddCounterCallback("alloc-rate", "dotnet.mem.allocation_rate", "bytes/sec", "Allocation Rate (Bytes / sec)"); From 7697ab327b942f5e97dc830e2a91af59b77317a8 Mon Sep 17 00:00:00 2001 From: Soheil Alizadeh Date: Mon, 13 Dec 2021 11:23:47 +0100 Subject: [PATCH 3/3] Revert "Use correct runtime units" This reverts commit e8fb26964ed599b9a6d7fb1e9af5cb2d9328f669. --- src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs b/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs index f27bb90..8ccde2c 100644 --- a/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs +++ b/src/StackExchange.Metrics/Metrics/RuntimeMetricSource.cs @@ -58,7 +58,7 @@ void AddGaugeCallback(string eventName, string name, string unit, string descrip } AddGaugeCallback("cpu-usage", "dotnet.cpu.usage", "percent", "% CPU usage"); - AddGaugeCallback("working-set", "dotnet.mem.working_set", "megabytes", "Working set for the process"); + AddGaugeCallback("working-set", "dotnet.mem.working_set", "bytes", "Working set for the process"); // GC AddCounterCallback("gen-0-gc-count", "dotnet.mem.collections.gen0", "collections", "Number of gen-0 collections"); @@ -67,7 +67,7 @@ void AddGaugeCallback(string eventName, string name, string unit, string descrip AddGaugeCallback("gen-0-size", "dotnet.mem.size.gen0", "bytes", "Total number of bytes in gen-0"); AddGaugeCallback("gen-1-size", "dotnet.mem.size.gen1", "bytes", "Total number of bytes in gen-1"); AddGaugeCallback("gen-2-size", "dotnet.mem.size.gen2", "bytes", "Total number of bytes in gen-2"); - AddGaugeCallback("gc-heap-size", "dotnet.mem.size.heap", "megabytes", "Total number of bytes across all heaps"); + AddGaugeCallback("gc-heap-size", "dotnet.mem.size.heap", "bytes", "Total number of bytes across all heaps"); AddGaugeCallback("loh-size", "dotnet.mem.size.loh", "bytes", "Total number of bytes in the LOH"); AddCounterCallback("alloc-rate", "dotnet.mem.allocation_rate", "bytes/sec", "Allocation Rate (Bytes / sec)");