*fix spi classloader

Signed-off-by: chengyouling <spadgerlin888@163.com>
sermant-io · Jan 7, 2025 · 41b4113 · 41b4113
1 parent 5185ebd
commit 41b4113
Show file tree

Hide file tree

Showing 32 changed files with 101 additions and 42 deletions.
diff --git a/.../sermant-agentcore-core/src/main/java/io/sermant/core/classloader/ClassLoaderManager.java b/.../sermant-agentcore-core/src/main/java/io/sermant/core/classloader/ClassLoaderManager.java
@@ -45,6 +45,8 @@ public class ClassLoaderManager {
 
     private static FrameworkClassLoader frameworkClassLoader;
 
+    private static ClassLoader userClassLoader;
+
     private ClassLoaderManager() {
     }
 
@@ -88,6 +90,23 @@ public PluginClassLoader run() {
         });
     }
 
+    public static void setUserClassLoader(ClassLoader userClassLoader) {
+        ClassLoaderManager.userClassLoader = userClassLoader;
+    }
+
+    /**
+     * get ContextClassLoader or UserClassLoader
+     *
+     * @return ClassLoader
+     */
+    public static ClassLoader getContextClassLoaderOrUserClassLoader() {
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+        if (classLoader != null) {
+            return classLoader;
+        }
+        return userClassLoader;
+    }
+
     public static SermantClassLoader getSermantClassLoader() {
         return sermantClassLoader;
     }

