Fix parseInt, add tests

Signed-off-by: Giacomo Licari <[email protected]>
prometheus-community · Nov 2, 2023 · a030979 · a030979
1 parent 077d972
commit a030979
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 19 deletions.
diff --git a/exporter/collector.go b/exporter/collector.go
@@ -65,22 +65,21 @@ func (mc JSONMetricCollector) Collect(ch chan<- prometheus.Metric) {
 					floatValue,
 					extractLabels(mc.Logger, mc.Data, m.LabelsJSONPaths)...,
 				)
+			} else {
+				intValue, err := SanitizeHexIntValue(value)
+				if err == nil {
+					ch <- prometheus.MustNewConstMetric(
+						m.Desc,
+						m.ValueType,
+						float64(intValue),
+						extractLabels(mc.Logger, mc.Data, m.LabelsJSONPaths)...,
+					)
+				} else {
+					level.Error(mc.Logger).Log("msg", "Failed to convert extracted value to float64", "path", m.KeyJSONPath, "value", value, "err", err, "metric", m.Desc)
+					continue
+				}
 			}
 
-			intValue, err := SanitizeHexIntValue(value)
-			if err == nil {
-				ch <- prometheus.MustNewConstMetric(
-					m.Desc,
-					prometheus.UntypedValue,
-					float64(intValue),
-					extractLabels(mc.Logger, mc.Data, m.LabelsJSONPaths)...,
-				)
-			}
-
-
-			level.Error(mc.Logger).Log("msg", "Failed to convert extracted value to float64", "path", m.KeyJSONPath, "value", value, "err", err, "metric", m.Desc)
-			continue
-
 		case config.ObjectScrape:
 			values, err := extractValue(mc.Logger, mc.Data, m.KeyJSONPath, true)
 			if err != nil {
@@ -102,7 +101,8 @@ func (mc JSONMetricCollector) Collect(ch chan<- prometheus.Metric) {
 						continue
 					}
 
-					if floatValue, err := SanitizeValue(value); err == nil {
+					floatValue, err := SanitizeValue(value)
+					if err == nil {
 						metric := prometheus.MustNewConstMetric(
 							m.Desc,
 							m.ValueType,
@@ -111,8 +111,18 @@ func (mc JSONMetricCollector) Collect(ch chan<- prometheus.Metric) {
 						)
 						ch <- timestampMetric(mc.Logger, m, jdata, metric)
 					} else {
-						level.Error(mc.Logger).Log("msg", "Failed to convert extracted value to float64", "path", m.ValueJSONPath, "value", value, "err", err, "metric", m.Desc)
-						continue
+						intValue, err := SanitizeHexIntValue(value)
+						if err == nil {
+							ch <- prometheus.MustNewConstMetric(
+								m.Desc,
+								m.ValueType,
+								float64(intValue),
+								extractLabels(mc.Logger, mc.Data, m.LabelsJSONPaths)...,
+							)
+						} else {
+							level.Error(mc.Logger).Log("msg", "Failed to convert extracted value to float64", "path", m.ValueJSONPath, "value", value, "err", err, "metric", m.Desc)
+							continue
+						}
 					}
 				}
 			} else {

diff --git a/exporter/util.go b/exporter/util.go
@@ -79,8 +79,11 @@ func SanitizeHexIntValue(s string) (int64, error) {
 	var value int64
 	var resultErr string
 
-	// Check if value is an hex integer, e.g. 0x1d54c54 => 30755924
-	if value, err = strconv.ParseInt(s, 16, 64); err == nil {
+ 	// remove 0x suffix if found in the input string
+ 	cleaned := strings.Replace(s, "0x", "", -1)
+	cleaned = strings.Replace(cleaned, "\"", "", -1)
+
+	if value, err = strconv.ParseInt(cleaned, 16, 64); err == nil {
 		return value, nil
 	}
 	resultErr = fmt.Sprintf("%s", err)

diff --git a/exporter/util_test.go b/exporter/util_test.go
@@ -48,6 +48,27 @@ func TestSanitizeValue(t *testing.T) {
 	}
 }
 
+func TestSanitizeValueHex(t *testing.T) {
+	tests := []struct {
+		Input          string
+		ExpectedOutput int64
+		ShouldSucceed  bool
+	}{
+		{"0x1d55195", 30757269, true},
+		{"\"0x1d55195\"", 30757269, true},
+	}
+
+	for i, test := range tests {
+		actualOutput, err := SanitizeHexIntValue(test.Input)
+		if err != nil && test.ShouldSucceed {
+			t.Fatalf("Value snitization test %d failed with an unexpected error.\nINPUT:\n%q\nERR:\n%s", i, test.Input, err)
+		}
+		if test.ShouldSucceed && actualOutput != test.ExpectedOutput {
+			t.Fatalf("Value sanitization test %d fails unexpectedly.\nGOT:\n%d\nEXPECTED:\n%d", i, actualOutput, test.ExpectedOutput)
+		}
+	}
+}
+
 func TestSanitizeValueNaN(t *testing.T) {
 	actualOutput, err := SanitizeValue("<nil>")
 	if err != nil {