Rename Lnstats to NetStat

Signed-off-by: Aleksei Zakharov <zaharov@selectel.ru>
prometheus · Jul 16, 2021 · 062efc4 · 062efc4
1 parent b22b642
commit 062efc4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/lnstat.go → netstat.go b/lnstat.go → netstat.go
@@ -21,28 +21,28 @@ import (
 	"strings"
 )
 
-// Lnstats contains statistics for all the counters from one file
-type Lnstats struct {
+// NetStat contains statistics for all the counters from one file
+type NetStat struct {
 	Filename string
 	Stats    map[string][]uint64
 }
 
-// Lnstat() retrieves stats from /proc/net/stat/
-func (fs FS) Lnstat() ([]Lnstats, error) {
+// NetStat retrieves stats from /proc/net/stat/
+func (fs FS) NetStat() ([]NetStat, error) {
 	statFiles, err := filepath.Glob(fs.proc.Path("net/stat/*"))
 	if err != nil {
 		return nil, err
 	}
 
-	var lnstatsTotal []Lnstats
+	var netStatsTotal []NetStat
 
 	for _, filePath := range statFiles {
 		file, err := os.Open(filePath)
 		if err != nil {
 			return nil, err
 		}
 
-		lnstatFile := Lnstats{
+		netStatFile := NetStat{
 			Filename: filepath.Base(filePath),
 			Stats:    make(map[string][]uint64),
 		}
@@ -59,10 +59,10 @@ func (fs FS) Lnstat() ([]Lnstats, error) {
 				if err != nil {
 					return nil, err
 				}
-				lnstatFile.Stats[headers[num]] = append(lnstatFile.Stats[headers[num]], value)
+				netStatFile.Stats[headers[num]] = append(netStatFile.Stats[headers[num]], value)
 			}
 		}
-		lnstatsTotal = append(lnstatsTotal, lnstatFile)
+		netStatsTotal = append(netStatsTotal, netStatFile)
 	}
-	return lnstatsTotal, nil
+	return netStatsTotal, nil
 }
diff --git a/lnstat_test.go → netstat_test.go b/lnstat_test.go → netstat_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 )
 
-func TestLnstat(t *testing.T) {
+func TestNetStat(t *testing.T) {
 	const (
 		filesCount             = 2
 		CPUsCount              = 2
@@ -30,16 +30,16 @@ func TestLnstat(t *testing.T) {
 		t.Fatalf("failed to open procfs: %v", err)
 	}
 
-	lnstats, err := fs.Lnstat()
+	netStats, err := fs.NetStat()
 	if err != nil {
-		t.Fatalf("Lnstat() error: %s", err)
+		t.Fatalf("NetStat() error: %s", err)
 	}
 
-	if len(lnstats) != filesCount {
-		t.Fatalf("unexpected number of files parsed %d, expected %d", len(lnstats), filesCount)
+	if len(netStats) != filesCount {
+		t.Fatalf("unexpected number of files parsed %d, expected %d", len(netStats), filesCount)
 	}
 
-	expectedStats := [2]Lnstats{
+	expectedStats := [2]NetStat{
 		{
 			Filename: "arp_cache",
 			Stats:    make(map[string][]uint64),
@@ -83,28 +83,28 @@ func TestLnstat(t *testing.T) {
 		}
 	}
 
-	for _, lnstatFile := range lnstats {
-		if lnstatFile.Filename == "arp_cache" && len(lnstatFile.Stats) != arpCacheMetricsCount {
-			t.Fatalf("unexpected arp_cache metrics count %d, expected %d", len(lnstatFile.Stats), arpCacheMetricsCount)
+	for _, netStatFile := range netStats {
+		if netStatFile.Filename == "arp_cache" && len(netStatFile.Stats) != arpCacheMetricsCount {
+			t.Fatalf("unexpected arp_cache metrics count %d, expected %d", len(netStatFile.Stats), arpCacheMetricsCount)
 		}
-		if lnstatFile.Filename == "ndisc_cache" && len(lnstatFile.Stats) != ndiscCacheMetricsCount {
-			t.Fatalf("unexpected ndisc_cache metrics count %d, expected %d", len(lnstatFile.Stats), ndiscCacheMetricsCount)
+		if netStatFile.Filename == "ndisc_cache" && len(netStatFile.Stats) != ndiscCacheMetricsCount {
+			t.Fatalf("unexpected ndisc_cache metrics count %d, expected %d", len(netStatFile.Stats), ndiscCacheMetricsCount)
 		}
 		for _, expected := range expectedStats {
-			for header, stats := range lnstatFile.Stats {
+			for header, stats := range netStatFile.Stats {
 				if header == "" {
 					t.Fatalf("Found empty metric name")
 				}
 				if len(stats) != CPUsCount {
-					t.Fatalf("Lnstat parsed %d lines with metrics, expected %d", len(stats), CPUsCount)
+					t.Fatalf("NetStat() parsed %d lines with metrics, expected %d", len(stats), CPUsCount)
 				}
-				if lnstatFile.Filename == expected.Filename {
+				if netStatFile.Filename == expected.Filename {
 					if expected.Stats[header] == nil {
 						t.Fatalf("unexpected metric header: %s", header)
 					}
-					for cpu, value := range lnstatFile.Stats[header] {
+					for cpu, value := range netStatFile.Stats[header] {
 						if expected.Stats[header][cpu] != value {
-							t.Fatalf("unexpected value for %s for cpu %d in %s: %d, expected %d", header, cpu, lnstatFile.Filename, value, expected.Stats[header][cpu])
+							t.Fatalf("unexpected value for %s for cpu %d in %s: %d, expected %d", header, cpu, netStatFile.Filename, value, expected.Stats[header][cpu])
 						}
 					}
 				}