From 4f9a9581610ba50cfc3d7872af539d2b3189b2f6 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Wed, 18 Oct 2017 18:00:45 +0800 Subject: [PATCH] Remove old enable/disable mechanism. --- .../apm/agent/core/conf/Config.java | 18 ----------- .../apm/agent/core/plugin/PluginCfg.java | 11 +++---- .../apm/agent/core/plugin/PluginDefine.java | 32 ++----------------- 3 files changed, 7 insertions(+), 54 deletions(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java index d7b317709d04..55e58942f1ba 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/conf/Config.java @@ -18,8 +18,6 @@ package org.skywalking.apm.agent.core.conf; -import java.util.LinkedList; -import java.util.List; import org.skywalking.apm.agent.core.context.trace.TraceSegment; import org.skywalking.apm.agent.core.logging.core.LogLevel; import org.skywalking.apm.agent.core.logging.core.WriterFactory; @@ -129,22 +127,6 @@ public static class Logging { } public static class Plugin { - - /** - * Name of disabled plugin, The value spilt by , - * if you have multiple plugins need to disable. - * - * Here are the plugin names : - * tomcat-7.x/8.x, dubbo, jedis-2.x, motan, httpclient-4.x, jdbc, mongodb-3.x. - */ - public static List DISABLED_PLUGINS = new LinkedList(); - - /** - * Name of force enable plugin, The value spilt by , - * if you have multiple plugins need to enable. - */ - public static List FORCE_ENABLE_PLUGINS = new LinkedList(); - public static class MongoDB { /** * If true, trace all the parameters, default is false. diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java index 3f2c78b1ad72..e22aa39bb12d 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginCfg.java @@ -18,15 +18,16 @@ package org.skywalking.apm.agent.core.plugin; +import org.skywalking.apm.agent.core.logging.api.ILog; +import org.skywalking.apm.agent.core.logging.api.LogManager; +import org.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import org.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException; -import org.skywalking.apm.agent.core.logging.api.ILog; -import org.skywalking.apm.agent.core.logging.api.LogManager; public enum PluginCfg { INSTANCE; @@ -45,9 +46,7 @@ void load(InputStream input) throws IOException { continue; } PluginDefine plugin = PluginDefine.build(pluginDefine); - if (plugin.enable()) { - pluginClassList.add(plugin); - } + pluginClassList.add(plugin); } catch (IllegalPluginDefineException e) { logger.error(e, "Failed to format plugin({}) define.", pluginDefine); } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginDefine.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginDefine.java index 8ac632c54d59..d03f54b9e904 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginDefine.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginDefine.java @@ -18,12 +18,10 @@ package org.skywalking.apm.agent.core.plugin; -import org.skywalking.apm.agent.core.conf.Config; import org.skywalking.apm.agent.core.plugin.exception.IllegalPluginDefineException; import org.skywalking.apm.util.StringUtil; public class PluginDefine { - public static final String PLUGIN_OFF_PREFIX = "[OFF]"; /** * Plugin name. */ @@ -34,15 +32,9 @@ public class PluginDefine { */ private String defineClass; - /** - * The sate of plugin. - */ - private State state; - - private PluginDefine(String name, String defineClass, State state) { + private PluginDefine(String name, String defineClass) { this.name = name; this.defineClass = defineClass; - this.state = state; } public static PluginDefine build(String define) throws IllegalPluginDefineException { @@ -57,32 +49,12 @@ public static PluginDefine build(String define) throws IllegalPluginDefineExcept String pluginName = pluginDefine[0]; String defineClass = pluginDefine[1]; - if (pluginName.toUpperCase().startsWith(PLUGIN_OFF_PREFIX)) { - return new PluginDefine(pluginName.substring(PLUGIN_OFF_PREFIX.length()), defineClass, State.OFF); - } else { - return new PluginDefine(pluginName, defineClass, State.ON); - } - } - - public boolean enable() { - return !forceDisable() || forceEnable(); - } - - private boolean forceDisable() { - return state != State.ON || Config.Plugin.DISABLED_PLUGINS.contains(name); - } - - private boolean forceEnable() { - return state == State.OFF && Config.Plugin.FORCE_ENABLE_PLUGINS.contains(name); + return new PluginDefine(pluginName, defineClass); } public String getDefineClass() { return defineClass; } - - private enum State { - OFF, ON; - } }