glide up

vendor/github.com/go-kit/kit/metrics/generic/generic.go

@@ -33,7 +33,6 @@ func NewCounter(name string) *Counter {
 // With implements Counter.
 func (c *Counter) With(labelValues ...string) metrics.Counter {
 	return &Counter{
-		Name: c.Name,
 		bits: atomic.LoadUint64(&c.bits),
 		lvs:  c.lvs.With(labelValues...),
 	}
@@ -96,7 +95,6 @@ func NewGauge(name string) *Gauge {
 // With implements Gauge.
 func (g *Gauge) With(labelValues ...string) metrics.Gauge {
 	return &Gauge{
-		Name: g.Name,
 		bits: atomic.LoadUint64(&g.bits),
 		lvs:  g.lvs.With(labelValues...),
 	}
@@ -107,20 +105,6 @@ func (g *Gauge) Set(value float64) {
 	atomic.StoreUint64(&g.bits, math.Float64bits(value))
 }
 
-// Add implements metrics.Gauge.
-func (g *Gauge) Add(delta float64) {
-	for {
-		var (
-			old  = atomic.LoadUint64(&g.bits)
-			newf = math.Float64frombits(old) + delta
-			new  = math.Float64bits(newf)
-		)
-		if atomic.CompareAndSwapUint64(&g.bits, old, new) {
-			break
-		}
-	}
-}
-
 // Value returns the current value of the gauge.
 func (g *Gauge) Value() float64 {
 	return math.Float64frombits(atomic.LoadUint64(&g.bits))
@@ -137,7 +121,7 @@ func (g *Gauge) LabelValues() []string {
 type Histogram struct {
 	Name string
 	lvs  lv.LabelValues
-	h    *safeHistogram
+	h    gohistogram.Histogram
 }
 
 // NewHistogram returns a numeric histogram based on VividCortex/gohistogram. A
@@ -145,30 +129,25 @@ type Histogram struct {
 func NewHistogram(name string, buckets int) *Histogram {
 	return &Histogram{
 		Name: name,
-		h:    &safeHistogram{Histogram: gohistogram.NewHistogram(buckets)},
+		h:    gohistogram.NewHistogram(buckets),
 	}
 }
 
 // With implements Histogram.
 func (h *Histogram) With(labelValues ...string) metrics.Histogram {
 	return &Histogram{
-		Name: h.Name,
-		lvs:  h.lvs.With(labelValues...),
-		h:    h.h,
+		lvs: h.lvs.With(labelValues...),
+		h:   h.h,
 	}
 }
 
 // Observe implements Histogram.
 func (h *Histogram) Observe(value float64) {
-	h.h.Lock()
-	defer h.h.Unlock()
 	h.h.Add(value)
 }
 
 // Quantile returns the value of the quantile q, 0.0 < q < 1.0.
 func (h *Histogram) Quantile(q float64) float64 {
-	h.h.RLock()
-	defer h.h.RUnlock()
 	return h.h.Quantile(q)
 }
 
@@ -180,17 +159,9 @@ func (h *Histogram) LabelValues() []string {
 // Print writes a string representation of the histogram to the passed writer.
 // Useful for printing to a terminal.
 func (h *Histogram) Print(w io.Writer) {
-	h.h.RLock()
-	defer h.h.RUnlock()
 	fmt.Fprintf(w, h.h.String())
 }
 
-// safeHistogram exists as gohistogram.Histogram is not goroutine-safe.
-type safeHistogram struct {
-	sync.RWMutex
-	gohistogram.Histogram
-}
-
 // Bucket is a range in a histogram which aggregates observations.
 type Bucket struct {
 	From, To, Count int64
@@ -237,7 +208,7 @@ func (h *SimpleHistogram) Observe(value float64) {
 // ApproximateMovingAverage returns the approximate moving average of observations.
 func (h *SimpleHistogram) ApproximateMovingAverage() float64 {
 	h.mtx.RLock()
-	defer h.mtx.RUnlock()
+	h.mtx.RUnlock()
 	return h.avg
 }
 

vendor/github.com/go-kit/kit/metrics/generic/generic_test.go

@@ -7,7 +7,6 @@ package generic_test
 import (
 	"math"
 	"math/rand"
-	"sync"
 	"testing"
 
 	"github.com/go-kit/kit/metrics/generic"
@@ -15,11 +14,7 @@ import (
 )
 
 func TestCounter(t *testing.T) {
-	name := "my_counter"
-	counter := generic.NewCounter(name).With("label", "counter").(*generic.Counter)
-	if want, have := name, counter.Name; want != have {
-		t.Errorf("Name: want %q, have %q", want, have)
-	}
+	counter := generic.NewCounter("my_counter").With("label", "counter").(*generic.Counter)
 	value := func() float64 { return counter.Value() }
 	if err := teststat.TestCounter(counter, value); err != nil {
 		t.Fatal(err)
@@ -40,11 +35,7 @@ func TestValueReset(t *testing.T) {
 }
 
 func TestGauge(t *testing.T) {
-	name := "my_gauge"
-	gauge := generic.NewGauge(name).With("label", "gauge").(*generic.Gauge)
-	if want, have := name, gauge.Name; want != have {
-		t.Errorf("Name: want %q, have %q", want, have)
-	}
+	gauge := generic.NewGauge("my_gauge").With("label", "gauge").(*generic.Gauge)
 	value := func() float64 { return gauge.Value() }
 	if err := teststat.TestGauge(gauge, value); err != nil {
 		t.Fatal(err)
@@ -52,11 +43,7 @@ func TestGauge(t *testing.T) {
 }
 
 func TestHistogram(t *testing.T) {
-	name := "my_histogram"
-	histogram := generic.NewHistogram(name, 50).With("label", "histogram").(*generic.Histogram)
-	if want, have := name, histogram.Name; want != have {
-		t.Errorf("Name: want %q, have %q", want, have)
-	}
+	histogram := generic.NewHistogram("my_histogram", 50).With("label", "histogram").(*generic.Histogram)
 	quantiles := func() (float64, float64, float64, float64) {
 		return histogram.Quantile(0.50), histogram.Quantile(0.90), histogram.Quantile(0.95), histogram.Quantile(0.99)
 	}
@@ -65,27 +52,6 @@ func TestHistogram(t *testing.T) {
 	}
 }
 
-func TestIssue424(t *testing.T) {
-	var (
-		histogram   = generic.NewHistogram("dont_panic", 50)
-		concurrency = 100
-		operations  = 1000
-		wg          sync.WaitGroup
-	)
-
-	wg.Add(concurrency)
-	for i := 0; i < concurrency; i++ {
-		go func() {
-			defer wg.Done()
-			for j := 0; j < operations; j++ {
-				histogram.Observe(float64(j))
-				histogram.Observe(histogram.Quantile(0.5))
-			}
-		}()
-	}
-	wg.Wait()
-}
-
 func TestSimpleHistogram(t *testing.T) {
 	histogram := generic.NewSimpleHistogram().With("label", "simple_histogram").(*generic.SimpleHistogram)
 	var (