From 3d7e1cfc5a5fb3a1e02851387000a4cb57352bfd Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 17 Jul 2025 15:06:30 +0800 Subject: [PATCH 1/2] Fix memory pool metrics unit to follow standard --- .../Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs index 213fe3e84218..4a2d030141da 100644 --- a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs +++ b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs @@ -23,22 +23,22 @@ public PinnedBlockMemoryPoolMetrics(IMeterFactory meterFactory) _currentMemory = _meter.CreateUpDownCounter( "aspnetcore.memorypool.current_memory", - unit: "{bytes}", + unit: "By", description: "Number of bytes that are currently pooled by the pool."); _totalAllocatedMemory = _meter.CreateCounter( "aspnetcore.memorypool.total_allocated", - unit: "{bytes}", + unit: "By", description: "Total number of allocations made by the pool."); _evictedMemory = _meter.CreateCounter( "aspnetcore.memorypool.evicted_memory", - unit: "{bytes}", + unit: "By", description: "Total number of bytes that have been evicted."); _totalRented = _meter.CreateCounter( "aspnetcore.memorypool.total_rented", - unit: "{bytes}", + unit: "By", description: "Total number of rented bytes from the pool."); } From 9653cbcc8486cac46fb4aac76dbac2e64117ac2d Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Thu, 17 Jul 2025 15:55:31 +0800 Subject: [PATCH 2/2] Rename counters --- .../Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs | 10 +++++----- .../Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs index f35fd05c36ef..1f8d0edebe39 100644 --- a/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs +++ b/src/Servers/Kestrel/Core/test/PinnedBlockMemoryPoolTests.cs @@ -231,7 +231,7 @@ public async Task EvictionsAreScheduled() public void CurrentMemoryMetricTracksPooledMemory() { var testMeterFactory = new TestMeterFactory(); - using var currentMemoryMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memorypool.current_memory"); + using var currentMemoryMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memory_pool.current_memory"); var pool = new PinnedBlockMemoryPool(testMeterFactory); @@ -267,7 +267,7 @@ public void CurrentMemoryMetricTracksPooledMemory() public void TotalAllocatedMetricTracksAllocatedMemory() { var testMeterFactory = new TestMeterFactory(); - using var totalMemoryMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memorypool.total_allocated"); + using var totalMemoryMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memory_pool.total_allocated"); var pool = new PinnedBlockMemoryPool(testMeterFactory); @@ -290,7 +290,7 @@ public void TotalAllocatedMetricTracksAllocatedMemory() public void TotalRentedMetricTracksRentOperations() { var testMeterFactory = new TestMeterFactory(); - using var rentMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memorypool.total_rented"); + using var rentMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memory_pool.total_rented"); var pool = new PinnedBlockMemoryPool(testMeterFactory); @@ -315,7 +315,7 @@ public void TotalRentedMetricTracksRentOperations() public void EvictedMemoryMetricTracksEvictedMemory() { var testMeterFactory = new TestMeterFactory(); - using var evictMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memorypool.evicted_memory"); + using var evictMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memory_pool.evicted_memory"); var pool = new PinnedBlockMemoryPool(testMeterFactory); @@ -352,7 +352,7 @@ public void EvictedMemoryMetricTracksEvictedMemory() public void MetricsAreAggregatedAcrossPoolsWithSameMeterFactory() { var testMeterFactory = new TestMeterFactory(); - using var rentMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memorypool.total_rented"); + using var rentMetric = new MetricCollector(testMeterFactory, "Microsoft.AspNetCore.MemoryPool", "aspnetcore.memory_pool.total_rented"); var pool1 = new PinnedBlockMemoryPool(testMeterFactory); var pool2 = new PinnedBlockMemoryPool(testMeterFactory); diff --git a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs index 4a2d030141da..0211f2bc610c 100644 --- a/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs +++ b/src/Shared/Buffers.MemoryPool/PinnedBlockMemoryPoolMetrics.cs @@ -22,22 +22,22 @@ public PinnedBlockMemoryPoolMetrics(IMeterFactory meterFactory) _meter = meterFactory.Create(MeterName); _currentMemory = _meter.CreateUpDownCounter( - "aspnetcore.memorypool.current_memory", + "aspnetcore.memory_pool.current_memory", unit: "By", description: "Number of bytes that are currently pooled by the pool."); _totalAllocatedMemory = _meter.CreateCounter( - "aspnetcore.memorypool.total_allocated", + "aspnetcore.memory_pool.total_allocated", unit: "By", description: "Total number of allocations made by the pool."); _evictedMemory = _meter.CreateCounter( - "aspnetcore.memorypool.evicted_memory", + "aspnetcore.memory_pool.evicted_memory", unit: "By", description: "Total number of bytes that have been evicted."); _totalRented = _meter.CreateCounter( - "aspnetcore.memorypool.total_rented", + "aspnetcore.memory_pool.total_rented", unit: "By", description: "Total number of rented bytes from the pool."); }