From d8431cc171d27f79b7f3eb73a540390569e1c8ae Mon Sep 17 00:00:00 2001 From: James Grady Date: Thu, 14 Sep 2017 15:25:09 -0700 Subject: [PATCH 1/5] Updated references to internal kiip fork --- README.md | 4 ++-- async_test.go | 2 +- data_field.go | 2 +- data_field_test.go | 2 +- sentry.go | 2 +- sentry_test.go | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fbdb713..c5debb1 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Every sentry application defined on the server gets a different ```go import ( - "github.com/sirupsen/logrus" + "github.com/kiip/logrus" "github.com/evalphobia/logrus_sentry" ) @@ -54,7 +54,7 @@ the `NewWithClientSentryHook` constructor: ```go import ( - "github.com/sirupsen/logrus" + "github.com/kiip/logrus" "github.com/evalphobia/logrus_sentry" "github.com/getsentry/raven-go" ) diff --git a/async_test.go b/async_test.go index 4488e9b..29e0af6 100644 --- a/async_test.go +++ b/async_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/sirupsen/logrus" + "github.com/kiip/logrus" ) func TestParallelLogging(t *testing.T) { diff --git a/data_field.go b/data_field.go index 37c89fb..117cf9b 100644 --- a/data_field.go +++ b/data_field.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/getsentry/raven-go" - "github.com/sirupsen/logrus" + "github.com/kiip/logrus" ) const ( diff --git a/data_field_test.go b/data_field_test.go index 97d6ac5..5e3df61 100644 --- a/data_field_test.go +++ b/data_field_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/getsentry/raven-go" - "github.com/sirupsen/logrus" + "github.com/kiip/logrus" "github.com/stretchr/testify/assert" ) diff --git a/sentry.go b/sentry.go index bbe18a5..af91608 100644 --- a/sentry.go +++ b/sentry.go @@ -8,8 +8,8 @@ import ( "time" "github.com/getsentry/raven-go" + "github.com/kiip/logrus" "github.com/pkg/errors" - "github.com/sirupsen/logrus" ) var ( diff --git a/sentry_test.go b/sentry_test.go index 63b50dc..9b32296 100644 --- a/sentry_test.go +++ b/sentry_test.go @@ -16,8 +16,8 @@ import ( "time" "github.com/getsentry/raven-go" + "github.com/kiip/logrus" pkgerrors "github.com/pkg/errors" - "github.com/sirupsen/logrus" ) const ( @@ -266,7 +266,7 @@ func TestSentryStacktrace(t *testing.T) { t.Error("Frame should not be identified as in_app without prefixes") } - hook.StacktraceConfiguration.InAppPrefixes = []string{"github.com/sirupsen/logrus"} + hook.StacktraceConfiguration.InAppPrefixes = []string{"github.com/kiip/logrus"} hook.StacktraceConfiguration.Context = 2 hook.StacktraceConfiguration.Skip = 2 @@ -277,7 +277,7 @@ func TestSentryStacktrace(t *testing.T) { t.Error("Stacktrace should not be empty") } lastFrame = packet.Stacktrace.Frames[stacktraceSize-1] - expectedFilename := "github.com/sirupsen/logrus/entry.go" + expectedFilename := "github.com/kiip/logrus/entry.go" if lastFrame.Filename != expectedFilename { t.Errorf("File name should have been %s, was %s", expectedFilename, lastFrame.Filename) } From 61accc1b1263268b355d088854e15e1a504f2a9f Mon Sep 17 00:00:00 2001 From: James Grady Date: Thu, 14 Sep 2017 15:46:05 -0700 Subject: [PATCH 2/5] Renamed references to kiip library --- .travis.yml | 10 ++-------- README.md | 16 ++++++++-------- async_test.go | 2 +- data_field.go | 2 +- data_field_test.go | 2 +- sentry.go | 2 +- sentry_test.go | 4 ++-- utils.go | 2 +- 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4b8c336..2dd5f55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,8 @@ sudo: false language: go go: - - 1.4 - - 1.5 - - 1.6 - - 1.7 - - tip -matrix: - allow_failures: - - go: tip + - 1.9 + before_install: - go get github.com/axw/gocov/gocov - go get github.com/mattn/goveralls diff --git a/README.md b/README.md index c5debb1..126af25 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Sentry Hook for Logrus :walrus: -[![Build Status](https://travis-ci.org/evalphobia/logrus_sentry.svg?branch=master)](https://travis-ci.org/evalphobia/logrus_sentry) [![Coverage Status](https://coveralls.io/repos/evalphobia/logrus_sentry/badge.svg?branch=master&service=github)](https://coveralls.io/github/evalphobia/logrus_sentry?branch=master) [![GoDoc](https://godoc.org/github.com/evalphobia/logrus_sentry?status.svg)](https://godoc.org/github.com/evalphobia/logrus_sentry) +[![Build Status](https://travis-ci.org/kiip/logrussentry.svg?branch=master)](https://travis-ci.org/kiip/logrussentry) [![Coverage Status](https://coveralls.io/repos/github/kiip/logrussentry/badge.svg?branch=master)](https://coveralls.io/github/kiip/logrussentry?branch=master) [![GoDoc](https://godoc.org/github.com/kiip/logrussentry?status.svg)](https://godoc.org/github.com/kiip/logrussentry) [Sentry](https://getsentry.com) provides both self-hosted and hosted solutions for exception tracking. @@ -17,12 +17,12 @@ Every sentry application defined on the server gets a different ```go import ( "github.com/kiip/logrus" - "github.com/evalphobia/logrus_sentry" + "github.com/kiip/logrussentry" ) func main() { log := logrus.New() - hook, err := logrus_sentry.NewSentryHook(YOUR_DSN, []logrus.Level{ + hook, err := logrussentry.NewSentryHook(YOUR_DSN, []logrus.Level{ logrus.PanicLevel, logrus.FatalLevel, logrus.ErrorLevel, @@ -45,7 +45,7 @@ levels := []logrus.Level{ logrus.FatalLevel, logrus.ErrorLevel, } -hook, err := logrus_sentry.NewWithTagsSentryHook(YOUR_DSN, tags, levels) +hook, err := logrussentry.NewWithTagsSentryHook(YOUR_DSN, tags, levels) ``` @@ -55,7 +55,7 @@ the `NewWithClientSentryHook` constructor: ```go import ( "github.com/kiip/logrus" - "github.com/evalphobia/logrus_sentry" + "github.com/kiip/logrussentry" "github.com/getsentry/raven-go" ) @@ -67,7 +67,7 @@ func main() { log.Fatal(err) } - hook, err := logrus_sentry.NewWithClientSentryHook(client, []logrus.Level{ + hook, err := logrussentry.NewWithClientSentryHook(client, []logrus.Level{ logrus.PanicLevel, logrus.FatalLevel, logrus.ErrorLevel, @@ -116,7 +116,7 @@ The SentryHook has a default timeout of `100 milliseconds` when created with a call to `NewSentryHook`. This can be changed by assigning a value to the `Timeout` field: ```go -hook, _ := logrus_sentry.NewSentryHook(...) +hook, _ := logrussentry.NewSentryHook(...) hook.Timeout = 20*time.Second ``` @@ -126,7 +126,7 @@ By default the hook will not send any stacktraces. However, this can be enabled with: ```go -hook, _ := logrus_sentry.NewSentryHook(...) +hook, _ := logrussentry.NewSentryHook(...) hook.StacktraceConfiguration.Enable = true ``` diff --git a/async_test.go b/async_test.go index 29e0af6..86e654c 100644 --- a/async_test.go +++ b/async_test.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "net/http" diff --git a/data_field.go b/data_field.go index 117cf9b..de5dcc1 100644 --- a/data_field.go +++ b/data_field.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "net/http" diff --git a/data_field_test.go b/data_field_test.go index 5e3df61..a6c0d6d 100644 --- a/data_field_test.go +++ b/data_field_test.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "errors" diff --git a/sentry.go b/sentry.go index af91608..dedc448 100644 --- a/sentry.go +++ b/sentry.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "encoding/json" diff --git a/sentry_test.go b/sentry_test.go index 9b32296..4cbc3d9 100644 --- a/sentry_test.go +++ b/sentry_test.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "compress/zlib" @@ -255,7 +255,7 @@ func TestSentryStacktrace(t *testing.T) { t.Error("Stacktrace should not be empty") } lastFrame := packet.Stacktrace.Frames[stacktraceSize-1] - expectedSuffix := "logrus_sentry/sentry_test.go" + expectedSuffix := "logrussentry/sentry_test.go" if !strings.HasSuffix(lastFrame.Filename, expectedSuffix) { t.Errorf("File name should have ended with %s, was %s", expectedSuffix, lastFrame.Filename) } diff --git a/utils.go b/utils.go index 8b4a909..ccb4fb7 100644 --- a/utils.go +++ b/utils.go @@ -1,4 +1,4 @@ -package logrus_sentry +package logrussentry import ( "fmt" From b76237fff8bcb67b63c9e3bf19609505f6af2de6 Mon Sep 17 00:00:00 2001 From: James Grady Date: Thu, 14 Sep 2017 16:19:04 -0700 Subject: [PATCH 3/5] Force build From e993e307581bedd4e90b441919255ed9a95a0ab4 Mon Sep 17 00:00:00 2001 From: James Grady Date: Thu, 14 Sep 2017 16:35:27 -0700 Subject: [PATCH 4/5] Update to keep code coverage --- .gitignore | 2 ++ .travis.yml | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a988100 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +coverage.out +logrussentry diff --git a/.travis.yml b/.travis.yml index 2dd5f55..32bc716 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,21 @@ language: go go: - 1.9 +env: + global: + secure: swil3Y+gIZkN/Ch6NF13dM1QPF+rABiW5kTSP149arwwu1tcDGIv/64zifGzrOxkrez9ZUQzJs5fqsBtRX5p4Q8hC7s8D+3On5TqLovPUr4Pu5Fjy4VJdGz6NaD1Zp1hcwBPJo30efI16utACfjDSuvGhc2s3W98LmZJajaNqVbDFYOkCgZQgIToWeMQ25ZcObvsM+RrJUsZMndSaCZ0N4JTA3fb4uygOmd60qo/kcoiYbp7daP0cshq9IggcQPlPgVraodmY4MLy5bCRHtN6xzqa0DfzvGHqPp815pIYCYi2AxfdkrnUz1ZZxGIv7lrC4MHe+kC7YSe1YhJYfxEFInXhbOd5bcdQeJ0By1V0woku5wzXU7MrE4ZqzABYUhbEFdyWFrBqkvMWkLE70uFhpRxQgE8x9C0qbjY7/yNK0RRPXyiGn98kk6eio+H1fPdxUI/PlrmblUiObvjnWZo+rSWajSlzdYzFvY+OOrP3H7dSQTbotsqqqQYyIILxOX+zbQR+SNlRURqhra7xOreYSSaCyZBzCi0O3B4iz2AdwRdb6OVz7YRIJZuOr02Ht+H0csnzMs3IWHxjLxB6SmpQvZ1cMUy04vgQWsghcTip1jVsU5oTYLtW0V501p0DjcLdzKo6lj+fddjMLeV0Ok6S1v717Cu03DaMYzbp2VnXjI= + before_install: - go get github.com/axw/gocov/gocov - go get github.com/mattn/goveralls - - if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi + - if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; + fi + before_script: - go vet ./... - gofmt -s -l . + script: - - $HOME/gopath/bin/goveralls -service=travis-ci + - go test -v -covermode=count -coverprofile=coverage.out + - "$HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken + $COVERALLS_TOKEN" From 07670f026eda8215a1ea9b941d66b02e98a2f563 Mon Sep 17 00:00:00 2001 From: Shreyas Jayanna Date: Wed, 28 Nov 2018 16:24:47 -0800 Subject: [PATCH 5/5] Update Sentry call --- sentry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry.go b/sentry.go index dedc448..f67e282 100644 --- a/sentry.go +++ b/sentry.go @@ -298,7 +298,7 @@ func (hook *SentryHook) convertStackTrace(st errors.StackTrace) *raven.Stacktrac pc := uintptr(stFrames[i]) fn := runtime.FuncForPC(pc) file, line := fn.FileLine(pc) - frame := raven.NewStacktraceFrame(pc, file, line, stConfig.Context, stConfig.InAppPrefixes) + frame := raven.NewStacktraceFrame(pc, fn.Name(), file, line, stConfig.Context, stConfig.InAppPrefixes) if frame != nil { frames = append(frames, frame) }