Integrate Beyla without eBPF binaries

Author: rafaelroquetto

Makefile

@@ -84,7 +84,9 @@ ALLOY_BINARY         ?= build/alloy
 SERVICE_BINARY       ?= build/alloy-service
 ALLOYLINT_BINARY     ?= build/alloylint
 GOOS                 ?= $(shell go env GOOS)
+GOHOSTOS             ?= $(shell go env GOHOSTOS)
 GOARCH               ?= $(shell go env GOARCH)
+GOHOSTARCH           ?= $(shell go env GOHOSTARCH)
 GOARM                ?= $(shell go env GOARM)
 CGO_ENABLED          ?= 1
 RELEASE_BUILD        ?= 0
@@ -94,7 +96,7 @@ GOEXPERIMENT         ?= $(shell go env GOEXPERIMENT)
 # container. USE_CONTAINER must _not_ be included to avoid infinite recursion.
 PROPAGATE_VARS := \
     ALLOY_IMAGE ALLOY_IMAGE_WINDOWS \
-    BUILD_IMAGE GOOS GOARCH GOARM CGO_ENABLED RELEASE_BUILD \
+    BUILD_IMAGE GOOS GOHOSTOS GOARCH GOHOSTARCH GOARM CGO_ENABLED RELEASE_BUILD \
     ALLOY_BINARY \
     VERSION GO_TAGS GOEXPERIMENT
 
@@ -114,9 +116,10 @@ GO_LDFLAGS   := -X $(VPREFIX).Branch=$(GIT_BRANCH)                        \
                 -X $(VPREFIX).BuildUser=$(shell whoami)@$(shell hostname) \
                 -X $(VPREFIX).BuildDate=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 
+GO_BUILTIN_TAGS  := beyla_bpf $(GO_TAGS)
 DEFAULT_FLAGS    := $(GO_FLAGS)
-DEBUG_GO_FLAGS   := -ldflags "$(GO_LDFLAGS)" -tags "$(GO_TAGS)"
-RELEASE_GO_FLAGS := -ldflags "-s -w $(GO_LDFLAGS)" -tags "$(GO_TAGS)"
+DEBUG_GO_FLAGS   := -ldflags "$(GO_LDFLAGS)" -tags "$(GO_BUILTIN_TAGS)"
+RELEASE_GO_FLAGS := -ldflags "-s -w $(GO_LDFLAGS)" -tags "$(GO_BUILTIN_TAGS)"
 
 ifeq ($(RELEASE_BUILD),1)
 GO_FLAGS := $(DEFAULT_FLAGS) $(RELEASE_GO_FLAGS)
@@ -139,7 +142,7 @@ lint: alloylint
 # We have to run test twice: once for all packages with -race and then once
 # more without -race for packages that have known race detection issues. The
 # final command runs tests for all other submodules.
-test:
+test: generate-beyla
 	$(GO_ENV) go test $(GO_FLAGS) -race $(shell go list ./... | grep -v /integration-tests/)
 	$(GO_ENV) go test $(GO_FLAGS) ./internal/static/integrations/node_exporter ./internal/static/logs ./internal/component/otelcol/processor/tail_sampling ./internal/component/loki/source/file ./internal/component/loki/source/docker
 	$(GO_ENV) find . -name go.mod -not -path "./go.mod" -execdir go test -race ./... \;
@@ -163,7 +166,7 @@ integration-test:
 .PHONY: binaries alloy
 binaries: alloy
 
-alloy:
+alloy: generate-beyla
 ifeq ($(USE_CONTAINER),1)
 	$(RERUN_IN_CONTAINER)
 else
@@ -178,7 +181,7 @@ else
 	$(GO_ENV) go build $(GO_FLAGS) -o $(SERVICE_BINARY) ./internal/cmd/alloy-service
 endif
 
-alloylint:
+alloylint: generate-beyla
 ifeq ($(USE_CONTAINER),1)
 	$(RERUN_IN_CONTAINER)
 else
