Merge pull request #25 from Shopify/bugsnag-hook-ctx

Pass along context from log entry to bugsnag hook

Gopkg.toml

@@ -28,6 +28,10 @@
   name = "github.com/stretchr/testify"
   version = ">= 1.2.1"
 
+[[constraint]]
+  name = "github.com/sirupsen/logrus"
+  version = ">= 1.4.0"
+
 [[override]]
   name = "github.com/gorilla/mux"
   branch = "subrouter-match-err"

logger/logger.go

@@ -33,6 +33,9 @@ func ContextLog(ctx Valuer, err []error, entry *logrus.Entry) *logrus.Entry {
 
 	if ctx != nil {
 		entry = entry.WithFields(getLoggableValues(ctx))
+		if ctx, ok := ctx.(context.Context); ok {
+			entry = entry.WithContext(ctx)
+		}
 	}
 
 	if len(err) != 0 {

logger/logger_test.go

@@ -10,6 +10,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+type contextKeyType string
+
 func buildLogger() (Logger, *bytes.Buffer) {
 	buf := bytes.NewBuffer(nil)
 	logrusLogger := logrus.New()
@@ -110,7 +112,8 @@ func TestContextLog(t *testing.T) {
 
 	GlobalFields["testKey"] = "value"
 
-	ctx := context.Background()
+	ctx := context.WithValue(context.Background(), contextKeyType("ctxValue"), "value")
+
 	ctx = WithField(ctx, "bar", "baz")
 	entry := logger(ctx, nil).WithField("a", "b")
 	assert.Equal(t, logrus.Fields{
@@ -119,6 +122,7 @@ func TestContextLog(t *testing.T) {
 		"a":         "b",
 		"testKey":   "value",
 	}, entry.Data)
+	assert.Equal(t, ctx, entry.Context)
 }
 
 func TestLogIfError(t *testing.T) {

logrusbugsnag/bugsnag.go

@@ -94,7 +94,9 @@ func (hook *Hook) Fire(entry *logrus.Entry) error {
 	}
 
 	errWithStack := bugsnag_errors.New(notifyErr, skipFrames)
-	bugsnagErr := bugsnag.Notify(errWithStack, metadata)
+
+	// Pass in our own metadata as well as the entry context, which might contain more data that Bugsnag can extract.
+	bugsnagErr := bugsnag.Notify(errWithStack, metadata, entry.Context)
 	if bugsnagErr != nil {
 		return ErrBugsnagSendFailed{bugsnagErr}
 	}