From a5e713b6e04ac0a31cdb881a77a082de7a201e56 Mon Sep 17 00:00:00 2001 From: Seva Poliakov <ctrlok@gmail.com> Date: Tue, 14 Jul 2020 12:02:25 +0300 Subject: [PATCH] add vm_protoparser_rows_read_total metrics to promscrape (#624) * add vm_protoparser_rows_read_total metrics to promscrape move vm_protoparser_rows_read_total for promscrape to better place move vm_protoparser_rows_read_total for promscrape to better place * remove possibility of infinity loop at prometheus parser --- lib/protoparser/prometheus/parser.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/protoparser/prometheus/parser.go b/lib/protoparser/prometheus/parser.go index e6895e45c6..b18a79b230 100644 --- a/lib/protoparser/prometheus/parser.go +++ b/lib/protoparser/prometheus/parser.go @@ -147,16 +147,21 @@ func (r *Row) unmarshal(s string, tagsPool []Tag, noEscapes bool) ([]Tag, error) return tagsPool, nil } +var rowsReadScrape = metrics.NewCounter(`vm_protoparser_rows_read_total{type="promscrape"}`) + func unmarshalRows(dst []Row, s string, tagsPool []Tag, noEscapes bool, errLogger func(s string)) ([]Row, []Tag) { for len(s) > 0 { n := strings.IndexByte(s, '\n') if n < 0 { // The last line. - return unmarshalRow(dst, s, tagsPool, noEscapes, errLogger) + dst, tagsPool = unmarshalRow(dst, s, tagsPool, noEscapes, errLogger) + break + } else { + dst, tagsPool = unmarshalRow(dst, s[:n], tagsPool, noEscapes, errLogger) + s = s[n+1:] } - dst, tagsPool = unmarshalRow(dst, s[:n], tagsPool, noEscapes, errLogger) - s = s[n+1:] } + rowsReadScrape.Add(len(dst)) return dst, tagsPool }