-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Replace `logrus` with `zap` logger Signed-off-by: Arrobo, Gabriel <[email protected]> * Create release Signed-off-by: Arrobo, Gabriel <[email protected]> --------- Signed-off-by: Arrobo, Gabriel <[email protected]>
- Loading branch information
1 parent
d7c870a
commit 165f62f
Showing
25 changed files
with
225 additions
and
439 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.4.4-dev | ||
| 1.5.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,90 @@ | ||
| // SPDX-FileCopyrightText: 2021 Open Networking Foundation <[email protected]> | ||
| // Copyright 2019 free5GC.org | ||
| // SPDX-FileCopyrightText: 2024 Canonical Ltd. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // SPDX-FileCopyrightText: 2024 Intel Corporation | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package logger | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
| formatter "github.com/antonfisher/nested-logrus-formatter" | ||
| "github.com/sirupsen/logrus" | ||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| var ( | ||
| log *logrus.Logger | ||
| AppLog *logrus.Entry | ||
| InitLog *logrus.Entry | ||
| CfgLog *logrus.Entry | ||
| Handlelog *logrus.Entry | ||
| HttpLog *logrus.Entry | ||
| UeauLog *logrus.Entry | ||
| UecmLog *logrus.Entry | ||
| SdmLog *logrus.Entry | ||
| PpLog *logrus.Entry | ||
| EeLog *logrus.Entry | ||
| UtilLog *logrus.Entry | ||
| CallbackLog *logrus.Entry | ||
| ContextLog *logrus.Entry | ||
| ConsumerLog *logrus.Entry | ||
| GinLog *logrus.Entry | ||
| GrpcLog *logrus.Entry | ||
| ProducerLog *logrus.Entry | ||
| log *zap.Logger | ||
| AppLog *zap.SugaredLogger | ||
| InitLog *zap.SugaredLogger | ||
| CfgLog *zap.SugaredLogger | ||
| Handlelog *zap.SugaredLogger | ||
| HttpLog *zap.SugaredLogger | ||
| UeauLog *zap.SugaredLogger | ||
| UecmLog *zap.SugaredLogger | ||
| SdmLog *zap.SugaredLogger | ||
| PpLog *zap.SugaredLogger | ||
| EeLog *zap.SugaredLogger | ||
| UtilLog *zap.SugaredLogger | ||
| CallbackLog *zap.SugaredLogger | ||
| ContextLog *zap.SugaredLogger | ||
| ConsumerLog *zap.SugaredLogger | ||
| GinLog *zap.SugaredLogger | ||
| GrpcLog *zap.SugaredLogger | ||
| ProducerLog *zap.SugaredLogger | ||
| atomicLevel zap.AtomicLevel | ||
| ) | ||
|
|
||
| func init() { | ||
| log = logrus.New() | ||
| log.SetReportCaller(false) | ||
| atomicLevel = zap.NewAtomicLevelAt(zap.InfoLevel) | ||
| config := zap.Config{ | ||
| Level: atomicLevel, | ||
| Development: false, | ||
| Encoding: "console", | ||
| EncoderConfig: zap.NewProductionEncoderConfig(), | ||
| OutputPaths: []string{"stdout"}, | ||
| ErrorOutputPaths: []string{"stderr"}, | ||
| } | ||
|
|
||
| config.EncoderConfig.TimeKey = "timestamp" | ||
| config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder | ||
| config.EncoderConfig.LevelKey = "level" | ||
| config.EncoderConfig.EncodeLevel = zapcore.CapitalLevelEncoder | ||
| config.EncoderConfig.CallerKey = "caller" | ||
| config.EncoderConfig.EncodeCaller = zapcore.ShortCallerEncoder | ||
| config.EncoderConfig.MessageKey = "message" | ||
| config.EncoderConfig.StacktraceKey = "" | ||
|
|
||
| log.Formatter = &formatter.Formatter{ | ||
| TimestampFormat: time.RFC3339, | ||
| TrimMessages: true, | ||
| NoFieldsSpace: true, | ||
| HideKeys: true, | ||
| FieldsOrder: []string{"component", "category"}, | ||
| var err error | ||
| log, err = config.Build() | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
|
|
||
| AppLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "App"}) | ||
| InitLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "Init"}) | ||
| CfgLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "CFG"}) | ||
| Handlelog = log.WithFields(logrus.Fields{"component": "UDM", "category": "HDLR"}) | ||
| HttpLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "HTTP"}) | ||
| UeauLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "UEAU"}) | ||
| UecmLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "UECM"}) | ||
| SdmLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "SDM"}) | ||
| PpLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "PP"}) | ||
| EeLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "EE"}) | ||
| UtilLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "Util"}) | ||
| CallbackLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "CB"}) | ||
| ContextLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "CTX"}) | ||
| ConsumerLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "Consumer"}) | ||
| GinLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "GIN"}) | ||
| GrpcLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "GRPC"}) | ||
| ProducerLog = log.WithFields(logrus.Fields{"component": "UDM", "category": "Producer"}) | ||
| AppLog = log.Sugar().With("component", "UDM", "category", "App") | ||
| InitLog = log.Sugar().With("component", "UDM", "category", "Init") | ||
| CfgLog = log.Sugar().With("component", "UDM", "category", "CFG") | ||
| Handlelog = log.Sugar().With("component", "UDM", "category", "HDLR") | ||
| HttpLog = log.Sugar().With("component", "UDM", "category", "HTTP") | ||
| UeauLog = log.Sugar().With("component", "UDM", "category", "UEAU") | ||
| UecmLog = log.Sugar().With("component", "UDM", "category", "UECM") | ||
| SdmLog = log.Sugar().With("component", "UDM", "category", "SDM") | ||
| PpLog = log.Sugar().With("component", "UDM", "category", "PP") | ||
| EeLog = log.Sugar().With("component", "UDM", "category", "EE") | ||
| UtilLog = log.Sugar().With("component", "UDM", "category", "Util") | ||
| CallbackLog = log.Sugar().With("component", "UDM", "category", "CB") | ||
| ContextLog = log.Sugar().With("component", "UDM", "category", "CTX") | ||
| ConsumerLog = log.Sugar().With("component", "UDM", "category", "Consumer") | ||
| GinLog = log.Sugar().With("component", "UDM", "category", "GIN") | ||
| GrpcLog = log.Sugar().With("component", "UDM", "category", "GRPC") | ||
| ProducerLog = log.Sugar().With("component", "UDM", "category", "Producer") | ||
| } | ||
|
|
||
| func SetLogLevel(level logrus.Level) { | ||
| log.SetLevel(level) | ||
| func GetLogger() *zap.Logger { | ||
| return log | ||
| } | ||
|
|
||
| func SetReportCaller(set bool) { | ||
| log.SetReportCaller(set) | ||
| // SetLogLevel: set the log level (panic|fatal|error|warn|info|debug) | ||
| func SetLogLevel(level zapcore.Level) { | ||
| InitLog.Infoln("set log level:", level) | ||
| atomicLevel.SetLevel(level) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.