Merge pull request #134 from xiaoziv/input-code-refactor

input code refactor
flashcatcloud · Aug 1, 2022 · e964b15 · e964b15
2 parents 89248e4 + 13cc06e
commit e964b15
Show file tree

Hide file tree

Showing 43 changed files with 50 additions and 200 deletions.
diff --git a/agent/metrics_agent.go b/agent/metrics_agent.go
@@ -56,33 +56,28 @@ func (a *Agent) startMetricsAgent() error {
 			continue
 		}
 
-		if err = input.Init(); err != nil {
+		if err = inputs.MayInit(input); err != nil {
 			if !errors.Is(err, types.ErrInstancesEmpty) {
 				log.Println("E! failed to init input:", name, "error:", err)
 			}
 			continue
 		}
 
-		if input.GetInstances() != nil {
-			instances := input.GetInstances()
-			if len(instances) == 0 {
-				continue
-			}
-
+		instances := inputs.MayGetInstances(input)
+		if instances != nil {
 			empty := true
 			for i := 0; i < len(instances); i++ {
 				if err := instances[i].InitInternalConfig(); err != nil {
 					log.Println("E! failed to init input:", name, "error:", err)
 					continue
 				}
 
-				if err := instances[i].Init(); err != nil {
+				if err := inputs.MayInit(instances[i]); err != nil {
 					if !errors.Is(err, types.ErrInstancesEmpty) {
 						log.Println("E! failed to init input:", name, "error:", err)
 					}
 					continue
 				}
-
 				empty = false
 			}
 

diff --git a/agent/metrics_reader.go b/agent/metrics_reader.go
@@ -41,7 +41,7 @@ func NewInputReader(inputName string, in inputs.Input) *InputReader {
 
 func (r *InputReader) Stop() {
 	r.quitChan <- struct{}{}
-	r.input.Drop()
+	inputs.MayDrop(r.input)
 }
 
 func (r *InputReader) startInput() {
@@ -82,10 +82,10 @@ func (r *InputReader) gatherOnce() {
 
 	// plugin level, for system plugins
 	slist := types.NewSampleList()
-	r.input.Gather(slist)
+	inputs.MayGather(r.input, slist)
 	r.forward(r.input.Process(slist))
 
-	instances := r.input.GetInstances()
+	instances := inputs.MayGetInstances(r.input)
 	if len(instances) == 0 {
 		return
 	}
@@ -106,7 +106,7 @@ func (r *InputReader) gatherOnce() {
 			}
 
 			insList := types.NewSampleList()
-			ins.Gather(insList)
+			inputs.MayGather(ins, insList)
 			r.forward(ins.Process(insList))
 		}(instances[i])
 	}

diff --git a/inputs/conntrack/conntrack.go b/inputs/conntrack/conntrack.go
@@ -40,11 +40,6 @@ func init() {
 	})
 }
 
-// just placeholder
-func (c *Conntrack) GetInstances() []inputs.Instance {
-	return nil
-}
-
 func (c *Conntrack) setDefaults() {
 	if len(c.Dirs) == 0 {
 		c.Dirs = dfltDirs
@@ -60,8 +55,6 @@ func (c *Conntrack) Init() error {
 	return nil
 }
 
-func (c *Conntrack) Drop() {}
-
 func (c *Conntrack) Gather(slist *types.SampleList) {
 	var metricKey string
 	fields := make(map[string]interface{})

diff --git a/inputs/cpu/cpu.go b/inputs/cpu/cpu.go
@@ -28,10 +28,6 @@ func init() {
 	})
 }
 
-func (c *CPUStats) Init() error                     { return nil }
-func (c *CPUStats) Drop()                           {}
-func (c *CPUStats) GetInstances() []inputs.Instance { return nil }
-
 func (c *CPUStats) Gather(slist *types.SampleList) {
 	times, err := c.ps.CPUTimes(c.CollectPerCPU, true)
 	if err != nil {

diff --git a/inputs/disk/disk.go b/inputs/disk/disk.go
@@ -29,18 +29,6 @@ func init() {
 	})
 }
 
-// just placeholder
-func (s *DiskStats) GetInstances() []inputs.Instance {
-	return nil
-}
-
-func (s *DiskStats) Init() error {
-	return nil
-}
-
-func (s *DiskStats) Drop() {
-}
-
 func (s *DiskStats) Gather(slist *types.SampleList) {
 	disks, partitions, err := s.ps.DiskUsage(s.MountPoints, s.IgnoreFS)
 	if err != nil {

diff --git a/inputs/diskio/diskio.go b/inputs/diskio/diskio.go
@@ -28,13 +28,6 @@ func init() {
 	})
 }
 
-// just placeholder
-func (d *DiskIO) GetInstances() []inputs.Instance {
-	return nil
-}
-
-func (d *DiskIO) Drop() {}
-
 func (d *DiskIO) Init() error {
 	for _, device := range d.Devices {
 		if filter.HasMeta(device) {

diff --git a/inputs/dns_query/dns_query.go b/inputs/dns_query/dns_query.go
@@ -34,10 +34,6 @@ func init() {
 	})
 }
 
-func (dq *DnsQuery) Init() error                    { return nil }
-func (dq *DnsQuery) Drop()                          {}
-func (dq *DnsQuery) Gather(slist *types.SampleList) {}
-
 func (dq *DnsQuery) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(dq.Instances))
 	for i := 0; i < len(dq.Instances); i++ {

diff --git a/inputs/docker/docker.go b/inputs/docker/docker.go
@@ -50,10 +50,6 @@ func init() {
 	})
 }
 
-func (d *Docker) Init() error                     { return nil }
-func (d *Docker) Drop()                           {}
-func (d *Docker) Gather(slist *itypes.SampleList) {}
-
 func (d *Docker) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(d.Instances))
 	for i := 0; i < len(d.Instances); i++ {

diff --git a/inputs/elasticsearch/elasticsearch.go b/inputs/elasticsearch/elasticsearch.go
@@ -94,10 +94,6 @@ func init() {
 	})
 }
 
-func (r *Elasticsearch) Init() error                    { return nil }
-func (r *Elasticsearch) Drop()                          {}
-func (r *Elasticsearch) Gather(slist *types.SampleList) {}
-
 func (r *Elasticsearch) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(r.Instances))
 	for i := 0; i < len(r.Instances); i++ {

diff --git a/inputs/exec/exec.go b/inputs/exec/exec.go
@@ -45,10 +45,6 @@ func init() {
 	})
 }
 
