SSE: Localize/Contain Errors within an Expression (#73163)

Changes SSE to not always fail all queries when one fails. Now only the query itself, and nodes that depend on it will error.
---------

Co-authored-by: Gilles De Mey <gilles.de.mey@gmail.com>
This commit is contained in:
Kyle Brandt
2023-09-13 13:58:16 -04:00
committed by GitHub
co-authored by Gilles De Mey
parent 01755608db
commit 35e488b22b
25 changed files with 663 additions and 679 deletions
+40 -1
View File
@@ -2,6 +2,7 @@ package expr
import (
"errors"
"fmt"
"github.com/grafana/grafana/pkg/util/errutil"
)
@@ -13,7 +14,7 @@ var ConversionError = errutil.BadRequest("sse.readDataError").MustTemplate(
),
)
func MakeConversionError(refID string, err error) error {
func makeConversionError(refID string, err error) error {
data := errutil.TemplateData{
// Conversion errors should only have meta information in errors
Public: map[string]any{
@@ -52,3 +53,41 @@ func MakeQueryError(refID, datasourceUID string, err error) error {
return QueryError.Build(data)
}
var depErrStr = "did not execute expression [{{ .Public.refId }}] due to a failure to of the dependent expression or query [{{.Public.depRefId}}]"
var DependencyError = errutil.NewBase(
errutil.StatusBadRequest, "sse.dependencyError").MustTemplate(
depErrStr,
errutil.WithPublic(depErrStr))
func makeDependencyError(refID, depRefID string) error {
data := errutil.TemplateData{
Public: map[string]interface{}{
"refId": refID,
"depRefId": depRefID,
},
Error: fmt.Errorf("did not execute expression %v due to a failure to of the dependent expression or query %v", refID, depRefID),
}
return DependencyError.Build(data)
}
var unexpectedNodeTypeErrString = "expected executable node type but got node type [{{ .Public.nodeType }} for refid [{{ .Public.refId}}]"
var UnexpectedNodeTypeError = errutil.NewBase(
errutil.StatusBadRequest, "sse.unexpectedNodeType").MustTemplate(
unexpectedNodeTypeErrString,
errutil.WithPublic(unexpectedNodeTypeErrString))
func makeUnexpectedNodeTypeError(refID, nodeType string) error {
data := errutil.TemplateData{
Public: map[string]interface{}{
"refId": refID,
"nodeType": nodeType,
},
Error: fmt.Errorf("expected executable node type but got node type %v for refId %v", nodeType, refID),
}
return UnexpectedNodeTypeError.Build(data)
}