Skip to content

Add Work.RequestFunc #149

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.

Sign up for GitHub

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

Merged
rakyll merged 2 commits into from
Aug 6, 2020
+11 −3
Merged

Add Work.RequestFunc #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7341d4
Remove unused variable in test
twpayne Apr 25, 2019
25dc967
Add Work.RequestFunc
twpayne Apr 25, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion requester/requester.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ type Work struct {

RequestBody []byte

// RequestFunc is a function to generate requests. If it is nil, then
// Request and RequestData are cloned for each request.
RequestFunc func() *http.Request

// N is the total number of requests to make.
N int

Expand Down Expand Up @@ -146,7 +150,12 @@ func (b *Work) makeRequest(c *http.Client) {
var code int
var dnsStart, connStart, resStart, reqStart, delayStart time.Duration
var dnsDuration, connDuration, resDuration, reqDuration, delayDuration time.Duration
req := cloneRequest(b.Request, b.RequestBody)
var req *http.Request
if b.RequestFunc != nil {
req = b.RequestFunc()
} else {
req = cloneRequest(b.Request, b.RequestBody)
}
trace := &httptrace.ClientTrace{
DNSStart: func(info httptrace.DNSStartInfo) {
dnsStart = now()
Expand Down
3 changes: 1 addition & 2 deletions requester/requester_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@ func TestQps(t *testing.T) {
}

func TestRequest(t *testing.T) {
var uri, contentType, some, method, auth string
var uri, contentType, some, auth string
handler := func(w http.ResponseWriter, r *http.Request) {
uri = r.RequestURI
method = r.Method
contentType = r.Header.Get("Content-type")
some = r.Header.Get("X-some")
auth = r.Header.Get("Authorization")
Expand Down