From d4c52333c66ff70b2001103d8d837909cdac9b0d Mon Sep 17 00:00:00 2001
From: Marco Pracucci <marco@pracucci.com>
Date: Thu, 23 Apr 2020 11:20:30 +0200
Subject: [PATCH] Fix querier HTTP middlewares

Signed-off-by: Marco Pracucci <marco@pracucci.com>
---
 pkg/cortex/modules.go                                | 2 +-
 vendor/github.com/weaveworks/common/server/server.go | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkg/cortex/modules.go b/pkg/cortex/modules.go
index 3975f84756a..6fc17f9cfea 100644
--- a/pkg/cortex/modules.go
+++ b/pkg/cortex/modules.go
@@ -210,7 +210,7 @@ func (t *Cortex) initQuerier(cfg *Config) (serv services.Service, err error) {
 
 	// Query frontend worker will only be started after all its dependencies are started, not here.
 	// Worker may also be nil, if not configured, which is OK.
-	worker, err := frontend.NewWorker(cfg.Worker, httpgrpc_server.NewServer(handler), util.Logger)
+	worker, err := frontend.NewWorker(cfg.Worker, httpgrpc_server.NewServer(t.server.HTTPMiddleware.Wrap(handler)), util.Logger)
 	if err != nil {
 		return
 	}
diff --git a/vendor/github.com/weaveworks/common/server/server.go b/vendor/github.com/weaveworks/common/server/server.go
index 748fa8f2c13..de10630e012 100644
--- a/vendor/github.com/weaveworks/common/server/server.go
+++ b/vendor/github.com/weaveworks/common/server/server.go
@@ -104,6 +104,7 @@ type Server struct {
 
 	HTTP       *mux.Router
 	HTTPServer *http.Server
+	HTTPMiddleware middleware.Interface
 	GRPC       *grpc.Server
 	Log        logging.Interface
 }
@@ -198,7 +199,7 @@ func New(cfg Config) (*Server, error) {
 	if cfg.RegisterInstrumentation {
 		RegisterInstrumentation(router)
 	}
-	httpMiddleware := []middleware.Interface{
+	httpMiddlewares := []middleware.Interface{
 		middleware.Tracer{
 			RouteMatcher: router,
 		},
@@ -211,12 +212,12 @@ func New(cfg Config) (*Server, error) {
 		},
 	}
 
-	httpMiddleware = append(httpMiddleware, cfg.HTTPMiddleware...)
+	httpMiddleware := middleware.Merge(append(httpMiddlewares, cfg.HTTPMiddleware...)...)
 	httpServer := &http.Server{
 		ReadTimeout:  cfg.HTTPServerReadTimeout,
 		WriteTimeout: cfg.HTTPServerWriteTimeout,
 		IdleTimeout:  cfg.HTTPServerIdleTimeout,
-		Handler:      middleware.Merge(httpMiddleware...).Wrap(router),
+		Handler:      httpMiddleware.Wrap(router),
 	}
 
 	return &Server{
@@ -227,6 +228,7 @@ func New(cfg Config) (*Server, error) {
 
 		HTTP:       router,
 		HTTPServer: httpServer,
+		HTTPMiddleware: httpMiddleware,
 		GRPC:       grpcServer,
 		Log:        log,
 	}, nil