r3

scionproto · Oct 16, 2019 · 21e9d58 · 21e9d58
1 parent 63496f3
commit 21e9d58
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/go/path_srv/internal/metrics/sync.go b/go/path_srv/internal/metrics/sync.go
@@ -29,7 +29,7 @@ type SyncRegLabels struct {
 
 // Labels returns the labels.
 func (l SyncRegLabels) Labels() []string {
-	return []string{"result", "src"}
+	return []string{prom.LabelResult, prom.LabelSrc}
 }
 
 // Values returns the values.
@@ -51,7 +51,7 @@ type SyncPushLabels struct {
 
 // Labels returns the labels.
 func (l SyncPushLabels) Labels() []string {
-	return []string{"result", "dst"}
+	return []string{prom.LabelResult, "dst"}
 }
 
 // Values returns the values.
@@ -65,7 +65,6 @@ func (l SyncPushLabels) WithResult(result string) SyncPushLabels {
 	return l
 }
 
-// sync contains metrics for segment synchronization.
 type sync struct {
 	registrations *prometheus.CounterVec
 	pushes        *prometheus.CounterVec
@@ -88,8 +87,8 @@ func (s sync) Registrations(l SyncRegLabels) prometheus.Counter {
 }
 
 // RegistrationSuccess increments registrations with the given stats.
-func (s sync) RegistrationSuccess(l SyncRegLabels, new, updated int) {
-	s.Registrations(l.WithResult(OkRegistrationNew)).Add(float64(new))
+func (s sync) RegistrationSuccess(l SyncRegLabels, inserted, updated int) {
+	s.Registrations(l.WithResult(OkRegistrationNew)).Add(float64(inserted))
 	s.Registrations(l.WithResult(OkRegiststrationUpdated)).Add(float64(updated))
 }
 

diff --git a/go/sciond/internal/metrics/metrics.go b/go/sciond/internal/metrics/metrics.go
@@ -45,7 +45,7 @@ const (
 const (
 	OkSuccess   = prom.Success
 	ErrInternal = prom.ErrInternal
-	ErrNetwork  = prom.ErrReply
+	ErrNetwork  = prom.ErrNetwork
 )
 
 var resultLabel = []string{prom.LabelResult}