*: update server metrics (pingcap#1749)

indescribable · Sep 21, 2016 · 453158c · 453158c
1 parent bd43d06
commit 453158c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/server/conn.go b/server/conn.go
@@ -110,9 +110,10 @@ func (cc *clientConn) handshake() error {
 func (cc *clientConn) Close() error {
 	cc.server.rwlock.Lock()
 	delete(cc.server.clients, cc.connectionID)
+	connections := len(cc.server.clients)
 	cc.server.rwlock.Unlock()
+	connGauge.Set(float64(connections))
 	cc.conn.Close()
-	connGauge.Dec()
 	if cc.ctx != nil {
 		return cc.ctx.Close()
 	}
@@ -305,8 +306,6 @@ func (cc *clientConn) Run() {
 		cc.Close()
 	}()
 
-	connGauge.Inc()
-
 	for {
 		cc.alloc.Reset()
 		data, err := cc.readPacket()

diff --git a/server/server.go b/server/server.go
@@ -197,7 +197,9 @@ func (s *Server) onConn(c net.Conn) {
 
 	s.rwlock.Lock()
 	s.clients[conn.connectionID] = conn
+	connections := len(s.clients)
 	s.rwlock.Unlock()
+	connGauge.Set(float64(connections))
 
 	conn.Run()
 }

diff --git a/tidb-server/main.go b/tidb-server/main.go
@@ -194,10 +194,9 @@ func pushMetric(addr string, interval time.Duration) {
 func prometheusPushClient(addr string, interval time.Duration) {
 	// TODO: TiDB do not have uniq name, so we use host+port to compose a name.
 	job := "tidb"
-	grouping := map[string]string{"instance": fmt.Sprintf("%s:%s", *host, *port)}
 	for {
 		err := push.FromGatherer(
-			job, grouping,
+			job, push.HostnameGroupingKey(),
 			addr,
 			prometheus.DefaultGatherer,
 		)