From 8501b4a48de32acd19f0604634f6762c806e717a Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Mon, 9 Dec 2019 16:40:10 +0200 Subject: [PATCH] app/vminsert: consistency renaming for counters --- app/vminsert/graphite/request_handler.go | 10 +++++----- app/vminsert/influx/request_handler.go | 8 ++++---- app/vminsert/opentsdb/request_handler.go | 10 +++++----- app/vminsert/opentsdbhttp/request_handler.go | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/vminsert/graphite/request_handler.go b/app/vminsert/graphite/request_handler.go index fe9150dc5..2f57e7a5d 100644 --- a/app/vminsert/graphite/request_handler.go +++ b/app/vminsert/graphite/request_handler.go @@ -61,13 +61,13 @@ func (ctx *pushCtx) InsertRows() error { const flushTimeout = 3 * time.Second func (ctx *pushCtx) Read(r io.Reader) bool { - graphiteReadCalls.Inc() + readCalls.Inc() if ctx.err != nil { return false } if c, ok := r.(net.Conn); ok { if err := c.SetReadDeadline(time.Now().Add(flushTimeout)); err != nil { - graphiteReadErrors.Inc() + readErrors.Inc() ctx.err = fmt.Errorf("cannot set read deadline: %s", err) return false } @@ -79,7 +79,7 @@ func (ctx *pushCtx) Read(r io.Reader) bool { ctx.err = nil } else { if ctx.err != io.EOF { - graphiteReadErrors.Inc() + readErrors.Inc() ctx.err = fmt.Errorf("cannot read graphite plaintext protocol data: %s", ctx.err) } return false @@ -132,8 +132,8 @@ func (ctx *pushCtx) reset() { } var ( - graphiteReadCalls = metrics.NewCounter(`vm_read_calls_total{name="graphite"}`) - graphiteReadErrors = metrics.NewCounter(`vm_read_errors_total{name="graphite"}`) + readCalls = metrics.NewCounter(`vm_read_calls_total{name="graphite"}`) + readErrors = metrics.NewCounter(`vm_read_errors_total{name="graphite"}`) ) func getPushCtx() *pushCtx { diff --git a/app/vminsert/influx/request_handler.go b/app/vminsert/influx/request_handler.go index 3e60ea35b..d14937060 100644 --- a/app/vminsert/influx/request_handler.go +++ b/app/vminsert/influx/request_handler.go @@ -36,7 +36,7 @@ func InsertHandler(req *http.Request) error { } func insertHandlerInternal(req *http.Request) error { - influxReadCalls.Inc() + readCalls.Inc() r := req.Body if req.Header.Get("Content-Encoding") == "gzip" { @@ -132,7 +132,7 @@ func (ctx *pushCtx) Read(r io.Reader, tsMultiplier int64) bool { ctx.reqBuf, ctx.tailBuf, ctx.err = common.ReadLinesBlock(r, ctx.reqBuf, ctx.tailBuf) if ctx.err != nil { if ctx.err != io.EOF { - influxReadErrors.Inc() + readErrors.Inc() ctx.err = fmt.Errorf("cannot read influx line protocol data: %s", ctx.err) } return false @@ -166,8 +166,8 @@ func (ctx *pushCtx) Read(r io.Reader, tsMultiplier int64) bool { } var ( - influxReadCalls = metrics.NewCounter(`vm_read_calls_total{name="influx"}`) - influxReadErrors = metrics.NewCounter(`vm_read_errors_total{name="influx"}`) + readCalls = metrics.NewCounter(`vm_read_calls_total{name="influx"}`) + readErrors = metrics.NewCounter(`vm_read_errors_total{name="influx"}`) ) type pushCtx struct { diff --git a/app/vminsert/opentsdb/request_handler.go b/app/vminsert/opentsdb/request_handler.go index 911ab530a..7ad872fc9 100644 --- a/app/vminsert/opentsdb/request_handler.go +++ b/app/vminsert/opentsdb/request_handler.go @@ -61,13 +61,13 @@ func (ctx *pushCtx) InsertRows() error { const flushTimeout = 3 * time.Second func (ctx *pushCtx) Read(r io.Reader) bool { - opentsdbReadCalls.Inc() + readCalls.Inc() if ctx.err != nil { return false } if c, ok := r.(net.Conn); ok { if err := c.SetReadDeadline(time.Now().Add(flushTimeout)); err != nil { - opentsdbReadErrors.Inc() + readErrors.Inc() ctx.err = fmt.Errorf("cannot set read deadline: %s", err) return false } @@ -79,7 +79,7 @@ func (ctx *pushCtx) Read(r io.Reader) bool { ctx.err = nil } else { if ctx.err != io.EOF { - opentsdbReadErrors.Inc() + readErrors.Inc() ctx.err = fmt.Errorf("cannot read OpenTSDB put protocol data: %s", ctx.err) } return false @@ -131,8 +131,8 @@ func (ctx *pushCtx) reset() { } var ( - opentsdbReadCalls = metrics.NewCounter(`vm_read_calls_total{name="opentsdb"}`) - opentsdbReadErrors = metrics.NewCounter(`vm_read_errors_total{name="opentsdb"}`) + readCalls = metrics.NewCounter(`vm_read_calls_total{name="opentsdb"}`) + readErrors = metrics.NewCounter(`vm_read_errors_total{name="opentsdb"}`) ) func getPushCtx() *pushCtx { diff --git a/app/vminsert/opentsdbhttp/request_handler.go b/app/vminsert/opentsdbhttp/request_handler.go index 4e8423932..8cdcf58af 100644 --- a/app/vminsert/opentsdbhttp/request_handler.go +++ b/app/vminsert/opentsdbhttp/request_handler.go @@ -19,9 +19,9 @@ var ( rowsInserted = metrics.NewCounter(`vm_rows_inserted_total{type="opentsdb-http"}`) rowsPerInsert = metrics.NewSummary(`vm_rows_per_insert{type="opentsdb-http"}`) - opentsdbReadCalls = metrics.NewCounter(`vm_read_calls_total{name="opentsdb-http"}`) - opentsdbReadErrors = metrics.NewCounter(`vm_read_errors_total{name="opentsdb-http"}`) - opentsdbUnmarshalErrors = metrics.NewCounter(`vm_unmarshal_errors_total{name="opentsdb-http"}`) + readCalls = metrics.NewCounter(`vm_read_calls_total{name="opentsdb-http"}`) + readErrors = metrics.NewCounter(`vm_read_errors_total{name="opentsdb-http"}`) + unmarshalErrors = metrics.NewCounter(`vm_unmarshal_errors_total{name="opentsdb-http"}`) ) // insertHandler processes HTTP OpenTSDB put requests. @@ -33,13 +33,13 @@ func insertHandler(req *http.Request, maxSize int64) error { } func insertHandlerInternal(req *http.Request, maxSize int64) error { - opentsdbReadCalls.Inc() + readCalls.Inc() r := req.Body if req.Header.Get("Content-Encoding") == "gzip" { zr, err := common.GetGzipReader(r) if err != nil { - opentsdbReadErrors.Inc() + readErrors.Inc() return fmt.Errorf("cannot read gzipped http protocol data: %s", err) } defer common.PutGzipReader(zr) @@ -53,11 +53,11 @@ func insertHandlerInternal(req *http.Request, maxSize int64) error { lr := io.LimitReader(r, maxSize+1) reqLen, err := ctx.reqBuf.ReadFrom(lr) if err != nil { - opentsdbReadErrors.Inc() + readErrors.Inc() return fmt.Errorf("cannot read HTTP OpenTSDB request: %s", err) } if reqLen > maxSize { - opentsdbReadErrors.Inc() + readErrors.Inc() return fmt.Errorf("too big HTTP OpenTSDB request; mustn't exceed %d bytes", maxSize) } @@ -66,7 +66,7 @@ func insertHandlerInternal(req *http.Request, maxSize int64) error { defer parserPool.Put(p) v, err := p.ParseBytes(ctx.reqBuf.B) if err != nil { - opentsdbUnmarshalErrors.Inc() + unmarshalErrors.Inc() return fmt.Errorf("cannot parse HTTP OpenTSDB json: %s", err) } ctx.Rows.Unmarshal(v)