Make tsdb dataframes response able to carry encoded/decoded frames (#25454)

Make tsdb dataframes response able to carry encoded and/or decoded frames

pkg/tsdb/cloudwatch/cloudwatch.go

@@ -7,6 +7,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/aws/aws-sdk-go/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface"
@@ -202,37 +204,23 @@ func (e *CloudWatchExecutor) executeLogAlertQuery(ctx context.Context, queryCont
 			return nil, err
 		}
 
-		encodedFrames := make([][]byte, 0)
-		for _, frame := range groupedFrames {
-			dataframeEnc, err := frame.MarshalArrow()
-			if err != nil {
-				return nil, err
-			}
-			encodedFrames = append(encodedFrames, dataframeEnc)
-		}
-
 		response := &tsdb.Response{
 			Results: make(map[string]*tsdb.QueryResult),
 		}
 
 		response.Results["A"] = &tsdb.QueryResult{
 			RefId:      "A",
-			Dataframes: encodedFrames,
+			Dataframes: tsdb.NewDecodedDataFrames(groupedFrames),
 		}
 
 		return response, nil
 	}
 
-	dataframeEnc, err := dataframe.MarshalArrow()
-	if err != nil {
-		return nil, err
-	}
-
 	response := &tsdb.Response{
 		Results: map[string]*tsdb.QueryResult{
 			"A": {
 				RefId:      "A",
-				Dataframes: [][]byte{dataframeEnc},
+				Dataframes: tsdb.NewDecodedDataFrames(data.Frames{dataframe}),
 			},
 		},
 	}

pkg/tsdb/cloudwatch/log_actions.go

@@ -41,25 +41,11 @@ func (e *CloudWatchExecutor) executeLogActions(ctx context.Context, queryContext
 					return err
 				}
 
-				encodedFrames := make([][]byte, 0)
-				for _, frame := range groupedFrames {
-					dataframeEnc, err := frame.MarshalArrow()
-					if err != nil {
-						return err
-					}
-					encodedFrames = append(encodedFrames, dataframeEnc)
-				}
-
-				resultChan <- &tsdb.QueryResult{RefId: query.RefId, Dataframes: encodedFrames}
+				resultChan <- &tsdb.QueryResult{RefId: query.RefId, Dataframes: tsdb.NewDecodedDataFrames(groupedFrames)}
 				return nil
 			}
 
-			dataframeEnc, err := dataframe.MarshalArrow()
-			if err != nil {
-				return err
-			}
-
-			resultChan <- &tsdb.QueryResult{RefId: query.RefId, Dataframes: [][]byte{dataframeEnc}}
+			resultChan <- &tsdb.QueryResult{RefId: query.RefId, Dataframes: tsdb.NewDecodedDataFrames(data.Frames{dataframe})}
 			return nil
 		})
 	}