Merge pull request #13 from thockin/master

Update glogr to logr 1.0.0-rc1

Author: thockin

README.md

@@ -4,5 +4,3 @@ This package implements the [logr interface](https://github.com/go-logr/logr)
 in terms of Google's [glog](https://godoc.org/github.com/golang/glog).  This
 provides a relatively minimalist API to logging in Go, backed by a well-proven
 implementation.
-
-This is a BETA grade implementation.

benchmark/benchmaark_test.go renamed to benchmark/benchmark_test.go

@@ -24,7 +24,6 @@ import (
 
 	"github.com/go-logr/glogr"
 	"github.com/go-logr/logr"
-	"github.com/golang/glog"
 )
 
 func init() {
@@ -33,99 +32,132 @@ func init() {
 	os.Stderr, _ = os.Open("/dev/null")
 }
 
-func BenchmarkGlogInfoOneArg(b *testing.B) {
+//go:noinline
+func doInfoOneArg(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		glog.Info("this is", "a", "string")
+		log.Info("this is", "a", "string")
 	}
 }
 
-func BenchmarkInfoOneArg(b *testing.B) {
-	var log logr.Logger = glogr.New()
-
+//go:noinline
+func doInfoSeveralArgs(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		log.Info("this is", "a", "string")
+		log.Info("multi",
+			"bool", true, "string", "str", "int", 42,
+			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
 	}
 }
 
-func BenchmarkGlogInfoSeveralArgs(b *testing.B) {
+//go:noinline
+func doV0Info(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		glog.Info("multi",
+		log.V(0).Info("multi",
 			"bool", true, "string", "str", "int", 42,
 			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
 	}
 }
 
-func BenchmarkInfoSeveralArgs(b *testing.B) {
-	var log logr.Logger = glogr.New()
-
+//go:noinline
+func doV9Info(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		log.Info("multi",
+		log.V(9).Info("multi",
 			"bool", true, "string", "str", "int", 42,
 			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
 	}
 }
 
-func BenchmarkGlogInfoV0(b *testing.B) {
+//go:noinline
+func doError(b *testing.B, log logr.Logger) {
+	err := fmt.Errorf("error message")
 	for i := 0; i < b.N; i++ {
-		glog.V(0).Info("multi",
+		log.Error(err, "multi",
 			"bool", true, "string", "str", "int", 42,
 			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
 	}
 }
 
-func BenchmarkV0Info(b *testing.B) {
-	var log logr.Logger = glogr.New()
-
+//go:noinline
+func doWithValues(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		log.V(0).Info("multi",
-			"bool", true, "string", "str", "int", 42,
-			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
+		l := log.WithValues("k1", "v1", "k2", "v2")
+		_ = l
 	}
 }
 
-func BenchmarkGlogV9Info(b *testing.B) {
+//go:noinline
+func doWithName(b *testing.B, log logr.Logger) {
 	for i := 0; i < b.N; i++ {
-		glog.V(9).Info("multi",
-			"bool", true, "string", "str", "int", 42,
-			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
+		l := log.WithName("name")
+		_ = l
 	}
 }
 
-func BenchmarkV9Info(b *testing.B) {
+func BenchmarkDiscardInfoOneArg(b *testing.B) {
 	var log logr.Logger = glogr.New()
+	doInfoOneArg(b, log)
+}
 
-	for i := 0; i < b.N; i++ {
-		log.V(9).Info("multi",
-			"bool", true, "string", "str", "int", 42,
-			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
-	}
+func BenchmarkDiscardInfoSeveralArgs(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doInfoSeveralArgs(b, log)
 }
 
-func BenchmarkError(b *testing.B) {
+func BenchmarkDiscardV0Info(b *testing.B) {
 	var log logr.Logger = glogr.New()
+	doV0Info(b, log)
+}
 
-	err := fmt.Errorf("error message")
-	for i := 0; i < b.N; i++ {
-		log.Error(err, "multi",
-			"bool", true, "string", "str", "int", 42,
-			"float", 3.14, "struct", struct{ X, Y int }{93, 76})
-	}
+func BenchmarkDiscardV9Info(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doV9Info(b, log)
 }
 
-func BenchmarkWithValues(b *testing.B) {
+func BenchmarkDiscardError(b *testing.B) {
 	var log logr.Logger = glogr.New()
+	doError(b, log)
+}
 
-	for i := 0; i < b.N; i++ {
-		l := log.WithValues("k1", "v1", "k2", "v2")
-		_ = l
-	}
+func BenchmarkDiscardWithValues(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doWithValues(b, log)
 }
 
-func BenchmarkWithName(b *testing.B) {
+func BenchmarkDiscardWithName(b *testing.B) {
 	var log logr.Logger = glogr.New()
+	doWithName(b, log)
+}
 
-	for i := 0; i < b.N; i++ {
-		l := log.WithName("name")
-		_ = l
-	}
+func BenchmarkFuncrInfoOneArg(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doInfoOneArg(b, log)
+}
+
+func BenchmarkFuncrInfoSeveralArgs(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doInfoSeveralArgs(b, log)
+}
+
+func BenchmarkFuncrV0Info(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doV0Info(b, log)
+}
+
+func BenchmarkFuncrV9Info(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doV9Info(b, log)
+}
+
+func BenchmarkFuncrError(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doError(b, log)
+}
+
+func BenchmarkFuncrWithValues(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doWithValues(b, log)
+}
+
+func BenchmarkFuncrWithName(b *testing.B) {
+	var log logr.Logger = glogr.New()
+	doWithName(b, log)
 }

example/main.go

@@ -37,7 +37,7 @@ func Helper(log logr.Logger, msg string) {
 }
 
 func helper2(log logr.Logger, msg string) {
-	logr.WithCallDepth(log, 2).Info(msg)
+	log.WithCallDepth(2).Info(msg)
 }
 
 func main() {