wip

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

Author: csviri

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

@@ -76,11 +76,20 @@ public void receivedEvent(Event event, Map<String, Object> metadata) {
   }
 
   @Override
+  @Deprecated(forRemoval = true)
   public void reconcileCustomResource(
       HasMetadata resource, RetryInfo retryInfo, Map<String, Object> metadata) {
     metricsList.forEach(metrics -> metrics.reconcileCustomResource(resource, retryInfo, metadata));
   }
 
+  @Override
+  public void submittedForReconciliation(
+      HasMetadata resource, RetryInfo retryInfo, Map<String, Object> metadata) {
+    metricsList.forEach(
+        metrics -> metrics.submittedForReconciliation(resource, retryInfo, metadata));
+    reconcileCustomResource(resource, retryInfo, metadata);
+  }
+
   @Override
   public void failedReconciliation(
       HasMetadata resource, RetryInfo retry, Exception exception, Map<String, Object> metadata) {
@@ -105,10 +114,17 @@ public void cleanupDoneFor(ResourceID resourceID, Map<String, Object> metadata)
     metricsList.forEach(metrics -> metrics.cleanupDoneFor(resourceID, metadata));
   }
 
+  @Override
+  @Deprecated(forRemoval = true)
+  public void finishedReconciliation(HasMetadata resource, Map<String, Object> metadata) {
+    metricsList.forEach(metrics -> metrics.finishedReconciliation(resource, metadata));
+  }
+
   @Override
   public void successfullyFinishedReconciliation(
       HasMetadata resource, Map<String, Object> metadata) {
     metricsList.forEach(metrics -> metrics.successfullyFinishedReconciliation(resource, metadata));
+    finishedReconciliation(resource, metadata);
   }
 
   @Override

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

@@ -147,7 +147,6 @@ void successfullyFinishedReconciliation_shouldDelegateToAllMetricsInOrder() {
     inOrder.verify(metrics1).successfullyFinishedReconciliation(resource, metadata);
     inOrder.verify(metrics2).successfullyFinishedReconciliation(resource, metadata);
     inOrder.verify(metrics3).successfullyFinishedReconciliation(resource, metadata);
-    verifyNoMoreInteractions(metrics1, metrics2, metrics3);
   }
 
   @Test