Merge pull request #12 from williamchanrico/refactor_collector

Refactor variable names and function extraction

Author: williamchanrico

Makefile

@@ -3,7 +3,7 @@
 NAME          := planet-exporter
 BIN_DIRECTORY := ./bin
 REVISION      := $(shell git rev-parse --short HEAD 2>/dev/null)
-VERSION       := v0.1.1
+VERSION       := v0.2.0-dev
 
 ifndef REVISION
 	override REVISION = none

collector/task/darkstat/darkstat.go

@@ -111,47 +111,64 @@ func Collect(ctx context.Context) error {
 	ctxCollect, ctxCollectCancel := context.WithCancel(ctx)
 	defer ctxCollectCancel()
 
-	inventoryHosts := inventory.Get()
-
-	localAddr, err := network.DefaultLocalAddr()
-	if err != nil {
-		return err
-	}
-	// To label source traffic that we need to build dependency graph
-	localHostgroup := localAddr.String()
-	localDomain := localAddr.String()
-	localInventory, ok := inventoryHosts[localAddr.String()]
-	if ok {
-		localHostgroup = localInventory.Hostgroup
-		localDomain = localInventory.Domain
-	}
-	log.Debugf("Local address don't exist in inventory: %v", localAddr.String())
-
 	// Scrape darkstat prometheus endpoint for host_bytes_total
-	var darkstatHostBytesTotal *prom2json.Family
+	var darkstatHostBytesTotalMetric *prom2json.Family
 	darkstatScrape, err := singleton.prometheusClient.Scrape(ctxCollect, singleton.darkstatAddr)
 	if err != nil {
 		return err
 	}
 	for _, v := range darkstatScrape {
 		if v.Name == "host_bytes_total" {
-			darkstatHostBytesTotal = v
+			darkstatHostBytesTotalMetric = v
 			break
 		}
 	}
-	if darkstatHostBytesTotal == nil {
+	if darkstatHostBytesTotalMetric == nil {
 		return fmt.Errorf("Metric host_bytes_total doesn't exist")
 	}
 
 	// Extract relevant data out of host_bytes_total
+	hosts, err := toHostMetrics(darkstatHostBytesTotalMetric)
+	if err != nil {
+		return err
+	}
+
+	singleton.mu.Lock()
+	singleton.hosts = hosts
+	singleton.mu.Unlock()
+
+	log.Debugf("taskdarkstat.Collect retrieved %v downstreams metrics", len(hosts))
+	log.Debugf("taskdarkstat.Collect process took %v", time.Since(startTime))
+	return nil
+}
+
+// toHostMetrics converts darkstatHostBytesTotal metrics into planet explorer prometheus metrics.
+func toHostMetrics(darkstatHostBytesTotal *prom2json.Family) ([]Metric, error) {
 	var hosts []Metric
+
+	inventoryHosts := inventory.Get()
+
+	localAddr, err := network.DefaultLocalAddr()
+	if err != nil {
+		return nil, err
+	}
+	// To label source traffic that we need to build dependency graph
+	localHostgroup := localAddr.String()
+	localDomain := localAddr.String()
+	localInventory, ok := inventoryHosts[localAddr.String()]
+	if ok {
+		localHostgroup = localInventory.Hostgroup
+		localDomain = localInventory.Domain
+	}
+	log.Debugf("Local address don't exist in inventory: %v", localAddr.String())
+
 	for _, m := range darkstatHostBytesTotal.Metrics {
 		metric := m.(prom2json.Metric)
 
 		ip := net.ParseIP(metric.Labels["ip"])
 
 		// Skip its own IP as we don't need it
-		if ip.Equal(localAddr) {
+		if ip.Equal(nil) || ip.Equal(localAddr) {
 			continue
 		}
 
@@ -183,11 +200,5 @@ func Collect(ctx context.Context) error {
 		})
 	}
 
-	singleton.mu.Lock()
-	singleton.hosts = hosts
-	singleton.mu.Unlock()
-
-	log.Debugf("taskdarkstat.Collect retrieved %v downstreams metrics", len(hosts))
-	log.Debugf("taskdarkstat.Collect process took %v", time.Since(startTime))
-	return nil
+	return hosts, nil
 }

collector/task/ebpf/tcptop.go

@@ -49,10 +49,10 @@ var (
 )
 
 const (
-	send_bytes = "ebpf_exporter_ipv4_send_bytes"
-	recv_bytes = "ebpf_exporter_ipv4_recv_bytes"
-	ingress    = "ingress"
-	egress     = "egress"
+	sendBytes = "ebpf_exporter_ipv4_send_bytes"
+	recvBytes = "ebpf_exporter_ipv4_recv_bytes"
+	ingress   = "ingress"
+	egress    = "egress"
 )
 
 func init() {
@@ -125,33 +125,33 @@ func Collect(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	var send_bytes_metric *prom2json.Family
-	var recv_bytes_metric *prom2json.Family
+	var sendBytesMetric *prom2json.Family
+	var recvBytesMetric *prom2json.Family
 	for _, v := range ebpfScrape {
-		if v.Name == send_bytes {
-			send_bytes_metric = v
+		if v.Name == sendBytes {
+			sendBytesMetric = v
 		}
-		if v.Name == recv_bytes {
-			recv_bytes_metric = v
+		if v.Name == recvBytes {
+			recvBytesMetric = v
 		}
-		if send_bytes_metric != nil && recv_bytes_metric != nil {
+		if sendBytesMetric != nil && recvBytesMetric != nil {
 			break
 		}
 	}
-	if send_bytes_metric == nil {
-		return fmt.Errorf("Metric %v doesn't exist", send_bytes)
+	if sendBytesMetric == nil {
+		return fmt.Errorf("Metric %v doesn't exist", sendBytes)
 	}
-	if recv_bytes_metric == nil {
-		return fmt.Errorf("Metric %v doesn't exist", recv_bytes)
+	if recvBytesMetric == nil {
+		return fmt.Errorf("Metric %v doesn't exist", recvBytes)
 	}
 
-	sendHostBytes, err := toHostMetrics(send_bytes_metric, egress)
+	sendHostBytes, err := toHostMetrics(sendBytesMetric, egress)
 	if err != nil {
-		log.Errorf("Conversion to host metric failed for %v, err: %v", send_bytes, err)
+		log.Errorf("Conversion to host metric failed for %v, err: %v", sendBytes, err)
 	}
-	recvHostBytes, err := toHostMetrics(recv_bytes_metric, ingress)
+	recvHostBytes, err := toHostMetrics(recvBytesMetric, ingress)
 	if err != nil {
-		log.Errorf("Conversion to host metric failed for %v, err: %v", recv_bytes, err)
+		log.Errorf("Conversion to host metric failed for %v, err: %v", recvBytes, err)
 	}
 
 	singleton.mu.Lock()
@@ -164,7 +164,7 @@ func Collect(ctx context.Context) error {
 }
 
 // toHostMetrics converts ebpf metrics into planet explorer prometheus metrics.
-func toHostMetrics(bytes_metric *prom2json.Family, direction string) ([]Metric, error) {
+func toHostMetrics(bytesMetric *prom2json.Family, direction string) ([]Metric, error) {
 	var hosts []Metric
 	inventoryHosts := inventory.Get()
 
@@ -183,11 +183,11 @@ func toHostMetrics(bytes_metric *prom2json.Family, direction string) ([]Metric,
 	}
 	log.Debugf("Local address doesn't exist in the inventory: %v", localAddr.String())
 
-	for _, m := range bytes_metric.Metrics {
+	for _, m := range bytesMetric.Metrics {
 		metric := m.(prom2json.Metric)
-		destIp := net.ParseIP(metric.Labels["daddr"])
+		destIP := net.ParseIP(metric.Labels["daddr"])
 
-		if destIp.Equal(localAddr) || destIp.Equal(nil) {
+		if destIP.Equal(nil) || destIP.Equal(localAddr) {
 			continue
 		}