Merge pull request #202 from skruger/memory_usage_stats

Report memory usage and correct CPU percentage in heartbeat messages

Author: myzhan

runner.go

@@ -621,9 +621,11 @@ func (r *slaveRunner) run() {
 				}
 				// send client heartbeat message
 				CPUUsage := GetCurrentCPUUsage()
+				MemUsage := GetCurrentMemUsage()
 				data := map[string]interface{}{
-					"state":             r.state,
-					"current_cpu_usage": CPUUsage,
+					"state":                r.state,
+					"current_cpu_usage":    CPUUsage,
+					"current_memory_usage": MemUsage,
 				}
 				r.client.sendChannel() <- newGenericMessage("heartbeat", data, r.nodeID)
 			case <-r.shutdownChan:

utils.go

@@ -137,3 +137,9 @@ func GetCurrentCPUUsage() float64 {
 	}
 	return percent / float64(runtime.NumCPU())
 }
+
+func GetCurrentMemUsage() uint64 {
+	var m runtime.MemStats
+	runtime.ReadMemStats(&m)
+	return m.Alloc
+}