github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114609 from pohly/log-runtime-verbosity-level

Browse Source 
runtime log verbosity level changes
This commit is contained in:
Kubernetes Prow Robot
2023-01-20 19:34:02 -08:00
committed by GitHub
parent afe936fee5 a41424d4c8
commit 92f0818cf2
17 changed files with 293 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
test/integration/logs/benchmark/benchmark_test.go
View File

@@ -32,7 +32,6 @@ import (
"testing"
"time"
"github.com/go-logr/logr"
logsapi "k8s.io/component-base/logs/api/v1"
logsjson "k8s.io/component-base/logs/json"
"k8s.io/klog/v2"
@@ -175,9 +174,6 @@ func benchmarkOutputFormats(b *testing.B, config loadGeneratorConfig, discard bo
generateOutput(b, config, nil, out)
})
b.Run("JSON", func(b *testing.B) {
c := logsapi.NewLoggingConfiguration()
var logger logr.Logger
var flush func()
var out1, out2 *os.File
if !discard {
var err error
@@ -192,38 +188,30 @@ func benchmarkOutputFormats(b *testing.B, config loadGeneratorConfig, discard bo
}
defer out2.Close()
}
o := logsapi.LoggingOptions{}
if discard {
o.ErrorStream = io.Discard
o.InfoStream = io.Discard
} else {
o.ErrorStream = out1
o.InfoStream = out1
}
b.Run("single-stream", func(b *testing.B) {
if discard {
logger, flush = logsjson.NewJSONLogger(c.Verbosity, logsjson.AddNopSync(&output), nil, nil)
} else {
stderr := os.Stderr
os.Stderr = out1
defer func() {
os.Stderr = stderr
}()
logger, flush = logsjson.Factory{}.Create(*c)
}
c := logsapi.NewLoggingConfiguration()
logger, control := logsjson.Factory{}.Create(*c, o)
klog.SetLogger(logger)
defer klog.ClearLogger()
generateOutput(b, config, flush, out1)
generateOutput(b, config, control.Flush, out1)
})
b.Run("split-stream", func(b *testing.B) {
if discard {
logger, flush = logsjson.NewJSONLogger(c.Verbosity, logsjson.AddNopSync(&output), logsjson.AddNopSync(&output), nil)
} else {
stdout, stderr := os.Stdout, os.Stderr
os.Stdout, os.Stderr = out1, out2
defer func() {
os.Stdout, os.Stderr = stdout, stderr
}()
c := logsapi.NewLoggingConfiguration()
c.Options.JSON.SplitStream = true
logger, flush = logsjson.Factory{}.Create(*c)
}
c := logsapi.NewLoggingConfiguration()
c.Options.JSON.SplitStream = true
logger, control := logsjson.Factory{}.Create(*c, o)
klog.SetLogger(logger)
defer klog.ClearLogger()
generateOutput(b, config, flush, out1, out2)
generateOutput(b, config, control.Flush, out1, out2)
})
})
}