mirror
/
client_golang
mirror of https://github.com/prometheus/client_golang.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fixed support for unordered input of exemplars. (#1100) 

Signed-off-by: bwplotka <bwplotka@gmail.com>
This commit is contained in:
Bartlomiej Plotka 2022-08-02 11:32:30 +02:00 committed by GitHub
parent 44ce5e1ee5
commit 3faf3bae70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prometheus/metric.go
View File

@ -192,8 +192,6 @@ func (m *withExemplarsMetric) Write(pb *dto.Metric) error {
Exemplar: e, Exemplar: e,
} }
pb.Histogram.Bucket = append(pb.Histogram.Bucket, b) pb.Histogram.Bucket = append(pb.Histogram.Bucket, b)
break
// Terminating the loop after creating the +Inf bucket and adding one exemplar, if there are other exemplars in the +Inf bucket range they will be ignored.
} }
} }
default: default:

16
prometheus/metric_test.go
View File

@ -47,18 +47,19 @@ func TestWithExemplarsMetric(t *testing.T) {
h := MustNewConstHistogram( h := MustNewConstHistogram(
NewDesc("http_request_duration_seconds", "A histogram of the HTTP request durations.", nil, nil), NewDesc("http_request_duration_seconds", "A histogram of the HTTP request durations.", nil, nil),
4711, 403.34, 4711, 403.34,
// Four buckets, but we expect five as the +Inf bucket will be created if we see value outside of those buckets.
map[float64]uint64{25: 121, 50: 2403, 100: 3221, 200: 4233}, map[float64]uint64{25: 121, 50: 2403, 100: 3221, 200: 4233},
) )
m := &withExemplarsMetric{Metric: h, exemplars: []*dto.Exemplar{ m := &withExemplarsMetric{Metric: h, exemplars: []*dto.Exemplar{
{Value: proto.Float64(2000.0)}, // Unordered exemplars.
{Value: proto.Float64(500.0)},
{Value: proto.Float64(42.0)},
{Value: proto.Float64(157.0)},
{Value: proto.Float64(100.0)},
{Value: proto.Float64(89.0)},
{Value: proto.Float64(24.0)}, {Value: proto.Float64(24.0)},
{Value: proto.Float64(25.1)}, {Value: proto.Float64(25.1)},
{Value: proto.Float64(42.0)},
{Value: proto.Float64(89.0)},
{Value: proto.Float64(100.0)},
{Value: proto.Float64(157.0)},
{Value: proto.Float64(500.0)},
{Value: proto.Float64(2000.0)},
}} }}
metric := dto.Metric{} metric := dto.Metric{}
if err := m.Write(&metric); err != nil { if err := m.Write(&metric); err != nil {
@ -68,8 +69,7 @@ func TestWithExemplarsMetric(t *testing.T) {
t.Errorf("want %v, got %v", want, got) t.Errorf("want %v, got %v", want, got)
} }
// When there are more exemplars than there are buckets, a +Inf bucket will be created and the last exemplar value will be added. expectedExemplarVals := []float64{24.0, 25.1, 89.0, 157.0, 500.0}
expectedExemplarVals := []float64{24.0, 42.0, 100.0, 157.0, 500.0}
for i, b := range metric.GetHistogram().Bucket { for i, b := range metric.GetHistogram().Bucket {
if b.Exemplar == nil { if b.Exemplar == nil {
t.Errorf("Expected exemplar for bucket %v, got nil", i) t.Errorf("Expected exemplar for bucket %v, got nil", i)