feat: support empty selector

kubeshop · May 5, 2022 · c18155d · c18155d
1 parent 312cefe
commit c18155d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/server/assertions/selectors/parser.go b/server/assertions/selectors/parser.go
@@ -7,7 +7,7 @@ import (
 )
 
 type ParserSelector struct {
-	SpanSelectors []parserSpanSelector `( @@* ( "," @@ )*)`
+	SpanSelectors []parserSpanSelector `( @@* ( "," @@ )*)*`
 }
 
 type parserSpanSelector struct {

diff --git a/server/assertions/selectors/selector.go b/server/assertions/selectors/selector.go
@@ -12,6 +12,11 @@ type Selector struct {
 }
 
 func (s Selector) Filter(trace traces.Trace) []traces.Span {
+	if len(s.spanSelectors) == 0 {
+		// empty selector should select everything
+		return getAllSpans(trace)
+	}
+
 	allFilteredSpans := make([]traces.Span, 0)
 	for _, spanSelector := range s.spanSelectors {
 		spans := filterSpans(trace.RootSpan, spanSelector)
@@ -21,6 +26,15 @@ func (s Selector) Filter(trace traces.Trace) []traces.Span {
 	return allFilteredSpans
 }
 
+func getAllSpans(trace traces.Trace) []traces.Span {
+	var allSpans = make([]traces.Span, 0)
+	traverseTree(trace.RootSpan, func(span traces.Span) {
+		allSpans = append(allSpans, span)
+	})
+
+	return allSpans
+}
+
 type spanSelector struct {
 	Filters       []filter
 	PsedoClass    PseudoClass

diff --git a/server/assertions/selectors/selector_test.go b/server/assertions/selectors/selector_test.go
@@ -66,6 +66,11 @@ func TestSelector(t *testing.T) {
 		Expression      string
 		ExpectedSpanIds []trace.SpanID
 	}{
+		{
+			Name:            "Empty selector should select all spans",
+			Expression:      ``,
+			ExpectedSpanIds: []trace.SpanID{postImportSpanID, insertPokemonDatabaseSpanID, getPokemonFromExternalAPISpanID, updatePokemonDatabaseSpanID},
+		},
 		{
 			Name:            "Selector with span name",
 			Expression:      `span[name="Get pokemon from external API"]`,