Skip to content

Refactor setting the logging level #483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 21, 2025
+28 −78
Merged

Refactor setting the logging level #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b852473
Refactor setting the logging level
gab-arrobo Nov 21, 2025
1716bc3
Address Copilot's comment
gab-arrobo Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ require (
github.com/urfave/cli/v3 v3.6.1
github.com/wmnsk/go-pfcp v0.0.24
go.mongodb.org/mongo-driver v1.17.6
go.uber.org/zap v1.27.1
go.yaml.in/yaml/v4 v4.0.0-rc.3
)

Expand Down Expand Up @@ -60,7 +61,6 @@ require (
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
go.uber.org/mock v0.5.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1
go.yaml.in/yaml/v2 v2.4.2 // indirect
golang.org/x/arch v0.20.0 // indirect
golang.org/x/crypto v0.43.0 // indirect
Expand Down
104 changes: 27 additions & 77 deletions service/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,86 +123,17 @@ func (smf *SMF) Initialize(c *cli.Command) error {
}

func (smf *SMF) setLogLevel() {
if factory.SmfConfig.Logger == nil {
logger.InitLog.Warnln("SMF config without log level setting")
cfgLogger := factory.SmfConfig.Logger
if cfgLogger == nil {
logger.InitLog.Warnln("SMF config without log level setting, defaulting to `info`")
return
}

if factory.SmfConfig.Logger.SMF != nil {
if factory.SmfConfig.Logger.SMF.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.SMF.DebugLevel); err != nil {
logger.InitLog.Warnf("SMF Log level [%s] is invalid, set to [info] level",
factory.SmfConfig.Logger.SMF.DebugLevel)
logger.SetLogLevel(zap.InfoLevel)
} else {
logger.InitLog.Infof("SMF Log level is set to [%s] level", level)
logger.SetLogLevel(level)
}
} else {
logger.InitLog.Infoln("SMF Log level is default set to [info] level")
logger.SetLogLevel(zap.InfoLevel)
}
}

if factory.SmfConfig.Logger.NAS != nil {
if factory.SmfConfig.Logger.NAS.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.NAS.DebugLevel); err != nil {
nasLogger.NasLog.Warnf("NAS Log level [%s] is invalid, set to [info] level",
factory.SmfConfig.Logger.NAS.DebugLevel)
logger.SetLogLevel(zap.InfoLevel)
} else {
nasLogger.SetLogLevel(level)
}
} else {
nasLogger.NasLog.Warnln("NAS Log level not set. Default set to [info] level")
nasLogger.SetLogLevel(zap.InfoLevel)
}
}

if factory.SmfConfig.Logger.NGAP != nil {
if factory.SmfConfig.Logger.NGAP.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.NGAP.DebugLevel); err != nil {
ngapLogger.NgapLog.Warnf("NGAP Log level [%s] is invalid, set to [info] level",
factory.SmfConfig.Logger.NGAP.DebugLevel)
ngapLogger.SetLogLevel(zap.InfoLevel)
} else {
ngapLogger.SetLogLevel(level)
}
} else {
ngapLogger.NgapLog.Warnln("NGAP Log level not set. Default set to [info] level")
ngapLogger.SetLogLevel(zap.InfoLevel)
}
}

if factory.SmfConfig.Logger.OpenApi != nil {
if factory.SmfConfig.Logger.OpenApi.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.OpenApi.DebugLevel); err != nil {
openapiLogger.OpenapiLog.Warnf("OpenApi Log level [%s] is invalid, set to [info] level",
factory.SmfConfig.Logger.OpenApi.DebugLevel)
openapiLogger.SetLogLevel(zap.InfoLevel)
} else {
openapiLogger.SetLogLevel(level)
}
} else {
openapiLogger.OpenapiLog.Warnln("OpenApi Log level not set. Default set to [info] level")
openapiLogger.SetLogLevel(zap.InfoLevel)
}
}

if factory.SmfConfig.Logger.Util != nil {
if factory.SmfConfig.Logger.Util.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.SmfConfig.Logger.Util.DebugLevel); err != nil {
utilLogger.UtilLog.Warnf("Util (drsm, fsm, etc.) Log level [%s] is invalid, set to [info] level",
factory.SmfConfig.Logger.Util.DebugLevel)
utilLogger.SetLogLevel(zap.InfoLevel)
} else {
utilLogger.SetLogLevel(level)
}
} else {
utilLogger.UtilLog.Warnln("Util (drsm, fsm, etc.) Log level not set. Default set to [info] level")
utilLogger.SetLogLevel(zap.InfoLevel)
}
}
setModuleLogLevel(cfgLogger, cfgLogger.SMF, logger.InitLog, logger.SetLogLevel)
setModuleLogLevel(cfgLogger, cfgLogger.NAS, nasLogger.NasLog, nasLogger.SetLogLevel)
setModuleLogLevel(cfgLogger, cfgLogger.NGAP, ngapLogger.NgapLog, ngapLogger.SetLogLevel)
setModuleLogLevel(cfgLogger, cfgLogger.OpenApi, openapiLogger.OpenapiLog, openapiLogger.SetLogLevel)
setModuleLogLevel(cfgLogger, cfgLogger.Util, utilLogger.UtilLog, utilLogger.SetLogLevel)

// Initialize Statistics
go metrics.InitMetrics()
Expand Down Expand Up @@ -394,3 +325,22 @@ func (smf *SMF) Terminate(cancelServices context.CancelFunc, wg *sync.WaitGroup)
func (smf *SMF) Exec(c *cli.Command) error {
return nil
}

// setModuleLogLevel is a helper to reduce repetition in log level setup
func setModuleLogLevel(logger *utilLogger.Logger, moduleCfg *utilLogger.LogSetting, logObj *zap.SugaredLogger, setLevel func(zapcore.Level)) {
moduleName, err := utilLogger.GetLogSettingName(logger, moduleCfg)
if err != nil {
logObj.Errorf("could not determine module name: %v", err)
return
}
if moduleCfg == nil || moduleCfg.DebugLevel == "" {
logObj.Warnf("%s Log level not set. Default setting to [info] level", moduleName)
setLevel(zap.InfoLevel)
return
}
level, err := zapcore.ParseLevel(moduleCfg.DebugLevel)
if err != nil {
logObj.Warnf("%s Log level [%s] is invalid, setting to [%s] level", moduleName, moduleCfg.DebugLevel, level.String())
}
setLevel(level)
}