From ff8df5dc3660a268538453512121c64eb554b985 Mon Sep 17 00:00:00 2001 From: Raj Kamal Singh <1133322+raj-k-singh@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:26:34 +0530 Subject: [PATCH] chore: use base prefix of /ws for websocket paths (#5719) Co-authored-by: Vikrant Gupta --- ee/query-service/app/server.go | 1 + pkg/query-service/app/http_handler.go | 7 ++++++- pkg/query-service/app/server.go | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ee/query-service/app/server.go b/ee/query-service/app/server.go index 348cdbddd2..082ddcd358 100644 --- a/ee/query-service/app/server.go +++ b/ee/query-service/app/server.go @@ -359,6 +359,7 @@ func (s *Server) createPublicServer(apiHandler *api.APIHandler) (*http.Server, e apiHandler.RegisterIntegrationRoutes(r, am) apiHandler.RegisterQueryRangeV3Routes(r, am) apiHandler.RegisterQueryRangeV4Routes(r, am) + apiHandler.RegisterWebSocketPaths(r, am) c := cors.New(cors.Options{ AllowedOrigins: []string{"*"}, diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go index 97b5f0de2a..5064cc359b 100644 --- a/pkg/query-service/app/http_handler.go +++ b/pkg/query-service/app/http_handler.go @@ -333,13 +333,18 @@ func (aH *APIHandler) RegisterQueryRangeV3Routes(router *mux.Router, am *AuthMid subRouter.HandleFunc("/filter_suggestions", am.ViewAccess(aH.getQueryBuilderSuggestions)).Methods(http.MethodGet) - // websocket handler for query progress + // TODO(Raj): Remove this handler after /ws based path has been completely rolled out. subRouter.HandleFunc("/query_progress", am.ViewAccess(aH.GetQueryProgressUpdates)).Methods(http.MethodGet) // live logs subRouter.HandleFunc("/logs/livetail", am.ViewAccess(aH.liveTailLogs)).Methods(http.MethodGet) } +func (aH *APIHandler) RegisterWebSocketPaths(router *mux.Router, am *AuthMiddleware) { + subRouter := router.PathPrefix("/ws").Subrouter() + subRouter.HandleFunc("/query_progress", am.ViewAccess(aH.GetQueryProgressUpdates)).Methods(http.MethodGet) +} + func (aH *APIHandler) RegisterQueryRangeV4Routes(router *mux.Router, am *AuthMiddleware) { subRouter := router.PathPrefix("/api/v4").Subrouter() subRouter.HandleFunc("/query_range", am.ViewAccess(aH.QueryRangeV4)).Methods(http.MethodPost) diff --git a/pkg/query-service/app/server.go b/pkg/query-service/app/server.go index 3f5352edbd..4fb4d9ad22 100644 --- a/pkg/query-service/app/server.go +++ b/pkg/query-service/app/server.go @@ -303,6 +303,7 @@ func (s *Server) createPublicServer(api *APIHandler) (*http.Server, error) { api.RegisterLogsRoutes(r, am) api.RegisterIntegrationRoutes(r, am) api.RegisterQueryRangeV3Routes(r, am) + api.RegisterWebSocketPaths(r, am) api.RegisterQueryRangeV4Routes(r, am) api.RegisterMessagingQueuesRoutes(r, am)