Improve csv output

Author: pgilad

README.md

@@ -10,8 +10,7 @@ Parse JMeter JTL files, supporting:
 - Cookies
 - More...
 
-The parser is a **stream decoder**, meaning it's safe to use
-for very large files
+The parser is a **stream decoder**, meaning it's safe to use for very large files
 
 ## Usage
 
@@ -45,10 +44,12 @@ $ ./compare.sh data.jtl
 
 - CSV
 
-Currently CSV output is not configurable, and outputs only:
-- label
-- timestamp
-- latency
+Sample CSV output:
+```csv
+Label,Timestamp,Response Time,Latency,Users
+Label1,1519028940050,1205,1205,1
+Label2,1519028941268,93,93,1
+```
 
 ## License
 

jtl/jtl.go

@@ -79,25 +79,25 @@ type HttpSample struct {
 	NestedSamples
 }
 
-func (s Sample) MarshalJSON() ([]byte, error) {
+func (sample Sample) MarshalJSON() ([]byte, error) {
 	type Alias Sample
 	return json.Marshal(&struct {
 		Type string `json:"type"`
 		Alias
 	}{
 		Type:  "sample",
-		Alias: (Alias)(s),
+		Alias: (Alias)(sample),
 	})
 }
 
-func (s HttpSample) MarshalJSON() ([]byte, error) {
+func (sample HttpSample) MarshalJSON() ([]byte, error) {
 	type Alias HttpSample
 	return json.Marshal(&struct {
 		Type string `json:"type"`
 		Alias
 	}{
 		Type:  "httpSample",
-		Alias: (Alias)(s),
+		Alias: (Alias)(sample),
 	})
 }
 

output/csv.go

@@ -13,7 +13,7 @@ func CSV(output <-chan interface{}) {
 	defer writer.Flush()
 
 	// write csv header
-	writer.Write([]string{"Label", "Timestamp", "Latency", "Users"})
+	writer.Write([]string{"Label", "Timestamp", "Response Time", "Latency", "Users"})
 
 	for {
 		element, more := <-output
@@ -33,8 +33,32 @@ func CSV(output <-chan interface{}) {
 	}
 }
 
-func writeHttpSample(sample jtl.HttpSample, writer *csv.Writer) {
-	data := []string{*sample.Label, strconv.FormatUint(*sample.Timestamp, 10), strconv.Itoa(*sample.Latency), strconv.Itoa(*sample.NA)}
+func createCSVRow(sample interface{}) []string {
+	// TODO: remove duplication
+	switch s := sample.(type) {
+	case jtl.Sample:
+		return []string{
+			*s.Label,
+			strconv.FormatUint(*s.Timestamp, 10),
+			strconv.Itoa(*s.ElapsedTime),
+			strconv.Itoa(*s.ElapsedTime),
+			strconv.Itoa(*s.NA),
+		}
+	case jtl.HttpSample:
+		return []string{
+			*s.Label,
+			strconv.FormatUint(*s.Timestamp, 10),
+			strconv.Itoa(*s.ElapsedTime),
+			strconv.Itoa(*s.ElapsedTime),
+			strconv.Itoa(*s.NA),
+		}
+	default:
+		return []string{}
+	}
+}
+
+func writeSample(sample jtl.Sample, writer *csv.Writer) {
+	data := createCSVRow(sample)
 	writer.Write(data)
 	for _, row := range sample.Samples {
 		writeSample(row, writer)
@@ -44,8 +68,8 @@ func writeHttpSample(sample jtl.HttpSample, writer *csv.Writer) {
 	}
 }
 
-func writeSample(sample jtl.Sample, writer *csv.Writer) {
-	data := []string{*sample.Label, strconv.FormatUint(*sample.Timestamp, 10), strconv.Itoa(*sample.Latency), strconv.Itoa(*sample.NA)}
+func writeHttpSample(sample jtl.HttpSample, writer *csv.Writer) {
+	data := createCSVRow(sample)
 	writer.Write(data)
 	for _, row := range sample.Samples {
 		writeSample(row, writer)