Added root.name and root.service.name support to v2 and parquet

CHANGELOG.md

@@ -57,6 +57,7 @@ Jsonnet users will now need to specify a storage request and limit for the gener
 * [BUGFIX] Fix wal check on span name to be substring [#1548](https://github.com/grafana/tempo/pull/1548) (@mdisibio)
 * [BUGFIX] Prevent ingester panic "cannot grow buffer" [#1258](https://github.com/grafana/tempo/issues/1258) (@mdisibio)
 * [BUGFIX] metrics-generator: do not remove x-scope-orgid header in single tenant modus [#1554](https://github.com/grafana/tempo/pull/1554) (@kvrhdn)
+* [BUGFIX] Fixed issue where backend does not support `root.name` and `root.service.name` [#1589](https://github.com/grafana/tempo/pull/1589) (@kvrhdn)
 
 ## v1.4.1 / 2022-05-05
 

pkg/model/trace/matches.go

@@ -70,6 +70,11 @@ func MatchesProto(id []byte, trace *tempopb.Trace, req *tempopb.SearchRequest) (
 				// checks non attribute span properties for matching
 				matchSpan(tagsToFind, s)
 				matchAttributes(tagsToFind, s.Attributes)
+
+				// special root span check
+				if len(s.ParentSpanId) == 0 && b.Resource != nil {
+					matchRootServiceName(tagsToFind, b.Resource.Attributes)
+				}
 			}
 		}
 	}
@@ -142,6 +147,12 @@ func matchSpan(tags map[string]string, s *v1.Span) {
 			delete(tags, StatusCodeTag)
 		}
 	}
+
+	if name, ok := tags[RootSpanNameTag]; ok {
+		if strings.Contains(s.Name, name) && len(s.ParentSpanId) == 0 {
+			delete(tags, RootSpanNameTag)
+		}
+	}
 }
 
 // matchAttributes tests to see if any tags in the map match any passed attributes
@@ -184,3 +195,17 @@ func matchAttributes(tags map[string]string, atts []*v1common.KeyValue) {
 		}
 	}
 }
+
+func matchRootServiceName(tags map[string]string, atts []*v1common.KeyValue) {
+	name, ok := tags[RootServiceNameTag]
+	if !ok {
+		return
+	}
+
+	for _, a := range atts {
+		if a.Key == "service.name" && strings.Contains(a.Value.GetStringValue(), name) {
+			delete(tags, RootServiceNameTag)
+			return
+		}
+	}
+}

pkg/model/trace/search_test_suite.go

@@ -166,6 +166,8 @@ func SearchTestSuite() (
 		makeReq("k8s.namespace.name", "k8sNamespace"),
 		makeReq("k8s.pod.name", "k8sPod"),
 		makeReq("k8s.container.name", "k8sContainer"),
+		makeReq("root.service.name", "RootService"),
+		makeReq("root.name", "RootSpan"),
 
 		// Well-known span attributes
 		makeReq("name", "Span"),
@@ -214,6 +216,8 @@ func SearchTestSuite() (
 		makeReq("http.url", "asdf"),
 		makeReq("http.status_code", "200"),
 		makeReq("status.code", "ok"),
+		makeReq("root.service.name", "NotRootService"),
+		makeReq("root.name", "NotRootSpan"),
 
 		// Span attributes
 		makeReq("foo", "baz"), // wrong case

tempodb/encoding/vparquet/block_search.go

@@ -101,6 +101,10 @@ func makePipelineWithRowGroups(ctx context.Context, req *tempopb.SearchRequest,
 
 	for k, v := range req.Tags {
 		switch k {
+		case LabelRootServiceName:
+			traceIters = append(traceIters, makeIter("RootServiceName", pq.NewSubstringPredicate(v), ""))
+		case LabelRootSpanName:
+			traceIters = append(traceIters, makeIter("RootSpanName", pq.NewSubstringPredicate(v), ""))
 		case LabelServiceName:
 			resourceIters = append(resourceIters, makeIter("rs.Resource.ServiceName", pq.NewSubstringPredicate(v), ""))
 		case LabelCluster:

tempodb/encoding/vparquet/schema.go

@@ -15,6 +15,9 @@ import (
 // Label names for conversion b/n Proto <> Parquet
 
 const (
+	LabelRootSpanName    = "root.name"
+	LabelRootServiceName = "root.service.name"
+
 	LabelServiceName = "service.name"
 	LabelCluster     = "cluster"
 	LabelNamespace   = "namespace"