diff --git a/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java index a210636ec4474057abecdad2631b79d0c519feba..3a1dea4469c284050b4f4ab36d2baa988e62c3ac 100644 --- a/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java +++ b/apm-commons/apm-util/src/main/java/org/skywalking/apm/util/ConfigInitializer.java @@ -3,6 +3,7 @@ package org.skywalking.apm.util; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.LinkedList; +import java.util.List; import java.util.Properties; import java.util.logging.Logger; @@ -20,7 +21,7 @@ public class ConfigInitializer { } private static void initNextLevel(Properties properties, Class recentConfigType, - ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException { + ConfigDesc parentDesc) throws IllegalArgumentException, IllegalAccessException { for (Field field : recentConfigType.getFields()) { if (Modifier.isPublic(field.getModifiers()) && Modifier.isStatic(field.getModifiers())) { String configKey = (parentDesc + "." + field.getName()).toLowerCase(); @@ -35,8 +36,10 @@ public class ConfigInitializer { field.set(null, Long.valueOf(value)); else if (type.equals(boolean.class)) field.set(null, Boolean.valueOf(value)); + else if (type.equals(List.class)) + field.set(null, convert2List(value)); else if (type.isEnum()) - field.set(null, Enum.valueOf((Class) type, value.toUpperCase())); + field.set(null, Enum.valueOf((Class)type, value.toUpperCase())); } } } @@ -46,6 +49,22 @@ public class ConfigInitializer { parentDesc.removeLastDesc(); } } + + private static List convert2List(String value) { + List result = new LinkedList(); + if (StringUtil.isEmpty(value)) { + return result; + } + + String[] segments = value.split(","); + for (String segment : segments) { + String trimmedSegment = segment.trim(); + if (!StringUtil.isEmpty(trimmedSegment)) { + result.add(trimmedSegment); + } + } + return result; + } } class ConfigDesc { 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 79f6413701f78c0564ef43e622ae09f2e49400f1..898c16327950d03a6d56458c2f343dbb73b21bff 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 @@ -1,5 +1,7 @@ package org.skywalking.apm.agent.core.conf; +import java.util.LinkedList; +import java.util.List; import org.skywalking.apm.agent.core.logging.LogLevel; import org.skywalking.apm.agent.core.logging.WriterFactory; @@ -83,6 +85,16 @@ public class Config { } 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(); + public static class MongoDB { /** * If true, trace all the parameters, default is false. @@ -90,5 +102,6 @@ public class Config { */ public static boolean TRACE_PARAM = false; } + } } diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java index 7ebdcc19836b62d54af956881aa715991ec5b55a..cad9fa8a137c4280435a87105287b51ccc241c12 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginBootstrap.java @@ -42,18 +42,18 @@ public class PluginBootstrap { } } - List pluginClassList = PluginCfg.INSTANCE.getPluginClassList(); + List pluginClassList = PluginCfg.INSTANCE.getPluginClassList(); List plugins = new ArrayList(); - for (String pluginClassName : pluginClassList) { + for (PluginDefine pluginDefine : pluginClassList) { try { - logger.debug("loading plugin class {}.", pluginClassName); + logger.debug("loading plugin class {}.", pluginDefine.getDefineClass()); AbstractClassEnhancePluginDefine plugin = - (AbstractClassEnhancePluginDefine) Class.forName(pluginClassName).newInstance(); + (AbstractClassEnhancePluginDefine) Class.forName(pluginDefine.getDefineClass()).newInstance(); plugin.setClassTypePool(classTypePool); plugins.add(plugin); } catch (Throwable t) { - logger.error(t, "load plugin [{}] failure.", pluginClassName); + logger.error(t, "load plugin [{}] failure.", pluginDefine.getDefineClass()); } } 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 151478d0d8587183e338886a522816261e1c64db..ce7eeed842aa0e72d8edbafaf1d88f28df1b3384 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 @@ -1,26 +1,34 @@ package org.skywalking.apm.agent.core.plugin; -import org.skywalking.apm.util.StringUtil; - 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.logging.ILog; +import org.skywalking.apm.logging.LogManager; public enum PluginCfg { INSTANCE; - private List pluginClassList = new ArrayList(); + private static final ILog logger = LogManager.getLogger(PluginCfg.class); + + private List pluginClassList = new ArrayList(); void load(InputStream input) throws IOException { try { BufferedReader reader = new BufferedReader(new InputStreamReader(input)); - String pluginDefineClassName = null; - while ((pluginDefineClassName = reader.readLine()) != null) { - if (!StringUtil.isEmpty(pluginDefineClassName)) { - pluginClassList.add(pluginDefineClassName.trim()); + String pluginDefine = null; + while ((pluginDefine = reader.readLine()) != null) { + try { + PluginDefine plugin = PluginDefine.build(pluginDefine); + if (plugin.enable()) { + pluginClassList.add(plugin); + } + } catch (IllegalPluginDefineException e) { + logger.error("Failed to format plugin define.", e); } } } finally { @@ -28,7 +36,8 @@ public enum PluginCfg { } } - public List getPluginClassList() { + public List getPluginClassList() { return pluginClassList; } + } 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 new file mode 100644 index 0000000000000000000000000000000000000000..96a82f896679935523033f0c633691f91e72041f --- /dev/null +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/PluginDefine.java @@ -0,0 +1,45 @@ +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 { + /** + * Plugin name. + */ + private String name; + + /** + * The class name of plugin defined. + */ + private String defineClass; + + private PluginDefine(String name, String defineClass) { + this.name = name; + this.defineClass = defineClass; + } + + public static PluginDefine build(String define) throws IllegalPluginDefineException { + if (StringUtil.isEmpty(define)) { + throw new IllegalPluginDefineException(define); + } + + String[] pluginDefine = define.split("="); + if (pluginDefine.length != 2) { + throw new IllegalPluginDefineException(define); + } + + return new PluginDefine(pluginDefine[0], pluginDefine[1]); + } + + public boolean enable() { + return !Config.Plugin.DISABLED_PLUGINS.contains(name); + } + + public String getDefineClass() { + return defineClass; + } +} + + diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java new file mode 100644 index 0000000000000000000000000000000000000000..41fb13b7b0ccbcdc6ea43749bd7d89ab472af1ea --- /dev/null +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/plugin/exception/IllegalPluginDefineException.java @@ -0,0 +1,10 @@ +package org.skywalking.apm.agent.core.plugin.exception; + +/** + * Thrown to indicate that a illegal format plugin definition has been defined in skywalking-plugin.define. + */ +public class IllegalPluginDefineException extends Exception { + public IllegalPluginDefineException(String define) { + super("Illegal plugin define : " + define); + } +} diff --git a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService index 45405000c508f5e3c709844beb3917f5513828e1..0b8021650bc6caf671b6fdc48797eb3e21f72795 100644 --- a/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService +++ b/apm-sniffer/apm-agent-core/src/main/resources/META-INF/services/org.skywalking.apm.agent.core.boot.BootService @@ -1,4 +1,4 @@ org.skywalking.apm.agent.core.queue.TraceSegmentProcessQueue org.skywalking.apm.agent.core.context.ContextManager org.skywalking.apm.agent.core.client.CollectorClientService -org.skywalking.apm.agent.core.sampling.SamplingService +org.skywalking.apm.agent.core.sampling.SamplingService \ No newline at end of file diff --git a/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java index 7853f3616383c964fd62d47a7a4417fef1c66d7b..3806698c1013ff495f1a7490dc050d176ce9b820 100644 --- a/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java +++ b/apm-sniffer/apm-agent-core/src/test/java/org/skywalking/apm/agent/core/plugin/PluginCfgTest.java @@ -17,7 +17,7 @@ import java.util.List; public class PluginCfgTest { @Test public void testLoad() throws IOException { - String data = "com.test.classA\r\ncom.test.ClassB"; + String data = "TestA=com.test.classA\r\nTestB=com.test.ClassB"; final byte[] dataBytes = data.getBytes(); PluginCfg.INSTANCE.load(new InputStream() { int index = 0; @@ -31,10 +31,10 @@ public class PluginCfgTest { } }); - List list = PluginCfg.INSTANCE.getPluginClassList(); + List list = PluginCfg.INSTANCE.getPluginClassList(); Assert.assertEquals(2, list.size()); - Assert.assertEquals("com.test.classA", list.get(0)); - Assert.assertEquals("com.test.ClassB", list.get(1)); + Assert.assertEquals("com.test.classA", list.get(0).getDefineClass()); + Assert.assertEquals("com.test.ClassB", list.get(1).getDefineClass()); } @Before diff --git a/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def b/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def index 32e8cdffb3be77ea38db710f3b589d153816f7cf..2b07edf843fd4896bdc78a49d5875115e1a80e3f 100644 --- a/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-agent-core/src/test/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.agent.core.plugin.MockAbstractClassEnhancePluginDefine +MOCKPLUGIN=org.skywalking.apm.agent.core.plugin.MockAbstractClassEnhancePluginDefine diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def index c19910e0da4fef99d1d0a8d051ea770ab04b9eb9..8d1917a6dc4ae5cba4fdea00a3364ddffb43262b 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.plugin.dubbo.DubboInstrumentation +dubbo=org.skywalking.apm.plugin.dubbo.DubboInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def index 4452346e2c9aef62675d0b4d8172f1670ed56126..bea7bc146794d8a43042dc4d9f942b608380a501 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def @@ -1,4 +1,4 @@ -org.skywalking.apm.plugin.httpClient.v4.define.AbstractHttpClientInstrumentation -org.skywalking.apm.plugin.httpClient.v4.define.InternalHttpClientInstrumentation -org.skywalking.apm.plugin.httpClient.v4.define.MinimalHttpClientInstrumentation -org.skywalking.apm.plugin.httpClient.v4.define.DefaultRequestDirectorInstrumentation +httpclient-4.x=org.skywalking.apm.plugin.httpClient.v4.define.AbstractHttpClientInstrumentation +httpclient-4.x=org.skywalking.apm.plugin.httpClient.v4.define.InternalHttpClientInstrumentation +httpclient-4.x=org.skywalking.apm.plugin.httpClient.v4.define.MinimalHttpClientInstrumentation +httpclient-4.x=org.skywalking.apm.plugin.httpClient.v4.define.DefaultRequestDirectorInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def index ac9bd33b2391790cff6fead2a19d673aeef1c106..c946b2924ce5670b02a3d72778a9edb636d57501 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/resources/skywalking-plugin.def @@ -1,3 +1,3 @@ -org.skywalking.apm.plugin.jdbc.define.H2Instrumentation -org.skywalking.apm.plugin.jdbc.define.MysqlInstrumentation -org.skywalking.apm.plugin.jdbc.define.OracleInstrumentation +jdbc=org.skywalking.apm.plugin.jdbc.define.H2Instrumentation +jdbc=org.skywalking.apm.plugin.jdbc.define.MysqlInstrumentation +jdbc=org.skywalking.apm.plugin.jdbc.define.OracleInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def index 354b4fd028e47c5dfeecc34a3e34cd7769eec5df..d2b37ef8c74bfc6c6f8ade5e51a6e1d29fff12f2 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def @@ -1,2 +1,2 @@ -org.skywalking.apm.plugin.jedis.v2.define.JedisClusterInstrumentation -org.skywalking.apm.plugin.jedis.v2.define.JedisInstrumentation +jedis-2.x=org.skywalking.apm.plugin.jedis.v2.define.JedisClusterInstrumentation +jedis-2.x=org.skywalking.apm.plugin.jedis.v2.define.JedisInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def index 27d8a38ad5c525b49676b2a9efcd2479623d8171..cdb37e55841b67243afc9bc6fb573c5e7bb2ed2e 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.plugin.mongodb.v3.define.MongoDBInstrumentation \ No newline at end of file +mongodb-3.x=org.skywalking.apm.plugin.mongodb.v3.define.MongoDBInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def index 21d17238569b834f7bec26e99575e4c9aacd245f..b653df3bdbb08b629c909a904c5a5ae5a6d4d67f 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/src/main/resources/skywalking-plugin.def @@ -1,2 +1,2 @@ -org.skywalking.apm.plugin.motan.define.MotanConsumerInstrumentation -org.skywalking.apm.plugin.motan.define.MotanProviderInstrumentation +motan-0.x=org.skywalking.apm.plugin.motan.define.MotanConsumerInstrumentation +motan-0.x=org.skywalking.apm.plugin.motan.define.MotanProviderInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def index b22c5d050acb44cf5a6df54afde164d4d084c3ee..fb17b30923877da0dba53c298e629fda39711276 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.plugin.tomcat78x.define.TomcatInstrumentation +tomcat-7.x/8.x=org.skywalking.apm.plugin.tomcat78x.define.TomcatInstrumentation \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def index 9672c714ef6bb95f31e874beca0c6ebf8934ac7e..f6a48831a863f0db674ef6d4dc99ed929047c831 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.toolkit.activation.log.log4j.v1.x.TraceIdPatternConverterActivation +log4j=org.skywalking.apm.toolkit.activation.log.log4j.v1.x.TraceIdPatternConverterActivation \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def index 75f99a7882db30fc76159b3c69d4574369909d2d..c68759c261565a894076de05ec165add9900957a 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.toolkit.activation.log.log4j.v2.x.Log4j2OutputAppenderActivation +log4j2=org.skywalking.apm.toolkit.activation.log.log4j.v2.x.Log4j2OutputAppenderActivation \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def index 53a49b181cb59a5304ca3b3461c231357ffc566b..2f1f0252875022b12ab5fa801ae0dc77ae8caa76 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.toolkit.activation.log.logback.v1.x.LogbackPatternConverterActivation +logback=org.skywalking.apm.toolkit.activation.log.logback.v1.x.LogbackPatternConverterActivation \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def index 65afa78cd0c5f5483099073cd557234a72b5c9ad..96fa9e53773f8d9bd744ff3e5f081a5d0153a5e1 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/resources/skywalking-plugin.def @@ -1,2 +1,2 @@ -org.skywalking.apm.toolkit.activation.opentracing.span.SkyWalkingSpanActivation -org.skywalking.apm.toolkit.activation.opentracing.tracer.SkyWalkingTracerActivation +opentracing=org.skywalking.apm.toolkit.activation.opentracing.span.SkyWalkingSpanActivation +opentracing=org.skywalking.apm.toolkit.activation.opentracing.tracer.SkyWalkingTracerActivation \ No newline at end of file diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def index 2f3b1a6d735279d2a89943b73f13e2f4818456c0..0284210fdfdf19b57caf73139b9425d870efed12 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def @@ -1 +1 @@ -org.skywalking.apm.toolkit.activation.trace.TraceContextActivation \ No newline at end of file +tracecontext=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation \ No newline at end of file