Update Makefile to only generate what is needed (#1213)

* Update Makefile to only generate what is needed

Use depinfo files and make targets ensure that generate is only run when
needed.

* Update generate cmd to use env vars

* Ignore the depfiles

* Add generate/all target

* Pattern match generate targets

* Remove go-mod-tidy as dep of generate

.gitignore

@@ -5,6 +5,7 @@
 *.so
 *.dylib
 **/*.o
+**/*.go.d
 .tools/
 **/internal/test/e2e/*/main
 

Makefile

@@ -2,15 +2,19 @@
 # Assume the Makefile is in the root of the repository.
 REPODIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
+# Used by bpf2go to generate make compatible depinfo files.
+export BPF2GO_MAKEBASE := $(REPODIR)
+
 TOOLS_MOD_DIR := ./internal/tools
 TOOLS = $(CURDIR)/.tools
 
 ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' ! -path './LICENSES/*' -exec dirname {} \; | sort)
 ALL_GO_MODS := $(shell find . -type f -name 'go.mod' ! -path '$(TOOLS_MOD_DIR)/*' ! -path './LICENSES/*' | sort)
 
-# Build the list of include directories to compile the bpf program
-BPF_INCLUDE += -I${REPODIR}/internal/include/libbpf
-BPF_INCLUDE += -I${REPODIR}/internal/include
+# BPF compile time dependencies.
+BPF2GO_CFLAGS += -I${REPODIR}/internal/include/libbpf
+BPF2GO_CFLAGS += -I${REPODIR}/internal/include
+export BPF2GO_CFLAGS
 
 # Go default variables
 GOCMD?= go
@@ -54,14 +58,25 @@ TEST_TARGETS := test-verbose test-ebpf
 test-ebpf: ARGS = -tags=ebpf_test -run ^TestEBPF # These need to be run with sudo.
 test-verbose: ARGS = -v
 $(TEST_TARGETS): test
-test: generate $(ALL_GO_MODS:%=test/%)
+test: go-mod-tidy generate $(ALL_GO_MODS:%=test/%)
 test/%/go.mod:
 	@cd $* && $(GOCMD) test $(ARGS) ./...
 
-.PHONY: generate
-generate: export CFLAGS := $(BPF_INCLUDE)
-generate: go-mod-tidy
-generate:
+PROBE_ROOT = internal/pkg/instrumentation/bpf/
+PROBE_GEN_GO := $(shell find $(PROBE_ROOT) -type f -name 'bpf_*_bpfe[lb].go')
+PROBE_GEN_OBJ := $(PROBE_GEN_GO:.go=.o)
+
+# Include all depinfo files to ensure we only re-generate when needed.
+-include $(shell find $(PROBE_ROOT) -type f -name 'bpf_*_bpfel.go.d')
+
+.PHONY: generate generate/all
+generate: $(PROBE_GEN_GO)
+$(PROBE_GEN_GO): %.go: %.o
+
+$(PROBE_GEN_OBJ):
+	$(GOCMD) generate ./$(dir $@)...
+
+generate/all:
 	$(GOCMD) generate ./...
 
 .PHONY: docker-generate
@@ -85,15 +100,15 @@ go-mod-tidy/%:
 .PHONY: golangci-lint golangci-lint-fix
 golangci-lint-fix: ARGS=--fix
 golangci-lint-fix: golangci-lint
-golangci-lint: generate $(ALL_GO_MOD_DIRS:%=golangci-lint/%)
+golangci-lint: go-mod-tidy generate $(ALL_GO_MOD_DIRS:%=golangci-lint/%)
 golangci-lint/%: DIR=$*
 golangci-lint/%: | $(GOLANGCI_LINT)
 	@echo 'golangci-lint $(if $(ARGS),$(ARGS) ,)$(DIR)' \
 		&& cd $(DIR) \
 		&& $(GOLANGCI_LINT) run --allow-serial-runners --timeout=2m0s $(ARGS)
 
 .PHONY: build
-build: generate
+build: go-mod-tidy generate
 	CGO_ENABLED=$(CGO_ENABLED) $(GOCMD) build -o otel-go-instrumentation ./cli/...
 
 .PHONY: docker-build

internal/pkg/instrumentation/bpf/database/sql/probe.go

@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/utils"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/consumer/probe.go

@@ -19,7 +19,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/github.com/segmentio/kafka-go/producer/probe.go

@@ -18,7 +18,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/go.opentelemetry.io/auto/sdk/probe.go

@@ -21,7 +21,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 // New returns a new [probe.Probe].
 func New(logger *slog.Logger) probe.Probe {

internal/pkg/instrumentation/bpf/go.opentelemetry.io/otel/traceglobal/probe.go

@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/instrumentation/context"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/google.golang.org/grpc/client/probe.go

@@ -22,7 +22,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/google.golang.org/grpc/server/probe.go

@@ -24,7 +24,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/net/http/client/probe.go

@@ -24,8 +24,8 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf_no_tp ./bpf/probe.bpf.c -- -DNO_HEADER_PROPAGATION
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf_no_tp ./bpf/probe.bpf.c -- -DNO_HEADER_PROPAGATION
 
 const (
 	// pkg is the package being instrumented.

internal/pkg/instrumentation/bpf/net/http/server/probe.go

@@ -23,7 +23,7 @@ import (
 	"go.opentelemetry.io/auto/internal/pkg/structfield"
 )
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 -cc clang -cflags $CFLAGS bpf ./bpf/probe.bpf.c
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -target amd64,arm64 bpf ./bpf/probe.bpf.c
 
 const (
 	// pkg is the package being instrumented.