diff --git a/skywalking-collector/skywalking-agent/pom.xml b/skywalking-collector/skywalking-agent/pom.xml index 5d2ca53cb..c37d2e744 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-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 bb27dc2f2..000000000 --- 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 7fef952c3..000000000 --- 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 e93e2c50b..000000000 --- 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 fbb5519f6..000000000 --- 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 ab4bfc609..000000000 --- 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 4e2af7485..000000000 --- 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 cc8b1c7bb..000000000 --- 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/pom.xml b/skywalking-collector/skywalking-sdk-plugin/pom.xml index f342e4b54..78806644f 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