mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix OpenMetrics parser to sort uppercase labels correctly. (#10510)

Browse source 
Signed-off-by: Peter Štibraný <pstibrany@gmail.com>
This commit is contained in:
Peter Štibraný 2022-03-31 20:18:53 +02:00 committed by GitHub
parent ed0c68224e
commit cd18da3605
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
model/textparse/openmetricsparse.go
View file

@ -175,9 +175,8 @@ func (p *OpenMetricsParser) Metric(l *labels.Labels) string {
*l = append(*l, labels.Label{Name: s[a:b], Value: s[c:d]}) *l = append(*l, labels.Label{Name: s[a:b], Value: s[c:d]})
} }
// Sort labels. We can skip the first entry since the metric name is // Sort labels.
// already at the right place. sort.Sort(*l)
sort.Sort((*l)[1:])
return s return s
} }

5
model/textparse/openmetricsparse_test.go
View file

@ -52,6 +52,7 @@ ii{foo="bar"} 1
# TYPE ss stateset # TYPE ss stateset
ss{ss="foo"} 1 ss{ss="foo"} 1
ss{ss="bar"} 0 ss{ss="bar"} 0
ss{A="a"} 0
# TYPE un unknown # TYPE un unknown
_metric_starting_with_underscore 1 _metric_starting_with_underscore 1
testmetric{_label_starting_with_underscore="foo"} 1 testmetric{_label_starting_with_underscore="foo"} 1
@ -177,6 +178,10 @@ foo_total 17.0 1520879607.789 # {xx="yy"} 5`
m: `ss{ss="bar"}`, m: `ss{ss="bar"}`,
v: 0, v: 0,
lset: labels.FromStrings("__name__", "ss", "ss", "bar"), lset: labels.FromStrings("__name__", "ss", "ss", "bar"),
}, {
m: `ss{A="a"}`,
v: 0,
lset: labels.FromStrings("A", "a", "__name__", "ss"),
}, { }, {
m: "un", m: "un",
typ: MetricTypeUnknown, typ: MetricTypeUnknown,