Prometheus: Chore - Remove incorrect FrameType from exemplar frame (#57695)

This commit is contained in:
Kyle Brandt 2022-10-28 09:15:01 -04:00 committed by GitHub
parent 6a6fdbc1f9
commit 2cd9cbd359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions

View File

@ -598,7 +598,11 @@ func exemplarToDataFrames(response []apiv1.ExemplarQueryResult, query *Prometheu
dataFields = append(dataFields, data.NewField(label, nil, labelsVector[label])) 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 { func sortedLabels(labelsVector map[string][]string) []string {

View File

@ -706,7 +706,11 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
data.NewField("traceID", map[string]string{}, []string{"test1", "test2"}), data.NewField("traceID", map[string]string{}, []string{"test1", "test2"}),
data.NewField("userID", map[string]string{}, []string{"", "test3"}), 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) t.Errorf("Result mismatch (-want +got):\n%s", diff)
} }
}) })

View File

@ -160,7 +160,6 @@ func processExemplars(q *models.Query, dr *backend.DataResponse) *backend.DataRe
// copy the frame metadata to the new exemplar frame // copy the frame metadata to the new exemplar frame
exemplarFrame.Meta = frame.Meta exemplarFrame.Meta = frame.Meta
exemplarFrame.RefID = frame.RefID exemplarFrame.RefID = frame.RefID
frame.Meta.Type = data.FrameTypeTimeSeriesMany
step := time.Duration(frame.Fields[0].Config.Interval) * time.Millisecond step := time.Duration(frame.Fields[0].Config.Interval) * time.Millisecond
seriesLabels := getSeriesLabels(frame) seriesLabels := getSeriesLabels(frame)

View File

@ -1,7 +1,6 @@
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
// //
// Frame[0] { // Frame[0] {
// "type": "timeseries-many",
// "custom": { // "custom": {
// "resultType": "exemplar" // "resultType": "exemplar"
// }, // },
@ -34,7 +33,6 @@
"schema": { "schema": {
"name": "exemplar", "name": "exemplar",
"meta": { "meta": {
"type": "timeseries-many",
"custom": { "custom": {
"resultType": "exemplar" "resultType": "exemplar"
}, },

View File

@ -1,7 +1,6 @@
// 🌟 This was machine generated. Do not edit. 🌟 // 🌟 This was machine generated. Do not edit. 🌟
// //
// Frame[0] { // Frame[0] {
// "type": "timeseries-many",
// "custom": { // "custom": {
// "resultType": "exemplar" // "resultType": "exemplar"
// }, // },
@ -34,7 +33,6 @@
"schema": { "schema": {
"name": "exemplar", "name": "exemplar",
"meta": { "meta": {
"type": "timeseries-many",
"custom": { "custom": {
"resultType": "exemplar" "resultType": "exemplar"
}, },