Update test

amazon-contributing · Aug 14, 2024 · bab8231 · bab8231
1 parent 9c631d4
commit bab8231
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/receiver/awscontainerinsightreceiver/internal/stores/nodeinfo_test.go b/receiver/awscontainerinsightreceiver/internal/stores/nodeinfo_test.go
@@ -103,9 +103,9 @@ func TestGetNodeStatusCapacityGPUs(t *testing.T) {
 	assert.True(t, valid)
 	assert.Equal(t, uint64(20), nodeStatusCapacityGPUs)
 
-	nodeInfo = newNodeInfo("testNodeNonExistent", &mockNodeInfoProvider{}, zap.NewNop())
-	nodeStatusCapacityGPUs, valid = nodeInfo.getNodeStatusAllocatablePods()
-	assert.False(t, valid)
+	nodeInfo = newNodeInfo("testNode2", &mockNodeInfoProvider{}, zap.NewNop())
+	nodeStatusCapacityGPUs, valid = nodeInfo.getNodeStatusCapacityGPUs()
+	assert.True(t, valid)
 	assert.Equal(t, uint64(0), nodeStatusCapacityGPUs)
 }
 

diff --git a/receiver/awscontainerinsightreceiver/internal/stores/podstore.go b/receiver/awscontainerinsightreceiver/internal/stores/podstore.go
@@ -414,11 +414,9 @@ func (p *PodStore) decorateGPU(metric CIMetric, pod *corev1.Pod) {
 	if p.includeEnhancedMetrics && p.enableAcceleratedComputeMetrics && metric.GetTag(ci.MetricType) == ci.TypePod &&
 		pod.Status.Phase != corev1.PodSucceeded && pod.Status.Phase != corev1.PodFailed {
 
-		if podGpuRequest, ok := getResourceSettingForPod(pod, 0, gpuKey, getRequestForContainer); ok {
-			metric.AddField(ci.MetricName(ci.TypePod, ci.GpuRequest), podGpuRequest)
-		}
-
 		if podGpuLimit, ok := getResourceSettingForPod(pod, 0, gpuKey, getLimitForContainer); ok {
+			podGpuRequest, _ := getResourceSettingForPod(pod, 0, gpuKey, getRequestForContainer)
+			metric.AddField(ci.MetricName(ci.TypePod, ci.GpuRequest), podGpuRequest)
 			metric.AddField(ci.MetricName(ci.TypePod, ci.GpuLimit), podGpuLimit)
 			var podGpuUsageTotal uint64
 			if pod.Status.Phase == corev1.PodRunning { // Set the GPU limit as the usage_total for running pods only

diff --git a/receiver/awscontainerinsightreceiver/internal/stores/utils_test.go b/receiver/awscontainerinsightreceiver/internal/stores/utils_test.go
@@ -70,8 +70,7 @@ func (m *mockNodeInfoProvider) NodeToCapacityMap() map[string]v1.ResourceList {
 			"nvidia.com/gpu": *resource.NewQuantity(20, resource.DecimalExponent),
 		},
 		"testNode2": {
-			"pods":           *resource.NewQuantity(10, resource.DecimalSI),
-			"nvidia.com/gpu": *resource.NewQuantity(30, resource.DecimalExponent),
+			"pods": *resource.NewQuantity(10, resource.DecimalSI),
 		},
 	}
 }
@@ -83,8 +82,7 @@ func (m *mockNodeInfoProvider) NodeToAllocatableMap() map[string]v1.ResourceList
 			"nvidia.com/gpu": *resource.NewQuantity(20, resource.DecimalExponent),
 		},
 		"testNode2": {
-			"pods":           *resource.NewQuantity(20, resource.DecimalSI),
-			"nvidia.com/gpu": *resource.NewQuantity(30, resource.DecimalExponent),
+			"pods": *resource.NewQuantity(20, resource.DecimalSI),
 		},
 	}
 }