github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/logger: follow-up for 09105ff49c

Browse source
This commit is contained in:
Aliaksandr Valialkin 2020-11-19 12:36:50 +02:00
parent 09105ff49c
commit 97a0c80904
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/CHANGELOG.md
View file

@ -7,6 +7,9 @@
snap install victoriametrics
```
* FEATURE: vminsert: export `vm_rpc_vmstorage_is_reachable` metric, which can be used for monitoring reachability of vmstorage nodes from vminsert nodes.
* FEATURE: add `-loggerWarnsPerSecondLimit` command-line flag for rate limiting of WARN messages in logs. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/905
* FEATURE: apply `loggerErrorsPerSecondLimit` and `-loggerWarnsPerSecondLimit` rate limit per caller. I.e. log messages are suppressed if the same caller logs the same message
at the rate exceeding the given limit. See https://github.com/VictoriaMetrics/VictoriaMetrics/issues/905#issuecomment-729395855
# [v1.47.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.47.0)

28
lib/logger/logger.go
View file

@ -37,7 +37,7 @@ func Init() {
setLoggerOutput()
validateLoggerLevel()
validateLoggerFormat()
go errorsAndWarnsLoggedCleaner()
go logLimiterCleaner()
logAllFlags()
}
@ -126,37 +126,36 @@ func logLevelSkipframes(skipframes int, level, format string, args ...interface{
logMessage(level, msg, 3+skipframes)
}
func errorsAndWarnsLoggedCleaner() {
func logLimiterCleaner() {
for {
time.Sleep(time.Second)
logLimiter.reset()
}
}
var (
logLimiter = newLogLimit()
)
var logLimiter = newLogLimit()
func newLogLimit() *logLimit {
return &logLimit{
s: make(map[string]uint64),
m: make(map[string]uint64),
}
}
type logLimit struct {
mu sync.Mutex
s map[string]uint64
m map[string]uint64
}
func (ll *logLimit) reset() {
ll.mu.Lock()
ll.s = make(map[string]uint64)
ll.m = make(map[string]uint64, len(ll.m))
ll.mu.Unlock()
}
// needSuppress check if given string exceeds limit,
// when count equals limit, log message prefix returned.
func (ll *logLimit) needSuppress(file string, limit uint64) (bool, string) {
// needSuppress checks if the number of calls for the given location exceeds the given limit.
//
// When the number of calls equals limit, log message prefix returned.
func (ll *logLimit) needSuppress(location string, limit uint64) (bool, string) {
// fast path
var msg string
if limit == 0 {
@ -165,7 +164,7 @@ func (ll *logLimit) needSuppress(file string, limit uint64) (bool, string) {
ll.mu.Lock()
defer ll.mu.Unlock()
if n, ok := ll.s[file]; ok {
if n, ok := ll.m[location]; ok {
if n >= limit {
switch n {
// report only once
@ -175,9 +174,9 @@ func (ll *logLimit) needSuppress(file string, limit uint64) (bool, string) {
return true, msg
}
}
ll.s[file] = n + 1
ll.m[location] = n + 1
} else {
ll.s[file] = 1
ll.m[location] = 1
}
return false, msg
}
@ -191,7 +190,6 @@ func (lw *logWriter) Write(p []byte) (int, error) {
}
func logMessage(level, msg string, skipframes int) {
timestamp := ""
if !*disableTimestamps {
timestamp = time.Now().UTC().Format("2006-01-02T15:04:05.000Z")