PR feedback - utilize metricsString() function on NodeStateType to si…

…mplify code.

net.go

@@ -87,13 +87,6 @@ const (
 	maxPushPullRequests    = 128 // Maximum number of concurrent push/pull requests
 )
 
-const (
-	nodeStateAlive   = "alive"
-	nodeStateDead    = "dead"
-	nodeStateLeft    = "left"
-	nodeStateSuspect = "suspect"
-)
-
 // ping request sent directly to node
 type ping struct {
 	SeqNo uint32
@@ -1015,22 +1008,13 @@ func (m *Memberlist) sendLocalState(conn net.Conn, join bool, streamLabel string
 	m.nodeLock.RUnlock()
 
 	nodeStateCounts := make(map[string]int)
-	nodeStateCounts[nodeStateAlive] = 0
-	nodeStateCounts[nodeStateLeft] = 0
-	nodeStateCounts[nodeStateDead] = 0
-	nodeStateCounts[nodeStateSuspect] = 0
+	nodeStateCounts[StateAlive.metricsString()] = 0
+	nodeStateCounts[StateLeft.metricsString()] = 0
+	nodeStateCounts[StateDead.metricsString()] = 0
+	nodeStateCounts[StateSuspect.metricsString()] = 0
 
 	for _, n := range localNodes {
-		switch n.State {
-		case StateAlive:
-			nodeStateCounts[nodeStateAlive]++
-		case StateDead:
-			nodeStateCounts[nodeStateDead]++
-		case StateSuspect:
-			nodeStateCounts[nodeStateSuspect]++
-		case StateLeft:
-			nodeStateCounts[nodeStateLeft]++
-		}
+		nodeStateCounts[n.State.metricsString()]++
 	}
 
 	for nodeState, cnt := range nodeStateCounts {

state.go

@@ -15,6 +15,21 @@ import (
 
 type NodeStateType int
 
+func (t NodeStateType) metricsString() string {
+	switch t {
+	case StateAlive:
+		return "alive"
+	case StateDead:
+		return "dead"
+	case StateSuspect:
+		return "suspect"
+	case StateLeft:
+		return "left"
+	default:
+		return ""
+	}
+}
+
 const (
 	StateAlive NodeStateType = iota
 	StateSuspect

state_test.go

@@ -2275,10 +2275,10 @@ func TestMemberlist_PushPull(t *testing.T) {
 
 		instancesMetricName := "consul.usage.test.memberlist.node.instances"
 		verifyGaugeExists(t, "consul.usage.test.memberlist.size.local", sink)
-		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, nodeStateAlive), sink)
-		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, nodeStateDead), sink)
-		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, nodeStateLeft), sink)
-		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, nodeStateSuspect), sink)
+		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, StateAlive.metricsString()), sink)
+		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, StateDead.metricsString()), sink)
+		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, StateLeft.metricsString()), sink)
+		verifyGaugeExists(t, fmt.Sprintf("%s;node_state=%s", instancesMetricName, StateSuspect.metricsString()), sink)
 	})
 }