Merge pull request #2143 from sthaha/chore-improve-clone

fix(monitor): use value-based maps to fix Clone() shallow copy bug

Author: vimalk78

internal/exporter/prometheus/collector/power_collector_concurrency_test.go

@@ -122,23 +122,23 @@ func TestPowerCollectorWithRegistry(t *testing.T) {
 		Timestamp:  time.Now(),
 		UsageRatio: 0.5,
 		Zones: monitor.NodeZoneUsageMap{
-			package0Zone: &monitor.NodeUsage{
+			package0Zone: monitor.NodeUsage{
 				EnergyTotal:       nodePkgAbs,
 				ActiveEnergyTotal: nodePkgDelta / 2,
 				IdleEnergyTotal:   nodePkgDelta / 2,
 				Power:             nodePkgPower,
 				ActivePower:       nodePkgPower / 2,
 				IdlePower:         nodePkgPower / 2,
 			},
-			dramZone: &monitor.NodeUsage{
+			dramZone: monitor.NodeUsage{
 				EnergyTotal:       nodeDramAbs,
 				ActiveEnergyTotal: nodeDramDelta / 2,
 				IdleEnergyTotal:   nodeDramDelta / 2,
 				Power:             nodeDramPower,
 				ActivePower:       nodeDramPower / 2,
 				IdlePower:         nodeDramPower / 2,
 			},
-			package1Zone: &monitor.NodeUsage{
+			package1Zone: monitor.NodeUsage{
 				EnergyTotal:       nodePkgAbs,
 				ActiveEnergyTotal: nodePkgDelta / 2,
 				IdleEnergyTotal:   nodePkgDelta / 2,
@@ -248,7 +248,7 @@ func TestUpdateDuringCollection(t *testing.T) {
 				Timestamp:  time.Now(),
 				UsageRatio: 0.5,
 				Zones: monitor.NodeZoneUsageMap{
-					packageZone: &monitor.NodeUsage{
+					packageZone: monitor.NodeUsage{
 						EnergyTotal:       100 * device.Joule,
 						ActiveEnergyTotal: 5 * device.Joule,
 						IdleEnergyTotal:   5 * device.Joule,

internal/exporter/prometheus/collector/power_collector_test.go

@@ -88,15 +88,15 @@ func TestPowerCollector(t *testing.T) {
 		Timestamp:  time.Now(),
 		UsageRatio: 0.5,
 		Zones: monitor.NodeZoneUsageMap{
-			packageZone: &monitor.NodeUsage{
+			packageZone: monitor.NodeUsage{
 				EnergyTotal:       nodePkgAbs,
 				ActiveEnergyTotal: nodePkgDelta / 2, // 50% of delta is used
 				IdleEnergyTotal:   nodePkgDelta / 2, // 50% of delta is idle
 				Power:             nodePkgPower,
 				ActivePower:       nodePkgPower / 2, // 50% of power is used
 				IdlePower:         nodePkgPower / 2, // 50% of power is idle
 			},
-			dramZone: &monitor.NodeUsage{
+			dramZone: monitor.NodeUsage{
 				EnergyTotal:       nodeDramAbs,
 				ActiveEnergyTotal: nodeDramDelta / 2, // 50% of delta is used
 				IdleEnergyTotal:   nodeDramDelta / 2, // 50% of delta is idle

internal/exporter/stdout/stdout_test.go

@@ -164,11 +164,11 @@ func getTestNodeData() *monitor.Node {
 	// Create test node Snapshot
 	return &monitor.Node{
 		Zones: monitor.NodeZoneUsageMap{
-			packageZone: &monitor.NodeUsage{
+			packageZone: monitor.NodeUsage{
 				EnergyTotal: nodePkgAbs,
 				Power:       nodePkgPower,
 			},
-			dramZone: &monitor.NodeUsage{
+			dramZone: monitor.NodeUsage{
 				EnergyTotal: nodeDramAbs,
 				Power:       nodeDramPower,
 			},