Update go.mod for Go 1.22, fix CI (#187)

Use go 1.22 in the for the go.mod file. Update the go build tags to use the new go:build format. Run CI use the two latest Go minors (1.22.x and 1.23.x).
elastic · Dec 12, 2024 · 0b9c34c · 0b9c34c
1 parent 5ccdc52
commit 0b9c34c
Show file tree

Hide file tree

Showing 26 changed files with 38 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,9 +21,9 @@
     lint:
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v3
+        - uses: actions/checkout@v4
 
-        - uses: actions/setup-go@v4
+        - uses: actions/setup-go@v5
           with:
             go-version-file: 'go.mod'
 
@@ -36,7 +36,7 @@
       strategy:
         fail-fast: false
         matrix:
-          go-version: ['1.15', '1.16']
+          go-version: ['1.22.x', '1.23.x']
           os: [macos-latest, ubuntu-latest, windows-latest]
       runs-on: ${{ matrix.os }}
       steps:

diff --git a/cgroup/doc.go b/cgroup/doc.go
@@ -2,7 +2,7 @@
 // control groups, a Linux kernel feature for grouping tasks to track and limit
 // resource usage.
 //
-// Terminology
+// # Terminology
 //
 // A cgroup is a collection of processes that are bound to a set of limits.
 //

diff --git a/examples/ss/ss.go b/examples/ss/ss.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package main

diff --git a/examples/ss/ss_other.go b/examples/ss/ss_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package main

diff --git a/go.mod b/go.mod
@@ -1,9 +1,15 @@
 module github.com/elastic/gosigar
 
-go 1.14
+go 1.22.9
 
 require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0
+	golang.org/x/sys v0.26.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -7,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0 h1:8H8QZJ30plJyIVj60H3lr8TZGIq2Fh3Cyrs/ZNg1foU=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

diff --git a/psnotify/psnotify.go b/psnotify/psnotify.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2012 VMware, Inc.
 
+//go:build darwin || freebsd || netbsd || openbsd || linux
 // +build darwin freebsd netbsd openbsd linux
 
 package psnotify

diff --git a/psnotify/psnotify_bsd.go b/psnotify/psnotify_bsd.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2012 VMware, Inc.
 
+//go:build darwin || freebsd || netbsd || openbsd
 // +build darwin freebsd netbsd openbsd
 
 // Go interface to BSD kqueue process events.

diff --git a/psnotify/psnotify_test.go b/psnotify/psnotify_test.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2012 VMware, Inc.
 
+//go:build darwin || freebsd || netbsd || openbsd || linux
 // +build darwin freebsd netbsd openbsd linux
 
 package psnotify

diff --git a/sigar_aix.go b/sigar_aix.go
@@ -1,3 +1,4 @@
+//go:build aix
 // +build aix
 
 package gosigar
@@ -403,7 +404,7 @@ func (self *ProcState) Get(pid int) error {
 	return nil
 }
 
-//Get returns the current memory usage of a process
+// Get returns the current memory usage of a process
 func (self *ProcMem) Get(pid int) error {
 	info := C.struct_procsinfo64{}
 	cpid := C.pid_t(pid)

diff --git a/sigar_darwin.go b/sigar_darwin.go
@@ -1,3 +1,4 @@
+//go:build !386
 // +build !386
 
 package gosigar

diff --git a/sigar_linux_common.go b/sigar_linux_common.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2012 VMware, Inc.
 
+//go:build freebsd || linux
 // +build freebsd linux
 
 package gosigar

diff --git a/sigar_openbsd.go b/sigar_openbsd.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2016 Jasper Lievisse Adriaanse <[email protected]>.
 
+//go:build openbsd
 // +build openbsd
 
 package gosigar

diff --git a/sigar_stub.go b/sigar_stub.go
@@ -1,3 +1,4 @@
+//go:build !aix && !darwin && !freebsd && !linux && !openbsd && !windows
 // +build !aix,!darwin,!freebsd,!linux,!openbsd,!windows
 
 package gosigar

diff --git a/sigar_unix.go b/sigar_unix.go
@@ -1,5 +1,6 @@
 // Copyright (c) 2012 VMware, Inc.
 
+//go:build aix || darwin || freebsd || linux
 // +build aix darwin freebsd linux
 
 package gosigar

diff --git a/sys/linux/inetdiag.go b/sys/linux/inetdiag.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package linux

diff --git a/sys/linux/inetdiag_test.go b/sys/linux/inetdiag_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package linux

diff --git a/sys/linux/netlink.go b/sys/linux/netlink.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package linux

diff --git a/sys/linux/netlink_test.go b/sys/linux/netlink_test.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package linux

diff --git a/sys/linux/sysconf_cgo.go b/sys/linux/sysconf_cgo.go
@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package linux

diff --git a/sys/linux/sysconf_nocgo.go b/sys/linux/sysconf_nocgo.go
@@ -1,3 +1,4 @@
+//go:build !cgo || !linux
 // +build !cgo !linux
 
 package linux

diff --git a/sys/windows/fix_generated.go b/sys/windows/fix_generated.go
@@ -15,7 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-//+build ignore
+//go:build ignore
+// +build ignore
 
 package main
 

diff --git a/sys/windows/ntquery.go b/sys/windows/ntquery.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

diff --git a/sys/windows/privileges.go b/sys/windows/privileges.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

diff --git a/sys/windows/privileges_test.go b/sys/windows/privileges_test.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows

diff --git a/sys/windows/version.go b/sys/windows/version.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package windows