Fix unit tests and linter

grafana · Oct 2, 2023 · 4bae072 · 4bae072
1 parent 129652a
commit 4bae072
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/component/all/all.go b/component/all/all.go
@@ -81,6 +81,7 @@ import (
 	_ "github.com/grafana/agent/component/otelcol/processor/probabilistic_sampler"  // Import otelcol.processor.probabilistic_sampler
 	_ "github.com/grafana/agent/component/otelcol/processor/span"                   // Import otelcol.processor.span
 	_ "github.com/grafana/agent/component/otelcol/processor/tail_sampling"          // Import otelcol.processor.tail_sampling
+	_ "github.com/grafana/agent/component/otelcol/processor/transform"              // Import otelcol.processor.transform
 	_ "github.com/grafana/agent/component/otelcol/receiver/jaeger"                  // Import otelcol.receiver.jaeger
 	_ "github.com/grafana/agent/component/otelcol/receiver/kafka"                   // Import otelcol.receiver.kafka
 	_ "github.com/grafana/agent/component/otelcol/receiver/loki"                    // Import otelcol.receiver.loki

diff --git a/component/otelcol/processor/transform/transform_test.go b/component/otelcol/processor/transform/transform_test.go
@@ -431,7 +431,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `unable to parse OTTL statement: 1:18: unexpected token "where" (expected ")" Key*)`,
+			errorMsg: `unable to parse OTTL statement "set(body, \"bear\" where attributes[\"http.path\"] == \"/animal\"": statement has invalid syntax: 1:18: unexpected token "where" (expected ")" Key*)`,
 		},
 		{
 			testName: "bad_syntax_metric",
@@ -445,7 +445,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `unable to parse OTTL statement: 1:18: unexpected token "where" (expected ")" Key*)`,
+			errorMsg: `unable to parse OTTL statement "set(name, \"bear\" where attributes[\"http.path\"] == \"/animal\"": statement has invalid syntax: 1:18: unexpected token "where" (expected ")" Key*)`,
 		},
 		{
 			testName: "bad_syntax_trace",
@@ -459,7 +459,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `unable to parse OTTL statement: 1:18: unexpected token "where" (expected ")" Key*)`,
+			errorMsg: `unable to parse OTTL statement "set(name, \"bear\" where attributes[\"http.path\"] == \"/animal\"": statement has invalid syntax: 1:18: unexpected token "where" (expected ")" Key*)`,
 		},
 		{
 			testName: "unknown_function_log",
@@ -473,7 +473,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `undefined function not_a_function`,
+			errorMsg: `unable to parse OTTL statement "not_a_function(attributes, [\"http.method\", \"http.path\"])": undefined function "not_a_function"`,
 		},
 		{
 			testName: "unknown_function_metric",
@@ -487,7 +487,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `undefined function not_a_function`,
+			errorMsg: `unable to parse OTTL statement "not_a_function(attributes, [\"http.method\", \"http.path\"])": undefined function "not_a_function"`,
 		},
 		{
 			testName: "unknown_function_trace",
@@ -501,7 +501,7 @@ func TestArguments_UnmarshalRiver(t *testing.T) {
 			}
 			output {}
 			`,
-			errorMsg: `undefined function not_a_function`,
+			errorMsg: `unable to parse OTTL statement "not_a_function(attributes, [\"http.method\", \"http.path\"])": undefined function "not_a_function"`,
 		},
 		{
 			testName: "unknown_context",