RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-30 19:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11681 from dgrisonnet/fix-tokens

Browse Source 
Fix error output of the Prometheus parser to display the right tokens
This commit is contained in:
Levi Harrison 2023-01-02 16:04:20 -05:00 committed by GitHub
commit 15492d7100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/textparse/promparse.go
View File

@ -340,7 +340,7 @@ func (p *PromParser) Next() (Entry, error) {
t2 = p.nextToken()
}
if t2 != tValue {
return EntryInvalid, parseError("expected value after metric", t)
return EntryInvalid, parseError("expected value after metric", t2)
}
if p.val, err = parseFloat(yoloString(p.l.buf())); err != nil {
return EntryInvalid, err
@ -350,7 +350,7 @@ func (p *PromParser) Next() (Entry, error) {
p.val = math.Float64frombits(value.NormalNaN)
}
p.hasTS = false
switch p.nextToken() {
switch t := p.nextToken(); t {
case tLinebreak:
break
case tTimestamp:
@ -359,7 +359,7 @@ func (p *PromParser) Next() (Entry, error) {
return EntryInvalid, err
}
if t2 := p.nextToken(); t2 != tLinebreak {
return EntryInvalid, parseError("expected next entry after timestamp", t)
return EntryInvalid, parseError("expected next entry after timestamp", t2)
}
default:
return EntryInvalid, parseError("expected timestamp or new record", t)

10
model/textparse/promparse_test.go
View File

@ -219,7 +219,7 @@ func TestPromParseErrors(t *testing.T) {
}{
{
input: "a",
err: "expected value after metric, got \"MNAME\"",
err: "expected value after metric, got \"INVALID\"",
},
{
input: "a{b='c'} 1\n",
@ -263,7 +263,7 @@ func TestPromParseErrors(t *testing.T) {
},
{
input: "foo 0 1_2\n",
err: "expected next entry after timestamp, got \"MNAME\"",
err: "expected next entry after timestamp, got \"INVALID\"",
},
{
input: `{a="ok"} 1`,
@ -325,7 +325,11 @@ func TestPromNullByteHandling(t *testing.T) {
},
{
input: "a\x00{b=\"ddd\"} 1",
err: "expected value after metric, got \"MNAME\"",
err: "expected value after metric, got \"INVALID\"",
},
{
input: "a 0 1\x00",
err: "expected next entry after timestamp, got \"INVALID\"",
},
}