Upgrade go-metrics api to the latest version, clean up qCounter global variable

metrics.go

@@ -1,27 +1,26 @@
 package main
 
 import (
-	metrics "github.com/abh/go-metrics"
-	"log"
-	"os"
 	"runtime"
 	"time"
-)
 
-var qCounter = metrics.NewMeter()
+	metrics "github.com/abh/go-metrics"
+)
 
 type ServerMetrics struct {
+	qCounter               metrics.Meter
 	lastQueryCount         int64
-	queriesHistogram       *metrics.StandardHistogram
-	queriesHistogramRecent *metrics.StandardHistogram
-	goroutines             *metrics.StandardGauge
+	queriesHistogram       metrics.Histogram
+	queriesHistogramRecent metrics.Histogram
+	goroutines             metrics.Gauge
 }
 
 func NewMetrics() *ServerMetrics {
 	m := new(ServerMetrics)
 
-	m.lastQueryCount = qCounter.Count()
-	metrics.Register("queries", qCounter)
+	m.qCounter = metrics.NewMeter()
+	m.lastQueryCount = m.qCounter.Count()
+	metrics.Register("queries", m.qCounter)
 
 	m.queriesHistogram = metrics.NewHistogram(metrics.NewUniformSample(1800))
 	metrics.Register("queries-histogram", m.queriesHistogram)
@@ -46,9 +45,9 @@ func (m *ServerMetrics) Updater() {
 		time.Sleep(1 * time.Second)
 
 		// Make sure go-metrics get some input to update the rate
-		qCounter.Mark(0)
+		m.qCounter.Mark(0)
 
-		current := qCounter.Count()
+		current := m.qCounter.Count()
 		newQueries := current - m.lastQueryCount
 		m.lastQueryCount = current
 
@@ -56,6 +55,5 @@ func (m *ServerMetrics) Updater() {
 		m.queriesHistogramRecent.Update(newQueries)
 
 		m.goroutines.Update(int64(runtime.NumGoroutine()))
-
 	}
 }

monitor.go

@@ -1,10 +1,8 @@
 package main
 
 import (
-	"code.google.com/p/go.net/websocket"
 	"encoding/json"
 	"fmt"
-	"github.com/abh/go-metrics"
 	"html/template"
 	"io"
 	"log"
@@ -14,6 +12,9 @@ import (
 	"sort"
 	"strconv"
 	"time"
+
+	"code.google.com/p/go.net/websocket"
+	"github.com/abh/go-metrics"
 )
 
 // Initial status message on websocket
@@ -154,7 +155,8 @@ func initialStatus() string {
 
 func logStatus() {
 	log.Println(initialStatus())
-	// Does not impact performance too much
+
+	qCounter := metrics.Get("queries").(metrics.Meter)
 	lastQueryCount := qCounter.Count()
 
 	for {
@@ -177,6 +179,7 @@ func monitor(zones Zones) {
 	go hub.run()
 	go httpHandler(zones)
 
+	qCounter := metrics.Get("queries").(metrics.Meter)
 	lastQueryCount := qCounter.Count()
 
 	status := new(statusStreamMsgUpdate)
@@ -191,7 +194,6 @@ func monitor(zones Zones) {
 		status.QueryCount = qCounter.Count()
 		status.Qps = newQueries
 
-		// go-metrics only updates the rate every 5 seconds, so don't pretend otherwise
 		newQps1m := qCounter.Rate1()
 		if newQps1m != lastQps1m {
 			status.Qps1m = newQps1m

serve.go

@@ -3,13 +3,15 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/abh/dns"
 	"log"
 	"net"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/abh/dns"
+	"github.com/abh/go-metrics"
 )
 
 func getQuestionName(z *Zone, req *dns.Msg) string {
@@ -26,7 +28,7 @@ func serve(w dns.ResponseWriter, req *dns.Msg, z *Zone) {
 		dns.TypeToString[qtype], req.MsgHdr.Id, w.RemoteAddr())
 
 	// Global meter
-	qCounter.Mark(1)
+	metrics.Get("queries").(metrics.Meter).Mark(1)
 
 	// Zone meter
 	z.Metrics.Queries.Mark(1)
@@ -181,6 +183,8 @@ func statusRR(label string) []dns.RR {
 	if err == nil {
 		status["h"] = hostname
 	}
+
+	qCounter := metrics.Get("queries").(metrics.Meter)
 	status["up"] = strconv.Itoa(int(time.Since(timeStarted).Seconds()))
 	status["qs"] = strconv.FormatInt(qCounter.Count(), 10)
 	status["qps1"] = fmt.Sprintf("%.4f", qCounter.Rate1())

stathat.go

@@ -1,11 +1,13 @@
 package main
 
 import (
-	"github.com/stathat/go"
 	"log"
 	"runtime"
 	"strings"
 	"time"
+
+	"github.com/abh/go-metrics"
+	"github.com/stathat/go"
 )
 
 func (zs *Zones) statHatPoster() {
@@ -59,6 +61,7 @@ func (zs *Zones) statHatPoster() {
 
 func statHatPoster() {
 
+	qCounter := metrics.Get("queries").(metrics.Meter)
 	lastQueryCount := qCounter.Count()
 	stathatGroups := append(serverGroups, "total", serverID)
 	suffix := strings.Join(stathatGroups, ",")

zone.go

@@ -1,10 +1,11 @@
 package main
 
 import (
-	"github.com/abh/dns"
-	"github.com/abh/go-metrics"
 	"strings"
 	"time"
+
+	"github.com/abh/dns"
+	"github.com/abh/go-metrics"
 )
 
 type ZoneOptions struct {
@@ -45,8 +46,8 @@ type Label struct {
 type labels map[string]*Label
 
 type ZoneMetrics struct {
-	Queries     *metrics.StandardMeter
-	EdnsQueries *metrics.StandardMeter
+	Queries     metrics.Meter
+	EdnsQueries metrics.Meter
 	LabelStats  *zoneLabelStats
 	ClientStats *zoneLabelStats
 }