From 40b66d29ffa8a5db1e2fb47721249cb60a4b85e6 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Fri, 7 Feb 2020 08:33:26 +0100 Subject: [PATCH] OpenMetrics parse: avoid setting prev token (#6781) We can avoid setting a prev token in the OM parser. The previous coundition that checked for prev was unreacheable. Signed-off-by: Julien Pivotto --- pkg/textparse/openmetricsparse.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkg/textparse/openmetricsparse.go b/pkg/textparse/openmetricsparse.go index 647223a3b..35ef1d5c4 100644 --- a/pkg/textparse/openmetricsparse.go +++ b/pkg/textparse/openmetricsparse.go @@ -90,7 +90,6 @@ type OpenMetricsParser struct { hasTS bool start int offsets []int - prev token eOffsets []int exemplar []byte @@ -233,19 +232,14 @@ func (p *OpenMetricsParser) Next() (Entry, error) { p.exemplarVal = 0 p.hasExemplarTs = false - t := p.nextToken() - defer func() { p.prev = t }() - switch t { + switch t := p.nextToken(); t { case tEofWord: if t := p.nextToken(); t != tEOF { return EntryInvalid, errors.New("unexpected data after # EOF") } return EntryInvalid, io.EOF case tEOF: - if p.prev != tEofWord { - return EntryInvalid, errors.New("data does not end with # EOF") - } - return EntryInvalid, io.EOF + return EntryInvalid, errors.New("data does not end with # EOF") case tHelp, tType, tUnit: switch t := p.nextToken(); t { case tMName: