* Refactor the pull backend to use the expvar hook.

* Fix the nanoseconds => ints for histogram buckets.
* Gigantic rename of metrics:

-Int => Counter
-IntGauge => Gauge
-IntFunc => GaugeFunc
-Counters => CountersWithLabels
-MultiCounters => CountersWithMultiLabels
-MultiCounterFunc => CountersFuncWithMultiLabels
-Gauges => GaugesWithLabels
-MultiGauges=> GaugesWithMultiLabels

* Add an explicit labelName for CountersWithLabels & GaugesWithLabels

Signed-off-by: Maggie Zhou <mzhou@slack-corp.com>

go/mysql/server.go

@@ -43,9 +43,9 @@ const (
 var (
 	// Metrics
 	timings    = stats.NewTimings("MysqlServerTimings", "MySQL server timings")
-	connCount  = stats.NewInt("MysqlServerConnCount", "Connection count for MySQL servers")
-	connAccept = stats.NewInt("MysqlServerConnAccepted", "Connections accepted by MySQL server")
-	connSlow   = stats.NewInt("MysqlServerConnSlow", "Slow MySQL server connections")
+	connCount  = stats.NewCounter("MysqlServerConnCount", "Connection count for MySQL servers")
+	connAccept = stats.NewCounter("MysqlServerConnAccepted", "Connections accepted by MySQL server")
+	connSlow   = stats.NewCounter("MysqlServerConnSlow", "Slow MySQL server connections")
 )
 
 // A Handler is an interface used by Listener to send queries.

go/proc/counting_listener.go

@@ -37,8 +37,8 @@ type countingConnection struct {
 func Published(l net.Listener, countTag, acceptTag string) net.Listener {
 	return &CountingListener{
 		Listener:   l,
-		ConnCount:  stats.NewInt(countTag, "Connection count inside net.Listener"),
-		ConnAccept: stats.NewInt(acceptTag, "Connections accepted inside net.Listener"),
+		ConnCount:  stats.NewCounter(countTag, "Connection count inside net.Listener"),
+		ConnAccept: stats.NewCounter(acceptTag, "Connections accepted inside net.Listener"),
 	}
 }