Merge branch 'master' into block-device-size

Signed-off-by: Finn Snape <[email protected]>

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   lint:
     docker:
-    - image: cimg/go:1.22
+    - image: cimg/go:1.23
     steps:
     - checkout
     - run: make check_license
@@ -46,16 +46,16 @@ workflows:
         matrix:
           parameters:
             go_version:
-            - "1.20"
             - "1.21"
             - "1.22"
+            - "1.23"
     - test:
         name: test-windows
         os: windows
         run_test: false
         matrix:
           parameters:
             go_version:
-            - "1.20"
             - "1.21"
             - "1.22"
+            - "1.23"

.golangci.yml

@@ -2,6 +2,7 @@
 linters:
   enable:
   - errcheck
+  - forbidigo
   - godot
   - gofmt
   - goimports
@@ -15,6 +16,10 @@ linters:
   - unused
 
 linter-settings:
+  forbidigo:
+    forbid:
+      - p: ^fmt\.Print.*$
+        msg: Do not commit print statements.
   godot:
     capital: true
     exclude:

go.mod

@@ -1,9 +1,9 @@
 module github.com/prometheus/procfs
 
-go 1.20
+go 1.21
 
 require (
 	github.com/google/go-cmp v0.6.0
 	golang.org/x/sync v0.8.0
-	golang.org/x/sys v0.24.0
+	golang.org/x/sys v0.25.0
 )

go.sum

@@ -2,5 +2,5 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
 golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

proc_smaps.go

@@ -19,7 +19,6 @@ package procfs
 import (
 	"bufio"
 	"errors"
-	"fmt"
 	"os"
 	"regexp"
 	"strconv"
@@ -117,7 +116,6 @@ func (p Proc) procSMapsRollupManual() (ProcSMapsRollup, error) {
 func (s *ProcSMapsRollup) parseLine(line string) error {
 	kv := strings.SplitN(line, ":", 2)
 	if len(kv) != 2 {
-		fmt.Println(line)
 		return errors.New("invalid net/dev line, missing colon")
 	}