Split system memory and linux hugepage memory state enum, added used pages metric as percentage and total number

Author: sitole

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/documentation.md

@@ -24,7 +24,7 @@ Bytes of memory in use.
 
 | Name | Description | Values | Requirement Level |
 | ---- | ----------- | ------ | -------- |
-| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used``, ``reserved``, ``surplus`` | Recommended |
+| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used`` | Recommended |
 
 ## Optional Metrics
 
@@ -88,7 +88,7 @@ Number of huge pages in use by state.
 
 | Name | Description | Values | Requirement Level |
 | ---- | ----------- | ------ | -------- |
-| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used``, ``reserved``, ``surplus`` | Recommended |
+| system.memory.linux.hugepages.state | Breakdown of huge pages usage by state. | Str: ``free``, ``used``, ``reserved``, ``surplus`` | Recommended |
 
 ### system.memory.linux.hugepages.utilization
 
@@ -102,7 +102,7 @@ Percentage of huge pages in use by state.
 
 | Name | Description | Values | Requirement Level |
 | ---- | ----------- | ------ | -------- |
-| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used``, ``reserved``, ``surplus`` | Recommended |
+| system.memory.linux.hugepages.state | Breakdown of huge pages usage by state. | Str: ``free``, ``used``, ``reserved``, ``surplus`` | Recommended |
 
 ### system.memory.page_size
 
@@ -124,4 +124,4 @@ Percentage of memory bytes in use.
 
 | Name | Description | Values | Requirement Level |
 | ---- | ----------- | ------ | -------- |
-| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used``, ``reserved``, ``surplus`` | Recommended |
+| state | Breakdown of memory usage by type. | Str: ``buffered``, ``cached``, ``inactive``, ``free``, ``slab_reclaimable``, ``slab_unreclaimable``, ``used`` | Recommended |

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go

@@ -70,16 +70,21 @@ func (s *memoryScraper) recordLinuxHugePagesMetrics(now pcommon.Timestamp, memIn
 	// Record limit (total huge pages available) in number of pages
 	s.mb.RecordSystemMemoryLinuxHugepagesLimitDataPoint(now, int64(memInfo.HugePagesTotal))
 
+	// Calculate used pages
+	hugePagesUsed := int64(memInfo.HugePagesTotal - memInfo.HugePagesFree)
+
 	// Record usage with state attributes in number of pages
-	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesFree), metadata.AttributeStateFree)
-	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesRsvd), metadata.AttributeStateReserved)
-	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesSurp), metadata.AttributeStateSurplus)
+	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesFree), metadata.AttributeSystemMemoryLinuxHugepagesStateFree)
+	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, hugePagesUsed, metadata.AttributeSystemMemoryLinuxHugepagesStateUsed)
+	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesRsvd), metadata.AttributeSystemMemoryLinuxHugepagesStateReserved)
+	s.mb.RecordSystemMemoryLinuxHugepagesUsageDataPoint(now, int64(memInfo.HugePagesSurp), metadata.AttributeSystemMemoryLinuxHugepagesStateSurplus)
 
 	// Record utilization with state attributes as percentage
 	if memInfo.HugePagesTotal != 0 {
-		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesFree)/float64(memInfo.HugePagesTotal), metadata.AttributeStateFree)
-		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesRsvd)/float64(memInfo.HugePagesTotal), metadata.AttributeStateReserved)
-		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesSurp)/float64(memInfo.HugePagesTotal), metadata.AttributeStateSurplus)
+		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesFree)/float64(memInfo.HugePagesTotal), metadata.AttributeSystemMemoryLinuxHugepagesStateFree)
+		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(hugePagesUsed)/float64(memInfo.HugePagesTotal), metadata.AttributeSystemMemoryLinuxHugepagesStateUsed)
+		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesRsvd)/float64(memInfo.HugePagesTotal), metadata.AttributeSystemMemoryLinuxHugepagesStateReserved)
+		s.mb.RecordSystemMemoryLinuxHugepagesUtilizationDataPoint(now, float64(memInfo.HugePagesSurp)/float64(memInfo.HugePagesTotal), metadata.AttributeSystemMemoryLinuxHugepagesStateSurplus)
 	}
 }
 

receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics_test.go

@@ -23,9 +23,11 @@ attributes:
         slab_reclaimable,
         slab_unreclaimable,
         used,
-        reserved,
-        surplus,
       ]
+  system.memory.linux.hugepages.state:
+    description: Breakdown of huge pages usage by state.
+    type: string
+    enum: [free, used, reserved, surplus]
 
 metrics:
   system.linux.memory.available:
@@ -93,7 +95,7 @@ metrics:
       value_type: int
       aggregation_temporality: cumulative
       monotonic: false
-    attributes: [state]
+    attributes: [system.memory.linux.hugepages.state]
 
   system.memory.linux.hugepages.utilization:
     enabled: false
@@ -103,7 +105,7 @@ metrics:
       level: development
     gauge:
       value_type: double
-    attributes: [state]
+    attributes: [system.memory.linux.hugepages.state]
 
   system.memory.page_size:
     enabled: false