feature: modified for addition of config in defaulteventhandler

Author: laxmikantbpandhare

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

@@ -48,7 +48,7 @@ public class DefaultEventHandler implements EventHandler {
   private final int terminationTimeout;
   private final ReentrantLock lock = new ReentrantLock();
   private DefaultEventSourceManager eventSourceManager;
-  private final Metrics metrics = new Metrics(new Metrics.NoopMeterRegistry(Clock.SYSTEM));
+  private ControllerConfiguration configuration;
 
   public DefaultEventHandler(
       ResourceController controller, ControllerConfiguration configuration, MixedOperation client) {
@@ -57,28 +57,28 @@ public DefaultEventHandler(
         configuration.getName(),
         GenericRetry.fromConfiguration(configuration.getRetryConfiguration()),
         configuration.getConfigurationService().concurrentReconciliationThreads(),
-        configuration.getConfigurationService().getTerminationTimeoutSeconds());
+        configuration.getConfigurationService().getTerminationTimeoutSeconds(), configuration);
   }
 
   DefaultEventHandler(
       EventDispatcher eventDispatcher,
       String relatedControllerName,
       Retry retry,
-      int concurrentReconciliationThreads) {
+      int concurrentReconciliationThreads, ControllerConfiguration configuration) {
     this(
         eventDispatcher,
         relatedControllerName,
         retry,
         concurrentReconciliationThreads,
-        ConfigurationService.DEFAULT_TERMINATION_TIMEOUT_SECONDS);
+        ConfigurationService.DEFAULT_TERMINATION_TIMEOUT_SECONDS, configuration);
   }
 
   private DefaultEventHandler(
       EventDispatcher eventDispatcher,
       String relatedControllerName,
       Retry retry,
       int concurrentReconciliationThreads,
-      int terminationTimeout) {
+      int terminationTimeout, ControllerConfiguration configuration) {
     this.eventDispatcher = eventDispatcher;
     this.retry = retry;
     this.controllerName = relatedControllerName;
@@ -88,6 +88,7 @@ private DefaultEventHandler(
         new ScheduledThreadPoolExecutor(
             concurrentReconciliationThreads,
             runnable -> new Thread(runnable, "EventHandler-" + relatedControllerName));
+    this.configuration = configuration;
   }
 
   @Override
@@ -116,7 +117,10 @@ public void handleEvent(Event event) {
       final Predicate<CustomResource> selector = event.getCustomResourcesSelector();
       for (String uid : eventSourceManager.getLatestResourceUids(selector)) {
         eventBuffer.addEvent(uid, event);
-        metrics.timeControllerEvents();
+        configuration
+            .getConfigurationService()
+            .getMetrics()
+            .timeControllerEvents();
         executeBufferedEvents(uid);
       }
     } finally {
@@ -166,7 +170,10 @@ void eventProcessingFinished(
 
       if (retry != null && postExecutionControl.exceptionDuringExecution()) {
         handleRetryOnException(executionScope);
-        metrics.timeControllerRetry();
+        configuration
+            .getConfigurationService()
+            .getMetrics()
+            .timeControllerRetry();
         return;
       }
 

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

@@ -11,10 +11,13 @@
 import static org.mockito.Mockito.when;
 
 import io.fabric8.kubernetes.client.Watcher;
+import io.javaoperatorsdk.operator.Metrics;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.DefaultEvent;
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
+import io.javaoperatorsdk.operator.processing.event.internal.TimerEventSource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import java.util.Objects;
 import java.util.UUID;
@@ -33,12 +36,17 @@ class CustomResourceSelectorTest {
   private final DefaultEventSourceManager defaultEventSourceManagerMock =
       mock(DefaultEventSourceManager.class);
 
+  private TimerEventSource retryTimerEventSourceMock = mock(TimerEventSource.class);
+  private ControllerConfiguration configuration =
+      mock(ControllerConfiguration.class);
+  private final ConfigurationService configService = mock(ConfigurationService.class);
+
   private final DefaultEventHandler defaultEventHandler =
       new DefaultEventHandler(
           eventDispatcherMock,
           "Test",
           null,
-          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER);
+          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER, configuration);
 
   @BeforeEach
   public void setup() {
@@ -58,6 +66,10 @@ public void setup() {
         })
             .when(defaultEventSourceManagerMock)
             .cleanup(any());
+
+    when(configuration.getName()).thenReturn("DefaultEventHandlerTest");
+    when(configService.getMetrics()).thenReturn(Metrics.NOOP);
+    when(configuration.getConfigurationService()).thenReturn(configService);
   }
 
   @Test

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

@@ -13,8 +13,11 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.Watcher;
+import io.javaoperatorsdk.operator.Metrics;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
@@ -44,20 +47,25 @@ class DefaultEventHandlerTest {
       mock(DefaultEventSourceManager.class);
 
   private TimerEventSource retryTimerEventSourceMock = mock(TimerEventSource.class);
+  private ControllerConfiguration configuration =
+      mock(ControllerConfiguration.class);
+  private final ConfigurationService configService = mock(ConfigurationService.class);
 
   private DefaultEventHandler defaultEventHandler =
       new DefaultEventHandler(
           eventDispatcherMock,
           "Test",
           null,
-          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER);
+          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER,
+          configuration);
 
   private DefaultEventHandler defaultEventHandlerWithRetry =
       new DefaultEventHandler(
           eventDispatcherMock,
           "Test",
           GenericRetry.defaultLimitedExponentialRetry(),
-          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER);
+          ConfigurationService.DEFAULT_RECONCILIATION_THREADS_NUMBER,
+          configuration);
 
   @BeforeEach
   public void setup() {
@@ -66,6 +74,10 @@ public void setup() {
     defaultEventHandler.setEventSourceManager(defaultEventSourceManagerMock);
     defaultEventHandlerWithRetry.setEventSourceManager(defaultEventSourceManagerMock);
 
+    when(configuration.getName()).thenReturn("DefaultEventHandlerTest");
+    when(configService.getMetrics()).thenReturn(Metrics.NOOP);
+    when(configuration.getConfigurationService()).thenReturn(configService);
+
     // todo: remove
     when(defaultEventSourceManagerMock.getCache()).thenReturn(customResourceCache);
     doCallRealMethod().when(defaultEventSourceManagerMock).getLatestResource(any());