diff --git a/go.mod b/go.mod index b5897178db2..fe25e1e7877 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/grafana/cuetsy v0.0.1 github.com/grafana/grafana-aws-sdk v0.10.3 github.com/grafana/grafana-azure-sdk-go v1.2.0 - github.com/grafana/grafana-plugin-sdk-go v0.136.0 + github.com/grafana/grafana-plugin-sdk-go v0.137.0 github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/hashicorp/go-hclog v1.0.0 @@ -64,7 +64,6 @@ require ( github.com/jmespath/go-jmespath v0.4.0 github.com/json-iterator/go v1.1.12 github.com/jung-kurt/gofpdf v1.16.2 - github.com/laher/mergefs v0.1.1 github.com/lib/pq v1.10.4 github.com/linkedin/goavro/v2 v2.10.0 github.com/m3db/prometheus_remote_client_golang v0.4.4 @@ -248,6 +247,7 @@ require ( github.com/golang-migrate/migrate/v4 v4.7.0 github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f github.com/grafana/thema v0.0.0-20220523183731-72aebd14e751 + github.com/laher/mergefs v0.1.1 go.etcd.io/etcd/api/v3 v3.5.4 go.opentelemetry.io/contrib/propagators/jaeger v1.6.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.3 diff --git a/go.sum b/go.sum index 73a2ab06f3e..cab036f4332 100644 --- a/go.sum +++ b/go.sum @@ -1453,8 +1453,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.94.0/go.mod h1:3VXz4nCv6wH5SfgB3mlW3 github.com/grafana/grafana-plugin-sdk-go v0.114.0/go.mod h1:D7x3ah+1d4phNXpbnOaxa/osSaZlwh9/ZUnGGzegRbk= github.com/grafana/grafana-plugin-sdk-go v0.125.0/go.mod h1:9YiJ5GUxIsIEUC0qR9+BJVP5M7mCSP6uc6Ne62YKkgc= github.com/grafana/grafana-plugin-sdk-go v0.129.0/go.mod h1:4edtosZepfQF9jkQwRywJsNSJzXTHmzbmcVcAl8MEQc= -github.com/grafana/grafana-plugin-sdk-go v0.136.0 h1:DSw/RLUI8pr/zunJUhbTjHyaRzf0IoOZgu2PjLsJ6Wc= -github.com/grafana/grafana-plugin-sdk-go v0.136.0/go.mod h1:jmrxelOJKrIK0yrsIzcotS8pbqPZozbmJgGy7k3hK1k= +github.com/grafana/grafana-plugin-sdk-go v0.137.0 h1:4AFA4O5ViGjjktXKmmpyCc1kzRaSHYUHjJWNqUbpW6E= +github.com/grafana/grafana-plugin-sdk-go v0.137.0/go.mod h1:jmrxelOJKrIK0yrsIzcotS8pbqPZozbmJgGy7k3hK1k= github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa h1:+pXjAxavVR2FKKNsuuCXGCWEj8XGc1Af6SPiyBpzU2A= github.com/grafana/loki v1.6.2-0.20211015002020-7832783b1caa/go.mod h1:0O8o/juxNSKN/e+DzWDTRkl7Zm8CkZcz0NDqEdojlrk= github.com/grafana/saml v0.0.0-20211007135653-aed1b2edd86b h1:YiSGp34F4V0G08HHx1cJBf2GVgwYAkXQjzuVs1t8jYk= diff --git a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go index a011258afc2..0c6944cffba 100644 --- a/pkg/infra/httpclient/httpclientprovider/http_client_provider.go +++ b/pkg/infra/httpclient/httpclientprovider/http_client_provider.go @@ -28,6 +28,7 @@ func New(cfg *setting.Cfg, validator models.PluginRequestValidator, tracer traci SetUserAgentMiddleware(userAgent), sdkhttpclient.BasicAuthenticationMiddleware(), sdkhttpclient.CustomHeadersMiddleware(), + sdkhttpclient.ContextualMiddleware(), ResponseLimitMiddleware(cfg.ResponseLimit), RedirectLimitMiddleware(validator), } diff --git a/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go b/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go index a0b58db5530..6a6b871c9eb 100644 --- a/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go +++ b/pkg/infra/httpclient/httpclientprovider/http_client_provider_test.go @@ -27,13 +27,14 @@ func TestHTTPClientProvider(t *testing.T) { _ = New(&setting.Cfg{SigV4AuthEnabled: false}, &validations.OSSPluginRequestValidator{}, tracer) require.Len(t, providerOpts, 1) o := providerOpts[0] - require.Len(t, o.Middlewares, 7) + require.Len(t, o.Middlewares, 8) require.Equal(t, TracingMiddlewareName, o.Middlewares[0].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, DataSourceMetricsMiddlewareName, o.Middlewares[1].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[2].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName()) - require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName()) + require.Equal(t, sdkhttpclient.ContextualMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName()) + require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName()) }) t.Run("When creating new provider and SigV4 is enabled should apply expected middleware", func(t *testing.T) { @@ -51,13 +52,14 @@ func TestHTTPClientProvider(t *testing.T) { _ = New(&setting.Cfg{SigV4AuthEnabled: true}, &validations.OSSPluginRequestValidator{}, tracer) require.Len(t, providerOpts, 1) o := providerOpts[0] - require.Len(t, o.Middlewares, 8) + require.Len(t, o.Middlewares, 9) require.Equal(t, TracingMiddlewareName, o.Middlewares[0].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, DataSourceMetricsMiddlewareName, o.Middlewares[1].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, SetUserAgentMiddlewareName, o.Middlewares[2].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, sdkhttpclient.BasicAuthenticationMiddlewareName, o.Middlewares[3].(sdkhttpclient.MiddlewareName).MiddlewareName()) require.Equal(t, sdkhttpclient.CustomHeadersMiddlewareName, o.Middlewares[4].(sdkhttpclient.MiddlewareName).MiddlewareName()) - require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName()) - require.Equal(t, SigV4MiddlewareName, o.Middlewares[7].(sdkhttpclient.MiddlewareName).MiddlewareName()) + require.Equal(t, sdkhttpclient.ContextualMiddlewareName, o.Middlewares[5].(sdkhttpclient.MiddlewareName).MiddlewareName()) + require.Equal(t, ResponseLimitMiddlewareName, o.Middlewares[6].(sdkhttpclient.MiddlewareName).MiddlewareName()) + require.Equal(t, SigV4MiddlewareName, o.Middlewares[8].(sdkhttpclient.MiddlewareName).MiddlewareName()) }) } diff --git a/pkg/services/live/telemetry/telegraf/convert_test.go b/pkg/services/live/telemetry/telegraf/convert_test.go index c585b36ca32..691474e4c09 100644 --- a/pkg/services/live/telemetry/telegraf/convert_test.go +++ b/pkg/services/live/telemetry/telegraf/convert_test.go @@ -41,7 +41,7 @@ func checkTestData(t *testing.T, file string) *backend.DataResponse { dr.Frames = append(dr.Frames, w.Frame()) } - experimental.CheckGoldenJSONResponse(t, "testdata", file, dr, true) + experimental.CheckGoldenJSONResponse(t, "testdata", file, dr, false) return dr } diff --git a/pkg/services/live/telemetry/telegraf/testdata/changing_types_NaN.jsonc b/pkg/services/live/telemetry/telegraf/testdata/changing_types_NaN.jsonc index b998d5e98a4..bbe3b08294e 100644 --- a/pkg/services/live/telemetry/telegraf/testdata/changing_types_NaN.jsonc +++ b/pkg/services/live/telemetry/telegraf/testdata/changing_types_NaN.jsonc @@ -8,10 +8,10 @@ // | Labels: | Labels: | Labels: | Labels: | Labels: | // | Type: []string | Type: []time.Time | Type: []*float64 | Type: []*float64 | Type: []*string | // +----------------+-------------------------------+------------------+------------------+-----------------+ -// | host=A | 2021-03-22 04:51:30 -0400 EDT | 0 | null | aaa | -// | host=B | 2021-03-22 04:51:30 -0400 EDT | null | 0 | bbb | -// | host=A | 2021-03-22 04:51:31 -0400 EDT | null | 0 | ccc | -// | host=B | 2021-03-22 04:51:31 -0400 EDT | 0 | null | 1 | +// | host=A | 2021-03-22 08:51:30 +0000 UTC | 0 | null | aaa | +// | host=B | 2021-03-22 08:51:30 +0000 UTC | null | 0 | bbb | +// | host=A | 2021-03-22 08:51:31 +0000 UTC | null | 0 | ccc | +// | host=B | 2021-03-22 08:51:31 +0000 UTC | 0 | null | 1 | // +----------------+-------------------------------+------------------+------------------+-----------------+ // //