Merge branch 'sofastack:master' into master

sofastack · Mar 16, 2024 · 1790b70 · 1790b70
2 parents 1bd24f4 + 2e8af92
commit 1790b70
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/sofa-boot-project/sofa-boot-actuator-autoconfigure/pom.xml b/sofa-boot-project/sofa-boot-actuator-autoconfigure/pom.xml
@@ -30,6 +30,12 @@
             <artifactId>spring-boot-actuator-autoconfigure</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>com.alipay.sofa</groupId>
             <artifactId>runtime-sofa-boot</artifactId>

diff --git a/...ore/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/common/RpcThreadPoolMonitor.java b/...ore/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/common/RpcThreadPoolMonitor.java
@@ -82,6 +82,8 @@ public void start() {
                         StringBuilder sb = new StringBuilder();
                         sb.append("coreSize:" + threadPoolExecutor.getCorePoolSize() + ",");
                         sb.append("maxPoolSize:" + threadPoolExecutor.getMaximumPoolSize() + ",");
+                        sb.append("queueRemainingSize:"
+                                  + threadPoolExecutor.getQueue().remainingCapacity() + ",");
                         sb.append("keepAliveTime:"
                                   + threadPoolExecutor.getKeepAliveTime(TimeUnit.MILLISECONDS)
                                   + "\n");

diff --git a/...-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/filter/JvmFilterHolder.java b/...-core/runtime-sofa-boot/src/main/java/com/alipay/sofa/runtime/filter/JvmFilterHolder.java
@@ -18,9 +18,8 @@
 
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -31,7 +30,7 @@
  */
 public class JvmFilterHolder {
 
-    private final List<JvmFilter> JVM_FILTERS    = new ArrayList<>();
+    private final List<JvmFilter> JVM_FILTERS    = new CopyOnWriteArrayList<>();
 
     private final AtomicBoolean   FILTERS_SORTED = new AtomicBoolean(false);
 
@@ -56,8 +55,8 @@ public List<JvmFilter> getJvmFilters() {
     }
 
     public static boolean beforeInvoking(JvmFilterContext context) {
-        List<JvmFilter> filters = Collections.unmodifiableList(context.getSofaRuntimeContext()
-            .getJvmFilterHolder().getJvmFilters());
+        List<JvmFilter> filters = context.getSofaRuntimeContext().getJvmFilterHolder()
+            .getJvmFilters();
         for (JvmFilter filter : filters) {
             if (!filter.before(context)) {
                 return false;
@@ -67,8 +66,8 @@ public static boolean beforeInvoking(JvmFilterContext context) {
     }
 
     public static boolean afterInvoking(JvmFilterContext context) {
-        List<JvmFilter> filters = Collections.unmodifiableList(context.getSofaRuntimeContext()
-            .getJvmFilterHolder().getJvmFilters());
+        List<JvmFilter> filters = context.getSofaRuntimeContext().getJvmFilterHolder()
+            .getJvmFilters();
         for (int i = filters.size() - 1; i >= 0; --i) {
             if (!filters.get(i).after(context)) {
                 return false;