Added conf params. Still need to call TransmitGetMeasure

node/receiver.go

@@ -360,6 +360,22 @@ func ReceiveFinishRealtime(instance *server.Instance,
 	}
 	p.Measure(tag)
 
+	//Send the finished signal on first node
+	if r.GetTopology().IsFirstNode(instance.GetID()) {
+		jww.INFO.Printf("[%s]: RID %d FIRST NODE ReceiveFinishRealtime"+
+			" Retrieving and storing metrics", instance, roundID)
+
+		// TODO: Where does this go?
+		//nodeComms := instance.GetNetwork()
+		//measures = io.TransmitGetMeasure(nodeComms, instance.GetTopology(),roundID)
+		//logFile = instance.GetMetricsLog()
+
+		//if logFile != "" {
+		//	go measure.AppendToMetricsLog(logFile, measures)
+		//}
+
+	}
+
 	p.UpdateFinalStates()
 
 	if !instance.GetKeepBuffers() {
@@ -384,7 +400,9 @@ func ReceiveFinishRealtime(instance *server.Instance,
 	if r.GetTopology().IsFirstNode(instance.GetID()) {
 		jww.INFO.Printf("[%s]: RID %d FIRST NODE ReceiveFinishRealtime"+
 			" SENDING END ROUND SIGNAL", instance, roundID)
+
 		instance.FinishRound(roundID)
+
 	}
 
 	return nil

node/receiver_test.go

@@ -939,6 +939,9 @@ func TestReceiveFinishRealtime(t *testing.T) {
 			Ids: buildMockNodeIDs(numNodes),
 		},
 		Index: 0,
+		Metrics: conf.Metrics{
+			Log: "",
+		},
 	}
 
 	instance := server.CreateServerInstance(&params, &globals.UserMap{},

server/conf/metrics.go

+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2019 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
+package conf
+
+// Contains metrics information such as log path
+type Metrics struct {
+	Log string
+}

server/conf/metrics_test.go

+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2019 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
+package conf
+
+import (
+	"gopkg.in/yaml.v2"
+	"io/ioutil"
+	"reflect"
+	"testing"
+)
+
+var ExpectedMetrics = Metrics{
+	Log: "~/.elixxir/metrics.log",
+}
+
+// This test checks that unmarshalling the params.yaml file
+// has the expected Database object.
+func TestMetrics_UnmarshallingFileEqualsExpected(t *testing.T) {
+
+	buf, _ := ioutil.ReadFile("./params.yaml")
+
+	actual := Params{}
+
+	err := yaml.Unmarshal(buf, &actual)
+	if err != nil {
+		t.Errorf("Unable to decode into struct, %v", err)
+	}
+
+	if !reflect.DeepEqual(ExpectedMetrics, actual.Metrics) {
+		t.Errorf("Metrics object did not match value")
+	}
+
+}

server/conf/params.go

@@ -27,6 +27,7 @@ type Params struct {
 	Database      Database
 	Gateways      Gateways
 	Permissioning Permissioning
+	Metrics       Metrics
 }
 
 // NewParams gets elements of the viper object
@@ -66,6 +67,8 @@ func NewParams(vip *viper.Viper) (*Params, error) {
 	params.Groups.CMix = vip.GetStringMapString("groups.cmix")
 	params.Groups.E2E = vip.GetStringMapString("groups.e2e")
 
+	params.Metrics.Log = vip.GetString("metrics.log")
+
 	// In the event IDs are not able to be provided,
 	// we can hash the node addresses as a workaround
 	if len(params.Node.Ids) == 0 {

server/conf/params.yaml

@@ -48,4 +48,6 @@ batch: 20
 verbose: true
 skipReg: true
 keepBuffers: true
+metrics:
+  log:  "~/.elixxir/metrics.log"
 ...

server/conf/params_test.go

@@ -26,6 +26,7 @@ func TestNewParams_ReturnsParamsWhenGivenValidViper(t *testing.T) {
 		Database:      ExpectedDatabase,
 		Gateways:      ExpectedGateways,
 		Permissioning: ExpectedPermissioning,
+		Metrics:       ExpectedMetrics,
 	}
 
 	vip := viper.New()
@@ -80,4 +81,8 @@ func TestNewParams_ReturnsParamsWhenGivenValidViper(t *testing.T) {
 	if !reflect.DeepEqual(expectedParams.Gateways, params.Gateways) {
 		t.Errorf("Params gateways value does not match expected value")
 	}
+
+	if !reflect.DeepEqual(expectedParams.Metrics, params.Metrics) {
+		t.Errorf("Params metrics value does not match expected value")
+	}
 }

server/instance.go

@@ -108,6 +108,11 @@ func (i *Instance) GetGraphGenerator() services.GraphGenerator {
 	return i.graphGenerator
 }
 
+// GetMetricsLog returns the log path for metrics data
+func (i *Instance) GetMetricsLog() string {
+	return i.params.Metrics.Log
+}
+
 //Initializes the first node components of the instance
 func (i *Instance) InitFirstNode() {
 	i.firstNode.Initialize()

server/measure/metrics.go

 package measure
 
 import (
+	"os"
 	"sync"
 	"time"
 )
@@ -45,3 +46,22 @@ func (m *Metrics) Measure(tag string) time.Time {
 
 	return measure.Timestamp
 }
+
+// AppendToMetricsLog appends a measures to
+// a log file which is located in logPath
+func AppendToMetricsLog(logPath, measures string) {
+	f, err := os.OpenFile(logPath, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
+	if err != nil {
+		// warning
+	}
+	defer func() {
+		if f != nil {
+			_ = f.Close()
+		}
+	}()
+
+	_, err = f.WriteString(measures)
+	if err != nil {
+		// warning
+	}
+}