Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bucket histogram option #68

Merged
merged 5 commits into from
Oct 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ Usage:
Flags:
-b, --body string A request body to be sent.
-B, --body-file string The path to file whose content will be set as the http request body.
--buckets Histogram buckets in comma-separated value (example: "10ms, 100ms, 500ms".
-c, --connections int Amount of maximum open idle connections per target host (default 10000)
--debug Run in debug mode.
-d, --duration duration The amount of time to issue requests to the targets. Give 0s for an infinite attack. (default 10s)
Expand Down
9 changes: 8 additions & 1 deletion attacker/attacker.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ type Options struct {
Connections int
HTTP2 bool
LocalAddr net.IPAddr
Buckets []time.Duration

Attacker Attacker
}
Expand Down Expand Up @@ -100,7 +101,13 @@ func Attack(ctx context.Context, target string, resCh chan *Result, metricsCh ch
Header: opts.Header,
})

metrics := &vegeta.Metrics{}
var metrics *vegeta.Metrics
if len(opts.Buckets) > 0 {
histogram := &vegeta.Histogram{Buckets: opts.Buckets}
metrics = &vegeta.Metrics{Histogram: histogram}
} else {
metrics = &vegeta.Metrics{}
}

child, cancelChild := context.WithCancel(ctx)
defer cancelChild()
Expand Down
29 changes: 29 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ type cli struct {
noHTTP2 bool
localAddress string
noKeepAlive bool
buckets string

debug bool
version bool
Expand Down Expand Up @@ -81,6 +82,7 @@ func parseFlags(stdout, stderr io.Writer) (*cli, error) {
flagSet.IntVarP(&c.connections, "connections", "c", attacker.DefaultConnections, "Amount of maximum open idle connections per target host")
flagSet.BoolVar(&c.noHTTP2, "no-http2", false, "Don't issue HTTP/2 requests to servers which support it.")
flagSet.StringVar(&c.localAddress, "local-addr", "0.0.0.0", "Local IP address.")
flagSet.StringVar(&c.buckets, "buckets", "", "Histogram buckets; comma-separated list.")
flagSet.Usage = c.usage
if err := flagSet.Parse(os.Args[1:]); err != nil {
if !errors.Is(err, flag.ErrHelp) {
Expand Down Expand Up @@ -177,6 +179,12 @@ func (c *cli) makeOptions() (*attacker.Options, error) {

localAddr := net.IPAddr{IP: net.ParseIP(c.localAddress)}

parsedBuckets, err := parseBucketOptions(c.buckets)

if err != nil {
return nil, fmt.Errorf("wrong buckets format %w", err)
}

return &attacker.Options{
Rate: c.rate,
Duration: c.duration,
Expand All @@ -191,6 +199,7 @@ func (c *cli) makeOptions() (*attacker.Options, error) {
Connections: c.connections,
HTTP2: !c.noHTTP2,
LocalAddr: localAddr,
Buckets: parsedBuckets,
}, nil
}

Expand All @@ -202,6 +211,26 @@ func validateMethod(method string) bool {
return false
}

func parseBucketOptions(rawBuckets string) ([]time.Duration, error) {
if rawBuckets == "" {
return []time.Duration{}, nil
}

stringBuckets := strings.Split(rawBuckets, ",")
result := make([]time.Duration, len(stringBuckets))

for _, bucket := range stringBuckets {
trimmedBucket := strings.TrimSpace(bucket)
d, err := time.ParseDuration(trimmedBucket)
if err != nil {
return nil, err
}
result = append(result, d)
}

return result, nil
}

// Makes a new file under the working directory only when debug use.
func setDebug(w io.Writer, debug bool) {
if !debug {
Expand Down
4 changes: 4 additions & 0 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ func TestMakeOptions(t *testing.T) {
MaxBody: 0,
HTTP2: true,
KeepAlive: true,
Buckets: []time.Duration{},
},
wantErr: false,
},
Expand All @@ -229,6 +230,7 @@ func TestMakeOptions(t *testing.T) {
MaxBody: 0,
HTTP2: true,
KeepAlive: true,
Buckets: []time.Duration{},
},
wantErr: false,
},
Expand Down Expand Up @@ -267,6 +269,7 @@ func TestMakeOptions(t *testing.T) {
MaxBody: 0,
HTTP2: false,
KeepAlive: true,
Buckets: []time.Duration{},
},
wantErr: false,
},
Expand Down Expand Up @@ -294,6 +297,7 @@ func TestMakeOptions(t *testing.T) {
MaxBody: 0,
HTTP2: true,
KeepAlive: false,
Buckets: []time.Duration{},
},
wantErr: false,
},
Expand Down