decoder v2: adapt metricset package tests (#4338)

part of #3551
elastic · Oct 27, 2020 · 5e45987 · 5e45987
1 parent 41b0314
commit 5e45987
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/processor/stream/package_tests/intake_test_processor.go b/processor/stream/package_tests/intake_test_processor.go
@@ -112,12 +112,8 @@ func (p *intakeTestProcessor) Decode(data interface{}) error {
 			var event model.Transaction
 			err = v2.DecodeNestedTransaction(d, &input, &event)
 		case "metricset":
-			var m map[string]interface{}
-			if err = d.Decode(&m); err != nil && err != io.EOF {
-				return err
-			}
-			input.Raw = m[eventType]
-			err = modeldecoder.DecodeMetricset(input, &model.Batch{})
+			var event model.Metricset
+			err = v2.DecodeNestedMetricset(d, &input, &event)
 		default:
 			return errors.New("root key required")
 		}

diff --git a/processor/stream/package_tests/metricset_attrs_test.go b/processor/stream/package_tests/metricset_attrs_test.go
@@ -46,7 +46,6 @@ func TestAttributesPresenceInMetric(t *testing.T) {
 		"service",
 		"metricset",
 		"metricset.samples",
-		"metricset.samples.+.value",
 	)
 	metricsetProcSetup().AttrsPresence(t, requiredKeys, nil)
 }
@@ -58,33 +57,29 @@ func TestInvalidPayloads(t *testing.T) {
 	validMetric := obj{"value": json.Number("1.0")}
 	payloadData := []tests.SchemaTestData{
 		{Key: "metricset.timestamp",
-			Valid: val{json.Number("1496170422281000")},
-			Invalid: []tests.Invalid{
-				{Msg: `timestamp/type`, Values: val{"1496170422281000"}}}},
+			Valid:   val{json.Number("1496170422281000")},
+			Invalid: []tests.Invalid{{Msg: `decode error`, Values: val{"1496170422281000"}}}},
 		{Key: "metricset.tags",
 			Valid: val{obj{tests.Str1024Special: tests.Str1024Special}, obj{tests.Str1024: 123.45}, obj{tests.Str1024: true}},
 			Invalid: []tests.Invalid{
-				{Msg: `tags/type`, Values: val{"tags"}},
-				{Msg: `tags/patternproperties`, Values: val{obj{"invalid": tests.Str1025}, obj{tests.Str1024: obj{}}}},
-				{Msg: `tags/additionalproperties`, Values: val{obj{"invali*d": "hello"}, obj{"invali\"d": "hello"}}}},
+				{Msg: `decode error`, Values: val{"tags"}},
+				{Msg: `validation error`, Values: val{obj{"invalid": tests.Str1025}, obj{tests.Str1024: obj{}}}},
+				{Msg: `validation error`, Values: val{obj{"invali*d": "hello"}, obj{"invali\"d": "hello"}}}},
 		},
 		{
-			Key: "metricset.samples",
-			Valid: val{
-				obj{"valid-metric": validMetric},
-			},
+			Key:   "metricset.samples",
+			Valid: val{obj{"valid-metric": validMetric}},
 			Invalid: []tests.Invalid{
 				{
-					Msg: "/properties/samples/additionalproperties",
+					Msg: `validation error`,
 					Values: val{
 						obj{"metric\"key\"_quotes": validMetric},
 						obj{"metric-*-key-star": validMetric},
 					},
 				},
 				{
-					Msg: "/properties/samples/patternproperties",
+					Msg: `decode error`,
 					Values: val{
-						obj{"nil-value": obj{"value": nil}},
 						obj{"string-value": obj{"value": "foo"}},
 					},
 				},