GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 16:38:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(metrics-explorer): added time filter in inner sub queries of list and samples (#7436)

Browse Source
This commit is contained in:
aniketio-ctrl 2025-03-26 15:27:21 +05:30 committed by GitHub
parent 8998ca652e
commit 72207691a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 64 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -1143,7 +1143,7 @@ func (r *ClickHouseReader) GetUsage(ctx context.Context, queryParams *model.GetU
func (r *ClickHouseReader) SearchTracesV2(ctx context.Context, params *model.SearchTracesParams, func (r *ClickHouseReader) SearchTracesV2(ctx context.Context, params *model.SearchTracesParams,
smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string, smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string,
levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) {
searchSpansResult := []model.SearchSpansResult{ searchSpansResult := []model.SearchSpansResult{
{ {
Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError", "StatusMessage", "StatusCodeString", "SpanKind"}, Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError", "StatusMessage", "StatusCodeString", "SpanKind"},
@ -1291,7 +1291,7 @@ func (r *ClickHouseReader) SearchTracesV2(ctx context.Context, params *model.Sea
func (r *ClickHouseReader) SearchTraces(ctx context.Context, params *model.SearchTracesParams, func (r *ClickHouseReader) SearchTraces(ctx context.Context, params *model.SearchTracesParams,
smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string, smartTraceAlgorithm func(payload []model.SearchSpanResponseItem, targetSpanId string,
levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) { levelUp int, levelDown int, spanLimit int) ([]model.SearchSpansResult, error)) (*[]model.SearchSpansResult, error) {
if r.useTraceNewSchema { if r.useTraceNewSchema {
return r.SearchTracesV2(ctx, params, smartTraceAlgorithm) return r.SearchTracesV2(ctx, params, smartTraceAlgorithm)
@ -5982,10 +5982,10 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
} }
firstQueryLimit := req.Limit firstQueryLimit := req.Limit
dataPointsOrder := false samplesOrder := false
var orderByClauseFirstQuery string var orderByClauseFirstQuery string
if req.OrderBy.ColumnName == "samples" { if req.OrderBy.ColumnName == "samples" {
dataPointsOrder = true samplesOrder = true
orderByClauseFirstQuery = fmt.Sprintf("ORDER BY timeseries %s", req.OrderBy.Order) orderByClauseFirstQuery = fmt.Sprintf("ORDER BY timeseries %s", req.OrderBy.Order)
if req.Limit < 50 { if req.Limit < 50 {
firstQueryLimit = 50 firstQueryLimit = 50
@ -5995,8 +5995,8 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
} }
// Determine which tables to use // Determine which tables to use
start, end, tsTable, localTsTable := utils.WhichTSTableToUse(req.Start, req.EndD) start, end, tsTable, localTsTable := utils.WhichTSTableToUse(req.Start, req.End)
sampleTable, countExp := utils.WhichSampleTableToUse(req.Start, req.EndD) sampleTable, countExp := utils.WhichSampleTableToUse(req.Start, req.End)
metricsQuery := fmt.Sprintf( metricsQuery := fmt.Sprintf(
`SELECT `SELECT
@ -6018,7 +6018,10 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
args = append(args, start, end) args = append(args, start, end)
valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads) valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads)
begin := time.Now()
rows, err := r.db.Query(valueCtx, metricsQuery, args...) rows, err := r.db.Query(valueCtx, metricsQuery, args...)
queryDuration := time.Since(begin)
zap.L().Info("Time taken to execute metrics query to fetch metrics with high time series", zap.String("query", metricsQuery), zap.Any("args", args), zap.Duration("duration", queryDuration))
if err != nil { if err != nil {
zap.L().Error("Error executing metrics query", zap.Error(err)) zap.L().Error("Error executing metrics query", zap.Error(err))
return &metrics_explorer.SummaryListMetricsResponse{}, &model.ApiError{Typ: "ClickHouseError", Err: err} return &metrics_explorer.SummaryListMetricsResponse{}, &model.ApiError{Typ: "ClickHouseError", Err: err}
@ -6049,12 +6052,12 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
// Build a comma-separated list of quoted metric names. // Build a comma-separated list of quoted metric names.
metricsList := "'" + strings.Join(metricNames, "', '") + "'" metricsList := "'" + strings.Join(metricNames, "', '") + "'"
// If samples are being sorted by datapoints, update the ORDER clause. // If samples are being sorted by datapoints, update the ORDER clause.
if dataPointsOrder { if samplesOrder {
orderByClauseFirstQuery = fmt.Sprintf("ORDER BY s.samples %s", req.OrderBy.Order) orderByClauseFirstQuery = fmt.Sprintf("ORDER BY s.samples %s", req.OrderBy.Order)
} else { } else {
orderByClauseFirstQuery = "" orderByClauseFirstQuery = ""
} }
args = make([]interface{}, 0)
var sampleQuery string var sampleQuery string
var sb strings.Builder var sb strings.Builder
@ -6062,13 +6065,11 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
sb.WriteString(fmt.Sprintf( sb.WriteString(fmt.Sprintf(
`SELECT `SELECT
s.samples, s.samples,
s.metric_name, s.metric_name
s.lastReceived
FROM ( FROM (
SELECT SELECT
dm.metric_name, dm.metric_name,
%s AS samples, %s AS samples
MAX(dm.unix_milli) AS lastReceived
FROM %s.%s AS dm FROM %s.%s AS dm
WHERE dm.metric_name IN (%s) WHERE dm.metric_name IN (%s)
AND dm.fingerprint IN ( AND dm.fingerprint IN (
@ -6076,6 +6077,7 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
FROM %s.%s FROM %s.%s
WHERE metric_name IN (%s) WHERE metric_name IN (%s)
AND __normalized = true AND __normalized = true
AND unix_milli BETWEEN ? AND ?
%s %s
GROUP BY fingerprint GROUP BY fingerprint
) )
@ -6089,18 +6091,18 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
metricsList, metricsList,
whereClause, whereClause,
)) ))
args = append(args, start, end)
args = append(args, req.Start, req.End)
} else { } else {
// If no filters, it is a simpler query. // If no filters, it is a simpler query.
sb.WriteString(fmt.Sprintf( sb.WriteString(fmt.Sprintf(
`SELECT `SELECT
s.samples, s.samples,
s.metric_name, s.metric_name
s.lastReceived
FROM ( FROM (
SELECT SELECT
metric_name, metric_name,
%s AS samples, %s AS samples
MAX(unix_milli) AS lastReceived
FROM %s.%s FROM %s.%s
WHERE metric_name IN (%s) WHERE metric_name IN (%s)
AND unix_milli BETWEEN ? AND ? AND unix_milli BETWEEN ? AND ?
@ -6109,6 +6111,7 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
countExp, countExp,
signozMetricDBName, sampleTable, signozMetricDBName, sampleTable,
metricsList)) metricsList))
args = append(args, req.Start, req.End)
} }
// Append ORDER BY clause if provided. // Append ORDER BY clause if provided.
@ -6119,10 +6122,10 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
// Append LIMIT clause. // Append LIMIT clause.
sb.WriteString(fmt.Sprintf("LIMIT %d;", req.Limit)) sb.WriteString(fmt.Sprintf("LIMIT %d;", req.Limit))
sampleQuery = sb.String() sampleQuery = sb.String()
begin = time.Now()
// Append the time boundaries for sampleQuery.
args = append(args, start, end)
rows, err = r.db.Query(valueCtx, sampleQuery, args...) rows, err = r.db.Query(valueCtx, sampleQuery, args...)
queryDuration = time.Since(begin)
zap.L().Info("Time taken to execute list summary query", zap.String("query", sampleQuery), zap.Any("args", args), zap.Duration("duration", queryDuration))
if err != nil { if err != nil {
zap.L().Error("Error executing samples query", zap.Error(err)) zap.L().Error("Error executing samples query", zap.Error(err))
return &response, &model.ApiError{Typ: "ClickHouseError", Err: err} return &response, &model.ApiError{Typ: "ClickHouseError", Err: err}
@ -6130,18 +6133,15 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
defer rows.Close() defer rows.Close()
samplesMap := make(map[string]uint64) samplesMap := make(map[string]uint64)
lastReceivedMap := make(map[string]int64)
for rows.Next() { for rows.Next() {
var samples uint64 var samples uint64
var metricName string var metricName string
var lastReceived int64 if err := rows.Scan(&samples, &metricName); err != nil {
if err := rows.Scan(&samples, &metricName, &lastReceived); err != nil {
zap.L().Error("Error scanning sample row", zap.Error(err)) zap.L().Error("Error scanning sample row", zap.Error(err))
return &response, &model.ApiError{Typ: "ClickHouseError", Err: err} return &response, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
samplesMap[metricName] = samples samplesMap[metricName] = samples
lastReceivedMap[metricName] = lastReceived
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
zap.L().Error("Error iterating over sample rows", zap.Error(err)) zap.L().Error("Error iterating over sample rows", zap.Error(err))
@ -6167,16 +6167,13 @@ func (r *ClickHouseReader) ListSummaryMetrics(ctx context.Context, req *metrics_
} }
if samples, exists := samplesMap[response.Metrics[i].MetricName]; exists { if samples, exists := samplesMap[response.Metrics[i].MetricName]; exists {
response.Metrics[i].Samples = samples response.Metrics[i].Samples = samples
if lastReceived, exists := lastReceivedMap[response.Metrics[i].MetricName]; exists {
response.Metrics[i].LastReceived = lastReceived
}
filteredMetrics = append(filteredMetrics, response.Metrics[i]) filteredMetrics = append(filteredMetrics, response.Metrics[i])
} }
} }
response.Metrics = filteredMetrics response.Metrics = filteredMetrics
// If ordering by samples, sort in-memory. // If ordering by samples, sort in-memory.
if dataPointsOrder { if samplesOrder {
sort.Slice(response.Metrics, func(i, j int) bool { sort.Slice(response.Metrics, func(i, j int) bool {
return response.Metrics[i].Samples > response.Metrics[j].Samples return response.Metrics[i].Samples > response.Metrics[j].Samples
}) })
@ -6194,7 +6191,7 @@ func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, r
if len(conditions) > 0 { if len(conditions) > 0 {
whereClause = "AND " + strings.Join(conditions, " AND ") whereClause = "AND " + strings.Join(conditions, " AND ")
} }
start, end, tsTable, _ := utils.WhichTSTableToUse(req.Start, req.EndD) start, end, tsTable, _ := utils.WhichTSTableToUse(req.Start, req.End)
// Construct the query without backticks // Construct the query without backticks
query := fmt.Sprintf(` query := fmt.Sprintf(`
@ -6224,26 +6221,29 @@ func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, r
) )
args = append(args, args = append(args,
start, end, // For total_cardinality subquery start, end, // For total_time_series subquery
start, end, // For main query start, end, // For main query
) )
valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads) valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads)
begin := time.Now()
rows, err := r.db.Query(valueCtx, query, args...) rows, err := r.db.Query(valueCtx, query, args...)
duration := time.Since(begin)
zap.L().Info("Time taken to execute time series percentage query", zap.String("query", query), zap.Any("args", args), zap.Duration("duration", duration))
if err != nil { if err != nil {
zap.L().Error("Error executing cardinality query", zap.Error(err), zap.String("query", query)) zap.L().Error("Error executing time series percentage query", zap.Error(err), zap.String("query", query))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
defer rows.Close() defer rows.Close()
var heatmap []metrics_explorer.TreeMapResponseItem var treemap []metrics_explorer.TreeMapResponseItem
for rows.Next() { for rows.Next() {
var item metrics_explorer.TreeMapResponseItem var item metrics_explorer.TreeMapResponseItem
if err := rows.Scan(&item.MetricName, &item.TotalValue, &item.Percentage); err != nil { if err := rows.Scan(&item.MetricName, &item.TotalValue, &item.Percentage); err != nil {
zap.L().Error("Error scanning row", zap.Error(err)) zap.L().Error("Error scanning row", zap.Error(err))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
heatmap = append(heatmap, item) treemap = append(treemap, item)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
@ -6251,11 +6251,10 @@ func (r *ClickHouseReader) GetMetricsTimeSeriesPercentage(ctx context.Context, r
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
return &heatmap, nil return &treemap, nil
} }
func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req *metrics_explorer.TreeMapMetricsRequest) (*[]metrics_explorer.TreeMapResponseItem, *model.ApiError) { func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req *metrics_explorer.TreeMapMetricsRequest) (*[]metrics_explorer.TreeMapResponseItem, *model.ApiError) {
var args []interface{}
conditions, _ := utils.BuildFilterConditions(&req.Filters, "ts") conditions, _ := utils.BuildFilterConditions(&req.Filters, "ts")
whereClause := "" whereClause := ""
@ -6264,8 +6263,8 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
} }
// Determine time range and tables to use // Determine time range and tables to use
start, end, tsTable, localTsTable := utils.WhichTSTableToUse(req.Start, req.EndD) start, end, tsTable, localTsTable := utils.WhichTSTableToUse(req.Start, req.End)
sampleTable, countExp := utils.WhichSampleTableToUse(req.Start, req.EndD) sampleTable, countExp := utils.WhichSampleTableToUse(req.Start, req.End)
queryLimit := 50 + req.Limit queryLimit := 50 + req.Limit
metricsQuery := fmt.Sprintf( metricsQuery := fmt.Sprintf(
@ -6284,9 +6283,12 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
) )
valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads) valueCtx := context.WithValue(ctx, "clickhouse_max_threads", constants.MetricsExplorerClickhouseThreads)
begin := time.Now()
rows, err := r.db.Query(valueCtx, metricsQuery, start, end) rows, err := r.db.Query(valueCtx, metricsQuery, start, end)
duration := time.Since(begin)
zap.L().Info("Time taken to execute samples percentage metric name query to reduce search space", zap.String("query", metricsQuery), zap.Any("start", start), zap.Any("end", end), zap.Duration("duration", duration))
if err != nil { if err != nil {
zap.L().Error("Error executing metrics query", zap.Error(err)) zap.L().Error("Error executing samples percentage query", zap.Error(err))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
defer rows.Close() defer rows.Close()
@ -6317,7 +6319,6 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
// Build optimized query with JOIN but `unix_milli` filter only on the sample table // Build optimized query with JOIN but `unix_milli` filter only on the sample table
var sb strings.Builder var sb strings.Builder
sb.WriteString(fmt.Sprintf( sb.WriteString(fmt.Sprintf(
`WITH TotalSamples AS ( `WITH TotalSamples AS (
SELECT %s AS total_samples SELECT %s AS total_samples
@ -6338,8 +6339,14 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
countExp, signozMetricDBName, sampleTable, // Inner select samples countExp, signozMetricDBName, sampleTable, // Inner select samples
)) ))
var args []interface{}
args = append(args,
req.Start, req.End, // For total_samples subquery
)
// Apply `unix_milli` filter **only** on the sample table (`dm`) // Apply `unix_milli` filter **only** on the sample table (`dm`)
sb.WriteString(` WHERE dm.unix_milli BETWEEN ? AND ?`) sb.WriteString(` WHERE dm.unix_milli BETWEEN ? AND ?`)
args = append(args, req.Start, req.End)
// Use JOIN instead of IN (subquery) when additional filters exist // Use JOIN instead of IN (subquery) when additional filters exist
if whereClause != "" { if whereClause != "" {
@ -6348,12 +6355,14 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
SELECT ts.fingerprint SELECT ts.fingerprint
FROM %s.%s AS ts FROM %s.%s AS ts
WHERE ts.metric_name IN (%s) WHERE ts.metric_name IN (%s)
AND unix_milli BETWEEN ? AND ?
AND __normalized = true AND __normalized = true
%s %s
GROUP BY ts.fingerprint GROUP BY ts.fingerprint
)`, )`,
signozMetricDBName, localTsTable, metricsList, whereClause, signozMetricDBName, localTsTable, metricsList, whereClause,
)) ))
args = append(args, start, end)
} }
// Apply metric filtering after all conditions // Apply metric filtering after all conditions
@ -6366,14 +6375,16 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
LIMIT ?;`, LIMIT ?;`,
metricsList, metricsList,
)) ))
args = append(args, req.Limit)
sampleQuery := sb.String() sampleQuery := sb.String()
// Add start and end time to args (only for sample table) // Add start and end time to args (only for sample table)
args = append(args, start, end, start, end, req.Limit)
begin = time.Now()
// Execute the sample percentage query // Execute the sample percentage query
rows, err = r.db.Query(valueCtx, sampleQuery, args...) rows, err = r.db.Query(valueCtx, sampleQuery, args...)
duration = time.Since(begin)
zap.L().Info("Time taken to execute samples percentage query", zap.String("query", sampleQuery), zap.Any("args", args), zap.Duration("duration", duration))
if err != nil { if err != nil {
zap.L().Error("Error executing samples query", zap.Error(err)) zap.L().Error("Error executing samples query", zap.Error(err))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
@ -6381,21 +6392,21 @@ func (r *ClickHouseReader) GetMetricsSamplesPercentage(ctx context.Context, req
defer rows.Close() defer rows.Close()
// Process the results into a response slice // Process the results into a response slice
var heatmap []metrics_explorer.TreeMapResponseItem var treemap []metrics_explorer.TreeMapResponseItem
for rows.Next() { for rows.Next() {
var item metrics_explorer.TreeMapResponseItem var item metrics_explorer.TreeMapResponseItem
if err := rows.Scan(&item.TotalValue, &item.MetricName, &item.Percentage); err != nil { if err := rows.Scan(&item.TotalValue, &item.MetricName, &item.Percentage); err != nil {
zap.L().Error("Error scanning row", zap.Error(err)) zap.L().Error("Error scanning row", zap.Error(err))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
heatmap = append(heatmap, item) treemap = append(treemap, item)
} }
if err := rows.Err(); err != nil { if err := rows.Err(); err != nil {
zap.L().Error("Error iterating over sample rows", zap.Error(err)) zap.L().Error("Error iterating over sample rows", zap.Error(err))
return nil, &model.ApiError{Typ: "ClickHouseError", Err: err} return nil, &model.ApiError{Typ: "ClickHouseError", Err: err}
} }
return &heatmap, nil return &treemap, nil
} }
func (r *ClickHouseReader) GetNameSimilarity(ctx context.Context, req *metrics_explorer.RelatedMetricsRequest) (map[string]metrics_explorer.RelatedMetricsScore, *model.ApiError) { func (r *ClickHouseReader) GetNameSimilarity(ctx context.Context, req *metrics_explorer.RelatedMetricsRequest) (map[string]metrics_explorer.RelatedMetricsScore, *model.ApiError) {

12
pkg/query-service/app/metricsexplorer/summary.go
View File

@ -225,21 +225,21 @@ func (receiver *SummaryService) GetMetricsTreemap(ctx context.Context, params *m
var response metrics_explorer.TreeMap var response metrics_explorer.TreeMap
switch params.Treemap { switch params.Treemap {
case metrics_explorer.TimeSeriesTeeMap: case metrics_explorer.TimeSeriesTeeMap:
cardinality, apiError := receiver.reader.GetMetricsTimeSeriesPercentage(ctx, params) ts, apiError := receiver.reader.GetMetricsTimeSeriesPercentage(ctx, params)
if apiError != nil { if apiError != nil {
return nil, apiError return nil, apiError
} }
if cardinality != nil { if ts != nil {
response.TimeSeries = *cardinality response.TimeSeries = *ts
} }
return &response, nil return &response, nil
case metrics_explorer.SamplesTreeMap: case metrics_explorer.SamplesTreeMap:
dataPoints, apiError := receiver.reader.GetMetricsSamplesPercentage(ctx, params) samples, apiError := receiver.reader.GetMetricsSamplesPercentage(ctx, params)
if apiError != nil { if apiError != nil {
return nil, apiError return nil, apiError
} }
if dataPoints != nil { if samples != nil {
response.Samples = *dataPoints response.Samples = *samples
} }
return &response, nil return &response, nil
default: default:

4
pkg/query-service/app/summary.go
View File

@ -89,13 +89,13 @@ func (aH *APIHandler) GetTreeMap(w http.ResponseWriter, r *http.Request) {
ctx := r.Context() ctx := r.Context()
params, apiError := explorer.ParseTreeMapMetricsParams(r) params, apiError := explorer.ParseTreeMapMetricsParams(r)
if apiError != nil { if apiError != nil {
zap.L().Error("error parsing heatmap metric params", zap.Error(apiError.Err)) zap.L().Error("error parsing tree map metric params", zap.Error(apiError.Err))
RespondError(w, apiError, nil) RespondError(w, apiError, nil)
return return
} }
result, apiError := aH.SummaryService.GetMetricsTreemap(ctx, params) result, apiError := aH.SummaryService.GetMetricsTreemap(ctx, params)
if apiError != nil { if apiError != nil {
zap.L().Error("error getting heatmap data", zap.Error(apiError.Err)) zap.L().Error("error getting tree map data", zap.Error(apiError.Err))
RespondError(w, apiError, nil) RespondError(w, apiError, nil)
return return
} }

4
pkg/query-service/model/metrics_explorer/summary.go
View File

@ -9,7 +9,7 @@ type SummaryListMetricsRequest struct {
Limit int `json:"limit"` Limit int `json:"limit"`
OrderBy v3.OrderBy `json:"orderBy"` OrderBy v3.OrderBy `json:"orderBy"`
Start int64 `json:"start"` Start int64 `json:"start"`
EndD int64 `json:"end"` End int64 `json:"end"`
Filters v3.FilterSet `json:"filters"` Filters v3.FilterSet `json:"filters"`
} }
@ -24,7 +24,7 @@ type TreeMapMetricsRequest struct {
Limit int `json:"limit"` Limit int `json:"limit"`
Treemap TreeMapType `json:"treemap"` Treemap TreeMapType `json:"treemap"`
Start int64 `json:"start"` Start int64 `json:"start"`
EndD int64 `json:"end"` End int64 `json:"end"`
Filters v3.FilterSet `json:"filters"` Filters v3.FilterSet `json:"filters"`
} }