fix(micrometer): fix NPE when reconciling already marked events

Refs: #836

Author: scrocquesel

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

@@ -4,6 +4,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
@@ -57,11 +58,13 @@ public void cleanupDoneFor(ResourceID customResourceUid) {
     incrementCounter(customResourceUid, "events.delete");
   }
 
-  public void reconcileCustomResource(ResourceID resourceID,
-      RetryInfo retryInfo) {
+  public void reconcileCustomResource(ResourceID resourceID, RetryInfo retryInfoNullable) {
+    Optional<RetryInfo> retryInfo = Optional.ofNullable(retryInfoNullable);
     incrementCounter(resourceID, RECONCILIATIONS + "started",
-        RECONCILIATIONS + "retries.number", "" + retryInfo.getAttemptCount(),
-        RECONCILIATIONS + "retries.last", "" + retryInfo.isLastAttempt());
+        RECONCILIATIONS + "retries.number",
+        "" + retryInfo.map(RetryInfo::getAttemptCount).orElse(0),
+        RECONCILIATIONS + "retries.last",
+        "" + retryInfo.map(RetryInfo::isLastAttempt).orElse(true));
   }
 
   @Override

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

@@ -81,6 +81,22 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
         eventSourceManager);
   }
 
+  EventProcessor(
+      ReconciliationDispatcher<R> reconciliationDispatcher,
+      EventSourceManager<R> eventSourceManager,
+      String relatedControllerName,
+      Retry retry,
+      Metrics metrics) {
+    this(
+        eventSourceManager.getControllerResourceEventSource().getResourceCache(),
+        null,
+        relatedControllerName,
+        reconciliationDispatcher,
+        retry,
+        metrics,
+        eventSourceManager);
+  }
+
   private EventProcessor(
       Cache<R> cache,
       ExecutorService executor,

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java

@@ -12,6 +12,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerResourceCache;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerResourceEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
@@ -23,6 +24,7 @@
 import static io.javaoperatorsdk.operator.TestUtils.testCustomResource;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -47,6 +49,7 @@ class EventProcessorTest {
   private TimerEventSource retryTimerEventSourceMock = mock(TimerEventSource.class);
   private ControllerResourceEventSource controllerResourceEventSourceMock =
       mock(ControllerResourceEventSource.class);
+  private Metrics metricsMock = mock(Metrics.class);
   private EventProcessor eventProcessor;
   private EventProcessor eventProcessorWithRetry;
 
@@ -276,7 +279,8 @@ public void cancelScheduleOnceEventsOnSuccessfulExecution() {
   public void startProcessedMarkedEventReceivedBefore() {
     var crID = new ResourceID("test-cr", TEST_NAMESPACE);
     eventProcessor =
-        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
+        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null,
+            metricsMock));
     when(resourceCacheMock.get(eq(crID))).thenReturn(Optional.of(testCustomResource()));
     eventProcessor.handleEvent(new Event(crID));
 
@@ -285,6 +289,7 @@ public void startProcessedMarkedEventReceivedBefore() {
     eventProcessor.start();
 
     verify(reconciliationDispatcherMock, timeout(100).times(1)).handleExecution(any());
+    verify(metricsMock, times(1)).reconcileCustomResource(any(), isNull());;
   }
 
   private ResourceID eventAlreadyUnderProcessing() {