-func (e *Exec) Init() error                    { return nil }
-func (e *Exec) Drop()                          {}
-func (e *Exec) Gather(slist *types.SampleList) {}
-
 func (e *Exec) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(e.Instances))
 	for i := 0; i < len(e.Instances); i++ {

diff --git a/inputs/http_response/http_response.go b/inputs/http_response/http_response.go
@@ -145,10 +145,6 @@ func init() {
 	})
 }
 
-func (h *HTTPResponse) Init() error                    { return nil }
-func (h *HTTPResponse) Drop()                          {}
-func (h *HTTPResponse) Gather(slist *types.SampleList) {}
-
 func (h *HTTPResponse) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(h.Instances))
 	for i := 0; i < len(h.Instances); i++ {

diff --git a/inputs/inputs.go b/inputs/inputs.go
@@ -5,16 +5,53 @@ import (
 	"flashcat.cloud/categraf/types"
 )
 
+type Initializer interface {
+	Init() error
+}
+
+type SampleGatherer interface {
+	Gather(*types.SampleList)
+}
+
+type Dropper interface {
+	Drop()
+}
+
+type InstancesGetter interface {
+	GetInstances() []Instance
+}
+
+func MayInit(t interface{}) error {
+	if initializer, ok := t.(Initializer); ok {
+		return initializer.Init()
+	}
+	return nil
+}
+
+func MayGather(t interface{}, slist *types.SampleList) {
+	if gather, ok := t.(SampleGatherer); ok {
+		gather.Gather(slist)
+	}
+}
+
+func MayDrop(t interface{}) {
+	if dropper, ok := t.(Dropper); ok {
+		dropper.Drop()
+	}
+}
+
+func MayGetInstances(t interface{}) []Instance {
+	if instancesGetter, ok := t.(InstancesGetter); ok {
+		return instancesGetter.GetInstances()
+	}
+	return nil
+}
+
 type Input interface {
 	GetLabels() map[string]string
 	GetInterval() config.Duration
 	InitInternalConfig() error
 	Process(*types.SampleList) *types.SampleList
-
-	Init() error
-	Drop()
-	Gather(*types.SampleList)
-	GetInstances() []Instance
 }
 
 type Creator func() Input
@@ -30,7 +67,4 @@ type Instance interface {
 	GetIntervalTimes() int64
 	InitInternalConfig() error
 	Process(*types.SampleList) *types.SampleList
-
-	Init() error
-	Gather(*types.SampleList)
 }
diff --git a/inputs/jolokia_agent/jolokia_agent.go b/inputs/jolokia_agent/jolokia_agent.go
@@ -26,10 +26,6 @@ func init() {
 	})
 }
 
-func (r *JolokiaAgent) Init() error                    { return nil }
-func (r *JolokiaAgent) Drop()                          {}
-func (r *JolokiaAgent) Gather(slist *types.SampleList) {}
-
 func (r *JolokiaAgent) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(r.Instances))
 	for i := 0; i < len(r.Instances); i++ {

diff --git a/inputs/jolokia_proxy/jolokia_proxy.go b/inputs/jolokia_proxy/jolokia_proxy.go
@@ -25,10 +25,6 @@ func init() {
 	})
 }
 
-func (r *JolokiaProxy) Init() error                    { return nil }
-func (r *JolokiaProxy) Drop()                          {}
-func (r *JolokiaProxy) Gather(slist *types.SampleList) {}
-
 func (r *JolokiaProxy) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(r.Instances))
 	for i := 0; i < len(r.Instances); i++ {

diff --git a/inputs/kafka/kafka.go b/inputs/kafka/kafka.go
@@ -28,9 +28,6 @@ func init() {
 	})
 }
 
