From 85f1aab36339e6a1485f57121e9ba6aa0f94c526 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 28 Oct 2022 16:53:36 +0200
Subject: [PATCH] Prometheus: Chore - Remove incorrect FrameType from exemplar
 frame (#57695) (#57828)

(cherry picked from commit 2cd9cbd35925830dee97d9d18840eadc9d0cbbf3)

Co-authored-by: Kyle Brandt <kyle@grafana.com>
---
 pkg/tsdb/prometheus/buffered/time_series_query.go           | 6 +++++-
 pkg/tsdb/prometheus/buffered/time_series_query_test.go      | 6 +++++-
 pkg/tsdb/prometheus/querydata/response.go                   | 1 -
 pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc   | 2 --
 .../testdata/exemplar.result.streaming-wide.golden.jsonc    | 2 --
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/tsdb/prometheus/buffered/time_series_query.go b/pkg/tsdb/prometheus/buffered/time_series_query.go
index 3a8a5ba8acd..9f5357d73b5 100644
--- a/pkg/tsdb/prometheus/buffered/time_series_query.go
+++ b/pkg/tsdb/prometheus/buffered/time_series_query.go
@@ -601,7 +601,11 @@ func exemplarToDataFrames(response []apiv1.ExemplarQueryResult, query *Prometheu
 		dataFields = append(dataFields, data.NewField(label, nil, labelsVector[label]))
 	}
 
-	return append(frames, newDataFrame("exemplar", "exemplar", dataFields...))
+	newFrame := newDataFrame("exemplar", "exemplar", dataFields...)
+	// unset on exemplars (ugly but this client will be deprecated soon)
+	newFrame.Meta.Type = ""
+
+	return append(frames, newFrame)
 }
 
 func sortedLabels(labelsVector map[string][]string) []string {
diff --git a/pkg/tsdb/prometheus/buffered/time_series_query_test.go b/pkg/tsdb/prometheus/buffered/time_series_query_test.go
index 6749d4deef8..5b27c2051f9 100644
--- a/pkg/tsdb/prometheus/buffered/time_series_query_test.go
+++ b/pkg/tsdb/prometheus/buffered/time_series_query_test.go
@@ -706,7 +706,11 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			data.NewField("traceID", map[string]string{}, []string{"test1", "test2"}),
 			data.NewField("userID", map[string]string{}, []string{"", "test3"}),
 		}
-		if diff := cmp.Diff(newDataFrame("exemplar", "exemplar", fields...), res[0], data.FrameTestCompareOptions()...); diff != "" {
+
+		newFrame := newDataFrame("exemplar", "exemplar", fields...)
+		newFrame.Meta.Type = ""
+
+		if diff := cmp.Diff(newFrame, res[0], data.FrameTestCompareOptions()...); diff != "" {
 			t.Errorf("Result mismatch (-want +got):\n%s", diff)
 		}
 	})
diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go
index 64b0ffe48fb..8d78f02abd9 100644
--- a/pkg/tsdb/prometheus/querydata/response.go
+++ b/pkg/tsdb/prometheus/querydata/response.go
@@ -159,7 +159,6 @@ func processExemplars(q *models.Query, dr *backend.DataResponse) *backend.DataRe
 		// copy the frame metadata to the new exemplar frame
 		exemplarFrame.Meta = frame.Meta
 		exemplarFrame.RefID = frame.RefID
-		frame.Meta.Type = data.FrameTypeTimeSeriesMany
 
 		step := time.Duration(frame.Fields[0].Config.Interval) * time.Millisecond
 		seriesLabels := getSeriesLabels(frame)
diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc b/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc
index 6bd04762af8..4d87b4cf262 100644
--- a/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc
+++ b/pkg/tsdb/prometheus/testdata/exemplar.result.golden.jsonc
@@ -1,7 +1,6 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "timeseries-many",
 //      "custom": {
 //          "resultType": "exemplar"
 //      },
@@ -34,7 +33,6 @@
       "schema": {
         "name": "exemplar",
         "meta": {
-          "type": "timeseries-many",
           "custom": {
             "resultType": "exemplar"
           },
diff --git a/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc b/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc
index 6bd04762af8..4d87b4cf262 100644
--- a/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc
+++ b/pkg/tsdb/prometheus/testdata/exemplar.result.streaming-wide.golden.jsonc
@@ -1,7 +1,6 @@
 //  🌟 This was machine generated.  Do not edit. 🌟
 //  
 //  Frame[0] {
-//      "type": "timeseries-many",
 //      "custom": {
 //          "resultType": "exemplar"
 //      },
@@ -34,7 +33,6 @@
       "schema": {
         "name": "exemplar",
         "meta": {
-          "type": "timeseries-many",
           "custom": {
             "resultType": "exemplar"
           },