[pull] master from google:master

.github/workflows/publish-container.yml

@@ -0,0 +1,73 @@
+name: Publish Container Image
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build and publish'
+        required: true
+        type: string
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Free disk space
+        run: |
+          echo "Disk space before cleanup:"
+          df -h
+          sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+          sudo docker image prune --all --force
+          sudo docker builder prune -a -f
+          echo "Disk space after cleanup:"
+          df -h
+
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable=${{ github.event_name != 'workflow_dispatch' && github.ref == format('refs/tags/{0}', github.ref_name) }}
+            type=raw,value=${{ github.event.inputs.tag }},enable=${{ github.event_name == 'workflow_dispatch' }}
+            type=sha,prefix=,suffix=-${{ github.sha }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./deploy/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref_name }}

.github/workflows/release-binaries.yml

@@ -0,0 +1,112 @@
+name: Release Binaries
+
+on:
+  push:
+    tags:
+      - 'v*'
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to build and publish'
+        required: true
+        type: string
+
+jobs:
+  build-linux-binaries:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, arm64]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
+          fetch-depth: 0  # Fetch all history for proper versioning
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
+      - name: Set VERSION environment variable
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "VERSION=${INPUTS_TAG}" >> $GITHUB_ENV
+          else
+            echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
+        env:
+          INPUTS_TAG: ${{ inputs.tag }}
+
+      - name: Build Linux ${{ matrix.arch }} binary
+        env:
+          GOARCH: ${{ matrix.arch }}
+          OUTPUT_NAME_WITH_ARCH: "true"
+          VERSION: ${{ env.VERSION }}
+        run: |
+          # Create a Docker container with the appropriate architecture
+          docker run --rm -v ${PWD}:/go/src/github.com/google/cadvisor \
+            --platform linux/${{ matrix.arch }} \
+            golang:1.25 \
+            /bin/bash -c "cd /go/src/github.com/google/cadvisor && GOARCH=${{ matrix.arch }} OUTPUT_NAME_WITH_ARCH=true VERSION=${VERSION} GO_FLAGS='-buildvcs=false -tags=netgo' GO_CGO_ENABLED=0 ./build/build.sh"
+
+      - name: Generate SHA256 checksums
+        run: |
+          cd _output
+          # List all files in the output directory
+          ls -la
+          # Generate SHA256 checksums for all binaries
+          find . -name "cadvisor*" -type f -not -name "*.sha256" -exec sh -c 'sha256sum "$1" > "$1.sha256"' _ {} \;
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v6
+        with:
+          name: cadvisor-linux-${{ matrix.arch }}
+          path: |
+            _output/cadvisor*
+          retention-days: 1
+
+  create-release:
+    needs: build-linux-binaries
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write  # Needed for creating GitHub releases
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.tag || github.ref }}
+
+      - name: Set VERSION environment variable
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "VERSION=${INPUTS_TAG}" >> $GITHUB_ENV
+          else
+            echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
+        env:
+          INPUTS_TAG: ${{ inputs.tag }}
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v7
+        with:
+          path: artifacts
+
+      - name: Display structure of downloaded files
+        run: ls -R artifacts
+
+      - name: Create Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.VERSION }}
+          name: cAdvisor ${{ env.VERSION }}
+          draft: false
+          prerelease: ${{ contains(env.VERSION, 'alpha') || contains(env.VERSION, 'beta') || contains(env.VERSION, 'rc') }}
+          generate_release_notes: true
+          files: |
+            artifacts/**/*

.github/workflows/stale.yaml

@@ -0,0 +1,30 @@
+name: Stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "21 4 * * *"
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v10
+      with:
+        stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. This issue will be closed in 30 days unless new comments are made or the stale label is removed. To skip these checks, apply the "lifecycle/frozen" label.'
+        stale-pr-message: 'This PR is stale because it has been open 90 days with no activity. This PR will be closed in 30 days unless new comments are made or the stale label is removed. To skip these checks, apply the "lifecycle/frozen" label.'
+        stale-issue-label: 'lifecycle/stale'
+        stale-pr-label: 'lifecycle/stale'
+        exempt-issue-labels: 'lifecycle/frozen'
+        exempt-pr-labels: 'lifecycle/frozen'
+        days-before-stale: 90
+        close-issue-message: 'This issue was automatically closed due to inactivity.'
+        close-pr-message: 'This pull request was automatically closed due to inactivity.'
+        days-before-issue-close: 30
+        days-before-pr-close: 30
+        remove-stale-when-updated: true
+        operations-per-run: 300

.github/workflows/test.yml

