Skip to content

Commit 6d987ed

Browse files
korniltsevkorniltsev
authored
chore: bump jfr-parser (#2968)
1 parent fc19d28 commit 6d987ed

File tree

72 files changed

+564
-597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+564
-597
lines changed

‎ebpf/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/cespare/xxhash/v2 v2.2.0
99
github.com/cilium/ebpf v0.11.0
1010
github.com/go-kit/log v0.2.1
11-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
11+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815
1212
github.com/grafana/pyroscope/api v0.4.0
1313
github.com/hashicorp/golang-lru/v2 v2.0.5
1414
github.com/ianlancetaylor/demangle v0.0.0-20230524184225-eabc099b10ab

‎ebpf/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
2222
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
2323
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
2424
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
25-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
26-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
25+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8=
26+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
2727
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
2828
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
2929
github.com/grafana/pyroscope/api v0.4.0 h1:J86DxoNeLOvtJhB1Cn65JMZkXe682D+RqeoIUiYc/eo=

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ require (
2222
github.com/gogo/status v1.1.1
2323
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
2424
github.com/google/go-cmp v0.6.0
25-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98
25+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815
2626
github.com/google/uuid v1.4.0
2727
github.com/gorilla/mux v1.8.0
2828
github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6
29-
github.com/grafana/jfr-parser/pprof v0.0.0-20240108135448-c7f61c1f689e
29+
github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361
3030
github.com/grafana/pyroscope-go v1.0.3
3131
github.com/grafana/pyroscope-go/godeltaprof v0.1.7
32-
github.com/grafana/pyroscope/api v0.3.0
32+
github.com/grafana/pyroscope/api v0.4.0
3333
github.com/grafana/regexp v0.0.0-20221123153739-15dc172cd2db
3434
github.com/grafana/river v0.3.0
3535
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,8 +365,8 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf
365365
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
366366
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
367367
github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg=
368-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
369-
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
368+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8=
369+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
370370
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
371371
github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
372372
github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw=
@@ -388,8 +388,8 @@ github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6 h1:Z78JZ7pa6InQ5BcMB
388388
github.com/grafana/dskit v0.0.0-20231221015914-de83901bf4d6/go.mod h1:kkWM4WUV230bNG3urVRWPBnSJHs64y/0RmWjftnnn0c=
389389
github.com/grafana/jfr-parser v0.8.0 h1:/uo2wZNXrxw7tKLFwP2omJ3EQGMkD9wzhPsRogVofc0=
390390
github.com/grafana/jfr-parser v0.8.0/go.mod h1:M5u1ux34Qo47ZBWksbMYVk40s7dvU3WMVYpxweEu4R0=
391-
github.com/grafana/jfr-parser/pprof v0.0.0-20240108135448-c7f61c1f689e h1:Xpf1EsOY+ZMQYzusCLEixnWifv36J/jLz0GihnEyuNA=
392-
github.com/grafana/jfr-parser/pprof v0.0.0-20240108135448-c7f61c1f689e/go.mod h1:SDOa+U4/vAkuGjYBWXJpHpiaesbeXuhaQW4xzHzTSL4=
391+
github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361 h1:TtNajaiSRfM2Mz8N7ouFQDFlviXbIEk9Hts0yoZnhGM=
392+
github.com/grafana/jfr-parser/pprof v0.0.0-20240126072739-986e71dc0361/go.mod h1:P5406BrWxjahTzVF6aCSumNI1KPlZJc0zO0v+zKZ4gc=
393393
github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91 h1:/NipyHnOmvRsVzj81j2qE0VxsvsqhOB0f4vJIhk2qCQ=
394394
github.com/grafana/memberlist v0.3.1-0.20220708130638-bd88e10a3d91/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
395395
github.com/grafana/objstore v0.0.0-20231121154247-84f91ea90e72 h1:o22hsDMQ3kv/0N9PkzHQSd5xMmmmdA5UJR7Jb4xISZQ=

‎go.work.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,9 +1049,13 @@ github.com/chromedp/chromedp v0.9.2/go.mod h1:LkSXJKONWTCHAfQasKFUZI+mxqS4tZqhmt
10491049
github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
10501050
github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
10511051
github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE=
1052+
github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM=
1053+
github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ=
10521054
github.com/chzyer/readline v1.5.1 h1:upd/6fQk4src78LMRzh5vItIt361/o4uq553V8B5sGI=
10531055
github.com/chzyer/readline v1.5.1/go.mod h1:Eh+b79XXUwfKfcPLepksvw2tcLE/Ct21YObkaSkeBlk=
10541056
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8=
1057+
github.com/chzyer/test v1.0.0 h1:p3BQDXSxOhOG0P9z6/hGnII4LGiEPOYBhs8asl/fC04=
1058+
github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38GC8=
10551059
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible h1:C29Ae4G5GtYyYMm1aztcyj/J5ckgJm2zwdDajFbx1NY=
10561060
github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
10571061
github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI=
@@ -1399,6 +1403,7 @@ github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoG
13991403
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
14001404
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
14011405
github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
1406+
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 h1:WzfWbQz/Ze8v6l++GGbGNFZnUShVpP/0xffCPLL+ax8=
14021407
github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
14031408
github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
14041409
github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=

‎pkg/ingester/pyroscope/ingest_handler_test.go

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"net/http/httptest"
99
"os"
1010
"sort"
11-
"strings"
1211
"testing"
1312

1413
"connectrpc.com/connect"
@@ -142,54 +141,6 @@ const (
142141
testdataDirJFR = repoRoot + "pkg/og/convert/jfr/testdata"
143142
)
144143

145-
func TestIngestJFR(b *testing.T) {
146-
testdata := []struct {
147-
jfr string
148-
labels string
149-
}{
150-
{"cortex-dev-01__kafka-0__cpu__0.jfr.gz", ""},
151-
{"cortex-dev-01__kafka-0__cpu__1.jfr.gz", ""},
152-
{"cortex-dev-01__kafka-0__cpu__2.jfr.gz", ""},
153-
{"cortex-dev-01__kafka-0__cpu__3.jfr.gz", ""},
154-
{"cortex-dev-01__kafka-0__cpu_lock_alloc__0.jfr.gz", ""},
155-
{"cortex-dev-01__kafka-0__cpu_lock_alloc__1.jfr.gz", ""},
156-
{"cortex-dev-01__kafka-0__cpu_lock_alloc__2.jfr.gz", ""},
157-
{"cortex-dev-01__kafka-0__cpu_lock_alloc__3.jfr.gz", ""},
158-
{"cortex-dev-01__kafka-0__cpu_lock0_alloc0__0.jfr.gz", ""},
159-
{"dump1.jfr.gz", "dump1.labels.pb.gz"},
160-
{"dump2.jfr.gz", "dump2.labels.pb.gz"},
161-
}
162-
l := log.NewSyncLogger(log.NewLogfmtLogger(os.Stderr))
163-
164-
for _, jfr := range testdata {
165-
td := jfr
166-
b.Run(td.jfr, func(t *testing.T) {
167-
src := testdataDirJFR + "/" + td.jfr
168-
jfr, err := bench.ReadGzipFile(src)
169-
require.NoError(t, err)
170-
var labels []byte
171-
if td.labels != "" {
172-
labels, err = bench.ReadGzipFile(testdataDirJFR + "/" + td.labels)
173-
}
174-
require.NoError(t, err)
175-
svc := &MockPushService{Keep: true, T: t}
176-
h := NewPyroscopeIngestHandler(svc, l)
177-
178-
res := httptest.NewRecorder()
179-
body, ct := createJFRRequestBody(t, jfr, labels)
180-
181-
req := httptest.NewRequest("POST", "/ingest?name=javaapp&format=jfr", bytes.NewReader(body))
182-
req.Header.Set("Content-Type", ct)
183-
h.ServeHTTP(res, req)
184-
assert.Equal(t, 200, res.Code)
185-
186-
dst := strings.ReplaceAll(src, ".jfr.gz", ".pprof.json.gz")
187-
// svc.DumpTo(dst)
188-
svc.CompareDump(dst)
189-
})
190-
}
191-
}
192-
193144
func TestCorruptedJFR422(t *testing.T) {
194145
l := log.NewSyncLogger(log.NewLogfmtLogger(os.Stderr))
195146

0 commit comments

Comments
 (0)