From d7d30227990bcb8006efef00d152f5b509ed0349 Mon Sep 17 00:00:00 2001 From: Shivanth Date: Wed, 6 Nov 2024 08:26:04 +0100 Subject: [PATCH] Remove exemplars from parameters for constNativeHistogram function Signed-off-by: Shivanth --- prometheus/histogram.go | 16 ---------------- prometheus/histogram_test.go | 1 - 2 files changed, 17 deletions(-) diff --git a/prometheus/histogram.go b/prometheus/histogram.go index 727bec42a..3dd013190 100644 --- a/prometheus/histogram.go +++ b/prometheus/histogram.go @@ -1867,15 +1867,6 @@ func validateCount(sum float64, count uint64, negativeBuckets, positiveBuckets m return nil } -func validateExemplars(exemplars []*dto.Exemplar) error { - for _, e := range exemplars { - if !e.GetTimestamp().IsValid() { - return fmt.Errorf("invalid timestamp found in exemplars") - } - } - return nil -} - // NewConstNativeHistogram returns a metric representing a Prometheus Nativehistogram with // fixed values for the count, sum, and positive/negative/zero bucket counts. As those parameters // cannot be changed, the returned value does not implement the Histogram @@ -1905,7 +1896,6 @@ func NewConstNativeHistogram( schema int32, zeroThreshold float64, createdTimestamp time.Time, - exemplars []*dto.Exemplar, labelValues ...string, ) (Metric, error) { if desc.err != nil { @@ -1920,9 +1910,6 @@ func NewConstNativeHistogram( if err := validateCount(sum, count, negativeBuckets, positiveBuckets, zeroBucket); err != nil { return nil, err } - if err := validateExemplars(exemplars); err != nil { - return nil, err - } NegativeSpan, NegativeDelta := makeBucketsFromMap(negativeBuckets) PositiveSpan, PositiveDelta := makeBucketsFromMap(positiveBuckets) @@ -1932,7 +1919,6 @@ func NewConstNativeHistogram( CreatedTimestamp: timestamppb.New(createdTimestamp), Schema: &schema, ZeroThreshold: &zeroThreshold, - Exemplars: exemplars, SampleCount: &count, SampleSum: &sum, @@ -1964,7 +1950,6 @@ func MustNewConstNativeHistogram( nativeHistogramSchema int32, nativeHistogramZeroThreshold float64, createdTimestamp time.Time, - exemplars []*dto.Exemplar, labelValues ...string, ) Metric { nativehistogram, err := NewConstNativeHistogram(desc, @@ -1976,7 +1961,6 @@ func MustNewConstNativeHistogram( nativeHistogramSchema, nativeHistogramZeroThreshold, createdTimestamp, - exemplars, labelValues...) if err != nil { panic(err) diff --git a/prometheus/histogram_test.go b/prometheus/histogram_test.go index 665111ec7..c52cbc21f 100644 --- a/prometheus/histogram_test.go +++ b/prometheus/histogram_test.go @@ -1980,7 +1980,6 @@ func TestConstNativeHistogram(t *testing.T) { cold.nativeHistogramSchema, math.Float64frombits(cold.nativeHistogramZeroThresholdBits), _his.lastResetTime, - _his.nativeExemplars.exemplars, ) if err != nil { t.Fatal("unexpected error writing metric", err)