Skip to content

Commit bf5fa71

Browse files
gnurizengnurizen
authored
Merge pull request #106 from parca-dev/pr635
pr635
2 parents 860c4f0 + 4a01451 commit bf5fa71

Some content is hidden

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

54 files changed

+634
-1257
lines changed

‎.github/workflows/collector-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
git clone --depth=1 https://github.com/open-telemetry/opentelemetry-collector.git $collector_path
3838
- name: Setup replace statement
3939
run: |
40-
COLLECTOR_PATH=/tmp/opentelemetry-collector ./scripts/local-collector.sh
40+
COLLECTOR_PATH=/tmp/opentelemetry-collector ./support/local-collector.sh
4141
go mod tidy
4242
- name: Tests
4343
run: make test-junit

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ support/golbls_1_24.test: ./interpreter/golabels/test/main.go
141141
support/golbls_cgo.test: ./interpreter/golabels/test/main-cgo.go
142142
CGO_ENABLED=1 GOTOOLCHAIN=go1.24.1 go build -ldflags '-extldflags "-static"' -tags $(GO_TAGS),usecgo -o $@ $<
143143

144-
integration-test-binaries: generate ebpf rust-components support/golbls_1_23.test support/golbls_1_24.test support/golbls_cgo.test
144+
integration-test-binaries: generate ebpf support/golbls_1_23.test support/golbls_1_24.test support/golbls_cgo.test
145145
$(foreach test_name, $(TEST_INTEGRATION_BINARY_DIRS), \
146146
(go test -ldflags='-extldflags=-static' -trimpath -c \
147147
-tags $(GO_TAGS),static_build,integration \

‎collector/internal/controller.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ func NewController(cfg *controller.Config,
3636
GRPCConnectionTimeout: intervals.GRPCConnectionTimeout(),
3737
ReportInterval: intervals.ReportInterval(),
3838
ExecutablesCacheElements: 16384,
39-
// Next step: Calculate FramesCacheElements from numCores and samplingRate.
40-
FramesCacheElements: 131072,
41-
SamplesPerSecond: cfg.SamplesPerSecond,
39+
SamplesPerSecond: cfg.SamplesPerSecond,
4240
}, nextConsumer)
4341
if err != nil {
4442
return nil, err

‎go.mod‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module go.opentelemetry.io/ebpf-profiler
33
go 1.23.6
44

55
require (
6-
github.com/aws/aws-sdk-go-v2 v1.37.0
7-
github.com/aws/aws-sdk-go-v2/config v1.30.0
8-
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.0
6+
github.com/aws/aws-sdk-go-v2 v1.37.1
7+
github.com/aws/aws-sdk-go-v2/config v1.30.2
8+
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1
99
github.com/cespare/xxhash/v2 v2.3.0
1010
github.com/cilium/ebpf v0.19.0
1111
github.com/docker/go-connections v0.5.0
@@ -15,10 +15,10 @@ require (
1515
github.com/klauspost/compress v1.18.0
1616
github.com/mdlayher/kobject v0.0.0-20200520190114-19ca17470d7d
1717
github.com/minio/sha256-simd v1.0.1
18-
github.com/parca-dev/oomprof v0.1.5-0.20250812211204-fcd45c49d0db
18+
github.com/parca-dev/oomprof v0.1.5-0.20250916114836-5d60b5355c17
1919
github.com/peterbourgon/ff/v3 v3.4.0
2020
github.com/sirupsen/logrus v1.9.3
21-
github.com/stretchr/testify v1.10.0
21+
github.com/stretchr/testify v1.11.1
2222
github.com/testcontainers/testcontainers-go v0.35.0
2323
github.com/tklauser/numcpus v0.10.0
2424
github.com/zeebo/xxh3 v1.0.2
@@ -36,7 +36,7 @@ require (
3636
golang.org/x/exp v0.0.0-20250717185816-542afb5b7346
3737
golang.org/x/mod v0.26.0
3838
golang.org/x/sync v0.16.0
39-
golang.org/x/sys v0.34.0
39+
golang.org/x/sys v0.35.0
4040
google.golang.org/grpc v1.74.1
4141
)
4242

@@ -45,19 +45,19 @@ require (
4545
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
4646
github.com/Microsoft/go-winio v0.6.2 // indirect
4747
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
48-
github.com/aws/aws-sdk-go-v2/credentials v1.18.0 // indirect
49-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.17.0 // indirect
50-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.0 // indirect
51-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.0 // indirect
48+
github.com/aws/aws-sdk-go-v2/credentials v1.18.2 // indirect
49+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.1 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 // indirect
51+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.1 // indirect
5252
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
53-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.0 // indirect
53+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1 // indirect
5454
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.0 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.0 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.0 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/sso v1.26.0 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.0 // indirect
60-
github.com/aws/aws-sdk-go-v2/service/sts v1.35.0 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.1 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1 // indirect
58+
github.com/aws/aws-sdk-go-v2/service/sso v1.26.1 // indirect
59+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.1 // indirect
60+
github.com/aws/aws-sdk-go-v2/service/sts v1.35.1 // indirect
6161
github.com/aws/smithy-go v1.22.5 // indirect
6262
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6363
github.com/containerd/containerd v1.7.18 // indirect
@@ -120,6 +120,6 @@ require (
120120
golang.org/x/net v0.40.0 // indirect
121121
golang.org/x/text v0.25.0 // indirect
122122
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
123-
google.golang.org/protobuf v1.36.6 // indirect
123+
google.golang.org/protobuf v1.36.8 // indirect
124124
gopkg.in/yaml.v3 v3.0.1 // indirect
125125
)

‎go.sum‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,40 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl
66
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
77
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
88
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
9-
github.com/aws/aws-sdk-go-v2 v1.37.0 h1:YtCOESR/pN4j5oA7cVHSfOwIcuh/KwHC4DOSXFbv5F0=
10-
github.com/aws/aws-sdk-go-v2 v1.37.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
9+
github.com/aws/aws-sdk-go-v2 v1.37.1 h1:SMUxeNz3Z6nqGsXv0JuJXc8w5YMtrQMuIBmDx//bBDY=
10+
github.com/aws/aws-sdk-go-v2 v1.37.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
1111
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=
1212
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=
13-
github.com/aws/aws-sdk-go-v2/config v1.30.0 h1:XhzXYU2x/T441/0CBh0g6UUC/OFGk+FRpl3ThI8AqM8=
14-
github.com/aws/aws-sdk-go-v2/config v1.30.0/go.mod h1:4j78A2ko2xc7SMLjjSUrgpp42vyneH9c8j3emf/CLTo=
15-
github.com/aws/aws-sdk-go-v2/credentials v1.18.0 h1:r9W/BX4B1dEbsd2NogyuFXmEfYhdUULUVEOh0SDAovw=
16-
github.com/aws/aws-sdk-go-v2/credentials v1.18.0/go.mod h1:SMtUJQRWEpyfC+ouDJNYdI7NNMqUjHM/Oaf0FV+vWNs=
17-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.17.0 h1:ouCRc4lCriJtCnrIN4Kw2tA/uETRZBrxwb/607gRvkE=
18-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.17.0/go.mod h1:LW9/PxQD1SYFC7pnWcgqPhoyZprhjEdg5hBK6qYPLW8=
19-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.0 h1:H2iZoqW/v2Jnrh1FnU725Bq6KJ0k2uP63yH+DcY+HUI=
20-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.0/go.mod h1:L0FqLbwMXHvNC/7crWV1iIxUlOKYZUE8KuTIA+TozAI=
21-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.0 h1:EDped/rNzAhFPhVY0sDGbtD16OKqksfA8OjF/kLEgw8=
22-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.0/go.mod h1:uUI335jvzpZRPpjYx6ODc/wg1qH+NnoSTK/FwVeK0C0=
13+
github.com/aws/aws-sdk-go-v2/config v1.30.2 h1:YE1BmSc4fFYqFgN1mN8uzrtc7R9x+7oSWeX8ckoltAw=
14+
github.com/aws/aws-sdk-go-v2/config v1.30.2/go.mod h1:UNrLGZ6jfAVjgVJpkIxjLufRJqTXCVYOpkeVf83kwBo=
15+
github.com/aws/aws-sdk-go-v2/credentials v1.18.2 h1:mfm0GKY/PHLhs7KO0sUaOtFnIQ15Qqxt+wXbO/5fIfs=
16+
github.com/aws/aws-sdk-go-v2/credentials v1.18.2/go.mod h1:v0SdJX6ayPeZFQxgXUKw5RhLpAoZUuynxWDfh8+Eknc=
17+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.1 h1:owmNBboeA0kHKDcdF8KiSXmrIuXZustfMGGytv6OMkM=
18+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.1/go.mod h1:Bg1miN59SGxrZqlP8vJZSmXW+1N8Y1MjQDq1OfuNod8=
19+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 h1:ksZXBYv80EFTcgc8OJO48aQ8XDWXIQL7gGasPeCoTzI=
20+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1/go.mod h1:HSksQyyJETVZS7uM54cir0IgxttTD+8aEoJMPGepHBI=
21+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.1 h1:+dn/xF/05utS7tUhjIcndbuaPjfll2LhbH1cCDGLYUQ=
22+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.1/go.mod h1:hyAGz30LHdm5KBZDI58MXx5lDVZ5CUfvfTZvMu4HCZo=
2323
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
2424
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
25-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.0 h1:iLvW/zOkHGU3BDU5thWnj+UZ9pjhuVhv1loLj7yVtBw=
26-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.0/go.mod h1:Fn3gvhdF1x5Rs9nUoCy/fJT1ms8f8dO7RqM9lJHuazQ=
25+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1 h1:4HbnOGE9491a9zYJ9VpPh1ApgEq6ZlD4Kuv1PJenFpc=
26+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.1/go.mod h1:Z6QnHC6TmpJWUxAy8FI4JzA7rTwl6EIANkyK9OR5z5w=
2727
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=
2828
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=
29-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.0 h1:qGyLBQPphYzUf+IIlb5tHnvg1U2Vc5hXPcP7oRSQfy0=
30-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.0/go.mod h1:g+dzKSLXiR/8ATkPXmLhPOI6rDdjLP3tngeo3FvDcIw=
31-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.0 h1:eRhU3Sh8dGbaniI6B+I48XJMrTPRkK4DKo+vqIxziOU=
32-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.0/go.mod h1:paNLV18DZ6FnWE/bd06RIKPDIFpjuvCkGKWTG/GDBeM=
33-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.0 h1:6jusT+XCcvnD+Elxvm7bUf5sCMTpZEp3AKjYQ4tWJSo=
34-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.0/go.mod h1:LimGpdIF/sTBdgqwOEkrArXLCoTamK/9L9x8IKBFTIc=
35-
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.0 h1:gAV4NEp4A+JOrIdoXkAeyy6IOo7+X2s/jRuaHKYiMaU=
36-
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.0/go.mod h1:JIQwK8sZ5MuKGm5rrFwp9MHUcyYEsQNpVixuPDlnwaU=
37-
github.com/aws/aws-sdk-go-v2/service/sso v1.26.0 h1:cuFWHH87GP1NBGXXfMicUbE7Oty5KpPxN6w4JpmuxYc=
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.26.0/go.mod h1:aJBemdlbCKyOXEXdXBqS7E+8S9XTDcOTaoOjtng54hA=
39-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.0 h1:t2va+wewPOYIqC6XyJ4MGjiGKkczMAPsgq5W4FtL9ME=
40-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.0/go.mod h1:ExCTcqYqN0hYYRsDlBVU8+68grqlWdgX9/nZJwQW4aY=
41-
github.com/aws/aws-sdk-go-v2/service/sts v1.35.0 h1:FD9agdG4CeOGS3ORLByJk56YIXDS7mxFpmZyCtpqExc=
42-
github.com/aws/aws-sdk-go-v2/service/sts v1.35.0/go.mod h1:NDzDPbBF1xtSTZUMuZx0w3hIfWzcL7X2AQ0Tr9becIQ=
29+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1 h1:ps3nrmBWdWwakZBydGX1CxeYFK80HsQ79JLMwm7Y4/c=
30+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.1/go.mod h1:bAdfrfxENre68Hh2swNaGEVuFYE74o0SaSCAlaG9E74=
31+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.1 h1:ky79ysLMxhwk5rxJtS+ILd3Mc8kC5fhsLBrP27r6h4I=
32+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.1/go.mod h1:+2MmkvFvPYM1vsozBWduoLJUi5maxFk5B7KJFECujhY=
33+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1 h1:MdVYlN5pcQu1t1OYx4Ajo3fKl1IEhzgdPQbYFCRjYS8=
34+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.1/go.mod h1:iikmNLrvHm2p4a3/4BPeix2S9P+nW8yM1IZW73x8bFA=
35+
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1 h1:Hsqo8+dFxSdDvv9B2PgIx1AJAnDpqgS0znVI+R+MoGY=
36+
github.com/aws/aws-sdk-go-v2/service/s3 v1.85.1/go.mod h1:8Q0TAPXD68Z8YqlcIGHs/UNIDHsxErV9H4dl4vJEpgw=
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.26.1 h1:uWaz3DoNK9MNhm7i6UGxqufwu3BEuJZm72WlpGwyVtY=
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.26.1/go.mod h1:ILpVNjL0BO+Z3Mm0SbEeUoYS9e0eJWV1BxNppp0fcb8=
39+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.1 h1:XdG6/o1/ZDmn3wJU5SRAejHaWgKS4zHv0jBamuKuS2k=
40+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.31.1/go.mod h1:oiotGTKadCOCl3vg/tYh4k45JlDF81Ka8rdumNhEnIQ=
41+
github.com/aws/aws-sdk-go-v2/service/sts v1.35.1 h1:iF4Xxkc0H9c/K2dS0zZw3SCkj0Z7n6AMnUiiyoJND+I=
42+
github.com/aws/aws-sdk-go-v2/service/sts v1.35.1/go.mod h1:0bxIatfN0aLq4mjoLDeBpOjOke68OsFlXPDFJ7V0MYw=
4343
github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
4444
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
4545
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -169,8 +169,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
169169
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
170170
github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
171171
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
172-
github.com/parca-dev/oomprof v0.1.5-0.20250812211204-fcd45c49d0db h1:YoZ8I4zUvE6QBA9zPPR1zKWWdoVMeINPjUKfhGu5kVc=
173-
github.com/parca-dev/oomprof v0.1.5-0.20250812211204-fcd45c49d0db/go.mod h1:+vw0+rZYq/rTVouF6G+/+Uol758EOkUINi8/8RXPvX0=
172+
github.com/parca-dev/oomprof v0.1.5-0.20250916114836-5d60b5355c17 h1:amrSTgX5V7nE0EIwgaSzIj5W8v6in2a3J8ez9tNNJKM=
173+
github.com/parca-dev/oomprof v0.1.5-0.20250916114836-5d60b5355c17/go.mod h1:iqI6XrmiNWOa8m2vEIKo+GtQrqbWCMLFpBWuk8RuAPs=
174174
github.com/peterbourgon/ff/v3 v3.4.0 h1:QBvM/rizZM1cB0p0lGMdmR7HxZeI/ZrBWB4DqLkMUBc=
175175
github.com/peterbourgon/ff/v3 v3.4.0/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyXE/eKY9RztQ=
176176
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -199,8 +199,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
199199
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
200200
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
201201
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
202-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
203-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
202+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
203+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
204204
github.com/testcontainers/testcontainers-go v0.35.0 h1:uADsZpTKFAtp8SLK+hMwSaa+X+JiERHtd4sQAFmXeMo=
205205
github.com/testcontainers/testcontainers-go v0.35.0/go.mod h1:oEVBj5zrfJTrgjwONs1SsRbnBtH9OKl+IGl3UMcr2B4=
206206
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
@@ -322,8 +322,8 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
322322
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
323323
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
324324
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
325-
golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
326-
golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
325+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
326+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
327327
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
328328
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
329329
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -347,8 +347,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:
347347
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
348348
google.golang.org/grpc v1.74.1 h1:1liE5AupsvQAxKhrVPU9yhMEnyjmMi+F6FUmP9EB2ts=
349349
google.golang.org/grpc v1.74.1/go.mod h1:CtQ+BGjaAIXHs/5YS3i473GqwBBa1zGQNevxdeBEXrM=
350-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
351-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
350+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
351+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
352352
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
353353
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
354354
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎host/host.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,5 @@ type Trace struct {
6565
CPU int
6666
EnvVars map[string]string
6767
CustomLabels map[string]string
68+
KernelFrames libpf.Frames
6869
}

‎interpreter/customlabels/integrationtests/node_test.go‎

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@ import (
3333
testcontainers "github.com/testcontainers/testcontainers-go"
3434
"github.com/testcontainers/testcontainers-go/wait"
3535
"go.opentelemetry.io/ebpf-profiler/libpf"
36-
"go.opentelemetry.io/ebpf-profiler/reporter"
3736
"go.opentelemetry.io/ebpf-profiler/testutils"
3837
tracertypes "go.opentelemetry.io/ebpf-profiler/tracer/types"
3938
)
4039

41-
type symbolMap map[libpf.FrameID]libpf.String
42-
4340
const N_WORKERS int = 8
4441

4542
var files = []string{
@@ -80,7 +77,7 @@ func TestIntegration(t *testing.T) {
8077
enabledTracers, err := tracertypes.Parse("labels,v8")
8178
require.NoError(t, err)
8279

83-
r := &mockReporter{symbols: make(symbolMap)}
80+
r := &testutils.MockReporter{}
8481
traceCh, trc := testutils.StartTracer(ctx, t, enabledTracers, r, false)
8582

8683
testHTTPEndpoint(ctx, t, cont)
@@ -118,10 +115,10 @@ func TestIntegration(t *testing.T) {
118115
"readFileHandle",
119116
}
120117
hasWorkloadFrame := false
121-
for i := range ct.FrameTypes {
122-
if ct.FrameTypes[i] == libpf.V8Frame {
123-
id := libpf.NewFrameID(ct.Files[i], ct.Linenos[i])
124-
name := r.getFunctionName(id)
118+
119+
for i := range ct.Frames {
120+
if ct.Frames[i].Value().Type == libpf.V8Frame {
121+
name := ct.Frames[i].Value().FunctionName.String()
125122
if slices.Contains(knownWorkloadFrames, name) {
126123
hasWorkloadFrame = true
127124
}
@@ -266,28 +263,3 @@ func testHTTPEndpoint(ctx context.Context, t *testing.T, cont testcontainers.Con
266263
wg.Wait()
267264
require.NoError(t, errors.Join(errs...))
268265
}
269-
270-
type mockReporter struct {
271-
mu sync.Mutex
272-
symbols symbolMap
273-
}
274-
275-
var _ reporter.SymbolReporter = &mockReporter{}
276-
277-
func (m *mockReporter) ExecutableMetadata(*reporter.ExecutableMetadataArgs) {
278-
}
279-
func (m *mockReporter) FrameKnown(_ libpf.FrameID) bool { return false }
280-
func (m *mockReporter) ExecutableKnown(libpf.FileID) bool {
281-
return false
282-
}
283-
func (m *mockReporter) FrameMetadata(args *reporter.FrameMetadataArgs) {
284-
m.mu.Lock()
285-
defer m.mu.Unlock()
286-
m.symbols[args.FrameID] = args.FunctionName
287-
}
288-
289-
func (m *mockReporter) getFunctionName(frameID libpf.FrameID) string {
290-
m.mu.Lock()
291-
defer m.mu.Unlock()
292-
return m.symbols[frameID].String()
293-
}

‎interpreter/dotnet/dotnet.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ import (
107107
log "github.com/sirupsen/logrus"
108108

109109
"go.opentelemetry.io/ebpf-profiler/interpreter"
110-
"go.opentelemetry.io/ebpf-profiler/libpf"
111110
)
112111

113112
const (
@@ -125,9 +124,6 @@ var (
125124
// regex for the core language runtime
126125
dotnetRegex = regexp.MustCompile(`/(\d+)\.(\d+).(\d+)/libcoreclr.so$`)
127126

128-
// The FileID used for Dotnet stub frames. Same FileID as in other interpreters.
129-
stubsFileID = libpf.NewStubFileID(libpf.DotnetFrame)
130-
131127
// compiler check to make sure the needed interfaces are satisfied
132128
_ interpreter.Data = &dotnetData{}
133129
_ interpreter.Instance = &dotnetInstance{}

0 commit comments

Comments
 (0)