应用部署在发行版tomcat的支持 #1532
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package io.sermant.core.plugin.agent.enhance; | ||
|
|
||
| import io.sermant.core.config.ConfigManager; | ||
| import io.sermant.core.plugin.agent.interceptor.Interceptor; | ||
| import io.sermant.core.service.inject.config.InjectConfig; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * ClassLoader 增强抽象类 | ||
| * | ||
| * @author Yaxx19 | ||
| * @since 2024-06-04 | ||
| */ | ||
| public abstract class AbstractClassLoaderInterceptor implements Interceptor { | ||
|
|
||
| private final Set<String> essentialPackage; | ||
|
|
||
| /** | ||
| * constructor | ||
| */ | ||
| public AbstractClassLoaderInterceptor() { | ||
| essentialPackage = ConfigManager.getConfig(InjectConfig.class).getEssentialPackage(); | ||
| } | ||
|
|
||
| protected boolean isSermantClass(String name) { | ||
|
Collaborator
There was a problem hiding this comment. add Javadoc comment for isSermantClass and isSermantResource |
||
| for (String prefix : essentialPackage) { | ||
| if (name.startsWith(prefix)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| protected boolean isSermantResource(String path) { | ||
| String name = path.replace('/', '.'); | ||
| for (String prefix : essentialPackage) { | ||
| if (name.startsWith(prefix)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package io.sermant.core.plugin.agent.enhance; | ||
|
|
||
| import io.sermant.core.plugin.agent.declarer.AbstractPluginDeclarer; | ||
| import io.sermant.core.plugin.agent.declarer.InterceptDeclarer; | ||
| import io.sermant.core.plugin.agent.matcher.ClassMatcher; | ||
| import io.sermant.core.plugin.agent.matcher.MethodMatcher; | ||
|
|
||
| /** | ||
| * 发行版Tomcat ClassLoader 增强 | ||
| * | ||
| * @author Yaxx19 | ||
| * @since 2024-06-04 | ||
| */ | ||
| public class WebappClassLoaderDeclarer extends AbstractPluginDeclarer { | ||
|
|
||
| private static final String TOMCAT_CLASS_LOADER = "org.apache.catalina.loader.WebappClassLoaderBase"; | ||
|
|
||
| @Override | ||
| public ClassMatcher getClassMatcher() { | ||
| return ClassMatcher.nameEquals(TOMCAT_CLASS_LOADER); | ||
| } | ||
|
|
||
| @Override | ||
| public InterceptDeclarer[] getInterceptDeclarers(ClassLoader classLoader) { | ||
| return new InterceptDeclarer[] { | ||
| InterceptDeclarer.build(MethodMatcher.nameEquals("loadClass"), | ||
| new ClassLoaderLoadClassInterceptor()), | ||
| InterceptDeclarer.build(MethodMatcher.nameEquals("getResourceAsStream"), | ||
| new WebappClassLoaderGetResourceAsStreamInterceptor())}; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package io.sermant.core.plugin.agent.enhance; | ||
|
|
||
| import io.sermant.core.classloader.ClassLoaderManager; | ||
| import io.sermant.core.common.LoggerFactory; | ||
| import io.sermant.core.plugin.agent.entity.ExecuteContext; | ||
|
|
||
| import java.net.URL; | ||
| import java.util.Optional; | ||
| import java.util.logging.Level; | ||
| import java.util.logging.Logger; | ||
|
|
||
| /** | ||
| * 发行版Tomcat ClassLoader getResourceAsStream 增强 | ||
|
Collaborator
There was a problem hiding this comment. i hope all comments could be in english, As well as PR description and commit message |
||
| * | ||
| * @author Yaxx19 | ||
| * @since 2024-06-04 | ||
| */ | ||
| public class WebappClassLoaderGetResourceAsStreamInterceptor extends AbstractClassLoaderInterceptor { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(); | ||
|
|
||
| @Override | ||
| public ExecuteContext before(ExecuteContext context) throws Exception { | ||
| return context; | ||
| } | ||
|
|
||
| @Override | ||
| public ExecuteContext after(ExecuteContext context) throws Exception { | ||
| if (context.getResult() != null) { | ||
| return context; | ||
| } | ||
|
|
||
| String path = (String) context.getArguments()[0]; | ||
| if (isSermantResource(path)) { | ||
| Optional<URL> url = ClassLoaderManager.getPluginClassFinder().findSermantResource(path); | ||
| if (!url.isPresent()) { | ||
| LOGGER.log(Level.WARNING, "Can not get resource stream [{0}] by sermant.And then find by {1}. ", | ||
| new Object[]{path, context.getObject()}); | ||
| } else { | ||
| context.changeResult(url.get().openStream()); | ||
| LOGGER.log(Level.INFO, "Get resource stream: {0} successfully by sermant.", path); | ||
| } | ||
| } | ||
| return context; | ||
| } | ||
|
|
||
| @Override | ||
| public ExecuteContext onThrow(ExecuteContext context) throws Exception { | ||
| return context; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add copy right and licence for all new class files. You can refer to https://github.com/sermant-io/Sermant/blob/6b2582d346fef1ad358c1b408697b1c8749d6ff7/sermant-backend/src/main/java/io/sermant/backend/handler/config/ServiceRegistryPluginHandler.java