Add output option for csv format

cmd/collectors.go

@@ -30,6 +30,7 @@ import (
 	"github.com/loadimpact/k6/lib"
 	"github.com/loadimpact/k6/lib/consts"
 	"github.com/loadimpact/k6/stats/cloud"
+	"github.com/loadimpact/k6/stats/csv"
 	"github.com/loadimpact/k6/stats/datadog"
 	"github.com/loadimpact/k6/stats/influxdb"
 	jsonc "github.com/loadimpact/k6/stats/json"
@@ -47,6 +48,7 @@ const (
 	collectorCloud    = "cloud"
 	collectorStatsD   = "statsd"
 	collectorDatadog  = "datadog"
+	collectorCSV      = "csv"
 )
 
 func parseCollector(s string) (t, arg string) {
@@ -111,6 +113,19 @@ func newCollector(collectorName, arg string, src *lib.SourceData, conf Config) (
 				return nil, err
 			}
 			return datadog.New(config)
+		case collectorCSV:
+			config := csv.NewConfig().Apply(conf.Collectors.CSV)
+			if err := envconfig.Process("k6", &config); err != nil {
+				return nil, err
+			}
+			if arg != "" {
+				cmdConfig, err := csv.ParseArg(arg)
+				if err != nil {
+					return nil, err
+				}
+				config = config.Apply(cmdConfig)
+			}
+			return csv.New(afero.NewOsFs(), conf.SystemTags, config)
 		default:
 			return nil, errors.Errorf("unknown output type: %s", collectorName)
 		}

cmd/config.go

@@ -35,6 +35,7 @@ import (
 	"github.com/loadimpact/k6/lib/scheduler"
 	"github.com/loadimpact/k6/lib/types"
 	"github.com/loadimpact/k6/stats/cloud"
+	"github.com/loadimpact/k6/stats/csv"
 	"github.com/loadimpact/k6/stats/datadog"
 	"github.com/loadimpact/k6/stats/influxdb"
 	"github.com/loadimpact/k6/stats/kafka"
@@ -72,6 +73,7 @@ type Config struct {
 		Cloud    cloud.Config    `json:"cloud"`
 		StatsD   common.Config   `json:"statsd"`
 		Datadog  datadog.Config  `json:"datadog"`
+		CSV      csv.Config      `json:"csv"`
 	} `json:"collectors"`
 }
 
@@ -97,6 +99,7 @@ func (c Config) Apply(cfg Config) Config {
 	c.Collectors.Kafka = c.Collectors.Kafka.Apply(cfg.Collectors.Kafka)
 	c.Collectors.StatsD = c.Collectors.StatsD.Apply(cfg.Collectors.StatsD)
 	c.Collectors.Datadog = c.Collectors.Datadog.Apply(cfg.Collectors.Datadog)
+	c.Collectors.CSV = c.Collectors.CSV.Apply(cfg.Collectors.CSV)
 	return c
 }
 

stats/csv/collector.go

@@ -0,0 +1,233 @@
+/*
+ *
+ * k6 - a next-generation load testing tool
+ * Copyright (C) 2016 Load Impact
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package csv
+
+import (
+	"bytes"
+	"context"
+	"encoding/csv"
+	"fmt"
+	"io"
+	"os"
+	"sort"
+	"sync"
+	"time"
+
+	"github.com/loadimpact/k6/lib"
+	"github.com/loadimpact/k6/stats"
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/afero"
+)
+
+// Collector saving output to csv implements the lib.Collector interface
+type Collector struct {
+	outfile      io.WriteCloser
+	fname        string
+	resTags      []string
+	ignoredTags  []string
+	csvWriter    *csv.Writer
+	csvLock      sync.Mutex
+	buffer       []stats.Sample
+	bufferLock   sync.Mutex
+	row          []string
+	saveInterval time.Duration
+}
+
+// Verify that Collector implements lib.Collector
+var _ lib.Collector = &Collector{}
+
+// Similar to ioutil.NopCloser, but for writers
+type nopCloser struct {
+	io.Writer
+}
+
+func (nopCloser) Close() error { return nil }
+
+// New Creates new instance of CSV collector
+func New(fs afero.Fs, tags lib.TagSet, config Config) (*Collector, error) {
+	resTags := []string{}
+	ignoredTags := []string{}
+	for tag, flag := range tags {
+		if flag {
+			resTags = append(resTags, tag)
+		} else {
+			ignoredTags = append(ignoredTags, tag)
+		}
+	}
+	sort.Strings(resTags)
+	sort.Strings(ignoredTags)
+
+	saveInterval := time.Duration(config.SaveInterval.Duration)
+	fname := config.FileName.String
+
+	if fname == "" || fname == "-" {
+		logfile := nopCloser{os.Stdout}
+		return &Collector{
+			outfile:      logfile,
+			fname:        "-",
+			resTags:      resTags,
+			ignoredTags:  ignoredTags,
+			csvWriter:    csv.NewWriter(logfile),
+			row:          make([]string, 0, 3+len(resTags)+1),
+			saveInterval: saveInterval,
+		}, nil
+	}
+
+	logfile, err := fs.Create(fname)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Collector{
+		outfile:      logfile,
+		fname:        fname,
+		resTags:      resTags,
+		ignoredTags:  ignoredTags,
+		csvWriter:    csv.NewWriter(logfile),
+		row:          make([]string, 0, 3+len(resTags)+1),
+		saveInterval: saveInterval,
+	}, nil
+}
+
+// Init writes column names to csv file
+func (c *Collector) Init() error {
+	header := MakeHeader(c.resTags)
+	err := c.csvWriter.Write(header)
+	if err != nil {
+		logrus.WithField("filename", c.fname).Error("CSV: Error writing column names to file")
+	}
+	c.csvWriter.Flush()
+	return nil
+}
+
+// SetRunStatus does nothing
+func (c *Collector) SetRunStatus(status lib.RunStatus) {}
+
+// Run just blocks until the context is done
+func (c *Collector) Run(ctx context.Context) {
+	ticker := time.NewTicker(c.saveInterval)
+	for {
+		select {
+		case <-ticker.C:
+			c.WriteToFile()
+		case <-ctx.Done():
+			c.WriteToFile()
+			err := c.outfile.Close()
+			if err != nil {
+				logrus.WithField("filename", c.fname).Error("CSV: Error closing the file")
+			}
+			return
+		}
+	}
+}
+
+// Collect Saves samples to buffer
+func (c *Collector) Collect(scs []stats.SampleContainer) {
+	c.bufferLock.Lock()
+	defer c.bufferLock.Unlock()
+	for _, sc := range scs {
+		c.buffer = append(c.buffer, sc.GetSamples()...)
+	}
+}
+
+// WriteToFile Writes samples to the csv file
+func (c *Collector) WriteToFile() {
+	c.bufferLock.Lock()
+	samples := c.buffer
+	c.buffer = nil
+	c.bufferLock.Unlock()
+
+	if len(samples) > 0 {
+		c.csvLock.Lock()
+		defer c.csvLock.Unlock()
+		for _, sc := range samples {
+			for _, sample := range sc.GetSamples() {
+				sample := sample
+				if &sample != nil {
+					row := c.row[:0]
+					row = SampleToRow(&sample, c.resTags, c.ignoredTags, row)
+					err := c.csvWriter.Write(row)
+					if err != nil {
+						logrus.WithField("filename", c.fname).Error("CSV: Error writing to file")
+					}
+				}
+			}
+		}
+		c.csvWriter.Flush()
+	}
+}
+
+// Link returns a dummy string, it's only included to satisfy the lib.Collector interface
+func (c *Collector) Link() string {
+	return c.fname
+}
+
+// MakeHeader creates list of column names for csv file
+func MakeHeader(tags []string) []string {
+	tags = append(tags, "extra_tags")
+	return append([]string{"metric_name", "timestamp", "metric_value"}, tags...)
+}
+
+// SampleToRow converts sample into array of strings
+func SampleToRow(sample *stats.Sample, resTags []string, ignoredTags []string, row []string) []string {
+	row = append(row, sample.Metric.Name)
+	row = append(row, fmt.Sprintf("%d", sample.Time.Unix()))
+	row = append(row, fmt.Sprintf("%f", sample.Value))
+	sampleTags := sample.Tags.CloneTags()
+
+	for _, tag := range resTags {
+		row = append(row, sampleTags[tag])
+	}
+
+	extraTags := bytes.Buffer{}
+	prev := false
+	for tag, val := range sampleTags {
+		if sort.SearchStrings(resTags, tag) == len(resTags) && sort.SearchStrings(ignoredTags, tag) == len(ignoredTags) {
+			if prev {
+				_, err := extraTags.WriteString("&")
+				if err != nil {
+					break
+				}
+			}
+			_, err := extraTags.WriteString(tag)
+			if err != nil {
+				break
+			}
+			_, err = extraTags.WriteString("=")
+			if err != nil {
+				break
+			}
+			_, err = extraTags.WriteString(val)
+			if err != nil {
+				break
+			}
+			prev = true
+		}
+	}
+	row = append(row, extraTags.String())
+
+	return row
+}
+
+// GetRequiredSystemTags returns which sample tags are needed by this collector
+func (c *Collector) GetRequiredSystemTags() lib.TagSet {
+	return lib.TagSet{} // There are no required tags for this collector
+}