Merge with upstream

Author: gnurizen

.github/workflows/env/action.yml

@@ -27,5 +27,5 @@ runs:
         sudo dpkg --add-architecture arm64
         sudo apt-get update -y
 
-        sudo apt-get install -y llvm clang dwz curl unzip gcc-aarch64-linux-gnu \
+        sudo apt-get install -y curl unzip gcc-aarch64-linux-gnu \
           libc6-arm64-cross qemu-user-binfmt libc6:arm64

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

.github/workflows/push-docker-image.yml

@@ -0,0 +1,36 @@
+name: "Update builder docker image"
+
+on:
+  push:
+    branches: ["main"]
+    paths:
+      - "Dockerfile"
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up environment
+        uses: ./.github/workflows/env
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Set current timestamp tag
+        id: tag
+        run: |
+          echo "tag=$(date +%Y%m%d%H%M)" >> $GITHUB_OUTPUT
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64
+          tags: otel/opentelemetry-ebpf-profiler-dev:latest,otel/opentelemetry-ebpf-profiler-dev:${{ steps.tag.outputs.tag }}

.github/workflows/unit-test-on-pull-request.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version-file: go.mod
           check-latest: true
           cache-dependency-path: go.sum
         id: go
@@ -30,27 +30,6 @@ jobs:
             exit 1
           fi
 
-  tracer:
-    name: Check that tracer is up-to-date
-    runs-on: ubuntu-24.04
-    strategy:
-      matrix:
-        target_arch: [amd64, arm64]
-    steps:
-      - name: Clone code
-        uses: actions/checkout@v4
-      - name: Set up environment
-        uses: ./.github/workflows/env
-      - name: Check that tracer is up-to-date
-        env:
-          TARGET_ARCH: ${{ matrix.target_arch }}
-        run: |
-          make -C support/ebpf
-          if [ -n "$(git status --porcelain)" ]; then
-            echo "run \"make -C support/ebpf\"."
-            exit 1
-          fi
-
   lint:
     name: Lint (${{ matrix.target_arch }})
     runs-on: ubuntu-24.04
@@ -65,7 +44,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23"
+          go-version-file: go.mod
           check-latest: true
           cache-dependency-path: go.sum
         id: go
@@ -79,6 +58,11 @@ jobs:
           CGO_ENABLED: 1
         with:
           version: ${{ steps.linter-version.outputs.version }}
+      - name: Lint eBPF code
+        run: |
+          sudo apt update
+          sudo apt install -y clang-format-17
+          make lint -C support/ebpf
 
   test:
     name: Test (${{ matrix.target_arch }})
@@ -102,8 +86,56 @@ jobs:
       - name: Tests
         run: make test TARGET_ARCH=${{ matrix.target_arch }}
 
+  test-rust:
+    name: Test rust components
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Clone code
+        uses: actions/checkout@v4
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install protoc
+        env:
+          PB_URL: "https://github.com/protocolbuffers/protobuf/releases/download/v24.4/"
+          PB_FILE: "protoc-24.4-linux-x86_64.zip"
+          INSTALL_DIR: "/usr/local"
+        run: |
+          wget -q "$PB_URL/$PB_FILE"
+          sudo unzip "$PB_FILE" -d "$INSTALL_DIR" 'bin/*' 'include/*'
+          sudo chmod +xr "$INSTALL_DIR/bin/protoc"
+          sudo find "$INSTALL_DIR/include" -type d -exec chmod +x {} \;
+          sudo find "$INSTALL_DIR/include" -type f -exec chmod +r {} \;
+          rm "$PB_FILE"
+      - name: Tests
+        run: |
+          cargo test
+
+  check-ebpf-blobs:
+    name: Check for differences in the eBPF binary blobs
+    runs-on: ubuntu-24.04
+    container: otel/opentelemetry-ebpf-profiler-dev:latest
+    steps:
+      - name: Clone code
+        uses: actions/checkout@v4
+      - name: Hash eBPF blobs
+        run: |
+          sha256sum support/ebpf/tracer.ebpf.release.* > ebpf-blobs.hash
+          cat ebpf-blobs.hash
+      - name: Rebuild eBPF blobs
+        run: |
+          rm support/ebpf/tracer.ebpf.release.*
+          make amd64 -C support/ebpf
+          make arm64 -C support/ebpf
+      - name: Check for differences
+        run: |
+          if ! sha256sum --check ebpf-blobs.hash; then
+            echo "Please rebuild and commit the updated eBPF binary blobs."
+            exit 1
+          fi
+
+
   build-integration-test-binaries:
-    name: Build integration test binaries (${{ matrix.target_arch }})
+    name: Build integration test binaries (${{ matrix.target_arch }}-go${{ matrix.go_version}})
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     strategy:
@@ -131,7 +163,7 @@ jobs:
           path: support/*.test
 
   integration-tests:
-    name: Integration tests (v${{ matrix.kernel }} ${{ matrix.target_arch }})
+    name: Integration tests (v${{ matrix.kernel }} ${{ matrix.target_arch }} ${{ matrix.go_version}})
     runs-on: ubuntu-24.04
     needs: build-integration-test-binaries
     timeout-minutes: 10
@@ -159,10 +191,9 @@ jobs:
     steps:
       - name: Clone code
         uses: actions/checkout@v4
-      - name: Set up environment
-        uses: ./.github/workflows/env
       - name: Install dependencies
         run: |
+          sudo apt-get update
           case "${{ matrix.target_arch }}" in
             amd64) sudo apt-get -y install qemu-system-x86;;
             arm64) sudo apt-get -y install qemu-system-arm;;

.gitignore

@@ -5,3 +5,4 @@
 /go
 ebpf-profiler
 ci-kernels
+/target

.golangci.yml

@@ -27,6 +27,13 @@ issues:
     - virt-tests
     - vm-images
 
+  # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-rules:
+    # Don't complain about integer overflows
+    - text: "G115:"
+      linters:
+        - gosec
+
 linters:
   enable-all: true
   disable:
@@ -58,7 +65,6 @@ linters:
     - godot
     - godox # complains about TODO etc
     - gofumpt
-    - gomnd
     - gomoddirectives
     - inamedparam
     - interfacebloat
@@ -86,7 +92,7 @@ linters:
     - wsl
     - wrapcheck
     # the following linters are deprecated
-    - execinquery
+    - exportloopref
     # we don't want to change code to Go 1.22+ yet
     - intrange
     - copyloopvar

CONTRIBUTING.md

@@ -18,6 +18,13 @@ get invited to meetings.
 See the [#otel-profiles](https://cloud-native.slack.com/archives/C03J794L0BV)
 slack channel for discussions and questions.
 
+## Pre-requisites
+
+- Linux (4.19+ for x86-64, 5.5+ for ARM64) with eBPF enabled (the profiler currently only runs on Linux)
+- Go as specified in [go.mod](https://github.com/open-telemetry/opentelemetry-ebpf-profiler/blob/main/go.mod)
+- docker
+- Rust as specified in [Cargo.toml](https://github.com/open-telemetry/opentelemetry-ebpf-profiler/blob/main/Cargo.toml)
+
 ## Development
 
 You can view and edit the source code by cloning this repository: