From 9524e4bbd1e69d40789234e1e8567543ccf29321 Mon Sep 17 00:00:00 2001
From: Stanislav Khalash <stanislav.khalash@sap.com>
Date: Fri, 19 Jan 2024 13:14:59 +0100
Subject: [PATCH] Simplify logs

---
 internal/reconciler/logparser/reconciler.go      | 9 +++------
 internal/reconciler/logpipeline/reconciler.go    | 9 +++------
 internal/reconciler/metricpipeline/reconciler.go | 7 ++-----
 internal/reconciler/telemetry/reconciler.go      | 7 ++-----
 internal/reconciler/tracepipeline/reconciler.go  | 7 ++-----
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/internal/reconciler/logparser/reconciler.go b/internal/reconciler/logparser/reconciler.go
index 875a846bd..247a698ca 100644
--- a/internal/reconciler/logparser/reconciler.go
+++ b/internal/reconciler/logparser/reconciler.go
@@ -71,18 +71,15 @@ func NewReconciler(client client.Client, config Config, prober DaemonSetProber,
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logf.FromContext(ctx).V(1).Info("Reconciling")
+
 	overrideConfig, err := r.overridesHandler.LoadOverrides(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	logf.FromContext(ctx).V(1).Info("Reconciling",
-		"global_overrides", overrideConfig.Global,
-		"logging_overrides", overrideConfig.Logging,
-	)
-
 	if overrideConfig.Logging.Paused {
-		logf.FromContext(ctx).V(1).Info("Skipping reconciliation of logparser as reconciliation is paused.")
+		logf.FromContext(ctx).V(1).Info("Skipping reconciliation: paused using override config")
 		return ctrl.Result{}, nil
 	}
 
diff --git a/internal/reconciler/logpipeline/reconciler.go b/internal/reconciler/logpipeline/reconciler.go
index e2d61b9cd..432332702 100644
--- a/internal/reconciler/logpipeline/reconciler.go
+++ b/internal/reconciler/logpipeline/reconciler.go
@@ -87,18 +87,15 @@ func NewReconciler(client client.Client, config Config, prober DaemonSetProber,
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logf.FromContext(ctx).V(1).Info("Reconciling")
+
 	overrideConfig, err := r.overridesHandler.LoadOverrides(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	logf.FromContext(ctx).V(1).Info("Reconciling",
-		"global_overrides", overrideConfig.Global,
-		"logging_overrides", overrideConfig.Logging,
-	)
-
 	if overrideConfig.Logging.Paused {
-		logf.FromContext(ctx).V(1).Info("Skipping reconciliation of logpipeline as reconciliation is paused.")
+		logf.FromContext(ctx).V(1).Info("Skipping reconciliation: paused using override config")
 		return ctrl.Result{}, nil
 	}
 
diff --git a/internal/reconciler/metricpipeline/reconciler.go b/internal/reconciler/metricpipeline/reconciler.go
index 6afe91350..fffb2fe8e 100644
--- a/internal/reconciler/metricpipeline/reconciler.go
+++ b/internal/reconciler/metricpipeline/reconciler.go
@@ -62,16 +62,13 @@ func NewReconciler(client client.Client, config Config, gatewayProber Deployment
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logf.FromContext(ctx).V(1).Info("Reconciling")
+
 	overrideConfig, err := r.overridesHandler.LoadOverrides(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	logf.FromContext(ctx).V(1).Info("Reconciling",
-		"global_overrides", overrideConfig.Global,
-		"metrics_overrides", overrideConfig.Metrics,
-	)
-
 	if overrideConfig.Metrics.Paused {
 		logf.FromContext(ctx).V(1).Info("Skipping reconciliation: paused using override config")
 		return ctrl.Result{}, nil
diff --git a/internal/reconciler/telemetry/reconciler.go b/internal/reconciler/telemetry/reconciler.go
index 96d45a762..1e1c52de3 100644
--- a/internal/reconciler/telemetry/reconciler.go
+++ b/internal/reconciler/telemetry/reconciler.go
@@ -76,16 +76,13 @@ func NewReconciler(client client.Client, scheme *runtime.Scheme, config Config,
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logf.FromContext(ctx).V(1).Info("Reconciling")
+
 	overrideConfig, err := r.overridesHandler.LoadOverrides(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	logf.FromContext(ctx).V(1).Info("Reconciling",
-		"global_overrides", overrideConfig.Global,
-		"telemetry_overrides", overrideConfig.Logging,
-	)
-
 	if overrideConfig.Telemetry.Paused {
 		logf.FromContext(ctx).V(1).Info("Skipping reconciliation: paused using override config")
 		return ctrl.Result{}, nil
diff --git a/internal/reconciler/tracepipeline/reconciler.go b/internal/reconciler/tracepipeline/reconciler.go
index 76f8908fe..673de0079 100644
--- a/internal/reconciler/tracepipeline/reconciler.go
+++ b/internal/reconciler/tracepipeline/reconciler.go
@@ -69,16 +69,13 @@ func NewReconciler(client client.Client, config Config, prober DeploymentProber,
 }
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
+	logf.FromContext(ctx).V(1).Info("Reconciling")
+
 	overrideConfig, err := r.overridesHandler.LoadOverrides(ctx)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
 
-	logf.FromContext(ctx).V(1).Info("Reconciling",
-		"global_overrides", overrideConfig.Global,
-		"tracing_overrides", overrideConfig.Tracing,
-	)
-
 	if overrideConfig.Tracing.Paused {
 		logf.FromContext(ctx).V(1).Info("Skipping reconciliation: paused using override config")
 		return ctrl.Result{}, nil