Skip to content

feat: make logger encoders kube-aware #4125

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: make logger encoders kube-aware #4125

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion cns/logger/v2/cores/etw_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/pkg/errors"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
)

type ETWConfig struct {
Expand Down Expand Up @@ -44,5 +45,5 @@ func ETWCore(cfg *ETWConfig) (zapcore.Core, func(), error) {
encoderConfig := zap.NewProductionEncoderConfig()
encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
jsonEncoder := zapcore.NewJSONEncoder(encoderConfig)
return zapetw.New(cfg.ProviderName, cfg.EventName, jsonEncoder, cfg.level) //nolint:wrapcheck // ignore
return zapetw.New(cfg.ProviderName, cfg.EventName, &ctrlzap.KubeAwareEncoder{Encoder: jsonEncoder}, cfg.level) //nolint:wrapcheck // ignore
}
3 changes: 2 additions & 1 deletion cns/logger/v2/cores/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"gopkg.in/natefinch/lumberjack.v2"
ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
)

type FileConfig struct {
Expand Down Expand Up @@ -50,5 +51,5 @@ func FileCore(cfg *FileConfig) (zapcore.Core, func(), error) {
encoderConfig := zap.NewProductionEncoderConfig()
encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
jsonEncoder := zapcore.NewJSONEncoder(encoderConfig)
return zapcore.NewCore(jsonEncoder, zapcore.AddSync(filesink), cfg.level), func() { _ = filesink.Close() }, nil
return zapcore.NewCore(&ctrlzap.KubeAwareEncoder{Encoder: jsonEncoder}, zapcore.AddSync(filesink), cfg.level), func() { _ = filesink.Close() }, nil
}
3 changes: 2 additions & 1 deletion cns/logger/v2/cores/stdout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/pkg/errors"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
)

type StdoutConfig struct {
Expand Down Expand Up @@ -41,5 +42,5 @@ func (cfg *StdoutConfig) UnmarshalJSON(data []byte) error {
func StdoutCore(l zapcore.Level) zapcore.Core {
encoderConfig := zap.NewProductionEncoderConfig()
encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
return zapcore.NewCore(logfmt.NewEncoder(encoderConfig), os.Stdout, l)
return zapcore.NewCore(&ctrlzap.KubeAwareEncoder{Encoder: logfmt.NewEncoder(encoderConfig)}, os.Stdout, l)
}
Loading