Revert To Old Flow For Legacy

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>

cmd/query/app/server.go

@@ -285,17 +285,17 @@ func createHTTPServerLegacy(
 ) (*httpServer, error) {
 	r := createHTTPRouter(querySvc, metricsQuerySvc, queryOpts, tm, telset)
 	var handler http.Handler = r
+	handler = responseHeadersHandler(handler, queryOpts.HTTP.ResponseHeaders)
 	if queryOpts.BearerTokenPropagation {
 		handler = bearertoken.PropagationHandler(telset.Logger, handler)
 	}
-	recoveryHandler := recoveryhandler.NewRecoveryHandler(telset.Logger, true)
-	handler = recoveryHandler(handler)
-	handler = responseHeadersHandler(handler, queryOpts.HTTP.ResponseHeaders)
 	handler = handlers.CompressHandler(handler)
+	recoveryHandler := recoveryhandler.NewRecoveryHandler(telset.Logger, true)
+
 	errorLog, _ := zap.NewStdLogAt(telset.Logger, zapcore.ErrorLevel)
 	server := &httpServer{
 		Server: &http.Server{
-			Handler:           handler,
+			Handler:           recoveryHandler(handler),
 			ErrorLog:          errorLog,
 			ReadHeaderTimeout: 2 * time.Second,
 		},