From 64e1e4a0a8f568da4c1fede817ef358ce5e60626 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Fri, 8 Jul 2016 17:26:19 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dagent-test=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98,=202.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9HttpClient=E6=8F=92=E4=BB=B6=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=90=8D=E5=86=99=E9=94=99=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 41 +++++++ .../src/main/resources/skywalking-plugin.def | 8 +- .../agent/test/mysql/JDBCPluginTest.java | 24 ++-- test/skywalking-agent-test/pom.xml | 115 +++++++++--------- .../agent/test/RedisClusterPluginTest.java | 46 ------- .../agent/test/RedisPluginTest.java | 39 ------ .../agent/test/RedisClusterOperator.java | 0 .../agent/test/RedisClusterPluginTest.java | 40 ++++++ .../skywalking/agent/test/RedisOperator.java | 0 .../agent/test/RedisPluginTest.java | 33 +++++ .../src/{main => test}/resources/log4j2.xml | 0 .../src/{main => test}/resources/redis.conf | 0 .../{main => test}/resources/sky-walking.auth | 0 13 files changed, 187 insertions(+), 159 deletions(-) delete mode 100644 test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java delete mode 100644 test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java rename test/skywalking-agent-test/redis-test/src/{main => test}/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java (100%) create mode 100644 test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java rename test/skywalking-agent-test/redis-test/src/{main => test}/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java (100%) create mode 100644 test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java rename test/skywalking-agent-test/redis-test/src/{main => test}/resources/log4j2.xml (100%) rename test/skywalking-agent-test/redis-test/src/{main => test}/resources/redis.conf (100%) rename test/skywalking-agent-test/redis-test/src/{main => test}/resources/sky-walking.auth (100%) diff --git a/.gitignore b/.gitignore index f94a9ea9f..b75ff97cd 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,44 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +.idea/ +samples/skywalking-auth/skywalking-auth.iml +samples/skywalking-auth/target/ +skywalking-alarm/skywalking-alarm.iml +skywalking-alarm/target/ +skywalking-analysis/skywalking-analysis.iml +skywalking-analysis/target/ +skywalking-collector/skywalking-agent/dependency-reduced-pom.xml +skywalking-collector/skywalking-agent/skywalking-agent.iml +skywalking-collector/skywalking-agent/target/ +skywalking-collector/skywalking-api/skywalking-api.iml +skywalking-collector/skywalking-collector.iml +skywalking-collector/skywalking-log/example/example.iml +skywalking-collector/skywalking-log/log4j-1.x-plugin/skywalking-log4j-1.x-plugin.iml +skywalking-collector/skywalking-log/log4j-2.x-plugin/skywalking-log4j-2.x-plugin.iml +skywalking-collector/skywalking-log/skywalking-log.iml +skywalking-collector/skywalking-protocol/skywalking-protocol.iml +skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/skywalking-dubbo-plugin.iml +skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/target/ +skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/skywalking-httpClient-4.x-plugin.iml +skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/target/ +skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/skywalking-jdbc-plugin.iml +skywalking-sdk-plugin/jdbc-plugin/target/ +skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/skywalking-jedis-2.x-plugin.iml +skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/target/ +skywalking-collector/skywalking-sdk-plugin/spring-plugin/skywalking-spring-plugin.iml +skywalking-collector/skywalking-sdk-plugin/spring-plugin/target/ +skywalking-collector/skywalking-sdk-plugin/web-plugin/skywalking-web-plugin.iml +skywalking-collector/skywalking-sdk-plugin/web-plugin/target/ +skywalking-server/target/ +skywalking-webui/skywalking-webui.iml +skywalking.iml +test/skywalking-agent-test/.idea/ +test/skywalking-agent-test/dubbo-test/ +test/skywalking-agent-test/jdbc-test/jdbc-test.iml +test/skywalking-agent-test/redis-test/redis-test.iml +test/skywalking-test-api/skywalking-test-api.iml +test/skywalking-test-api/target/ +skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/target/ +.gitignore +skywalking-collector/skywalking-log/logback-plugin/logback-plugin.iml diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def index 7f692d2b0..e3cf11127 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def @@ -1,4 +1,4 @@ -AbstractHttpClientPluginDefine -InternalHttpClientPluginDefine -MinimalHttpClientPluginDefine -DefaultRequestDirectorPluginDefine +com.ai.cloud.skywalking.httpClient.v4.plugin.define.AbstractHttpClientPluginDefine +com.ai.cloud.skywalking.httpClient.v4.plugin.define.InternalHttpClientPluginDefine +com.ai.cloud.skywalking.httpClient.v4.plugin.define.MinimalHttpClientPluginDefine +com.ai.cloud.skywalking.httpClient.v4.plugin.define.DefaultRequestDirectorPluginDefine diff --git a/test/skywalking-agent-test/jdbc-test/src/test/java/com/ai/cloud/skywalking/agent/test/mysql/JDBCPluginTest.java b/test/skywalking-agent-test/jdbc-test/src/test/java/com/ai/cloud/skywalking/agent/test/mysql/JDBCPluginTest.java index 95c85eb6d..f6c83b1c9 100644 --- a/test/skywalking-agent-test/jdbc-test/src/test/java/com/ai/cloud/skywalking/agent/test/mysql/JDBCPluginTest.java +++ b/test/skywalking-agent-test/jdbc-test/src/test/java/com/ai/cloud/skywalking/agent/test/mysql/JDBCPluginTest.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.agent.test.mysql; -import com.ai.skywalking.testframework.api.TraceTreeAssert; +import com.ai.skywalking.testframework.api.RequestSpanAssert; import org.junit.Test; import java.sql.Connection; @@ -25,13 +25,12 @@ public class JDBCPluginTest { p0.execute(); con.commit(); con.close(); - TraceTreeAssert.assertEquals(new String[][]{ - {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, - {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.commit"}, - {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.close"}, - }, true); + RequestSpanAssert.assertEquals( + new String[][] {{"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, + {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.commit"}, + {"0", "jdbc:mysql://127.0.0.1:3306/test?user=root&password=root(null)", "connection.close"},}, true); - TraceTreeAssert.clearTraceData(); + RequestSpanAssert.clearTraceData(); } @Test @@ -46,12 +45,11 @@ public class JDBCPluginTest { p0.execute(); con.commit(); con.close(); - TraceTreeAssert.assertEquals(new String[][]{ - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.commit"}, - {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.close"}, - }, true); + RequestSpanAssert.assertEquals( + new String[][] {{"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "preaparedStatement.executeUpdate:select 1 from dual where 1=?"}, + {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.commit"}, + {"0", "jdbc:oracle:thin:@10.1.130.239:1521:ora(edc_export)", "connection.close"},}, true); - TraceTreeAssert.clearTraceData(); + RequestSpanAssert.clearTraceData(); } } diff --git a/test/skywalking-agent-test/pom.xml b/test/skywalking-agent-test/pom.xml index f56667df0..c80ff5c02 100644 --- a/test/skywalking-agent-test/pom.xml +++ b/test/skywalking-agent-test/pom.xml @@ -1,65 +1,66 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.ai.cloud - skywalking-agent-test - pom - 1.0-Final + com.ai.cloud + skywalking-agent-test + pom + 1.0-Final - skywalking-agent-test - http://maven.apache.org + skywalking-agent-test + http://maven.apache.org - - redis-test - jdbc-test - + + redis-test + jdbc-test + dubbo-test + - - UTF-8 - + + UTF-8 + + + + + junit + junit + 4.12 + test + + + org.apache.logging.log4j + log4j-core + 2.4.1 + + + com.ai.cloud + skywalking-test-api + 1.0-Final + test + + + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + ${project.build.sourceEncoding} + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + - - - junit - junit - 4.12 - test - - - org.apache.logging.log4j - log4j-core - 2.4.1 - - - com.ai.cloud - skywalking-test-api - 1.0-Final - test - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - - diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java deleted file mode 100644 index dd12db848..000000000 --- a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.ai.cloud.skywalking.agent.test; - -import com.ai.skywalking.testframework.api.TraceTreeAssert; -import org.junit.After; -import org.junit.Test; - -public class RedisClusterPluginTest { - - @After - public void clearData(){ - TraceTreeAssert.clearTraceData(); - } - - - @Test - public void testSetData() { - RedisClusterOperator.setData("key1", "value1"); - TraceTreeAssert.assertEquals(new String[][]{ - // 根据实际情况进行修改 - {"0.0", "127.0.0.1:7001 set", "key=key1"}, - {"0", "127.0.0.1:7001;127.0.0.1:7000; set", "key=key1"}, - }); - - } - - @Test - public void testGetData() { - RedisClusterOperator.getData("key1"); - TraceTreeAssert.assertEquals(new String[][]{ - // 根据实际情况进行修改 - {"0.0", "127.0.0.1:7001 get", "key=key1"}, - {"0", "127.0.0.1:7001;127.0.0.1:7000; get", "key=key1"}, - }); - } - - - @Test - public void testDelData() { - RedisClusterOperator.delData("key1"); - TraceTreeAssert.assertEquals(new String[][]{ - // 根据实际情况进行修改 - {"0.0", "127.0.0.1:7001 del", "key=key1"}, - {"0", "127.0.0.1:7001;127.0.0.1:7000; del", "key=key1"}, - }); - } -} diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java b/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java deleted file mode 100644 index 2d6d285b6..000000000 --- a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ai.cloud.skywalking.agent.test; - -import com.ai.skywalking.testframework.api.TraceTreeAssert; - -import org.junit.After; -import org.junit.Test; - -public class RedisPluginTest { - - @After - public void clearData(){ - TraceTreeAssert.clearTraceData(); - } - - @Test - public void testSetData() throws Exception { - RedisOperator.setData("key1", "value1"); - TraceTreeAssert.assertEquals(new String[][]{ - {"0", "127.0.0.1:6379 set", "key=key1"}, - }); - } - - @Test - public void testGetData() throws Exception { - RedisOperator.getData("key1"); - TraceTreeAssert.assertEquals(new String[][]{ - {"0", "127.0.0.1:6379 get", "key=key1"}, - }); - } - - - @Test - public void testDelData() throws Exception { - RedisOperator.delData("key1"); - TraceTreeAssert.assertEquals(new String[][]{ - {"0", "127.0.0.1:6379 del", "key=key1"}, - }); - } -} diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java similarity index 100% rename from test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java rename to test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterOperator.java diff --git a/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java new file mode 100644 index 000000000..d6cf3424b --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisClusterPluginTest.java @@ -0,0 +1,40 @@ +package com.ai.cloud.skywalking.agent.test; + +import com.ai.skywalking.testframework.api.RequestSpanAssert; +import org.junit.After; +import org.junit.Test; + +public class RedisClusterPluginTest { + + @After + public void clearData() { + RequestSpanAssert.clearTraceData(); + } + + + @Test + public void testSetData() { + RedisClusterOperator.setData("key1", "value1"); + RequestSpanAssert.assertEquals(new String[][] { + // 根据实际情况进行修改 + {"0.0", "127.0.0.1:7001 set", "key=key1"}, {"0", "127.0.0.1:7001;127.0.0.1:7000; set", "key=key1"},}); + + } + + @Test + public void testGetData() { + RedisClusterOperator.getData("key1"); + RequestSpanAssert.assertEquals(new String[][] { + // 根据实际情况进行修改 + {"0.0", "127.0.0.1:7001 get", "key=key1"}, {"0", "127.0.0.1:7001;127.0.0.1:7000; get", "key=key1"},}); + } + + + @Test + public void testDelData() { + RedisClusterOperator.delData("key1"); + RequestSpanAssert.assertEquals(new String[][] { + // 根据实际情况进行修改 + {"0.0", "127.0.0.1:7001 del", "key=key1"}, {"0", "127.0.0.1:7001;127.0.0.1:7000; del", "key=key1"},}); + } +} diff --git a/test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java similarity index 100% rename from test/skywalking-agent-test/redis-test/src/main/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java rename to test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisOperator.java diff --git a/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java new file mode 100644 index 000000000..6a33f4007 --- /dev/null +++ b/test/skywalking-agent-test/redis-test/src/test/java/com/ai/cloud/skywalking/agent/test/RedisPluginTest.java @@ -0,0 +1,33 @@ +package com.ai.cloud.skywalking.agent.test; + + +import com.ai.skywalking.testframework.api.RequestSpanAssert; +import org.junit.After; +import org.junit.Test; + +public class RedisPluginTest { + + @After + public void clearData() { + RequestSpanAssert.clearTraceData(); + } + + @Test + public void testSetData() throws Exception { + RedisOperator.setData("key1", "value1"); + RequestSpanAssert.assertEquals(new String[][] {{"0", "127.0.0.1:6379 set", "key=key1"},}); + } + + @Test + public void testGetData() throws Exception { + RedisOperator.getData("key1"); + RequestSpanAssert.assertEquals(new String[][] {{"0", "127.0.0.1:6379 get", "key=key1"},}); + } + + + @Test + public void testDelData() throws Exception { + RedisOperator.delData("key1"); + RequestSpanAssert.assertEquals(new String[][] {{"0", "127.0.0.1:6379 del", "key=key1"},}); + } +} diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml b/test/skywalking-agent-test/redis-test/src/test/resources/log4j2.xml similarity index 100% rename from test/skywalking-agent-test/redis-test/src/main/resources/log4j2.xml rename to test/skywalking-agent-test/redis-test/src/test/resources/log4j2.xml diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/redis.conf b/test/skywalking-agent-test/redis-test/src/test/resources/redis.conf similarity index 100% rename from test/skywalking-agent-test/redis-test/src/main/resources/redis.conf rename to test/skywalking-agent-test/redis-test/src/test/resources/redis.conf diff --git a/test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth b/test/skywalking-agent-test/redis-test/src/test/resources/sky-walking.auth similarity index 100% rename from test/skywalking-agent-test/redis-test/src/main/resources/sky-walking.auth rename to test/skywalking-agent-test/redis-test/src/test/resources/sky-walking.auth