-func (r *Kafka) Init() error                    { return nil }
-func (r *Kafka) Gather(slist *types.SampleList) {}
-
 func (r *Kafka) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(r.Instances))
 	for i := 0; i < len(r.Instances); i++ {

diff --git a/inputs/kernel/kernel.go b/inputs/kernel/kernel.go
@@ -43,10 +43,6 @@ func init() {
 	})
 }
 
-func (s *KernelStats) Init() error                     { return nil }
-func (s *KernelStats) Drop()                           {}
-func (s *KernelStats) GetInstances() []inputs.Instance { return nil }
-
 func (s *KernelStats) Gather(slist *types.SampleList) {
 	data, err := s.getProcStat()
 	if err != nil {

diff --git a/inputs/kernel_vmstat/kernel_vmstat.go b/inputs/kernel_vmstat/kernel_vmstat.go
@@ -32,10 +32,6 @@ func init() {
 	})
 }
 
-func (s *KernelVmstat) Init() error                     { return nil }
-func (s *KernelVmstat) Drop()                           {}
-func (s *KernelVmstat) GetInstances() []inputs.Instance { return nil }
-
 func (s *KernelVmstat) Gather(slist *types.SampleList) {
 	data, err := s.getProcVmstat()
 	if err != nil {

diff --git a/inputs/kubernetes/kubernetes.go b/inputs/kubernetes/kubernetes.go
@@ -32,10 +32,6 @@ func init() {
 	})
 }
 
-func (k *Kubernetes) Init() error                    { return nil }
-func (k *Kubernetes) Drop()                          {}
-func (k *Kubernetes) Gather(slist *types.SampleList) {}
-
 func (k *Kubernetes) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(k.Instances))
 	for i := 0; i < len(k.Instances); i++ {

diff --git a/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go b/inputs/linux_sysctl_fs/linux_sysctl_fs_linux.go
@@ -33,10 +33,6 @@ func init() {
 	})
 }
 
-func (s *SysctlFS) Init() error                     { return nil }
-func (s *SysctlFS) Drop()                           {}
-func (s *SysctlFS) GetInstances() []inputs.Instance { return nil }
-
 func (s *SysctlFS) Gather(slist *types.SampleList) {
 	fields := map[string]interface{}{}
 

diff --git a/inputs/logstash/logstash.go b/inputs/logstash/logstash.go
@@ -31,10 +31,6 @@ func init() {
 	})
 }
 
-func (l *Logstash) Init() error                    { return nil }
-func (l *Logstash) Drop()                          {}
-func (l *Logstash) Gather(slist *types.SampleList) {}
-
 func (l *Logstash) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(l.Instances))
 	for i := 0; i < len(l.Instances); i++ {

diff --git a/inputs/mem/mem.go b/inputs/mem/mem.go
@@ -28,10 +28,6 @@ func init() {
 	})
 }
 
-func (s *MemStats) Init() error                     { return nil }
-func (s *MemStats) Drop()                           {}
-func (s *MemStats) GetInstances() []inputs.Instance { return nil }
-
 func (s *MemStats) Gather(slist *types.SampleList) {
 	vm, err := s.ps.VMStat()
 	if err != nil {

diff --git a/inputs/mongodb/mongodb.go b/inputs/mongodb/mongodb.go
@@ -24,9 +24,6 @@ func init() {
 	})
 }
 
-func (r *MongoDB) Init() error                    { return nil }
-func (r *MongoDB) Gather(slist *types.SampleList) {}
-
 func (r *MongoDB) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(r.Instances))
 	for i := 0; i < len(r.Instances); i++ {

diff --git a/inputs/mysql/mysql.go b/inputs/mysql/mysql.go
@@ -158,10 +158,6 @@ func init() {
 	})
 }
 
-func (m *MySQL) Init() error                    { return nil }
-func (m *MySQL) Drop()                          {}
-func (m *MySQL) Gather(slist *types.SampleList) {}
-
 func (m *MySQL) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(m.Instances))
 	for i := 0; i < len(m.Instances); i++ {

diff --git a/inputs/net/net.go b/inputs/net/net.go
@@ -33,9 +33,6 @@ func init() {
 	})
 }
 
-func (s *NetIOStats) Drop()                           {}
-func (s *NetIOStats) GetInstances() []inputs.Instance { return nil }
-
 func (s *NetIOStats) Init() error {
 	var err error
 

diff --git a/inputs/net_response/net_response.go b/inputs/net_response/net_response.go
@@ -93,10 +93,6 @@ func init() {
 	})
 }
 
-func (n *NetResponse) Init() error                    { return nil }
-func (n *NetResponse) Drop()                          {}
-func (n *NetResponse) Gather(slist *types.SampleList) {}
-
 func (n *NetResponse) GetInstances() []inputs.Instance {
 	ret := make([]inputs.Instance, len(n.Instances))
 	for i := 0; i < len(n.Instances); i++ {