chore: clean up

.github/workflows/build.yml

@@ -15,6 +15,8 @@ env:
   GOFUMPT_VERSION: v0.4.0
   # renovate: datasource=go depName=github.com/golangci/golangci-lint
   GOLANGCI_LINT_VERSION: v1.51.2
+  # renovate: datasource=go depName=github.com/florianl/bluebox
+  BLUEBOX_VERSION: v0.0.1
 
 jobs:
   skip-check:
@@ -38,10 +40,10 @@ jobs:
               ".go-version",
               "3rdparty",
               "Makefile",
-              "bpf/",
-              "kerneltest/",
+              "bpf/**",
               "go.mod",
-              "go.sum"
+              "go.sum",
+              "kerneltest/**"
             ]
           skip_after_successful_duplicate: false
 
@@ -126,7 +128,7 @@ jobs:
 
       - name: Build initramfs
         run: |
-          go install github.com/florianl/bluebox@v0.0.1
+          go install "github.com/florianl/bluebox@${BLUEBOX_VERSION}"
           make initramfs
 
       - name: Upload initramfs

.github/workflows/container.yml

@@ -40,7 +40,7 @@ jobs:
               "3rdparty",
               "Dockerfile*",
               "Makefile",
-              "bpf/Makefile",
+              "bpf/**",
               "deploy/**",
               "e2e/**",
               "go.mod",

.pre-commit-config.yaml

@@ -1,15 +1,4 @@
 repos:
-  - repo: local
-    hooks:
-      # We use custom step instead of https://github.com/golangci/golangci-lint,
-      # because we need to pass additional parameters to for CGO builds.
-      - id: go-lint
-        name: go-lint
-        entry: make go/lint
-        language: system
-        types: [go]
-        pass_filenames: false
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
@@ -38,6 +27,11 @@ repos:
           - --fuzzy-match-generates-todo
         types: [shell]
         exclude: ^internal/(?:go|pprof)/
+  - repo: https://github.com/golangci/golangci-lint
+    rev: v1.51.2
+    hooks:
+      - id: golangci-lint
+        entry: make go/lint-fix
   - repo: https://github.com/hadolint/hadolint
     rev: v2.12.1-beta
     hooks:

Makefile

@@ -188,10 +188,12 @@ check-license:
 
 .PHONY: go/lint
 go/lint:
+	touch $(OUT_BPF)
 	$(GO_ENV) $(CGO_ENV) golangci-lint run
 
 .PHONY: go/lint-fix
 go/lint-fix:
+	touch $(OUT_BPF)
 	$(GO_ENV) $(CGO_ENV) golangci-lint run --fix
 
 .PHONY: bpf/lint-fix

bpf/Makefile

@@ -43,9 +43,7 @@ OUT_BPF := $(OUT_BPF_DIR)/cpu.bpf.o
 BPF_BUNDLE := $(OUT_DIR)/parca-agent.bpf.tar.gz
 
 # input:
-BPF_HEADERS := ../3rdparty/include
 LIBBPF_HEADERS := $(OUT_DIR)/libbpf/$(ARCH)/usr/include
-LIBBPF_OBJ := $(OUT_DIR)/libbpf/$(ARCH)/libbpf.a
 
 VMLINUX := cpu/vmlinux.h
 BPF_SRC := cpu/cpu.bpf.c
@@ -60,7 +58,7 @@ $(BPF_BUNDLE): $(BPF_SRC) $(LIBBPF_HEADERS)/bpf $(BPF_HEADERS)
 	mkdir -p $(bpf_bundle_dir)
 	cp $$(find $^ -type f) $(bpf_bundle_dir)
 
-$(OUT_BPF): $(BPF_SRC) $(LIBBPF_HEADERS) $(LIBBPF_OBJ) $(BPF_HEADERS) | $(OUT_DIR)
+$(OUT_BPF): $(BPF_SRC) $(LIBBPF_HEADERS) $(BPF_HEADERS) | $(OUT_DIR)
 	mkdir -p $(OUT_BPF_DIR)
 	$(CMD_CC) -S \
 		-D__BPF_TRACING__ \

pkg/profiler/cpu/bpf_metrics.go

@@ -17,7 +17,6 @@ package cpu
 import (
 	"bufio"
 	"bytes"
-	_ "embed"
 	"fmt"
 	"io"
 	"os"