Fix go1.12 test regression

Breakage is due to this change in go 1.12: Tracebacks, runtime.Caller, and runtime.Callers no longer include compiler-generated initialization functions. Doing a traceback during the initialization of a global variable will now show a function named PKG.init.ializers. Fix rs#137
markdessain · Feb 27, 2019 · 6d6350a · 6d6350a
1 parent 299ff03
commit 6d6350a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ go:
 - "1.8"
 - "1.9"
 - "1.10"
+- "1.11"
+- "1.12"
 - "master"
 matrix:
   allow_failures:

diff --git a/context.go b/context.go
@@ -350,8 +350,8 @@ func (c Context) Interface(key string, i interface{}) Context {
 type callerHook struct{}
 
 func (ch callerHook) Run(e *Event, level Level, msg string) {
-	// Three extra frames to skip (added by hook infra).
-	e.caller(CallerSkipFrameCount + 3)
+	// Extra frames to skip (added by hook infra).
+	e.caller(CallerSkipFrameCount + contextCallerSkipFrameCount)
 }
 
 var ch = callerHook{}

diff --git a/go112.go b/go112.go
@@ -0,0 +1,7 @@
+// +build go1.12
+
+package zerolog
+
+// Since go 1.12, some auto generated init functions are hidden from
+// runtime.Caller.
+const contextCallerSkipFrameCount = 2
diff --git a/not_go112.go b/not_go112.go
@@ -0,0 +1,5 @@
+// +build !go1.12
+
+package zerolog
+
+const contextCallerSkipFrameCount = 3
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ go: @@
     - "1.8"
     - "1.9"
     - "1.10"
+    - "1.11"
+    - "1.12"
     - "master"
     matrix:
       allow_failures:
@@ Expand Down @@