public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: use any rather than interface{} (#74066)

Browse Source
This commit is contained in:
Ryan McKinley
2023-08-30 18:46:47 +03:00
committed by GitHub
parent 3e272d2bda
commit 025b2f3011
525 changed files with 2528 additions and 2528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/plugins/log/fake.go
+16 -16
View File
@@ -13,29 +13,29 @@ func NewTestLogger() *TestLogger {
return &TestLogger{}
}
func (f *TestLogger) New(_ ...interface{}) Logger {
func (f *TestLogger) New(_ ...any) Logger {
return NewTestLogger()
}
func (f *TestLogger) Info(msg string, ctx ...interface{}) {
func (f *TestLogger) Info(msg string, ctx ...any) {
f.InfoLogs.Calls++
f.InfoLogs.Message = msg
f.InfoLogs.Ctx = ctx
}
func (f *TestLogger) Warn(msg string, ctx ...interface{}) {
func (f *TestLogger) Warn(msg string, ctx ...any) {
f.WarnLogs.Calls++
f.WarnLogs.Message = msg
f.WarnLogs.Ctx = ctx
}
func (f *TestLogger) Debug(msg string, ctx ...interface{}) {
func (f *TestLogger) Debug(msg string, ctx ...any) {
f.DebugLogs.Calls++
f.DebugLogs.Message = msg
f.DebugLogs.Ctx = ctx
}
func (f *TestLogger) Error(msg string, ctx ...interface{}) {
func (f *TestLogger) Error(msg string, ctx ...any) {
f.ErrorLogs.Calls++
f.ErrorLogs.Message = msg
f.ErrorLogs.Ctx = ctx
@@ -44,7 +44,7 @@ func (f *TestLogger) Error(msg string, ctx ...interface{}) {
type Logs struct {
Calls int
Message string
Ctx []interface{}
Ctx []any
}
var _ PrettyLogger = (*TestPrettyLogger)(nil)
@@ -55,13 +55,13 @@ func NewTestPrettyLogger() *TestPrettyLogger {
return &TestPrettyLogger{}
}
func (f *TestPrettyLogger) Successf(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Failuref(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Info(_ ...interface{}) {}
func (f *TestPrettyLogger) Infof(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Debug(_ ...interface{}) {}
func (f *TestPrettyLogger) Debugf(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Warn(_ ...interface{}) {}
func (f *TestPrettyLogger) Warnf(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Error(_ ...interface{}) {}
func (f *TestPrettyLogger) Errorf(_ string, _ ...interface{}) {}
func (f *TestPrettyLogger) Successf(_ string, _ ...any) {}
func (f *TestPrettyLogger) Failuref(_ string, _ ...any) {}
func (f *TestPrettyLogger) Info(_ ...any) {}
func (f *TestPrettyLogger) Infof(_ string, _ ...any) {}
func (f *TestPrettyLogger) Debug(_ ...any) {}
func (f *TestPrettyLogger) Debugf(_ string, _ ...any) {}
func (f *TestPrettyLogger) Warn(_ ...any) {}
func (f *TestPrettyLogger) Warnf(_ string, _ ...any) {}
func (f *TestPrettyLogger) Error(_ ...any) {}
func (f *TestPrettyLogger) Errorf(_ string, _ ...any) {}
pkg/plugins/log/infra_wrapper.go
+10 -10
View File
@@ -16,42 +16,42 @@ func NewPrettyLogger(name string) *prettyLogger {
}
}
func (l *prettyLogger) Successf(format string, args ...interface{}) {
func (l *prettyLogger) Successf(format string, args ...any) {
l.log.Info(fmt.Sprintf(format, args...))
}
func (l *prettyLogger) Failuref(format string, args ...interface{}) {
func (l *prettyLogger) Failuref(format string, args ...any) {
l.log.Error(fmt.Sprintf(format, args...))
}
func (l *prettyLogger) Info(args ...interface{}) {
func (l *prettyLogger) Info(args ...any) {
l.log.Info(fmt.Sprint(args...))
}
func (l *prettyLogger) Infof(format string, args ...interface{}) {
func (l *prettyLogger) Infof(format string, args ...any) {
l.log.Info(fmt.Sprintf(format, args...))
}
func (l *prettyLogger) Debug(args ...interface{}) {
func (l *prettyLogger) Debug(args ...any) {
l.log.Debug(fmt.Sprint(args...))
}
func (l *prettyLogger) Debugf(format string, args ...interface{}) {
func (l *prettyLogger) Debugf(format string, args ...any) {
l.log.Debug(fmt.Sprintf(format, args...))
}
func (l *prettyLogger) Warn(args ...interface{}) {
func (l *prettyLogger) Warn(args ...any) {
l.log.Warn(fmt.Sprint(args...))
}
func (l *prettyLogger) Warnf(format string, args ...interface{}) {
func (l *prettyLogger) Warnf(format string, args ...any) {
l.log.Warn(fmt.Sprintf(format, args...))
}
func (l *prettyLogger) Error(args ...interface{}) {
func (l *prettyLogger) Error(args ...any) {
l.log.Error(fmt.Sprint(args...))
}
func (l *prettyLogger) Errorf(format string, args ...interface{}) {
func (l *prettyLogger) Errorf(format string, args ...any) {
l.log.Error(fmt.Sprintf(format, args...))
}
pkg/plugins/log/logger.go
+6 -6
View File
@@ -14,31 +14,31 @@ type grafanaInfraLogWrapper struct {
l *log.ConcreteLogger
}
func (d *grafanaInfraLogWrapper) New(ctx ...interface{}) Logger {
func (d *grafanaInfraLogWrapper) New(ctx ...any) Logger {
if len(ctx) == 0 {
return &grafanaInfraLogWrapper{
l: d.l.New(),
}
}
ctx = append([]interface{}{"logger"}, ctx...)
ctx = append([]any{"logger"}, ctx...)
return &grafanaInfraLogWrapper{
l: d.l.New(ctx...),
}
}
func (d *grafanaInfraLogWrapper) Debug(msg string, ctx ...interface{}) {
func (d *grafanaInfraLogWrapper) Debug(msg string, ctx ...any) {
d.l.Debug(msg, ctx...)
}
func (d *grafanaInfraLogWrapper) Info(msg string, ctx ...interface{}) {
func (d *grafanaInfraLogWrapper) Info(msg string, ctx ...any) {
d.l.Info(msg, ctx...)
}
func (d *grafanaInfraLogWrapper) Warn(msg string, ctx ...interface{}) {
func (d *grafanaInfraLogWrapper) Warn(msg string, ctx ...any) {
d.l.Warn(msg, ctx...)
}
func (d *grafanaInfraLogWrapper) Error(msg string, ctx ...interface{}) {
func (d *grafanaInfraLogWrapper) Error(msg string, ctx ...any) {
d.l.Error(msg, ctx...)
}