chore: several fixes

frontend/src/constants/queryBuilder.ts

@@ -180,7 +180,7 @@ export const initialQueryBuilderFormValues: IBuilderQuery = {
 	orderBy: [],
 	groupBy: [],
 	legend: '',
-	reduceTo: 'sum',
+	reduceTo: 'avg',
 };
 
 const initialQueryBuilderFormLogsValues: IBuilderQuery = {

frontend/src/container/MetricsApplication/MetricsPageQueries/MetricsPageQueriesFactory.ts

@@ -48,7 +48,7 @@ export const getQueryBuilderQueries = ({
 				items: filterItems[index],
 				op: 'AND',
 			},
-			reduceTo: 'sum',
+			reduceTo: 'avg',
 			dataSource,
 		};
 
@@ -86,7 +86,7 @@ export const getQueryBuilderQuerieswithFormula = ({
 		aggregateAttribute: autocompleteData[index],
 		queryName: alphabet[index],
 		expression: alphabet[index],
-		reduceTo: 'sum',
+		reduceTo: 'avg',
 		filters: {
 			items: additionalItems[index],
 			op: 'AND',

frontend/src/container/TraceDetail/SelectedSpanDetails/config.ts

@@ -58,7 +58,7 @@ export const getTraceToLogsQuery = (
 					legend: '',
 					orderBy: [],
 					queryName: 'A',
-					reduceTo: 'min',
+					reduceTo: 'avg',
 					stepInterval: getStep({
 						start: minTime,
 						end: maxTime,

frontend/tests/dashboards/utils.ts

@@ -101,7 +101,7 @@ export const insertWidgetIdInResponse = (widgetID: string): any => ({
 									limit: null,
 									orderBy: [],
 									queryName: 'A',
-									reduceTo: 'sum',
+									reduceTo: 'avg',
 									stepInterval: 60,
 								},
 							],

frontend/tests/fixtures/api/dashboard/dashboardGetCallWithTimeSeriesWidget200.json

@@ -56,7 +56,7 @@
 									"limit": null,
 									"orderBy": [],
 									"queryName": "A",
-									"reduceTo": "sum",
+									"reduceTo": "avg",
 									"stepInterval": 60
 								}
 							],

frontend/tests/fixtures/api/dashboard/putDashboardWithTimeSeries200.json

@@ -56,7 +56,7 @@
 									"limit": null,
 									"orderBy": [],
 									"queryName": "A",
-									"reduceTo": "sum",
+									"reduceTo": "avg",
 									"stepInterval": 60
 								}
 							],

frontend/tests/fixtures/api/traces/traceExplorerViews200.json

@@ -40,7 +40,7 @@
 								"order": "desc"
 							}
 						],
-						"reduceTo": "sum"
+						"reduceTo": "avg"
 					}
 				},
 				"panelType": "table",

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

