@@ -21,6 +21,7 @@ import (
2121 "context"
2222 "crypto/tls"
2323 "fmt"
24+ "github.com/devtron-labs/devtron/api/util"
2425 "github.com/devtron-labs/devtron/client/telemetry"
2526 "github.com/devtron-labs/devtron/otel"
2627 "log"
@@ -54,6 +55,7 @@ type App struct {
5455 serveTls bool
5556 sessionManager2 * authMiddleware.SessionManager
5657 OtelTracingService * otel.OtelTracingServiceImpl
58+ loggingMiddleware util.LoggingMiddleware
5759}
5860
5961func NewApp (router * router.MuxRouter ,
@@ -64,6 +66,7 @@ func NewApp(router *router.MuxRouter,
6466 pubsubClient * pubsub.PubSubClientServiceImpl ,
6567 sessionManager2 * authMiddleware.SessionManager ,
6668 posthogClient * telemetry.PosthogClient ,
69+ loggingMiddleware util.LoggingMiddleware ,
6770) * App {
6871 //check argo connection
6972 //todo - check argo-cd version on acd integration installation
@@ -78,6 +81,7 @@ func NewApp(router *router.MuxRouter,
7881 sessionManager2 : sessionManager2 ,
7982 posthogClient : posthogClient ,
8083 OtelTracingService : otel .NewOtelTracingServiceImpl (Logger ),
84+ loggingMiddleware : loggingMiddleware ,
8185 }
8286 return app
8387}
@@ -94,7 +98,7 @@ func (app *App) Start() {
9498 //authEnforcer := casbin2.Create()
9599
96100 server := & http.Server {Addr : fmt .Sprintf (":%d" , port ), Handler : authMiddleware .Authorizer (app .sessionManager2 , user .WhitelistChecker )(app .MuxRouter .Router )}
97-
101+ app . MuxRouter . Router . Use ( app . loggingMiddleware . LoggingMiddleware )
98102 app .MuxRouter .Router .Use (middleware .PrometheusMiddleware )
99103 if tracerProvider != nil {
100104 app .MuxRouter .Router .Use (otelmux .Middleware (otel .OTEL_ORCHESTRASTOR_SERVICE_NAME ))
0 commit comments