Skip to content

Commit 4225234

Browse files
committed
story(logger middleware) : remove field flag added
1 parent ab5954d commit 4225234

File tree

5 files changed

+15
-21
lines changed

5 files changed

+15
-21
lines changed

App.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ func (app *App) Start() {
7070
}),
7171
grpc.ChainStreamInterceptor(
7272
grpc_prometheus.StreamServerInterceptor,
73-
logging.StreamServerInterceptor(middlewares.InterceptorLogger(app.LoggerConfig.EnableLogger, app.Logger),
73+
logging.StreamServerInterceptor(middlewares.InterceptorLogger(app.LoggerConfig.EnableLogger, app.LoggerConfig.RemoveReqFields, app.Logger),
7474
logging.WithLogOnEvents(logging.PayloadReceived)),
7575
recovery.StreamServerInterceptor(recoveryOption)), // panic interceptor, should be at last
7676
grpc.ChainUnaryInterceptor(
7777
grpc_prometheus.UnaryServerInterceptor,
78-
logging.UnaryServerInterceptor(middlewares.InterceptorLogger(app.LoggerConfig.EnableLogger, app.Logger),
78+
logging.UnaryServerInterceptor(middlewares.InterceptorLogger(app.LoggerConfig.EnableLogger, app.LoggerConfig.RemoveReqFields, app.Logger),
7979
logging.WithLogOnEvents(logging.PayloadReceived)),
8080
recovery.UnaryServerInterceptor(recoveryOption)), // panic interceptor, should be at last
8181
}
@@ -103,7 +103,8 @@ func (app *App) Start() {
103103
}
104104

105105
type LoggerConfig struct {
106-
EnableLogger bool `env:"ENABLE_LOGGER" envDefault:"false"`
106+
EnableLogger bool `env:"FEATURE_LOGGER_MIDDLEWARE_ENABLE" envDefault:"false"`
107+
RemoveReqFields []string `env:"FEATURE_LOGGER_MIDDLEWARE_REMOVE_FIELDS" envSeparator:","`
107108
}
108109

109110
func GetLoggerConfig() (*LoggerConfig, error) {

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
//github.com/argoproj/gitops-engine v0.7.1-0.20231013183858-f15cf615b814
77
github.com/aws/aws-sdk-go v1.44.285
88
github.com/caarlos0/env v3.5.0+incompatible
9-
github.com/devtron-labs/common-lib v0.0.16-0.20240412125407-1a6223a96820
9+
github.com/devtron-labs/common-lib v0.0.16-0.20240415060522-342520c4f43c
1010
github.com/docker/docker-credential-helpers v0.7.0 // indirect
1111
github.com/evanphx/json-patch v5.7.0+incompatible
1212
github.com/go-pg/pg v6.15.1+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,8 +716,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
716716
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
717717
github.com/devtron-labs/authenticator v0.4.31 h1:CEMLek3JnMuH9ULsC6BHNJr+NiyGzBd4lgdSxH2IGnc=
718718
github.com/devtron-labs/authenticator v0.4.31/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU=
719-
github.com/devtron-labs/common-lib v0.0.16-0.20240412125407-1a6223a96820 h1:qqXpFazGN8UR06BgFnVSiwLr55CP6e3OB3BoEHyb2SA=
720-
github.com/devtron-labs/common-lib v0.0.16-0.20240412125407-1a6223a96820/go.mod h1:1Zn+pXIj7ZOKHRe/AVfj2EdKjk+480wpSyYvu/v3ibY=
719+
github.com/devtron-labs/common-lib v0.0.16-0.20240415060522-342520c4f43c h1:t+M/gVy5esqqXVw2g/v1VVHXJzPWcT1pMdhZfKMhDTY=
720+
github.com/devtron-labs/common-lib v0.0.16-0.20240415060522-342520c4f43c/go.mod h1:1Zn+pXIj7ZOKHRe/AVfj2EdKjk+480wpSyYvu/v3ibY=
721721
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc=
722722
github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI=
723723
github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY=

vendor/github.com/devtron-labs/common-lib/middlewares/logger.go

Lines changed: 7 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ github.com/davecgh/go-spew/spew
137137
github.com/devtron-labs/authenticator/client
138138
github.com/devtron-labs/authenticator/jwt
139139
github.com/devtron-labs/authenticator/oidc
140-
# github.com/devtron-labs/common-lib v0.0.16-0.20240412125407-1a6223a96820
140+
# github.com/devtron-labs/common-lib v0.0.16-0.20240415060522-342520c4f43c
141141
## explicit; go 1.20
142142
github.com/devtron-labs/common-lib/constants
143143
github.com/devtron-labs/common-lib/middlewares

0 commit comments

Comments
 (0)