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

Chore: Mark prometheus query json unmarshaling errors as downstream error (#112314)

Browse Source 
* mark json unmarshaling errors as downstream

* shortcut
This commit is contained in:
ismail simsek
2025-10-21 09:58:30 +00:00
committed by GitHub
parent 4ac8063bda
commit 5e8294c9d3
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/promlib/models/query.go
+4 -2
View File
@@ -13,11 +13,13 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/gtime"
sdkapi "github.com/grafana/grafana-plugin-sdk-go/experimental/apis/data/v0alpha1"
scope "github.com/grafana/grafana/apps/scope/pkg/apis/scope/v0alpha1"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/trace"
scope "github.com/grafana/grafana/apps/scope/pkg/apis/scope/v0alpha1"
glog "github.com/grafana/grafana-plugin-sdk-go/backend/log"
"github.com/grafana/grafana/pkg/promlib/intervalv2"
)
@@ -164,7 +166,7 @@ type internalQueryModel struct {
func Parse(ctx context.Context, log glog.Logger, span trace.Span, query backend.DataQuery, dsScrapeInterval string, intervalCalculator intervalv2.Calculator, fromAlert bool) (*Query, error) {
model := &internalQueryModel{}
if err := json.Unmarshal(query.JSON, model); err != nil {
return nil, err
return nil, backend.DownstreamErrorf("error unmarshaling query: %w", err)
}
span.SetAttributes(attribute.String("rawExpr", model.Expr))