From c84bbc83eb92b6ef922b76891ce52a090688081b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Tue, 12 Mar 2024 10:49:23 +0100 Subject: [PATCH] fix: conflicting types of log fields in json output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ScaledJob is an object in logs during setup, but a string later. So I change name to scaledJob.Name in the latter cases. Signed-off-by: Mårten Svantesson --- CHANGELOG.md | 1 + pkg/scaling/scale_handler.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 633fa17886a..15bd8085e9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ Here is an overview of all new **experimental** features: ### Fixes +- **General**: Log field ScaledJob no longer have conflicting types ([#5592](https://github.com/kedacore/keda/pull/5592)) - **General**: Validate empty array value of triggers in ScaledObject/ScaledJob creation ([#5520](https://github.com/kedacore/keda/issues/5520)) ### Deprecations diff --git a/pkg/scaling/scale_handler.go b/pkg/scaling/scale_handler.go index fcc060dc97c..b4d4c7011c3 100644 --- a/pkg/scaling/scale_handler.go +++ b/pkg/scaling/scale_handler.go @@ -816,7 +816,7 @@ func (h *scaleHandler) getScaledJobMetrics(ctx context.Context, scaledJob *kedav isActive := false scalerType := fmt.Sprintf("%T:", scaler) - scalerLogger := log.WithValues("ScaledJob", scaledJob.Name, "Scaler", scalerType) + scalerLogger := log.WithValues("scaledJob.Name", scaledJob.Name, "Scaler", scalerType) metricSpecs := scaler.GetMetricSpecForScaling(ctx) @@ -880,7 +880,7 @@ func (h *scaleHandler) isScaledJobActive(ctx context.Context, scaledJob *kedav1a isActive, queueLength, maxValue, maxFloatValue := scaledjob.IsScaledJobActive(scalersMetrics, scaledJob.Spec.ScalingStrategy.MultipleScalersCalculation, scaledJob.MinReplicaCount(), scaledJob.MaxReplicaCount()) - logger.V(1).WithValues("ScaledJob", scaledJob.Name).Info("Checking if ScaleJob Scalers are active", "isActive", isActive, "maxValue", maxFloatValue, "MultipleScalersCalculation", scaledJob.Spec.ScalingStrategy.MultipleScalersCalculation) + logger.V(1).WithValues("scaledJob.Name", scaledJob.Name).Info("Checking if ScaleJob Scalers are active", "isActive", isActive, "maxValue", maxFloatValue, "MultipleScalersCalculation", scaledJob.Spec.ScalingStrategy.MultipleScalersCalculation) return isActive, queueLength, maxValue }