Skip to content

Commit ba25822

Browse files
authored
use go 1.21 for pgo testing (#2279)
* update godeltaprof * Update golang version to 1.21.0
1 parent a51d115 commit ba25822

File tree

10 files changed

+28
-18
lines changed

10 files changed

+28
-18
lines changed
File renamed without changes.

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Install Go
2727
uses: actions/setup-go@v4
2828
with:
29-
go-version: "1.19.12"
29+
go-version: "1.21.0"
3030
cache: true
3131
- run: yarn --frozen-lockfile
3232
- run: make build
@@ -56,7 +56,7 @@ jobs:
5656
- name: Install Go
5757
uses: actions/setup-go@v4
5858
with:
59-
go-version: "1.19.12"
59+
go-version: "1.21.0"
6060
cache: true
6161
- run: yarn --frozen-lockfile
6262
- run: make build

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- run: git fetch --force --tags
2929
- uses: actions/setup-go@v3
3030
with:
31-
go-version: "1.19.12"
31+
go-version: "1.21.0"
3232
cache: true
3333
- uses: actions/setup-node@v3
3434
with:

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install Go
2424
uses: actions/setup-go@v4
2525
with:
26-
go-version: 1.19.12
26+
go-version: 1.21.0
2727
- name: Format
2828
run: make fmt check/unstaged-changes
2929
test:
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install Go
3535
uses: actions/setup-go@v4
3636
with:
37-
go-version: 1.19.12
37+
go-version: 1.21.0
3838
- name: Go Mod
3939
run: make check/go/mod
4040
- name: Test
@@ -48,7 +48,7 @@ jobs:
4848
- name: Install Go
4949
uses: actions/setup-go@v4
5050
with:
51-
go-version: 1.19.12
51+
go-version: 1.21.0
5252
- name: Run linter
5353
run: make lint
5454
- name: Check helm manifests
@@ -78,7 +78,7 @@ jobs:
7878
- name: Set up go
7979
uses: actions/setup-go@v2
8080
with:
81-
go-version: 1.19.12
81+
go-version: 1.21.0
8282
- uses: actions/setup-node@v3
8383
with:
8484
node-version: lts/hydrogen
@@ -100,7 +100,7 @@ jobs:
100100
- name: Set up go
101101
uses: actions/setup-go@v2
102102
with:
103-
go-version: 1.19.12
103+
go-version: 1.21.0
104104
- uses: actions/setup-node@v3
105105
with:
106106
node-version: lts/hydrogen

.github/workflows/weekly-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
git tag "$WEEKLY_IMAGE_TAG"
2626
- uses: actions/setup-go@v3
2727
with:
28-
go-version: "1.19.12"
28+
go-version: "1.21.0"
2929
cache: true
3030
# setup docker buildx
3131
- name: Set up QEMU

.goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project_name: pyroscope
22
before:
33
hooks:
44
# This hook ensures that goreleaser uses the correct go version for a Phlare release
5-
- sh -euc "go version | grep "go version go1.19.12 " || { echo "Unexpected go version"; exit 1; }"
5+
- sh -euc "go version | grep "go version go1.21.0 " || { echo "Unexpected go version"; exit 1; }"
66
builds:
77
- env:
88
- CGO_ENABLED=0

ebpf/symtab/proc_linux_test.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,22 @@ func TestSelfElfSymbolsLazy(t *testing.T) {
5454

5555
e, err := elf0.Open(f)
5656
require.NoError(t, err)
57+
defer e.Close()
58+
5759
expectedSymbols := elf.GetELFSymbolsFromSymtab(e)
5860

61+
if len(expectedSymbols) == 0 {
62+
t.Skip("no symbols found")
63+
return
64+
}
65+
5966
me, err := elf.NewMMapedElfFile(f)
6067
require.NoError(t, err)
68+
defer me.Close()
6169

6270
symbolTable, err := me.NewSymbolTable(new(elf.SymbolsOptions))
6371
require.NoError(t, err)
6472

65-
require.Greater(t, len(symbolTable.Index.Names), 500)
66-
6773
for _, symbol := range expectedSymbols {
6874
name := symbolTable.Resolve(symbol.Start)
6975
if symbol.Name == "runtime.text" && name == "internal/cpu.Initialize" {

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
github.com/prometheus/client_golang v1.16.0
4646
github.com/prometheus/common v0.44.0
4747
github.com/prometheus/prometheus v0.46.0
48-
github.com/pyroscope-io/client v0.7.1
48+
github.com/pyroscope-io/client v0.7.2
4949
github.com/pyroscope-io/jfr-parser v0.7.0
5050
github.com/samber/lo v1.37.0
5151
github.com/sirupsen/logrus v1.9.3
@@ -184,7 +184,7 @@ require (
184184
github.com/prometheus/common/sigv4 v0.1.0 // indirect
185185
github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
186186
github.com/prometheus/procfs v0.11.0 // indirect
187-
github.com/pyroscope-io/godeltaprof v0.1.0 // indirect
187+
github.com/pyroscope-io/godeltaprof v0.1.2 // indirect
188188
github.com/rivo/uniseg v0.4.3 // indirect
189189
github.com/rogpeppe/go-internal v1.11.0 // indirect
190190
github.com/rs/xid v1.5.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,10 +1077,10 @@ github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuR
10771077
github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
10781078
github.com/prometheus/prometheus v0.46.0 h1:9JSdXnsuT6YsbODEhSQMwxNkGwPExfmzqG73vCMk/Kw=
10791079
github.com/prometheus/prometheus v0.46.0/go.mod h1:10L5IJE5CEsjee1FnOcVswYXlPIscDWWt3IJ2UDYrz4=
1080-
github.com/pyroscope-io/client v0.7.1 h1:yFRhj3vbgjBxehvxQmedmUWJQ4CAfCHhn+itPsuWsHw=
1081-
github.com/pyroscope-io/client v0.7.1/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU=
1082-
github.com/pyroscope-io/godeltaprof v0.1.0 h1:UBqtjt0yZi4jTxqZmLAs34XG6ycS3vUTlhEUSq4NHLE=
1083-
github.com/pyroscope-io/godeltaprof v0.1.0/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
1080+
github.com/pyroscope-io/client v0.7.2 h1:OX2qdUQsS8RSkn/3C8isD7f/P0YiZQlRbAlecAaj/R8=
1081+
github.com/pyroscope-io/client v0.7.2/go.mod h1:FEocnjn+Ngzxy6EtU9ZxXWRvQ0+pffkrBxHLnPpxwi8=
1082+
github.com/pyroscope-io/godeltaprof v0.1.2 h1:MdlEmYELd5w+lvIzmZvXGNMVzW2Qc9jDMuJaPOR75g4=
1083+
github.com/pyroscope-io/godeltaprof v0.1.2/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
10841084
github.com/pyroscope-io/jfr-parser v0.7.0 h1:U1fE48cEJz/j7NngW/2wRbQXjx9P4yCDVY7L8CkY5fI=
10851085
github.com/pyroscope-io/jfr-parser v0.7.0/go.mod h1:ZMcbJjfDkOwElEK8CvUJbpetztRWRXszCmf5WU0erV8=
10861086
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

go.work.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,6 +1376,10 @@ github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB
13761376
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
13771377
github.com/pyroscope-io/client v0.6.1-0.20230130114945-a64d920d2fba h1:SyF8fpp4K+eOGCwrlzunuDytyJ4F12ePvdnmmdA4P60=
13781378
github.com/pyroscope-io/client v0.6.1-0.20230130114945-a64d920d2fba/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU=
1379+
github.com/pyroscope-io/client v0.7.2/go.mod h1:FEocnjn+Ngzxy6EtU9ZxXWRvQ0+pffkrBxHLnPpxwi8=
1380+
github.com/pyroscope-io/dotnetdiag v1.2.1 h1:3XEMrfFJnZ87BiEhozyQKmCUAuMd/Spq7KChPuD2Cf0=
1381+
github.com/pyroscope-io/dotnetdiag v1.2.1/go.mod h1:eFUEHCp4eD1TgcXMlJihC+R4MrqGf7nTRdWxNADbDHA=
1382+
github.com/pyroscope-io/godeltaprof v0.1.2/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
13791383
github.com/pyroscope-io/dotnetdiag v1.2.1 h1:3XEMrfFJnZ87BiEhozyQKmCUAuMd/Spq7KChPuD2Cf0=
13801384
github.com/pyroscope-io/dotnetdiag v1.2.1/go.mod h1:eFUEHCp4eD1TgcXMlJihC+R4MrqGf7nTRdWxNADbDHA=
13811385
github.com/pyroscope-io/goldga v0.4.2-0.20220218190441-817afcc3a7f1 h1:T1fDdt3E3UpaGZ7tRF2IYrUFwNyuPlIWGeCOjfINp1s=

0 commit comments

Comments
 (0)