adding gauges and tests for memberlist.nodes.<state>

net.go

@@ -87,6 +87,13 @@ 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
@@ -1007,6 +1014,29 @@ 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
+
+	for _, n := range localNodes {
+		switch n.State {
+		case StateAlive:
+			nodeStateCounts[nodeStateAlive]++
+		case StateDead:
+			nodeStateCounts[nodeStateDead]++
+		case StateSuspect:
+			nodeStateCounts[nodeStateSuspect]++
+		case StateLeft:
+			nodeStateCounts[nodeStateLeft]++
+		}
+	}
+
+	for nodeState, cnt := range nodeStateCounts {
+		metrics.SetGaugeWithLabels([]string{"memberlist", "nodes", nodeState}, float32(cnt), m.metricLabels)
+	}
+
 	// Get the delegate state
 	var userData []byte
 	if m.config.Delegate != nil {

state_test.go

@@ -2317,14 +2317,11 @@ func TestMemberlist_PushPull(t *testing.T) {
 			failf("expected 2 messages from pushPull")
 		}
 
-		intv := getIntervalMetrics(t, sink)
-
-		gaugeName := "consul.usage.test.memberlist.size.local"
-		actualGauge := intv.Gauges[gaugeName]
-
-		if actualGauge.Value == 0 {
-			t.Fatalf("memberlist.size.local gauge not emitted")
-		}
+		verifyGaugeExists(t, "consul.usage.test.memberlist.size.local", sink)
+		verifyGaugeExists(t, "consul.usage.test.memberlist.nodes.alive", sink)
+		verifyGaugeExists(t, "consul.usage.test.memberlist.nodes.suspect", sink)
+		verifyGaugeExists(t, "consul.usage.test.memberlist.nodes.left", sink)
+		verifyGaugeExists(t, "consul.usage.test.memberlist.nodes.dead", sink)
 	})
 }
 
@@ -2467,3 +2464,10 @@ func getIntervalMetrics(t *testing.T, sink *metrics.InmemSink) *metrics.Interval
 	intv := intervals[0]
 	return intv
 }
+
+func verifyGaugeExists(t *testing.T, name string, sink *metrics.InmemSink) {
+	interval := getIntervalMetrics(t, sink)
+	if _, ok := interval.Gauges[name]; !ok {
+		t.Fatalf("%s gauge not emmited", name)
+	}
+}