Sync from upstream (2025-01-17) (#11)

* Bump golangci-lint to 1.63.4 (open-telemetry#311) Author: Tim Rühsen <[email protected]> * CI: reduce boiler plate of environment (open-telemetry#312) * Consistent format of the eBPF code (open-telemetry#310) * Off CPU profiling (open-telemetry#196) * CI: Check for differences in the eBPF binary blobs (open-telemetry#305) * README: drop make target docker-image as pre requirement (open-telemetry#304) Signed-off-by: Florian Lehner <[email protected]> * Setup collector receiver (open-telemetry#160) Author: Damien Mathieu <[email protected]> Co-authored-by: Tim Rühsen <[email protected]> * Send process name as process.executable.name (/proc/PID/comm) (open-telemetry#298) Author: Christos Kalkanis <[email protected]> Co-authored-by: Tim Rühsen <[email protected]> * Remove host metadata collector (open-telemetry#299) Author: Damien Mathieu <[email protected]> * apmint: return error if Attach() fails (open-telemetry#271) * docker: build and push docker builder image (open-telemetry#297) Signed-off-by: Florian Lehner <[email protected]> * Update golang.org/x/net to v0.33.0 (Fix CVE-2024-45338) (open-telemetry#294) Author: Tim Rühsen <[email protected]> * metrics: update package documentation (open-telemetry#295) Signed-off-by: Florian Lehner <[email protected]> * Fix pdata function table order (open-telemetry#286) Author: Tolya Korniltsev <[email protected]> * Fix cross-compilation (open-telemetry#282) (open-telemetry#290) Author: Christos Kalkanis <[email protected]> * Use clang-17 for building tracers (open-telemetry#270) Author: Mathieu Bressolle-Chataigner <[email protected]> Co-authored-by: Co-authored-by: Christos Kalkanis <[email protected]> * Make the CollAgentAddr config optional in controller (open-telemetry#279) Author: Damien Mathieu <[email protected]> Co-authored-by: Christos Kalkanis <[email protected]> Co-authored-by: Florian Lehner <[email protected]> * Remove unused type libpf.TraceAndCounts (open-telemetry#283) Author: Tim Rühsen <[email protected]> * Collector Reporter (open-telemetry#208) Author: Damien Mathieu <[email protected]> Co-authored-by: Tim Rühsen <[email protected]> Co-authored-by: Florian Lehner <[email protected]> Co-authored-by: Christos Kalkanis <[email protected]> * proc: handle nvidia kernel modules (open-telemetry#274) * README: provide new version of devfiler (open-telemetry#275) Author: Florian Lehner <[email protected]> * Extract reporter data generation, and use pdata (open-telemetry#245) Author: Damien Mathieu <[email protected]> Co-authored-by: Florian Lehner <[email protected]> Co-authored-by: Christos Kalkanis <[email protected]> * apmint: warn user about changes in the APM service (open-telemetry#269) Author: Florian Lehner <[email protected]> Co-authored-by: Joel Höner <[email protected]> * coredump: no need for full dump with bundled files (open-telemetry#213) Author: Timo Teräs <[email protected]> * Send executable path with every stack trace (open-telemetry#253) * Send thread name as ThreadNameKey not ProcessCommandKey (open-telemetry#265) Author: Christos Kalkanis <[email protected]> * proc: Fix parsing Kernel Module lines where refcount is - (open-telemetry#263) Author: Frederic Branczyk <[email protected]> * reporter: extend lifetime for cached elements (open-telemetry#260) Author: Florian Lehner <[email protected]> * Reporter: allow extending samples with extra attributes (open-telemetry#237) Author: Joel Höner <[email protected]> Co-authored-by: Tim Rühsen <[email protected]>
instana · Jan 17, 2025 · e2ebf7c · e2ebf7c
2 parents ee8a86f + 2698137
commit e2ebf7c
Show file tree

Hide file tree

Showing 95 changed files with 5,429 additions and 2,883 deletions.
diff --git a/.github/workflows/env/action.yml b/.github/workflows/env/action.yml
@@ -27,12 +27,11 @@ 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
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "1.23"
-        check-latest: true
+        go-version-file: go.mod
         cache-dependency-path: go.sum
       id: go
diff --git a/.github/workflows/push-docker-image.yml b/.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 }}
diff --git a/.github/workflows/unit-test-on-pull-request.yml b/.github/workflows/unit-test-on-pull-request.yml
@@ -44,6 +44,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 }})
@@ -67,6 +72,29 @@ jobs:
       - name: Tests
         run: make test TARGET_ARCH=${{ matrix.target_arch }}
 
+  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
+      - 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 }})
     runs-on: ubuntu-24.04

diff --git a/.golangci.yml b/.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

diff --git a/LICENSES/github.com/gogo/protobuf/LICENSE b/LICENSES/github.com/gogo/protobuf/LICENSE
@@ -0,0 +1,35 @@
+Copyright (c) 2013, The GoGo Authors. All rights reserved.
+
+Protocol Buffers for Go with Gadgets
+
+Go support for Protocol Buffers - Google's data interchange format
+
+Copyright 2010 The Go Authors.  All rights reserved.
+https://github.com/golang/protobuf
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/LICENSES/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE b/LICENSES/github.com/grpc-ecosystem/grpc-gateway/v2/LICENSE
diff --git a/LICENSES/github.com/json-iterator/go/LICENSE b/LICENSES/github.com/json-iterator/go/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 json-iterator
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/...ES/go.opentelemetry.io/proto/otlp/LICENSE → ...S/github.com/modern-go/concurrent/LICENSE b/...ES/go.opentelemetry.io/proto/otlp/LICENSE → ...S/github.com/modern-go/concurrent/LICENSE