Merge branch '3.x' of https://github.com/sofastack/sofa-boot into 3.x

sofastack · Aug 13, 2024 · a36e38c · a36e38c
2 parents 036aa0c + f180dab
commit a36e38c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
     <description>SOFABoot Build</description>
 
     <properties>
-        <revision>3.23.0-SNAPSHOT</revision>
+        <revision>3.24.0-SNAPSHOT</revision>
         <sofa.boot.version>${revision}</sofa.boot.version>
         <!--maven plugin-->
         <maven.staging.plugin>1.6.7</maven.staging.plugin>

diff --git a/...me-sofa-boot/src/main/java/com/alipay/sofa/runtime/service/binding/JvmBindingAdapter.java b/...me-sofa-boot/src/main/java/com/alipay/sofa/runtime/service/binding/JvmBindingAdapter.java
@@ -210,8 +210,10 @@ public Object doInvoke(MethodInvocation invocation) throws Throwable {
                                                 + "] has already been destroyed.");
             }
 
-            SofaLogger.debug(">> Start in JVM service invoke, the service interface is  - {}",
-                getInterfaceName());
+            if (SofaLogger.isDebugEnabled()) {
+                SofaLogger.debug(">> Start in JVM service invoke, the service interface is  - {}",
+                    getInterfaceName());
+            }
 
             Object retVal;
             Object targetObj = this.getTarget();
@@ -225,17 +227,21 @@ public Object doInvoke(MethodInvocation invocation) throws Throwable {
                     try {
                         return serviceProxy.invoke(invocation);
                     } finally {
-                        SofaLogger.debug(
-                            "<< Finish Cross App JVM service invoke, the service is  - {}]",
-                            (getInterfaceName() + "#" + getUniqueId()));
+                        if (SofaLogger.isDebugEnabled()) {
+                            SofaLogger.debug(
+                                "<< Finish Cross App JVM service invoke, the service is  - {}]",
+                                (getInterfaceName() + "#" + getUniqueId()));
+                        }
                     }
                 }
             }
 
             if (targetObj == null || ((targetObj instanceof Proxy) && binding.hasBackupProxy())) {
                 targetObj = binding.getBackupProxy();
-                SofaLogger.debug("<<{}.{} backup proxy invoke.", getInterfaceName().getName(),
-                    invocation.getMethod().getName());
+                if (SofaLogger.isDebugEnabled()) {
+                    SofaLogger.debug("<<{}.{} backup proxy invoke.", getInterfaceName().getName(),
+                        invocation.getMethod().getName());
+                }
             }
 
             if (targetObj == null) {
@@ -250,9 +256,11 @@ public Object doInvoke(MethodInvocation invocation) throws Throwable {
             } catch (InvocationTargetException ex) {
                 throw ex.getTargetException();
             } finally {
-                SofaLogger.debug(
-                    "<< Finish JVM service invoke, the service implementation is  - {}]",
-                    (this.target == null ? "null" : this.target.getClass().getName()));
+                if (SofaLogger.isDebugEnabled()) {
+                    SofaLogger.debug(
+                        "<< Finish JVM service invoke, the service implementation is  - {}]",
+                        (this.target == null ? "null" : this.target.getClass().getName()));
+                }
 
                 popThreadContextClassLoader(tcl);
             }