Merge pull request #1702 from maryamtahhan/cleanup-node-globals

Cleanup stats pkg globals

cmd/exporter/exporter.go

@@ -31,7 +31,6 @@ import (
 
 	"github.com/sustainable-computing-io/kepler/pkg/bpf"
 	"github.com/sustainable-computing-io/kepler/pkg/build"
-	"github.com/sustainable-computing-io/kepler/pkg/collector/stats"
 	"github.com/sustainable-computing-io/kepler/pkg/config"
 	"github.com/sustainable-computing-io/kepler/pkg/manager"
 	"github.com/sustainable-computing-io/kepler/pkg/metrics"
@@ -147,8 +146,6 @@ func main() {
 	platform.InitPowerImpl()
 	defer platform.StopPower()
 
-	stats.InitAvailableParamAndMetrics()
-
 	if config.EnabledGPU() {
 		r := accelerator.GetRegistry()
 		if a, err := accelerator.New(accelerator.GPU, true); err == nil {

pkg/collector/metric_collector.go

@@ -79,8 +79,6 @@ func (c *Collector) Initialize() error {
 	// model component decide whether/how to init
 	model.CreatePowerEstimatorModels(
 		stats.GetProcessFeatureNames(c.bpfSupportedMetrics),
-		stats.NodeMetadataFeatureNames(),
-		stats.NodeMetadataFeatureValues(),
 		c.bpfSupportedMetrics,
 	)
 

pkg/collector/metric_collector_test.go

@@ -45,7 +45,7 @@ var _ = Describe("Test Collector Unit", func() {
 		metricCollector := newMockCollector(bpfExporter)
 		// The default estimator model is the ratio
 		bpfSupportedMetrics := bpfExporter.SupportedMetrics()
-		model.CreatePowerEstimatorModels(stats.GetProcessFeatureNames(bpfSupportedMetrics), stats.NodeMetadataFeatureNames(), stats.NodeMetadataFeatureValues(), bpfSupportedMetrics)
+		model.CreatePowerEstimatorModels(stats.GetProcessFeatureNames(bpfSupportedMetrics), bpfSupportedMetrics)
 		// update container and node metrics
 		metricCollector.UpdateProcessEnergyUtilizationMetrics()
 		metricCollector.AggregateProcessEnergyUtilizationMetrics()

pkg/collector/stats/benchmark_test.go

@@ -39,7 +39,7 @@ func benchmarkNtesting(b *testing.B, processNumber int) {
 
 	// The default estimator model is the ratio
 	bpfSupportedMetrics := bpf.DefaultSupportedMetrics()
-	model.CreatePowerEstimatorModels(stats.GetProcessFeatureNames(bpfSupportedMetrics), stats.NodeMetadataFeatureNames(), stats.NodeMetadataFeatureValues(), bpfSupportedMetrics)
+	model.CreatePowerEstimatorModels(stats.GetProcessFeatureNames(bpfSupportedMetrics), bpfSupportedMetrics)
 
 	// update container and node metrics
 	b.ReportAllocs()

pkg/collector/stats/node_stats.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2021.
+Copyright 2021-2024.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import (
 
 	"github.com/sustainable-computing-io/kepler/pkg/bpf"
 	"github.com/sustainable-computing-io/kepler/pkg/config"
+	"github.com/sustainable-computing-io/kepler/pkg/node"
 	acc "github.com/sustainable-computing-io/kepler/pkg/sensors/accelerator"
 	"github.com/sustainable-computing-io/kepler/pkg/utils"
 )
@@ -30,32 +31,16 @@ type NodeStats struct {
 
 	// IdleResUtilization is used to determine idle pmap[string]eriods
 	IdleResUtilization map[string]uint64
-}
-
-// NodeCPUArchitecture returns the CPU architecture
-func NodeCPUArchitecture() string {
-	return getCPUArch()
-}
-
-// NodeCPUPackageMap returns the CPU package map
-func NodeCPUPackageMap() map[int32]string {
-	return getCPUPackageMap()
-}
-
-// NodeMetadataFeatureNames returns the feature names for metadata
-func NodeMetadataFeatureNames() []string {
-	return []string{"cpu_architecture"}
-}
 
-// NodeMetadataFeatureValues returns the feature values for metadata
-func NodeMetadataFeatureValues() []string {
-	return []string{NodeCPUArchitecture()}
+	// nodeInfo allows access to node information
+	nodeInfo node.Node
 }
 
 func NewNodeStats(bpfSupportedMetrics bpf.SupportedMetrics) *NodeStats {
 	return &NodeStats{
 		Stats:              *NewStats(bpfSupportedMetrics),
 		IdleResUtilization: map[string]uint64{},
+		nodeInfo:           node.NewNodeInfo(),
 	}
 }
 
@@ -151,3 +136,19 @@ func (ne *NodeStats) String() string {
 		"%v\n", ne.Stats.String(),
 	)
 }
+
+func (ne *NodeStats) MetadataFeatureNames() []string {
+	return ne.nodeInfo.MetadataFeatureNames()
+}
+
+func (ne *NodeStats) MetadataFeatureValues() []string {
+	return ne.nodeInfo.MetadataFeatureValues()
+}
+
+func (ne *NodeStats) CPUArchitecture() string {
+	return ne.nodeInfo.CPUArchitecture()
+}
+
+func (ne *NodeStats) NodeName() string {
+	return ne.nodeInfo.Name()
+}