Feat/7077 | Related metrics api

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

@@ -5310,33 +5310,31 @@ func (r *ClickHouseReader) GetMetricsDataPointsAndLastReceived(ctx context.Conte
 	return dataPoints, uint64(lastRecievedTimestamp), nil // Convert to uint64 before returning
 }
 
-func (r *ClickHouseReader) GetTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, uint64, *model.ApiError) {
+func (r *ClickHouseReader) GetTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, *model.ApiError) {
 	query := fmt.Sprintf(`SELECT 
-     uniq(arrayJoin(arrayMap(x -> x.2, arrayFilter(x -> NOT startsWith(x.1, '__'), JSONExtractKeysAndValuesRaw(labels))))) AS cardinality,
     count(DISTINCT fingerprint) AS timeSeriesCount
 FROM %s.%s
-WHERE metric_name = ?;`, signozMetricDBName, signozTSTableNameV41Day)
+WHERE metric_name = ?;`, signozMetricDBName, signozTSTableNameV41Week)
 	var timeSeriesCount uint64
-	var cardinality uint64
-	err := r.db.QueryRow(ctx, query, metricName).Scan(&timeSeriesCount, &cardinality)
+	err := r.db.QueryRow(ctx, query, metricName).Scan(&timeSeriesCount)
 	if err != nil {
-		return 0, 0, &model.ApiError{Typ: "ClickHouseError", Err: err}
+		return 0, &model.ApiError{Typ: "ClickHouseError", Err: err}
 	}
-	return timeSeriesCount, cardinality, nil
+	return timeSeriesCount, nil
 }
 
 func (r *ClickHouseReader) GetAttributesForMetricName(ctx context.Context, metricName string) (*[]metrics_explorer.Attribute, *model.ApiError) {
 	query := fmt.Sprintf(`
 SELECT 
     kv.1 AS key,
-    arrayMap(x -> replaceAll(x, '"', ''), groupUniqArray(kv.2)) AS values,
+    arrayMap(x -> trim(BOTH '\"' FROM x), groupUniqArray(kv.2)) AS values,
     length(groupUniqArray(kv.2)) AS valueCount
 FROM %s.%s
 ARRAY JOIN arrayFilter(x -> NOT startsWith(x.1, '__'), JSONExtractKeysAndValuesRaw(labels)) AS kv
-WHERE metric_name = 'system_memory_usage'
+WHERE metric_name = ?
 GROUP BY kv.1
 ORDER BY valueCount DESC;
-    `, signozMetricDBName, signozTSTableNameV41Day)
+    `, signozMetricDBName, signozTSTableNameV41Week)
 
 	rows, err := r.db.Query(ctx, query, metricName)
 	if err != nil {
@@ -5373,7 +5371,7 @@ ORDER BY valueCount DESC;
 
 func (r *ClickHouseReader) GetActiveTimeSeriesForMetricName(ctx context.Context, metricName string, duration time.Duration) (uint64, *model.ApiError) {
 	milli := time.Now().Add(-duration).UnixMilli()
-	query := fmt.Sprintf("SELECT count(DISTINCT fingerprint) FROM %s.%s WHERE metric_name = '%s' and unix_milli >= ?", signozMetricDBName, signozTSTableNameV41Day, metricName)
+	query := fmt.Sprintf("SELECT count(DISTINCT fingerprint) FROM %s.%s WHERE metric_name = '%s' and unix_milli >= ?", signozMetricDBName, signozTSTableNameV4, metricName)
 	var timeSeries uint64
 	// Using QueryRow instead of Select since we're only expecting a single value
 	err := r.db.QueryRow(ctx, query, milli).Scan(&timeSeries)

pkg/query-service/app/metricsexplorer/summary.go

@@ -108,18 +108,17 @@ func (receiver *SummaryService) GetMetricsSummary(ctx context.Context, metricNam
 
 	// Call 3: GetTotalTimeSeriesForMetricName
 	g.Go(func() error {
-		totalSeries, cardinality, err := receiver.reader.GetTotalTimeSeriesForMetricName(ctx, metricName)
+		totalSeries, err := receiver.reader.GetTotalTimeSeriesForMetricName(ctx, metricName)
 		if err != nil {
 			return err
 		}
 		metricDetailsDTO.TimeSeriesTotal = totalSeries
-		metricDetailsDTO.Cardinality = cardinality
 		return nil
 	})
 
 	// Call 4: GetActiveTimeSeriesForMetricName
 	g.Go(func() error {
-		activeSeries, err := receiver.reader.GetActiveTimeSeriesForMetricName(ctx, metricName, 30*time.Minute)
+		activeSeries, err := receiver.reader.GetActiveTimeSeriesForMetricName(ctx, metricName, 120*time.Minute)
 		if err != nil {
 			return err
 		}

pkg/query-service/interfaces/interface.go

@@ -121,7 +121,7 @@ type Reader interface {
 	GetAllMetricFilterAttributeKeys(ctx context.Context, req *metrics_explorer.FilterKeyRequest, skipDotNames bool) (*[]v3.AttributeKey, *model.ApiError)
 
 	GetMetricsDataPointsAndLastReceived(ctx context.Context, metricName string) (uint64, uint64, *model.ApiError)
-	GetTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, uint64, *model.ApiError)
+	GetTotalTimeSeriesForMetricName(ctx context.Context, metricName string) (uint64, *model.ApiError)
 	GetActiveTimeSeriesForMetricName(ctx context.Context, metricName string, duration time.Duration) (uint64, *model.ApiError)
 	GetAttributesForMetricName(ctx context.Context, metricName string) (*[]metrics_explorer.Attribute, *model.ApiError)
 

pkg/query-service/model/metrics_explorer/summary.go

@@ -86,7 +86,6 @@ type MetricDetailsDTO struct {
 	Description      string      `json:"description"`
 	Type             string      `json:"type"`
 	Unit             string      `json:"unit"`
-	Cardinality      uint64      `json:"cardinality"`
 	DataPoints       uint64      `json:"dataPoints"`
 	TimeSeriesTotal  uint64      `json:"timeSeriesTotal"`
 	TimeSeriesActive uint64      `json:"timeSeriesActive"`