@@ -273,6 +276,13 @@ drone: generate-drone
 	drone lint .drone/drone.yml --trusted
 	drone --server https://drone.grafana.net sign --save grafana/alloy .drone/drone.yml
 
+# Required by vendored Beyla to build eBPF artifacts prior to building the
+# Alloy binary
+.PHONY: generate-beyla
+generate-beyla:
+	@go mod vendor
+	@GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go generate vendor/github.com/grafana/beyla/v2/bpf/build_ebpf.go > /dev/null
+
 .PHONY: clean
 clean: clean-dist clean-build-container-cache
 	rm -rf ./build/*
@@ -285,7 +295,9 @@ info:
 	@printf "BUILD_IMAGE         = $(BUILD_IMAGE)\n"
 	@printf "ALLOY_BINARY        = $(ALLOY_BINARY)\n"
 	@printf "GOOS                = $(GOOS)\n"
+	@printf "GOHOSTOS            = $(GOHOSTOS)\n"
 	@printf "GOARCH              = $(GOARCH)\n"
+	@printf "GOHOSTARCH          = $(GOHOSTARCH)\n"
 	@printf "GOARM               = $(GOARM)\n"
 	@printf "CGO_ENABLED         = $(CGO_ENABLED)\n"
 	@printf "RELEASE_BUILD       = $(RELEASE_BUILD)\n"

go.mod

@@ -893,7 +893,7 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
 
-require github.com/grafana/beyla/v2 v2.0.4-alloy.2
+require github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705
 
 // NOTE: replace directives below must always be *temporary*.
 //

go.sum

@@ -1248,8 +1248,8 @@ github.com/gosnmp/gosnmp v1.38.0/go.mod h1:FE+PEZvKrFz9afP9ii1W3cprXuVZ17ypCcyyf
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/grafana/alloy-remote-config v0.0.10 h1:1Ge7lz2mjXI1rd6SmiZpFHyXeLehBuCi43+XTkdqgV4=
 github.com/grafana/alloy-remote-config v0.0.10/go.mod h1:kHE1usYo2WAVCikQkIXuoG1Clz8BSdiz3kF+DZSCQ4k=
-github.com/grafana/beyla/v2 v2.0.4-alloy.2 h1:f3liglMaxw44IVuJH10GbJvv0BKSAHKsXTwN3guXv7I=
-github.com/grafana/beyla/v2 v2.0.4-alloy.2/go.mod h1:upm4aerYwSs+bQKA1Sp5b2TwjxGVmiWEiZav3qc5Kkc=
+github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705 h1:hRKODZCnUXYG2/m9pdzKWtEZgzDhAXNaJ6Nhr8MwwJg=
+github.com/grafana/beyla/v2 v2.0.1-0.20250220141223-3107a3218705/go.mod h1:MKNkPychrqv6FKK6yI3i3Eqn4QNBGJY9hZGeO7Su+ck=
 github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2 h1:ju6EcY2aEobeBg185ETtFCKj5WzaQ48qfkbsSRRQrF4=
 github.com/grafana/cadvisor v0.0.0-20240729082359-1f04a91701e2/go.mod h1:8sLW/G7rcFe1CKMaA4pYT4mX3P1xQVGqM6luzEzx/2g=
 github.com/grafana/catchpoint-prometheus-exporter v0.0.0-20250218151502-6e97feaee761 h1:dPJOIEwtQ8uR3Qa79pb/lsSFJQ6j4P9vpCUQ4fKimG4=

internal/component/beyla/ebpf/beyla_linux.go

@@ -13,6 +13,7 @@ import (
 	"sync"
 	"time"
 
+	_ "github.com/grafana/beyla/v2/bpf"
 	"github.com/grafana/beyla/v2/pkg/beyla"
 	"github.com/grafana/beyla/v2/pkg/components"
 	beylaCfg "github.com/grafana/beyla/v2/pkg/config"