feat(btfhack): remove unused creator params & add dev args for flow p…

…robe Signed-off-by: xiayu.lyt <xiayu.lyt@alibaba-inc.com>
cloudonly · Oct 9, 2023 · 3a897c4 · 3a897c4
1 parent 57e059f
commit 3a897c4
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 35 deletions.
diff --git a/pkg/exporter/probe/flow/flow.go b/pkg/exporter/probe/flow/flow.go
@@ -32,16 +32,25 @@ const (
 )
 
 var (
-	dev       = "eth0"
 	probeName = "flow"
 )
 
 func init() {
 	probe.MustRegisterMetricsProbe(probeName, metricsProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
-	p := &metricsProbe{}
+type flowArgs struct {
+	Dev string
+}
+
+func metricsProbeCreator(args flowArgs) (probe.MetricsProbe, error) {
+	if args.Dev == "" {
+		args.Dev = "eth0"
+	}
+
+	p := &metricsProbe{
+		args: args,
+	}
 	opts := probe.BatchMetricsOpts{
 		Namespace:      probe.MetricsNamespace,
 		Subsystem:      probeName,
@@ -57,6 +66,7 @@ func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
 
 type metricsProbe struct {
 	bpfObjs bpfObjects
+	args    flowArgs
 }
 
 func (p *metricsProbe) Start(_ context.Context) error {
@@ -80,7 +90,7 @@ func (p *metricsProbe) Stop(_ context.Context) error {
 
 func (p *metricsProbe) cleanup() error {
 	//TODO only clean qdisc after replace qdisc successfully
-	link, err := netlink.LinkByName(dev)
+	link, err := netlink.LinkByName(p.args.Dev)
 	if err == nil {
 		_ = cleanQdisc(link)
 	}
@@ -203,15 +213,9 @@ func (p *metricsProbe) loadBPF() error {
 
 	opts := ebpf.CollectionOptions{}
 
-	//TODO 优化btf文件的查找方式
-	btf, err := bpfutil.LoadBTFFromFile("/sys/kernel/btf/vmlinux")
-	if err != nil {
-		panic(err)
-	}
-
 	opts.Programs = ebpf.ProgramOptions{
 		LogLevel:    ebpf.LogLevelInstruction | ebpf.LogLevelBranch | ebpf.LogLevelStats,
-		KernelTypes: btf,
+		KernelTypes: bpfutil.LoadBTFSpecOrNil(),
 	}
 
 	// Load pre-compiled programs and maps into the kernel.
@@ -222,17 +226,17 @@ func (p *metricsProbe) loadBPF() error {
 }
 
 func (p *metricsProbe) loadAndAttachBPF() error {
-	eth0, err := netlink.LinkByName(dev)
+	eth0, err := netlink.LinkByName(p.args.Dev)
 	if err != nil {
-		return fmt.Errorf("fail get link %s, err: %w", dev, err)
+		return fmt.Errorf("fail get link %s, err: %w", p.args.Dev, err)
 	}
 
 	if err := p.loadBPF(); err != nil {
 		return err
 	}
 
 	if err := p.setupTCFilter(eth0); err != nil {
-		return fmt.Errorf("failed replace %s qdisc with clsact, err: %v", dev, err)
+		return fmt.Errorf("failed replace %s qdisc with clsact, err: %v", p.args.Dev, err)
 	}
 	return nil
 }

diff --git a/pkg/exporter/probe/nlconntrack/conntrackevents.go b/pkg/exporter/probe/nlconntrack/conntrackevents.go
@@ -30,7 +30,7 @@ var (
 	probeName = "conntrack"
 )
 
-func eventProbeCreator(sink chan<- *probe.Event, _ map[string]interface{}) (probe.EventProbe, error) {
+func eventProbeCreator(sink chan<- *probe.Event) (probe.EventProbe, error) {
 	p := &conntrackEventProbe{
 		sink: sink,
 	}

diff --git a/pkg/exporter/probe/nlconntrack/conntrackmetrics.go b/pkg/exporter/probe/nlconntrack/conntrackmetrics.go
@@ -29,7 +29,7 @@ var (
 	conntrackMetrics = []string{Found, Invalid, Ignore, Insert, InsertFailed, Drop, EarlyDrop, Error, SearchRestart, Entries, MaxEntries}
 )
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &conntrackMetricsProbe{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, conntrackMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/nlqdisc/nlqdiscstats.go b/pkg/exporter/probe/nlqdisc/nlqdiscstats.go
@@ -59,7 +59,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, qdiscProbeCreator)
 }
 
-func qdiscProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func qdiscProbeCreator() (probe.MetricsProbe, error) {
 	p := &Probe{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, qdiscMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procfd/procfd.go b/pkg/exporter/probe/procfd/procfd.go
@@ -26,7 +26,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, fdProbeCreator)
 }
 
-func fdProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func fdProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcFD{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, FDMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procio/procio.go b/pkg/exporter/probe/procio/procio.go
@@ -30,7 +30,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, ioProbeCreator)
 }
 
-func ioProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func ioProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcIO{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, IOMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procipvs/ipvsservicestats.go b/pkg/exporter/probe/procipvs/ipvsservicestats.go
@@ -32,7 +32,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, ipvsProbeCreator)
 }
 
-func ipvsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func ipvsProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcIPVS{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, IPVSMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procnetdev/procnetdev.go b/pkg/exporter/probe/procnetdev/procnetdev.go
@@ -30,7 +30,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, netdevProbeCreator)
 }
 
-func netdevProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func netdevProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcNetdev{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, NetdevMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procnetstat/procnetstat.go b/pkg/exporter/probe/procnetstat/procnetstat.go
@@ -98,7 +98,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, netdevProbeCreator)
 }
 
-func netdevProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func netdevProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcNetstat{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, TCPExtMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procsnmp/procsnmp.go b/pkg/exporter/probe/procsnmp/procsnmp.go
@@ -86,8 +86,8 @@ func init() {
 	probe.MustRegisterMetricsProbe(IP, newSnmpProbeCreator(IP))
 }
 
-func newSnmpProbeCreator(probeName string) func(args map[string]interface{}) (probe.MetricsProbe, error) {
-	return func(args map[string]interface{}) (probe.MetricsProbe, error) {
+func newSnmpProbeCreator(probeName string) func() (probe.MetricsProbe, error) {
+	return func() (probe.MetricsProbe, error) {
 		p := &procSNMP{
 			name: probeName,
 		}

diff --git a/pkg/exporter/probe/procsock/procsock.go b/pkg/exporter/probe/procsock/procsock.go
@@ -36,7 +36,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, sockProbeCreator)
 }
 
-func sockProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func sockProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcSock{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, TCPSockStatMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/procsoftnet/procsoftnet.go b/pkg/exporter/probe/procsoftnet/procsoftnet.go
@@ -32,7 +32,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, softNetProbeCreator)
 }
 
-func softNetProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func softNetProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcSoftnet{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, softnetMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/proctcpsummary/proctcp.go b/pkg/exporter/probe/proctcpsummary/proctcp.go
@@ -76,7 +76,7 @@ func init() {
 	probe.MustRegisterMetricsProbe(probeName, softNetProbeCreator)
 }
 
-func softNetProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func softNetProbeCreator() (probe.MetricsProbe, error) {
 	p := &ProcTCP{}
 
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, TCPSummaryMetrics, p.CollectOnce)

diff --git a/pkg/exporter/probe/tracebiolatency/tracebiolatency.go b/pkg/exporter/probe/tracebiolatency/tracebiolatency.go
@@ -29,7 +29,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, bioLatencyProbeCreator)
 }
 
-func bioLatencyProbeCreator(sink chan<- *probe.Event, _ map[string]interface{}) (probe.EventProbe, error) {
+func bioLatencyProbeCreator(sink chan<- *probe.Event) (probe.EventProbe, error) {
 	p := &BiolatencyProbe{
 		sink: sink,
 	}

diff --git a/pkg/exporter/probe/tracekernel/tracekernel.go b/pkg/exporter/probe/tracekernel/tracekernel.go
@@ -62,7 +62,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &metricsProbe{}
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, metrics, p.CollectOnce)
 

diff --git a/pkg/exporter/probe/tracenetiftxlatency/tracenetiftxlatency.go b/pkg/exporter/probe/tracenetiftxlatency/tracenetiftxlatency.go
@@ -42,7 +42,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &metricsProbe{}
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, metrics, p.CollectOnce)
 

diff --git a/pkg/exporter/probe/tracenetsoftirq/tracenetsoftirq.go b/pkg/exporter/probe/tracenetsoftirq/tracenetsoftirq.go
@@ -41,7 +41,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &metricsProbe{}
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, metrics, p.CollectOnce)
 

diff --git a/pkg/exporter/probe/tracepacketloss/packetloss.go b/pkg/exporter/probe/tracepacketloss/packetloss.go
@@ -61,7 +61,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &metricsProbe{}
 	batchMetrics := probe.NewLegacyBatchMetricsWithUnderscore(probeName, packetLossMetrics, p.CollectOnce)
 

diff --git a/pkg/exporter/probe/tracesocketlatency/socketlatency.go b/pkg/exporter/probe/tracesocketlatency/socketlatency.go
@@ -66,7 +66,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
+func metricsProbeCreator() (probe.MetricsProbe, error) {
 	p := &metricsProbe{}
 	batchMetrics := probe.NewLegacyBatchMetrics(probeName, socketlatencyMetrics, p.CollectOnce)
 

diff --git a/pkg/exporter/probe/tracetcpreset/tracetcpreset.go b/pkg/exporter/probe/tracetcpreset/tracetcpreset.go
@@ -41,7 +41,7 @@ func init() {
 	probe.MustRegisterEventProbe(probeName, eventProbeCreator)
 }
 
-func eventProbeCreator(sink chan<- *probe.Event, _ map[string]interface{}) (probe.EventProbe, error) {
+func eventProbeCreator(sink chan<- *probe.Event) (probe.EventProbe, error) {
 	p := &tcpResetProbe{
 		sink: sink,
 	}

diff --git a/pkg/exporter/probe/tracevirtcmdlat/tracevirtcmdlat.go b/pkg/exporter/probe/tracevirtcmdlat/tracevirtcmdlat.go
@@ -49,7 +49,7 @@ func metricsProbeCreator(_ map[string]interface{}) (probe.MetricsProbe, error) {
 	return probe.NewMetricsProbe(probeName, p, batchMetrics), nil
 }
 
-func eventProbeCreator(sink chan<- *probe.Event, _ map[string]interface{}) (probe.EventProbe, error) {
+func eventProbeCreator(sink chan<- *probe.Event) (probe.EventProbe, error) {
 	p := &eventProbe{
 		sink: sink,
 	}