Merge pull request #781 from juandspy/CCXDEV-14052

[CCXDEV-14052] Remove formated error logs
RedHatInsights · Aug 26, 2024 · b637391 · b637391
2 parents f1ba428 + d873638
commit b637391
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/differ/comparator.go b/differ/comparator.go
@@ -33,7 +33,7 @@ import (
 
 // Messages
 const (
-	clusterName      = "cluster"
+	clusterStr       = "cluster"
 	resolutionKey    = "resolution"
 	resolutionMsg    = "Should notify user"
 	resolutionReason = "reason"
@@ -116,7 +116,7 @@ func updateNotificationRecordSentState(storage Storage, cluster types.ClusterEnt
 }
 
 func updateNotificationRecordErrorState(storage Storage, err error, cluster types.ClusterEntry, report types.ClusterReport, notifiedAt types.Timestamp, eventTarget types.EventTarget) {
-	log.Error().Msgf("New issues couldn't be notified for cluster %s", string(cluster.ClusterName))
+	log.Error().Err(err).Str(clusterStr, string(cluster.ClusterName)).Msg("New issues couldn't be notified")
 	NotificationNotSentErrorState.Inc()
 	err = storage.WriteNotificationRecordForCluster(cluster, notificationTypes.Instant, states.ErrorState, report, notifiedAt, err.Error(), eventTarget)
 	if err != nil {

diff --git a/differ/content.go b/differ/content.go
@@ -44,13 +44,13 @@ func fetchAllRulesContent(config *conf.DependenciesConfiguration) (rules types.R
 
 	req, err := http.NewRequest("GET", contentURL, http.NoBody)
 	if err != nil {
-		log.Error().Msgf("Got error while setting up HTTP request for content service -  %s", err.Error())
+		log.Error().Err(err).Msg("Got error while setting up HTTP request for content service")
 		return nil, err
 	}
 
 	body, err := httputils.SendRequest(req, 10*time.Second)
 	if err != nil {
-		log.Error().Msgf("Got error while processing HTTP request - %s", err.Error())
+		log.Error().Err(err).Msg("Got error while processing HTTP request")
 		return nil, err
 	}
 

diff --git a/differ/renderer.go b/differ/renderer.go
@@ -42,8 +42,7 @@ func renderReportsForCluster(
 	clusterName types.ClusterName,
 	reports types.ReportContent,
 	ruleContent types.Rules) ([]types.RenderedReport, error) {
-
-	log.Debug().Str("cluster", string(clusterName)).Msg("RenderReportsForCluster")
+	log.Debug().Str(clusterStr, string(clusterName)).Msg("RenderReportsForCluster")
 
 	req, err := createTemplateRendererRequest(ruleContent, reports, clusterName, config.TemplateRendererURL)
 	if err != nil {

diff --git a/differ/storage.go b/differ/storage.go
@@ -611,7 +611,7 @@ func (storage DBStorage) WriteReadError(
 	if err != nil {
 		log.Err(err).
 			Int("org", int(orgID)).
-			Str("cluster", string(clusterName)).
+			Str(clusterStr, string(clusterName)).
 			Str("last checked", lastCheckedTime.String()).
 			Str("created at", createdAt.String()).
 			Str("error text", errorText).

diff --git a/producer/servicelog/service_log_producer.go b/producer/servicelog/service_log_producer.go
@@ -83,7 +83,7 @@ func (producer *Producer) ProduceMessage(msg types.ProducerMessage) (partitionID
 
 	response, err := client.Do(req)
 	if err != nil {
-		log.Error().Err(err).Msgf("Error making the HTTP request")
+		log.Error().Err(err).Msg("Error making the HTTP request")
 		return -1, -1, err
 	}
 
@@ -112,7 +112,7 @@ func (producer *Producer) ProduceMessage(msg types.ProducerMessage) (partitionID
 		return 0, 0, nil
 	default:
 		err = fmt.Errorf("received unexpected response status code - %s", response.Status)
-		log.Error().Err(err).Msgf("Got unexpected response status code")
+		log.Error().Err(err).Msg("Got unexpected response status code")
 		return -1, -1, err
 	}
 }