github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-02-09 15:27:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

app/vmalert: consistently use "%w" instead of "%s" in fmt.Errorf when wrapping errors

Browse source
This commit is contained in:
Aliaksandr Valialkin 2020-07-15 13:54:45 +03:00
parent 9eb71dda3d
commit ed7580ad22
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/vmalert/remotewrite/remotewrite.go
View file

@ -226,14 +226,14 @@ func (c *Client) send(ctx context.Context, data []byte) error {
r := bytes.NewReader(data) r := bytes.NewReader(data)
req, err := http.NewRequest("POST", c.addr, r) req, err := http.NewRequest("POST", c.addr, r)
if err != nil { if err != nil {
return fmt.Errorf("failed to create new HTTP request: %s", err) return fmt.Errorf("failed to create new HTTP request: %w", err)
} }
if c.baPass != "" { if c.baPass != "" {
req.SetBasicAuth(c.baUser, c.baPass) req.SetBasicAuth(c.baUser, c.baPass)
} }
resp, err := c.c.Do(req.WithContext(ctx)) resp, err := c.c.Do(req.WithContext(ctx))
if err != nil { if err != nil {
return fmt.Errorf("error while sending request to %s: %s; Data len %d(%d)", return fmt.Errorf("error while sending request to %s: %w; Data len %d(%d)",
req.URL, err, len(data), r.Size()) req.URL, err, len(data), r.Size())
} }
defer func() { _ = resp.Body.Close() }() defer func() { _ = resp.Body.Close() }()

6
app/vmalert/remotewrite/remotewrite_test.go
View file

@ -82,19 +82,19 @@ func (rw *rwServer) handler(w http.ResponseWriter, r *http.Request) {
} }
data, err := ioutil.ReadAll(r.Body) data, err := ioutil.ReadAll(r.Body)
if err != nil { if err != nil {
rw.err(w, fmt.Errorf("body read err: %s", err)) rw.err(w, fmt.Errorf("body read err: %w", err))
return return
} }
defer func() { _ = r.Body.Close() }() defer func() { _ = r.Body.Close() }()
b, err := snappy.Decode(nil, data) b, err := snappy.Decode(nil, data)
if err != nil { if err != nil {
rw.err(w, fmt.Errorf("decode err: %s", err)) rw.err(w, fmt.Errorf("decode err: %w", err))
return return
} }
wr := &prompb.WriteRequest{} wr := &prompb.WriteRequest{}
if err := wr.Unmarshal(b); err != nil { if err := wr.Unmarshal(b); err != nil {
rw.err(w, fmt.Errorf("unmarhsal err: %s", err)) rw.err(w, fmt.Errorf("unmarhsal err: %w", err))
return return
} }
atomic.AddUint64(&rw.acceptedRows, uint64(len(wr.Timeseries))) atomic.AddUint64(&rw.acceptedRows, uint64(len(wr.Timeseries)))