feat: fixes missing data by type (#585)

* feat: fixes missing data by type Signed-off-by: AlexsJones <alexsimonjones@gmail.com> * chore: reverted Makefile Signed-off-by: AlexsJones <alexsimonjones@gmail.com> * chore: addressing PR comments Signed-off-by: AlexsJones <alexsimonjones@gmail.com> --------- Signed-off-by: AlexsJones <alexsimonjones@gmail.com>
k8sgpt-ai · Dec 19, 2024 · a1426b7 · a1426b7
1 parent 5de88b5
commit a1426b7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/controllers/analysis_step.go b/controllers/analysis_step.go
@@ -131,7 +131,7 @@ func (step *AnalysisStep) cleanUpStaleResults(rawResults map[string]corev1alpha1
 				if err != nil {
 					return err
 				}
-				numberOfResultsByType := instance.r.MetricsBuilder.GetCounterVec("k8sgpt_number_of_results_by_type")
+				numberOfResultsByType := instance.r.MetricsBuilder.GetGaugeVec("k8sgpt_number_of_results_by_type")
 				if numberOfResultsByType != nil {
 					numberOfResultsByType.WithLabelValues(result.Spec.Kind, result.Spec.Name, instance.k8sgptConfig.Name).Desc()
 				}
@@ -143,20 +143,17 @@ func (step *AnalysisStep) cleanUpStaleResults(rawResults map[string]corev1alpha1
 }
 
 func (step *AnalysisStep) processRawResults(rawResults map[string]corev1alpha1.Result, instance *K8sGPTInstance) error {
+
+	numberOfResultsByType := instance.r.MetricsBuilder.GetGaugeVec("k8sgpt_number_of_results_by_type")
+	if numberOfResultsByType != nil {
+		numberOfResultsByType.Reset()
+	}
 	for _, result := range rawResults {
-		operation, err := resources.CreateOrUpdateResult(instance.ctx, instance.r.Client, result)
+		err := resources.CreateOrUpdateResult(instance.ctx, instance.r.Client, result)
 		if err != nil {
 			return err
 		}
-
-		if operation == resources.CreatedResult {
-			numberOfResultsByType := instance.r.MetricsBuilder.GetCounterVec("k8sgpt_number_of_results_by_type")
-			if numberOfResultsByType != nil {
-				numberOfResultsByType.WithLabelValues(result.Spec.Kind, result.Spec.Name, instance.k8sgptConfig.Name).Inc()
-			} else if operation == resources.UpdatedResult {
-				instance.logger.Info("updated successfully %s", result.Name)
-			}
-		}
+		numberOfResultsByType.WithLabelValues(result.Spec.Kind, result.Spec.Name, instance.k8sgptConfig.Name).Inc()
 	}
 
 	return nil

diff --git a/pkg/resources/results.go b/pkg/resources/results.go
@@ -62,33 +62,33 @@ func GetResult(resultSpec v1alpha1.ResultSpec, name, namespace, backend string,
 		},
 	}
 }
-func CreateOrUpdateResult(ctx context.Context, c client.Client, res v1alpha1.Result) (ResultOperation, error) {
+func CreateOrUpdateResult(ctx context.Context, c client.Client, res v1alpha1.Result) error {
 	var existing v1alpha1.Result
 	if err := c.Get(ctx, client.ObjectKey{Namespace: res.Namespace, Name: res.Name}, &existing); err != nil {
 		if !errors.IsNotFound(err) {
-			return NoOpResult, err
+			return err
 		}
 		if err := c.Create(ctx, &res); err != nil {
-			return NoOpResult, err
+			return err
 		}
 		fmt.Printf("Created result %s\n", res.Name)
-		return CreatedResult, nil
+		return nil
 	}
 	if len(existing.Spec.Error) == len(res.Spec.Error) && reflect.DeepEqual(res.Labels, existing.Labels) {
 		existing.Status.LifeCycle = string(NoOpResult)
 		err := c.Status().Update(ctx, &existing)
-		return NoOpResult, err
+		return err
 	}
 
 	existing.Spec = res.Spec
 	existing.Labels = res.Labels
 	if err := c.Update(ctx, &existing); err != nil {
-		return NoOpResult, err
+		return err
 	}
 	existing.Status.LifeCycle = string(UpdatedResult)
 	if err := c.Status().Update(ctx, &existing); err != nil {
-		return NoOpResult, err
+		return err
 	}
 	fmt.Printf("Updated result %s\n", res.Name)
-	return UpdatedResult, nil
+	return nil
 }