@@ -3975,7 +3975,7 @@ func (r *ClickHouseReader) GetMetricAggregateAttributes(ctx context.Context, req
 	var rows driver.Rows
 	var response v3.AggregateAttributeResponse
 
-	query = fmt.Sprintf("SELECT DISTINCT metric_name, type, is_monotonic from %s.%s WHERE metric_name ILIKE $1", signozMetricDBName, signozTSTableNameV41Day)
+	query = fmt.Sprintf("SELECT metric_name, type, is_monotonic, temporality FROM %s.%s WHERE metric_name ILIKE $1 GROUP BY metric_name, type, is_monotonic, temporality", signozMetricDBName, signozTSTableNameV41Day)
 	if req.Limit != 0 {
 		query = query + fmt.Sprintf(" LIMIT %d;", req.Limit)
 	}
@@ -3987,22 +3987,30 @@ func (r *ClickHouseReader) GetMetricAggregateAttributes(ctx context.Context, req
 	}
 	defer rows.Close()
 
-	var metricName, typ string
+	seen := make(map[string]struct{})
+
+	var metricName, typ, temporality string
 	var isMonotonic bool
 	for rows.Next() {
-		if err := rows.Scan(&metricName, &typ, &isMonotonic); err != nil {
+		if err := rows.Scan(&metricName, &typ, &isMonotonic, &temporality); err != nil {
 			return nil, fmt.Errorf("error while scanning rows: %s", err.Error())
 		}
-		// unlike traces/logs `tag`/`resource` type, the `Type` will be metric type
-		if typ == "Sum" && !isMonotonic {
+		// Non-monotonic cumulative sums are treated as gauges
+		if typ == "Sum" && !isMonotonic && temporality == string(v3.Cumulative) {
 			typ = "Gauge"
 		}
+		// unlike traces/logs `tag`/`resource` type, the `Type` will be metric type
 		key := v3.AttributeKey{
 			Key:      metricName,
 			DataType: v3.AttributeKeyDataTypeFloat64,
 			Type:     v3.AttributeKeyType(typ),
 			IsColumn: true,
 		}
+		// remove duplicates
+		if _, ok := seen[metricName+typ]; ok {
+			continue
+		}
+		seen[metricName+typ] = struct{}{}
 		response.AttributeKeys = append(response.AttributeKeys, key)
 	}
 
@@ -4017,7 +4025,7 @@ func (r *ClickHouseReader) GetMetricAttributeKeys(ctx context.Context, req *v3.F
 	var response v3.FilterAttributeKeyResponse
 
 	// skips the internal attributes i.e attributes starting with __
-	query = fmt.Sprintf("SELECT DISTINCT arrayJoin(tagKeys) as distinctTagKey from (SELECT DISTINCT(JSONExtractKeys(labels)) tagKeys from %s.%s WHERE metric_name=$1 AND unix_milli >= $2) WHERE distinctTagKey ILIKE $3 AND distinctTagKey NOT LIKE '\\_\\_%%'", signozMetricDBName, signozTSTableNameV41Day)
+	query = fmt.Sprintf("SELECT arrayJoin(tagKeys) AS distinctTagKey FROM (SELECT JSONExtractKeys(labels) AS tagKeys FROM %s.%s WHERE metric_name=$1 AND unix_milli >= $2 GROUP BY tagKeys) WHERE distinctTagKey ILIKE $3 AND distinctTagKey NOT LIKE '\\_\\_%%' GROUP BY distinctTagKey", signozMetricDBName, signozTSTableNameV41Day)
 	if req.Limit != 0 {
 		query = query + fmt.Sprintf(" LIMIT %d;", req.Limit)
 	}
@@ -4052,7 +4060,7 @@ func (r *ClickHouseReader) GetMetricAttributeValues(ctx context.Context, req *v3
 	var rows driver.Rows
 	var attributeValues v3.FilterAttributeValueResponse
 
-	query = fmt.Sprintf("SELECT DISTINCT(JSONExtractString(labels, $1)) from %s.%s WHERE metric_name=$2 AND JSONExtractString(labels, $3) ILIKE $4 AND unix_milli >= $5", signozMetricDBName, signozTSTableNameV41Day)
+	query = fmt.Sprintf("SELECT JSONExtractString(labels, $1) AS tagValue FROM %s.%s WHERE metric_name=$2 AND JSONExtractString(labels, $3) ILIKE $4 AND unix_milli >= $5 GROUP BY tagValue", signozMetricDBName, signozTSTableNameV41Day)
 	if req.Limit != 0 {
 		query = query + fmt.Sprintf(" LIMIT %d;", req.Limit)
 	}

pkg/query-service/app/limit.go

@@ -20,7 +20,7 @@ func applyMetricLimit(results []*v3.Result, queryRangeParams *v3.QueryRangeParam
 			limit := builderQueries[result.QueryName].Limit
 
 			orderByList := builderQueries[result.QueryName].OrderBy
-			if limit > 0 {
+			{
 				if len(orderByList) == 0 {
 					// If no orderBy is specified, sort by value in descending order
 					orderByList = []v3.OrderBy{{ColumnName: constants.SigNozOrderByValue, Order: "desc"}}

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

@@ -28,7 +28,8 @@ func PrepareMetricQuery(start, end int64, queryType v3.QueryType, panelType v3.P
 
 	var quantile float64
 
-	if v3.IsPercentileOperator(mq.SpaceAggregation) {
+	if v3.IsPercentileOperator(mq.SpaceAggregation) &&
+		mq.AggregateAttribute.Type != v3.AttributeKeyType(v3.MetricTypeExponentialHistogram) {
 		quantile = v3.GetPercentileFromOperator(mq.SpaceAggregation)
 		// If quantile is set, we need to group by le
 		// and set the space aggregation to sum
@@ -81,7 +82,8 @@ func PrepareMetricQuery(start, end int64, queryType v3.QueryType, panelType v3.P
 	groupBy := helpers.GroupByAttributeKeyTags(groupByWithoutLe...)
 	orderBy := helpers.OrderByAttributeKeyTags(mq.OrderBy, groupByWithoutLe)
 
-	if quantile != 0 {
+	// fixed-bucket histogram quantiles are calculated with UDF
+	if quantile != 0 && mq.AggregateAttribute.Type != v3.AttributeKeyType(v3.MetricTypeExponentialHistogram) {
 		query = fmt.Sprintf(`SELECT %s, histogramQuantile(arrayMap(x -> toFloat64(x), groupArray(le)), groupArray(value), %.3f) as value FROM (%s) GROUP BY %s ORDER BY %s`, groupBy, quantile, query, groupBy, orderBy)
 	}
 

pkg/query-service/app/parser.go

@@ -1019,6 +1019,25 @@ func ParseQueryRangeParams(r *http.Request) (*v3.QueryRangeParamsV3, *model.ApiE
 				}
 			}
 
+			var timeShiftBy int64
+			if len(query.Functions) > 0 {
+				for idx := range query.Functions {
+					function := &query.Functions[idx]
+					if function.Name == v3.FunctionNameTimeShift {
+						// move the function to the beginning of the list
+						// so any other function can use the shifted time
+						var fns []v3.Function
+						fns = append(fns, *function)
+						fns = append(fns, query.Functions[:idx]...)
+						fns = append(fns, query.Functions[idx+1:]...)
+						query.Functions = fns
+						timeShiftBy = int64(function.Args[0].(float64))
+						break
+					}
+				}
+			}
+			query.ShiftBy = timeShiftBy
+
 			if query.Filters == nil || len(query.Filters.Items) == 0 {
 				continue
 			}
@@ -1045,25 +1064,6 @@ func ParseQueryRangeParams(r *http.Request) (*v3.QueryRangeParamsV3, *model.ApiE
 					}
 				}
 			}
-
-			var timeShiftBy int64
-			if len(query.Functions) > 0 {
-				for idx := range query.Functions {
-					function := &query.Functions[idx]
-					if function.Name == v3.FunctionNameTimeShift {
-						// move the function to the beginning of the list
-						// so any other function can use the shifted time
-						var fns []v3.Function
-						fns = append(fns, *function)
-						fns = append(fns, query.Functions[:idx]...)
-						fns = append(fns, query.Functions[idx+1:]...)
-						query.Functions = fns
-						timeShiftBy = int64(function.Args[0].(float64))
-						break
-					}
-				}
-			}
-			query.ShiftBy = timeShiftBy
 		}
 	}
 	queryRangeParams.Variables = formattedVars

pkg/query-service/common/metrics.go

@@ -21,6 +21,5 @@ func AdjustedMetricTimeRange(start, end, step int64, aggregaOperator v3.TimeAggr
 
 func PastDayRoundOff() int64 {
 	now := time.Now().UnixMilli()
-	pastDay := now - (now % (time.Hour.Milliseconds() * 24))
-	return pastDay
+	return int64(math.Floor(float64(now)/float64(time.Hour.Milliseconds()*24))) * time.Hour.Milliseconds() * 24
 }

pkg/query-service/model/v3/v3.go

@@ -509,11 +509,11 @@ const (
 	SpaceAggregationMin          SpaceAggregation = "min"
 	SpaceAggregationMax          SpaceAggregation = "max"
 	SpaceAggregationCount        SpaceAggregation = "count"
-	SpaceAggregationPercentile50 SpaceAggregation = "percentile_50"
-	SpaceAggregationPercentile75 SpaceAggregation = "percentile_75"
-	SpaceAggregationPercentile90 SpaceAggregation = "percentile_90"
-	SpaceAggregationPercentile95 SpaceAggregation = "percentile_95"
-	SpaceAggregationPercentile99 SpaceAggregation = "percentile_99"
+	SpaceAggregationPercentile50 SpaceAggregation = "p50"
+	SpaceAggregationPercentile75 SpaceAggregation = "p75"
+	SpaceAggregationPercentile90 SpaceAggregation = "p90"
+	SpaceAggregationPercentile95 SpaceAggregation = "p95"
+	SpaceAggregationPercentile99 SpaceAggregation = "p99"
 )
 
 func (s SpaceAggregation) Validate() error {
@@ -659,8 +659,11 @@ func (b *BuilderQuery) Validate() error {
 					return fmt.Errorf("aggregate operator is invalid: %w", err)
 				}
 			} else {
-				if err := b.TimeAggregation.Validate(); err != nil {
-					return fmt.Errorf("time aggregation is invalid: %w", err)
+				// the time aggregation is not needed for percentile operators
+				if !IsPercentileOperator(b.SpaceAggregation) {
+					if err := b.TimeAggregation.Validate(); err != nil {
+						return fmt.Errorf("time aggregation is invalid: %w", err)
+					}
 				}
 
 				if err := b.SpaceAggregation.Validate(); err != nil {
@@ -723,13 +726,30 @@ func (b *BuilderQuery) Validate() error {
 				if len(function.Args) == 0 {
 					return fmt.Errorf("timeShiftBy param missing in query")
 				}
+				_, ok := function.Args[0].(float64)
+				if !ok {
+					// if string, attempt to convert to float
+					timeShiftBy, err := strconv.ParseFloat(function.Args[0].(string), 64)
+					if err != nil {
+						return fmt.Errorf("timeShiftBy param should be a number")
+					}
+					function.Args[0] = timeShiftBy
+				}
 			} else if function.Name == FunctionNameEWMA3 ||
 				function.Name == FunctionNameEWMA5 ||
 				function.Name == FunctionNameEWMA7 {
 				if len(function.Args) == 0 {
 					return fmt.Errorf("alpha param missing in query")
 				}
-				alpha := function.Args[0].(float64)
+				alpha, ok := function.Args[0].(float64)
+				if !ok {
+					// if string, attempt to convert to float
+					alpha, err := strconv.ParseFloat(function.Args[0].(string), 64)
+					if err != nil {
+						return fmt.Errorf("alpha param should be a float")
+					}
+					function.Args[0] = alpha
+				}
 				if alpha < 0 || alpha > 1 {
 					return fmt.Errorf("alpha param should be between 0 and 1")
 				}
@@ -740,6 +760,15 @@ func (b *BuilderQuery) Validate() error {
 				if len(function.Args) == 0 {
 					return fmt.Errorf("threshold param missing in query")
 				}
+				_, ok := function.Args[0].(float64)
+				if !ok {
+					// if string, attempt to convert to float
+					threshold, err := strconv.ParseFloat(function.Args[0].(string), 64)
+					if err != nil {
+						return fmt.Errorf("threshold param should be a float")
+					}
+					function.Args[0] = threshold
+				}
 			}
 		}
 	}