Commit a5e3d03d36fa4f9f2915d10d6b17fa0e02b734cc - golang-github-go-kit-kit

Merge pull request #459 from go-kit/issue-455 metrics/generic: With should track Name Peter Bourgon authored 7 years ago GitHub committed 7 years ago

2 changed file(s) with 20 addition(s) and 5 deletion(s). Raw diff Collapse all Expand all

-2

metrics/generic/generic.go less more

32	32	// With implements Counter.
33	33	func (c *Counter) With(labelValues ...string) metrics.Counter {
34	34	return &Counter{
	35	Name: c.Name,
35	36	bits: atomic.LoadUint64(&c.bits),
36	37	lvs: c.lvs.With(labelValues...),
37	38	}

94	95	// With implements Gauge.
95	96	func (g *Gauge) With(labelValues ...string) metrics.Gauge {
96	97	return &Gauge{
	98	Name: g.Name,
97	99	bits: atomic.LoadUint64(&g.bits),
98	100	lvs: g.lvs.With(labelValues...),
99	101	}

149	151	// With implements Histogram.
150	152	func (h *Histogram) With(labelValues ...string) metrics.Histogram {
151	153	return &Histogram{
152		lvs: h.lvs.With(labelValues...),
153		h: h.h,
	154	Name: h.Name,
	155	lvs: h.lvs.With(labelValues...),
	156	h: h.h,
154	157	}
155	158	}
156	159

+15

-3

metrics/generic/generic_test.go less more

14	14	)
15	15
16	16	func TestCounter(t *testing.T) {
17		counter := generic.NewCounter("my_counter").With("label", "counter").(*generic.Counter)
	17	name := "my_counter"
	18	counter := generic.NewCounter(name).With("label", "counter").(*generic.Counter)
	19	if want, have := name, counter.Name; want != have {
	20	t.Errorf("Name: want %q, have %q", want, have)
	21	}
18	22	value := func() float64 { return counter.Value() }
19	23	if err := teststat.TestCounter(counter, value); err != nil {
20	24	t.Fatal(err)

35	39	}
36	40
37	41	func TestGauge(t *testing.T) {
38		gauge := generic.NewGauge("my_gauge").With("label", "gauge").(*generic.Gauge)
	42	name := "my_gauge"
	43	gauge := generic.NewGauge(name).With("label", "gauge").(*generic.Gauge)
	44	if want, have := name, gauge.Name; want != have {
	45	t.Errorf("Name: want %q, have %q", want, have)
	46	}
39	47	value := func() float64 { return gauge.Value() }
40	48	if err := teststat.TestGauge(gauge, value); err != nil {
41	49	t.Fatal(err)

43	51	}
44	52
45	53	func TestHistogram(t *testing.T) {
46		histogram := generic.NewHistogram("my_histogram", 50).With("label", "histogram").(*generic.Histogram)
	54	name := "my_histogram"
	55	histogram := generic.NewHistogram(name, 50).With("label", "histogram").(*generic.Histogram)
	56	if want, have := name, histogram.Name; want != have {
	57	t.Errorf("Name: want %q, have %q", want, have)
	58	}
47	59	quantiles := func() (float64, float64, float64, float64) {
48	60	return histogram.Quantile(0.50), histogram.Quantile(0.90), histogram.Quantile(0.95), histogram.Quantile(0.99)
49	61	}