dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix tags applied to wrong metric on parse error (#5650)

Browse Source
This commit is contained in:
Daniel Nelson
2019-04-02 11:14:56 -07:00
parent 0d00f0af3c
commit c283e5992a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/parsers/influx/handler.go
View File

@@ -118,3 +118,7 @@ func (h *MetricHandler) SetTimestamp(tm []byte) error {
h.builder.SetTime(time.Unix(0, ns)) h.builder.SetTime(time.Unix(0, ns))
return nil return nil
} }
func (h *MetricHandler) Reset() {
h.builder.Reset()
}

2
plugins/parsers/influx/parser.go
View File

@@ -75,6 +75,7 @@ func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
} }
if err != nil { if err != nil {
p.handler.Reset()
return nil, &ParseError{ return nil, &ParseError{
Offset: p.machine.Position(), Offset: p.machine.Position(),
LineOffset: p.machine.LineOffset(), LineOffset: p.machine.LineOffset(),
@@ -87,6 +88,7 @@ func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
metric, err := p.handler.Metric() metric, err := p.handler.Metric()
if err != nil { if err != nil {
p.handler.Reset()
return nil, err return nil, err
} }