WIP

Author: kevinburke

bench_test.go

@@ -32,33 +32,49 @@ func BenchmarkDiscard(b *testing.B) {
 	}
 }
 
+func BenchmarkCallerFileHandler(b *testing.B) {
+	lg := New()
+	lg.SetHandler(CallerFileHandler(DiscardHandler()))
+
+	for i := 0; i < b.N; i++ {
+		lg.Info("test message")
+	}
+}
+
+func BenchmarkCallerFuncHandler(b *testing.B) {
+	lg := New()
+	lg.SetHandler(CallerFuncHandler(DiscardHandler()))
+
+	for i := 0; i < b.N; i++ {
+		lg.Info("test message")
+	}
+}
+
 func BenchmarkLogfmtNoCtx(b *testing.B) {
 	r := Record{
-		Time:     time.Now(),
-		Lvl:      LvlInfo,
-		Msg:      "test message",
-		Ctx:      []interface{}{},
-		KeyNames: DefaultRecordKeyNames,
+		Time: time.Now(),
+		Lvl:  LvlInfo,
+		Msg:  "test message",
+		Ctx:  []interface{}{},
 	}
 
 	logfmt := LogfmtFormat()
 	for i := 0; i < b.N; i++ {
-		logfmt.Format(r)
+		logfmt.Format(&r)
 	}
 }
 
 func BenchmarkJsonNoCtx(b *testing.B) {
 	r := Record{
-		Time:     time.Now(),
-		Lvl:      LvlInfo,
-		Msg:      "test message",
-		Ctx:      []interface{}{},
-		KeyNames: DefaultRecordKeyNames,
+		Time: time.Now(),
+		Lvl:  LvlInfo,
+		Msg:  "test message",
+		Ctx:  []interface{}{},
 	}
 
 	jsonfmt := JsonFormat()
 	for i := 0; i < b.N; i++ {
-		jsonfmt.Format(r)
+		jsonfmt.Format(&r)
 	}
 }
 
@@ -190,32 +206,3 @@ func BenchmarkLog15WithoutFields(b *testing.B) {
 		}
 	})
 }
-
-func BenchmarkDefaultWarn(b *testing.B) {
-	logger := New("source", "default", "partition", 3)
-	logger.SetHandler(newHandler())
-	b.ReportAllocs()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Warn("warn message")
-		}
-	})
-}
-func BenchmarkDefaultDebug(b *testing.B) {
-	logger := New("source", "default", "partition", 3)
-	logger.SetHandler(newHandler())
-	b.ReportAllocs()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			logger.Debug("debug message")
-		}
-	})
-}
-func newHandler() Handler {
-	lvl := LvlWarn
-	logformat := LogfmtFormat()
-	handler := StreamHandler(ioutil.Discard, logformat)
-	return LvlFilterHandler(lvl, handler)
-}

logger.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strings"
 	"time"
+
+	"github.com/go-stack/stack"
 )
 
 const timeKey = "t"
@@ -71,7 +73,8 @@ type Record struct {
 	Lvl      Lvl
 	Msg      string
 	Ctx      []interface{}
-	KeyNames *RecordKeyNames
+	Call     stack.Call
+	KeyNames RecordKeyNames
 }
 
 // RecordKeyNames are the predefined names of the log props used by the Logger interface.
@@ -81,12 +84,6 @@ type RecordKeyNames struct {
 	Lvl  string
 }
 
-var DefaultRecordKeyNames = &RecordKeyNames{
-	Time: timeKey,
-	Msg:  msgKey,
-	Lvl:  lvlKey,
-}
-
 // A Logger writes key/value pairs to a Handler
 type Logger interface {
 	// New returns a new Logger that has this logger's context plus the given context
@@ -112,12 +109,17 @@ type logger struct {
 }
 
 func (l *logger) write(msg string, lvl Lvl, ctx []interface{}) {
-	l.h.Log(Record{
-		Time:     time.Now(),
-		Lvl:      lvl,
-		Msg:      msg,
-		Ctx:      newContext(l.ctx, ctx),
-		KeyNames: DefaultRecordKeyNames,
+	l.h.Log(&Record{
+		Time: time.Now(),
+		Lvl:  lvl,
+		Msg:  msg,
+		Ctx:  newContext(l.ctx, ctx),
+		Call: stack.Caller(2),
+		KeyNames: RecordKeyNames{
+			Time: timeKey,
+			Msg:  msgKey,
+			Lvl:  lvlKey,
+		},
 	})
 }