(nifi) branch main updated: NIFI-14707 Use static Logger for TimedLock class (#10064)

[exceptionfactory]

This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 38f265eac6 NIFI-14707 Use static Logger for TimedLock class (#10064)
38f265eac6 is described below

commit 38f265eac696fe7302a21a76797cd0e4d3db2e50
Author: Eric Secules <esecu...@gmail.com>
AuthorDate: Thu Jul 3 13:45:26 2025 -0700

    NIFI-14707 Use static Logger for TimedLock class (#10064)
    
    - Use a single static logger for TimedLock and its debuggable counterpart 
and make sure that all log messages include the lock name to avoid creating 
numerous named Logger instances based on the number of unique objects in the 
flow configuration
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java    | 7 +++----
 .../src/main/java/org/apache/nifi/util/concurrency/TimedLock.java  | 4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
index e7d599eb41..dd6a3b8cd4 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/DebugEnabledTimedLock.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 public class DebugEnabledTimedLock implements DebuggableTimedLock {
 
     private final Lock lock;
-    private final Logger logger;
+    private static final Logger logger = 
LoggerFactory.getLogger(TimedLock.class.getName());
     private long lockTime = 0L;
 
     private final Map<String, Long> lockIterations = new HashMap<>();
@@ -40,7 +40,6 @@ public class DebugEnabledTimedLock implements 
DebuggableTimedLock {
         this.lock = lock;
         this.name = name;
         this.iterationFrequency = iterationFrequency;
-        logger = LoggerFactory.getLogger(TimedLock.class.getName() + "." + 
name);
     }
 
     /**
@@ -54,7 +53,7 @@ public class DebugEnabledTimedLock implements 
DebuggableTimedLock {
             logger.trace("TryLock failed for Lock: {}", name);
             return false;
         }
-        logger.trace("TryLock successful");
+        logger.trace("TryLock successful for Lock: {}", name);
 
         return true;
     }
@@ -78,7 +77,7 @@ public class DebugEnabledTimedLock implements 
DebuggableTimedLock {
             logger.trace("TryLock failed for Lock {} with a timeout of {} {}", 
name, timeout, timeUnit);
             return false;
         }
-        logger.trace("TryLock successful");
+        logger.trace("TryLock successful for Lock: {}", name);
         return true;
     }
 
diff --git 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
index 532d3c3d04..6abf1dd6be 100644
--- 
a/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
+++ 
b/nifi-commons/nifi-utils/src/main/java/org/apache/nifi/util/concurrency/TimedLock.java
@@ -27,13 +27,11 @@ public class TimedLock {
     private final DebugEnabledTimedLock enabled;
     private final DebugDisabledTimedLock disabled;
 
-    private final Logger logger;
+    private static final Logger logger = 
LoggerFactory.getLogger(TimedLock.class.getName());
 
     public TimedLock(final Lock lock, final String name, final int 
iterationFrequency) {
         this.enabled = new DebugEnabledTimedLock(lock, name, 
iterationFrequency);
         this.disabled = new DebugDisabledTimedLock(lock);
-
-        logger = LoggerFactory.getLogger(TimedLock.class.getName() + "." + 
name);
     }
 
     private DebuggableTimedLock getLock() {