knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some nits around logging (#1946)

This commit is contained in:
Victor Agababov 2020-12-07 14:50:40 -08:00 committed by GitHub
parent 45d3810627
commit 7e918163fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
logging/config.go
View File

@ -62,9 +62,9 @@ func NewLogger(configJSON string, levelOverride string, opts ...zap.Option) (*za
}
}
logger, err2 := loggingCfg.Build(append(opts, zapdriver.WrapCore())...)
if err2 != nil {
panic(err2)
logger, err = loggingCfg.Build(append(opts, zapdriver.WrapCore())...)
if err != nil {
panic(err)
}
slogger := enrichLoggerWithCommitID(logger.Named(fallbackLoggerName))
@ -74,13 +74,14 @@ func NewLogger(configJSON string, levelOverride string, opts ...zap.Option) (*za
func enrichLoggerWithCommitID(logger *zap.Logger) *zap.SugaredLogger {
commitID, err := changeset.Get()
if err == nil {
// Enrich logs with GitHub commit ID.
return logger.With(zap.String(logkey.GitHubCommitID, commitID)).Sugar()
if err != nil {
logger.Info("Fetch GitHub commit ID from kodata failed", zap.Error(err))
return logger.Sugar()
}
logger.Info("Fetch GitHub commit ID from kodata failed", zap.Error(err))
return logger.Sugar()
// Enrich logs with GitHub commit ID.
return logger.With(zap.String(logkey.GitHubCommitID, commitID)).Sugar()
}
// NewLoggerFromConfig creates a logger using the provided Config
@ -94,7 +95,7 @@ func NewLoggerFromConfig(config *Config, name string, opts ...zap.Option) (*zap.
return logger.Named(name), level
}
func newLoggerFromConfig(configJSON string, levelOverride string, opts []zap.Option) (*zap.Logger, zap.AtomicLevel, error) {
func newLoggerFromConfig(configJSON, levelOverride string, opts []zap.Option) (*zap.Logger, zap.AtomicLevel, error) {
loggingCfg, err := zapConfigFromJSON(configJSON)
if err != nil {
return nil, zap.AtomicLevel{}, err
@ -179,7 +180,6 @@ func levelFromString(level string) (*zapcore.Level, error) {
// when a config map is updated
func UpdateLevelFromConfigMap(logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel,
levelKey string) func(configMap *corev1.ConfigMap) {
return func(configMap *corev1.ConfigMap) {
config, err := NewConfigFromConfigMap(configMap)
if err != nil {

5
test/logstream/v2/stream_test.go
View File

@ -80,17 +80,16 @@ func TestFailToStartStream(t *testing.T) {
pod.Status = readyStatus
const want = "hungry for apples"
f := newK8sFake(fake.NewSimpleClientset(), nil, /*watcherr*/
f := newK8sFake(fake.NewSimpleClientset(), nil, /*watcher*/
errors.New(want) /*getlogs err*/)
logFuncInvoked := make(chan struct{})
t.Cleanup(func() { close(logFuncInvoked) })
logFunc := func(format string, args ...interface{}) {
res := fmt.Sprintf(format, args...)
if !strings.Contains(res, want) {
t.Errorf("Expected message to contain %q, but message was: %s", want, res)
}
logFuncInvoked <- struct{}{}
close(logFuncInvoked)
}
ctx, cancel := context.WithCancel(context.Background())
stream := logstream.FromNamespace(ctx, f, pod.Namespace)