Change default value of 'parse_to' to 'attributes' (#463)

* Change default value of 'parse_to' to 'attributes' * Fix tests in recently added operator
Shopify · Apr 6, 2022 · 4672c7f · 4672c7f
1 parent 708e313
commit 4672c7f
Show file tree

Hide file tree

Showing 10 changed files with 517 additions and 357 deletions.
diff --git a/operator/helper/parser.go b/operator/helper/parser.go
@@ -28,7 +28,7 @@ func NewParserConfig(operatorID, operatorType string) ParserConfig {
 	return ParserConfig{
 		TransformerConfig: NewTransformerConfig(operatorID, operatorType),
 		ParseFrom:         entry.NewBodyField(),
-		ParseTo:           entry.NewBodyField(),
+		ParseTo:           entry.NewAttributeField(),
 		PreserveTo:        nil,
 	}
 }

diff --git a/operator/helper/parser_test.go b/operator/helper/parser_test.go
@@ -491,9 +491,11 @@ func TestParserFields(t *testing.T) {
 				e := entry.New()
 				e.ObservedTimestamp = now
 				e.Body = map[string]interface{}{
-					"key": "value",
 					"one": map[string]interface{}{},
 				}
+				e.Attributes = map[string]interface{}{
+					"key": "value",
+				}
 				return e
 			},
 		},
@@ -515,10 +517,8 @@ func TestParserFields(t *testing.T) {
 			func() *entry.Entry {
 				e := entry.New()
 				e.ObservedTimestamp = now
-				e.Body = map[string]interface{}{
-					"key": "value",
-				}
 				e.Attributes = map[string]interface{}{
+					"key": "value",
 					"one": map[string]interface{}{},
 				}
 				return e
@@ -542,7 +542,7 @@ func TestParserFields(t *testing.T) {
 			func() *entry.Entry {
 				e := entry.New()
 				e.ObservedTimestamp = now
-				e.Body = map[string]interface{}{
+				e.Attributes = map[string]interface{}{
 					"key": "value",
 				}
 				e.Resource = map[string]interface{}{
@@ -596,7 +596,7 @@ func TestParserFields(t *testing.T) {
 			func() *entry.Entry {
 				e := entry.New()
 				e.ObservedTimestamp = now
-				e.Body = map[string]interface{}{"key": "value"}
+				e.Attributes = map[string]interface{}{"key": "value"}
 				return e
 			},
 		},
@@ -616,16 +616,18 @@ func TestParserFields(t *testing.T) {
 				e := entry.New()
 				e.ObservedTimestamp = now
 				e.Body = map[string]interface{}{
-					"key":      "value",
 					"original": keyValue,
 				}
+				e.Attributes = map[string]interface{}{
+					"key": "value",
+				}
 				return e
 			},
 		},
 		{
 			"PreserveToOverwrite",
 			func(cfg *ParserConfig) {
-				dst := entry.NewBodyField("key")
+				dst := entry.NewAttributeField("key")
 				cfg.PreserveTo = &dst
 			},
 			func() *entry.Entry {
@@ -637,7 +639,7 @@ func TestParserFields(t *testing.T) {
 			func() *entry.Entry {
 				e := entry.New()
 				e.ObservedTimestamp = now
-				e.Body = map[string]interface{}{
+				e.Attributes = map[string]interface{}{
 					"key": keyValue,
 				}
 				return e
@@ -659,6 +661,9 @@ func TestParserFields(t *testing.T) {
 				e := entry.New()
 				e.ObservedTimestamp = now
 				e.Body = keyValue
+				e.Attributes = map[string]interface{}{
+					"key": "value",
+				}
 				return e
 			},
 		},
@@ -682,7 +687,9 @@ func TestParserFields(t *testing.T) {
 				e.ObservedTimestamp = now
 				e.Body = map[string]interface{}{
 					"source": keyValue,
-					"key":    "value",
+				}
+				e.Attributes = map[string]interface{}{
+					"key": "value",
 				}
 				return e
 			},

diff --git a/operator/input/syslog/syslog_test.go b/operator/input/syslog/syslog_test.go
@@ -72,10 +72,10 @@ func SyslogInputTest(t *testing.T, cfg *SyslogInputConfig, tc syslog.Case) {
 		require.NoError(t, err)
 	}
 
-	if v, ok := tc.InputBody.(string); ok {
+	if v, ok := tc.Input.Body.(string); ok {
 		_, err = conn.Write([]byte(v))
 	} else {
-		_, err = conn.Write(tc.InputBody.([]byte))
+		_, err = conn.Write(tc.Input.Body.([]byte))
 	}
 
 	conn.Close()
@@ -85,10 +85,10 @@ func SyslogInputTest(t *testing.T, cfg *SyslogInputConfig, tc syslog.Case) {
 	select {
 	case e := <-fake.Received:
 		// close pipeline to avoid data race
-		require.Equal(t, tc.ExpectedBody, e.Body)
-		require.Equal(t, tc.ExpectedTimestamp, e.Timestamp)
-		require.Equal(t, tc.ExpectedSeverity, e.Severity)
-		require.Equal(t, tc.ExpectedSeverityText, e.SeverityText)
+		ots := time.Now()
+		e.ObservedTimestamp = ots
+		tc.Expect.ObservedTimestamp = ots
+		require.Equal(t, tc.Expect, e)
 	case <-time.After(time.Second):
 		require.FailNow(t, "Timed out waiting for entry to be processed")
 	}