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

@@ -209,8 +209,7 @@ public void cleanupDone(ResourceID resourceID, Map<String, Object> metadata) {
   }
 
   @Override
-  @Deprecated(forRemoval = true)
-  public void reconcileCustomResource(
+  public void submittedForReconciliation(
       HasMetadata resource, RetryInfo retryInfoNullable, Map<String, Object> metadata) {
     Optional<RetryInfo> retryInfo = Optional.ofNullable(retryInfoNullable);
     incrementCounter(
@@ -269,11 +268,6 @@ public void failedReconciliation(
         Tag.of(EXCEPTION, cause.getClass().getSimpleName()));
   }
 
-  @Override
-  public <T extends Map<?, ?>> T monitorSizeOf(T map, String name) {
-    return registry.gaugeMapSize(PREFIX + name + SIZE_SUFFIX, Collections.emptyList(), map);
-  }
-
   private void addMetadataTags(
       ResourceID resourceID, Map<String, Object> metadata, List<Tag> tags, boolean prefixed) {
     if (collectPerResourceMetrics) {

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

@@ -84,13 +84,13 @@ void receivedEvent_shouldDelegateToAllMetricsInOrder() {
   }
 
   @Test
-  void reconcileCustomResource_shouldDelegateToAllMetricsInOrder() {
-    aggregatedMetrics.reconcileCustomResource(resource, retryInfo, metadata);
+  void submittedForReconciliation_shouldDelegateToAllMetricsInOrder() {
+    aggregatedMetrics.submittedForReconciliation(resource, retryInfo, metadata);
 
     final var inOrder = inOrder(metrics1, metrics2, metrics3);
-    inOrder.verify(metrics1).reconcileCustomResource(resource, retryInfo, metadata);
-    inOrder.verify(metrics2).reconcileCustomResource(resource, retryInfo, metadata);
-    inOrder.verify(metrics3).reconcileCustomResource(resource, retryInfo, metadata);
+    inOrder.verify(metrics1).submittedForReconciliation(resource, retryInfo, metadata);
+    inOrder.verify(metrics2).submittedForReconciliation(resource, retryInfo, metadata);
+    inOrder.verify(metrics3).submittedForReconciliation(resource, retryInfo, metadata);
     verifyNoMoreInteractions(metrics1, metrics2, metrics3);
   }
 
@@ -176,18 +176,4 @@ void timeControllerExecution_shouldPropagateException() throws Exception {
     verify(metrics3, never()).timeControllerExecution(any());
     verifyNoMoreInteractions(metrics1, metrics2, metrics3);
   }
-
-  @Test
-  void monitorSizeOf_shouldDelegateToAllMetricsInOrderAndReturnOriginalMap() {
-    final var testMap = Map.of("key1", "value1");
-    final var mapName = "testMap";
-
-    final var result = aggregatedMetrics.monitorSizeOf(testMap, mapName);
-
-    assertThat(result).isSameAs(testMap);
-    verify(metrics1).monitorSizeOf(testMap, mapName);
-    verify(metrics2).monitorSizeOf(testMap, mapName);
-    verify(metrics3).monitorSizeOf(testMap, mapName);
-    verifyNoMoreInteractions(metrics1, metrics2, metrics3);
-  }
 }