From 719cf20a13e706514d8b38a965eaa5108508c78f Mon Sep 17 00:00:00 2001 From: agungdwiprasetyo Date: Tue, 14 Mar 2023 16:33:51 +0700 Subject: [PATCH] rest server: update root middleware --- codebase/app/rest_server/rest_server.go | 3 ++- init.go | 2 +- wrapper/http_handler.go | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/codebase/app/rest_server/rest_server.go b/codebase/app/rest_server/rest_server.go index 20a1168e..519eb872 100644 --- a/codebase/app/rest_server/rest_server.go +++ b/codebase/app/rest_server/rest_server.go @@ -47,6 +47,7 @@ func NewServer(service factory.ServiceFactory, opts ...OptionFunc) factory.AppSe } server.serverEngine.HTTPErrorHandler = server.opt.errorHandler + server.serverEngine.Use(server.opt.rootMiddlewares...) server.serverEngine.GET("/", echo.WrapHandler(server.opt.rootHandler)) server.serverEngine.GET("/memstats", @@ -54,7 +55,7 @@ func NewServer(service factory.ServiceFactory, opts ...OptionFunc) factory.AppSe echo.WrapMiddleware(service.GetDependency().GetMiddleware().HTTPBasicAuth), ) - restRootPath := server.serverEngine.Group(server.opt.rootPath, server.opt.rootMiddlewares...) + restRootPath := server.serverEngine.Group(server.opt.rootPath) for _, m := range service.GetModules() { if h := m.RESTHandler(); h != nil { h.Mount(restRootPath) diff --git a/init.go b/init.go index a559a9d6..9c5e04f8 100644 --- a/init.go +++ b/init.go @@ -2,5 +2,5 @@ package candi const ( // Version of this library - Version = "v1.14.1" + Version = "v1.14.2" ) diff --git a/wrapper/http_handler.go b/wrapper/http_handler.go index caa90586..e91f24c5 100644 --- a/wrapper/http_handler.go +++ b/wrapper/http_handler.go @@ -20,7 +20,7 @@ func HTTPMiddlewareTracer(maxLogSize int) func(http.Handler) http.Handler { return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) { isDisableTrace, _ := strconv.ParseBool(req.Header.Get(candihelper.HeaderDisableTrace)) - if isDisableTrace { + if isDisableTrace || req.URL.Path == "/" { next.ServeHTTP(rw, req.WithContext(tracer.SkipTraceContext(req.Context()))) return }