diff --git a/common/kafka/logs.go b/common/kafka/logs.go index 978e02ae..dd1d33a4 100644 --- a/common/kafka/logs.go +++ b/common/kafka/logs.go @@ -4,6 +4,7 @@ package kafka import ( + "github.com/twmb/franz-go/pkg/kfake" "github.com/twmb/franz-go/pkg/kgo" "akvorado/common/helpers" @@ -43,3 +44,17 @@ func (l *Logger) Log(level kgo.LogLevel, msg string, keyvals ...any) { l.r.Debug().Fields(keyvals).Msg(msg) } } + +// Logf logs a message at the specified level for kfake. +func (l *Logger) Logf(level kfake.LogLevel, msg string, keyvals ...any) { + switch level { + case kfake.LogLevelError: + l.r.Error().Fields(keyvals).Msg(msg) + case kfake.LogLevelWarn: + l.r.Warn().Fields(keyvals).Msg(msg) + case kfake.LogLevelInfo: + l.r.Info().Fields(keyvals).Msg(msg) + case kfake.LogLevelDebug: + l.r.Debug().Fields(keyvals).Msg(msg) + } +} diff --git a/common/kafka/tests.go b/common/kafka/tests.go index b5057daa..f4f5c651 100644 --- a/common/kafka/tests.go +++ b/common/kafka/tests.go @@ -133,17 +133,3 @@ func InterceptMessages(t *testing.T, cluster *kfake.Cluster, callback func(*kgo. } var _ kfake.Logger = &Logger{} - -// Logf logs a message at the specified level for kfake. -func (l *Logger) Logf(level kfake.LogLevel, msg string, keyvals ...any) { - switch level { - case kfake.LogLevelError: - l.r.Error().Fields(keyvals).Msg(msg) - case kfake.LogLevelWarn: - l.r.Warn().Fields(keyvals).Msg(msg) - case kfake.LogLevelInfo: - l.r.Info().Fields(keyvals).Msg(msg) - case kfake.LogLevelDebug: - l.r.Debug().Fields(keyvals).Msg(msg) - } -} diff --git a/outlet/metadata/provider/snmp/logs.go b/outlet/metadata/provider/snmp/logs.go new file mode 100644 index 00000000..2cd2d223 --- /dev/null +++ b/outlet/metadata/provider/snmp/logs.go @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2025 Free Mobile +// SPDX-License-Identifier: AGPL-3.0-only + +package snmp + +import ( + "fmt" + + "akvorado/common/reporter" +) + +type goSNMPLogger struct { + r *reporter.Reporter +} + +func (l *goSNMPLogger) Print(v ...any) { + if e := l.r.Debug(); e.Enabled() { + e.Msg(fmt.Sprint(v...)) + } +} + +func (l *goSNMPLogger) Printf(format string, v ...any) { + if e := l.r.Debug(); e.Enabled() { + e.Msg(fmt.Sprintf(format, v...)) + } +} diff --git a/outlet/metadata/provider/snmp/poller.go b/outlet/metadata/provider/snmp/poller.go index 9d85c7cc..3c8b2d98 100644 --- a/outlet/metadata/provider/snmp/poller.go +++ b/outlet/metadata/provider/snmp/poller.go @@ -13,7 +13,6 @@ import ( "github.com/gosnmp/gosnmp" - "akvorado/common/reporter" "akvorado/outlet/metadata/provider" ) @@ -210,19 +209,3 @@ func (p *Provider) Poll(ctx context.Context, exporter, agent netip.Addr, port ui } return provider.Answer{}, nil } - -type goSNMPLogger struct { - r *reporter.Reporter -} - -func (l *goSNMPLogger) Print(v ...any) { - if e := l.r.Debug(); e.Enabled() { - e.Msg(fmt.Sprint(v...)) - } -} - -func (l *goSNMPLogger) Printf(format string, v ...any) { - if e := l.r.Debug(); e.Enabled() { - e.Msg(fmt.Sprintf(format, v...)) - } -}