From 98498380f0b7c6b273ddbcc59e42e2ca256e6f79 Mon Sep 17 00:00:00 2001 From: Florian Lehner Date: Tue, 14 Apr 2026 10:06:43 +0200 Subject: [PATCH 1/4] CI: fix collector test These replace statements are necessary as golangci-lint introduces dependencies, that conflict with eBPF profiler and OTel collector. ``` $ go mod graph -modfile=internal/tools/go.mod | grep "google.golang.org/genproto" github.com/securego/gosec/v2@v2.24.8-0.20260309165252-619ce2117e08 google.golang.org/genproto/googleapis/rpc@v0.0.0-20250818200422-3122310a409c $ go mod graph -modfile=internal/tools/go.mod | grep github.com/securego/gosec/v2 github.com/open-telemetry/opentelemetry-ebpf-profiler/internal/tools github.com/securego/gosec/v2@v2.24.8-0.20260309165252-619ce2117e08 github.com/golangci/golangci-lint/v2@v2.11.4 github.com/securego/gosec/v2@v2.24.8-0.20260309165252-619ce2117e08 ``` Signed-off-by: Florian Lehner --- .github/workflows/collector-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/collector-tests.yml b/.github/workflows/collector-tests.yml index 74aaa8e69..d3db1c10e 100644 --- a/.github/workflows/collector-tests.yml +++ b/.github/workflows/collector-tests.yml @@ -44,6 +44,10 @@ jobs: - name: Setup replace statement run: | COLLECTOR_PATH=/tmp/opentelemetry-collector ./support/local-collector.sh + # Add replace directives to internal/tools for genproto and ebpf-profiler + go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto@v0.0.0-20260226221140-a57be14db171' + go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto/googleapis/rpc@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto/googleapis/rpc@v0.0.0-20260226221140-a57be14db171' + go mod edit -modfile=internal/tools/go.mod -replace="go.opentelemetry.io/ebpf-profiler=$(pwd)" go mod tidy go mod tidy -modfile=internal/tools/go.mod - name: Tests From 2824ce88af7cb809b6e2a4bf957fa5b73515eeea Mon Sep 17 00:00:00 2001 From: Florian Lehner Date: Tue, 14 Apr 2026 10:20:08 +0200 Subject: [PATCH 2/4] fixup: add trigger on CI job Signed-off-by: Florian Lehner --- .github/workflows/collector-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/collector-tests.yml b/.github/workflows/collector-tests.yml index d3db1c10e..8220299d8 100644 --- a/.github/workflows/collector-tests.yml +++ b/.github/workflows/collector-tests.yml @@ -8,6 +8,7 @@ on: branches: ["**"] paths: - cmd/otelcol-ebpf-profiler/manifest.yaml + - .github/workflows/collector-tests.yml concurrency: group: ${{ github.workflow }}-${{ github.ref_name }} From 7c1299748f216abe33e17eda5d9c0fe7775ec971 Mon Sep 17 00:00:00 2001 From: Florian Lehner Date: Tue, 14 Apr 2026 10:23:57 +0200 Subject: [PATCH 3/4] add go generate Signed-off-by: Florian Lehner --- .github/workflows/collector-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/collector-tests.yml b/.github/workflows/collector-tests.yml index 8220299d8..702111565 100644 --- a/.github/workflows/collector-tests.yml +++ b/.github/workflows/collector-tests.yml @@ -49,6 +49,7 @@ jobs: go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto@v0.0.0-20260226221140-a57be14db171' go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto/googleapis/rpc@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto/googleapis/rpc@v0.0.0-20260226221140-a57be14db171' go mod edit -modfile=internal/tools/go.mod -replace="go.opentelemetry.io/ebpf-profiler=$(pwd)" + go generate ./... go mod tidy go mod tidy -modfile=internal/tools/go.mod - name: Tests From cb5da683ae992921275ee080cd6d8f3aa623f0e3 Mon Sep 17 00:00:00 2001 From: Florian Lehner Date: Tue, 14 Apr 2026 10:29:17 +0200 Subject: [PATCH 4/4] fix Signed-off-by: Florian Lehner --- .github/workflows/collector-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/collector-tests.yml b/.github/workflows/collector-tests.yml index 702111565..6f58a9912 100644 --- a/.github/workflows/collector-tests.yml +++ b/.github/workflows/collector-tests.yml @@ -49,6 +49,9 @@ jobs: go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto@v0.0.0-20260226221140-a57be14db171' go mod edit -modfile=internal/tools/go.mod -replace='google.golang.org/genproto/googleapis/rpc@v0.0.0-20220519153652-3a47de7e79bd=google.golang.org/genproto/googleapis/rpc@v0.0.0-20260226221140-a57be14db171' go mod edit -modfile=internal/tools/go.mod -replace="go.opentelemetry.io/ebpf-profiler=$(pwd)" + go mod tidy + go mod tidy -modfile=internal/tools/go.mod + # Manual run of go generate and go mod tidy to have a clean start for make test-junit go generate ./... go mod tidy go mod tidy -modfile=internal/tools/go.mod