feat: traces QB

pkg/query-service/app/clickhouseReader/options.go

@@ -29,6 +29,7 @@ const (
 	defaultDependencyGraphTable    string        = "distributed_dependency_graph_minutes_v2"
 	defaultTopLevelOperationsTable string        = "distributed_top_level_operations"
 	defaultSpanAttributeTable      string        = "distributed_span_attributes"
+	defaultSpanAttributeKeysTable  string        = "distributed_span_attributes_keys"
 	defaultLogsDB                  string        = "signoz_logs"
 	defaultLogsTable               string        = "distributed_logs"
 	defaultLogsLocalTable          string        = "logs"
@@ -65,6 +66,7 @@ type namespaceConfig struct {
 	SpansTable              string
 	ErrorTable              string
 	SpanAttributeTable      string
+	SpanAttributeKeysTable  string
 	DependencyGraphTable    string
 	TopLevelOperationsTable string
 	LogsDB                  string
@@ -135,6 +137,7 @@ func NewOptions(datasource string, primaryNamespace string, otherNamespaces ...s
 			UsageExplorerTable:      defaultUsageExplorerTable,
 			SpansTable:              defaultSpansTable,
 			SpanAttributeTable:      defaultSpanAttributeTable,
+			SpanAttributeKeysTable:  defaultSpanAttributeKeysTable,
 			DependencyGraphTable:    defaultDependencyGraphTable,
 			TopLevelOperationsTable: defaultTopLevelOperationsTable,
 			LogsDB:                  defaultLogsDB,

pkg/query-service/app/clickhouseReader/reader.go

@@ -96,6 +96,7 @@ type ClickHouseReader struct {
 	usageExplorerTable      string
 	SpansTable              string
 	spanAttributeTable      string
+	spanAttributesKeysTable string
 	dependencyGraphTable    string
 	topLevelOperationsTable string
 	logsDB                  string
@@ -147,6 +148,7 @@ func NewReader(localDB *sqlx.DB, configFile string, featureFlag interfaces.Featu
 		durationTable:           options.primary.DurationTable,
 		SpansTable:              options.primary.SpansTable,
 		spanAttributeTable:      options.primary.SpanAttributeTable,
+		spanAttributesKeysTable: options.primary.SpanAttributeKeysTable,
 		dependencyGraphTable:    options.primary.DependencyGraphTable,
 		topLevelOperationsTable: options.primary.TopLevelOperationsTable,
 		logsDB:                  options.primary.LogsDB,
@@ -3829,7 +3831,7 @@ func (r *ClickHouseReader) GetLogAggregateAttributes(ctx context.Context, req *v
 		v3.AggregateOperatorMax:
 		where = "tagKey ILIKE $1 AND (tagDataType='int64' or tagDataType='float64')"
 	case
-		v3.AggregateOpeatorCount,
+		v3.AggregateOperatorCount,
 		v3.AggregateOperatorNoOp:
 		return &v3.AggregateAttributeResponse{}, nil
 	default:
@@ -4251,7 +4253,7 @@ func (r *ClickHouseReader) GetTraceAggregateAttributes(ctx context.Context, req
 		v3.AggregateOperatorMax:
 		where = "tagKey ILIKE $1 AND dataType='float64'"
 	case
-		v3.AggregateOpeatorCount,
+		v3.AggregateOperatorCount,
 		v3.AggregateOperatorNoOp:
 		return &v3.AggregateAttributeResponse{}, nil
 	default:
@@ -4380,3 +4382,38 @@ func (r *ClickHouseReader) GetTraceAttributeValues(ctx context.Context, req *v3.
 
 	return &attributeValues, nil
 }
+
+func (r *ClickHouseReader) GetSpanAttributeKeys(ctx context.Context) (map[string]v3.AttributeKey, error) {
+	var query string
+	var err error
+	var rows driver.Rows
+	response := map[string]v3.AttributeKey{}
+
+	query = fmt.Sprintf("SELECT DISTINCT(tagKey), tagType, dataType, isColumn FROM %s.%s", r.TraceDB, r.spanAttributesKeysTable)
+
+	rows, err = r.db.Query(ctx, query)
+
+	if err != nil {
+		zap.S().Error(err)
+		return nil, fmt.Errorf("error while executing query: %s", err.Error())
+	}
+	defer rows.Close()
+
+	var tagKey string
+	var dataType string
+	var tagType string
+	var isColumn bool
+	for rows.Next() {
+		if err := rows.Scan(&tagKey, &tagType, &dataType, &isColumn); err != nil {
+			return nil, fmt.Errorf("error while scanning rows: %s", err.Error())
+		}
+		key := v3.AttributeKey{
+			Key:      tagKey,
+			DataType: v3.AttributeKeyDataType(dataType),
+			Type:     v3.AttributeKeyType(tagType),
+			IsColumn: isColumn,
+		}
+		response[tagKey] = key
+	}
+	return response, nil
+}

pkg/query-service/app/http_handler.go

@@ -25,6 +25,7 @@ import (
 	"go.signoz.io/signoz/pkg/query-service/app/metrics"
 	metricsv3 "go.signoz.io/signoz/pkg/query-service/app/metrics/v3"
 	"go.signoz.io/signoz/pkg/query-service/app/parser"
+	tracesV3 "go.signoz.io/signoz/pkg/query-service/app/traces/v3"
 	"go.signoz.io/signoz/pkg/query-service/auth"
 	"go.signoz.io/signoz/pkg/query-service/constants"
 	v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
@@ -107,10 +108,8 @@ func NewAPIHandler(opts APIHandlerOpts) (*APIHandler, error) {
 
 	builderOpts := queryBuilderOptions{
 		BuildMetricQuery: metricsv3.PrepareMetricQuery,
-		BuildTraceQuery: func(start, end int64, queryType v3.QueryType, panelType v3.PanelType, bq *v3.BuilderQuery) (string, error) {
-			return "", errors.New("not implemented")
-		},
-		BuildLogQuery: logsv3.PrepareLogsQuery,
+		BuildTraceQuery:  tracesV3.PrepareTracesQuery,
+		BuildLogQuery:    logsv3.PrepareLogsQuery,
 	}
 	aH.queryBuilder = NewQueryBuilder(builderOpts)
 
@@ -2669,6 +2668,20 @@ func (aH *APIHandler) getLogFieldsV3(ctx context.Context, queryRangeParams *v3.Q
 	return data, nil
 }
 
+func (aH *APIHandler) getSpanKeysV3(ctx context.Context, queryRangeParams *v3.QueryRangeParamsV3) (map[string]v3.AttributeKey, error) {
+	data := map[string]v3.AttributeKey{}
+	for _, query := range queryRangeParams.CompositeQuery.BuilderQueries {
+		if query.DataSource == v3.DataSourceTraces {
+			spanKeys, err := aH.reader.GetSpanAttributeKeys(ctx)
+			if err != nil {
+				return nil, err
+			}
+			return spanKeys, nil
+		}
+	}
+	return data, nil
+}
+
 func (aH *APIHandler) queryRangeV3(ctx context.Context, queryRangeParams *v3.QueryRangeParamsV3, w http.ResponseWriter, r *http.Request) {
 
 	var result []*v3.Result
@@ -2686,7 +2699,15 @@ func (aH *APIHandler) queryRangeV3(ctx context.Context, queryRangeParams *v3.Que
 			return
 		}
 
-		queries, err = aH.queryBuilder.prepareQueries(queryRangeParams, fields)
+		var spanKeys map[string]v3.AttributeKey
+		spanKeys, err = aH.getSpanKeysV3(ctx, queryRangeParams)
+		if err != nil {
+			apiErrObj := &model.ApiError{Typ: model.ErrorInternal, Err: err}
+			RespondError(w, apiErrObj, errQuriesByName)
+			return
+		}
+
+		queries, err = aH.queryBuilder.prepareQueries(queryRangeParams, fields, spanKeys)
 		if err != nil {
 			RespondError(w, &model.ApiError{Typ: model.ErrorBadData, Err: err}, nil)
 			return

pkg/query-service/app/logs/v3/query_builder.go

@@ -253,7 +253,7 @@ func buildLogsQuery(start, end, step int64, mq *v3.BuilderQuery, fields map[stri
 		op := fmt.Sprintf("%s(%s)", aggregateOperatorToSQLFunc[mq.AggregateOperator], aggregationKey)
 		query := fmt.Sprintf(queryTmpl, step, op, filterSubQuery, groupBy, having, orderBy)
 		return query, nil
-	case v3.AggregateOpeatorCount:
+	case v3.AggregateOperatorCount:
 		if mq.AggregateAttribute.Key != "" {
 			field, err := encrichFieldWithMetadata(mq.AggregateAttribute, fields)
 			if err != nil {

pkg/query-service/app/logs/v3/query_builder_test.go

@@ -58,19 +58,19 @@ var testGetSelectLabelsData = []struct {
 }{
 	{
 		Name:              "select fields for groupBy attribute",
-		AggregateOperator: v3.AggregateOpeatorCount,
+		AggregateOperator: v3.AggregateOperatorCount,
 		GroupByTags:       []v3.AttributeKey{{Key: "user_name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag}},
 		SelectLabels:      ", attributes_string_value[indexOf(attributes_string_key, 'user_name')] as user_name",
 	},
 	{
 		Name:              "select fields for groupBy resource",
-		AggregateOperator: v3.AggregateOpeatorCount,
+		AggregateOperator: v3.AggregateOperatorCount,
 		GroupByTags:       []v3.AttributeKey{{Key: "user_name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeResource}},
 		SelectLabels:      ", resources_string_value[indexOf(resources_string_key, 'user_name')] as user_name",
 	},
 	{
 		Name:              "select fields for groupBy attribute and resource",
-		AggregateOperator: v3.AggregateOpeatorCount,
+		AggregateOperator: v3.AggregateOperatorCount,
 		GroupByTags: []v3.AttributeKey{
 			{Key: "user_name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeResource},
 			{Key: "host", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag},
@@ -79,7 +79,7 @@ var testGetSelectLabelsData = []struct {
 	},
 	{
 		Name:              "select fields for groupBy materialized columns",
-		AggregateOperator: v3.AggregateOpeatorCount,
+		AggregateOperator: v3.AggregateOperatorCount,
 		GroupByTags:       []v3.AttributeKey{{Key: "host", IsColumn: true}},
 		SelectLabels:      ", host as host",
 	},
@@ -202,7 +202,7 @@ var testBuildLogsQueryData = []struct {
 		Step:  60,
 		BuilderQuery: &v3.BuilderQuery{
 			QueryName:         "A",
-			AggregateOperator: v3.AggregateOpeatorCount,
+			AggregateOperator: v3.AggregateOperatorCount,
 			Expression:        "A",
 		},
 		TableName:     "logs",
@@ -216,7 +216,7 @@ var testBuildLogsQueryData = []struct {
 		BuilderQuery: &v3.BuilderQuery{
 			QueryName:          "A",
 			AggregateAttribute: v3.AttributeKey{Key: "user_name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag},
-			AggregateOperator:  v3.AggregateOpeatorCount,
+			AggregateOperator:  v3.AggregateOperatorCount,
 			Expression:         "A",
 		},
 		TableName:     "logs",
@@ -230,7 +230,7 @@ var testBuildLogsQueryData = []struct {
 		BuilderQuery: &v3.BuilderQuery{
 			QueryName:          "A",
 			AggregateAttribute: v3.AttributeKey{Key: "user_name", DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag},
-			AggregateOperator:  v3.AggregateOpeatorCount,
+			AggregateOperator:  v3.AggregateOperatorCount,
 			Filters: &v3.FilterSet{Operator: "AND", Items: []v3.FilterItem{
 				{Key: v3.AttributeKey{Key: "bytes", DataType: v3.AttributeKeyDataTypeFloat64, Type: v3.AttributeKeyTypeTag}, Value: 100, Operator: ">"},
 			}},

pkg/query-service/app/metrics/v3/query_builder.go

@@ -260,7 +260,7 @@ func buildMetricQuery(start, end, step int64, mq *v3.BuilderQuery, tableName str
 		op := fmt.Sprintf("%s(value)", aggregateOperatorToSQLFunc[mq.AggregateOperator])
 		query := fmt.Sprintf(queryTmpl, groupTags, step, op, filterSubQuery, groupBy, orderBy)
 		return query, nil
-	case v3.AggregateOpeatorCount:
+	case v3.AggregateOperatorCount:
 		op := "toFloat64(count(*))"
 		query := fmt.Sprintf(queryTmpl, groupTags, step, op, filterSubQuery, groupBy, orderBy)
 		return query, nil

pkg/query-service/app/metrics/v3/query_builder_test.go

@@ -18,7 +18,7 @@ func TestBuildQuery(t *testing.T) {
 					"A": {
 						QueryName:          "A",
 						AggregateAttribute: v3.AttributeKey{Key: "name"},
-						AggregateOperator:  v3.AggregateOperatorRateMax,
+						AggregateOperator:  v3.AggregateOperatorNoOp,
 						Expression:         "A",
 					},
 				},

pkg/query-service/app/query_builder.go

@@ -35,7 +35,7 @@ var SupportedFunctions = []string{
 
 var evalFuncs = map[string]govaluate.ExpressionFunction{}
 
-type prepareTracesQueryFunc func(start, end int64, queryType v3.QueryType, panelType v3.PanelType, bq *v3.BuilderQuery) (string, error)
+type prepareTracesQueryFunc func(start, end int64, queryType v3.QueryType, panelType v3.PanelType, bq *v3.BuilderQuery, keys map[string]v3.AttributeKey) (string, error)
 type prepareLogsQueryFunc func(start, end int64, queryType v3.QueryType, panelType v3.PanelType, bq *v3.BuilderQuery, fields map[string]v3.AttributeKey) (string, error)
 type prepareMetricQueryFunc func(start, end int64, queryType v3.QueryType, panelType v3.PanelType, bq *v3.BuilderQuery) (string, error)
 
@@ -139,7 +139,11 @@ func (qb *queryBuilder) prepareQueries(params *v3.QueryRangeParamsV3, args ...in
 			if query.Expression == queryName {
 				switch query.DataSource {
 				case v3.DataSourceTraces:
-					queryString, err := qb.options.BuildTraceQuery(params.Start, params.End, compositeQuery.QueryType, compositeQuery.PanelType, query)
+					keys := map[string]v3.AttributeKey{}
+					if len(args) == 2 {
+						keys = args[1].(map[string]v3.AttributeKey)
+					}
+					queryString, err := qb.options.BuildTraceQuery(params.Start, params.End, compositeQuery.QueryType, compositeQuery.PanelType, query, keys)
 					if err != nil {
 						return nil, err
 					}