Merge remote-tracking branch 'upstream/main' into FreeBSD

Author: redanthrax

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Replace pkg/errors with Go 1.13 native errors #123.
+
 ### Changed
 
 ### Deprecated
@@ -17,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+## [1.8.1]
+
+### Fixed
+
+- Report OS name as Windows 11 when version is >= 10.0.22000. [#118](https://github.com/elastic/go-sysinfo/issues/118) [#121](https://github.com/elastic/go-sysinfo/pull/121)
+
 ## [1.8.0]
 
 ### Added
@@ -100,8 +108,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed a leak when calling the CommandLineToArgv function. [#51](https://github.com/redanthrax/go-sysinfo/pull/51)
-- Fixed a crash when calling the CommandLineToArgv function. [#58](https://github.com/redanthrax/go-sysinfo/pull/58)
+- Fixed a leak when calling the CommandLineToArgv function. [#51](https://github.com/elastic/go-sysinfo/pull/51)
+- Fixed a crash when calling the CommandLineToArgv function. [#58](https://github.com/elastic/go-sysinfo/pull/58)
 
 ## [1.0.1] - 2019-05-08
 
@@ -129,18 +137,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Changed the host containerized check to reduce false positives. [#42](https://github.com/redanthrax/go-sysinfo/pull/42) [#43](https://github.com/redanthrax/go-sysinfo/pull/43)
 
-[Unreleased]: https://github.com/redanthrax/go-sysinfo/compare/v1.8.0...HEAD
-[1.8.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.8.0
-[1.7.1]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.7.1
-[1.7.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.7.0
-[1.6.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.6.0
-[1.5.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.5.0
-[1.4.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.4.0
-[1.3.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.3.0
-[1.2.1]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.2.1
-[1.2.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.2.0
-[1.1.1]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.1.0
-[1.1.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.1.0
-[1.0.2]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.0.2
-[1.0.1]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.0.1
-[1.0.0]: https://github.com/redanthrax/go-sysinfo/releases/tag/v1.0.0
+[Unreleased]: https://github.com/elastic/go-sysinfo/compare/v1.8.1...HEAD
+[1.8.1]: https://github.com/elastic/go-sysinfo/releases/tag/v1.8.1
+[1.8.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.8.0
+[1.7.1]: https://github.com/elastic/go-sysinfo/releases/tag/v1.7.1
+[1.7.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.7.0
+[1.6.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.6.0
+[1.5.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.5.0
+[1.4.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.4.0
+[1.3.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.3.0
+[1.2.1]: https://github.com/elastic/go-sysinfo/releases/tag/v1.2.1
+[1.2.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.2.0
+[1.1.1]: https://github.com/elastic/go-sysinfo/releases/tag/v1.1.0
+[1.1.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.1.0
+[1.0.2]: https://github.com/elastic/go-sysinfo/releases/tag/v1.0.2
+[1.0.1]: https://github.com/elastic/go-sysinfo/releases/tag/v1.0.1
+[1.0.0]: https://github.com/elastic/go-sysinfo/releases/tag/v1.0.0

NOTICE.txt

@@ -1,5 +1,5 @@
 Elastic go-sysinfo
-Copyright 2017-2020 Elasticsearch B.V.
+Copyright 2017-2022 Elasticsearch B.V.
 
 This product includes software developed at
 Elasticsearch, B.V. (https://www.elastic.co/).

go.mod

@@ -5,15 +5,15 @@ go 1.18
 require (
 	github.com/elastic/go-windows v1.0.1
 	github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
-	github.com/pkg/errors v0.9.1
-	github.com/prometheus/procfs v0.7.3
-	github.com/stretchr/testify v1.8.0
-	golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b
-	howett.net/plist v1.0.0
+	github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0
+	github.com/stretchr/testify v1.3.0
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
+	howett.net/plist v0.0.0-20181124034731-591f970eefbb
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/pkg/errors v0.8.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

internal/registry/registry.go

@@ -18,7 +18,7 @@
 package registry
 
 import (
-	"github.com/pkg/errors"
+	"fmt"
 
 	"github.com/redanthrax/go-sysinfo/types"
 )
@@ -41,14 +41,14 @@ type ProcessProvider interface {
 func Register(provider interface{}) {
 	if h, ok := provider.(HostProvider); ok {
 		if hostProvider != nil {
-			panic(errors.Errorf("HostProvider already registered: %v", hostProvider))
+			panic(fmt.Sprintf("HostProvider already registered: %v", hostProvider))
 		}
 		hostProvider = h
 	}
 
 	if p, ok := provider.(ProcessProvider); ok {
 		if processProvider != nil {
-			panic(errors.Errorf("ProcessProvider already registered: %v", processProvider))
+			panic(fmt.Sprintf("ProcessProvider already registered: %v", processProvider))
 		}
 		processProvider = p
 	}

providers/aix/boottime_aix_ppc64.go

@@ -22,10 +22,9 @@ package aix
 
 import (
 	"encoding/binary"
+	"fmt"
 	"os"
 	"time"
-
-	"github.com/pkg/errors"
 )
 
 // utmp can't be used by "encoding/binary" if generated by cgo,
@@ -60,7 +59,7 @@ func bootTime(filename string) (time.Time, error) {
 	// Get boot time from /etc/utmp
 	file, err := os.Open(filename)
 	if err != nil {
-		return time.Time{}, errors.Wrap(err, "failed to get host uptime: cannot open /etc/utmp")
+		return time.Time{}, fmt.Errorf("failed to get host uptime: cannot open /etc/utmp: %w", err)
 	}
 
 	defer file.Close()
@@ -76,5 +75,5 @@ func bootTime(filename string) (time.Time, error) {
 		}
 	}
 
-	return time.Time{}, errors.Wrap(err, "failed to get host uptime: no utmp record")
+	return time.Time{}, fmt.Errorf("failed to get host uptime: no utmp record: %w", err)
 }

providers/aix/host_aix_ppc64.go

@@ -31,11 +31,12 @@ package aix
 import "C"
 
 import (
+	"errors"
+	"fmt"
 	"os"
 	"time"
 
 	"github.com/joeshaw/multierror"
-	"github.com/pkg/errors"
 
 	"github.com/redanthrax/go-sysinfo/internal/registry"
 	"github.com/redanthrax/go-sysinfo/providers/shared"
@@ -80,7 +81,7 @@ func (*host) CPUTime() (types.CPUTimes, error) {
 	cpudata := C.perfstat_cpu_total_t{}
 
 	if _, err := C.perfstat_cpu_total(nil, &cpudata, C.sizeof_perfstat_cpu_total_t, 1); err != nil {
-		return types.CPUTimes{}, errors.Wrap(err, "error while callin perfstat_cpu_total")
+		return types.CPUTimes{}, fmt.Errorf("error while callin perfstat_cpu_total: %w", err)
 	}
 
 	return types.CPUTimes{
@@ -100,7 +101,7 @@ func (*host) Memory() (*types.HostMemoryInfo, error) {
 	meminfo := C.perfstat_memory_total_t{}
 	_, err := C.perfstat_memory_total(nil, &meminfo, C.sizeof_perfstat_memory_total_t, 1)
 	if err != nil {
-		return nil, errors.Wrap(err, "perfstat_memory_total failed")
+		return nil, fmt.Errorf("perfstat_memory_total failed: %w", err)
 	}
 
 	mem.Total = uint64(meminfo.real_total) * pagesize
@@ -137,7 +138,7 @@ type reader struct {
 
 func (r *reader) addErr(err error) bool {
 	if err != nil {
-		if errors.Cause(err) != types.ErrNotImplemented {
+		if !errors.Is(err, types.ErrNotImplemented) {
 			r.errs = append(r.errs, err)
 		}
 		return true

providers/aix/kernel_aix_ppc64.go

@@ -26,27 +26,26 @@ package aix
 import "C"
 
 import (
+	"fmt"
 	"strconv"
-
-	"github.com/pkg/errors"
 )
 
 var oslevel string
 
 func getKernelVersion() (int, int, error) {
 	name := C.struct_utsname{}
 	if _, err := C.uname(&name); err != nil {
-		return 0, 0, errors.Wrap(err, "kernel version: uname")
+		return 0, 0, fmt.Errorf("kernel version: uname: %w", err)
 	}
 
 	version, err := strconv.Atoi(C.GoString(&name.version[0]))
 	if err != nil {
-		return 0, 0, errors.Wrap(err, "parsing kernel version")
+		return 0, 0, fmt.Errorf("parsing kernel version: %w", err)
 	}
 
 	release, err := strconv.Atoi(C.GoString(&name.release[0]))
 	if err != nil {
-		return 0, 0, errors.Wrap(err, "parsing kernel release")
+		return 0, 0, fmt.Errorf("parsing kernel release: %w", err)
 	}
 	return version, release, nil
 }

providers/aix/machineid_aix_ppc64.go

@@ -25,15 +25,13 @@ package aix
 */
 import "C"
 
-import (
-	"github.com/pkg/errors"
-)
+import "fmt"
 
 // MachineID returns the id of the machine
 func MachineID() (string, error) {
 	name := C.struct_utsname{}
 	if _, err := C.uname(&name); err != nil {
-		return "", errors.Wrap(err, "machine id")
+		return "", fmt.Errorf("machine id: %w", err)
 	}
 	return C.GoString(&name.machine[0]), nil
 }

providers/aix/os_aix_ppc64.go

@@ -21,13 +21,12 @@
 package aix
 
 import (
+	"fmt"
 	"io/ioutil"
 	"strconv"
 	"strings"
 
-	"github.com/pkg/errors"
-
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 // OperatingSystem returns information of the host operating system
@@ -44,7 +43,7 @@ func getOSInfo() (*types.OSInfo, error) {
 	// Retrieve build version from "/proc/version".
 	procVersion, err := ioutil.ReadFile("/proc/version")
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to get OS info: cannot open /proc/version")
+		return nil, fmt.Errorf("failed to get OS info: cannot open /proc/version: %w", err)
 	}
 	build := strings.SplitN(string(procVersion), "\n", 4)[2]
 

providers/aix/process_aix_ppc64.go

@@ -33,6 +33,8 @@ import "C"
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
@@ -43,9 +45,7 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/pkg/errors"
-
-	"github.com/redanthrax/go-sysinfo/types"
+	"github.com/elastic/go-sysinfo/types"
 )
 
 // Processes returns a list of all actives processes.
@@ -54,7 +54,7 @@ func (aixSystem) Processes() ([]types.Process, error) {
 	// getprocs which will also retrieve kernel threads.
 	files, err := ioutil.ReadDir("/proc")
 	if err != nil {
-		return nil, errors.Wrap(err, "error while reading /proc")
+		return nil, fmt.Errorf("error while reading /proc: %w", err)
 	}
 
 	processes := make([]types.Process, 0, len(files))
@@ -121,7 +121,7 @@ func (p *process) Info() (types.ProcessInfo, error) {
 		err = syscall.ESRCH
 	}
 	if err != nil {
-		return types.ProcessInfo{}, errors.Wrap(err, "error while calling getprocs")
+		return types.ProcessInfo{}, fmt.Errorf("error while calling getprocs: %w", err)
 	}
 
 	p.info.PPID = int(info.pi_ppid)
@@ -133,7 +133,7 @@ func (p *process) Info() (types.ProcessInfo, error) {
 	buf := make([]byte, 8192)
 	var args []string
 	if _, err := C.getargs(unsafe.Pointer(&info), C.sizeof_struct_procsinfo64, (*C.char)(&buf[0]), 8192); err != nil {
-		return types.ProcessInfo{}, errors.Wrap(err, "error while calling getargs")
+		return types.ProcessInfo{}, fmt.Errorf("error while calling getargs: %w", err)
 	}
 
 	bbuf := bytes.NewBuffer(buf)
@@ -143,7 +143,7 @@ func (p *process) Info() (types.ProcessInfo, error) {
 			break
 		}
 		if err != nil {
-			return types.ProcessInfo{}, errors.Wrap(err, "error while reading arguments")
+			return types.ProcessInfo{}, fmt.Errorf("error while reading arguments: %w", err)
 		}
 
 		args = append(args, string(chop(arg)))
@@ -183,7 +183,7 @@ func (p *process) Info() (types.ProcessInfo, error) {
 	cwd, err := os.Readlink("/proc/" + strconv.Itoa(p.pid) + "/cwd")
 	if err != nil {
 		if !os.IsNotExist(err) {
-			return types.ProcessInfo{}, errors.Wrapf(err, "error while reading /proc/%s/cwd", strconv.Itoa(p.pid))
+			return types.ProcessInfo{}, fmt.Errorf("error while reading /proc/%s/cwd: %w", strconv.Itoa(p.pid), err)
 		}
 	}
 
@@ -205,7 +205,7 @@ func (p *process) Environment() (map[string]string, error) {
 	info.pi_pid = C.pid_t(p.pid)
 
 	if _, err := C.getevars(unsafe.Pointer(&info), C.sizeof_struct_procsinfo64, (*C.char)(&buf[0]), 8192); err != nil {
-		return nil, errors.Wrap(err, "error while calling getevars")
+		return nil, fmt.Errorf("error while calling getevars: %w", err)
 	}
 
 	bbuf := bytes.NewBuffer(buf)
@@ -218,12 +218,12 @@ func (p *process) Environment() (map[string]string, error) {
 			break
 		}
 		if err != nil {
-			return nil, errors.Wrap(err, "error while calling getevars")
+			return nil, fmt.Errorf("error while calling getevars: %w", err)
 		}
 
 		pair := bytes.SplitN(chop(line), delim, 2)
 		if len(pair) != 2 {
-			return nil, errors.Wrap(err, "error reading process environment")
+			return nil, errors.New("error reading process environment")
 		}
 		p.env[string(pair[0])] = string(pair[1])
 	}
@@ -260,7 +260,7 @@ func (p *process) Memory() (types.MemoryInfo, error) {
 		err = syscall.ESRCH
 	}
 	if err != nil {
-		return types.MemoryInfo{}, errors.Wrap(err, "error while calling getprocs")
+		return types.MemoryInfo{}, fmt.Errorf("error while calling getprocs: %w", err)
 	}
 
 	mem.Resident = uint64(info.pi_drss+info.pi_trss) * pagesize
@@ -286,12 +286,12 @@ func (p *process) decodeProcfsFile(name string, data interface{}) error {
 
 	file, err := os.Open(fileName)
 	if err != nil {
-		return errors.Wrapf(err, "error while opening %s", fileName)
+		return fmt.Errorf("error while opening %s: %w", fileName, err)
 	}
 	defer file.Close()
 
 	if err := binary.Read(file, binary.BigEndian, data); err != nil {
-		return errors.Wrapf(err, "error while decoding %s", fileName)
+		return fmt.Errorf("error while decoding %s: %w", fileName, err)
 	}
 
 	return nil