Merge branch 'google:master' into jesseward/oomparser-ignore-old

Author: jesseward

.github/workflows/release-binaries.yml

@@ -49,8 +49,8 @@ jobs:
           # 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.24 \
-            /bin/bash -c "cd /go/src/github.com/google/cadvisor && GOARCH=${{ matrix.arch }} OUTPUT_NAME_WITH_ARCH=true VERSION=${{ env.VERSION }} GO_FLAGS='-buildvcs=false -tags=netgo' ./build/build.sh"
+            golang:1.25 \
+            /bin/bash -c "cd /go/src/github.com/google/cadvisor && GOARCH=${{ matrix.arch }} OUTPUT_NAME_WITH_ARCH=true VERSION=${{ env.VERSION }} GO_FLAGS='-buildvcs=false -tags=netgo' GO_CGO_ENABLED=0 ./build/build.sh"
 
       - name: Generate SHA256 checksums
         run: |

.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

@@ -4,8 +4,8 @@ jobs:
   test:
     strategy:
       matrix:
-        go-versions: ['1.24']
-        platform: [ubuntu-22.04]
+        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
@@ -31,8 +31,8 @@ jobs:
   test-integration:
     strategy:
       matrix:
-        go-versions: ['1.24']
-        platform: [ubuntu-22.04]
+        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
@@ -52,3 +52,26 @@ jobs:
       with:
         name: cadvisor.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@v4
+    - 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@v4
+      if: failure()
+      with:
+        name: cadvisor-crio.log
+        path: ${{ github.workspace }}/go/src/github.com/google/cadvisor/cadvisor.log

.golangci.yml

@@ -1,24 +1,62 @@
+version: "2"
+
 run:
   timeout: 5m
-  linters-settings:
-    govet:
-      enable-all: true
-    gofmt:
-      simplify: true
-    goimports:
-      local-prefixes: github.com/google/cadvisor
+
 linters:
-  disable-all: true
+  default: none
   enable:
     - govet
     - errcheck
     - staticcheck
     - unused
-    - gosimple
     - ineffassign
-    - typecheck
+  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

Makefile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 GO := go
-GOLANGCI_VER := 1.64.5
+GOLANGCI_VER := 2.6.2
 GO_TEST ?= $(GO) test $(or $(GO_FLAGS),-race)
 arch ?= $(shell go env GOARCH)
 
@@ -38,12 +38,21 @@ docker-test: container-test
 test-integration:
 	GO_FLAGS=$(or $(GO_FLAGS),-race) ./build/build.sh
 	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/api
-	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/healthz
+	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/common
 	@./build/integration.sh
 
 docker-test-integration:
 	@./build/integration-in-docker.sh
 
+docker-test-integration-crio:
+	@./build/integration-in-docker-crio.sh
+
+test-integration-crio:
+	GO_FLAGS=$(or $(GO_FLAGS),-race) ./build/build.sh
+	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/crio
+	$(GO_TEST) -c github.com/google/cadvisor/integration/tests/common
+	@./build/integration-crio.sh
+
 test-runner:
 	@$(GO) build github.com/google/cadvisor/integration/runner
 
@@ -72,7 +81,7 @@ docker-%:
 	@docker build -t cadvisor:$(shell git rev-parse --short HEAD) -f deploy/Dockerfile .
 
 docker-build:
-	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.23 make build
+	@docker run --rm -w /go/src/github.com/google/cadvisor -v ${PWD}:/go/src/github.com/google/cadvisor golang:1.25 make build
 
 presubmit: lint
 	@echo ">> checking go mod tidy"
@@ -100,4 +109,4 @@ clean:
 	@rm -f *.test cadvisor
 	@rm -rf _output/
 
-.PHONY: all build docker format release test test-integration lint presubmit tidy
+.PHONY: all build docker format release test test-integration test-integration-crio lint presubmit tidy

README.md

@@ -11,7 +11,7 @@ cAdvisor has native support for [Docker](https://github.com/docker/docker) conta
 To quickly tryout cAdvisor on your machine with Docker, we have a Docker image that includes everything you need to get started. You can run a single cAdvisor to monitor the whole machine. Simply run:
 
 ```
-VERSION=v0.49.1 # use the latest release version from https://github.com/google/cadvisor/releases
+VERSION=v0.53.0 # use the latest release version from https://github.com/google/cadvisor/releases
 sudo docker run \
   --volume=/:/rootfs:ro \
   --volume=/var/run:/var/run:ro \
@@ -23,7 +23,7 @@ sudo docker run \
   --name=cadvisor \
   --privileged \
   --device=/dev/kmsg \
-  gcr.io/cadvisor/cadvisor:$VERSION
+  ghcr.io/google/cadvisor:$VERSION # for versions prior to v0.53.0, use gcr.io/cadvisor/cadvisor instead
 ```
 
 cAdvisor is now running (in the background) on `http://localhost:8080`. The setup includes directories with Docker state cAdvisor needs to observe.

build/config/crio.sh

@@ -0,0 +1,19 @@
+# Copyright 2024 Google Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# CRI-O plain configuration - no special build flags
+unset GO_FLAGS
+unset PACKAGES
+unset BUILD_PACKAGES
+unset CADVISOR_ARGS