collector: fix invalid memory address or nil pointer panic

github.com/gogo/protobuf/proto.makeOneOfMarshaler.func1 github.com/gogo/protobuf@v1.3.2/proto/table_marshal.go:2598
zperf · Nov 10, 2023 · c049108 · c049108
1 parent ce27300
commit c049108
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tcpmon/collector/net.go b/tcpmon/collector/net.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/cockroachdb/errors"
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/zperf/tcpmon/tcpmon/gproto"
 	"github.com/zperf/tcpmon/tcpmon/parsing"
@@ -35,6 +35,7 @@ func (m *NetstatCollector) Collect(now time.Time) ([]byte, error) {
 func (m *NetstatCollector) doCollect(now time.Time) (*gproto.NetstatMetric, error) {
 	var metric gproto.NetstatMetric
 	metric.Timestamp = now.Unix()
+	metric.Type = gproto.MetricType_NET
 
 	err := CollectProc("snmp", &metric)
 	if err != nil {

diff --git a/tcpmon/collector/nic.go b/tcpmon/collector/nic.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/cockroachdb/errors"
 	"github.com/go-cmd/cmd"
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/zperf/tcpmon/tcpmon/gproto"
 	"github.com/zperf/tcpmon/tcpmon/parsing"

diff --git a/tcpmon/collector/socket.go b/tcpmon/collector/socket.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/cockroachdb/errors"
 	"github.com/go-cmd/cmd"
-	"github.com/gogo/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"github.com/zperf/tcpmon/tcpmon/gproto"
 	"github.com/zperf/tcpmon/tcpmon/parsing"