Merge 68c6334 into fbeefd0

sentry.go

@@ -331,21 +331,6 @@ func (hook *SentryHook) Levels() []logrus.Level {
 	return hook.levels
 }
 
-// SetRelease sets release tag.
-func (hook *SentryHook) SetRelease(release string) {
-	hook.client.SetRelease(release)
-}
-
-// SetEnvironment sets environment tag.
-func (hook *SentryHook) SetEnvironment(environment string) {
-	hook.client.SetEnvironment(environment)
-}
-
-// SetServerName sets server_name tag.
-func (hook *SentryHook) SetServerName(serverName string) {
-	hook.serverName = serverName
-}
-
 // AddIgnore adds field name to ignore.
 func (hook *SentryHook) AddIgnore(name string) {
 	hook.ignoreFields[name] = struct{}{}

sentry_setter.go

@@ -0,0 +1,55 @@
+package logrus_sentry
+
+import (
+	"github.com/getsentry/raven-go"
+)
+
+// SetDefaultLoggerName sets default logger name tag.
+func (hook *SentryHook) SetDefaultLoggerName(name string) {
+	hook.client.SetDefaultLoggerName(name)
+}
+
+// SetEnvironment sets environment tag.
+func (hook *SentryHook) SetEnvironment(environment string) {
+	hook.client.SetEnvironment(environment)
+}
+
+// SetHttpContext sets http client.
+func (hook *SentryHook) SetHttpContext(h *raven.Http) {
+	hook.client.SetHttpContext(h)
+}
+
+// SetIgnoreErrors sets ignoreErrorsRegexp.
+func (hook *SentryHook) SetIgnoreErrors(errs ...string) error {
+	return hook.client.SetIgnoreErrors(errs)
+}
+
+// SetIncludePaths sets includePaths.
+func (hook *SentryHook) SetIncludePaths(p []string) {
+	hook.client.SetIncludePaths(p)
+}
+
+// SetRelease sets release tag.
+func (hook *SentryHook) SetRelease(release string) {
+	hook.client.SetRelease(release)
+}
+
+// SetSampleRate sets sampling rate.
+func (hook *SentryHook) SetSampleRate(rate float32) error {
+	return hook.client.SetSampleRate(rate)
+}
+
+// SetTagsContext sets tags.
+func (hook *SentryHook) SetTagsContext(t map[string]string) {
+	hook.client.SetTagsContext(t)
+}
+
+// SetUserContext sets user.
+func (hook *SentryHook) SetUserContext(u *raven.User) {
+	hook.client.SetUserContext(u)
+}
+
+// SetServerName sets server_name tag.
+func (hook *SentryHook) SetServerName(serverName string) {
+	hook.serverName = serverName
+}

sentry_setter_test.go

@@ -0,0 +1,177 @@
+package logrus_sentry
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSetDefaultLoggerName(t *testing.T) {
+	const name = "my_logger"
+	a := assert.New(t)
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		logger := getTestLogger()
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		hook.SetDefaultLoggerName(name)
+		logger.Hooks.Add(hook)
+
+		logger.Error(message)
+		packet := <-pch
+		a.Equal(name, packet.Logger, "logger must be set")
+	})
+}
+
+func TestSetEnvironment(t *testing.T) {
+	const env = "test"
+	a := assert.New(t)
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		logger := getTestLogger()
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		hook.SetEnvironment(env)
+		logger.Hooks.Add(hook)
+
+		logger.Error(message)
+		packet := <-pch
+		a.Equal(env, packet.Environment, "environment must be set")
+	})
+}
+
+func TestSetIgnoreErrors(t *testing.T) {
+	a := assert.New(t)
+	tests := []struct {
+		errString string
+		isSuccess bool
+	}{
+		{"", true},
+		{"aaa", true},
+		{"jskljdasidjiaoklzmxcasifjiklmzx9eijodfsklcmzx", true},
+		{"[0-9]+", true},
+		{"[0-9", false},
+		{"+", false},
+	}
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		for _, tt := range tests {
+			target := fmt.Sprintf("%+v", tt)
+			err := hook.SetIgnoreErrors(tt.errString)
+			switch {
+			case !tt.isSuccess:
+				a.Error(err, target)
+			case tt.isSuccess:
+				a.NoError(err, target)
+			}
+		}
+	})
+}
+
+func TestSetIncludePaths(t *testing.T) {
+	a := assert.New(t)
+	paths := []string{
+		"aaa",
+		"bbb",
+		"ccc",
+	}
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		hook.SetIncludePaths(paths)
+		a.Equal(paths, hook.client.IncludePaths(), "includePaths must be set")
+	})
+}
+
+func TestSetRelease(t *testing.T) {
+	const releaseVer = "v0.1.0"
+	a := assert.New(t)
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		logger := getTestLogger()
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		hook.SetRelease(releaseVer)
+		logger.Hooks.Add(hook)
+
+		logger.Error(message)
+		packet := <-pch
+		a.Equal(releaseVer, packet.Release, "release version must be set")
+	})
+}
+
+func TestSetSampleRate(t *testing.T) {
+	a := assert.New(t)
+	tests := []struct {
+		rate      float32
+		isSuccess bool
+	}{
+		{0.0, true},
+		{0.1, true},
+		{0.5, true},
+		{0.9, true},
+		{1.0, true},
+		{-0.1, false},
+		{-2, false},
+		{1.1, false},
+		{2.0, false},
+	}
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		for _, tt := range tests {
+			target := fmt.Sprintf("%+v", tt)
+
+			err := hook.SetSampleRate(tt.rate)
+			switch {
+			case !tt.isSuccess:
+				a.Error(err, target)
+			case tt.isSuccess:
+				a.NoError(err, target)
+			}
+		}
+	})
+}
+
+func TestSetServerName(t *testing.T) {
+	a := assert.New(t)
+
+	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
+		logger := getTestLogger()
+		hook, err := NewSentryHook(dsn, []logrus.Level{
+			logrus.ErrorLevel,
+		})
+		a.NoError(err, "NewSentryHook should be NoError")
+
+		hook.SetServerName(server_name)
+		logger.Hooks.Add(hook)
+
+		logger.Error(message)
+		packet := <-pch
+		a.Equal(server_name, packet.ServerName, "server name must be set")
+	})
+}

