Skip to content

Use ApplyLogSetting function to simplify log setting #717

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
gab-arrobo merged 2 commits into from
Jun 12, 2026
+13 −84
Merged

Use ApplyLogSetting function to simplify log setting #717

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
927a884
Use ApplyLogSetting function to simplify log setting
gab-arrobo Jun 11, 2026
8b7f885
Improvement
gab-arrobo Jun 12, 2026
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 @@ -12,7 +12,7 @@ require (
github.com/omec-project/nas/v2 v2.0.0
github.com/omec-project/ngap/v2 v2.1.0
github.com/omec-project/openapi/v2 v2.0.0
github.com/omec-project/util v1.7.3
github.com/omec-project/util v1.7.4
github.com/prometheus/client_golang v1.23.2
github.com/urfave/cli/v3 v3.9.0
go.mongodb.org/mongo-driver v1.17.9
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ github.com/omec-project/ngap/v2 v2.1.0 h1:+dBCYZ5esgg7QVy2DzNLvc9OXpZG9B/Swh7KZY
github.com/omec-project/ngap/v2 v2.1.0/go.mod h1:VqYpVQGeBbRf8u56hjnI0en1Ee+BRMvmqrTiEymVBtg=
github.com/omec-project/openapi/v2 v2.0.0 h1:aeNPvcJotm+paJLxxBrxJsoMsSWcnLeyr5z7C/CJ/JQ=
github.com/omec-project/openapi/v2 v2.0.0/go.mod h1:dgqA/pmWLxUWeEl/lgecPmcDR4oolSzJK/ijbLwveow=
github.com/omec-project/util v1.7.3 h1:XKtttf8nbFZtk9y+Zat6+cg3k0KYkYekn/5mqGUb7Os=
github.com/omec-project/util v1.7.3/go.mod h1:D2Blqi9pBZCfrZGsLDR6RzlLBU0UJj4nTyln/LU3Y7M=
github.com/omec-project/util v1.7.4 h1:NaDGdIg3BxmFFXT5LTXAfMdAWgDUkwcYP7Mts/4nxho=
github.com/omec-project/util v1.7.4/go.mod h1:7YKrTd/UMUi+Mpnu7F2xcY3fDZ/3gPmH1xeSUU9+tI0=
github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/pierrec/lz4/v4 v4.1.26 h1:GrpZw1gZttORinvzBdXPUXATeqlJjqUG/D87TKMnhjY=
Expand Down
91 changes: 10 additions & 81 deletions service/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ import (
utilLogger "github.com/omec-project/util/logger"
"github.com/urfave/cli/v3"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

type AMF struct{}
Expand Down Expand Up @@ -115,86 +113,17 @@ func (amf *AMF) Initialize(ctx ctxt.Context, c *cli.Command) error {
}

func (amf *AMF) setLogLevel() {
if factory.AmfConfig.Logger == nil {
cfgLogger := factory.AmfConfig.Logger
if cfgLogger == nil {
logger.InitLog.Warnln("AMF config without log level setting")
return
}

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

if factory.AmfConfig.Logger.NAS != nil {
if factory.AmfConfig.Logger.NAS.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.AmfConfig.Logger.NAS.DebugLevel); err != nil {
nasLogger.NasLog.Warnf("NAS Log level [%s] is invalid, set to [info] level",
factory.AmfConfig.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.AmfConfig.Logger.NGAP != nil {
if factory.AmfConfig.Logger.NGAP.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.AmfConfig.Logger.NGAP.DebugLevel); err != nil {
ngapLogger.NgapLog.Warnf("NGAP Log level [%s] is invalid, set to [info] level",
factory.AmfConfig.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.AmfConfig.Logger.OpenApi != nil {
if factory.AmfConfig.Logger.OpenApi.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.AmfConfig.Logger.OpenApi.DebugLevel); err != nil {
openapiLogger.OpenapiLog.Warnf("OpenApi Log level [%s] is invalid, set to [info] level",
factory.AmfConfig.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.AmfConfig.Logger.Util != nil {
if factory.AmfConfig.Logger.Util.DebugLevel != "" {
if level, err := zapcore.ParseLevel(factory.AmfConfig.Logger.Util.DebugLevel); err != nil {
utilLogger.UtilLog.Warnf("Util (drsm, fsm, etc.) Log level [%s] is invalid, set to [info] level",
factory.AmfConfig.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)
}
}
utilLogger.ApplyLogSetting("AMF", cfgLogger.AMF, logger.InitLog, logger.SetLogLevel)
utilLogger.ApplyLogSetting("NAS", cfgLogger.NAS, nasLogger.NasLog, nasLogger.SetLogLevel)
utilLogger.ApplyLogSetting("NGAP", cfgLogger.NGAP, ngapLogger.NgapLog, ngapLogger.SetLogLevel)
utilLogger.ApplyLogSetting("OpenApi", cfgLogger.OpenApi, openapiLogger.OpenapiLog, openapiLogger.SetLogLevel)
utilLogger.ApplyLogSetting("Util", cfgLogger.Util, utilLogger.UtilLog, utilLogger.SetLogLevel)
}

func (amf *AMF) Start() {
Expand Down Expand Up @@ -254,13 +183,13 @@ func (amf *AMF) Start() {
Ratio: *factory.AmfConfig.Configuration.Telemetry.Ratio,
})
if err != nil {
logger.InitLog.Fatalf("could not initialize tracer", zap.Error(err))
logger.InitLog.Fatalf("could not initialize tracer: %v", err)
}
logger.InitLog.Infoln("tracer initialized successfully")
defer func() {
err = tp.Shutdown(ctx)
if err != nil {
logger.InitLog.Errorf("failed to shutdown tracer", zap.Error(err))
logger.InitLog.Errorf("failed to shutdown tracer: %v", err)
} else {
logger.InitLog.Infoln("tracer shutdown successfully")
}
Expand Down Expand Up @@ -399,7 +328,7 @@ func (amf *AMF) Terminate(cancelServices ctxt.CancelFunc, wg *sync.WaitGroup, tr
if tracerProvider != nil {
err := tracerProvider.Shutdown(ctx)
if err != nil {
logger.InitLog.Error("failed to shutdown tracer", zap.Error(err))
logger.InitLog.Errorf("failed to shutdown tracer: %v", err)
} else {
logger.InitLog.Infoln("tracer shutdown successfully")
}
Expand Down
Loading