diff --git a/skywalking-collector/skywalking-agent/pom.xml b/skywalking-collector/skywalking-agent/pom.xml
index 5d2ca53cb37be328ea71c1077b7d2534b0c0a144..c37d2e744af581de5a5055472478f6cf40396b17 100644
--- a/skywalking-collector/skywalking-agent/pom.xml
+++ b/skywalking-collector/skywalking-agent/pom.xml
@@ -39,11 +39,6 @@
skywalking-httpClient-4.x-plugin
1.0-Final
-
- com.ai.cloud
- skywalking-httpClient-4.x-plugin-dubbox-rest-attachment
- 1.0-Final
-
com.ai.cloud
skywalking-dubbo-plugin
diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java
index c97275bac9f431cc331d21028a47b281bf589944..1d39d737e3db66ae52252663f9f2292d1ac5cc8d 100644
--- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java
+++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java
@@ -1,27 +1,26 @@
package com.ai.cloud.skywalking.plugin.interceptor;
-import static com.ai.cloud.skywalking.plugin.PluginBootstrap.CLASS_TYPE_POOL;
-
import com.ai.cloud.skywalking.logging.LogManager;
import com.ai.cloud.skywalking.logging.Logger;
+import com.ai.cloud.skywalking.plugin.IPlugin;
+import com.ai.cloud.skywalking.plugin.PluginException;
+import com.ai.cloud.skywalking.util.StringUtil;
import net.bytebuddy.ByteBuddy;
import net.bytebuddy.dynamic.ClassFileLocator;
import net.bytebuddy.dynamic.DynamicType;
import net.bytebuddy.dynamic.loading.ClassLoadingStrategy;
import net.bytebuddy.pool.TypePool.Resolution;
-import com.ai.cloud.skywalking.plugin.IPlugin;
-import com.ai.cloud.skywalking.plugin.PluginException;
-import com.ai.cloud.skywalking.util.StringUtil;
+import static com.ai.cloud.skywalking.plugin.PluginBootstrap.CLASS_TYPE_POOL;
public abstract class AbstractClassEnhancePluginDefine implements IPlugin {
- private static Logger logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class);
-
- @Override
- public void define() throws PluginException {
- String interceptorDefineClassName = this.getClass().getName();
-
- String enhanceOriginClassName = getBeInterceptedClassName();
+ private static Logger logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class);
+
+ @Override
+ public void define() throws PluginException {
+ String interceptorDefineClassName = this.getClass().getName();
+
+ String enhanceOriginClassName = enhanceClassName();
if (StringUtil.isEmpty(enhanceOriginClassName)) {
logger.warn("classname of being intercepted is not defined by {}.",
interceptorDefineClassName);
@@ -38,13 +37,27 @@ public abstract class AbstractClassEnhancePluginDefine implements IPlugin {
return;
}
+ /**
+ * find witness classes for enhance class
+ */
+ String[] witnessClasses = witnessClasses();
+ if(witnessClasses != null) {
+ for (String witnessClass : witnessClasses) {
+ Resolution witnessClassResolution = CLASS_TYPE_POOL.describe(witnessClass);
+ if (!witnessClassResolution.isResolved()) {
+ logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", enhanceOriginClassName, interceptorDefineClassName, witnessClass);
+ return;
+ }
+ }
+ }
+
/**
* find origin class source code for interceptor
*/
DynamicType.Builder> newClassBuilder = new ByteBuddy()
.rebase(resolution.resolve(),
ClassFileLocator.ForClassLoader.ofClassPath());
-
+
newClassBuilder = this.enhance(enhanceOriginClassName, newClassBuilder);
/**
@@ -59,14 +72,24 @@ public abstract class AbstractClassEnhancePluginDefine implements IPlugin {
logger.debug("enhance class {} by {} completely.",
enhanceOriginClassName, interceptorDefineClassName);
- }
-
- protected abstract DynamicType.Builder> enhance(String enhanceOriginClassName, DynamicType.Builder> newClassBuilder) throws PluginException;
+ }
+
+ protected abstract DynamicType.Builder> enhance(String enhanceOriginClassName, DynamicType.Builder> newClassBuilder) throws PluginException;
+
+ /**
+ * 返回要被增强的类,应当返回类全名
+ *
+ * @return
+ */
+ protected abstract String enhanceClassName();
- /**
- * 返回要被增强的类,应当返回类全名
- *
- * @return
- */
- protected abstract String getBeInterceptedClassName();
+ /**
+ * 返回一个类名的列表
+ * 如果列表中的类在JVM中存在,则enhance可以会尝试生效
+ *
+ * @return
+ */
+ protected String[] witnessClasses(){
+ return new String[]{};
+ }
}
diff --git a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java
index cb4f1b825da5abbdba7c7427ec6844b0787cb636..b092b7ce7bab988939eb9600e790c25b7dfc67d7 100644
--- a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java
+++ b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/matcher/TestMatcherDefine.java
@@ -10,7 +10,7 @@ import com.ai.cloud.skywalking.plugin.interceptor.matcher.PrivateMethodMatcher;
*/
public class TestMatcherDefine extends ClassInstanceMethodsEnhancePluginDefine {
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "test.ai.cloud.matcher.TestMatcherClass";
}
diff --git a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java
index 31bc788b5ac4ef74718012ccebe6033e22318cce..c18b13e8b14ed738bb3163f0d3f9549f05e04a80 100644
--- a/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java
+++ b/skywalking-collector/skywalking-api/src/test/java/test/ai/cloud/plugin/TestInterceptorDefine.java
@@ -9,7 +9,7 @@ import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
public class TestInterceptorDefine extends ClassEnhancePluginDefine {
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "test.ai.cloud.plugin.BeInterceptedClass";
}
diff --git a/skywalking-collector/skywalking-log/logback-plugin/pom.xml b/skywalking-collector/skywalking-log/logback-plugin/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c5d865877060d9ec443388a3d80ef284c16e69c1
--- /dev/null
+++ b/skywalking-collector/skywalking-log/logback-plugin/pom.xml
@@ -0,0 +1,55 @@
+
+ 4.0.0
+
+ com.ai.cloud
+ skywalking-log
+ 1.0-Final
+
+ logback-plugin
+ logback-plugin
+ http://maven.apache.org
+
+
+ UTF-8
+
+
+
+
+ junit
+ junit
+ 3.8.1
+ test
+
+
+ ch.qos.logback
+ logback-classic
+ 1.1.5
+ compile
+
+
+ com.ai.cloud
+ skywalking-api
+ 1.0-Final
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-resources-plugin
+ 2.4.3
+
+ ${project.build.sourceEncoding}
+
+
+
+
+
+
+
+ bintray-wu-sheng-sky-walking-repository
+ wu-sheng-sky-walking-repository
+ https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-1.x-plugin/;publish=1
+
+
+
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java
new file mode 100644
index 0000000000000000000000000000000000000000..17ab9f5bab716a85a0185f8b33490c59ae025ce8
--- /dev/null
+++ b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/LogbackPatternConverter.java
@@ -0,0 +1,22 @@
+package com.ai.cloud.skywalking.plugin.log.logback;
+import ch.qos.logback.classic.pattern.ClassicConverter;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+
+import com.ai.cloud.skywalking.api.Tracing;
+import com.ai.cloud.skywalking.conf.AuthDesc;
+/**
+ *
+ * @author yushuqiang
+ *
+ */
+public class LogbackPatternConverter extends ClassicConverter {
+
+ @Override
+ public String convert(ILoggingEvent event) {
+ if (AuthDesc.isAuth()) {
+ return "TID:" + Tracing.getTraceId();
+ }
+
+ return "TID: N/A";
+ }
+}
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java
new file mode 100644
index 0000000000000000000000000000000000000000..9e46dfc8be8b37799db0a4415a14d3a4e87b558d
--- /dev/null
+++ b/skywalking-collector/skywalking-log/logback-plugin/src/main/java/com/ai/cloud/skywalking/plugin/log/logback/TraceIdPatternLogbackLayout.java
@@ -0,0 +1,12 @@
+package com.ai.cloud.skywalking.plugin.log.logback;
+import ch.qos.logback.classic.PatternLayout;
+/**
+ *
+ * @author yushuqiang
+ *
+ */
+public class TraceIdPatternLogbackLayout extends PatternLayout {
+ static {
+ defaultConverterMap.put("tid",LogbackPatternConverter.class.getName());
+ }
+}
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java b/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java
new file mode 100644
index 0000000000000000000000000000000000000000..386d0200a16d035d01e3a04ed3ded2f4fb4b2075
--- /dev/null
+++ b/skywalking-collector/skywalking-log/logback-plugin/src/test/java/com/ai/LogbackMain.java
@@ -0,0 +1,25 @@
+package com.ai;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
+import ch.qos.logback.core.util.StatusPrinter;
+public class LogbackMain {
+
+ static Logger logger = LoggerFactory.getLogger(LogbackMain.class);
+
+ public static void main(String[] args) throws JoranException {
+ LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+
+ JoranConfigurator configurator = new JoranConfigurator();
+ configurator.setContext(lc);
+ lc.reset();
+ configurator.doConfigure("E:\\testdubbo\\sky-walking\\skywalking-collector\\skywalking-log\\logback-plugin\\src\\test\\resources\\logback.xml");
+ StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
+
+ logger.info("Hello world11");
+ }
+
+}
diff --git a/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml b/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5033c927a153f4bc5ab044821c33decb6414c89e
--- /dev/null
+++ b/skywalking-collector/skywalking-log/logback-plugin/src/test/resources/logback.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%tid] [%thread] %-5level %logger{36} -%msg%n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java
index 508445c5ce48645f058c2c94a9e65de128d81102..f727b885d0b4d0c83bed26d4201a6cfa8d7a1965 100644
--- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboPluginDefine.java
@@ -17,7 +17,7 @@ public class DubboPluginDefine extends ClassStaticMethodsEnhancePluginDefine {
}
@Override
- protected String getBeInterceptedClassName() {
+ protected String enhanceClassName() {
return "com.alibaba.dubbo.rpc.protocol.ProtocolFilterWrapper";
}
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md
deleted file mode 100644
index bb27dc2f249327a0d72d4ad6847204d4349481ad..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# 追踪通过httpClient调用dubbox发布的rest服务?
-- 使用httpClient-4.x-plugin插件,[查看](../mysql-plugin)
-- 引入所需插件
-```xml
-
- com.ai.cloud
- skywalking-httpClient-4.x-plugin-dubbox-rest-attachment
- {latest_version}
-
-```
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml
deleted file mode 100644
index 7fef952c3f28a891cf9f00c15a1b4caffff84986..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
- 4.0.0
-
- com.ai.cloud
- skywalking-sdk-plugin
- 1.0-Final
-
-
- skywalking-httpClient-4.x-plugin-dubbox-rest-attachment
- jar
-
- httpClient-4.x-plugin-dubbox-rest-attachment
- http://maven.apache.org
-
-
- UTF-8
-
-
-
-
- com.ai.cloud
- skywalking-httpClient-4.x-plugin
- 1.0-Final
- compile
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.3
- test
-
-
-
-
- org.apache.logging.log4j
- log4j-core
- 2.4.1
- test
-
-
-
- junit
- junit
- 4.12
- test
-
-
-
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.4.3
-
- ${project.build.sourceEncoding}
-
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
- https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/;publish=1
-
-
-
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java
deleted file mode 100644
index e93e2c50bca61e4fafc4152e45e3587f5b18c831..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.skywalking.httpClient.v4.plugin.dubbox.rest.attachment;
-
-import org.skywalking.httpClient.v4.plugin.HttpClientExecuteInterceptor;
-
-import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher;
-import com.ai.cloud.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-import com.ai.cloud.skywalking.plugin.interceptor.enhance.IntanceMethodsAroundInterceptor;
-
-public class DubboxRestHeadSetterAttachment extends ClassInstanceMethodsEnhancePluginDefine {
-
- /**
- * this method is called as InterceptorPluginDefine
- * don't return be intercepted classname,
- * just run as a pre setter of attribute:HttpClientExecuteInterceptor.TRACE_HEAD_NAME
- */
- @Override
- public String getBeInterceptedClassName() {
- HttpClientExecuteInterceptor.TRACE_HEAD_NAME = "Dubbo-Attachments";
- return null;
- }
-
- @Override
- public MethodMatcher[] getInstanceMethodsMatchers() {
- return null;
- }
-
- @Override
- public IntanceMethodsAroundInterceptor getInstanceMethodsInterceptor() {
- return null;
- }
-
-}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def
deleted file mode 100644
index fbb5519f6d10550c744bcff272b06674c1c3ec59..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def
+++ /dev/null
@@ -1 +0,0 @@
-org.skywalking.httpClient.v4.plugin.dubbox.rest.attachment.DubboxRestHeadSetterAttachment
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java
deleted file mode 100644
index ab4bfc60926482be61018edc2778b16987f89b28..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package test.skywalking.httpClient.v4x.plugin.dubbox.rest.attachment;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.sql.SQLException;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.junit.Test;
-
-import com.ai.cloud.skywalking.plugin.TracingBootstrap;
-
-public class TestHttpClientV43 {
- @Test
- public void testsql() throws IllegalAccessException,
- IllegalArgumentException, InvocationTargetException,
- NoSuchMethodException, SecurityException, ClassNotFoundException {
- TracingBootstrap
- .main(new String[] { "test.skywalking.httpClient.v4x.plugin.dubbox.rest.attachment.TestHttpClientV43" });
- }
-
- public static void main(String[] args) throws ClassNotFoundException,
- SQLException, InterruptedException {
- HttpClientBuilder httpClientBuilder = HttpClientBuilder.create();
- // HttpClient
- CloseableHttpClient closeableHttpClient = httpClientBuilder.build();
-
- HttpGet httpGet = new HttpGet("http://www.baidu.com");
- System.out.println(httpGet.getRequestLine());
- try {
- // 执行get请求
- HttpResponse httpResponse = closeableHttpClient.execute(httpGet);
- // 获取响应消息实体
- HttpEntity entity = httpResponse.getEntity();
- // 响应状态
- System.out.println("status:" + httpResponse.getStatusLine());
- // 判断响应实体是否为空
- if (entity != null) {
- System.out.println("contentEncoding:"
- + entity.getContentEncoding());
- System.out.println("response content:"
- + EntityUtils.toString(entity));
- }
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try { // 关闭流并释放资源
- closeableHttpClient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- Thread.sleep(5*1000);
- }
-}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml
deleted file mode 100644
index 4e2af7485ab84c52a49dd7a350ce08515279fbc1..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth
deleted file mode 100644
index cc8b1c7bb0cf8189c2b37c961c1265a44a7b644f..0000000000000000000000000000000000000000
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth
+++ /dev/null
@@ -1,47 +0,0 @@
-#skyWalking用户ID
-skywalking.user_id=123
-#skyWalking应用编码
-skywalking.application_code=test
-#skywalking auth的环境变量名字
-skywalking.auth_system_env_name=SKYWALKING_RUN
-#skywalking数据编码
-skywalking.charset=UTF-8
-
-#是否打印数据
-buriedpoint.printf=true
-#埋点异常的最大长度
-buriedpoint.max_exception_stack_length=4000
-#业务字段的最大长度
-buriedpoint.businesskey_max_length=300
-#过滤异常
-buriedpoint.exclusive_exceptions=java.lang.RuntimeException
-
-#最大发送者的连接数阀比例
-sender.connect_percent=100
-#发送服务端配置
-sender.servers_addr=127.0.0.1:34000
-#最大发送的副本数量
-sender.max_copy_num=2
-#发送的最大长度
-sender.max_send_length=20000
-#当没有Sender时,尝试获取sender的等待周期
-sender.retry_get_sender_wait_interval=2000
-
-
-
-
-#最大消费线程数
-consumer.max_consumer=2
-#消费者最大等待时间
-consumer.max_wait_time=5
-#发送失败等待时间
-consumer.consumer_fail_retry_wait_interval=50
-
-#每个Buffer的最大个数
-buffer.buffer_max_size=18000
-#Buffer池的最大长度
-buffer.pool_size=5
-
-#发送检查线程检查周期
-senderchecker.check_polling_time=200
-
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
index 055a20a3869796a9295c954ddf47ed5475669791..bfc56038550f482ee85e5045fe5bfef2f1c0f14d 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
@@ -6,7 +6,7 @@ import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
public class AbstractHttpClientPluginDefine extends HttpClientPluginDefine {
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "org.apache.http.impl.client.AbstractHttpClient";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
index 03f3aeb39fa5a44b5873fd62d5e3e1b622b92142..d713d8e21420b278b66bfae60a667a7591dd5058 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
@@ -10,7 +10,7 @@ public class DefaultRequestDirectorPluginDefine extends HttpClientPluginDefine {
* since 4.3, this class is Deprecated.
*/
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "org.apache.http.impl.client.DefaultRequestDirector";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
index 84db0b610da8bf1bb403234e55c2470f83895a86..ebe4973b6d153f4ca329f821711831bd80782b11 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
@@ -10,7 +10,7 @@ public class InternalHttpClientPluginDefine extends HttpClientPluginDefine {
}
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "org.apache.http.impl.client.InternalHttpClient";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
index aa5067d8e382a6cfa095d94acf8be8c53b211ff9..17bc9adc39067fcea0fa256c24f9f6ae18cd30db 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
@@ -10,7 +10,7 @@ public class MinimalHttpClientPluginDefine extends HttpClientPluginDefine {
}
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "org.apache.http.impl.client.MinimalHttpClient";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java
index d5e98567b70fec187eed623f8a0ad10124594821..63fdd97c3d9529b1f9fa82f1e5cdf1f2d22618ab 100644
--- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisClusterPluginDefine.java
@@ -9,7 +9,7 @@ import com.ai.cloud.skywalking.plugin.interceptor.matcher.AnyMethodsMatcher;
public class JedisClusterPluginDefine extends ClassInstanceMethodsEnhancePluginDefine {
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "redis.clients.jedis.JedisCluster";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java
index bb86d12a2c9f62e5bcfdc21870ca3e8e310c90fa..8ce663b75234f585ff9aece8fd72c1668c06608a 100644
--- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java
@@ -11,7 +11,7 @@ import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
public class JedisPluginDefine extends ClassInstanceMethodsEnhancePluginDefine {
@Override
- public String getBeInterceptedClassName() {
+ public String enhanceClassName() {
return "redis.clients.jedis.Jedis";
}
diff --git a/skywalking-collector/skywalking-sdk-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/pom.xml
index f342e4b54757007976d66a0149fe05b985337a6e..78806644fef93cf30a45fbe11c036741790c38d4 100644
--- a/skywalking-collector/skywalking-sdk-plugin/pom.xml
+++ b/skywalking-collector/skywalking-sdk-plugin/pom.xml
@@ -16,7 +16,6 @@
jdbc-plugin
web-plugin
httpClient-4.x-plugin
- httpClient-4.x-plugin-dubbox-rest-attachment
jedis-2.x-plugin
pom