Revert "feature: Micrometer Integration for generating metrics - #64"

This reverts commit cc6c37f.

Author: metacosm

operator-framework-core/pom.xml

@@ -15,13 +15,6 @@
   <description>Core framework for implementing Kubernetes operators</description>
   <packaging>jar</packaging>
 
-  <properties>
-    <java.version>11</java.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
-    <micrometer-core.version>1.7.3</micrometer-core.version>
-  </properties>
-
   <build>
     <plugins>
       <plugin>
@@ -99,10 +92,5 @@
       <artifactId>log4j-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.micrometer</groupId>
-      <artifactId>micrometer-core</artifactId>
-      <version>${micrometer-core.version}</version>
-    </dependency>
   </dependencies>
 </project>

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

@@ -25,28 +25,21 @@ public class Operator implements AutoCloseable {
   private final Object lock;
   private final List<ControllerRef> controllers;
   private volatile boolean started;
-  private final Metrics metrics;
 
-  public Operator(
-      KubernetesClient k8sClient, ConfigurationService configurationService, Metrics metrics) {
+  public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) {
     this.k8sClient = k8sClient;
     this.configurationService = configurationService;
     this.closeables = new ArrayList<>();
     this.lock = new Object();
     this.controllers = new ArrayList<>();
     this.started = false;
-    this.metrics = metrics;
   }
 
   /** Adds a shutdown hook that automatically calls {@link #close()} when the app shuts down. */
   public void installShutdownHook() {
     Runtime.getRuntime().addShutdownHook(new Thread(this::close));
   }
 
-  public Operator(KubernetesClient k8sClient, ConfigurationService configurationService) {
-    this(k8sClient, configurationService, Metrics.NOOP);
-  }
-
   public KubernetesClient getKubernetesClient() {
     return k8sClient;
   }

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

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.CustomResource;
-import io.javaoperatorsdk.operator.Metrics;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import java.util.Set;
 
@@ -94,8 +93,4 @@ default ObjectMapper getObjectMapper() {
   default int getTerminationTimeoutSeconds() {
     return DEFAULT_TERMINATION_TIMEOUT_SECONDS;
   }
-
-  default Metrics getMetrics() {
-    return Metrics.NOOP;
-  }
 }

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

@@ -6,7 +6,6 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
-import io.javaoperatorsdk.operator.Metrics;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.RetryInfo;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
@@ -17,7 +16,6 @@
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
-import io.micrometer.core.instrument.Clock;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -48,7 +46,6 @@ 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));
 
   public DefaultEventHandler(
       ResourceController controller, ControllerConfiguration configuration, MixedOperation client) {
@@ -165,7 +162,6 @@ void eventProcessingFinished(
 
       if (retry != null && postExecutionControl.exceptionDuringExecution()) {
         handleRetryOnException(executionScope);
-        metrics.timeControllerRetry();
         return;
       }
 

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

@@ -123,12 +123,7 @@ private PostExecutionControl handleCreateOrUpdate(
           getName(resource),
           getVersion(resource),
           executionScope);
-
-      UpdateControl<R> updateControl =
-          configuration
-              .getConfigurationService()
-              .getMetrics()
-              .timeControllerCreateOrUpdate(controller, configuration, resource, context);
+      UpdateControl<R> updateControl = controller.createOrUpdateResource(resource, context);
       R updatedCustomResource = null;
       if (updateControl.isUpdateCustomResourceAndStatusSubResource()) {
         updatedCustomResource = updateCustomResource(updateControl.getCustomResource());
@@ -158,12 +153,8 @@ private PostExecutionControl handleDelete(R resource, Context<R> context) {
         "Executing delete for resource: {} with version: {}",
         getName(resource),
         getVersion(resource));
-
-    DeleteControl deleteControl =
-        configuration
-            .getConfigurationService()
-            .getMetrics()
-            .timeControllerDelete(controller, configuration, resource, context);
+    // todo: this is be executed in a try-catch statement, in case this fails
+    DeleteControl deleteControl = controller.deleteResource(resource, context);
     final var useFinalizer = configuration.useFinalizer();
     if (useFinalizer) {
       if (deleteControl == DeleteControl.DEFAULT_DELETE

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

@@ -15,14 +15,12 @@
 
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.Watcher;
-import io.javaoperatorsdk.operator.Metrics;
 import io.javaoperatorsdk.operator.TestUtils;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.RetryInfo;
 import io.javaoperatorsdk.operator.api.UpdateControl;
-import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.internal.CustomResourceEvent;
@@ -42,7 +40,6 @@ class EventDispatcherTest {
   private final ResourceController<CustomResource> controller = mock(ResourceController.class);
   private ControllerConfiguration<CustomResource> configuration =
       mock(ControllerConfiguration.class);
-  private final ConfigurationService configService = mock(ConfigurationService.class);
   private final EventDispatcher.CustomResourceFacade customResourceFacade =
       mock(EventDispatcher.CustomResourceFacade.class);
 
@@ -54,9 +51,6 @@ void setup() {
 
     when(configuration.getFinalizer()).thenReturn(DEFAULT_FINALIZER);
     when(configuration.useFinalizer()).thenCallRealMethod();
-    when(configuration.getName()).thenReturn("EventDispatcherTestController");
-    when(configService.getMetrics()).thenReturn(Metrics.NOOP);
-    when(configuration.getConfigurationService()).thenReturn(configService);
     when(controller.createOrUpdateResource(eq(testCustomResource), any()))
         .thenReturn(UpdateControl.updateCustomResource(testCustomResource));
     when(controller.deleteResource(eq(testCustomResource), any()))
@@ -141,6 +135,7 @@ void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
   @Test
   void callDeleteOnControllerIfMarkedForDeletionWhenNoFinalizerIsConfigured() {
     configureToNotUseFinalizer();
+
     markForDeletion(testCustomResource);
 
     eventDispatcher.handleExecution(
@@ -161,9 +156,6 @@ void doNotCallDeleteIfMarkedForDeletionWhenFinalizerHasAlreadyBeenRemoved() {
 
   private void configureToNotUseFinalizer() {
     ControllerConfiguration<CustomResource> configuration = mock(ControllerConfiguration.class);
-    when(configuration.getName()).thenReturn("EventDispatcherTestController");
-    when(configService.getMetrics()).thenReturn(Metrics.NOOP);
-    when(configuration.getConfigurationService()).thenReturn(configService);
     when(configuration.useFinalizer()).thenReturn(false);
     eventDispatcher = new EventDispatcher(controller, configuration, customResourceFacade);
   }

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

@@ -59,7 +59,7 @@ public void initialize(KubernetesClient k8sClient, ResourceController controller
       namespaces.create(
           new NamespaceBuilder().withNewMetadata().withName(TEST_NAMESPACE).endMetadata().build());
     }
-    operator = new Operator(k8sClient, configurationService, Metrics.NOOP);
+    operator = new Operator(k8sClient, configurationService);
     final var overriddenConfig =
         ControllerConfigurationOverrider.override(config).settingNamespace(TEST_NAMESPACE);
     if (retry != null) {