From 3328ac82064b683052460fec14b244392bd3b08c Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 22:39:30 +0200 Subject: [PATCH] [v10.4.x] Prometheus: Prevent duplicate registration of custom header middleware (#85120) Prometheus: Prevent duplicate registration of custom header middleware (#84860) * remove dupe middleware * fix test (cherry picked from commit c8c372c3279fa10a89e9270a8d26602d33aa1fea) Co-authored-by: Will Browne --- pkg/tsdb/prometheus/client/transport.go | 1 - pkg/tsdb/prometheus/client/transport_test.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/tsdb/prometheus/client/transport.go b/pkg/tsdb/prometheus/client/transport.go index a333e04fafb..8998b49bd7a 100644 --- a/pkg/tsdb/prometheus/client/transport.go +++ b/pkg/tsdb/prometheus/client/transport.go @@ -59,7 +59,6 @@ func middlewares(logger log.Logger, httpMethod string) []sdkhttpclient.Middlewar middlewares := []sdkhttpclient.Middleware{ // TODO: probably isn't needed anymore and should by done by http infra code middleware.CustomQueryParameters(logger), - sdkhttpclient.CustomHeadersMiddleware(), } // Needed to control GET vs POST method of the requests diff --git a/pkg/tsdb/prometheus/client/transport_test.go b/pkg/tsdb/prometheus/client/transport_test.go index b8f025f8a98..56367435c9f 100644 --- a/pkg/tsdb/prometheus/client/transport_test.go +++ b/pkg/tsdb/prometheus/client/transport_test.go @@ -23,7 +23,7 @@ func TestCreateTransportOptions(t *testing.T) { opts, err := CreateTransportOptions(context.Background(), settings, backend.NewLoggerWith("logger", "test")) require.NoError(t, err) require.Equal(t, http.Header{"Foo": []string{"bar"}}, opts.Header) - require.Equal(t, 2, len(opts.Middlewares)) + require.Equal(t, 1, len(opts.Middlewares)) }) t.Run("add azure credentials if configured", func(t *testing.T) { @@ -44,6 +44,6 @@ func TestCreateTransportOptions(t *testing.T) { ctx := backend.WithGrafanaConfig(context.Background(), cfg) opts, err := CreateTransportOptions(ctx, settings, backend.NewLoggerWith("logger", "test")) require.NoError(t, err) - require.Equal(t, 3, len(opts.Middlewares)) + require.Equal(t, 2, len(opts.Middlewares)) }) }