Remove ioutil (#2438)

Signed-off-by: inosato <si17_21@yahoo.co.jp>

collector/bonding_linux.go

@@ -19,7 +19,6 @@ package collector
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -76,21 +75,21 @@ func (c *bondingCollector) Update(ch chan<- prometheus.Metric) error {
 
 func readBondingStats(root string) (status map[string][2]int, err error) {
 	status = map[string][2]int{}
-	masters, err := ioutil.ReadFile(filepath.Join(root, "bonding_masters"))
+	masters, err := os.ReadFile(filepath.Join(root, "bonding_masters"))
 	if err != nil {
 		return nil, err
 	}
 	for _, master := range strings.Fields(string(masters)) {
-		slaves, err := ioutil.ReadFile(filepath.Join(root, master, "bonding", "slaves"))
+		slaves, err := os.ReadFile(filepath.Join(root, master, "bonding", "slaves"))
 		if err != nil {
 			return nil, err
 		}
 		sstat := [2]int{0, 0}
 		for _, slave := range strings.Fields(string(slaves)) {
-			state, err := ioutil.ReadFile(filepath.Join(root, master, fmt.Sprintf("lower_%s", slave), "bonding_slave", "mii_status"))
+			state, err := os.ReadFile(filepath.Join(root, master, fmt.Sprintf("lower_%s", slave), "bonding_slave", "mii_status"))
 			if errors.Is(err, os.ErrNotExist) {
 				// some older? kernels use slave_ prefix
-				state, err = ioutil.ReadFile(filepath.Join(root, master, fmt.Sprintf("slave_%s", slave), "bonding_slave", "mii_status"))
+				state, err = os.ReadFile(filepath.Join(root, master, fmt.Sprintf("slave_%s", slave), "bonding_slave", "mii_status"))
 			}
 			if err != nil {
 				return nil, err

collector/filefd_linux.go

@@ -19,7 +19,7 @@ package collector
 import (
 	"bytes"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strconv"
 
@@ -73,7 +73,7 @@ func parseFileFDStats(filename string) (map[string]string, error) {
 	}
 	defer file.Close()
 
-	content, err := ioutil.ReadAll(file)
+	content, err := io.ReadAll(file)
 	if err != nil {
 		return nil, err
 	}

collector/helper.go

@@ -14,14 +14,14 @@
 package collector
 
 import (
-	"io/ioutil"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
 )
 
 func readUintFromFile(path string) (uint64, error) {
-	data, err := ioutil.ReadFile(path)
+	data, err := os.ReadFile(path)
 	if err != nil {
 		return 0, err
 	}

collector/hwmon_linux.go

@@ -18,7 +18,6 @@ package collector
 
 import (
 	"errors"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
@@ -78,7 +77,7 @@ func addValueFile(data map[string]map[string]string, sensor string, prop string,
 	data[sensor][prop] = value
 }
 
-// sysReadFile is a simplified ioutil.ReadFile that invokes syscall.Read directly.
+// sysReadFile is a simplified os.ReadFile that invokes syscall.Read directly.
 func sysReadFile(file string) ([]byte, error) {
 	f, err := os.Open(file)
 	if err != nil {
@@ -87,7 +86,7 @@ func sysReadFile(file string) ([]byte, error) {
 	defer f.Close()
 
 	// On some machines, hwmon drivers are broken and return EAGAIN.  This causes
-	// Go's ioutil.ReadFile implementation to poll forever.
+	// Go's os.ReadFile implementation to poll forever.
 	//
 	// Since we either want to read data or bail immediately, do the simplest
 	// possible read using system call directly.
@@ -128,7 +127,7 @@ func explodeSensorFilename(filename string) (ok bool, sensorType string, sensorN
 }
 
 func collectSensorData(dir string, data map[string]map[string]string) error {
-	sensorFiles, dirError := ioutil.ReadDir(dir)
+	sensorFiles, dirError := os.ReadDir(dir)
 	if dirError != nil {
 		return dirError
 	}
@@ -374,7 +373,7 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
 	}
 
 	// preference 2: is there a name file
-	sysnameRaw, nameErr := ioutil.ReadFile(filepath.Join(dir, "name"))
+	sysnameRaw, nameErr := os.ReadFile(filepath.Join(dir, "name"))
 	if nameErr == nil && string(sysnameRaw) != "" {
 		cleanName := cleanMetricName(string(sysnameRaw))
 		if cleanName != "" {
@@ -402,7 +401,7 @@ func (c *hwMonCollector) hwmonName(dir string) (string, error) {
 // hwmonHumanReadableChipName is similar to the methods in hwmonName, but with
 // different precedences -- we can allow duplicates here.
 func (c *hwMonCollector) hwmonHumanReadableChipName(dir string) (string, error) {
-	sysnameRaw, nameErr := ioutil.ReadFile(filepath.Join(dir, "name"))
+	sysnameRaw, nameErr := os.ReadFile(filepath.Join(dir, "name"))
 	if nameErr != nil {
 		return "", nameErr
 	}
@@ -423,7 +422,7 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
 
 	hwmonPathName := filepath.Join(sysFilePath("class"), "hwmon")
 
-	hwmonFiles, err := ioutil.ReadDir(hwmonPathName)
+	hwmonFiles, err := os.ReadDir(hwmonPathName)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 			level.Debug(c.logger).Log("msg", "hwmon collector metrics are not available for this system")
@@ -435,15 +434,16 @@ func (c *hwMonCollector) Update(ch chan<- prometheus.Metric) error {
 
 	for _, hwDir := range hwmonFiles {
 		hwmonXPathName := filepath.Join(hwmonPathName, hwDir.Name())
+		fileInfo, _ := os.Lstat(hwmonXPathName)
 
-		if hwDir.Mode()&os.ModeSymlink > 0 {
-			hwDir, err = os.Stat(hwmonXPathName)
+		if fileInfo.Mode()&os.ModeSymlink > 0 {
+			fileInfo, err = os.Stat(hwmonXPathName)
 			if err != nil {
 				continue
 			}
 		}
 
-		if !hwDir.IsDir() {
+		if !fileInfo.IsDir() {
 			continue
 		}
 

collector/ipvs_linux_test.go

@@ -16,9 +16,9 @@ package collector
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"strings"
 	"testing"
 
@@ -189,7 +189,7 @@ func TestIPVSCollectorResponse(t *testing.T) {
 			rw := httptest.NewRecorder()
 			promhttp.InstrumentMetricHandler(registry, promhttp.HandlerFor(registry, promhttp.HandlerOpts{})).ServeHTTP(rw, &http.Request{})
 
-			wantMetrics, err := ioutil.ReadFile(test.metricsFile)
+			wantMetrics, err := os.ReadFile(test.metricsFile)
 			if err != nil {
 				t.Fatalf("unable to read input test file %s: %s", test.metricsFile, err)
 			}

collector/loadavg_linux.go

@@ -18,14 +18,14 @@ package collector
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"strconv"
 	"strings"
 )
 
 // Read loadavg from /proc.
 func getLoad() (loads []float64, err error) {
-	data, err := ioutil.ReadFile(procFilePath("loadavg"))
+	data, err := os.ReadFile(procFilePath("loadavg"))
 	if err != nil {
 		return nil, err
 	}

collector/perf_linux_test.go

@@ -17,7 +17,7 @@
 package collector
 
 import (
-	"io/ioutil"
+	"os"
 	"runtime"
 	"strconv"
 	"strings"
@@ -29,7 +29,7 @@ import (
 )
 
 func canTestPerf(t *testing.T) {
-	paranoidBytes, err := ioutil.ReadFile("/proc/sys/kernel/perf_event_paranoid")
+	paranoidBytes, err := os.ReadFile("/proc/sys/kernel/perf_event_paranoid")
 	if err != nil {
 		t.Skip("Procfs not mounted, skipping perf tests")
 	}

collector/qdisc_linux.go

@@ -19,7 +19,7 @@ package collector
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 
 	"github.com/ema/qdisc"
@@ -100,7 +100,7 @@ func NewQdiscStatCollector(logger log.Logger) (Collector, error) {
 func testQdiscGet(fixtures string) ([]qdisc.QdiscInfo, error) {
 	var res []qdisc.QdiscInfo
 
-	b, err := ioutil.ReadFile(filepath.Join(fixtures, "results.json"))
+	b, err := os.ReadFile(filepath.Join(fixtures, "results.json"))
 	if err != nil {
 		return res, err
 	}

collector/textfile.go

@@ -18,7 +18,6 @@ package collector
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -196,13 +195,13 @@ func (c *textFileCollector) Update(ch chan<- prometheus.Metric) error {
 	paths, err := filepath.Glob(c.path)
 	if err != nil || len(paths) == 0 {
 		// not glob or not accessible path either way assume single
-		// directory and let ioutil.ReadDir handle it
+		// directory and let os.ReadDir handle it
 		paths = []string{c.path}
 	}
 
 	mtimes := make(map[string]time.Time)
 	for _, path := range paths {
-		files, err := ioutil.ReadDir(path)
+		files, err := os.ReadDir(path)
 		if err != nil && path != "" {
 			errored = true
 			level.Error(c.logger).Log("msg", "failed to read textfile collector directory", "path", path, "err", err)

collector/textfile_test.go

@@ -15,9 +15,9 @@ package collector
 
 import (
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 
 	"github.com/go-kit/log"
@@ -120,7 +120,7 @@ func TestTextfileCollector(t *testing.T) {
 		promhttp.HandlerFor(registry, promhttp.HandlerOpts{}).ServeHTTP(rw, &http.Request{})
 		got := string(rw.Body.String())
 
-		want, err := ioutil.ReadFile(test.out)
+		want, err := os.ReadFile(test.out)
 		if err != nil {
 			t.Fatalf("%d. error reading fixture file %s: %s", i, test.out, err)
 		}

collector/wifi_linux.go

@@ -20,7 +20,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -366,7 +365,7 @@ type mockWifiStater struct {
 }
 
 func (s *mockWifiStater) unmarshalJSONFile(filename string, v interface{}) error {
-	b, err := ioutil.ReadFile(filepath.Join(s.fixtures, filename))
+	b, err := os.ReadFile(filepath.Join(s.fixtures, filename))
 	if err != nil {
 		return err
 	}

node_exporter_test.go

@@ -15,7 +15,7 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"os/exec"
@@ -84,17 +84,17 @@ func TestHandlingOfDuplicatedMetrics(t *testing.T) {
 		t.Skipf("node_exporter binary not available, try to run `make build` first: %s", err)
 	}
 
-	dir, err := ioutil.TempDir("", "node-exporter")
+	dir, err := os.MkdirTemp("", "node-exporter")
 	if err != nil {
 		t.Fatal(err)
 	}
 	defer os.RemoveAll(dir)
 
 	content := []byte("dummy_metric 1\n")
-	if err := ioutil.WriteFile(filepath.Join(dir, "a.prom"), content, 0600); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "a.prom"), content, 0600); err != nil {
 		t.Fatal(err)
 	}
-	if err := ioutil.WriteFile(filepath.Join(dir, "b.prom"), content, 0600); err != nil {
+	if err := os.WriteFile(filepath.Join(dir, "b.prom"), content, 0600); err != nil {
 		t.Fatal(err)
 	}
 
@@ -113,7 +113,7 @@ func queryExporter(address string) error {
 	if err != nil {
 		return err
 	}
-	b, err := ioutil.ReadAll(resp.Body)
+	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}