Merge branch 'main' into ruby-jit-upstream

Author: dalehamel

.github/workflows/codeql.yml

@@ -25,15 +25,15 @@ jobs:
         uses: ./.github/workflows/env
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           languages: go
 
       - name: Build Artifact
         run: make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
             category: "/language:Go"
         timeout-minutes: 10

.github/workflows/collector-tests.yml

@@ -4,6 +4,10 @@ on:
   schedule:
     # Run every day at 3:15 AM.
     - cron: '15 3 * * *'
+  pull_request:
+    branches: ["**"]
+    paths:
+      - cmd/otelcol-ebpf-profiler/manifest.yaml
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -50,3 +54,39 @@ jobs:
         run: |
           go install go.opentelemetry.io/build-tools/issuegenerator@v0.28.1
           issuegenerator -path /tmp/testresults
+
+  otelcol-ebpf-profiler:
+    strategy:
+      matrix:
+        include:
+          - { runner: ubuntu-24.04, use-upstream: true }
+          - { runner: ubuntu-24.04, use-upstream: false }
+          - { runner: ubuntu-24.04-arm, use-upstream: true }
+          - { runner: ubuntu-24.04-arm, use-upstream: false }
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Set up Go Stable
+        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        with:
+          go-version: stable
+      - name: Clone Collector
+        if: ${{ matrix.use-upstream }}
+        run: |
+          collector_path=/tmp/opentelemetry-collector
+          git clone --depth=1 https://github.com/open-telemetry/opentelemetry-collector.git $collector_path
+      - name: Setup replace statements
+        if: ${{ matrix.use-upstream }}
+        run: |
+          COLLECTOR_PATH=/tmp/opentelemetry-collector make otel-from-tree
+      - name: Build otelcol-ebpf-profiler
+        run: |
+          make otelcol-ebpf-profiler
+      - name: Generate Issue
+        if: failure()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          go install go.opentelemetry.io/build-tools/issuegenerator@v0.28.1
+          issuegenerator -path /tmp/testresults

.github/workflows/ossf-scorecard.yml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c793b717bc78562f491db7b0e93a3a178b099162 # v4.32.5
+        uses: github/codeql-action/upload-sarif@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
         with:
           sarif_file: results.sarif

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

@@ -18,20 +18,20 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Login to Docker Hub
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0
+        uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
       - 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@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
         with:
           push: true
           file: Dockerfile

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

@@ -62,22 +62,6 @@ jobs:
           make format
           git diff --exit-code || (echo 'Code base is not Go or C formatted, please run "make format" and commit the changes in this PR.'; exit 1)
 
-  build-collector:
-    name: Build OTel Collector (${{ matrix.target_arch }})
-    runs-on: ${{ matrix.runner }}
-    strategy:
-      matrix:
-        include:
-          - { target_arch: amd64, runner: ubuntu-24.04 }
-          - { target_arch: arm64, runner: ubuntu-24.04-arm }
-    steps:
-      - name: Clone code
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-      - name: Set up environment
-        uses: ./.github/workflows/env
-      - name: build
-        run: make otelcol-ebpf-profiler
-
   test:
     name: Test (${{ matrix.target_arch }}${{ matrix.go_flags }})
     runs-on: ${{ matrix.runner }}
@@ -196,7 +180,7 @@ jobs:
           go install github.com/florianl/bluebox@v0.0.1
           sudo mv ~/go/bin/bluebox /usr/local/bin/.
       - name: Fetch integration test binaries
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with: { name: "integration-test-binaries-${{ matrix.target_arch }}" }
       - name: Fetch precompiled kernel
         run: |

.golangci.yml

@@ -79,6 +79,7 @@ linters:
     - wastedassign
     - wsl
     - wrapcheck
+    - prealloc # CI failure with golangci 2.10.1, worth fixing
     # we don't want to change code to Go 1.22+ yet
     - intrange
     - copyloopvar
@@ -87,7 +88,7 @@ linters:
     paths:
       - design-docs
       - doc
-      - LICENSES 
+      - LICENSES
       - target
       - go
 

Cargo.lock

@@ -14,7 +14,7 @@ dist:
 
 receivers:
   - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.147.0
-  - gomod: go.opentelemetry.io/ebpf-profiler v0.0.202606
+  - gomod: go.opentelemetry.io/ebpf-profiler v0.0.202610
     import: go.opentelemetry.io/ebpf-profiler/collector
 
 exporters:

cmd/otelcol-ebpf-profiler/manifest.yaml

@@ -2,7 +2,11 @@
 
 set -euo pipefail
 
+# Use COLLECTOR_PATH if set, otherwise default to ../../../opentelemetry-collector
+COLLECTOR_PATH="${COLLECTOR_PATH:-../../../opentelemetry-collector}"
+
 echo "Adding local opentelemetry-collector replaces to manifest.yaml"
+echo "Using collector path: $COLLECTOR_PATH"
 
 if grep -q "# START otel-from-tree" cmd/otelcol-ebpf-profiler/manifest.yaml; then
     echo "otel-from-tree already applied. Run 'make otel-from-lib' first to revert."
@@ -16,7 +20,7 @@ grep -E "gomod: go.opentelemetry.io/collector/" cmd/otelcol-ebpf-profiler/manife
     sort -u | \
     while read -r module; do
         subpath=${module#go.opentelemetry.io/collector}
-        echo "  - ${module} => ../opentelemetry-collector${subpath}" >> cmd/otelcol-ebpf-profiler/manifest.yaml
+        echo "  - ${module} => ${COLLECTOR_PATH}${subpath}" >> cmd/otelcol-ebpf-profiler/manifest.yaml
     done
 
 echo "Local replaces added. You can now build with local opentelemetry-collector changes."

cmd/otelcol-ebpf-profiler/otel-from-tree.sh

@@ -1,7 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-//go:build linux
+//go:build linux && (amd64 || arm64)
 
 package collector // import "go.opentelemetry.io/ebpf-profiler/collector"