Introduce ConfiguredController concept, decouple Metrics code from business logic

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

@@ -1,19 +1,29 @@
 package io.javaoperatorsdk.operator;
 
-import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.DeleteControl;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
-import io.micrometer.core.instrument.*;
-import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
-import io.micrometer.core.instrument.distribution.pause.PauseDetector;
-import io.micrometer.core.instrument.noop.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.ToDoubleFunction;
 import java.util.function.ToLongFunction;
 
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.DistributionSummary;
+import io.micrometer.core.instrument.FunctionCounter;
+import io.micrometer.core.instrument.FunctionTimer;
+import io.micrometer.core.instrument.Gauge;
+import io.micrometer.core.instrument.Measurement;
+import io.micrometer.core.instrument.Meter;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
+import io.micrometer.core.instrument.distribution.pause.PauseDetector;
+import io.micrometer.core.instrument.noop.NoopCounter;
+import io.micrometer.core.instrument.noop.NoopDistributionSummary;
+import io.micrometer.core.instrument.noop.NoopFunctionCounter;
+import io.micrometer.core.instrument.noop.NoopFunctionTimer;
+import io.micrometer.core.instrument.noop.NoopGauge;
+import io.micrometer.core.instrument.noop.NoopMeter;
+import io.micrometer.core.instrument.noop.NoopTimer;
+
 public class Metrics {
   public static final Metrics NOOP = new Metrics(new NoopMeterRegistry(Clock.SYSTEM));
   private final MeterRegistry registry;
@@ -22,82 +32,42 @@ public Metrics(MeterRegistry registry) {
     this.registry = registry;
   }
 
-  public <R extends CustomResource> UpdateControl<R> timeControllerCreateOrUpdate(
-      ResourceController<R> controller,
-      ControllerConfiguration<R> configuration,
-      R resource,
-      Context<R> context) {
-    final var name = configuration.getName();
-    final var timer =
-        Timer.builder("operator.sdk.controllers.execution.createorupdate")
-            .tags("controller", name)
-            .publishPercentiles(0.3, 0.5, 0.95)
-            .publishPercentileHistogram()
-            .register(registry);
-    try {
-      final var result = timer.record(() -> controller.createOrUpdateResource(resource, context));
-      String successType = "cr";
-      if (result.isUpdateStatusSubResource()) {
-        successType = "status";
-      }
-      if (result.isUpdateCustomResourceAndStatusSubResource()) {
-        successType = "both";
-      }
-      registry
-          .counter(
-              "operator.sdk.controllers.execution.success", "controller", name, "type", successType)
-          .increment();
-      return result;
-    } catch (Exception e) {
-      registry
-          .counter(
-              "operator.sdk.controllers.execution.failure",
-              "controller",
-              name,
-              "exception",
-              e.getClass().getSimpleName())
-          .increment();
-      throw e;
-    }
+  public interface ControllerExecution<T> {
+    String name();
+
+    String controllerName();
+
+    String successTypeName(T result);
+
+    T execute();
   }
 
-  public DeleteControl timeControllerDelete(
-      ResourceController controller,
-      ControllerConfiguration configuration,
-      CustomResource resource,
-      Context context) {
-    final var name = configuration.getName();
+  public <T> T timeControllerExecution(ControllerExecution<T> execution) {
+    final var name = execution.controllerName();
+    final var execName = "operator.sdk.controllers.execution." + execution.name();
     final var timer =
-        Timer.builder("operator.sdk.controllers.execution.delete")
+        Timer.builder(execName)
             .tags("controller", name)
             .publishPercentiles(0.3, 0.5, 0.95)
             .publishPercentileHistogram()
             .register(registry);
     try {
-      final var result = timer.record(() -> controller.deleteResource(resource, context));
-      String successType = "notDelete";
-      if (result == DeleteControl.DEFAULT_DELETE) {
-        successType = "delete";
-      }
+      final var result = timer.record(execution::execute);
+      final var successType = execution.successTypeName(result);
       registry
-          .counter(
-              "operator.sdk.controllers.execution.success", "controller", name, "type", successType)
+          .counter(execName + ".success", "controller", name, "type", successType)
           .increment();
       return result;
     } catch (Exception e) {
+      final var exception = e.getClass().getSimpleName();
       registry
-          .counter(
-              "operator.sdk.controllers.execution.failure",
-              "controller",
-              name,
-              "exception",
-              e.getClass().getSimpleName())
+          .counter(execName + ".failure", "controller", name, "exception", exception)
           .increment();
       throw e;
     }
   }
 
-  public void timeControllerRetry() {
+  public void incrementControllerRetriesNumber() {
 
     registry
         .counter(
@@ -107,7 +77,7 @@ public void timeControllerRetry() {
 
   }
 
-  public void timeControllerEvents() {
+  public void incrementProcessedEventsNumber() {
 
     registry
         .counter(