From 0edd2e5900e2abada803e5a94f24f54fd507cfe8 Mon Sep 17 00:00:00 2001 From: William Perron Date: Tue, 15 Feb 2022 10:22:30 -0500 Subject: [PATCH] reduce repetition in constHistogram w/ exemplars --- prometheus/histogram.go | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/prometheus/histogram.go b/prometheus/histogram.go index af434ae64..6e4cda7b7 100644 --- a/prometheus/histogram.go +++ b/prometheus/histogram.go @@ -678,14 +678,15 @@ func NewConstHistogramWithExemplar( if err := validateLabelValues(labelValues, len(desc.variableLabels)); err != nil { return nil, err } - return &constHistogram{ - desc: desc, - count: count, - sum: sum, - buckets: buckets, - exemplars: exemplars, - labelPairs: MakeLabelPairs(desc, labelValues), - }, nil + + h, err := NewConstHistogram(desc, count, sum, buckets, labelValues...) + if err != nil { + return nil, err + } + + h.(*constHistogram).exemplars = exemplars + + return h, nil } // MustNewConstHistogram is a version of NewConstHistogram that panics where @@ -698,11 +699,9 @@ func MustNewConstHistogramWithExemplar( exemplars []*dto.Exemplar, labelValues ...string, ) Metric { - m, err := NewConstHistogramWithExemplar(desc, count, sum, buckets, exemplars, labelValues...) - if err != nil { - panic(err) - } - return m + h := MustNewConstHistogram(desc, count, sum, buckets, labelValues...) + h.(*constHistogram).exemplars = exemplars + return h } type buckSort []*dto.Bucket