rearrange log statements for log15 (#41137)

pkg/tsdb/prometheus/time_series_query.go

@@ -69,7 +69,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
 		if query.RangeQuery {
 			rangeResponse, _, err := client.QueryRange(ctx, query.Expr, timeRange)
 			if err != nil {
-				plog.Error("Range query", query.Expr, "failed with", err)
+				plog.Error("Range query failed", "query", query.Expr, "err", err)
 				result.Responses[query.RefId] = backend.DataResponse{Error: err}
 			} else {
 				response[RangeQueryType] = rangeResponse
@@ -79,7 +79,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
 		if query.InstantQuery {
 			instantResponse, _, err := client.Query(ctx, query.Expr, query.End)
 			if err != nil {
-				plog.Error("Instant query", query.Expr, "failed with", err)
+				plog.Error("Instant query failed", "query", query.Expr, "err", err)
 				result.Responses[query.RefId] = backend.DataResponse{Error: err}
 			} else {
 				response[InstantQueryType] = instantResponse
@@ -89,7 +89,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
 		if query.ExemplarQuery {
 			exemplarResponse, err := client.QueryExemplars(ctx, query.Expr, timeRange.Start, timeRange.End)
 			if err != nil {
-				plog.Error("Exemplar query", query.Expr, "failed with", err)
+				plog.Error("Exemplar query failed", "query", query.Expr, "err", err)
 				result.Responses[query.RefId] = backend.DataResponse{Error: err}
 			} else {
 				response[ExemplarQueryType] = exemplarResponse
@@ -230,7 +230,7 @@ func parseTimeSeriesResponse(value map[TimeSeriesQueryType]interface{}, query *P
 		case []apiv1.ExemplarQueryResult:
 			nextFrames = exemplarToDataFrames(v, query, nextFrames)
 		default:
-			plog.Error("Query", query.Expr, "returned unexpected result type", v)
+			plog.Error("Query returned unexpected result type", "type", v, "query", query.Expr)
 			continue
 		}