Skip to content

mixup of uber zap and package zap messesup import of zap when using l… #4

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

Open
NishanthSpShetty wants to merge 1 commit into
base: main
Choose a base branch
from
Open

mixup of uber zap and package zap messesup import of zap when using l… #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions loggers/zap/zap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"context"

"github.com/go-coldbrew/log/loggers"
"go.uber.org/zap"
uzap "go.uber.org/zap"
"go.uber.org/zap/zapcore"
)

type logger struct {
logger *zap.SugaredLogger
logger *uzap.SugaredLogger
opt loggers.Options
cfg zap.Config
cfg uzap.Config
}

//COLBREW_CALL_STACK_SIZE number stack frame involved between the logger call from application to zap call.
Expand Down Expand Up @@ -66,11 +66,11 @@ func toZapLevel(level loggers.Level) zapcore.Level {
case loggers.DebugLevel:
return zapcore.DebugLevel
case loggers.InfoLevel:
return zap.InfoLevel
return uzap.InfoLevel
case loggers.WarnLevel:
return zap.WarnLevel
return uzap.WarnLevel
case loggers.ErrorLevel:
return zap.ErrorLevel
return uzap.ErrorLevel
default:
return zapcore.ErrorLevel
}
Expand All @@ -84,8 +84,8 @@ func NewLogger(options ...loggers.Option) loggers.BaseLogger {
f(&opt)
}

zapCfg := zap.Config{
Level: zap.NewAtomicLevelAt(toZapLevel(opt.Level)),
zapCfg := uzap.Config{
Level: uzap.NewAtomicLevelAt(toZapLevel(opt.Level)),
OutputPaths: []string{"stdout"},
ErrorOutputPaths: []string{"stderr"},

Expand All @@ -110,10 +110,10 @@ func NewLogger(options ...loggers.Option) loggers.BaseLogger {
}
l, err := zapCfg.Build()

l = l.WithOptions(zap.AddCallerSkip(COLBREW_CALL_STACK_SIZE))
l = l.WithOptions(uzap.AddCallerSkip(COLBREW_CALL_STACK_SIZE))
if err != nil {
//should we fail? will use sugared log here
l, _ = zap.NewProduction()
l, _ = uzap.NewProduction()

}

Expand Down