fix(json_v2): use raw values for timestamps (#10413)

sspaink · web-flow · commit 18704de6eda5 · 2022-01-11T10:08:59.000-06:00
diff --git a/plugins/parsers/json_v2/parser.go b/plugins/parsers/json_v2/parser.go
@@ -119,7 +119,7 @@ func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {
 				}
 
 				var err error
-				p.timestamp, err = internal.ParseTimestamp(c.TimestampFormat, result.Value(), c.TimestampTimezone)
+				p.timestamp, err = internal.ParseTimestamp(c.TimestampFormat, result.Raw, c.TimestampTimezone)
 				if err != nil {
 					return nil, err
 				}
@@ -318,7 +318,7 @@ func (p *Parser) expandArray(result MetricNode) ([]telegraf.Metric, error) {
 				err := fmt.Errorf("use of 'timestamp_query' requires 'timestamp_format'")
 				return nil, err
 			}
-			timestamp, err := internal.ParseTimestamp(p.objectConfig.TimestampFormat, result.Value(), p.objectConfig.TimestampTimezone)
+			timestamp, err := internal.ParseTimestamp(p.objectConfig.TimestampFormat, result.Raw, p.objectConfig.TimestampTimezone)
 			if err != nil {
 				return nil, err
 			}
diff --git a/plugins/parsers/json_v2/parser_test.go b/plugins/parsers/json_v2/parser_test.go
@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"strings"
 	"testing"
+	"time"
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
@@ -47,7 +49,18 @@ func TestMultipleConfigs(t *testing.T) {
 			// Process expected metrics and compare with resulting metrics
 			expectedOutputs, err := readMetricFile(fmt.Sprintf("testdata/%s/expected.out", f.Name()))
 			require.NoError(t, err)
-			testutil.RequireMetricsEqual(t, expectedOutputs, acc.GetTelegrafMetrics(), testutil.IgnoreTime())
+			resultingMetrics := acc.GetTelegrafMetrics()
+			testutil.RequireMetricsEqual(t, expectedOutputs, resultingMetrics, testutil.IgnoreTime())
+
+			// Folder with timestamp prefixed will also check for matching timestamps to make sure they are parsed correctly
+			// The milliseconds weren't matching, seemed like a rounding difference between the influx parser
+			// Compares each metrics times separately and ignores milliseconds
+			if strings.HasPrefix(f.Name(), "timestamp") {
+				require.Equal(t, len(expectedOutputs), len(resultingMetrics))
+				for i, m := range resultingMetrics {
+					require.Equal(t, expectedOutputs[i].Time().Truncate(time.Second), m.Time().Truncate(time.Second))
+				}
+			}
 		})
 	}
 }
@@ -66,6 +79,8 @@ func readMetricFile(path string) ([]telegraf.Metric, error) {
 		line := scanner.Text()
 		if line != "" {
 			m, err := parser.ParseLine(line)
+			// The timezone needs to be UTC to match the timestamp test results
+			m.SetTime(m.Time().UTC())
 			if err != nil {
 				return nil, fmt.Errorf("unable to parse metric in %q failed: %v", line, err)
 			}
diff --git a/plugins/parsers/json_v2/testdata/timestamp_ns/expected.out b/plugins/parsers/json_v2/testdata/timestamp_ns/expected.out
@@ -0,0 +1,2 @@
+test value=0 1631202459121654321
+test value=1 1631202459121654321
diff --git a/plugins/parsers/json_v2/testdata/timestamp_ns/input.json b/plugins/parsers/json_v2/testdata/timestamp_ns/input.json
@@ -0,0 +1,7 @@
+{
+    "test": [
+        { "value": 0 },
+        { "value": 1 }
+    ],
+    "timestamp": 1631202459121654321
+}
diff --git a/plugins/parsers/json_v2/testdata/timestamp_ns/telegraf.conf b/plugins/parsers/json_v2/testdata/timestamp_ns/telegraf.conf
@@ -0,0 +1,11 @@
+# Example taken from: https://github.com/influxdata/telegraf/issues/5940
+
+[[inputs.file]]
+    files = ["./testdata/timestamp_ns/input.json"]
+    data_format = "json_v2"
+    [[inputs.file.json_v2]]
+        measurement_name = "test"
+        timestamp_path = "timestamp"
+        timestamp_format = "unix_ns"
+        [[inputs.file.json_v2.object]]
+            path = "test"

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (p *Parser) Parse(input []byte) ([]telegraf.Metric, error) {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`var err error`
`122`		`- p.timestamp, err = internal.ParseTimestamp(c.TimestampFormat, result.Value(), c.TimestampTimezone)`
	`122`	`+ p.timestamp, err = internal.ParseTimestamp(c.TimestampFormat, result.Raw, c.TimestampTimezone)`
`123`	`123`	`if err != nil {`
`124`	`124`	`return nil, err`
`125`	`125`	`}`
`@@ -318,7 +318,7 @@ func (p *Parser) expandArray(result MetricNode) ([]telegraf.Metric, error) {`
`318`	`318`	`err := fmt.Errorf("use of 'timestamp_query' requires 'timestamp_format'")`
`319`	`319`	`return nil, err`
`320`	`320`	`}`
`321`		`- timestamp, err := internal.ParseTimestamp(p.objectConfig.TimestampFormat, result.Value(), p.objectConfig.TimestampTimezone)`
	`321`	`+ timestamp, err := internal.ParseTimestamp(p.objectConfig.TimestampFormat, result.Raw, p.objectConfig.TimestampTimezone)`
`322`	`322`	`if err != nil {`
`323`	`323`	`return nil, err`
`324`	`324`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+test value=0 1631202459121654321`
	`2`	`+test value=1 1631202459121654321`