diff --git a/...e/src/main/java/io/sermant/core/plugin/agent/enhance/ClassLoaderLoadClassInterceptor.java b/...e/src/main/java/io/sermant/core/plugin/agent/enhance/ClassLoaderLoadClassInterceptor.java
@@ -47,6 +47,7 @@ public ClassLoaderLoadClassInterceptor() {
 
     @Override
     public ExecuteContext before(ExecuteContext context) throws Exception {
+        ClassLoaderManager.setUserClassLoader((ClassLoader) context.getObject());
         return context;
     }
 

diff --git a/...nt-agentcore-core/src/main/java/io/sermant/core/plugin/classloader/PluginClassLoader.java b/...nt-agentcore-core/src/main/java/io/sermant/core/plugin/classloader/PluginClassLoader.java
@@ -16,6 +16,7 @@
 
 package io.sermant.core.plugin.classloader;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.config.ConfigManager;
 import io.sermant.core.plugin.agent.config.AgentConfig;
@@ -133,9 +134,16 @@ public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundExce
 
     private Class<?> getClassFromLocalClassLoader(String name) {
         ClassLoader loader = localLoader.get(Thread.currentThread().getId());
-
+        if (loader == null) {
+            LOGGER.log(Level.FINE, "localLoader is null, thread name is {0}, classs name is {1}.",
+                    new Object[]{Thread.currentThread().getName(), name});
+        }
         if (loader == null && useContextLoader) {
-            loader = Thread.currentThread().getContextClassLoader();
+            loader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
+            if (loader == null) {
+                LOGGER.log(Level.WARNING, "contextClassLoader is null, thread name is {0}, classs name is {1}.",
+                        new Object[]{Thread.currentThread().getName(), name});
+            }
         }
         Class<?> clazz = null;
 

diff --git a/.../main/java/io/sermant/core/plugin/subscribe/processor/IntegratedEventListenerAdapter.java b/.../main/java/io/sermant/core/plugin/subscribe/processor/IntegratedEventListenerAdapter.java
@@ -17,6 +17,7 @@
 
 package io.sermant.core.plugin.subscribe.processor;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.service.dynamicconfig.common.DynamicConfigEvent;
 import io.sermant.core.service.dynamicconfig.common.DynamicConfigListener;
 
@@ -43,7 +44,7 @@ public class IntegratedEventListenerAdapter implements DynamicConfigListener {
     public IntegratedEventListenerAdapter(ConfigProcessor processor, String rawGroup) {
         this.processor = processor;
         this.rawGroup = rawGroup;
-        this.classLoader = Thread.currentThread().getContextClassLoader();
+        this.classLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
     }
 
     @Override
@@ -54,7 +55,7 @@ public void process(DynamicConfigEvent event) {
 
         // The classloader at subscription time may not be the same as the classloader at listener configuration
         // time, so need to restore it
-        ClassLoader currentClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader currentClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(classLoader);
             processor.process(rawGroup, event);

diff --git a/sermant-agentcore/sermant-agentcore-core/src/main/java/io/sermant/core/utils/ClassUtils.java b/sermant-agentcore/sermant-agentcore-core/src/main/java/io/sermant/core/utils/ClassUtils.java
@@ -17,6 +17,7 @@
 
 package io.sermant.core.utils;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 
 import java.io.IOException;
@@ -111,7 +112,7 @@ public static Optional<Class<?>> loadClass(String className, ClassLoader classLo
     public static Optional<Object> createInstance(String className, ClassLoader classLoader, Class<?>[] paramTypes) {
         ClassLoader curClassLoader = classLoader;
         if (curClassLoader == null) {
-            curClassLoader = Thread.currentThread().getContextClassLoader();
+            curClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         }
         try {
             final Class<?> clazz = curClassLoader.loadClass(className);

diff --git a/...nt-agentcore/sermant-agentcore-core/src/main/java/io/sermant/core/utils/ReflectUtils.java b/...nt-agentcore/sermant-agentcore-core/src/main/java/io/sermant/core/utils/ReflectUtils.java
@@ -17,6 +17,7 @@
 
 package io.sermant.core.utils;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 
 import java.lang.reflect.AccessibleObject;
@@ -166,7 +167,7 @@ private static Optional<Class<?>> loadClass(String className) {
             return Optional.empty();
         }
         return CLASS_CACHE.computeIfAbsent(className, value -> {
-            final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
             try {
                 return Optional.ofNullable(contextClassLoader.loadClass(className));
             } catch (ClassNotFoundException ignored) {

diff --git a/...agentcore-implement/src/main/java/io/sermant/implement/config/SermantYamlConstructor.java b/...agentcore-implement/src/main/java/io/sermant/implement/config/SermantYamlConstructor.java
@@ -16,6 +16,7 @@
 
 package io.sermant.implement.config;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.exception.SermantRuntimeException;
 
 import org.yaml.snakeyaml.LoaderOptions;
@@ -35,7 +36,7 @@ public class SermantYamlConstructor extends Constructor {
      */
     public SermantYamlConstructor() {
         super(Object.class, new LoaderOptions());
-        loader = Thread.currentThread().getContextClassLoader();
+        loader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
     }
 
     /**

diff --git a/...t/src/main/java/io/sermant/implement/service/dynamicconfig/nacos/NacosBufferedClient.java b/...t/src/main/java/io/sermant/implement/service/dynamicconfig/nacos/NacosBufferedClient.java
@@ -22,6 +22,7 @@
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.client.auth.impl.NacosAuthLoginConstant;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.config.ConfigManager;
 import io.sermant.core.service.dynamicconfig.config.DynamicConfig;
@@ -229,7 +230,7 @@ private Properties createProperties(String connectString, int sessionTimeout, St
      * @throws NacosInitException Connect to Nacos failed
      */
     private void createNacosClient(String connectString, Properties properties) {
-        ClassLoader tempClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader tempClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
         try {
             nacosClient = new NacosClient(properties);

diff --git a/...mmon/src/main/java/io/sermant/spring/common/loadbalancer/consumer/RibbonLbController.java b/...mmon/src/main/java/io/sermant/spring/common/loadbalancer/consumer/RibbonLbController.java
@@ -65,7 +65,7 @@ public String getRibbonLb(@RequestParam("serviceName") String serviceName) throw
         if (!RIBBON_CLASS.equals(loadBalancerClient.getClass().getName())) {
             return ERROR_RESPONSE;
         }
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         final Class<?> ribbonClientClass = contextClassLoader.loadClass(RIBBON_CLASS);
         final Field clientField = ReflectionUtils.findField(ribbonClientClass, "clientFactory");
         if (clientField == null) {

diff --git a/...onfig-plugin/src/main/java/io/sermant/dynamic/config/inject/DynamicClassInjectDefine.java b/...onfig-plugin/src/main/java/io/sermant/dynamic/config/inject/DynamicClassInjectDefine.java
@@ -17,6 +17,7 @@
 
 package io.sermant.dynamic.config.inject;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.plugin.config.PluginConfigManager;
 import io.sermant.core.service.inject.ClassInjectDefine;
 import io.sermant.core.utils.ClassUtils;
@@ -42,6 +43,6 @@ public Plugin plugin() {
     @Override
     public boolean canInject() {
         return PluginConfigManager.getPluginConfig(DynamicConfiguration.class).isEnableDynamicConfig()
-                && ClassUtils.loadClass(REFRESH_CLASS, Thread.currentThread().getContextClassLoader()).isPresent();
+                && ClassUtils.loadClass(REFRESH_CLASS, ClassLoaderManager.getContextClassLoaderOrUserClassLoader()).isPresent();
     }
 }
diff --git a/...ugin/src/main/java/io/sermant/dynamic/config/interceptors/SpringFactoriesInterceptor.java b/...ugin/src/main/java/io/sermant/dynamic/config/interceptors/SpringFactoriesInterceptor.java
@@ -17,6 +17,7 @@
 
 package io.sermant.dynamic.config.interceptors;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.service.ServiceManager;
@@ -94,7 +95,7 @@ private boolean isHasMethodLoadSpringFactories() {
 
     private void injectConfigurationsWithLowVersion(Object result, String factoryName) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         if (result instanceof List) {
             final List<String> convertedResult = (List<String>) result;
             CLASS_DEFINES.forEach(classInjectDefine -> {
@@ -108,7 +109,7 @@ private void injectConfigurationsWithLowVersion(Object result, String factoryNam
 
     private void injectConfigurations(Object result) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         final boolean isMultiValueMap = result instanceof MultiValueMap;
         if (result instanceof Map) {
             // spring 高版本处理, 针对List其为不可变list，需做一层处理

diff --git a/...ntrol-common/src/main/java/io/sermant/flowcontrol/common/handler/retry/AbstractRetry.java b/...ntrol-common/src/main/java/io/sermant/flowcontrol/common/handler/retry/AbstractRetry.java
@@ -17,6 +17,7 @@
 
 package io.sermant.flowcontrol.common.handler.retry;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.config.PluginConfigManager;
 import io.sermant.core.service.xds.entity.XdsRetryPolicy;
@@ -57,7 +58,8 @@ protected final Class<? extends Throwable>[] findClass(String[] classNames) {
         final List<Class<?>> result = new ArrayList<>(classNames.length);
         for (String className : classNames) {
             try {
-                result.add(Class.forName(className, false, Thread.currentThread().getContextClassLoader()));
+                result.add(Class.forName(className, false,
+                        ClassLoaderManager.getContextClassLoaderOrUserClassLoader()));
             } catch (ClassNotFoundException exception) {
                 LoggerFactory.getLogger().info(String.format(Locale.ENGLISH,
                         "Can not find retry exception class %s", className));

diff --git a/...ontrol-plugin/src/main/java/io/sermant/flowcontrol/config/SpringFactoriesInterceptor.java b/...ontrol-plugin/src/main/java/io/sermant/flowcontrol/config/SpringFactoriesInterceptor.java
@@ -17,6 +17,7 @@
 
 package io.sermant.flowcontrol.config;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
@@ -101,7 +102,7 @@ private boolean isHasMethodLoadSpringFactories() {
 
     private void injectConfigurationsWithLowVersion(Object result, String factoryName) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         if (result instanceof List) {
             final List<String> convertedResult = (List<String>) result;
             CLASS_DEFINES.forEach(classInjectDefine -> {
@@ -115,7 +116,7 @@ private void injectConfigurationsWithLowVersion(Object result, String factoryNam
 
     private void injectConfigurations(Object result) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         final boolean isMultiValueMap = result instanceof MultiValueMap;
         if (result instanceof Map) {
             // Spring high version processing, for List, which is an immutable list, a layer of processing is required.

diff --git a/...c/main/java/io/sermant/flowcontrol/inject/FlowControlSpringConfigurationInjectDefine.java b/...c/main/java/io/sermant/flowcontrol/inject/FlowControlSpringConfigurationInjectDefine.java
@@ -17,6 +17,7 @@
 
 package io.sermant.flowcontrol.inject;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.service.inject.ClassInjectDefine;
 import io.sermant.core.utils.ClassUtils;
 
@@ -53,6 +54,8 @@ public Plugin plugin() {
     }
 
     private boolean isLoadedClass(String className) {
-        return ClassUtils.loadClass(className, Thread.currentThread().getContextClassLoader(), true).isPresent();
+        return ClassUtils
+                .loadClass(className, ClassLoaderManager.getContextClassLoaderOrUserClassLoader(), true)
+                .isPresent();
     }
 }
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,6 +17,7 @@
 
 package io.sermant.flowcontrol.retry;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.utils.ClassUtils;
 import io.sermant.flowcontrol.retry.cluster.AlibabaDubboCluster;
@@ -70,7 +71,7 @@ protected ExecuteContext doAfter(ExecuteContext context) {
                 return context;
             }
             final Optional<Class<?>> retryInvokerClass;
-            final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+            final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
             if (APACHE_DUBBO_CLUSTER_CLASS_NAME.equals(type.getName())) {
                 ClassUtils.defineClass(
                         "io.sermant.flowcontrol.retry.cluster.ApacheDubboClusterInvoker", contextClassLoader);

diff --git a/...loadbalancer-plugin/src/main/java/io/sermant/loadbalancer/interceptor/UrlInterceptor.java b/...loadbalancer-plugin/src/main/java/io/sermant/loadbalancer/interceptor/UrlInterceptor.java
@@ -17,6 +17,7 @@
 
 package io.sermant.loadbalancer.interceptor;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
@@ -117,7 +118,7 @@ private void fillSupportRules(String extensionLoaderClazz, String lbClassName) {
             }
             supportRules = new HashSet<>();
             final Optional<Class<?>> lbClazz = ClassUtils
-                    .loadClass(lbClassName, Thread.currentThread().getContextClassLoader(), true);
+                    .loadClass(lbClassName, ClassLoaderManager.getContextClassLoaderOrUserClassLoader(), true);
             if (!lbClazz.isPresent()) {
                 return;
             }
@@ -141,7 +142,7 @@ private void fillSupportRules(String extensionLoaderClazz, String lbClassName) {
     }
 
     private boolean isAlibaba() {
-        return ClassUtils.loadClass(ALIBABA_LOADER, Thread.currentThread().getContextClassLoader(), false)
+        return ClassUtils.loadClass(ALIBABA_LOADER, ClassLoaderManager.getContextClassLoaderOrUserClassLoader(), false)
                 .isPresent();
     }
 

diff --git a/...-common/src/main/java/io/sermant/loadbalancer/interceptor/SpringFactoriesInterceptor.java b/...-common/src/main/java/io/sermant/loadbalancer/interceptor/SpringFactoriesInterceptor.java
@@ -17,6 +17,7 @@
 
 package io.sermant.loadbalancer.interceptor;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
@@ -101,7 +102,7 @@ private boolean isHasMethodLoadSpringFactories() {
 
     private void injectConfigurationsWithLowVersion(Object result, String factoryName) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         if (result instanceof List) {
             final List<String> convertedResult = (List<String>) result;
             CLASS_DEFINES.forEach(classInjectDefine -> {
@@ -115,7 +116,7 @@ private void injectConfigurationsWithLowVersion(Object result, String factoryNam
 
     private void injectConfigurations(Object result) {
         final ClassInjectService service = ServiceManager.getService(ClassInjectService.class);
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         final boolean isMultiValueMap = result instanceof MultiValueMap;
         if (result instanceof Map) {
             // Spring high version processing, for List, which is an immutable list, a layer of processing is required.

diff --git a/...ugin/src/main/java/io/sermant/loadbalancer/interceptor/RibbonLoadBalancerInterceptor.java b/...ugin/src/main/java/io/sermant/loadbalancer/interceptor/RibbonLoadBalancerInterceptor.java
@@ -21,6 +21,7 @@
 import com.netflix.loadbalancer.BaseLoadBalancer;
 import com.netflix.loadbalancer.IRule;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.plugin.agent.entity.ExecuteContext;
 import io.sermant.core.plugin.agent.interceptor.AbstractInterceptor;
@@ -67,7 +68,7 @@ public class RibbonLoadBalancerInterceptor extends AbstractInterceptor {
 
     private final Function<RibbonLoadbalancerType, Optional<AbstractLoadBalancerRule>> ruleCreator = type -> {
         final String clazzName = type.getClazzName();
-        final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        final ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         try {
             final Class<?> ruleClazz = contextClassLoader.loadClass(clazzName);
             return Optional.of((AbstractLoadBalancerRule) ruleClazz.newInstance());

diff --git a/...try/dubbo-registry-plugin/src/main/java/io/sermant/dubbo/registry/utils/ReflectUtils.java b/...try/dubbo-registry-plugin/src/main/java/io/sermant/dubbo/registry/utils/ReflectUtils.java
@@ -16,6 +16,7 @@
 
 package io.sermant.dubbo.registry.utils;
 
+import io.sermant.core.classloader.ClassLoaderManager;
 import io.sermant.core.common.LoggerFactory;
 import io.sermant.core.utils.ClassLoaderUtils;
 import io.sermant.dubbo.registry.cache.DubboCache;
@@ -100,7 +101,7 @@ private ReflectUtils() {
      * @return Host class
      */
     public static Optional<Class<?>> defineClass(String className) {
-        ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader contextClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         try {
             return Optional.of(ClassLoaderUtils.defineClass(className, contextClassLoader,
                     ClassLoaderUtils.getClassResource(ReflectUtils.class.getClassLoader(), className)));

diff --git a/...bo-registry-service/src/main/java/io/sermant/dubbo/registry/utils/NamingServiceUtils.java b/...bo-registry-service/src/main/java/io/sermant/dubbo/registry/utils/NamingServiceUtils.java
@@ -57,7 +57,7 @@ private NamingServiceUtils() {
     public static NamingService buildNamingService(Map<String, String> parameters, NacosRegisterConfig registerConfig,
         RegisterServiceCommonConfig commonConfig) {
         Properties nacosProperties = buildNacosProperties(parameters, registerConfig, commonConfig);
-        ClassLoader tempClassLoader = Thread.currentThread().getContextClassLoader();
+        ClassLoader tempClassLoader = ClassLoaderManager.getContextClassLoaderOrUserClassLoader();
         Thread.currentThread().setContextClassLoader(NamingServiceUtils.class.getClassLoader());
         try {
             return NacosFactory.createNamingService(nacosProperties);