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

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 169ca44f1f FELIX-6463 : Changing log levels to trace (#237)
169ca44f1f is described below

commit 169ca44f1f641ba9c1b050d952628b5e32b3c3f2
Author: Heiko Studt <[email protected]>
AuthorDate: Tue Dec 5 19:03:05 2023 +0100

    FELIX-6463 : Changing log levels to trace (#237)
    
    Using TRACE for logs used solely for debugging felix's code and not the 
client's
    
    Co-authored-by: Heiko Studt <[email protected]>
---
 .../felix/scr/impl/inject/field/FieldHandler.java  |  6 ++++--
 .../felix/scr/impl/inject/methods/BaseMethod.java  | 24 +++++++++++++++++-----
 .../scr/impl/manager/AbstractComponentManager.java |  4 +++-
 .../felix/scr/impl/manager/DependencyManager.java  |  6 ++++--
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git 
a/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java 
b/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
index b9e728f867..40e4fac6a1 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/inject/field/FieldHandler.java
@@ -379,11 +379,13 @@ public class FieldHandler
 
         private void resolve(final FieldHandler handler, final ComponentLogger 
logger)
         {
-            logger.log(Level.DEBUG, "getting field: {0}", null,
+            // Trace as it is very often called and has no real information 
for client's debugging
+            // as the result will always be logged inside setSearchResult()
+            logger.log(Level.TRACE, "getting field: {0}", null,
                 handler.metadata.getField());
 
             // resolve the field
-                   final FieldUtils.FieldSearchResult result = 
FieldUtils.searchField( handler.componentClass, handler.metadata.getField(), 
logger );
+            final FieldUtils.FieldSearchResult result = 
FieldUtils.searchField( handler.componentClass, handler.metadata.getField(), 
logger );
             handler.setSearchResult(result, logger);
         }
 
diff --git 
a/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java 
b/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
index 0309d255ab..e3e90be3d6 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/inject/methods/BaseMethod.java
@@ -159,12 +159,24 @@ public abstract class BaseMethod<P extends BaseParameter, 
T>
         final String targetPackage = getPackageName( targetClass );
         Class<?> theClass = targetClass;
 
+        if (logger.isLogEnabled(Level.DEBUG))
+        {
+            // the result of this search will be written in setMethod() 
+            // which is always called after findMethod()
+            // This is 'Debug' however, as the class information, where the 
search 
+            // was conducted, is quite important for the client's own debugging
+            logger.log(Level.DEBUG,
+                    "Locating method " + getMethodName() + " within class " + 
theClass.getName(), null );
+        }
+
         while (true)
         {
 
-            if (logger.isLogEnabled(Level.DEBUG))
+            if (logger.isLogEnabled(Level.TRACE))
             {
-                logger.log(Level.DEBUG,
+                // Trace as this is going through the whole hierachy and will 
log for non-existing methods 
+                // a lot of lines for e.g. the class Object not containing an 
activate method
+                logger.log(Level.TRACE,
                         "Locating method " + getMethodName() + " in class " + 
theClass.getName(), null );
             }
 
@@ -359,10 +371,11 @@ public abstract class BaseMethod<P extends BaseParameter, 
T>
         {
             // thrown if no method is declared with the given name and
             // parameters
-            if (logger.isLogEnabled(Level.DEBUG))
+            if (logger.isLogEnabled(Level.TRACE))
             {
                 String argList = ( parameterTypes != null ) ? Arrays.asList( 
parameterTypes ).toString() : "";
-                logger.log(Level.DEBUG, "Declared Method {0}.{1}({2}) not 
found", null,
+                // Trace as this is very often the case (e.g. no activate, no 
modified, ...)
+                logger.log(Level.TRACE, "Declared Method {0}.{1}({2}) not 
found", null,
                         clazz.getName(), name, argList );
             }
         }
@@ -614,7 +627,8 @@ public abstract class BaseMethod<P extends BaseParameter, T>
 
         private <P extends BaseParameter, T> void resolve( final BaseMethod<P, 
T> baseMethod, ComponentLogger logger )
         {
-            logger.log(Level.DEBUG, "getting {0}: {1}", null,
+            // Trace as we have more information inside findMethod to share
+            logger.log(Level.TRACE, "getting {0}: {1}", null,
                     baseMethod.getMethodNamePrefix(), 
baseMethod.getMethodName() );
 
             // resolve the method
diff --git 
a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
 
b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
index 979051a30b..b8aff475c1 100644
--- 
a/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
+++ 
b/scr/src/main/java/org/apache/felix/scr/impl/manager/AbstractComponentManager.java
@@ -1427,7 +1427,9 @@ public abstract class AbstractComponentManager<S> 
implements ComponentManager<S>
     State getState()
     {
         State s = state.get();
-        m_container.getLogger().log(Level.DEBUG, "Querying state {0}", null, 
s);
+        // Trace as this is a getter and is called VERY often and 
+        // has no benefit for client's own debugging
+        m_container.getLogger().log(Level.TRACE, "Querying state {0}", null, 
s);
         return s;
     }
 
diff --git 
a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java 
b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
index 94e8f14575..031b2c1c01 100644
--- a/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
+++ b/scr/src/main/java/org/apache/felix/scr/impl/manager/DependencyManager.java
@@ -322,7 +322,8 @@ public class DependencyManager<S, T> implements 
ReferenceManager<S, T>
         public void addedService(ServiceReference<T> serviceReference, 
RefPair<S, T> refPair, int trackingCount,
             int serviceCount, ExtendedServiceEvent event)
         {
-            m_componentManager.getLogger().log(Level.DEBUG,
+            // Trace as the real dynamic behavior (activating, binding, ...) 
is logged below for all cases
+            m_componentManager.getLogger().log(Level.TRACE,
                 "dm {0} tracking {1} MultipleDynamic added {2} (enter)",
                     null, getName(), trackingCount, serviceReference );
             boolean tracked = false;
@@ -356,7 +357,8 @@ public class DependencyManager<S, T> implements 
ReferenceManager<S, T>
                         null, getName(), trackingCount, isTrackerOpened(), 
isOptional() );
                 }
             }
-            m_componentManager.getLogger().log(Level.DEBUG,
+            // Trace as the real dynamic behavior (activating, binding, ...) 
is logged above for all cases
+            m_componentManager.getLogger().log(Level.TRACE,
                 "dm {0} tracking {1} MultipleDynamic added {2} (exit)",
                     null, getName(), trackingCount, serviceReference );
             if (!tracked)

Reply via email to