[sbserver] handle missing cpu stats

mxpv · mxpv · commit 79cb4b00008d · 2023-04-07T15:59:40.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/pkg/cri/sbserver/container_stats_list.go b/pkg/cri/sbserver/container_stats_list.go
@@ -64,12 +64,14 @@ func (c *criService) toCRIContainerStats(
 			return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)
 		}
 
-		// this is a calculated value and should be computed for all OSes
-		nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp))
-		if err != nil {
-			return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err)
+		if cs.Cpu != nil && cs.Cpu.UsageCoreNanoSeconds != nil {
+			// this is a calculated value and should be computed for all OSes
+			nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp))
+			if err != nil {
+				return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err)
+			}
+			cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}
 		}
-		cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}
 
 		containerStats.Stats = append(containerStats.Stats, cs)
 	}

Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,14 @@ func (c *criService) toCRIContainerStats(`
`64`	`64`	`return nil, fmt.Errorf("failed to decode container metrics for %q: %w", cntr.ID, err)`
`65`	`65`	`}`
`66`	`66`
`67`		`- // this is a calculated value and should be computed for all OSes`
`68`		`- nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp))`
`69`		`- if err != nil {`
`70`		`- return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err)`
	`67`	`+ if cs.Cpu != nil && cs.Cpu.UsageCoreNanoSeconds != nil {`
	`68`	`+ // this is a calculated value and should be computed for all OSes`
	`69`	`+ nanoUsage, err := c.getUsageNanoCores(cntr.Metadata.ID, false, cs.Cpu.UsageCoreNanoSeconds.Value, time.Unix(0, cs.Cpu.Timestamp))`
	`70`	`+ if err != nil {`
	`71`	`+ return nil, fmt.Errorf("failed to get usage nano cores, containerID: %s: %w", cntr.Metadata.ID, err)`
	`72`	`+ }`
	`73`	`+ cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}`
`71`	`74`	`}`
`72`		`- cs.Cpu.UsageNanoCores = &runtime.UInt64Value{Value: nanoUsage}`
`73`	`75`
`74`	`76`	`containerStats.Stats = append(containerStats.Stats, cs)`
`75`	`77`	`}`