diff --git a/pkg/distributor/push.go b/pkg/distributor/push.go index 7d48966bf22..4816954c0af 100644 --- a/pkg/distributor/push.go +++ b/pkg/distributor/push.go @@ -164,7 +164,7 @@ func handler( if err := parser(ctx, r, maxRecvMsgSize, rb, &req, logger); err != nil { // Check for httpgrpc error, default to client error if parsing failed if _, ok := httpgrpc.HTTPResponseFromError(err); !ok { - err = httpgrpc.Errorf(http.StatusBadRequest, "%s", err.Error()) + err = httpgrpc.Error(http.StatusBadRequest, err.Error()) } rb.CleanUp() diff --git a/pkg/distributor/push_test.go b/pkg/distributor/push_test.go index 92831c9d41b..2cba6f9db61 100644 --- a/pkg/distributor/push_test.go +++ b/pkg/distributor/push_test.go @@ -534,14 +534,14 @@ func TestHandler_ErrorTranslation(t *testing.T) { }{ { name: "a generic error during request parsing gets an HTTP 400", - err: fmt.Errorf("%s", errMsg), + err: errors.New(errMsg), expectedHTTPStatus: http.StatusBadRequest, expectedErrorMessage: errMsg, expectedLogs: []string{`level=error user=testuser msg="detected an error while ingesting Prometheus remote-write request (the request may have been partially ingested)" httpCode=400 err="rpc error: code = Code(400) desc = this is an error" insight=true`}, }, { name: "a gRPC error with a status during request parsing gets translated into HTTP error without DoNotLogError header", - err: httpgrpc.Errorf(http.StatusRequestEntityTooLarge, "%s", errMsg), + err: httpgrpc.Error(http.StatusRequestEntityTooLarge, errMsg), expectedHTTPStatus: http.StatusRequestEntityTooLarge, expectedErrorMessage: errMsg, expectedLogs: []string{`level=error user=testuser msg="detected an error while ingesting Prometheus remote-write request (the request may have been partially ingested)" httpCode=413 err="rpc error: code = Code(413) desc = this is an error" insight=true`}, @@ -590,14 +590,14 @@ func TestHandler_ErrorTranslation(t *testing.T) { }, { name: "a generic error during push gets a HTTP 500 without DoNotLogError header", - err: fmt.Errorf("%s", errMsg), + err: errors.New(errMsg), expectedHTTPStatus: http.StatusInternalServerError, expectedErrorMessage: errMsg, expectedLogs: []string{`level=error user=testuser msg="detected an error while ingesting Prometheus remote-write request (the request may have been partially ingested)" httpCode=500 err="this is an error"`}, }, { name: "a DoNotLogError of a generic error during push gets a HTTP 500 with DoNotLogError header", - err: middleware.DoNotLogError{Err: fmt.Errorf("%s", errMsg)}, + err: middleware.DoNotLogError{Err: errors.New(errMsg)}, expectedHTTPStatus: http.StatusInternalServerError, expectedErrorMessage: errMsg, expectedDoNotLogErrorHeader: true, diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 68ab65632b2..5fd6f2d05c1 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -405,7 +405,7 @@ func (s *Scheduler) cancelRequestAndRemoveFromPending(key queue.RequestKey, reas req := s.schedulerInflightRequests[key] if req != nil { - req.CancelFunc(cancellation.NewErrorf("%s", reason)) + req.CancelFunc(cancellation.NewError(reason)) } delete(s.schedulerInflightRequests, key) diff --git a/tools/tsdb-index-toc/main.go b/tools/tsdb-index-toc/main.go index 4a9c1edbf16..a226d68fec8 100644 --- a/tools/tsdb-index-toc/main.go +++ b/tools/tsdb-index-toc/main.go @@ -33,18 +33,18 @@ func main() { finfo, err := os.Stat(filepath) if err != nil { - log.Fatalf("%s", err.Error()) + log.Fatal(err.Error()) } indexSize := finfo.Size() f, err := fileutil.OpenMmapFile(filepath) if err != nil { - log.Fatalf("%s", err.Error()) + log.Fatal(err.Error()) } toc, err := index.NewTOCFromByteSlice(realByteSlice(f.Bytes())) if err != nil { - log.Fatalf("%s", err.Error()) + log.Fatal(err.Error()) } // See https://github.com/prometheus/prometheus/blob/main/tsdb/docs/format/index.md on the index format.