Merge pull request #2150 from vimalk78/fix-node-name

fix(exporter): move WithNodeName option to collector

Author: sthaha

cmd/kepler/main.go

@@ -197,6 +197,7 @@ func createPrometheusExporter(logger *slog.Logger, cfg *config.Config, apiServer
 		pm,
 		prometheus.WithLogger(logger),
 		prometheus.WithProcFSPath(cfg.Host.ProcFS),
+		prometheus.WithNodeName(cfg.Kube.Node),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create Prometheus collectors: %w", err)
@@ -210,7 +211,6 @@ func createPrometheusExporter(logger *slog.Logger, cfg *config.Config, apiServer
 		prometheus.WithLogger(logger),
 		prometheus.WithCollectors(collectors),
 		prometheus.WithDebugCollectors(debugCollectors),
-		prometheus.WithNodeName(cfg.Kube.Node),
 	)
 
 	return promExporter, nil

internal/exporter/prometheus/collector/power_collector_test.go

@@ -151,13 +151,27 @@ func TestPowerCollector(t *testing.T) {
 		},
 	}
 
+	testPods := monitor.Pods{
+		"test-pod": {
+			Name:      "test-pod",
+			Namespace: "default",
+			Zones: monitor.ZoneUsageMap{
+				packageZone: {
+					EnergyTotal: 100 * device.Joule,
+					Power:       5 * device.Watt,
+				},
+			},
+		},
+	}
+
 	// Create test Snapshot
 	testData := &monitor.Snapshot{
 		Timestamp:       time.Now(),
 		Node:            &testNodeData,
 		Processes:       testProcesses,
 		Containers:      testContainers,
 		VirtualMachines: testVMs,
+		Pods:            testPods,
 	}
 
 	// Mock Snapshot method
@@ -200,6 +214,9 @@ func TestPowerCollector(t *testing.T) {
 
 			"kepler_vm_cpu_joules_total",
 			"kepler_vm_cpu_watts",
+
+			"kepler_pod_cpu_joules_total",
+			"kepler_pod_cpu_watts",
 		}
 
 		assert.ElementsMatch(t, expectedMetricNames, metricNames(metrics))
@@ -309,6 +326,86 @@ func TestPowerCollector(t *testing.T) {
 		})
 	})
 
+	t.Run("Process Metrics Node Name Label", func(t *testing.T) {
+		metrics, err := registry.Gather()
+		assert.NoError(t, err)
+
+		for _, metric := range metrics {
+			if metric.GetName() == "kepler_process_cpu_joules_total" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Process metrics should have node_name label")
+				}
+			}
+			if metric.GetName() == "kepler_process_cpu_watts" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Process metrics should have node_name label")
+				}
+			}
+		}
+	})
+
+	t.Run("Container Metrics Node Name Label", func(t *testing.T) {
+		metrics, err := registry.Gather()
+		assert.NoError(t, err)
+
+		for _, metric := range metrics {
+			if metric.GetName() == "kepler_container_cpu_joules_total" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Container metrics should have node_name label")
+				}
+			}
+			if metric.GetName() == "kepler_container_cpu_watts" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Container metrics should have node_name label")
+				}
+			}
+		}
+	})
+
+	t.Run("VM Metrics Node Name Label", func(t *testing.T) {
+		metrics, err := registry.Gather()
+		assert.NoError(t, err)
+
+		for _, metric := range metrics {
+			if metric.GetName() == "kepler_vm_cpu_joules_total" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "VM metrics should have node_name label")
+				}
+			}
+			if metric.GetName() == "kepler_vm_cpu_watts" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "VM metrics should have node_name label")
+				}
+			}
+		}
+	})
+
+	t.Run("Pod Metrics Node Name Label", func(t *testing.T) {
+		metrics, err := registry.Gather()
+		assert.NoError(t, err)
+
+		for _, metric := range metrics {
+			if metric.GetName() == "kepler_pod_cpu_joules_total" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Pod metrics should have node_name label")
+				}
+			}
+			if metric.GetName() == "kepler_pod_cpu_watts" {
+				for _, m := range metric.GetMetric() {
+					nodeName := valueOfLabel(m, "node_name")
+					assert.Equal(t, "test-node", nodeName, "Pod metrics should have node_name label")
+				}
+			}
+		}
+	})
+
 	// Verify mock expectations
 	mockMonitor.AssertExpectations(t)
 }

internal/resource/procfs_reader_test.go

@@ -466,7 +466,6 @@ func TestRefresh_PodInformer(t *testing.T) {
 		mockProc.On("Comm").Return("test-process", nil)
 		mockProc.On("CmdLine").Return([]string{"/usr/bin/test", "--arg1"}, nil).Once()
 		mockProc.On("Executable").Return("/usr/bin/test", nil)
-		containerID := "container123"
 		containerID, cgPath := mockContainerIDAndPath(DockerRuntime)
 		mockProc.On("Cgroups").Return([]cGroup{{Path: cgPath}}, nil)
 		mockProc.On("CPUTime").Return(10.0, nil).Once()