add options to JSON output

reporter.go

@@ -8,6 +8,7 @@ import (
 
 // Reporter gethers all the results
 type Reporter struct {
+	options *Options
 	results chan *callResult
 	done    chan bool
 
@@ -24,7 +25,8 @@ type Reporter struct {
 
 // Report holds the data for the full test
 type Report struct {
-	Date time.Time `json:"date"`
+	Options *Options  `json:"options,omitempty"`
+	Date    time.Time `json:"date"`
 
 	Count   uint64        `json:"count"`
 	Total   time.Duration `json:"total"`
@@ -78,9 +80,10 @@ type ResultDetail struct {
 	Status  string        `json:"status"`
 }
 
-func newReporter(results chan *callResult, n int) *Reporter {
-	cap := min(n, maxResult)
+func newReporter(results chan *callResult, options *Options) *Reporter {
+	cap := min(options.N, maxResult)
 	return &Reporter{
+		options:        options,
 		results:        results,
 		done:           make(chan bool, 1),
 		statusCodeDist: make(map[string]int),
@@ -122,6 +125,7 @@ func (r *Reporter) Finalize(total time.Duration) *Report {
 	rps := float64(r.totalCount) / total.Seconds()
 
 	rep := &Report{
+		Options:        r.options,
 		Date:           time.Now(),
 		Count:          r.totalCount,
 		Total:          total,

requester.go

@@ -23,18 +23,18 @@ import (
 
 // Options represents the request options
 type Options struct {
-	Host          string
-	Cert          string
-	CName         string
-	N             int
-	C             int
-	QPS           int
-	Z             time.Duration
-	Timeout       int
-	DialTimtout   int
-	KeepaliveTime int
-	Data          interface{}
-	Metadata      *map[string]string
+	Host          string             `json:"host,omitempty"`
+	Cert          string             `json:"cert,omitempty"`
+	CName         string             `json:"cname,omitempty"`
+	N             int                `json:"n,omitempty"`
+	C             int                `json:"c,omitempty"`
+	QPS           int                `json:"qps,omitempty"`
+	Z             time.Duration      `json:"z,omitempty"`
+	Timeout       int                `json:"timeout,omitempty"`
+	DialTimtout   int                `json:"dialTimeout,omitempty"`
+	KeepaliveTime int                `json:"keepAlice,omitempty"`
+	Data          interface{}        `json:"data,omitempty"`
+	Metadata      *map[string]string `json:"metadata,omitempty"`
 }
 
 // Max size of the buffer of result channel.
@@ -113,7 +113,7 @@ func (b *Requester) Run() (*Report, error) {
 
 	b.stub = grpcdynamic.NewStub(cc)
 
-	b.reporter = newReporter(b.results, b.config.N)
+	b.reporter = newReporter(b.results, b.config)
 
 	go func() {
 		b.reporter.Run()