@@ -0,0 +1,94 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        go-versions: ['1.25']
+        platform: [ubuntu-24.04]
+        environment-variables: [build/config/plain.sh, build/config/libpfm4.sh, build/config/libipmctl.sh]
+    runs-on: ${{ matrix.platform }}
+    timeout-minutes: 30
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v6
+      with:
+        go-version: ${{ matrix.go-versions }}
+        check-latest: true
+    - name: Checkout code
+      uses: actions/checkout@v6
+    - name: Run presubmit checks
+      run: |
+        source ${{ matrix.environment-variables }}
+        if [[ "${BUILD_PACKAGES}" != "" ]]; then sudo apt-get update; sudo apt-get install ${BUILD_PACKAGES}; fi
+        make -e presubmit
+    - name: Run tests
+      env:
+        GOLANG_VERSION: ${{ matrix.go-versions }}
+      run: |
+        source ${{ matrix.environment-variables }}
+        make test
+  test-integration:
+    strategy:
+      matrix:
+        include:
+          # bookworm: all environment configs
+          - go-versions: '1.25'
+            platform: ubuntu-24.04
+            environment-variables: build/config/plain.sh
+            debian-version: bookworm
+          - go-versions: '1.25'
+            platform: ubuntu-24.04
+            environment-variables: build/config/libpfm4.sh
+            debian-version: bookworm
+          - go-versions: '1.25'
+            platform: ubuntu-24.04
+            environment-variables: build/config/libipmctl.sh
+            debian-version: bookworm
+          # trixie: only plain config
+          - go-versions: '1.25'
+            platform: ubuntu-24.04
+            environment-variables: build/config/plain.sh
+            debian-version: trixie
+    runs-on: ${{ matrix.platform }}
+    timeout-minutes: 30
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+    - name: Run integration tests
+      env:
+        GOLANG_VERSION: ${{ matrix.go-versions }}
+        DEBIAN_VERSION: ${{ matrix.debian-version }}
+      run: |
+        set -ex
+        source ${{ matrix.environment-variables }}
+        make docker-test-integration
+    - name: Upload cAdvisor log file
+      uses: actions/upload-artifact@v6
+      if: failure()
+      with:
+        name: cadvisor-${{ matrix.debian-version }}.log
+        path: ${{ github.workspace }}/go/src/github.com/google/cadvisor/cadvisor.log
+  test-integration-crio:
+    strategy:
+      matrix:
+        go-versions: ['1.25']
+        platform: [ubuntu-24.04]
+    runs-on: ${{ matrix.platform }}
+    timeout-minutes: 30
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+    - name: Run CRI-O integration tests
+      env:
+        GOLANG_VERSION: ${{ matrix.go-versions }}
+      run: |
+        set -ex
+        source build/config/crio.sh
+        make docker-test-integration-crio
+    - name: Upload cAdvisor log file
+      uses: actions/upload-artifact@v6
+      if: failure()
+      with:
+        name: cadvisor-crio.log
+        path: ${{ github.workspace }}/go/src/github.com/google/cadvisor/cadvisor.log

.gitignore

@@ -1,10 +1,15 @@
 cadvisor
 /release
 .vscode
+_output/
+
+# Log files
+*.log
 
 # Go test binaries
 *.test
 
 # Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
 .idea/
 *.iml
+*.swp

.golangci.yml

@@ -0,0 +1,62 @@
+version: "2"
+
+run:
+  timeout: 5m
+
+linters:
+  default: none
+  enable:
+    - govet
+    - errcheck
+    - staticcheck
+    - unused
+    - ineffassign
+  settings:
+    govet:
+      disable:
+        - fieldalignment  # too noisy, requires significant refactoring
+    errcheck:
+      exclude-functions:
+        - (io.Closer).Close
+        - (net.Conn).Close
+        - (*os.File).Close
+        - (net/http.ResponseWriter).Write
+        - os.Remove
+        - os.RemoveAll
+        - os.Setenv
+        - fmt.Fprint
+        - fmt.Fprintf
+        - fmt.Fprintln
+        - syscall.Close
+    staticcheck:
+      checks:
+        - "all"
+        - "-ST1000" # package comments - too noisy for existing codebase
+        - "-ST1003" # naming conventions (e.g., CrioId vs CrioID) - would break public API
+        - "-ST1020" # comment format on exported methods - too many to fix
+        - "-ST1021" # comment format on exported types - too many to fix
+        - "-ST1022" # comment format on exported consts - too many to fix
+        - "-QF*"    # disable quickfix suggestions
+  exclusions:
+    rules:
+      # Exclude errcheck in test files for cleaner test code
+      - linters:
+          - errcheck
+        path: "_test\\.go$"
+      # Exclude errcheck for Close() calls on any type
+      - linters:
+          - errcheck
+        text: "Error return value of .*.Close.* is not checked"
+      # Exclude govet printf check false positives
+      - linters:
+          - govet
+        text: "printf: non-constant format string"
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
+
+issues:
+  max-issues-per-linter: 0
+  max-same-issues: 0