Merge pull request #66 from mailgun/thrawn/develop

Added NewWithDepth() WrapWithDepth()

errors/context_map.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mailgun/holster/stack"
+	"github.com/mailgun/holster/v3/stack"
 	pkg "github.com/pkg/errors"
 )
 

errors/errors.go

@@ -95,11 +95,21 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mailgun/holster/stack"
+	"github.com/mailgun/holster/v3/stack"
 	pkg "github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
+// New returns an error with the supplied message.
+// New also records the stack trace at the depth specified.
+func NewWithDepth(message string, depth int) error {
+	return &fundamental{
+		msg:   message,
+		Stack: stack.New(depth),
+	}
+}
+
+
 // New returns an error with the supplied message.
 // New also records the stack trace at the point it was called.
 func New(message string) error {
@@ -184,6 +194,23 @@ func (w *withStack) Format(s fmt.State, verb rune) {
 	}
 }
 
+// WrapStack returns an error annotating err with a stack trace
+// at the depth indicated. A calling depth of 1 is the function that
+// called WrapStack. If err is nil, Wrap returns nil.
+func WrapWithDepth(err error, message string, depth int) error {
+	if err == nil {
+		return nil
+	}
+	err = &withMessage{
+		cause: err,
+		msg:   message,
+	}
+	return &withStack{
+		err,
+		stack.New(depth),
+	}
+}
+
 // Wrap returns an error annotating err with a stack trace
 // at the point Wrap is called, and the supplied message.
 // If err is nil, Wrap returns nil.

errors/with_context.go

@@ -3,7 +3,7 @@ package errors
 import (
 	"fmt"
 
-	"github.com/mailgun/holster/stack"
+	"github.com/mailgun/holster/v3/stack"
 )
 
 // Implement this interface to pass along unstructured context to the logger

errors/with_context_test.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mailgun/holster/errors"
-	"github.com/mailgun/holster/stack"
-	. "gopkg.in/check.v1"
 	"github.com/ahmetb/go-linq"
+	"github.com/mailgun/holster/v3/errors"
+	"github.com/mailgun/holster/v3/stack"
+	. "gopkg.in/check.v1"
 )
 
 type TestError struct {