Advance upstream-merge through 927a75e8 (kernel 5.10 bump)

.github/workflows/codeql.yml

@@ -25,15 +25,15 @@ jobs:
         uses: ./.github/workflows/env
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           languages: go
 
       - name: Build Artifact
         run: make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
             category: "/language:Go"
         timeout-minutes: 10

.github/workflows/collector-tests.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Set up environment
         uses: ./.github/workflows/env
       - name: Set up Go Stable
-        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version: stable
       - name: Cache coredump modules
@@ -72,7 +72,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Go Stable
-        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version: stable
       - name: Clone Collector

.github/workflows/env/action.yml

@@ -23,7 +23,7 @@ runs:
           aarch64) command -v aarch64-linux-gnu-gcc >/dev/null || sudo apt-get install -y gcc-aarch64-linux-gnu ;;
         esac
     - name: Set up Go
-      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
         go-version-file: go.mod
         cache-dependency-path: go.sum

.github/workflows/fossa.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
+      - uses: fossas/fossa-action@ff70fe9fe17cbd2040648f1c45e8ec4e4884dcf3 # v1.9.0
         with:
           api-key: ${{secrets.FOSSA_API_KEY}}
           team: OpenTelemetry

.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@38697555549f1db7851b81482ff19f1fa5c4fedc # v4.34.1
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           sarif_file: results.sarif

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

@@ -18,7 +18,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Login to Docker Hub
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4.1.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

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

@@ -17,7 +17,7 @@ jobs:
       - name: Clone code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Go
-        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: go.mod
           cache-dependency-path: go.sum
@@ -124,7 +124,7 @@ jobs:
       - name: Clone code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Set up Go
-        uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+        uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: go.mod
           cache-dependency-path: go.sum
@@ -152,7 +152,6 @@ jobs:
           # https://github.com/cilium/ci-kernels/pkgs/container/ci-kernels/versions?filters%5Bversion_type%5D=tagged
 
           # AMD64
-          - { target_arch: amd64, kernel: 5.4.276 }
           - { target_arch: amd64, kernel: 5.10.217 }
           - { target_arch: amd64, kernel: 5.15.159 }
           - { target_arch: amd64, kernel: 6.1.91 }
@@ -281,7 +280,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - { target_arch: amd64, kernel: 5.4.276 }
           - { target_arch: amd64, kernel: 5.10.217 }
           - { target_arch: amd64, kernel: 5.15.159 }
           - { target_arch: amd64, kernel: 6.1.91 }

.github/workflows/unit-test-rust.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Clone code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@29eef336d9b2848a0b548edc03f92a220660cdb8 # stable
         with:
           targets: ${{ matrix.rust_target }}
           toolchain: 1.88.0

CONTRIBUTING.md

@@ -20,7 +20,7 @@ slack channel for discussions and questions.
 
 ## Pre-requisites
 
-- Linux (5.4+ for x86-64, 5.5+ for ARM64) with eBPF enabled (the profiler currently only runs on Linux)
+- Linux (5.10+) 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)
@@ -86,6 +86,25 @@ All pull requests are squashed to a single commit upon merge to `main`.
 	[`draft`](https://github.blog/2019-02-14-introducing-draft-pull-requests/).
 * Make sure CLA is signed and CI is clear.
 
+### How to Address Review Feedback
+
+Please use the GitHub UI to accept review suggestions that you don't
+subsequently modify. Do not reimplement them in a separate commit.
+The latter behavior is problematic as it:
+
+1. Increases burden on reviewers who have to spend additional time to check
+   that your reimplementation accurately reflects the original suggestion.
+2. Increases the probability of bugs being introduced into the codebase.
+   This is not a theoretical concern as we've seen it happen multiple times.
+3. Does not credit the reviewer who came up with the accepted suggestion.
+
+You can pull the GitHub-generated commits (after you've accepted a suggestion)
+into your local repository by executing:
+
+```sh
+git pull <YOUR_FORK> <YOUR_BRANCH_NAME>
+```
+
 ### How to Get PRs Merged
 
 A PR is considered **ready to merge** when:

Cargo.toml

@@ -46,7 +46,7 @@ prost = "0.14.0"
 prost-build = "0.14.0"
 rustc-demangle = "0.1"
 serde_json = "1"
-sha2 = "0.10"
+sha2 = "0.11"
 tempfile = "3"
 thiserror = "2"
 zstd = "0.13.0"
@@ -67,7 +67,7 @@ version = "0.16.0"
 default-features = false
 
 [workspace.dependencies.object]
-version = "0.38.0"
+version = "0.39.0"
 default-features = false
 features = ["std", "read_core", "elf", "macho", "unaligned"]
 

Makefile

@@ -83,7 +83,7 @@ ebpf-profiler: ebpf
 	go build $(GO_FLAGS) -tags $(GO_TAGS)
 
 otelcol-ebpf-profiler: ebpf generate-collector
-	cd cmd/otelcol-ebpf-profiler/ && go build $(GO_FLAGS) -tags "$(GO_TAGS)" -o ../../$@ 
+	cd cmd/otelcol-ebpf-profiler/ && go build $(GO_FLAGS) -tags "$(GO_TAGS)" -o ../../$@
 
 # Sets opentelemetry collector modules to be pulled from local source tree.
 # This command allows you to make changes to your local checkout of otel core and build
@@ -94,7 +94,7 @@ otelcol-ebpf-profiler: ebpf generate-collector
 # 2. Run `make otel-from-tree` (only need to run it once to remap go modules)
 # 3. You can now build collector and it will use your local otel core changes.
 # 4. Before committing/pushing your changes, undo by running `make otel-from-lib`.
-otel-from-tree:
+otel-from-tree: generate-collector
 	./cmd/otelcol-ebpf-profiler/otel-from-tree.sh
 
 # Removes local opentelemetry-collector replaces from manifest.yaml.