lower metrics interval to 2s; update cpuPct field to cpuUsedPct

packages/api/internal/handlers/sanbox_metrics.go

@@ -65,7 +65,7 @@ func (a *APIStore) GetSandboxesSandboxIDMetrics(
 			for _, entry := range stream.Entries {
 
 				var metric struct {
-					CPUPct      float32 `json:"cpuPct"`
+					CPUUsedPct  float32 `json:"cpuUsedPct"`
 					CPUCount    int32   `json:"cpuCount"`
 					MemTotalMiB int64   `json:"memTotalMiB"`
 					MemUsedMiB  int64   `json:"memUsedMiB"`
@@ -78,7 +78,7 @@ func (a *APIStore) GetSandboxesSandboxIDMetrics(
 				}
 				metrics = append(metrics, api.SandboxMetric{
 					Timestamp:   entry.Timestamp,
-					CpuPct:      metric.CPUPct,
+					CpuUsedPct:  metric.CPUUsedPct,
 					CpuCount:    metric.CPUCount,
 					MemTotalMiB: metric.MemTotalMiB,
 					MemUsedMiB:  metric.MemUsedMiB,

packages/envd/internal/host/metrics.go

@@ -9,11 +9,11 @@ import (
 )
 
 type Metrics struct {
-	Timestamp   int64   `json:"ts"`            // Unix Timestamp in UTC
-	CPUCount    uint32  `json:"cpu_count"`     // Total CPU cores
-	CPUPercent  float32 `json:"cpu_pct"`       // Percent rounded to 2 decimal places
-	MemTotalMiB uint64  `json:"mem_total_mib"` // Total virtual memory in MiB
-	MemUsedMiB  uint64  `json:"mem_used_mib"`  // Used virtual memory in MiB
+	Timestamp      int64   `json:"ts"`            // Unix Timestamp in UTC
+	CPUCount       uint32  `json:"cpu_count"`     // Total CPU cores
+	CPUUsedPercent float32 `json:"cpu_used_pct"`  // Percent rounded to 2 decimal places
+	MemTotalMiB    uint64  `json:"mem_total_mib"` // Total virtual memory in MiB
+	MemUsedMiB     uint64  `json:"mem_used_mib"`  // Used virtual memory in MiB
 }
 
 func GetMetrics() (*Metrics, error) {
@@ -30,22 +30,22 @@ func GetMetrics() (*Metrics, error) {
 		return nil, err
 	}
 
-	cpuPcts, err := cpu.Percent(0, false)
+	cpuUsedPcts, err := cpu.Percent(0, false)
 	if err != nil {
 		return nil, err
 	}
 
-	cpuPct := cpuPcts[0]
-	cpuPctRounded := float32(cpuPct)
-	if cpuPct > 0 {
-		cpuPctRounded = float32(math.Round(cpuPct*100) / 100)
+	cpuUsedPct := cpuUsedPcts[0]
+	cpuUsedPctRounded := float32(cpuUsedPct)
+	if cpuUsedPct > 0 {
+		cpuUsedPctRounded = float32(math.Round(cpuUsedPct*100) / 100)
 	}
 
 	return &Metrics{
-		Timestamp:   time.Now().UTC().Unix(),
-		CPUCount:    uint32(cpuTotal),
-		CPUPercent:  cpuPctRounded,
-		MemUsedMiB:  memUsedMiB,
-		MemTotalMiB: memTotalMiB,
+		Timestamp:      time.Now().UTC().Unix(),
+		CPUCount:       uint32(cpuTotal),
+		CPUUsedPercent: cpuUsedPctRounded,
+		MemUsedMiB:     memUsedMiB,
+		MemTotalMiB:    memTotalMiB,
 	}, nil
 }

packages/envd/spec/envd.yaml

@@ -207,7 +207,7 @@ components:
       type: object
       description: Resource usage metrics
       properties:
-        cpu_pct:
+        cpu_used_pct:
           type: number
           format: float
           description: CPU usage percentage

packages/orchestrator/internal/sandbox/checks.go

@@ -15,7 +15,7 @@ import (
 
 const (
 	healthCheckInterval      = 10 * time.Second
-	metricsCheckInterval     = 5 * time.Second
+	metricsCheckInterval     = 2 * time.Second
 	minEnvdVersionForMetrcis = "0.1.5"
 )
 

packages/orchestrator/internal/sandbox/metrics.go

@@ -1,9 +1,9 @@
 package sandbox
 
 type SandboxMetrics struct {
-	Timestamp   int64   `json:"ts"`            // Unix Timestamp in UTC
-	CPUCount    uint32  `json:"cpu_count"`     // Total CPU cores
-	CPUPercent  float32 `json:"cpu_pct"`       // Percent rounded to 2 decimal places
-	MemTotalMiB uint64  `json:"mem_total_mib"` // Total virtual memory in MiB
-	MemUsedMiB  uint64  `json:"mem_used_mib"`  // Used virtual memory in MiB
+	Timestamp      int64   `json:"ts"`            // Unix Timestamp in UTC
+	CPUCount       uint32  `json:"cpu_count"`     // Total CPU cores
+	CPUUsedPercent float32 `json:"cpu_used_pct"`  // Percent rounded to 2 decimal places
+	MemTotalMiB    uint64  `json:"mem_total_mib"` // Total virtual memory in MiB
+	MemUsedMiB     uint64  `json:"mem_used_mib"`  // Used virtual memory in MiB
 }

packages/shared/pkg/logs/logger.go

@@ -182,13 +182,13 @@ func (l *SandboxLogger) MemoryUsage(memoryMiB float64) {
 	}
 }
 
-func (l *SandboxLogger) Metrics(memTotalMiB, memUsedMiB uint64, cpuCount uint32, cpuPct float32) {
+func (l *SandboxLogger) Metrics(memTotalMiB, memUsedMiB uint64, cpuCount uint32, cpuUsedPct float32) {
 	l.exporter.logger.Info().
 		Str("category", "metrics").
 		Str("instanceID", l.instanceID).
 		Str("envID", l.envID).
 		Str("teamID", l.teamID).
-		Float32("cpuPct", cpuPct).
+		Float32("cpuUsedPct", cpuUsedPct).
 		Uint32("cpuCount", cpuCount).
 		Uint64("memTotalMiB", memTotalMiB).
 		Uint64("memUsedMiB", memUsedMiB).

spec/openapi.yml

@@ -172,7 +172,7 @@ components:
       required:
         - timestamp
         - cpuCount
-        - cpuPct
+        - cpuUsedPct
         - memUsedMiB
         - memTotalMiB
       properties:
@@ -184,7 +184,7 @@ components:
           type: integer
           format: int32
           description: Number of CPU cores
-        cpuPct:
+        cpuUsedPct:
           type: number
           format: float
           description: CPU usage percentage