Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: add go1.21 #695

Merged
merged 2 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: "1.20"
go-version: "1.21"
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ jobs:
# pull requests, only run this step for a single job in the matrix. For
# all other workflow triggers (e.g., pushes to a release branch) run
# this step for the whole matrix.
if: ${{ github.event_name != 'pull_request' || (matrix.go == '1.20' && matrix.os == 'ubuntu') }}
if: ${{ github.event_name != 'pull_request' || (matrix.go == '1.21' && matrix.os == 'ubuntu') }}
timeout-minutes: 15
strategy:
matrix:
go: ["1.20", "1.19", "1.18"]
go: ["1.21", "1.20", "1.19", "1.18"]
os: [ubuntu, windows, macos]
fail-fast: false
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Bug fixes

- Fix trace function name parsing in profiler on go1.21+ ([#695](https://github.com/getsentry/sentry-go/pull/695))

## 0.23.0

The Sentry SDK team is happy to announce the immediate availability of Sentry Go SDK v0.23.0.
Expand Down
9 changes: 8 additions & 1 deletion internal/traceparser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,14 @@ var createdByPrefix = []byte("created by ")

func (f *Frame) Func() []byte {
if bytes.HasPrefix(f.line1, createdByPrefix) {
return f.line1[len(createdByPrefix):]
// Since go1.21, the line ends with " in goroutine X", saying which goroutine created this one.
// We currently don't have use for that so just remove it.
var line = f.line1[len(createdByPrefix):]
var spaceAt = bytes.IndexByte(line, ' ')
if spaceAt < 0 {
return line
}
return line[:spaceAt]
}

var end = bytes.LastIndexByte(f.line1, '(')
Expand Down
73 changes: 50 additions & 23 deletions internal/traceparser/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,39 @@ package traceparser
import (
"bytes"
"fmt"
"runtime"
"strings"
"testing"

"github.com/stretchr/testify/require"
)

func TestGenerateTrace(t *testing.T) {
stacks := make(chan string)
go func() {
var stacksBuffer = make([]byte, 1000)
for {
// Capture stacks for all existing goroutines.
// Note: runtime.GoroutineProfile() would be better but we can't use it at the moment because
// it doesn't give us `gid` for each routine, see https://github.com/golang/go/issues/59663
n := runtime.Stack(stacksBuffer, true)

// If we couldn't read everything, increase the buffer and try again.
if n >= len(stacksBuffer) {
stacksBuffer = make([]byte, n*2)
} else {
stacks <- string(stacksBuffer[0:n])
break
}
}
}()

t.Log(<-stacks)

// Note: uncomment to show the output so you can update it manually in tests below.
// t.Fail()
}

func TestParseEmpty(t *testing.T) {
var require = require.New(t)

Expand All @@ -17,11 +44,11 @@ func TestParseEmpty(t *testing.T) {
}

var tracetext = []byte(`
goroutine 18 [running]:
testing.(*M).startAlarm.func1()
C:/Users/name/scoop/apps/go/current/src/testing/testing.go:2241 +0x3c5
created by time.goFunc
C:/Users/name/scoop/apps/go/current/src/time/sleep.go:176 +0x32
goroutine 7 [running]:
github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace.func1()
c:/dev/sentry-go/internal/traceparser/parser_test.go:23 +0x6c
created by github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace in goroutine 6
c:/dev/sentry-go/internal/traceparser/parser_test.go:17 +0x7f

goroutine 1 [chan receive]:
testing.(*T).Run(0xc00006f6c0, {0x672288?, 0x180fd3?}, 0x6b5f98)
Expand Down Expand Up @@ -78,10 +105,10 @@ func TestParse(t *testing.T) {
i++
}

checkTrace(18, `testing.(*M).startAlarm.func1()
C:/Users/name/scoop/apps/go/current/src/testing/testing.go:2241 +0x3c5
created by time.goFunc
C:/Users/name/scoop/apps/go/current/src/time/sleep.go:176 +0x32`)
checkTrace(7, `github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace.func1()
c:/dev/sentry-go/internal/traceparser/parser_test.go:23 +0x6c
created by github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace in goroutine 6
c:/dev/sentry-go/internal/traceparser/parser_test.go:17 +0x7f`)

checkTrace(1, `testing.(*T).Run(0xc00006f6c0, {0x672288?, 0x180fd3?}, 0x6b5f98)
C:/Users/name/scoop/apps/go/current/src/testing/testing.go:1630 +0x405
Expand Down Expand Up @@ -144,13 +171,13 @@ func TestFrames(t *testing.T) {
}

var expected = strings.Split(strings.TrimLeft(`
Trace 0: goroutine 18 with at most 2 frames
Func = testing.(*M).startAlarm.func1
File = C:/Users/name/scoop/apps/go/current/src/testing/testing.go
Line = 2241
Func = time.goFunc
File = C:/Users/name/scoop/apps/go/current/src/time/sleep.go
Line = 176
Trace 0: goroutine 7 with at most 2 frames
Func = github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace.func1
File = c:/dev/sentry-go/internal/traceparser/parser_test.go
Line = 23
Func = github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace
File = c:/dev/sentry-go/internal/traceparser/parser_test.go
Line = 17
Trace 1: goroutine 1 with at most 6 frames
Func = testing.(*T).Run
File = C:/Users/name/scoop/apps/go/current/src/testing/testing.go
Expand Down Expand Up @@ -228,13 +255,13 @@ func TestFramesReversed(t *testing.T) {
}

var expected = strings.Split(strings.TrimLeft(`
Trace 0: goroutine 18 with at most 2 frames
Func = time.goFunc
File = C:/Users/name/scoop/apps/go/current/src/time/sleep.go
Line = 176
Func = testing.(*M).startAlarm.func1
File = C:/Users/name/scoop/apps/go/current/src/testing/testing.go
Line = 2241
Trace 0: goroutine 7 with at most 2 frames
Func = github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace
File = c:/dev/sentry-go/internal/traceparser/parser_test.go
Line = 17
Func = github.com/getsentry/sentry-go/internal/traceparser.TestGenerateTrace.func1
File = c:/dev/sentry-go/internal/traceparser/parser_test.go
Line = 23
Trace 1: goroutine 1 with at most 6 frames
Func = main.main
File = _testmain.go
Expand Down
1 change: 1 addition & 0 deletions profiler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ func validateProfile(t *testing.T, trace *profileTrace, duration time.Duration)

for _, frame := range trace.Frames {
require.NotEmpty(frame.Function)
require.NotContains(frame.Function, " ") // Space in the function name is likely a parsing error
require.Greater(len(frame.AbsPath)+len(frame.Filename), 0)
require.Greater(frame.Lineno, 0)
}
Expand Down
Loading