From 916a7bbb08bb153085d8b8d2cc27f50a16a0c2ab Mon Sep 17 00:00:00 2001 From: ismail simsek Date: Thu, 15 Feb 2024 15:09:30 +0100 Subject: [PATCH] Prometheus: Move converter in prometheus package (#82269) * use jsoniter from sdk * move converter into the prometheus * remove jsonitere * unit test * remove redundant ownership --- .github/CODEOWNERS | 1 - pkg/tsdb/loki/api.go | 5 ++-- .../prometheus}/converter/prom.go | 0 .../prometheus}/converter/prom_test.go | 28 ++----------------- .../testdata/loki-streams-a-frame.jsonc | 0 .../converter/testdata/loki-streams-a.json | 0 .../testdata/loki-streams-b-frame.jsonc | 0 .../converter/testdata/loki-streams-b.json | 0 .../testdata/loki-streams-c-frame.jsonc | 0 .../converter/testdata/loki-streams-c.json | 0 ...ki-streams-structured-metadata-frame.jsonc | 0 .../loki-streams-structured-metadata.json | 0 .../converter/testdata/prom-error-frame.jsonc | 0 .../converter/testdata/prom-error.json | 0 .../testdata/prom-exemplars-a-frame.json | 0 .../testdata/prom-exemplars-a-frame.jsonc | 0 .../testdata/prom-exemplars-a-golden.txt | 0 .../converter/testdata/prom-exemplars-a.json | 0 .../testdata/prom-exemplars-b-frame.json | 0 .../testdata/prom-exemplars-b-frame.jsonc | 0 .../testdata/prom-exemplars-b-golden.txt | 0 .../converter/testdata/prom-exemplars-b.json | 0 .../prom-exemplars-diff-labels-frame.jsonc | 0 .../testdata/prom-exemplars-diff-labels.json | 0 .../testdata/prom-exemplars-frame.jsonc | 0 .../converter/testdata/prom-exemplars.json | 0 .../testdata/prom-labels-frame.jsonc | 0 .../converter/testdata/prom-labels.json | 0 .../testdata/prom-matrix-frame.jsonc | 0 ...rom-matrix-histogram-no-labels-frame.jsonc | 0 .../prom-matrix-histogram-no-labels.json | 0 ...m-matrix-histogram-partitioned-frame.jsonc | 0 .../prom-matrix-histogram-partitioned.json | 0 .../prom-matrix-with-nans-frame.jsonc | 0 .../testdata/prom-matrix-with-nans.json | 0 .../converter/testdata/prom-matrix.json | 0 .../testdata/prom-scalar-frame.jsonc | 0 .../converter/testdata/prom-scalar.json | 0 .../testdata/prom-series-frame.jsonc | 0 .../converter/testdata/prom-series.json | 0 .../testdata/prom-string-frame.jsonc | 0 .../converter/testdata/prom-string.json | 0 .../testdata/prom-vector-frame.jsonc | 0 ...rom-vector-histogram-no-labels-frame.jsonc | 0 .../prom-vector-histogram-no-labels.json | 0 .../converter/testdata/prom-vector.json | 0 .../testdata/prom-warnings-frame.jsonc | 0 .../converter/testdata/prom-warnings.json | 0 pkg/tsdb/prometheus/querydata/response.go | 2 +- 49 files changed, 6 insertions(+), 30 deletions(-) rename pkg/{util => tsdb/prometheus}/converter/prom.go (100%) rename pkg/{util => tsdb/prometheus}/converter/prom_test.go (71%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-a-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-a.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-b-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-b.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-c-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-c.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-structured-metadata-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/loki-streams-structured-metadata.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-error-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-error.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-a-frame.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-a-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-a-golden.txt (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-a.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-b-frame.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-b-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-b-golden.txt (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-b.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-diff-labels-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-diff-labels.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-exemplars.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-labels-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-labels.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-histogram-no-labels.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-histogram-partitioned.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-with-nans-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix-with-nans.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-matrix.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-scalar-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-scalar.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-series-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-series.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-string-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-string.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-vector-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-vector-histogram-no-labels.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-vector.json (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-warnings-frame.jsonc (100%) rename pkg/{util => tsdb/prometheus}/converter/testdata/prom-warnings.json (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f2abae4267e..f9e5d9fdf1b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -269,7 +269,6 @@ /pkg/services/searchV2/ @grafana/grafana-app-platform-squad /pkg/services/store/ @grafana/grafana-app-platform-squad /pkg/infra/filestorage/ @grafana/grafana-app-platform-squad -/pkg/util/converter/ @grafana/grafana-app-platform-squad /pkg/modules/ @grafana/grafana-app-platform-squad /pkg/kindsysreport/ @grafana/grafana-app-platform-squad /pkg/services/grpcserver/ @grafana/grafana-app-platform-squad diff --git a/pkg/tsdb/loki/api.go b/pkg/tsdb/loki/api.go index b7564897184..272edafd8b5 100644 --- a/pkg/tsdb/loki/api.go +++ b/pkg/tsdb/loki/api.go @@ -20,10 +20,11 @@ import ( "go.opentelemetry.io/otel/trace" "github.com/grafana/grafana-plugin-sdk-go/backend" + "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/tsdb/loki/instrumentation" - "github.com/grafana/grafana/pkg/util/converter" + "github.com/grafana/grafana/pkg/tsdb/prometheus/converter" ) type LokiAPI struct { @@ -334,7 +335,7 @@ func getSupportingQueryHeaderValue(req *http.Request, supportingQueryType Suppor value = "datasample" case SupportingQueryInfiniteScroll: value = "infinitescroll" - default: //ignore + default: // ignore } return value diff --git a/pkg/util/converter/prom.go b/pkg/tsdb/prometheus/converter/prom.go similarity index 100% rename from pkg/util/converter/prom.go rename to pkg/tsdb/prometheus/converter/prom.go diff --git a/pkg/util/converter/prom_test.go b/pkg/tsdb/prometheus/converter/prom_test.go similarity index 71% rename from pkg/util/converter/prom_test.go rename to pkg/tsdb/prometheus/converter/prom_test.go index 18908c9a0cd..76dd73a2be3 100644 --- a/pkg/util/converter/prom_test.go +++ b/pkg/tsdb/prometheus/converter/prom_test.go @@ -1,15 +1,14 @@ package converter import ( - "fmt" "os" "path" "strings" "testing" "time" + sdkjsoniter "github.com/grafana/grafana-plugin-sdk-go/data/utils/jsoniter" "github.com/grafana/grafana-plugin-sdk-go/experimental" - "github.com/grafana/grafana/pkg/infra/httpclient" jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -44,29 +43,6 @@ func TestReadPromFrames(t *testing.T) { } } -func TestReadLimited(t *testing.T) { - for _, name := range files { - p := path.Join("testdata", name+".json") - stat, err := os.Stat(p) - require.NoError(t, err) - size := stat.Size() - - for i := int64(10); i < size-1; i += size / 10 { - t.Run(fmt.Sprintf("%v_%v", name, i), func(t *testing.T) { - //nolint:gosec - f, err := os.Open(p) - require.NoError(t, err) - mbr := httpclient.MaxBytesReader(f, i) - - iter := jsoniter.Parse(jsoniter.ConfigDefault, mbr, 1024) - rsp := ReadPrometheusStyleResult(iter, Options{}) - - require.ErrorContains(t, rsp.Error, "response body too large") - }) - } - } -} - func runScenario(name string, opts Options) func(t *testing.T) { return func(t *testing.T) { // Safe to disable, this is a test. @@ -74,7 +50,7 @@ func runScenario(name string, opts Options) func(t *testing.T) { f, err := os.Open(path.Join("testdata", name+".json")) require.NoError(t, err) - iter := jsoniter.Parse(jsoniter.ConfigDefault, f, 1024) + iter := jsoniter.Parse(sdkjsoniter.ConfigDefault, f, 1024) rsp := ReadPrometheusStyleResult(iter, opts) if strings.Contains(name, "error") { diff --git a/pkg/util/converter/testdata/loki-streams-a-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/loki-streams-a-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/loki-streams-a-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-a-frame.jsonc diff --git a/pkg/util/converter/testdata/loki-streams-a.json b/pkg/tsdb/prometheus/converter/testdata/loki-streams-a.json similarity index 100% rename from pkg/util/converter/testdata/loki-streams-a.json rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-a.json diff --git a/pkg/util/converter/testdata/loki-streams-b-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/loki-streams-b-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/loki-streams-b-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-b-frame.jsonc diff --git a/pkg/util/converter/testdata/loki-streams-b.json b/pkg/tsdb/prometheus/converter/testdata/loki-streams-b.json similarity index 100% rename from pkg/util/converter/testdata/loki-streams-b.json rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-b.json diff --git a/pkg/util/converter/testdata/loki-streams-c-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/loki-streams-c-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/loki-streams-c-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-c-frame.jsonc diff --git a/pkg/util/converter/testdata/loki-streams-c.json b/pkg/tsdb/prometheus/converter/testdata/loki-streams-c.json similarity index 100% rename from pkg/util/converter/testdata/loki-streams-c.json rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-c.json diff --git a/pkg/util/converter/testdata/loki-streams-structured-metadata-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/loki-streams-structured-metadata-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/loki-streams-structured-metadata-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-structured-metadata-frame.jsonc diff --git a/pkg/util/converter/testdata/loki-streams-structured-metadata.json b/pkg/tsdb/prometheus/converter/testdata/loki-streams-structured-metadata.json similarity index 100% rename from pkg/util/converter/testdata/loki-streams-structured-metadata.json rename to pkg/tsdb/prometheus/converter/testdata/loki-streams-structured-metadata.json diff --git a/pkg/util/converter/testdata/prom-error-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-error-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-error-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-error-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-error.json b/pkg/tsdb/prometheus/converter/testdata/prom-error.json similarity index 100% rename from pkg/util/converter/testdata/prom-error.json rename to pkg/tsdb/prometheus/converter/testdata/prom-error.json diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-frame.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-a-frame.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-frame.json diff --git a/pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-a-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-exemplars-a-golden.txt b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-golden.txt similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-a-golden.txt rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a-golden.txt diff --git a/pkg/util/converter/testdata/prom-exemplars-a.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-a.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-a.json diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-frame.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-b-frame.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-frame.json diff --git a/pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-b-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-exemplars-b-golden.txt b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-golden.txt similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-b-golden.txt rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b-golden.txt diff --git a/pkg/util/converter/testdata/prom-exemplars-b.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-b.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-b.json diff --git a/pkg/util/converter/testdata/prom-exemplars-diff-labels-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-diff-labels-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-diff-labels-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-diff-labels-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-exemplars-diff-labels.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-diff-labels.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-diff-labels.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-diff-labels.json diff --git a/pkg/util/converter/testdata/prom-exemplars-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-exemplars.json b/pkg/tsdb/prometheus/converter/testdata/prom-exemplars.json similarity index 100% rename from pkg/util/converter/testdata/prom-exemplars.json rename to pkg/tsdb/prometheus/converter/testdata/prom-exemplars.json diff --git a/pkg/util/converter/testdata/prom-labels-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-labels-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-labels-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-labels-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-labels.json b/pkg/tsdb/prometheus/converter/testdata/prom-labels.json similarity index 100% rename from pkg/util/converter/testdata/prom-labels.json rename to pkg/tsdb/prometheus/converter/testdata/prom-labels.json diff --git a/pkg/util/converter/testdata/prom-matrix-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-no-labels-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-no-labels.json b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-no-labels.json similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-histogram-no-labels.json rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-no-labels.json diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-partitioned-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-matrix-histogram-partitioned.json b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-partitioned.json similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-histogram-partitioned.json rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-histogram-partitioned.json diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-with-nans-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-with-nans-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-with-nans-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-matrix-with-nans.json b/pkg/tsdb/prometheus/converter/testdata/prom-matrix-with-nans.json similarity index 100% rename from pkg/util/converter/testdata/prom-matrix-with-nans.json rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix-with-nans.json diff --git a/pkg/util/converter/testdata/prom-matrix.json b/pkg/tsdb/prometheus/converter/testdata/prom-matrix.json similarity index 100% rename from pkg/util/converter/testdata/prom-matrix.json rename to pkg/tsdb/prometheus/converter/testdata/prom-matrix.json diff --git a/pkg/util/converter/testdata/prom-scalar-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-scalar-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-scalar-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-scalar-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-scalar.json b/pkg/tsdb/prometheus/converter/testdata/prom-scalar.json similarity index 100% rename from pkg/util/converter/testdata/prom-scalar.json rename to pkg/tsdb/prometheus/converter/testdata/prom-scalar.json diff --git a/pkg/util/converter/testdata/prom-series-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-series-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-series-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-series-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-series.json b/pkg/tsdb/prometheus/converter/testdata/prom-series.json similarity index 100% rename from pkg/util/converter/testdata/prom-series.json rename to pkg/tsdb/prometheus/converter/testdata/prom-series.json diff --git a/pkg/util/converter/testdata/prom-string-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-string-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-string-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-string-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-string.json b/pkg/tsdb/prometheus/converter/testdata/prom-string.json similarity index 100% rename from pkg/util/converter/testdata/prom-string.json rename to pkg/tsdb/prometheus/converter/testdata/prom-string.json diff --git a/pkg/util/converter/testdata/prom-vector-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-vector-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-vector-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-vector-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-vector-histogram-no-labels-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-vector-histogram-no-labels.json b/pkg/tsdb/prometheus/converter/testdata/prom-vector-histogram-no-labels.json similarity index 100% rename from pkg/util/converter/testdata/prom-vector-histogram-no-labels.json rename to pkg/tsdb/prometheus/converter/testdata/prom-vector-histogram-no-labels.json diff --git a/pkg/util/converter/testdata/prom-vector.json b/pkg/tsdb/prometheus/converter/testdata/prom-vector.json similarity index 100% rename from pkg/util/converter/testdata/prom-vector.json rename to pkg/tsdb/prometheus/converter/testdata/prom-vector.json diff --git a/pkg/util/converter/testdata/prom-warnings-frame.jsonc b/pkg/tsdb/prometheus/converter/testdata/prom-warnings-frame.jsonc similarity index 100% rename from pkg/util/converter/testdata/prom-warnings-frame.jsonc rename to pkg/tsdb/prometheus/converter/testdata/prom-warnings-frame.jsonc diff --git a/pkg/util/converter/testdata/prom-warnings.json b/pkg/tsdb/prometheus/converter/testdata/prom-warnings.json similarity index 100% rename from pkg/util/converter/testdata/prom-warnings.json rename to pkg/tsdb/prometheus/converter/testdata/prom-warnings.json diff --git a/pkg/tsdb/prometheus/querydata/response.go b/pkg/tsdb/prometheus/querydata/response.go index dd0e5f3f31b..70602c0158e 100644 --- a/pkg/tsdb/prometheus/querydata/response.go +++ b/pkg/tsdb/prometheus/querydata/response.go @@ -12,10 +12,10 @@ import ( "github.com/grafana/grafana-plugin-sdk-go/data" jsoniter "github.com/json-iterator/go" + "github.com/grafana/grafana/pkg/tsdb/prometheus/converter" "github.com/grafana/grafana/pkg/tsdb/prometheus/models" "github.com/grafana/grafana/pkg/tsdb/prometheus/querydata/exemplar" "github.com/grafana/grafana/pkg/tsdb/prometheus/utils" - "github.com/grafana/grafana/pkg/util/converter" ) func (s *QueryData) parseResponse(ctx context.Context, q *models.Query, res *http.Response, enablePrometheusDataplaneFlag bool) backend.DataResponse {