HTTP load generator, ApacheBench (ab) replacement
Go
Remove ReqOpts.
Burcu Dogan62920bfeccd2
diff --git a/boom.go b/boom.goindex 61ba1cf..423d7f6 100644--- a/boom.go+++ b/boom.go@@ -154,16 +154,17 @@ func main() {}}+ req, err := http.NewRequest(method, url, strings.NewReader(*body))+ if err != nil {+ usageAndExit(err.Error())+ }+ req.Header = header+ if username != "" && password != "" {+ req.SetBasicAuth(username, password)+ }+(&boomer.Boomer{- Req: &boomer.ReqOpts{- Method: method,- URL: url,- Body: *body,- Header: header,- Username: username,- Password: password,- ReadAll: *readAll,- },+ Request: req,N: num,C: conc,Qps: q,@@ -173,6 +174,7 @@ func main() {DisableKeepAlives: *disableKeepAlives,ProxyAddr: proxyURL,Output: *output,+ ReadAll: *readAll,}).Run()}diff --git a/boomer/boomer.go b/boomer/boomer.goindex a1df266..90ed794 100644--- a/boomer/boomer.go+++ b/boomer/boomer.go@@ -21,7 +21,6 @@ import ("io/ioutil""net/http""net/url"- "strings""sync""time"@@ -39,30 +38,9 @@ type result struct {contentLength int64}-type ReqOpts struct {- Method string- URL string- Header http.Header- Body string- Username string- Password string- ReadAll bool-}--// Creates a req object from req options-func (r *ReqOpts) Request() *http.Request {- req, _ := http.NewRequest(r.Method, r.URL, strings.NewReader(r.Body))- req.Header = r.Header- if r.Username != "" && r.Password != "" {- req.SetBasicAuth(r.Username, r.Password)- }- return req-}-type Boomer struct {- // Req represents the options of the request to be made.- // TODO(jbd): Make it work with an http.Request instead.- Req *ReqOpts+ // Request is the request to be made.+ Request *http.Request// N is the total number of requests to make.N int@@ -93,6 +71,10 @@ type Boomer struct {// Optional.ProxyAddr *url.URL+ // ReadAll determines whether the body of the response needs+ // to be fully consumed.+ ReadAll bool+bar *pb.ProgressBarresults chan *result}@@ -134,7 +116,7 @@ func (b *Boomer) Run() {close(b.results)}-func (b *Boomer) runWorker(wg *sync.WaitGroup, ch chan *http.Request, readAll bool) {+func (b *Boomer) runWorker(wg *sync.WaitGroup, ch chan *http.Request) {for req := range ch {s := time.Now()@@ -145,7 +127,7 @@ func (b *Boomer) runWorker(wg *sync.WaitGroup, ch chan *http.Request, readAll boif err == nil {size = resp.ContentLengthcode = resp.StatusCode- if readAll {+ if b.ReadAll {_, err = io.Copy(ioutil.Discard, resp.Body)}resp.Body.Close()@@ -185,16 +167,30 @@ func (b *Boomer) runWorkers() {jobsch := make(chan *http.Request, b.N)for i := 0; i < b.C; i++ {- go b.runWorker(&wg, jobsch, b.Req.ReadAll)+ go b.runWorker(&wg, jobsch)}for i := 0; i < b.N; i++ {if b.Qps > 0 {<-throttle}- jobsch <- b.Req.Request()+ jobsch <- cloneRequest(b.Request)}close(jobsch)wg.Wait()}++// cloneRequest returns a clone of the provided *http.Request.+// The clone is a shallow copy of the struct and its Header map.+func cloneRequest(r *http.Request) *http.Request {+ // shallow copy of the struct+ r2 := new(http.Request)+ *r2 = *r+ // deep copy of the Header+ r2.Header = make(http.Header, len(r.Header))+ for k, s := range r.Header {+ r2.Header[k] = append([]string(nil), s...)+ }+ return r2+}diff --git a/boomer/run_test.go b/boomer/run_test.goindex 9512e51..9139de2 100644--- a/boomer/run_test.go+++ b/boomer/run_test.go@@ -15,6 +15,7 @@package boomerimport (+ "bytes""io/ioutil""net/http""net/http/httptest"@@ -32,13 +33,11 @@ func TestN(t *testing.T) {server := httptest.NewServer(http.HandlerFunc(handler))defer server.Close()+ req, _ := http.NewRequest("GET", server.URL, nil)boomer := &Boomer{- Req: &ReqOpts{- Method: "GET",- URL: server.URL,- },- N: 20,- C: 2,+ Request: req,+ N: 20,+ C: 2,}boomer.Run()if count != 20 {@@ -55,14 +54,12 @@ func TestQps(t *testing.T) {server := httptest.NewServer(http.HandlerFunc(handler))defer server.Close()+ req, _ := http.NewRequest("GET", server.URL, nil)boomer := &Boomer{- Req: &ReqOpts{- Method: "GET",- URL: server.URL,- },- N: 20,- C: 2,- Qps: 1,+ Request: req,+ N: 20,+ C: 2,+ Qps: 1,}wg.Add(1)time.AfterFunc(time.Second, func() {@@ -90,16 +87,13 @@ func TestRequest(t *testing.T) {header := make(http.Header)header.Add("Content-type", "text/html")header.Add("X-some", "value")+ req, _ := http.NewRequest("GET", server.URL, nil)+ req.SetBasicAuth("username", "password")+ req.Header = headerboomer := &Boomer{- Req: &ReqOpts{- Method: "PUT",- URL: server.URL,- Header: header,- Username: "username",- Password: "password",- },- N: 1,- C: 1,+ Request: req,+ N: 1,+ C: 1,}boomer.Run()if uri != "/" {@@ -127,14 +121,11 @@ func TestBody(t *testing.T) {server := httptest.NewServer(http.HandlerFunc(handler))defer server.Close()+ req, _ := http.NewRequest("POST", server.URL, bytes.NewBuffer("Body"))boomer := &Boomer{- Req: &ReqOpts{- Method: "POST",- URL: server.URL,- Body: "Body",- },- N: 10,- C: 1,+ Request: req,+ N: 10,+ C: 1,}boomer.Run()if count != 10 {