Use sub-benchmarks to organize benchmarks

Use Go 1.7's fancy new sub-benchmarks feature to organize our comparative
benchmarking suite into scenarios. Within each scenario, compare all the
relevant libraries.

benchmarks/apex_log_bench_test.go → benchmarks/apex_test.go

@@ -22,44 +22,28 @@ package benchmarks
 
 import (
 	"io/ioutil"
-	"testing"
 	"time"
 
 	"github.com/apex/log"
 	"github.com/apex/log/handlers/json"
 )
 
-func newApexLog() *log.Logger {
+func newDisabledApexLog() *log.Logger {
 	return &log.Logger{
 		Handler: json.New(ioutil.Discard),
-		Level:   log.DebugLevel,
+		Level:   log.ErrorLevel,
 	}
 }
 
-func BenchmarkApexLogAddingFields(b *testing.B) {
-	logger := newApexLog()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.WithFields(log.Fields{
-				"int":               1,
-				"int64":             int64(1),
-				"float":             3.0,
-				"string":            "four!",
-				"bool":              true,
-				"time":              time.Unix(0, 0),
-				"error":             errExample.Error(),
-				"duration":          time.Second,
-				"user-defined type": _jane,
-				"another string":    "done!",
-			}).Info("Go fast.")
-		}
-	})
+func newApexLog() *log.Logger {
+	return &log.Logger{
+		Handler: json.New(ioutil.Discard),
+		Level:   log.DebugLevel,
+	}
 }
 
-func BenchmarkApexLogWithAccumulatedContext(b *testing.B) {
-	baseLogger := newApexLog()
-	logger := baseLogger.WithFields(log.Fields{
+func fakeApexFields() log.Fields {
+	return log.Fields{
 		"int":               1,
 		"int64":             int64(1),
 		"float":             3.0,
@@ -70,21 +54,5 @@ func BenchmarkApexLogWithAccumulatedContext(b *testing.B) {
 		"duration":          time.Second,
 		"user-defined type": _jane,
 		"another string":    "done!",
-	})
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Info("Go really fast.")
-		}
-	})
-}
-
-func BenchmarkApexLogWithoutFields(b *testing.B) {
-	logger := newApexLog()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Info("Go fast.")
-		}
-	})
+	}
 }

benchmarks/stdlib_bench_test.go → benchmarks/kit_test.go

@@ -22,39 +22,10 @@ package benchmarks
 
 import (
 	"io/ioutil"
-	"log"
-	"testing"
-	"time"
-)
 
-func BenchmarkStandardLibraryWithoutFields(b *testing.B) {
-	logger := log.New(ioutil.Discard, "", log.LstdFlags)
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Println("Go fast.")
-		}
-	})
-}
+	"github.com/go-kit/kit/log"
+)
 
-func BenchmarkStandardLibraryWithFormatting(b *testing.B) {
-	logger := log.New(ioutil.Discard, "", log.LstdFlags)
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Printf(
-				"Go fast. %v %v %v %s %v %v %v %v %v %s\n",
-				1,
-				int64(1),
-				3.0,
-				"four!",
-				true,
-				time.Unix(0, 0),
-				errExample,
-				time.Second,
-				_jane,
-				"done!",
-			)
-		}
-	})
+func newKitLog() *log.Context {
+	return log.NewContext(log.NewJSONLogger(ioutil.Discard))
 }

sugar_bench_test.go → benchmarks/log15_test.go

@@ -18,42 +18,16 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-package zap
+package benchmarks
 
 import (
-	"testing"
+	"io/ioutil"
 
-	"go.uber.org/zap/testutils"
-	"go.uber.org/zap/zapcore"
+	"gopkg.in/inconshreveable/log15.v2"
 )
 
-func withBenchedSugar(b *testing.B, f func(*SugaredLogger)) {
-	logger := New(zapcore.NewCore(
-		zapcore.NewJSONEncoder(NewProductionConfig().EncoderConfig),
-		&testutils.Discarder{},
-		DebugLevel,
-	)).Sugar()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			f(logger)
-		}
-	})
-}
-
-func Benchmark10FieldsSugar(b *testing.B) {
-	withBenchedSugar(b, func(logger *SugaredLogger) {
-		logger.Infow("Ten fields, passed at the log site.",
-			"one", 1,
-			"two", 2,
-			"three", 3,
-			"four", 4,
-			"five", 5,
-			"six", 6,
-			"seven", 7,
-			"eight", 8,
-			"nine", 9,
-			"ten", 10,
-		)
-	})
+func newLog15() log15.Logger {
+	logger := log15.New()
+	logger.SetHandler(log15.StreamHandler(ioutil.Discard, log15.JsonFormat()))
+	return logger
 }