Add werror.GenerateErrorString for generating the stacktrace param st…

…ring (#51)
palantir · Jun 4, 2019 · 0d8e0cf · 0d8e0cf
1 parent 87637ec
commit 0d8e0cf
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 23 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -32,6 +32,10 @@
   name = "github.com/palantir/pkg"
   version = ">=0.7.0"
 
+[[constraint]]
+  name = "github.com/palantir/witchcraft-go-error"
+  version = ">=1.1.0"
+
 [[constraint]]
   name = "github.com/rs/zerolog"
   version = "1.10.3"

diff --git a/vendor/github.com/palantir/witchcraft-go-error/Gopkg.lock b/vendor/github.com/palantir/witchcraft-go-error/Gopkg.lock
diff --git a/vendor/github.com/palantir/witchcraft-go-error/README.md b/vendor/github.com/palantir/witchcraft-go-error/README.md
diff --git a/vendor/github.com/palantir/witchcraft-go-error/werror.go b/vendor/github.com/palantir/witchcraft-go-error/werror.go
diff --git a/vendor/github.com/palantir/witchcraft-go-error/werror_printer.go b/vendor/github.com/palantir/witchcraft-go-error/werror_printer.go
diff --git a/wlog/svclog/svc1log/params.go b/wlog/svclog/svc1log/params.go
@@ -15,7 +15,6 @@
 package svc1log
 
 import (
-	"fmt"
 	"path"
 	"runtime"
 	"strconv"
@@ -177,17 +176,7 @@ func Stacktrace(err error) Param {
 		if err == nil {
 			return
 		}
-
-		// set the value of the error
-		errStr := err.Error()
-		if fancy, ok := err.(fmt.Formatter); ok {
-			verbose := fmt.Sprintf("%+v", fancy)
-			if verbose != errStr {
-				// this is a rich error type, like those produced by github.com/pkg/errors
-				errStr = verbose
-			}
-		}
-		entry.StringValue(StacktraceKey, errStr)
+		entry.StringValue(StacktraceKey, werror.GenerateErrorString(err, false))
 
 		// add all safe and unsafe parameters stored in error
 		safeParams, unsafeParams := werror.ParamsFromError(err)