improve: logging for resource filter cache

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -19,7 +19,7 @@
 
 public class Event {
 
-  private final ResourceID relatedCustomResource;
+  protected final ResourceID relatedCustomResource;
 
   public Event(ResourceID targetCustomResource) {
     this.relatedCustomResource = targetCustomResource;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ResourceEvent.java

@@ -25,8 +25,8 @@
 
 public class ResourceEvent extends Event {
 
-  private final ResourceAction action;
-  private final HasMetadata resource;
+  protected final ResourceAction action;
+  protected final HasMetadata resource;
 
   public ResourceEvent(ResourceAction action, ResourceID resourceID, HasMetadata resource) {
     super(resourceID);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ExtendedResourceEvent.java

@@ -15,6 +15,7 @@
  */
 package io.javaoperatorsdk.operator.processing.event.source.informer;
 
+import java.util.Objects;
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -25,7 +26,7 @@
 /** Used only for resource event filtering. */
 public class ExtendedResourceEvent extends ResourceEvent {
 
-  private HasMetadata previousResource;
+  private final HasMetadata previousResource;
 
   public ExtendedResourceEvent(
       ResourceAction action,
@@ -39,4 +40,31 @@ public ExtendedResourceEvent(
   public Optional<HasMetadata> getPreviousResource() {
     return Optional.ofNullable(previousResource);
   }
+
+  @Override
+  public String toString() {
+    return "ExtendedResourceEvent{"
+        + "previousResourceVersion="
+        + previousResource.getMetadata().getResourceVersion()
+        + ", action="
+        + action
+        + ", resourceVersion="
+        + resource.getMetadata().getResourceVersion()
+        + ", relatedCustomResource="
+        + relatedCustomResource
+        + '}';
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+    if (!super.equals(o)) return false;
+    ExtendedResourceEvent that = (ExtendedResourceEvent) o;
+    return Objects.equals(previousResource, that.previousResource);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), previousResource);
+  }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

@@ -93,11 +93,12 @@ public void changeNamespaces(Set<String> namespaces) {
   @SuppressWarnings("unchecked")
   public R eventFilteringUpdateAndCacheResource(R resourceToUpdate, UnaryOperator<R> updateMethod) {
     ResourceID id = ResourceID.fromResource(resourceToUpdate);
-    log.debug("Update and cache: {}", id);
+    log.debug("Starting event filter and cache update for: {}", id);
     R updatedResource = null;
     try {
       temporaryResourceCache.startEventFilteringModify(id);
       updatedResource = updateMethod.apply(resourceToUpdate);
+      log.debug("Resource update successful: {}", id);
       handleRecentResourceUpdate(id, updatedResource, resourceToUpdate);
       return updatedResource;
     } finally {
@@ -124,6 +125,14 @@ public R eventFilteringUpdateAndCacheResource(R resourceToUpdate, UnaryOperator<
                     : null;
             R prevVersionOfResource =
                 updatedForLambda != null ? updatedForLambda : extendedResourcePrevVersion;
+            if (log.isDebugEnabled()) {
+              log.debug(
+                  "Extended previous resource version: {} resource from update present: {}"
+                      + " extendedPrevResource present: {}",
+                  prevVersionOfResource.getMetadata().getResourceVersion(),
+                  updatedForLambda != null,
+                  extendedResourcePrevVersion != null);
+            }
             handleEvent(
                 r.getAction(),
                 latestResource,

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryResourceCache.java

@@ -133,13 +133,19 @@ private synchronized EventHandling onEvent(
           resource.getMetadata().getResourceVersion());
     }
     if (!unknownState) {
+      log.debug("Setting latest resource version to: {}", latestResourceVersion);
       latestResourceVersion = resource.getMetadata().getResourceVersion();
     }
     var cached = cache.get(resourceId);
     EventHandling result = EventHandling.NEW;
     if (cached != null) {
       int comp = ReconcilerUtilsInternal.compareResourceVersions(resource, cached);
       if (comp >= 0 || unknownState) {
+        log.debug(
+            "Removing resource from temp cache. id: {} comparison: {} unknown state: {}",
+            resourceId,
+            comp,
+            unknownState);
         cache.remove(resourceId);
         // we propagate event only for our update or newer other can be discarded since we know we
         // will receive
@@ -151,6 +157,7 @@ private synchronized EventHandling onEvent(
     }
     var ed = activeUpdates.get(resourceId);
     if (ed != null && result != EventHandling.OBSOLETE) {
+      log.debug("Setting last event for id: {} delete: {}", resourceId, delete);
       ed.setLastEvent(
           delete
               ? new ResourceDeleteEvent(ResourceAction.DELETED, resourceId, resource, unknownState)