public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

query service: improve error handling and logging (#108948)

Browse Source 
Co-authored-by: Sarah Zinger sarah.zinger@grafana.com
Co-authored-by: Gábor Farkas gabor.farkas@gmail.com
This commit is contained in:
Adam Simpson
2025-07-31 14:10:21 -04:00
committed by GitHub
co-authored by Sarah Zinger sarah.zinger@grafana.com Gábor Farkas gabor.farkas@gmail.com
parent e0dd56e4c7
commit 2d1271e981
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/registry/apis/query/query.go
+23 -4
View File
@@ -3,9 +3,11 @@ package query
import (
"context"
"encoding/json"
"errors"
"net/http"
"slices"
"strconv"
"strings"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
@@ -187,9 +189,25 @@ func (r *queryREST) Connect(connectCtx context.Context, name string, _ runtime.O
})
return
} else {
// return the error to the client, will send all non k8s errors as a k8 unexpected error
b.log.Error("hit unexpected error while executing query, this will show as an unhandled k8s status error", "err", err)
responder.Error(err)
var errorDataResponse backend.DataResponse
if errors.Is(err, service.ErrInvalidDatasourceID) || errors.Is(err, service.ErrNoQueriesFound) || errors.Is(err, service.ErrMissingDataSourceInfo) || errors.Is(err, service.ErrQueryParamMismatch) || errors.Is(err, service.ErrDuplicateRefId) {
errorDataResponse = backend.ErrDataResponseWithSource(backend.StatusBadRequest, backend.ErrorSourceDownstream, err.Error())
} else if strings.Contains(err.Error(), "expression request error") {
b.log.Error("Error calling TransformData in an expression", "err", err)
errorDataResponse = backend.ErrDataResponseWithSource(backend.StatusBadRequest, backend.ErrorSourceDownstream, err.Error())
} else {
b.log.Error("unknown error, treated as a 500", "err", err)
responder.Error(err)
return
}
qdr = &backend.QueryDataResponse{
Responses: map[string]backend.DataResponse{
"A": errorDataResponse,
},
}
responder.Object(query.GetResponseCode(qdr), &query.QueryDataResponse{
QueryDataResponse: *qdr,
})
return
}
}
@@ -215,6 +233,7 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
jsonQueries = append(jsonQueries, sjQuery)
}
mReq := dtos.MetricRequest{
From: raw.From,
To: raw.To,
@@ -234,7 +253,7 @@ func handleQuery(ctx context.Context, raw query.QueryDataRequest, b QueryAPIBuil
return nil, err
}
dsQuerierLoggerWithSlug := connectLogger.New("slug", instanceConfig.Options["slug"])
dsQuerierLoggerWithSlug := connectLogger.New("slug", instanceConfig.Options["slug"], "ruleuid", headers["X-Rule-Uid"])
mtDsClientBuilder := mtdsclient.NewMtDatasourceClientBuilderWithClientSupplier(
b.clientSupplier,