Merge pull request #12 from swiftwave-org/fix_7

feat: instead of cpu percentage send cpu time

Author: tanmoysrt

service/helpers.go

@@ -6,16 +6,6 @@ import (
 	"github.com/docker/docker/api/types"
 )
 
-func calculateCPUPercentUnix(v *types.StatsJSON) uint8 {
-	/*
-		cpu_delta = cpu_stats.cpu_usage.total_usage - precpu_stats.cpu_usage.total_usage
-		system_cpu_delta = cpu_stats.system_cpu_usage - precpu_stats.system_cpu_usage
-		CPU usage % = (cpu_delta / system_cpu_delta) * 100.0
-	*/
-	cpuDelta := float64(v.CPUStats.CPUUsage.TotalUsage) - float64(v.PreCPUStats.CPUUsage.TotalUsage)
-	systemDelta := float64(v.CPUStats.SystemUsage) - float64(v.PreCPUStats.SystemUsage)
-	return uint8(math.Round((cpuDelta / systemDelta) * 100.0))
-}
 
 func memoryUsageMB(v *types.StatsJSON) uint64 {
 	// used_memory = memory_stats.usage - memory_stats.stats.cache

service/types.go

@@ -1,9 +1,10 @@
 package service
 
 type ResourceStats struct {
-	CpuUsagePercent uint8   `json:"cpu_used_percent"`
-	UsedMemoryMB    uint64  `json:"used_memory_mb"`
-	NetStat         NetStat `json:"network"`
+	ServiceCpuTime uint64   `json:"service_cpu_time"`
+	SystemCpuTime  uint64   `json:"system_cpu_time"`
+	UsedMemoryMB   uint64   `json:"used_memory_mb"`
+	NetStat        *NetStat `json:"network"`
 }
 
 type NetStat struct {

service/utils.go

@@ -49,9 +49,10 @@ func Stats(cl *client.Client) (*map[string]*ResourceStats, error) {
 		// create a new ResourceStats if it doesn't exist
 		if _, ok := statsMap[serviceName]; !ok {
 			statsMap[serviceName] = &ResourceStats{
-				CpuUsagePercent: 0,
-				UsedMemoryMB:    0,
-				NetStat: NetStat{
+				ServiceCpuTime: 0,
+				SystemCpuTime:  0,
+				UsedMemoryMB:   0,
+				NetStat: &NetStat{
 					SentKB: 0,
 					RecvKB: 0,
 				},
@@ -72,7 +73,8 @@ func Stats(cl *client.Client) (*map[string]*ResourceStats, error) {
 		}
 
 		// save the stats
-		rs.CpuUsagePercent = rs.CpuUsagePercent + calculateCPUPercentUnix(&statsJSON)
+		rs.ServiceCpuTime = rs.ServiceCpuTime + uint64(statsJSON.CPUStats.CPUUsage.TotalUsage-statsJSON.PreCPUStats.CPUUsage.TotalUsage)
+		rs.SystemCpuTime = uint64(statsJSON.CPUStats.SystemUsage - statsJSON.PreCPUStats.SystemUsage)
 		rs.UsedMemoryMB = rs.UsedMemoryMB + memoryUsageMB(&statsJSON)
 		rs.NetStat.SentKB = rs.NetStat.SentKB + networkSentKB(&statsJSON)
 		rs.NetStat.RecvKB = rs.NetStat.RecvKB + networkRecvKB(&statsJSON)
@@ -106,12 +108,12 @@ func calculateNetStatDiffFromLastRecord(statsMap *map[string]*ResourceStats) {
 			if currentSentKB < oldSentKB {
 				statsMapRef[serviceName].NetStat.SentKB = 0
 			} else {
-				statsMapRef[serviceName].NetStat.SentKB = currentSentKB-oldSentKB
+				statsMapRef[serviceName].NetStat.SentKB = currentSentKB - oldSentKB
 			}
 			if currentRecvKB < oldRecvKB {
 				statsMapRef[serviceName].NetStat.RecvKB = 0
 			} else {
-				statsMapRef[serviceName].NetStat.RecvKB = currentRecvKB-oldRecvKB
+				statsMapRef[serviceName].NetStat.RecvKB = currentRecvKB - oldRecvKB
 			}
 			serviceLastNetStats[serviceName].SentKB = currentSentKB
 			serviceLastNetStats[serviceName].RecvKB = currentRecvKB