From d2a06143487a6ea40790a195870220eeeaf60a04 Mon Sep 17 00:00:00 2001
From: myan <myan@redhat.com>
Date: Tue, 29 Oct 2024 09:46:35 +0000
Subject: [PATCH] fix the log

Signed-off-by: myan <myan@redhat.com>
---
 manager/pkg/processes/cronjob/scheduler.go             | 2 +-
 manager/pkg/status/conflator/conflation_committer.go   | 6 +++---
 manager/pkg/status/dispatcher/conflation_dispatcher.go | 4 ++--
 manager/pkg/status/dispatcher/transport_dispatcher.go  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manager/pkg/processes/cronjob/scheduler.go b/manager/pkg/processes/cronjob/scheduler.go
index 21dc4dcbc..c2ae1711b 100644
--- a/manager/pkg/processes/cronjob/scheduler.go
+++ b/manager/pkg/processes/cronjob/scheduler.go
@@ -22,7 +22,7 @@ const (
 	EverySecond string = "second"
 )
 
-var log = logger.ZapLogger("cronjob-scheduler")
+var log = logger.DefaultZapLogger()
 
 type GlobalHubJobScheduler struct {
 	scheduler  *gocron.Scheduler
diff --git a/manager/pkg/status/conflator/conflation_committer.go b/manager/pkg/status/conflator/conflation_committer.go
index eca15189e..9ba0ef3cc 100644
--- a/manager/pkg/status/conflator/conflation_committer.go
+++ b/manager/pkg/status/conflator/conflation_committer.go
@@ -31,7 +31,7 @@ type ConflationCommitter struct {
 
 func NewKafkaConflationCommitter(metadataFunc MetadataFunc) *ConflationCommitter {
 	return &ConflationCommitter{
-		log:                  logger.ZapLogger("kafka-conflation-committer"),
+		log:                  logger.DefaultZapLogger(),
 		retrieveMetadataFunc: metadataFunc,
 		committedPositions:   map[string]int64{},
 	}
@@ -48,7 +48,7 @@ func (k *ConflationCommitter) Start(ctx context.Context) error {
 			case <-ticker.C: // wait for next time interval
 				err := k.commit()
 				if err != nil {
-					k.log.Info("failed to commit offset", "error", err)
+					k.log.Infow("failed to commit offset", "error", err)
 				}
 				// ticker.Reset()
 			case <-ctx.Done():
@@ -74,7 +74,7 @@ func (k *ConflationCommitter) commit() error {
 			continue
 		}
 
-		k.log.Warnf("commit offset to database", "topic@partition", key, "offset", transPosition.Offset)
+		k.log.Warnw("commit offset to database", "topic@partition", key, "offset", transPosition.Offset)
 		payload, err := json.Marshal(transport.EventPosition{
 			OwnerIdentity: transPosition.OwnerIdentity,
 			Topic:         transPosition.Topic,
diff --git a/manager/pkg/status/dispatcher/conflation_dispatcher.go b/manager/pkg/status/dispatcher/conflation_dispatcher.go
index 529d1bded..e88daa329 100644
--- a/manager/pkg/status/dispatcher/conflation_dispatcher.go
+++ b/manager/pkg/status/dispatcher/conflation_dispatcher.go
@@ -21,7 +21,7 @@ func NewConflationDispatcher(conflationReadyQueue *conflator.ConflationReadyQueu
 	dbWorkerPool *workerpool.DBWorkerPool,
 ) *ConflationDispatcher {
 	return &ConflationDispatcher{
-		log:                  logger.ZapLogger("conflation-dispatcher"),
+		log:                  logger.DefaultZapLogger(),
 		conflationReadyQueue: conflationReadyQueue,
 		dbWorkerPool:         dbWorkerPool,
 	}
@@ -41,7 +41,7 @@ func AddConflationDispatcher(mgr ctrl.Manager, conflationManager *conflator.Conf
 
 	// conflation dispatcher -> work pool
 	conflationDispatcher := &ConflationDispatcher{
-		log:                  logger.ZapLogger("conflation-dispatcher"),
+		log:                  logger.DefaultZapLogger(),
 		conflationReadyQueue: conflationManager.GetReadyQueue(),
 		dbWorkerPool:         dbWorkerPool,
 	}
diff --git a/manager/pkg/status/dispatcher/transport_dispatcher.go b/manager/pkg/status/dispatcher/transport_dispatcher.go
index 4da4f6b03..3f14e6e16 100644
--- a/manager/pkg/status/dispatcher/transport_dispatcher.go
+++ b/manager/pkg/status/dispatcher/transport_dispatcher.go
@@ -26,7 +26,7 @@ func AddTransportDispatcher(mgr ctrl.Manager, consumer transport.Consumer, manag
 	conflationManager *conflator.ConflationManager, stats *statistics.Statistics,
 ) error {
 	transportDispatcher := &TransportDispatcher{
-		log:               logger.ZapLogger("transport-dispatcher"),
+		log:               logger.DefaultZapLogger(),
 		consumer:          consumer,
 		conflationManager: conflationManager,
 		statistic:         stats,