Float and log processing (#189)

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>

Author: anders-swanson

collector/collector.go

@@ -290,15 +290,15 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric, tick *time.Time) {
 					e.logger.Error("Error scraping metric",
 						"Context", metric.Context,
 						"MetricsDesc", fmt.Sprint(metric.MetricsDesc),
-						"time", time.Since(scrapeStart),
+						"duration", time.Since(scrapeStart),
 						"error", scrapeError)
 				}
 				e.scrapeErrors.WithLabelValues(metric.Context).Inc()
 			} else {
 				e.logger.Debug("Successfully scraped metric",
 					"Context", metric.Context,
 					"MetricDesc", fmt.Sprint(metric.MetricsDesc),
-					"time", time.Since(scrapeStart))
+					"duration", time.Since(scrapeStart))
 			}
 		}()
 	}
@@ -500,11 +500,9 @@ func (e *Exporter) scrapeGenericValues(db *sql.DB, ch chan<- prometheus.Metric,
 		}
 		// Construct Prometheus values to sent back
 		for metric, metricHelp := range metricsDesc {
-			value, err := strconv.ParseFloat(strings.TrimSpace(row[metric]), 64)
-			// If not a float, skip current metric
-			if err != nil {
-				e.logger.Error("Unable to convert current value to float (metric=" + metric +
-					",metricHelp=" + metricHelp + ",value=<" + row[metric] + ">)")
+			value, ok := e.parseFloat(metric, metricHelp, row)
+			if !ok {
+				// Skip invalid metric values
 				continue
 			}
 			e.logger.Debug("Query result",

collector/metrics.go

@@ -5,6 +5,7 @@ package collector
 
 import (
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -52,10 +53,11 @@ func (e *Exporter) getQueryTimeout(metric Metric) time.Duration {
 
 func (e *Exporter) parseFloat(metric, metricHelp string, row map[string]string) (float64, bool) {
 	value, ok := row[metric]
-	if !ok {
-		return -1, ok
+	if !ok || value == "<nil>" {
+		// treat nil value as 0
+		return 0.0, ok
 	}
-	valueFloat, err := strconv.ParseFloat(value, 64)
+	valueFloat, err := strconv.ParseFloat(strings.TrimSpace(value), 64)
 	if err != nil {
 		e.logger.Error("Unable to convert current value to float (metric=" + metric +
 			",metricHelp=" + metricHelp + ",value=<" + row[metric] + ">)")