local now; namespace (#74, #76)

controller/metrics.go

@@ -131,7 +131,7 @@ func (mh *metricsHandler) run() {
 	if err := bson.Unmarshal(mtrBuf.Bytes(), &mtr); err == nil {
 		out := "metrics = {\n"
 		for k, v := range mtr.Sessions {
-			out += fmt.Sprintf("\t[%v]: %v/%v (%v)\n", k, util.BytesToSize(v.BytesRead), util.BytesToSize(v.BytesWritten), time.Duration(mtr.Now-v.LastUpdate)*time.Millisecond)
+			out += fmt.Sprintf("\t[%v.%v]: %v/%v (%v)\n", mtr.Namespace, k, util.BytesToSize(v.BytesRead), util.BytesToSize(v.BytesWritten), time.Duration(mtr.LocalNow-v.LastUpdate)*time.Millisecond)
 		}
 		out += "}"
 		logrus.Info(out)

endpoints/frontend/metrics.go

@@ -36,7 +36,7 @@ func newMetricsAgent(identityName, metricsServiceName string) (*metricsAgent, er
 	logrus.Infof("loaded '%v' identity", identityName)
 	return &metricsAgent{
 		metricsServiceName: metricsServiceName,
-		metrics:            &model.Metrics{},
+		metrics:            &model.Metrics{Namespace: identityName},
 		updates:            make(chan metricsUpdate, 10240),
 		zCtx:               ziti.NewContextWithConfig(zCfg),
 	}, nil
@@ -61,7 +61,7 @@ func (ma *metricsAgent) run() {
 }
 
 func (ma *metricsAgent) sendMetrics() error {
-	ma.metrics.Now = time.Now().UnixMilli()
+	ma.metrics.LocalNow = time.Now().UnixMilli()
 	metricsJson, err := bson.Marshal(ma.metrics)
 	if err != nil {
 		return errors.Wrap(err, "error marshaling metrics")

model/metrics.go

@@ -1,7 +1,8 @@
 package model
 
 type Metrics struct {
-	Now      int64 `json:"now"`
+	LocalNow  int64
+	Namespace string
 	Sessions  map[string]SessionMetrics
 }