improve: logging for tracing issues with events (#2260)

Signed-off-by: Attila Mészáros <[email protected]>
Co-authored-by: Chris Laprun <[email protected]>

Author: csviri

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

@@ -285,11 +285,12 @@ private void updatePostExecutionControlWithReschedule(
 
   private PostExecutionControl<P> handleCleanup(P resource,
       Context<P> context) {
-    log.debug(
-        "Executing delete for resource: {} with version: {}",
-        getName(resource),
-        getVersion(resource));
-
+    if (log.isDebugEnabled()) {
+      log.debug(
+          "Executing delete for resource: {} with version: {}",
+          ResourceID.fromResource(resource),
+          getVersion(resource));
+    }
     DeleteControl deleteControl = controller.cleanup(resource, context);
     final var useFinalizer = controller.useFinalizer();
     if (useFinalizer) {
@@ -345,7 +346,7 @@ ControllerConfiguration<P> configuration() {
 
   public P conflictRetryingUpdate(P resource, Function<P, Boolean> modificationFunction) {
     if (log.isDebugEnabled()) {
-      log.debug("Removing finalizer on resource: {}", ResourceID.fromResource(resource));
+      log.debug("Conflict retrying update for: {}", ResourceID.fromResource(resource));
     }
     int retryIndex = 0;
     while (true) {
@@ -393,10 +394,12 @@ public R getResource(String namespace, String name) {
     }
 
     public R updateResource(R resource) {
-      log.debug(
-          "Trying to replace resource {}, version: {}",
-          getName(resource),
-          resource.getMetadata().getResourceVersion());
+      if (log.isDebugEnabled()) {
+        log.debug(
+            "Trying to replace resource {}, version: {}",
+            ResourceID.fromResource(resource),
+            resource.getMetadata().getResourceVersion());
+      }
       return resource(resource).lockResourceVersion(resource.getMetadata().getResourceVersion())
           .update();
     }

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

@@ -66,7 +66,12 @@ public synchronized void start() {
 
   public void eventReceived(ResourceAction action, T resource, T oldResource) {
     try {
-      log.debug("Event received for resource: {}", getName(resource));
+      if (log.isDebugEnabled()) {
+        log.debug("Event received for resource: {} version: {} uuid: {} action: {}",
+            ResourceID.fromResource(resource),
+            getVersion(resource), resource.getMetadata().getUid(), action);
+        log.trace("Event Old resource: {},\n new resource: {}", oldResource, resource);
+      }
       MDCUtils.addResourceInfo(resource);
       controller.getEventSourceManager().broadcastOnResourceEvent(action, resource, oldResource);
       if ((legacyFilters == null ||
@@ -75,8 +80,8 @@ && isAcceptedByFilters(action, resource, oldResource)) {
         getEventHandler().handleEvent(
             new ResourceEvent(action, ResourceID.fromResource(resource), resource));
       } else {
-        log.debug("Skipping event handling resource {} with version: {}", getUID(resource),
-            getVersion(resource));
+        log.debug("Skipping event handling resource {}",
+            ResourceID.fromResource(resource));
       }
     } finally {
       MDCUtils.removeResourceInfo();