From a3dc756be49fb4de05b232ca20fe4c3b5dc6c9cf Mon Sep 17 00:00:00 2001
From: Alan Bernstein <alan.aaron.bernstein@gmail.com>
Date: Tue, 8 May 2018 19:46:26 -0500
Subject: [PATCH] Wrap errors in handler

---
 handler.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/handler.go b/handler.go
index 7bf11af1b..6eccd70a8 100644
--- a/handler.go
+++ b/handler.go
@@ -349,7 +349,7 @@ func (p *postIndexRequest) UnmarshalJSON(b []byte) error {
 	// m is an overflow map used to capture additional, unexpected keys.
 	m := make(map[string]interface{})
 	if err := json.Unmarshal(b, &m); err != nil {
-		return err
+		return errors.Wrap(err, "unmarshalling unexpected values")
 	}
 
 	validIndexOptions := getValidOptions(IndexOptions{})
@@ -360,7 +360,7 @@ func (p *postIndexRequest) UnmarshalJSON(b []byte) error {
 	// Unmarshal expected values.
 	var _p _postIndexRequest
 	if err := json.Unmarshal(b, &_p); err != nil {
-		return err
+		return errors.Wrap(err, "unmarshalling expected values")
 	}
 
 	p.Options = _p.Options
@@ -526,7 +526,7 @@ func (p *postFrameRequest) UnmarshalJSON(b []byte) error {
 	// m is an overflow map used to capture additional, unexpected keys.
 	m := make(map[string]interface{})
 	if err := json.Unmarshal(b, &m); err != nil {
-		return err
+		return errors.Wrap(err, "unmarshaling unexpected keys")
 	}
 
 	validFrameOptions := getValidOptions(FrameOptions{})
@@ -538,7 +538,7 @@ func (p *postFrameRequest) UnmarshalJSON(b []byte) error {
 	// Unmarshal expected values.
 	var _p _postFrameRequest
 	if err := json.Unmarshal(b, &_p); err != nil {
-		return err
+		return errors.Wrap(err, "unmarshalling expected keys")
 	}
 
 	p.Options = _p.Options
@@ -813,13 +813,13 @@ func (h *Handler) readProtobufQueryRequest(r *http.Request) (*QueryRequest, erro
 	// Slurp the body.
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "reading")
 	}
 
 	// Unmarshal into object.
 	var req internal.QueryRequest
 	if err := proto.Unmarshal(body, &req); err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "unmarshalling")
 	}
 
 	return decodeQueryRequest(&req), nil
@@ -832,7 +832,7 @@ func (h *Handler) readURLQueryRequest(r *http.Request) (*QueryRequest, error) {
 	// Parse query string.
 	buf, err := ioutil.ReadAll(r.Body)
 	if err != nil {
-		return nil, err
+		return nil, errors.Wrap(err, "reading")
 	}
 	query := string(buf)
 
@@ -877,9 +877,9 @@ func (h *Handler) writeQueryResponse(w http.ResponseWriter, r *http.Request, res
 // writeProtobufQueryResponse writes the response from the executor to w as protobuf.
 func (h *Handler) writeProtobufQueryResponse(w http.ResponseWriter, resp *QueryResponse) error {
 	if buf, err := proto.Marshal(encodeQueryResponse(resp)); err != nil {
-		return err
+		return errors.Wrap(err, "marshalling")
 	} else if _, err := w.Write(buf); err != nil {
-		return err
+		return errors.Wrap(err, "writing")
 	}
 	return nil
 }
@@ -1327,7 +1327,7 @@ func parseUint64Slice(s string) ([]uint64, error) {
 		// Parse number.
 		num, err := strconv.ParseUint(str, 10, 64)
 		if err != nil {
-			return nil, err
+			return nil, errors.Wrap(err, "parsing int")
 		}
 		a = append(a, num)
 	}
@@ -1591,7 +1591,7 @@ func GetTimeStamp(data map[string]interface{}, timeField string) (int64, error)
 
 	v, err := time.Parse(TimeFormat, timestamp)
 	if err != nil {
-		return 0, err
+		return 0, errors.Wrap(err, "parsing timestamp")
 	}
 
 	return v.Unix(), nil