diff --git a/internal/common/common.go b/internal/common/common.go index 92f4a04..df71688 100644 --- a/internal/common/common.go +++ b/internal/common/common.go @@ -27,7 +27,7 @@ import ( var ( Timeout = 3 * time.Second - ErrTimeout = errors.New("Command timed out.") + ErrTimeout = errors.New("command timed out") ) type Invoker interface { diff --git a/net/net_darwin.go b/net/net_darwin.go index f1065c6..c60a004 100644 --- a/net/net_darwin.go +++ b/net/net_darwin.go @@ -18,7 +18,7 @@ var ( const endOfLine = "\n" -func parseNetstatLine(line string) (stat *IOCountersStat, linkId *uint, err error) { +func parseNetstatLine(line string) (stat *IOCountersStat, linkID *uint, err error) { var ( numericValue uint64 columns = strings.Fields(line) @@ -35,8 +35,8 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkId *uint, err erro if err != nil { return } - linkIdUint := uint(numericValue) - linkId = &linkIdUint + linkIDUint := uint(numericValue) + linkID = &linkIDUint } base := 1 @@ -91,7 +91,7 @@ func parseNetstatLine(line string) (stat *IOCountersStat, linkId *uint, err erro } type netstatInterface struct { - linkId *uint + linkID *uint stat *IOCountersStat } @@ -112,7 +112,7 @@ func parseNetstatOutput(output string) ([]netstatInterface, error) { for index := 0; index < numberInterfaces; index++ { nsIface := netstatInterface{} - if nsIface.stat, nsIface.linkId, err = parseNetstatLine(lines[index+1]); err != nil { + if nsIface.stat, nsIface.linkID, err = parseNetstatLine(lines[index+1]); err != nil { return nil, err } interfaces[index] = nsIface @@ -126,7 +126,7 @@ type mapInterfaceNameUsage map[string]uint func newMapInterfaceNameUsage(ifaces []netstatInterface) mapInterfaceNameUsage { output := make(mapInterfaceNameUsage) for index := range ifaces { - if ifaces[index].linkId != nil { + if ifaces[index].linkID != nil { ifaceName := ifaces[index].stat.Name usage, ok := output[ifaceName] if ok { @@ -192,7 +192,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) { if !ifaceUsage.isTruncated() { // no truncated interface name, return stats of all interface with for index := range nsInterfaces { - if nsInterfaces[index].linkId != nil { + if nsInterfaces[index].linkID != nil { ret[retIndex] = *nsInterfaces[index].stat retIndex++ } @@ -212,7 +212,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) { for _, interfaceName := range interfaceNames { truncated := true for index := range nsInterfaces { - if nsInterfaces[index].linkId != nil && nsInterfaces[index].stat.Name == interfaceName { + if nsInterfaces[index].linkID != nil && nsInterfaces[index].stat.Name == interfaceName { // handle the non truncated name to avoid execute netstat for them again ret[retIndex] = *nsInterfaces[index].stat retIndex++ @@ -234,7 +234,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) { continue } for index := range parsedIfaces { - if parsedIfaces[index].linkId != nil { + if parsedIfaces[index].linkID != nil { ret = append(ret, *parsedIfaces[index].stat) break } diff --git a/net/net_darwin_test.go b/net/net_darwin_test.go index be70a9b..e4c33bb 100644 --- a/net/net_darwin_test.go +++ b/net/net_darwin_test.go @@ -49,28 +49,28 @@ func assertLoopbackStat(t *testing.T, err error, stat *IOCountersStat) { } func TestparseNetstatLineLink(t *testing.T) { - stat, linkId, err := parseNetstatLine( + stat, linkID, err := parseNetstatLine( `lo0 16384 869107 0 169411755 869108 1 169411756 0 0`, ) assertLoopbackStat(t, err, stat) - assert.NotNil(t, linkId) - assert.Equal(t, uint(1), *linkId) + assert.NotNil(t, linkID) + assert.Equal(t, uint(1), *linkID) } func TestparseNetstatLineIPv6(t *testing.T) { - stat, linkId, err := parseNetstatLine( + stat, linkID, err := parseNetstatLine( `lo0 16384 ::1/128 ::1 869107 - 169411755 869108 1 169411756 - -`, ) assertLoopbackStat(t, err, stat) - assert.Nil(t, linkId) + assert.Nil(t, linkID) } func TestparseNetstatLineIPv4(t *testing.T) { - stat, linkId, err := parseNetstatLine( + stat, linkID, err := parseNetstatLine( `lo0 16384 127 127.0.0.1 869107 - 169411755 869108 1 169411756 - -`, ) assertLoopbackStat(t, err, stat) - assert.Nil(t, linkId) + assert.Nil(t, linkID) } func TestParseNetstatOutput(t *testing.T) { @@ -81,23 +81,23 @@ func TestParseNetstatOutput(t *testing.T) { assert.NotNil(t, nsInterfaces[index].stat, "Index %d", index) } - assert.NotNil(t, nsInterfaces[0].linkId) - assert.Equal(t, uint(1), *nsInterfaces[0].linkId) + assert.NotNil(t, nsInterfaces[0].linkID) + assert.Equal(t, uint(1), *nsInterfaces[0].linkID) - assert.Nil(t, nsInterfaces[1].linkId) - assert.Nil(t, nsInterfaces[2].linkId) - assert.Nil(t, nsInterfaces[3].linkId) + assert.Nil(t, nsInterfaces[1].linkID) + assert.Nil(t, nsInterfaces[2].linkID) + assert.Nil(t, nsInterfaces[3].linkID) - assert.NotNil(t, nsInterfaces[4].linkId) - assert.Equal(t, uint(2), *nsInterfaces[4].linkId) + assert.NotNil(t, nsInterfaces[4].linkID) + assert.Equal(t, uint(2), *nsInterfaces[4].linkID) - assert.NotNil(t, nsInterfaces[5].linkId) - assert.Equal(t, uint(3), *nsInterfaces[5].linkId) + assert.NotNil(t, nsInterfaces[5].linkID) + assert.Equal(t, uint(3), *nsInterfaces[5].linkID) - assert.NotNil(t, nsInterfaces[6].linkId) - assert.Equal(t, uint(4), *nsInterfaces[6].linkId) + assert.NotNil(t, nsInterfaces[6].linkID) + assert.Equal(t, uint(4), *nsInterfaces[6].linkID) - assert.Nil(t, nsInterfaces[7].linkId) + assert.Nil(t, nsInterfaces[7].linkID) mapUsage := newMapInterfaceNameUsage(nsInterfaces) assert.False(t, mapUsage.isTruncated()) @@ -114,24 +114,24 @@ func TestParseNetstatTruncated(t *testing.T) { const truncatedIface = "utun8" - assert.NotNil(t, nsInterfaces[6].linkId) - assert.Equal(t, uint(88), *nsInterfaces[6].linkId) + assert.NotNil(t, nsInterfaces[6].linkID) + assert.Equal(t, uint(88), *nsInterfaces[6].linkID) assert.Equal(t, truncatedIface, nsInterfaces[6].stat.Name) - assert.NotNil(t, nsInterfaces[7].linkId) - assert.Equal(t, uint(90), *nsInterfaces[7].linkId) + assert.NotNil(t, nsInterfaces[7].linkID) + assert.Equal(t, uint(90), *nsInterfaces[7].linkID) assert.Equal(t, truncatedIface, nsInterfaces[7].stat.Name) - assert.NotNil(t, nsInterfaces[8].linkId) - assert.Equal(t, uint(92), *nsInterfaces[8].linkId) + assert.NotNil(t, nsInterfaces[8].linkID) + assert.Equal(t, uint(92), *nsInterfaces[8].linkID) assert.Equal(t, truncatedIface, nsInterfaces[8].stat.Name) - assert.NotNil(t, nsInterfaces[9].linkId) - assert.Equal(t, uint(93), *nsInterfaces[9].linkId) + assert.NotNil(t, nsInterfaces[9].linkID) + assert.Equal(t, uint(93), *nsInterfaces[9].linkID) assert.Equal(t, truncatedIface, nsInterfaces[9].stat.Name) - assert.NotNil(t, nsInterfaces[10].linkId) - assert.Equal(t, uint(95), *nsInterfaces[10].linkId) + assert.NotNil(t, nsInterfaces[10].linkID) + assert.Equal(t, uint(95), *nsInterfaces[10].linkID) assert.Equal(t, truncatedIface, nsInterfaces[10].stat.Name) mapUsage := newMapInterfaceNameUsage(nsInterfaces) diff --git a/process/process_darwin.go b/process/process_darwin.go index 883c88b..ef92285 100644 --- a/process/process_darwin.go +++ b/process/process_darwin.go @@ -152,7 +152,7 @@ func (p *Process) CreateTime() (int64, error) { elapsedDurations = append(elapsedDurations, time.Duration(p)) } - var elapsed time.Duration = time.Duration(elapsedDurations[0]) * time.Second + var elapsed = time.Duration(elapsedDurations[0]) * time.Second if len(elapsedDurations) > 1 { elapsed += time.Duration(elapsedDurations[1]) * time.Minute }