diff --git a/reporter/prometheus/prometheus.go b/reporter/prometheus/prometheus.go index 34459ab..d15862c 100644 --- a/reporter/prometheus/prometheus.go +++ b/reporter/prometheus/prometheus.go @@ -256,21 +256,6 @@ func (p *Prometheus) Close() error { return nil } -// SetMetricBuckets sets the buckets for a metric by name. -// -// This must be called before the metric is used, otherwise will be -// ignored or can have unexpected results. -// -// Deprecated: Use RegisterHistogram instead, this function will be removed in a future release. -func SetMetricBuckets(stats *statter.Statter, name string, buckets []float64) { - prom, ok := stats.Reporter().(*Prometheus) - if !ok { - return - } - - prom.buckets.Store(stats.FullName(name), buckets) -} - // RegisterCounter registers a counter with the given label names with the prometheus registrar, // returning false if it has already been registered. func RegisterCounter(stats *statter.Statter, name string, lblNames []string, help string) bool { diff --git a/reporter/prometheus/prometheus_test.go b/reporter/prometheus/prometheus_test.go index f3abfc7..ddac677 100644 --- a/reporter/prometheus/prometheus_test.go +++ b/reporter/prometheus/prometheus_test.go @@ -261,39 +261,3 @@ func TestRegisterHistogram_HandlesNoBuckets(t *testing.T) { assert.Contains(t, rec.Body.String(), "foo_bar_baz_bat_sum{label1=\"value1\"} 0.0123") assert.Contains(t, rec.Body.String(), "foo_bar_baz_bat_count{label1=\"value1\"} 1") } - -func TestSetBuckets_Histogram(t *testing.T) { - p := prometheus.New("test.test") - stats := statter.New(p, time.Second) - - prometheus.SetMetricBuckets(stats, "test", []float64{0.1, 1.0}) - - p.Histogram("test", [][2]string{{"foo", "bar"}})(0.0123) - - rr := httptest.NewRecorder() - req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) - p.Handler().ServeHTTP(rr, req) - - assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") - assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"1\"} 1") - assert.Contains(t, rr.Body.String(), "test_test_test_sum{foo=\"bar\"} 0.0123") - assert.Contains(t, rr.Body.String(), "test_test_test_count{foo=\"bar\"} 1") -} - -func TestSetBuckets_Timing(t *testing.T) { - p := prometheus.New("test.test") - stats := statter.New(p, time.Second) - - prometheus.SetMetricBuckets(stats, "test", []float64{0.1, 1.0}) - - p.Timing("test", [][2]string{{"foo", "bar"}})(1234500 * time.Nanosecond) - - rr := httptest.NewRecorder() - req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/metrics", nil) - p.Handler().ServeHTTP(rr, req) - - assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"0.1\"} 1") - assert.Contains(t, rr.Body.String(), "test_test_test_bucket{foo=\"bar\",le=\"1\"} 1") - assert.Contains(t, rr.Body.String(), "test_test_test_sum{foo=\"bar\"} 0.0012345") - assert.Contains(t, rr.Body.String(), "test_test_test_count{foo=\"bar\"} 1") -}