Metrics2: Store a registry of Counters

go/httputils/http.go

 package httputils
 
 import (
         "bytes"
         "fmt"
         "io"
         "io/ioutil"
         "net"
         "net/http"
         "net/url"
         "runtime"
         "strconv"
         "time"
 
         // Below is a port of the exponential backoff implementation from
         // google-http-java-client.
         "github.com/cenkalti/backoff"
         "github.com/fiorix/go-web/autogzip"
-        "github.com/rcrowley/go-metrics"
         "github.com/skia-dev/glog"
+        "go.skia.org/infra/go/metrics2"
         "go.skia.org/infra/go/timer"
         "go.skia.org/infra/go/util"
 )
 
 const (
         DIAL_TIMEOUT    = time.Minute
         REQUEST_TIMEOUT = 5 * time.Minute
 
         // Exponential backoff defaults.
         INITIAL_INTERVAL     = 500 * time.Millisecond
@@ skipping 140 matching lines @@
 
 // responseProxy implements http.ResponseWriter and records the status codes.
 type responseProxy struct {
         http.ResponseWriter
         wroteHeader bool
 }
 
 func (rp *responseProxy) WriteHeader(code int) {
         if !rp.wroteHeader {
                 glog.Infof("Response Code: %d", code)
-                metrics.GetOrRegisterCounter(fmt.Sprintf("http.statuscode.%d", code), metrics.DefaultRegistry).Inc(1)
+                metrics2.GetCounter("http.response", map[string]string{"statuscode": strconv.Itoa(code)}).Inc(1)
                 rp.ResponseWriter.WriteHeader(code)
                 rp.wroteHeader = true
         }
 }
 
 // recordResponse returns a wrapped http.Handler that records the status codes of the
 // responses.
 //
 // Note that if a handler doesn't explicitly set a response code and goes with
 // the default of 200 then this will never record anything.
@@ skipping 69 matching lines @@
                 val, err = strconv.Atoi(valStr)
                 if err != nil {
                         return 0, fmt.Errorf("Not a valid integer value.")
                 }
         }
         if val < 0 {
                 return defaultVal, nil
         }
         return val, nil
 }