diff --git a/pkg/kube_events_manager/monitor.go b/pkg/kube_events_manager/monitor.go index a5b8ec10..1294dc23 100644 --- a/pkg/kube_events_manager/monitor.go +++ b/pkg/kube_events_manager/monitor.go @@ -190,7 +190,7 @@ func (m *monitor) CreateInformers() error { if m.Config.NamespaceSelector != nil && m.Config.NamespaceSelector.LabelSelector != nil { logEntry.Debug("Create NamespaceInformer for namespace.labelSelector") - m.NamespaceInformer = NewNamespaceInformer(m.ctx, m.KubeClient, m.Config) + m.NamespaceInformer = NewNamespaceInformer(m.ctx, m.KubeClient, m.Config, m.logger.Named("namespace-informer")) err := m.NamespaceInformer.createSharedInformer( func(nsName string) { // Added/Modified event: check, create and run informers for Ns diff --git a/pkg/kube_events_manager/namespace_informer.go b/pkg/kube_events_manager/namespace_informer.go index 4134dc20..80fe3dfb 100644 --- a/pkg/kube_events_manager/namespace_informer.go +++ b/pkg/kube_events_manager/namespace_informer.go @@ -36,9 +36,11 @@ type namespaceInformer struct { addFn func(string) delFn func(string) + + logger *log.Logger } -func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *MonitorConfig) *namespaceInformer { +func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *MonitorConfig, logger *log.Logger) *namespaceInformer { cctx, cancel := context.WithCancel(ctx) informer := &namespaceInformer{ @@ -47,6 +49,7 @@ func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *M KubeClient: client, Monitor: monitor, ExistedObjects: make(map[string]bool), + logger: logger, } return informer } @@ -150,7 +153,7 @@ func (ni *namespaceInformer) start() { if err := wait.PollUntilContextCancel(cctx, DefaultSyncTime, true, func(_ context.Context) (bool, error) { return ni.SharedInformer.HasSynced(), nil }); err != nil { - ni.Monitor.Logger.Error("Cache is not synced for informer", + ni.logger.Error("Cache is not synced for informer", slog.String("debugName", ni.Monitor.Metadata.DebugName)) } diff --git a/pkg/kube_events_manager/resource_informer.go b/pkg/kube_events_manager/resource_informer.go index f9baa810..d24ffbac 100644 --- a/pkg/kube_events_manager/resource_informer.go +++ b/pkg/kube_events_manager/resource_informer.go @@ -463,7 +463,7 @@ func (ei *resourceInformer) start() { errorHandler := newWatchErrorHandler(ei.Monitor.Metadata.DebugName, ei.Monitor.Kind, ei.Monitor.Metadata.LogLabels, ei.metricStorage, ei.logger.Named("watch-error-handler")) err := DefaultFactoryStore.Start(ei.ctx, ei.id, ei.KubeClient.Dynamic(), ei.FactoryIndex, ei, errorHandler) if err != nil { - ei.Monitor.Logger.Error("cache is not synced for informer", slog.String("debugName", ei.Monitor.Metadata.DebugName)) + ei.logger.Error("cache is not synced for informer", slog.String("debugName", ei.Monitor.Metadata.DebugName)) return }