Skip to content
This repository was archived by the owner on Aug 30, 2023. It is now read-only.

Add Client.SetSkipFrames #76

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add Client.SetSkipFrames #76

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
66d50ef
Add ability to skip frames in stack trace.
Mar 1, 2016
6bd7f4e
Merge pull request #1 from sagansystems/skip-frames
jotto Mar 1, 2016
79b7c80
Merge remote-tracking branch 'upstream/master' into ch13322/upgrade-s…
gerad Jun 4, 2018
aa17293
Add skipFrames to CapturePanicAndWait
gerad Jun 5, 2018
0111130
Merge pull request #2 from sagansystems/ch13322/upgrade-sentry-client
gerad Jun 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@ type Client struct {
release string
environment string
sampleRate float32
skipFrames int

// default logger name (leave empty for 'root')
defaultLoggerName string
Expand Down Expand Up @@ -554,6 +555,15 @@ func (client *Client) worker() {
}
}

func (client *Client) SetSkipFrames(skip int) {
client.mu.Lock()
defer client.mu.Unlock()
client.skipFrames = skip
}

// SetSkipFrames for the default *Client
func SetSkipFrames(skip int) { DefaultClient.SetSkipFrames(skip) }

// Capture asynchronously delivers a packet to the Sentry server. It is a no-op
// when client is nil. A channel is provided if it is important to check for a
// send's success.
Expand Down Expand Up @@ -709,7 +719,7 @@ func (client *Client) CaptureError(err error, tags map[string]string, interfaces
extra := extractExtra(err)
cause := pkgErrors.Cause(err)

packet := NewPacketWithExtra(err.Error(), extra, append(append(interfaces, client.context.interfaces()...), NewException(cause, GetOrNewStacktrace(cause, 1, 3, client.includePaths)))...)
packet := NewPacketWithExtra(err.Error(), extra, append(append(interfaces, client.context.interfaces()...), NewException(cause, GetOrNewStacktrace(cause, 1+client.skipFrames, 3, client.includePaths)))...)
eventID, _ := client.Capture(packet, tags)

return eventID
Expand All @@ -734,7 +744,7 @@ func (client *Client) CaptureErrorAndWait(err error, tags map[string]string, int
extra := extractExtra(err)
cause := pkgErrors.Cause(err)

packet := NewPacketWithExtra(err.Error(), extra, append(append(interfaces, client.context.interfaces()...), NewException(cause, GetOrNewStacktrace(cause, 1, 3, client.includePaths)))...)
packet := NewPacketWithExtra(err.Error(), extra, append(append(interfaces, client.context.interfaces()...), NewException(cause, GetOrNewStacktrace(cause, 1+client.skipFrames, 3, client.includePaths)))...)
eventID, ch := client.Capture(packet, tags)
if eventID != "" {
<-ch
Expand Down Expand Up @@ -765,13 +775,13 @@ func (client *Client) CapturePanic(f func(), tags map[string]string, interfaces
if client.shouldExcludeErr(rval.Error()) {
return
}
packet = NewPacket(rval.Error(), append(append(interfaces, client.context.interfaces()...), NewException(rval, NewStacktrace(2, 3, client.includePaths)))...)
packet = NewPacket(rval.Error(), append(append(interfaces, client.context.interfaces()...), NewException(rval, NewStacktrace(2+client.skipFrames, 3, client.includePaths)))...)
default:
rvalStr := fmt.Sprint(rval)
if client.shouldExcludeErr(rvalStr) {
return
}
packet = NewPacket(rvalStr, append(append(interfaces, client.context.interfaces()...), NewException(errors.New(rvalStr), NewStacktrace(2, 3, client.includePaths)))...)
packet = NewPacket(rvalStr, append(append(interfaces, client.context.interfaces()...), NewException(errors.New(rvalStr), NewStacktrace(2+client.skipFrames, 3, client.includePaths)))...)
}

errorID, _ = client.Capture(packet, tags)
Expand Down Expand Up @@ -803,13 +813,13 @@ func (client *Client) CapturePanicAndWait(f func(), tags map[string]string, inte
if client.shouldExcludeErr(rval.Error()) {
return
}
packet = NewPacket(rval.Error(), append(append(interfaces, client.context.interfaces()...), NewException(rval, NewStacktrace(2, 3, client.includePaths)))...)
packet = NewPacket(rval.Error(), append(append(interfaces, client.context.interfaces()...), NewException(rval, NewStacktrace(2+client.skipFrames, 3, client.includePaths)))...)
default:
rvalStr := fmt.Sprint(rval)
if client.shouldExcludeErr(rvalStr) {
return
}
packet = NewPacket(rvalStr, append(append(interfaces, client.context.interfaces()...), NewException(errors.New(rvalStr), NewStacktrace(2, 3, client.includePaths)))...)
packet = NewPacket(rvalStr, append(append(interfaces, client.context.interfaces()...), NewException(errors.New(rvalStr), NewStacktrace(2+client.skipFrames, 3, client.includePaths)))...)
}

var ch chan error
Expand Down