Skip to content
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.

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

[7.17](backport #29727) Do not mention removal if version is not specified in cfgwarn messages #29739

Merged
merged 1 commit into from
Jan 10, 2022
Merged
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions libbeat/common/cfgwarn/cfgwarn.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ func Beta(format string, v ...interface{}) {
}

// Deprecate logs a deprecation message.
// The version string contains the version when the future will be removed
// The version string contains the version when the future will be removed.
// If version is empty, the message will not mention the removal of the feature.
func Deprecate(version string, format string, v ...interface{}) {
postfix := fmt.Sprintf(" Will be removed in version: %s", version)
var postfix string
if version != "" {
postfix = fmt.Sprintf(" Will be removed in version: %s", version)
}
logp.NewLogger(selector, zap.AddCallerSkip(1)).Warnf("DEPRECATED: "+format+postfix, v...)
}

Expand Down