*fix spi classloader

Signed-off-by: provenceee <83857838+provenceee@users.noreply.github.com>
provenceee · Nov 18, 2024 · 85a7707 · 85a7707
1 parent 9c8d7e5
commit 85a7707
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/sermant-integration-tests/dubbo-test/dubbo-2-6-integration-controller/pom.xml b/sermant-integration-tests/dubbo-test/dubbo-2-6-integration-controller/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dubbo-2-6-integration-controller</artifactId>
+    <packaging>war</packaging>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -62,6 +63,17 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/...-6-integration-controller/src/main/java/io/sermant/integration/ControllerApplication.java b/...-6-integration-controller/src/main/java/io/sermant/integration/ControllerApplication.java
@@ -24,6 +24,8 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.FilterType;
@@ -39,9 +41,13 @@
 @ImportResource({"classpath:dubbo/consumer.xml"})
 @ComponentScan(excludeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, value = {ProviderController.class,
     ConsumerController.class, FlowController.class}))
-public class ControllerApplication {
+public class ControllerApplication extends SpringBootServletInitializer {
     private static final Logger LOGGER = LoggerFactory.getLogger(ControllerApplication.class);
 
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(ControllerApplication.class);
+    }
+
     /**
      * spring启动类
      *

diff --git a/...control-plugin/src/main/java/io/sermant/flowcontrol/retry/ExtensionLoaderInterceptor.java b/...control-plugin/src/main/java/io/sermant/flowcontrol/retry/ExtensionLoaderInterceptor.java
@@ -17,7 +17,10 @@
 
 package io.sermant.flowcontrol.retry;
 
+import io.sermant.core.plugin.Plugin;
+import io.sermant.core.plugin.PluginManager;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
+import io.sermant.core.plugin.classloader.PluginClassLoader;
 import io.sermant.core.utils.ClassUtils;
 import io.sermant.flowcontrol.retry.cluster.AlibabaDubboCluster;
 import io.sermant.flowcontrol.retry.cluster.AlibabaDubboClusterInvoker;
@@ -71,20 +74,22 @@ protected ExecuteContext doAfter(ExecuteContext context) {
             }
             final Optional<Class<?>> retryInvokerClass;
             final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            Plugin flowcontrol = PluginManager.getPluginMap().get("flowcontrol");
+            PluginClassLoader pluginClassLoader = flowcontrol.getPluginClassLoader();
             if (APACHE_DUBBO_CLUSTER_CLASS_NAME.equals(type.getName())) {
                 ClassUtils.defineClass(
                         "io.sermant.flowcontrol.retry.cluster.ApacheDubboClusterInvoker", contextClassLoader,
-                        contextClassLoader);
+                        pluginClassLoader);
                 retryInvokerClass = ClassUtils.defineClass(
                         "io.sermant.flowcontrol.retry.cluster.ApacheDubboCluster", contextClassLoader,
-                        contextClassLoader);
+                        pluginClassLoader);
             } else if (ALIBABA_DUBBO_CLUSTER_CLASS_NAME.equals(type.getName())) {
                 ClassUtils.defineClass(
                         "io.sermant.flowcontrol.retry.cluster.AlibabaDubboClusterInvoker", contextClassLoader,
-                        contextClassLoader);
+                        pluginClassLoader);
                 retryInvokerClass = ClassUtils.defineClass(
                         "io.sermant.flowcontrol.retry.cluster.AlibabaDubboCluster", contextClassLoader,
-                        contextClassLoader);
+                        pluginClassLoader);
             } else {
                 return context;
             }