From b60588a749146a38c1b7f7119ee1fd85099389fe Mon Sep 17 00:00:00 2001 From: Shivanshu Raj Shrivastava Date: Fri, 25 Apr 2025 21:42:05 +0530 Subject: [PATCH] chore: use count instead of count distinct (#7711) Signed-off-by: Shivanshu Raj Shrivastava --- .../integrations/thirdPartyApi/translator.go | 98 ++++++++++++++++++- 1 file changed, 94 insertions(+), 4 deletions(-) diff --git a/pkg/query-service/app/integrations/thirdPartyApi/translator.go b/pkg/query-service/app/integrations/thirdPartyApi/translator.go index e3a8c2c27b..869ce872c7 100644 --- a/pkg/query-service/app/integrations/thirdPartyApi/translator.go +++ b/pkg/query-service/app/integrations/thirdPartyApi/translator.go @@ -82,6 +82,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "endpoints", @@ -121,6 +130,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "lastseen", @@ -160,6 +178,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "rps", @@ -179,13 +206,13 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er QueryName: "error", DataSource: v3.DataSourceTraces, StepInterval: defaultStepInterval, - AggregateOperator: v3.AggregateOperatorCountDistinct, + AggregateOperator: v3.AggregateOperatorCount, AggregateAttribute: v3.AttributeKey{ Key: "span_id", DataType: v3.AttributeKeyDataTypeString, IsColumn: true, }, - TimeAggregation: v3.TimeAggregationCountDistinct, + TimeAggregation: v3.TimeAggregationCount, SpaceAggregation: v3.SpaceAggregationSum, Filters: &v3.FilterSet{ Operator: "AND", @@ -209,6 +236,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "error", @@ -229,13 +265,13 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er QueryName: "total_span", DataSource: v3.DataSourceTraces, StepInterval: defaultStepInterval, - AggregateOperator: v3.AggregateOperatorCountDistinct, + AggregateOperator: v3.AggregateOperatorCount, AggregateAttribute: v3.AttributeKey{ Key: "span_id", DataType: v3.AttributeKeyDataTypeString, IsColumn: true, }, - TimeAggregation: v3.TimeAggregationCountDistinct, + TimeAggregation: v3.TimeAggregationCount, SpaceAggregation: v3.SpaceAggregationSum, Filters: &v3.FilterSet{ Operator: "AND", @@ -250,6 +286,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "total_span", @@ -292,6 +337,15 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "p99", @@ -366,6 +420,15 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "endpoints", @@ -406,6 +469,15 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "p99", @@ -439,6 +511,15 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "error_rate", @@ -471,6 +552,15 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Operator: v3.FilterOperatorExists, Value: "", }, + { + Key: v3.AttributeKey{ + Key: "kind_string", + DataType: v3.AttributeKeyDataTypeString, + IsColumn: true, + }, + Operator: "=", + Value: "Client", + }, }, thirdPartyApis.Filters), }, Expression: "lastseen",