Merge pull request #264 from xiaoziv/fix_netstat_compile_bug

fix netstat compile bug
flashcatcloud · Nov 22, 2022 · 63177f0 · 63177f0
2 parents 999b32b + 0d65cc0
commit 63177f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/go.mod b/go.mod
@@ -84,8 +84,8 @@ require (
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
 	github.com/jackc/pgtype v1.12.0 // indirect
 )
-require github.com/vmware/govmomi v0.29.0 // indirect
 
+require github.com/vmware/govmomi v0.29.0
 
 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc
 

diff --git a/inputs/netstat/ext_linux.go b/inputs/netstat/ext_linux.go
@@ -5,10 +5,13 @@ package netstat
 
 import (
 	"bufio"
+	"bytes"
 	"fmt"
 	"io"
 	"strconv"
 	"strings"
+
+	"github.com/toolkits/pkg/file"
 )
 
 // Copyright 2022 The Prometheus Authors
@@ -28,7 +31,7 @@ func (p Proc) Netstat() (*ProcNetstat, error) {
 	filename := p.path("net/netstat")
 	data, err := file.ReadBytes(filename)
 	if err != nil {
-		return ProcNetstat{PID: p.PID}, err
+		return nil, err
 	}
 	procNetstat, err := parseNetstat(bytes.NewReader(data), filename)
 	procNetstat.PID = p.PID