fix names

go/border/internal/metrics/metrics.go

@@ -62,7 +62,7 @@ type IntfLabels struct {
 
 // Labels returns the list of labels.
 func (l IntfLabels) Labels() []string {
-	return []string{"interface"}
+	return []string{"intf"}
 }
 
 // Values returns the label values in the order defined by Labels.

go/border/internal/metrics/process.go

@@ -31,9 +31,9 @@ type ProcessLabels struct {
 	// Result is the outcome of processing the packet.
 	Result string
 	// In is the input SCION interface.
-	In string
+	IntfIn string
 	// Out is the output SCION interface.
-	Out string
+	IntfOut string
 }
 
 // Labels returns the list of labels.
@@ -43,7 +43,7 @@ func (l ProcessLabels) Labels() []string {
 
 // Values returns the label values in the order defined by Labels.
 func (l ProcessLabels) Values() []string {
-	return []string{l.Result, l.In, l.Out}
+	return []string{l.Result, l.IntfIn, l.IntfOut}
 }
 
 type process struct {

go/border/router.go

@@ -127,7 +127,7 @@ func (r *Router) processPacket(rp *rpkt.RtrPkt) {
 		}
 	}
 	l := metrics.ProcessLabels{
-		In: metrics.IntfToLabel(rp.Ingress.IfID),
+		IntfIn: metrics.IntfToLabel(rp.Ingress.IfID),
 	}
 	// Assign a pseudorandom ID to the packet, for correlating log entries.
 	rp.Id = log.RandId(4)

go/border/rpkt/route.go

@@ -56,13 +56,13 @@ func (rp *RtrPkt) Route() error {
 	}
 	l := metrics.ProcessLabels{
 		Result: metrics.Success,
-		In:     rp.Ingress.IfLabel,
+		IntfIn: rp.Ingress.IfLabel,
 	}
 	rp.RefInc(len(rp.Egress))
 	// Call all egress functions.
 	for _, epair := range rp.Egress {
 		epair.S.Ring.Write(ringbuf.EntryList{&EgressRtrPkt{rp, epair.Dst}}, true)
-		l.Out = epair.S.Label
+		l.IntfOut = epair.S.Label
 		metrics.Process.Pkts(l).Inc()
 	}
 	return nil