From 83d01e7a0d46fb0c8fb3cf4991368380fc27c1e5 Mon Sep 17 00:00:00 2001 From: Raj Kamal Singh <1133322+raj-k-singh@users.noreply.github.com> Date: Tue, 17 Sep 2024 12:38:53 +0530 Subject: [PATCH] fix: dont request query progress reporting if reporting query start failed (#5958) --- pkg/query-service/app/http_handler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index f63f251e11..9411b595a0 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -3656,15 +3656,18 @@ func (aH *APIHandler) queryRangeV3(ctx context.Context, queryRangeParams *v3.Que // Hook up query progress tracking if requested queryIdHeader := r.Header.Get("X-SIGNOZ-QUERY-ID") if len(queryIdHeader) > 0 { - ctx = context.WithValue(ctx, "queryId", queryIdHeader) - onQueryFinished, err := aH.reader.ReportQueryStartForProgressTracking(queryIdHeader) + if err != nil { zap.L().Error( "couldn't report query start for progress tracking", zap.String("queryId", queryIdHeader), zap.Error(err), ) + } else { + // Adding queryId to the context signals clickhouse queries to report progress + ctx = context.WithValue(ctx, "queryId", queryIdHeader) + defer func() { go onQueryFinished() }()