Merge pull request #105 from netlify/chore/bugsnag-updates

Bugsnag updates

Author: Mike Heffner

go.mod

@@ -4,7 +4,7 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/bitly/go-simplejson v0.5.0 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/bugsnag/bugsnag-go v1.5.1
+	github.com/bugsnag/bugsnag-go v1.5.3
 	github.com/bugsnag/panicwrap v1.2.0 // indirect
 	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
 	github.com/go-chi/chi v4.0.2+incompatible

go.sum

@@ -11,6 +11,8 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4Yn
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bugsnag/bugsnag-go v1.5.1 h1:NnfkWPiRGJlUg6s5mRlsbudWcW/B/eGFSad98JxitaU=
 github.com/bugsnag/bugsnag-go v1.5.1/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
+github.com/bugsnag/bugsnag-go v1.5.3 h1:yeRUT3mUE13jL1tGwvoQsKdVbAsQx9AJ+fqahKveP04=
+github.com/bugsnag/bugsnag-go v1.5.3/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8=
 github.com/bugsnag/panicwrap v1.2.0 h1:OzrKrRvXis8qEvOkfcxNcYbOd2O7xXS2nnKMEMABFQA=
 github.com/bugsnag/panicwrap v1.2.0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
 github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=

nconf/args.go

@@ -14,15 +14,16 @@ type RootArgs struct {
 }
 
 func (args *RootArgs) Setup(config interface{}, version string) (logrus.FieldLogger, error) {
-	// first load the logger
-	logConfig := &struct {
-		Log *LoggingConfig
+	// first load the logger and BugSnag config
+	rootConfig := &struct {
+		Log     *LoggingConfig
+		BugSnag *BugSnagConfig
 	}{}
-	if err := LoadFromEnv(args.Prefix, args.EnvFile, logConfig); err != nil {
+	if err := LoadFromEnv(args.Prefix, args.EnvFile, rootConfig); err != nil {
 		return nil, errors.Wrap(err, "Failed to load the logging configuration")
 	}
 
-	log, err := ConfigureLogging(logConfig.Log)
+	log, err := ConfigureLogging(rootConfig.Log)
 	if err != nil {
 		return nil, errors.Wrap(err, "Failed to create the logger")
 	}
@@ -31,6 +32,10 @@ func (args *RootArgs) Setup(config interface{}, version string) (logrus.FieldLog
 	}
 	log = log.WithField("version", version)
 
+	if err := SetupBugSnag(rootConfig.BugSnag, version); err != nil {
+		return nil, errors.Wrap(err, "Failed to configure bugsnag")
+	}
+
 	if config != nil {
 		// second load the config for this project
 		if err := LoadFromEnv(args.Prefix, args.EnvFile, config); err != nil {

nconf/bugsnag.go

@@ -9,23 +9,29 @@ import (
 type BugSnagConfig struct {
 	Environment string
 	APIKey      string `envconfig:"api_key"`
+	LogHook     bool   `envconfig:"log_hook"`
 }
 
-func AddBugSnagHook(config *BugSnagConfig) error {
+func SetupBugSnag(config *BugSnagConfig, version string) error {
 	if config == nil || config.APIKey == "" {
 		return nil
 	}
 
 	bugsnag.Configure(bugsnag.Configuration{
 		APIKey:       config.APIKey,
 		ReleaseStage: config.Environment,
+		AppVersion:   version,
 		PanicHandler: func() {}, // this is to disable panic handling. The lib was forking and restarting the process (causing races)
 	})
-	hook, err := logrus_bugsnag.NewBugsnagHook()
-	if err != nil {
-		return err
+
+	if config.LogHook {
+		hook, err := logrus_bugsnag.NewBugsnagHook()
+		if err != nil {
+			return err
+		}
+		logrus.AddHook(hook)
+		logrus.Debug("Added bugsnag log hook")
 	}
-	logrus.AddHook(hook)
-	logrus.Debug("Added bugsnag hook")
+
 	return nil
 }

nconf/logging.go

@@ -4,7 +4,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -16,8 +15,6 @@ type LoggingConfig struct {
 	TSFormat         string                 `mapstructure:"ts_format" json:"ts_format"`
 	Fields           map[string]interface{} `mapstructure:"fields" json:"fields"`
 	UseNewLogger     bool                   `mapstructure:"use_new_logger",split_words:"true"`
-
-	BugSnag *BugSnagConfig
 }
 
 func ConfigureLogging(config *LoggingConfig) (*logrus.Entry, error) {
@@ -55,10 +52,6 @@ func ConfigureLogging(config *LoggingConfig) (*logrus.Entry, error) {
 		logger.Debug("Set log level to: " + logger.GetLevel().String())
 	}
 
-	if err := AddBugSnagHook(config.BugSnag); err != nil {
-		return nil, errors.Wrap(err, "Failed to configure bugsnag")
-	}
-
 	f := logrus.Fields{}
 	for k, v := range config.Fields {
 		f[k] = v