Replace WMI queries with direct API calls

.github/workflows/go.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: actions/setup-go@v6
       with:
         go-version-file: go.mod
-    - run: go run github.com/onsi/ginkgo/v2/ginkgo run -r --race --keep-going ./...
+    - run: go run github.com/onsi/ginkgo/v2/ginkgo run -r -p --race --keep-going --output-interceptor-mode=none ./...
       if: ${{ ! startsWith(matrix.os, 'windows') }}
-    - run: go run github.com/onsi/ginkgo/v2/ginkgo run -r --race --keep-going --output-interceptor-mode=none --skip-package=psnotify -v ./...
+    - run: go run github.com/onsi/ginkgo/v2/ginkgo run -r -p --race --keep-going --output-interceptor-mode=none --skip-package=psnotify ./...
       if: ${{ startsWith(matrix.os, 'windows') }}

bin/test-unit

@@ -19,7 +19,7 @@ main() {
     set -x
   fi
 
-  go run github.com/onsi/ginkgo/v2/ginkgo -p -r --randomize-all --randomize-suites --keep-going --race --skip-package=$skip_packages
+  go run github.com/onsi/ginkgo/v2/ginkgo run -p -r --randomize-all --randomize-suites --keep-going --race --skip-package=$skip_packages
 }
 
 main "$@"

concrete_sigar_test.go

@@ -1,6 +1,7 @@
 package sigar_test
 
 import (
+	"errors"
 	"runtime"
 	"time"
 
@@ -53,7 +54,7 @@ var _ = Describe("ConcreteSigar", func() {
 
 	It("GetLoadAverage", func() {
 		avg, err := concreteSigar.GetLoadAverage()
-		if err == sigar.ErrNotImplemented {
+		if errors.Is(err, sigar.ErrNotImplemented) {
 			Skip("Not implemented on " + runtime.GOOS)
 		}
 		Expect(avg.One).ToNot(BeNil())
@@ -81,12 +82,12 @@ var _ = Describe("ConcreteSigar", func() {
 	})
 
 	It("GetSwap", func() {
-		fsusage, err := concreteSigar.GetFileSystemUsage("/")
+		fsUsage, err := concreteSigar.GetFileSystemUsage("/")
 		Expect(err).ToNot(HaveOccurred())
-		Expect(fsusage.Total).ToNot(BeNil())
+		Expect(fsUsage.Total).ToNot(BeNil())
 
-		fsusage, err = concreteSigar.GetFileSystemUsage("T O T A L L Y B O G U S")
+		fsUsage, err = concreteSigar.GetFileSystemUsage("T O T A L L Y B O G U S")
 		Expect(err).To(HaveOccurred())
-		Expect(fsusage.Total).To(Equal(uint64(0)))
+		Expect(fsUsage.Total).To(Equal(uint64(0)))
 	})
 })

examples/df/df.go

@@ -3,12 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
 
 	sigar "github.com/cloudfoundry/gosigar"
 )
 
-const output_format = "%-15s %4s %4s %5s %4s %-15s\n"
+const outputFormat = "%-15s %4s %4s %5s %4s %-15s\n"
 
 func formatSize(size uint64) string {
 	return sigar.FormatSize(size * 1024)
@@ -18,29 +17,28 @@ func main() {
 	var fileSystemFilter string
 	flag.StringVar(&fileSystemFilter, "t", "", "Filesystem to filter on")
 	flag.Parse()
-	fslist := sigar.FileSystemList{}
-	fslist.Get() //nolint:errcheck
+	fsList := sigar.FileSystemList{}
+	fsList.Get() //nolint:errcheck
 
-	fmt.Fprintf(os.Stdout, output_format, //nolint:errcheck
-		"Filesystem", "Size", "Used", "Avail", "Use%", "Mounted on")
+	fmt.Printf(outputFormat, "Filesystem", "Size", "Used", "Avail", "Use%", "Mounted on")
 
-	for _, fs := range fslist.List {
-		dir_name := fs.DirName
+	for _, fs := range fsList.List {
+		dirName := fs.DirName
 		usage := sigar.FileSystemUsage{}
-		usage.Get(dir_name) //nolint:errcheck
+		usage.Get(dirName) //nolint:errcheck
 
 		if fileSystemFilter != "" {
 			if fs.SysTypeName != fileSystemFilter {
 				continue
 			}
 		}
 
-		fmt.Fprintf(os.Stdout, output_format, //nolint:errcheck
+		fmt.Printf(outputFormat,
 			fs.DevName,
 			formatSize(usage.Total),
 			formatSize(usage.Used),
 			formatSize(usage.Avail),
 			sigar.FormatPercent(usage.UsePercent()),
-			dir_name)
+			dirName)
 	}
 }

examples/free/free.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"os"
 
 	sigar "github.com/cloudfoundry/gosigar"
 )
@@ -18,15 +17,8 @@ func main() {
 	mem.Get()  //nolint:errcheck
 	swap.Get() //nolint:errcheck
 
-	fmt.Fprintf(os.Stdout, "%18s %10s %10s\n", //nolint:errcheck
-		"total", "used", "free")
-
-	fmt.Fprintf(os.Stdout, "Mem:    %10d %10d %10d\n", //nolint:errcheck
-		format(mem.Total), format(mem.Used), format(mem.Free))
-
-	fmt.Fprintf(os.Stdout, "-/+ buffers/cache: %10d %10d\n", //nolint:errcheck
-		format(mem.ActualUsed), format(mem.ActualFree))
-
-	fmt.Fprintf(os.Stdout, "Swap:   %10d %10d %10d\n", //nolint:errcheck
-		format(swap.Total), format(swap.Used), format(swap.Free))
+	fmt.Printf("%18s %10s %10s\n", "total", "used", "free")
+	fmt.Printf("Mem:    %10d %10d %10d\n", format(mem.Total), format(mem.Used), format(mem.Free))
+	fmt.Printf("-/+ buffers/cache: %10d %10d\n", format(mem.ActualUsed), format(mem.ActualFree))
+	fmt.Printf("Swap:   %10d %10d %10d\n", format(swap.Total), format(swap.Used), format(swap.Free))
 }

examples/uptime/uptime.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	sigar "github.com/cloudfoundry/gosigar"
@@ -19,7 +18,7 @@ func main() {
 		return
 	}
 
-	fmt.Fprintf(os.Stdout, " %s up %s load average: %.2f, %.2f, %.2f\n", //nolint:errcheck
+	fmt.Printf(" %s up %s load average: %.2f, %.2f, %.2f\n",
 		time.Now().Format("15:04:05"),
 		uptime.Format(),
 		avg.One, avg.Five, avg.Fifteen)

go.mod

@@ -5,7 +5,6 @@ go 1.23.0
 require (
 	github.com/onsi/ginkgo/v2 v2.27.2
 	github.com/onsi/gomega v1.38.2
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/sys v0.35.0
 )

go.sum

@@ -35,8 +35,6 @@ github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns
 github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
 github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
 github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=

psnotify/psnotify_bsd.go

@@ -1,8 +1,9 @@
 //go:build darwin || freebsd || netbsd || openbsd
 
-// Go interface to BSD kqueue process events.
 package psnotify
 
+// Go interface to BSD kqueue process events.
+
 import (
 	"syscall"
 )

psnotify/psnotify_test.go

@@ -185,7 +185,7 @@ func TestWatchFork(t *testing.T) {
 
 	tw := newTestWatcher(t)
 
-	// no watches added yet, so this fork event will no be captured
+	// no watches added yet, so this fork event will not be captured
 	runCommand(t, "date")
 
 	// watch fork events for this process