Add service:DHT:NodeCount to metric web

auxten · auxten · commit af3bbdf8f072 · 2019-04-29T15:55:15.000+08:00
diff --git a/cmd/cql-minerd/integration_test.go b/cmd/cql-minerd/integration_test.go
@@ -424,6 +424,7 @@ func TestFullProcess(t *testing.T) {
 			t.Fatalf("wait for chain service failed: %v", err)
 		}
 
+		time.Sleep(time.Hour)
 		_, dsn, err := client.Create(meta)
 		So(err, ShouldBeNil)
 		dsnCfg, err := client.ParseDSN(dsn)
diff --git a/consistent/consistent.go b/consistent/consistent.go
@@ -34,10 +34,13 @@ package consistent
 
 import (
 	"errors"
+	"expvar"
 	"sort"
 	"strconv"
 	"sync"
 
+	mw "github.com/zserge/metric"
+
 	"github.com/CovenantSQL/CovenantSQL/conf"
 	"github.com/CovenantSQL/CovenantSQL/crypto/hash"
 	"github.com/CovenantSQL/CovenantSQL/proto"
@@ -63,6 +66,14 @@ var (
 	ErrKeyNotFound = errors.New("node key not found")
 )
 
+const (
+	mwKeyDHTNodeCount = "service:DHT:NodeCount"
+)
+
+func init() {
+	expvar.Publish(mwKeyDHTNodeCount, mw.NewGauge("1M1d"))
+}
+
 // Consistent holds the information about the members of the consistent hash circle.
 type Consistent struct {
 	// TODO(auxten): do not store node info on circle, just put node id as value
@@ -180,7 +191,6 @@ func (c *Consistent) add(node proto.Node) (err error) {
 		log.WithField("node", node).WithError(err).Error("set node info failed")
 		return
 	}
-
 	c.AddCache(node)
 	return
 }
@@ -195,6 +205,7 @@ func (c *Consistent) AddCache(node proto.Node) {
 	}
 	c.updateSortedHashes()
 	c.count++
+	expvar.Get(mwKeyDHTNodeCount).(mw.Metric).Add(float64(c.count))
 	return
 }
 

Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,7 @@ func TestFullProcess(t *testing.T) {`
`424`	`424`	`t.Fatalf("wait for chain service failed: %v", err)`
`425`	`425`	`}`
`426`	`426`
	`427`	`+ time.Sleep(time.Hour)`
`427`	`428`	`_, dsn, err := client.Create(meta)`
`428`	`429`	`So(err, ShouldBeNil)`
`429`	`430`	`dsnCfg, err := client.ParseDSN(dsn)`