Refactor according to feedback

Co-authored-by: Didier Roche-Tolomelli <[email protected]>

internal/collector/sysinfo/cmd.go

@@ -7,10 +7,14 @@ import (
 	"os/exec"
 )
 
-func runCmd(ctx context.Context, cmd string, args ...string) (stdout bytes.Buffer, stderr bytes.Buffer, err error) {
+func runCmd(ctx context.Context, cmd string, args ...string) (stdout, stderr *bytes.Buffer, err error) {
+	stdout = &bytes.Buffer{}
+	stderr = &bytes.Buffer{}
+
 	c := exec.CommandContext(ctx, cmd, args...)
-	c.Stdout = &stdout
-	c.Stderr = &stderr
+	c.Stdout = stdout
+	c.Stderr = stderr
+	c.Env = append(c.Env, "LANG=C")
 	err = c.Run()
 
 	return stdout, stderr, err

internal/collector/sysinfo/json.go

@@ -2,23 +2,21 @@ package sysinfo
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 )
 
-func parseJSON(r io.Reader, v any) (any, error) {
-	// Read the entire content of the io.Reader first to check for errors even if valid json is first
+// parseJSON unmarshals the data in r into v.
+func parseJSON(r io.Reader, v any) error {
+	// Read the entire content of the io.Reader first to check for errors even if valid json is first.
 	buf, err := io.ReadAll(r)
 	if err != nil {
-		s := fmt.Sprintf("error reading from io.Reader: %v", err)
-		return nil, errors.New(s)
+		return fmt.Errorf("error reading from io.Reader: %v", err)
 	}
 
 	err = json.Unmarshal(buf, v)
 	if err != nil {
-		s := fmt.Sprintf("couldn't parse JSON: %v", err)
-		return nil, errors.New(s)
+		return fmt.Errorf("couldn't parse JSON: %v", err)
 	}
-	return v, nil
+	return nil
 }

internal/collector/sysinfo/sysinfo.go

@@ -19,28 +19,13 @@ type SysInfo struct {
 type hwInfo struct {
 	Product map[string]string
 
-	CPU     cpuInfo
-	GPUs    []gpuInfo
-	Mem     memInfo
+	CPU     map[string]string
+	GPUs    []map[string]string
+	Mem     map[string]int
 	Blks    []diskInfo
 	Screens []screenInfo
 }
 
-// CpuInfo contains CPU information of a machine.
-type cpuInfo struct {
-	CPU map[string]string
-}
-
-// GpuInfo contains GPU information of a specific GPU.
-type gpuInfo struct {
-	GPU map[string]string
-}
-
-// MemInfo contains Memory information of a machine.
-type memInfo struct {
-	Mem map[string]int
-}
-
 // DiskInfo contains Disk information of a disk or partition.
 type diskInfo struct {
 	Name string