Merge pull request tsenart#277 from TrevinTeacutter/master

Prevent null values from being reported in json
1u0 · May 18, 2018 · 9b3f61d · 9b3f61d
2 parents 2da25b2 + 5cff1c0
commit 9b3f61d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/metrics.go b/lib/metrics.go
@@ -144,4 +144,8 @@ func (m *Metrics) init() {
 			quantile.Known(0.99, 0.0005),
 		)
 	}
+
+	if m.Errors == nil {
+		m.Errors = make([]string, 0)
+	}
 }
diff --git a/lib/metrics_test.go b/lib/metrics_test.go
@@ -76,3 +76,17 @@ func TestMetrics_NoInfiniteRate(t *testing.T) {
 		t.Errorf("got rate %f, want %f", got, want)
 	}
 }
+
+// https://github.com/tsenart/vegeta/pull/277
+func TestMetrics_NilErrorOnClose(t *testing.T) {
+	t.Parallel()
+
+	m := Metrics{Errors: nil}
+	m.Close()
+
+	got, want := m.Errors, []string{}
+
+	if !reflect.DeepEqual(got, want) {
+		t.Errorf("\ngot:  %+v\nwant: %+v", got, want)
+	}
+}