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

Revert "Loki: Add error source to DataQuery (#77876)" (#78006)

Browse Source 
This reverts commit 934456dc1c.
This commit is contained in:
Ivana Huckova
2023-11-10 17:03:59 +01:00
committed by GitHub
parent c7442c0fd2
commit 8cd8eb7882
5 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tsdb/loki/loki.go
+20 -14
View File
@@ -13,10 +13,8 @@ import (
"github.com/grafana/dskit/concurrency"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
"github.com/grafana/grafana-plugin-sdk-go/backend/instancemgmt"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana-plugin-sdk-go/experimental/errorsource"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
"go.opentelemetry.io/otel/trace"
@@ -97,7 +95,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
return nil, err
}
opts.Middlewares = append(sdkhttpclient.DefaultMiddlewares(), errorsource.Middleware("errorsource"))
client, err := httpClientProvider.New(opts)
if err != nil {
return nil, err
@@ -242,28 +239,37 @@ func executeQuery(ctx context.Context, query *lokiQuery, req *backend.QueryDataR
defer span.End()
res := runQuery(ctx, api, query, responseOpts, plog)
return res
frames, err := runQuery(ctx, api, query, responseOpts, plog)
queryRes := backend.DataResponse{}
if err != nil {
span.RecordError(err)
span.SetStatus(codes.Error, err.Error())
queryRes.Error = err
} else {
queryRes.Frames = frames
}
return queryRes
}
// we extracted this part of the functionality to make it easy to unit-test it
func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts ResponseOpts, plog log.Logger) backend.DataResponse {
dataResponse := api.DataQuery(ctx, *query, responseOpts)
if dataResponse.Error != nil {
plog.Error("Error querying loki", "error", dataResponse.Error)
return dataResponse
func runQuery(ctx context.Context, api *LokiAPI, query *lokiQuery, responseOpts ResponseOpts, plog log.Logger) (data.Frames, error) {
frames, err := api.DataQuery(ctx, *query, responseOpts)
if err != nil {
plog.Error("Error querying loki", "error", err)
return data.Frames{}, err
}
for _, frame := range dataResponse.Frames {
err := adjustFrame(frame, query, !responseOpts.metricDataplane, responseOpts.logsDataplane)
for _, frame := range frames {
err = adjustFrame(frame, query, !responseOpts.metricDataplane, responseOpts.logsDataplane)
if err != nil {
plog.Error("Error adjusting frame", "error", err)
return errorsource.Response(errorsource.PluginError(err, false))
return data.Frames{}, err
}
}
return dataResponse
return frames, nil
}
func (s *Service) getDSInfo(ctx context.Context, pluginCtx backend.PluginContext) (*datasourceInfo, error) {