sentry_test.go

@@ -72,30 +72,6 @@ func WithTestDSN(t *testing.T, tf func(string, <-chan *resultPacket)) {
 	tf(dsn, pch)
 }
 
-func TestServerName(t *testing.T) {
-	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
-		logger := getTestLogger()
-
-		hook, err := NewSentryHook(dsn, []logrus.Level{
-			logrus.ErrorLevel,
-		})
-		hook.SetServerName(server_name)
-
-		if err != nil {
-			t.Fatal(err.Error())
-		}
-		logger.Hooks.Add(hook)
-
-		logger.Error(message)
-
-		packet := <-pch
-
-		if packet.ServerName != server_name {
-			t.Errorf("server_name should have been %s, was %s", server_name, packet.ServerName)
-		}
-	})
-}
-
 func TestSpecialFields(t *testing.T) {
 	WithTestDSN(t, func(dsn string, pch <-chan *resultPacket) {
 		logger := getTestLogger()
@@ -272,7 +248,7 @@ func TestSentryStacktrace(t *testing.T) {
 		hook.StacktraceConfiguration.Enable = true
 
 		logger.Error(message) // this is the call that the last frame of stacktrace should capture
-		expectedLineno := 274 //this should be the line number of the previous line
+		expectedLineno := 250 //this should be the line number of the previous line
 		packet = <-pch
 		stacktraceSize = len(packet.Stacktrace.Frames)
 		if stacktraceSize == 0 {