fix: config override with metrics (#840)

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -105,8 +105,8 @@ public void stop() throws OperatorException {
    */
   public <R extends HasMetadata> void register(Reconciler<R> reconciler)
       throws OperatorException {
-    final var defaultConfiguration = configurationService.getConfigurationFor(reconciler);
-    register(reconciler, defaultConfiguration);
+    final var controllerConfiguration = configurationService.getConfigurationFor(reconciler);
+    register(reconciler, controllerConfiguration);
   }
 
   /**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java

@@ -70,7 +70,10 @@ public ConfigurationService build() {
       @Override
       public <R extends HasMetadata> ControllerConfiguration<R> getConfigurationFor(
           Reconciler<R> reconciler) {
-        return original.getConfigurationFor(reconciler);
+        ControllerConfiguration<R> controllerConfiguration =
+            original.getConfigurationFor(reconciler);
+        controllerConfiguration.setConfigurationService(this);
+        return controllerConfiguration;
       }
 
       @Override

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

@@ -66,21 +66,6 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
         eventSourceManager);
   }
 
-  EventProcessor(
-      ReconciliationDispatcher<R> reconciliationDispatcher,
-      EventSourceManager<R> eventSourceManager,
-      String relatedControllerName,
-      Retry retry) {
-    this(
-        eventSourceManager.getControllerResourceEventSource().getResourceCache(),
-        null,
-        relatedControllerName,
-        reconciliationDispatcher,
-        retry,
-        null,
-        eventSourceManager);
-  }
-
   EventProcessor(
       ReconciliationDispatcher<R> reconciliationDispatcher,
       EventSourceManager<R> eventSourceManager,

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

@@ -61,11 +61,12 @@ public void setup() {
     when(controllerResourceEventSourceMock.getResourceCache()).thenReturn(resourceCacheMock);
 
     eventProcessor =
-        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
+        spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null,
+            null));
     eventProcessor.start();
     eventProcessorWithRetry =
         spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test",
-            GenericRetry.defaultLimitedExponentialRetry()));
+            GenericRetry.defaultLimitedExponentialRetry(), null));
     eventProcessorWithRetry.start();
 
     when(eventProcessor.retryEventSource()).thenReturn(retryTimerEventSourceMock);

sample-operators/mysql-schema/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>operator-framework</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.javaoperatorsdk</groupId>
+            <artifactId>micrometer-support</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.takes</groupId>
             <artifactId>takes</artifactId>

sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java

@@ -14,7 +14,10 @@
 import io.fabric8.kubernetes.client.DefaultKubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.Operator;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
 import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
+import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics;
+import io.micrometer.core.instrument.logging.LoggingMeterRegistry;
 
 public class MySQLSchemaOperator {
 
@@ -25,7 +28,10 @@ public static void main(String[] args) throws IOException {
 
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
-    Operator operator = new Operator(client, DefaultConfigurationService.instance());
+    Operator operator = new Operator(client,
+        new ConfigurationServiceOverrider(DefaultConfigurationService.instance())
+            .withMetrics(new MicrometerMetrics(new LoggingMeterRegistry()))
+            .build());
     operator.register(new MySQLSchemaReconciler(client, MySQLDbConfig.loadFromEnvironmentVars()));
     operator.installShutdownHook();
     operator.start();