wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

micrometer-support/src/main/java/io/javaoperatorsdk/operator/monitoring/micrometer/MicrometerMetrics.java

@@ -221,25 +221,33 @@ public void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata)
   public void reconcileCustomResource(
       HasMetadata resource, RetryInfo retryInfoNullable, Map<String, Object> metadata) {
     Optional<RetryInfo> retryInfo = Optional.ofNullable(retryInfoNullable);
-    incrementCounter(
-        ResourceID.fromResource(resource),
-        RECONCILIATIONS_STARTED,
-        metadata,
-        Tag.of(
-            RECONCILIATIONS_RETRIES_NUMBER,
-            String.valueOf(retryInfo.map(RetryInfo::getAttemptCount).orElse(0))),
-        Tag.of(
-            RECONCILIATIONS_RETRIES_LAST,
-            String.valueOf(retryInfo.map(RetryInfo::isLastAttempt).orElse(true))));
+    ResourceID resourceID = ResourceID.fromResource(resource);
+
+    // Record the counter without retry tags
+    incrementCounter(resourceID, RECONCILIATIONS_STARTED, metadata);
+
+    // Update retry number gauge
+    int retryNumber = retryInfo.map(RetryInfo::getAttemptCount).orElse(0);
+    updateGauge(resourceID, metadata, RECONCILIATIONS_RETRIES_NUMBER, retryNumber);
+
+    // Update retry last attempt gauge (1 for true, 0 for false)
+    int isLastAttempt = retryInfo.map(RetryInfo::isLastAttempt).orElse(true) ? 1 : 0;
+    updateGauge(resourceID, metadata, RECONCILIATIONS_RETRIES_LAST, isLastAttempt);
 
     var controllerQueueSize =
         gauges.get(controllerQueueSizeGaugeRefName(metadata.get(CONTROLLER_NAME).toString()));
     controllerQueueSize.incrementAndGet();
   }
 
   @Override
-  public void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {
-    incrementCounter(ResourceID.fromResource(resource), RECONCILIATIONS_SUCCESS, metadata);
+  public void successfullyFinishedReconciliation(
+      HasMetadata resource, Map<String, Object> metadata) {
+    ResourceID resourceID = ResourceID.fromResource(resource);
+    incrementCounter(resourceID, RECONCILIATIONS_SUCCESS, metadata);
+
+    // Reset retry gauges on successful reconciliation
+    updateGauge(resourceID, metadata, RECONCILIATIONS_RETRIES_NUMBER, 0);
+    updateGauge(resourceID, metadata, RECONCILIATIONS_RETRIES_LAST, 0);
   }
 
   @Override
@@ -335,6 +343,32 @@ private void incrementCounter(
     counter.increment();
   }
 
+  private void updateGauge(
+      ResourceID id, Map<String, Object> metadata, String gaugeName, int value) {
+    final var tags = new ArrayList<Tag>(6);
+    addMetadataTags(id, metadata, tags, false);
+
+    final var gaugeRefName = buildGaugeRefName(id, gaugeName);
+    AtomicInteger gauge =
+        gauges.computeIfAbsent(
+            gaugeRefName,
+            key -> {
+              AtomicInteger newGauge =
+                  registry.gauge(PREFIX + gaugeName, tags, new AtomicInteger(0));
+              // Find the meter in the registry and record it for cleanup
+              var meter = registry.find(PREFIX + gaugeName).tags(tags).gauge();
+              if (meter != null) {
+                cleaner.recordAssociation(id, meter);
+              }
+              return newGauge;
+            });
+    gauge.set(value);
+  }
+
+  private String buildGaugeRefName(ResourceID id, String gaugeName) {
+    return gaugeName + "." + id.getName() + "." + id.getNamespace().orElse(CLUSTER);
+  }
+
   protected Set<Meter.Id> recordedMeterIdsFor(ResourceID resourceID) {
     return cleaner.recordedMeterIdsFor(resourceID);
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/monitoring/AggregatedMetrics.java

@@ -103,8 +103,9 @@ public void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata)
   }
 
   @Override
-  public void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {
-    metricsList.forEach(metrics -> metrics.finishedReconciliation(resource, metadata));
+  public void successfullyFinishedReconciliation(
+      HasMetadata resource, Map<String, Object> metadata) {
+    metricsList.forEach(metrics -> metrics.successfullyFinishedReconciliation(resource, metadata));
   }
 
   @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/monitoring/Metrics.java

@@ -93,7 +93,8 @@ default void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata)
    * @param resource the {@link ResourceID} associated with the resource being processed
    * @param metadata metadata associated with the resource being processed
    */
-  default void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {}
+  default void successfullyFinishedReconciliation(
+      HasMetadata resource, Map<String, Object> metadata) {}
 
   /**
    * Encapsulates the information about a controller execution i.e. a call to either {@link

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventProcessor.java

@@ -292,7 +292,7 @@ synchronized void eventProcessingFinished(
       return;
     }
     cleanupOnSuccessfulExecution(executionScope);
-    metrics.finishedReconciliation(executionScope.getResource(), metricsMetadata);
+    metrics.successfullyFinishedReconciliation(executionScope.getResource(), metricsMetadata);
     if ((triggerOnAllEvents() && executionScope.isDeleteEvent())
         || (!triggerOnAllEvents() && state.deleteEventPresent())) {
       cleanupForDeletedEvent(executionScope.getResourceID());

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/monitoring/AggregatedMetricsTest.java

@@ -141,13 +141,13 @@ void cleanupDoneFor_shouldDelegateToAllMetricsInOrder() {
   }
 
   @Test
-  void finishedReconciliation_shouldDelegateToAllMetricsInOrder() {
-    aggregatedMetrics.finishedReconciliation(resource, metadata);
+  void successfullyFinishedReconciliation_shouldDelegateToAllMetricsInOrder() {
+    aggregatedMetrics.successfullyFinishedReconciliation(resource, metadata);
 
     final var inOrder = inOrder(metrics1, metrics2, metrics3);
-    inOrder.verify(metrics1).finishedReconciliation(resource, metadata);
-    inOrder.verify(metrics2).finishedReconciliation(resource, metadata);
-    inOrder.verify(metrics3).finishedReconciliation(resource, metadata);
+    inOrder.verify(metrics1).successfullyFinishedReconciliation(resource, metadata);
+    inOrder.verify(metrics2).successfullyFinishedReconciliation(resource, metadata);
+    inOrder.verify(metrics3).successfullyFinishedReconciliation(resource, metadata);
     verifyNoMoreInteractions(metrics1, metrics2, metrics3);
   }