Fix OBI generator image (#249)

Author: mariomac

.github/workflows/generator-image.yml

@@ -4,7 +4,7 @@ on:
     inputs:
       override_image_tag:
         type: string
-        description: Override image tag (empty for current timestamp)
+        description: "Override image tag (empty: SemVer patch + 1)"
 
 # Set restrictive permissions at workflow level
 permissions:
@@ -96,3 +96,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           tags: |
             "${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ steps.image_tag.outputs.imgtag }}"
+            "${{ env.REGISTRY }}/${{ env.IMAGE }}:latest"

Makefile

@@ -28,6 +28,7 @@ IMG = $(IMG_REGISTRY)/$(IMG_ORG)/$(IMG_NAME):$(VERSION)
 # The generator is a container image that provides a reproducible environment for
 # building eBPF binaries
 GEN_IMG ?= ghcr.io/grafana/beyla-ebpf-generator:main
+#TODO: GEN_IMG ?= ghcr.io/open-telemetry/obi-generator:latest
 
 COMPOSE_ARGS ?= -f test/integration/docker-compose.yml
 
@@ -42,7 +43,7 @@ CLANG_TIDY ?= clang-tidy
 CILIUM_EBPF_VER ?= $(call gomod-version,cilium/ebpf)
 
 # regular expressions for excluded file patterns
-EXCLUDE_COVERAGE_FILES="(_bpfel.go)|(/opentelemetry-ebpf-instrumentation/test/)|(/opentelemetry-ebpf-instrumentation/configs/)|(.pb.go)|(/pkg/export/otel/metric/)|(/cmd/ebpf-instrument-genfiles)"
+EXCLUDE_COVERAGE_FILES="(_bpfel.go)|(/opentelemetry-ebpf-instrumentation/test/)|(/opentelemetry-ebpf-instrumentation/configs/)|(.pb.go)|(/pkg/export/otel/metric/)|(/cmd/obi-genfiles)"
 
 .DEFAULT_GOAL := all
 
@@ -154,12 +155,12 @@ generate: export BPF_CFLAGS := $(CFLAGS)
 generate: export BPF2GO := $(BPF2GO)
 generate: bpf2go
 	@echo "### Generating files..."
-	@OTEL_EBPF_GENFILES_RUN_LOCALLY=1 go generate cmd/beyla-genfiles/beyla_genfiles.go
+	@OTEL_EBPF_GENFILES_RUN_LOCALLY=1 go generate cmd/obi-genfiles/obi_genfiles.go
 
 .PHONY: docker-generate
 docker-generate:
 	@echo "### Generating files (docker)..."
-	@OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/beyla-genfiles/beyla_genfiles.go
+	@OTEL_EBPF_GENFILES_GEN_IMG=$(GEN_IMG) go generate cmd/obi-genfiles/obi_genfiles.go
 
 .PHONY: verify
 verify: prereqs lint test
@@ -218,16 +219,18 @@ coverage-report-html: cov-exclude-generated
 	@echo "### Generating HTML coverage report"
 	go tool cover --html=$(TEST_OUTPUT)/cover.txt
 
+# image-build is only used for local development. GH actions that build and publish the image don't make use of it
 .PHONY: image-build
 image-build:
 	@echo "### Building and pushing the auto-instrumenter image"
 	$(call check_defined, IMG_ORG, Your Docker repository user name)
-	$(OCI_BIN) buildx build --platform linux/amd64,linux/arm64 -t ${IMG} .
+	$(OCI_BIN) buildx build --load -t ${IMG} .
 
+# generator-image-build is only used for local development. GH actions that build and publish the image don't make use of it
 .PHONY: generator-image-build
 generator-image-build:
 	@echo "### Creating the image that generates the eBPF binaries"
-	$(OCI_BIN) buildx build --build-arg EBPF_VER="$(CILIUM_EBPF_VER)" --platform linux/amd64,linux/arm64 -t $(GEN_IMG) -f generator.Dockerfile  .
+	$(OCI_BIN) buildx build --load -t $(GEN_IMG) -f generator.Dockerfile  .
 
 
 .PHONY: prepare-integration-test

cmd/beyla-genfiles/beyla_genfiles.go renamed to cmd/obi-genfiles/obi_genfiles.go

@@ -1,4 +1,4 @@
-//go:generate go run beyla_genfiles.go
+//go:generate go run obi_genfiles.go
 
 package main
 
@@ -34,8 +34,7 @@ type config struct {
 	HostPrefix      string `env:"OTEL_EBPF_GENFILES_HOST_PREFIX"      envDefault:"/home/runner/work/"`
 	Package         string `env:"OTEL_EBPF_GENFILES_PKG"              envDefault:"github.com/open-telemetry/opentelemetry-ebpf-instrumentation/pkg/beyla"`
 	OCIBin          string `env:"OTEL_EBPF_GENFILES_OCI_BIN"          envDefault:"docker"`
-	// TODO: replace by OTEL image once we publish them
-	GenImage string `env:"OTEL_EBPF_GENFILES_GEN_IMG"          envDefault:"ghcr.io/grafana/beyla-ebpf-generator:main"`
+	GenImage        string `env:"OTEL_EBPF_GENFILES_GEN_IMG"`
 }
 
 var cfg config

generator.Dockerfile

@@ -3,21 +3,21 @@ FROM base AS builder
 
 WORKDIR /build
 
-COPY cmd/beyla-genfiles/beyla_genfiles.go .
+COPY cmd/obi-genfiles/obi_genfiles.go .
 COPY go.mod go.mod
 COPY go.sum go.sum
-RUN go build -o beyla_genfiles beyla_genfiles.go
+RUN go build -o obi_genfiles obi_genfiles.go
 
 FROM base AS dist
 
 WORKDIR /src
 
 ENV EBPF_VER=v0.19.0
 
-RUN apk add clang llvm19 wget
+RUN apk add clang llvm20 wget
 RUN apk cache purge
 RUN go install github.com/cilium/ebpf/cmd/bpf2go@$EBPF_VER
-COPY --from=builder /build/beyla_genfiles /go/bin
+COPY --from=builder /build/obi_genfiles /go/bin
 
 RUN cat <<EOF > /generate.sh
 #!/bin/sh
@@ -26,9 +26,9 @@ export GOMODCACHE=/tmp/go-mod-cache
 export BPF2GO=bpf2go
 export BPF_CLANG=clang
 export BPF_CFLAGS="-O2 -g -Wall -Werror"
-export BEYLA_GENFILES_RUN_LOCALLY=1
-export BEYLA_GENFILES_MODULE_ROOT="/src"
-beyla_genfiles
+export OTEL_EBPF_GENFILES_RUN_LOCALLY=1
+export OTEL_EBPF_GENFILES_MODULE_ROOT="/src"
+obi_genfiles
 EOF
 
 RUN chmod +x /generate.sh