Generate eBPF files as part of the build process (#1666)

grafana · Feb 27, 2025 · 998ab56 · 998ab56
1 parent 837114e
commit 998ab56
Show file tree

Hide file tree

Showing 244 changed files with 36,289 additions and 15,233 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -16,7 +16,6 @@ jobs:
           repository: grafana/grafana-github-actions
           path: ./actions
           ref: main
-          lfs: true
       - name: Install Actions
         run: npm install --production --prefix ./actions
       - name: Run backport

diff --git a/.github/workflows/check_ebpf_integrity.yml b/.github/workflows/check_ebpf_integrity.yml
diff --git a/.github/workflows/clang-format-check.yml b/.github/workflows/clang-format-check.yml
@@ -15,7 +15,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          lfs: true
 
       - name: Install Clang-Format
         run: sudo apt-get install clang-format

diff --git a/.github/workflows/clang-tidy-check.yml b/.github/workflows/clang-tidy-check.yml
@@ -13,8 +13,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          lfs: true
 
       - name: Install clang-tidy
         run: |

diff --git a/.github/workflows/generator-image.yml b/.github/workflows/generator-image.yml
@@ -18,8 +18,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -55,4 +53,4 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           tags: |
             "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.timestamp.outputs.ts }}"
-            "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main"
+            "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:main"
diff --git a/.github/workflows/git-lfs-check.yml b/.github/workflows/git-lfs-check.yml
diff --git a/.github/workflows/helm-test.yml b/.github/workflows/helm-test.yml
@@ -27,7 +27,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0 # required for chart-testing to work
-          lfs: true
 
       - name: Regenerate docs
         run: |

diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml
@@ -20,7 +20,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          lfs: true
       - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2
         with:
           release_tag_regexp: '^v(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)$'

diff --git a/.github/workflows/publish_dockerhub_main.yml b/.github/workflows/publish_dockerhub_main.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - id: checkout
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - id: push-beyla-to-dockerhub
         uses: grafana/shared-workflows/actions/build-push-to-dockerhub@main

diff --git a/.github/workflows/publish_dockerhub_release.yml b/.github/workflows/publish_dockerhub_release.yml
@@ -16,8 +16,6 @@ jobs:
     steps:
       - id: checkout
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - id: push-beyla-to-dockerhub
         uses: grafana/shared-workflows/actions/build-push-to-dockerhub@main

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -15,14 +15,12 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
       - name: Run verification and unit tests
-        run: make verify cov-exclude-generated
+        run: make docker-generate verify cov-exclude-generated
       - name: Report coverage
         uses: codecov/codecov-action@v4
         env:

diff --git a/.github/workflows/pull_request_check_license.yml b/.github/workflows/pull_request_check_license.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/pull_request_integration_tests.yml b/.github/workflows/pull_request_integration_tests.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test
+        run: make docker-generate integration-test
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_integration_tests_arm.yml b/.github/workflows/pull_request_integration_tests_arm.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test-arm
+        run: make docker-generate integration-test-arm
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_k8s_integration_tests.yml b/.github/workflows/pull_request_k8s_integration_tests.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
@@ -26,7 +24,7 @@ jobs:
           docker system prune -af
           docker volume prune -f
       - name: Run integration tests
-        run: make integration-test-k8s
+        run: make docker-generate integration-test-k8s
         timeout-minutes: 60
       - name: Upload integration test logs
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/pull_request_oats_test.yml b/.github/workflows/pull_request_oats_test.yml
@@ -15,8 +15,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/release-binaries.yml b/.github/workflows/release-binaries.yml
@@ -14,8 +14,6 @@ jobs:
         go: [ '1.23' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/update-offsets.yml b/.github/workflows/update-offsets.yml
@@ -9,8 +9,6 @@ jobs:
     steps:
     - name: "Checkout repo"
       uses: actions/checkout@v3
-      with:
-        lfs: true
     - name: "Update Go"
       uses: actions/setup-go@v4
       with:

diff --git a/.github/workflows/workflow_integration_tests_vm.yml b/.github/workflows/workflow_integration_tests_vm.yml
@@ -25,8 +25,6 @@ jobs:
         go: [ '1.22' ]
     steps:
       - uses: actions/checkout@v3
-        with:
-          lfs: true
       - name: Clean up disk space
         run: |
           docker system prune -af
@@ -37,6 +35,7 @@ jobs:
           sudo apt-get install -y --no-install-recommends qemu-utils qemu-system-x86
       - name: Run VM integration tests
         run: |
+          make docker-generate
           sudo make -C test/vm KERNEL_VER=${{ inputs.kernel-version }} ARCH=${{ inputs.arch }} && [ -f testoutput/success ]
         timeout-minutes: ${{ inputs.timeout-minutes }}
       - name: Upload integration test logs

diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,15 @@
 # Build the autoinstrumenter binary
-FROM golang:1.23 AS builder
+FROM ghcr.io/grafana/beyla-ebpf-generator:main AS builder
 
 # TODO: embed software version in executable
 
 ARG TARGETARCH
 
 ENV GOARCH=$TARGETARCH
 
-WORKDIR /opt/app-root
+WORKDIR /src
 
-RUN apt-get update
-RUN apt-get install -qy ca-certificates
+RUN apk add make git bash
 
 # Copy the go manifests and source
 COPY .git/ .git/
@@ -26,6 +25,7 @@ COPY NOTICE NOTICE
 COPY third_party_licenses.csv third_party_licenses.csv
 
 # Build
+RUN /generate.sh
 RUN make compile
 
 # Create final image from minimal + built binary
@@ -35,11 +35,11 @@ LABEL maintainer="Grafana Labs <[email protected]>"
 
 WORKDIR /
 
-COPY --from=builder /opt/app-root/bin/beyla .
-COPY --from=builder /opt/app-root/LICENSE .
-COPY --from=builder /opt/app-root/NOTICE .
-COPY --from=builder /opt/app-root/third_party_licenses.csv .
+COPY --from=builder /src/bin/beyla .
+COPY --from=builder /src/LICENSE .
+COPY --from=builder /src/NOTICE .
+COPY --from=builder /src/third_party_licenses.csv .
 
 COPY --from=builder /etc/ssl/certs /etc/ssl/certs
 
-ENTRYPOINT [ "/beyla" ]
+ENTRYPOINT [ "/beyla" ]