HTTP load generator, ApacheBench (ab) replacement
Go
Simplify the runner.
Burcu Dogan5d2b920c8d0c
diff --git a/boomer/boomer.go b/boomer/boomer.goindex 290aebd..0ca0388 100644--- a/boomer/boomer.go+++ b/boomer/boomer.go@@ -92,7 +92,6 @@ type Boomer struct {ProxyAddr stringbar *pb.ProgressBar- rpt *reportresults chan *result}diff --git a/boomer/print.go b/boomer/print.goindex cab2b6c..b082e06 100644--- a/boomer/print.go+++ b/boomer/print.go@@ -34,25 +34,27 @@ type report struct {results chan *resulttotal time.Duration+ errors map[string]intstatusCodeDist map[int]intlats []float64- errors map[string]intsizeTotal int64output string}-func newReport(size int, results chan *result, output string) *report {- return &report{- statusCodeDist: make(map[int]int),- results: results,+func printReport(size int, results chan *result, output string, total time.Duration) {+ r := &report{output: output,+ results: results,+ total: total,+ statusCodeDist: make(map[int]int),errors: make(map[string]int),}+ r.finalize()}-func (r *report) finalize(total time.Duration) {+func (r *report) finalize() {for {select {case res := <-r.results:@@ -67,7 +69,6 @@ func (r *report) finalize(total time.Duration) {}}default:- r.total = totalr.rps = float64(len(r.lats)) / r.total.Seconds()r.average = r.avgTotal / float64(len(r.lats))r.print()diff --git a/boomer/run.go b/boomer/run.goindex 2f2cb1a..9dc790b 100644--- a/boomer/run.go+++ b/boomer/run.go@@ -16,8 +16,7 @@ package boomerimport ("crypto/tls"- "io"- "io/ioutil"+"sync""net"@@ -25,19 +24,31 @@ import ("time")+// Run makes all the requests, prints the summary. It blocks until+// all work is done.func (b *Boomer) Run() {b.results = make(chan *result, b.N)if b.Output == "" {b.bar = newPb(b.N)}- b.rpt = newReport(b.N, b.results, b.Output)++ start := time.Now()b.run()+ if b.Output == "" {+ b.bar.Finish()+ }++ printReport(b.N, b.results, b.Output, time.Now().Sub(start))+ close(b.results)}-func (b *Boomer) worker(ch chan *http.Request) {+func (b *Boomer) worker(wg *sync.WaitGroup, ch chan *http.Request) {host, _, _ := net.SplitHostPort(b.Req.OriginalHost)tr := &http.Transport{- TLSClientConfig: &tls.Config{InsecureSkipVerify: b.AllowInsecure, ServerName: host},+ TLSClientConfig: &tls.Config{+ InsecureSkipVerify: b.AllowInsecure,+ ServerName: host,+ },DisableCompression: b.DisableCompression,DisableKeepAlives: b.DisableKeepAlives,// TODO(jbd): Add dial timeout.@@ -49,23 +60,22 @@ func (b *Boomer) worker(ch chan *http.Request) {}}client := &http.Client{Transport: tr}+ _ = clientfor req := range ch {s := time.Now()- resp, err := client.Do(req)code := 0- var size int64 = 0+ size := int64(0)+ resp, err := client.Do(req)if err == nil {+ size = resp.ContentLengthcode = resp.StatusCode- if resp.ContentLength > 0 {- size = resp.ContentLength- }- io.Copy(ioutil.Discard, resp.Body)- // cleanup body, so the socket can be reusableresp.Body.Close()}if b.bar != nil {b.bar.Increment()}+ wg.Done()+b.results <- &result{statusCode: code,duration: time.Now().Sub(s),@@ -77,24 +87,18 @@ func (b *Boomer) worker(ch chan *http.Request) {func (b *Boomer) run() {var wg sync.WaitGroup- wg.Add(b.C)+ wg.Add(b.N)var throttle <-chan time.Timeif b.Qps > 0 {throttle = time.Tick(time.Duration(1e6/(b.Qps)) * time.Microsecond)}-- start := time.Now()jobs := make(chan *http.Request, b.N)- // Start workers.for i := 0; i < b.C; i++ {go func() {- b.worker(jobs)- wg.Done()+ b.worker(&wg, jobs)}()}-- // Start sending jobs to the workers.for i := 0; i < b.N; i++ {if b.Qps > 0 {<-throttle@@ -104,8 +108,4 @@ func (b *Boomer) run() {close(jobs)wg.Wait()- if b.bar != nil {- b.bar.Finish()- }- b.rpt.finalize(time.Now().Sub(start))}