cleanup

grafana · Sep 5, 2024 · af59d41 · af59d41
1 parent 1cc40d9
commit af59d41
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/pkg/opensearch/lucene_handler.go b/pkg/opensearch/lucene_handler.go
@@ -288,7 +288,6 @@ func (h *luceneHandler) executeQueries(ctx context.Context) (*backend.QueryDataR
 
 	res, err := h.client.ExecuteMultisearch(ctx, req)
 	if err != nil {
-		backend.Logger.Warn("executeMultisearch", "err", err)
 		// We are returning the error containing the source that was added through errorsource.Middleware
 		return errorsource.AddErrorToResponse(h.queries[0].RefID, response, err), nil
 	}

diff --git a/pkg/opensearch/opensearch.go b/pkg/opensearch/opensearch.go
@@ -74,7 +74,7 @@ func (ds *OpenSearchDatasource) QueryData(ctx context.Context, req *backend.Quer
 // handleServiceMapPrefetch inspects the given request, and, if it wants a serviceMap, creates and
 // calls the Prefetch query to get the services and operations lists that are required for
 // the associated Stats query. It then adds these parameters to the originating query so
-// the Stats query can be created later. Returns true if the serviceMap was fetched
+// the Stats query can be created later. Returns a response with an error if the request fails.
 func handleServiceMapPrefetch(ctx context.Context, osClient client.Client, req *backend.QueryDataRequest) *backend.QueryDataResponse {
 	for i, query := range req.Queries {
 		model, err := simplejson.NewJson(query.JSON)

diff --git a/pkg/opensearch/ppl_response_parser.go b/pkg/opensearch/ppl_response_parser.go
@@ -90,7 +90,7 @@ func (rp *pplResponseParser) parsePPLResponse(queryRes *backend.DataResponse, co
 				}
 				ts, err := rp.parseTimestamp(row[fieldIdx], timestampFormat)
 				if err != nil {
-					errResp := errorsource.Response(err)
+					errResp := errorsource.Response(errorsource.PluginError(err, false))
 					return &errResp, nil
 				}
 				value = *utils.NullFloatToNullableTime(ts)
@@ -139,7 +139,7 @@ func (rp *pplResponseParser) parsePPLResponse(queryRes *backend.DataResponse, co
 func (rp *pplResponseParser) parseTimeSeries(queryRes *backend.DataResponse) (*backend.DataResponse, error) {
 	t, err := getTimeSeriesResponseMeta(rp.Response.Schema)
 	if err != nil {
-		errResp := errorsource.Response(err)
+		errResp := errorsource.Response(errorsource.PluginError(err, false))
 		return &errResp, nil
 	}
 
@@ -153,7 +153,7 @@ func (rp *pplResponseParser) parseTimeSeries(queryRes *backend.DataResponse) (*b
 	for i, datarow := range rp.Response.Datarows {
 		err := rp.addDatarow(newFrame, i, datarow, t)
 		if err != nil {
-			errResp := errorsource.Response(err)
+			errResp := errorsource.Response(errorsource.PluginError(err, false))
 			return &errResp, nil
 		}
 	}

diff --git a/pkg/opensearch/response_parser.go b/pkg/opensearch/response_parser.go
@@ -203,7 +203,7 @@ func processTraceSpansResponse(res *client.SearchResponse, queryRes backend.Data
 				{
 					startTime, err := utils.TimeFieldToMilliseconds(v)
 					if err != nil {
-						return errorsource.Response(fmt.Errorf("error parsing startTime '%+v': %w", v, err))
+						return errorsource.Response(errorsource.PluginError(fmt.Errorf("error parsing startTime '%+v': %w", v, err), false))
 					}
 					doc[k] = startTime
 					continue
@@ -270,7 +270,7 @@ func processTraceSpansResponse(res *client.SearchResponse, queryRes backend.Data
 				{
 					spanEvents, stackTraces, err := transformTraceEventsToLogs(v.([]interface{}))
 					if err != nil {
-						return errorsource.Response(fmt.Errorf("error parsing event.time '%+v': %w", v, err))
+						return errorsource.Response(errorsource.PluginError(fmt.Errorf("error parsing event.time '%+v': %w", v, err), false))
 					}
 					if spanHasError && stackTraces != nil {
 						if spanHasError {