diff --git a/.travis.yml b/.travis.yml index f8d4a737c..bd48465a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,9 @@ sudo: required language: java -before_install: - - mkdir ci-dependencies - - cd ci-dependencies - - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/ojdbc14-10.2.0.4.0.jar - - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar - - cd .. install: - jdk_switcher use oraclejdk8 - - ./mvnw clean install -Ptravis-ci-submodule --quiet jacoco:report coveralls:report + - ./mvnw clean install --quiet jacoco:report coveralls:report - ./mvnw clean javadoc:javadoc -Dmaven.test.skip=true --quiet diff --git a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml index b70c1f362..2952b80ab 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml index e7ab92182..b7b844726 100644 --- a/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml index de28e2bfe..252b157ce 100644 --- a/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml +++ b/apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml index e9143dd19..27bd7c3f6 100644 --- a/apm-application-toolkit/apm-toolkit-opentracing/pom.xml +++ b/apm-application-toolkit/apm-toolkit-opentracing/pom.xml @@ -21,7 +21,7 @@ apm-application-toolkit org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/apm-toolkit-trace/pom.xml b/apm-application-toolkit/apm-toolkit-trace/pom.xml index 390fa6306..3e9fd16b5 100644 --- a/apm-application-toolkit/apm-toolkit-trace/pom.xml +++ b/apm-application-toolkit/apm-toolkit-trace/pom.xml @@ -20,7 +20,7 @@ apm-application-toolkit org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml index c3ce08a4f..8cdfd56ed 100644 --- a/apm-application-toolkit/pom.xml +++ b/apm-application-toolkit/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 apm-application-toolkit diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml index 948907d28..f9d478463 100644 --- a/apm-checkstyle/pom.xml +++ b/apm-checkstyle/pom.xml @@ -27,7 +27,7 @@ org.apache.skywalking apm-checkstyle - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT Module to hold Checkstyle for SkyWalking. diff --git a/apm-commons/apm-datacarrier/pom.xml b/apm-commons/apm-datacarrier/pom.xml index 93ad8905d..21cd1b44e 100644 --- a/apm-commons/apm-datacarrier/pom.xml +++ b/apm-commons/apm-datacarrier/pom.xml @@ -21,7 +21,7 @@ apm-commons org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml index 2603f92b4..370d22414 100644 --- a/apm-commons/apm-util/pom.xml +++ b/apm-commons/apm-util/pom.xml @@ -20,7 +20,7 @@ apm-commons org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-commons/pom.xml b/apm-commons/pom.xml index edf1c3b9c..ef4bf7ba6 100644 --- a/apm-commons/pom.xml +++ b/apm-commons/pom.xml @@ -20,7 +20,7 @@ apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-dist/pom.xml b/apm-dist/pom.xml index bbbfb8014..95e096ecd 100644 --- a/apm-dist/pom.xml +++ b/apm-dist/pom.xml @@ -17,12 +17,11 @@ ~ --> - + apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 @@ -82,12 +81,8 @@ - - + + diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml index 935d638dd..8654e8615 100644 --- a/apm-protocol/apm-network/pom.xml +++ b/apm-protocol/apm-network/pom.xml @@ -21,7 +21,7 @@ apm-protocol org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-protocol/pom.xml b/apm-protocol/pom.xml index 0b59e5d95..89dfa3e9a 100644 --- a/apm-protocol/pom.xml +++ b/apm-protocol/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index cc95d79bf..6bf8c9686 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -16,14 +16,13 @@ ~ --> - + 4.0.0 org.apache.skywalking apm-sniffer - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-agent-core @@ -214,8 +213,7 @@ - + @@ -231,7 +229,7 @@ - + @@ -240,22 +238,14 @@ package - - - - - - - - + + + + + + + + diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml index dd63db85d..eb1ab949f 100644 --- a/apm-sniffer/apm-agent/pom.xml +++ b/apm-sniffer/apm-agent/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-agent diff --git a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml index 52706f5e0..f7815fcfa 100644 --- a/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml index c3aa8fc0c..d062ece48 100644 --- a/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml index 7a2f96e47..6c10012dc 100644 --- a/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml index 95cedd091..2b4162ce3 100644 --- a/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml @@ -16,13 +16,11 @@ ~ limitations under the License. ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml index b7f401dde..2c83cfb61 100644 --- a/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/feign-default-http-9.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml index 6efc106e1..60c53ef19 100644 --- a/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-grpc-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml index 9aa4dfa86..7bb2dc1a9 100755 --- a/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml index 4657f8dd8..db3420389 100644 --- a/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-httpClient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml index 6e006cdb1..715545af2 100644 --- a/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/httpasyncclient-4.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-httpasyncclient-4.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml index d4967d724..d7a2630d8 100644 --- a/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml index 67266d617..ef5006793 100755 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml index d2c6e80a4..f4e6931b9 100644 --- a/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-jedis-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml index 71c0a02ac..60ce63482 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.0-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml index 36870b4ee..d554a9a98 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml index 5a1d01155..bf3117a52 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-server-9.x-plugin/pom.xml @@ -20,7 +20,7 @@ jetty-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml index cbdf65988..f7ae52aa8 100644 --- a/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT jetty-plugins diff --git a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml index bcb80c7a4..a1e9b217a 100644 --- a/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml index bf508fd58..4b28d747d 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml index 8c48f748d..ba2e2e32a 100644 --- a/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mongodb-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-mongodb-3.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml index c4c2e7daa..18591cec7 100644 --- a/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/motan-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml index 309afd9a4..a1dc32136 100755 --- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml index 1c2d5d55f..98a5d8f22 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/http-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml index 2cd2e1cd7..250a36f99 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/mvc-annotation-1.x-plugin/pom.xml @@ -20,7 +20,7 @@ nutz-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml index 04c39f7d5..094b38f18 100644 --- a/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/nutz-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT nutz-plugins diff --git a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml index f426bcec9..24514c413 100644 --- a/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/okhttp-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml deleted file mode 100755 index d8088c80a..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - apm-sdk-plugin - org.apache.skywalking - 6.0.0-alpha-SNAPSHOT - - 4.0.0 - - apm-oracle-10.x-plugin - jar - - oracle-10.x-plugin - http://maven.apache.org - - - UTF-8 - 10.2.0.4.0 - - - - - com.oracle - ojdbc14 - ${ojdbc14.version} - provided - - - org.apache.skywalking - apm-jdbc-commons - ${project.version} - provided - - - - - - - maven-deploy-plugin - - - - diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup deleted file mode 100644 index da58ddf94..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup +++ /dev/null @@ -1,76 +0,0 @@ - - - - - apm-sdk-plugin - org.apache.skywalking - 5.0.0-beta-SNAPSHOT - - 4.0.0 - - apm-oracle-10.x-plugin - jar - - oracle-10.x-plugin - http://maven.apache.org - - - UTF-8 - - - - - com.oracle - ojdbc14 - 10.2.0.4.0 - provided - - - org.apache.skywalking - apm-jdbc-commons - ${project.version} - provided - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - none - - jar - - - - - - - diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java deleted file mode 100644 index 3a4e72de0..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/Constants.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -/** - * Constants variables - * - * @author zhang xin - */ -public final class Constants { - public static final String STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.StatementExecuteMethodsInterceptor"; - - public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.PreparedStatementExecuteMethodsInterceptor"; -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java deleted file mode 100644 index d526ac506..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateCallableInterceptor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; - -public class CreateCallableInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - - } - - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "CallableStatement")); - } - return ret; - } - - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java deleted file mode 100644 index 9c8a2ba3b..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreatePreparedStatementInterceptor.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; - -public class CreatePreparedStatementInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - } - - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), (String)allArguments[0], "PreparedStatement")); - } - return ret; - } - - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java deleted file mode 100644 index ea2b95cad..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/CreateStatementInterceptor.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; - -public class CreateStatementInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - } - - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - Object ret) throws Throwable { - if (ret instanceof EnhancedInstance) { - ((EnhancedInstance)ret).setSkyWalkingDynamicField(new StatementEnhanceInfos((ConnectionInfo)objInst.getSkyWalkingDynamicField(), "", "Statement")); - } - return ret; - } - - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java deleted file mode 100644 index c85f2bc99..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/PreparedStatementExecuteMethodsInterceptor.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.tag.Tags; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; - -/** - * @author zhang xin - */ -public class PreparedStatementExecuteMethodsInterceptor implements InstanceMethodsAroundInterceptor { - - @Override - public final void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - if (cacheObject != null && cacheObject.getConnectionInfo() != null) { - ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); - - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); - Tags.DB_TYPE.set(span, "sql"); - Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); - Tags.DB_STATEMENT.set(span, cacheObject.getSql()); - span.setComponent(connectInfo.getComponent()); - SpanLayer.asDB(span); - } - } - - @Override - public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - - if (cacheObject != null && cacheObject.getConnectionInfo() != null) { - ContextManager.stopSpan(); - } - - return ret; - } - - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - if (cacheObject.getConnectionInfo() != null) { - ContextManager.activeSpan().errorOccurred().log(t); - } - } - - private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) { - return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName; - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java deleted file mode 100644 index b39fa3e48..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/StatementExecuteMethodsInterceptor.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle; - -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.tag.Tags; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.plugin.jdbc.define.StatementEnhanceInfos; -import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; - -public class StatementExecuteMethodsInterceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, Class[] argumentsTypes, - MethodInterceptResult result) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - if (cacheObject != null && cacheObject.getConnectionInfo() != null) { - ConnectionInfo connectInfo = cacheObject.getConnectionInfo(); - - AbstractSpan span = ContextManager.createExitSpan(buildOperationName(connectInfo, method.getName(), cacheObject.getStatementName()), connectInfo.getDatabasePeer()); - Tags.DB_TYPE.set(span, "sql"); - Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName()); - - String sql = ""; - if (allArguments.length > 0) { - sql = (String)allArguments[0]; - } - - Tags.DB_STATEMENT.set(span, sql); - span.setComponent(connectInfo.getComponent()); - - SpanLayer.asDB(span); - } - } - - @Override - public final Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, - Object ret) throws Throwable { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - if (cacheObject != null && cacheObject.getConnectionInfo() != null) { - ContextManager.stopSpan(); - } - return ret; - } - - @Override public final void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - StatementEnhanceInfos cacheObject = (StatementEnhanceInfos)objInst.getSkyWalkingDynamicField(); - if (cacheObject.getConnectionInfo() != null) { - ContextManager.activeSpan().errorOccurred().log(t); - } - } - - private String buildOperationName(ConnectionInfo connectionInfo, String methodName, String statementName) { - return connectionInfo.getDBType() + "/JDBI/" + statementName + "/" + methodName; - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java deleted file mode 100644 index f51b02d73..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/ConnectionInstrumentation.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; -import org.apache.skywalking.apm.plugin.jdbc.define.Constants; - -import static net.bytebuddy.matcher.ElementMatchers.named; -import static net.bytebuddy.matcher.ElementMatchers.takesArguments; - -/** - * {@link ConnectionInstrumentation} define that the oracle plugin intercept the following methods that the class which - * extend oracle.jdbc.driver.PhysicalConnection - * - * 1. Enhance prepareStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor - * 2. Enhance prepareCall by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor - * 3. Enhance createStatement by org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor - * 4. Enhance commit, rollback, close, releaseSavepoint by org.apache.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor - * - * @author zhangxin - */ -public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - public static final String ENHANCE_CLASS = "oracle.jdbc.driver.PhysicalConnection"; - public static final String PREPARED_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreatePreparedStatementInterceptor"; - public static final String CALLABLE_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateCallableInterceptor"; - public static final String CREATE_STATEMENT_INTERCEPT_CLASS = "org.apache.skywalking.apm.plugin.jdbc.oracle.CreateStatementInterceptor"; - public static final String T4C_CONNECTION_CLASS = "oracle.jdbc.driver.T4CConnection"; - - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[0]; - } - - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.PREPARE_STATEMENT_METHOD_NAME); - } - - @Override public String getMethodsInterceptor() { - return PREPARED_STATEMENT_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - }, - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.PREPARE_CALL_METHOD_NAME).and(takesArguments(3)); - } - - @Override public String getMethodsInterceptor() { - return CALLABLE_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - }, - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.CREATE_STATEMENT_METHOD_NAME).and(takesArguments(2)); - } - - @Override public String getMethodsInterceptor() { - return CREATE_STATEMENT_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - }, - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named(Constants.COMMIT_METHOD_NAME).or(named(Constants.ROLLBACK_METHOD_NAME)).or(named(Constants.CLOSE_METHOD_NAME)).or(named(Constants.RELEASE_SAVE_POINT_METHOD_NAME)); - } - - @Override public String getMethodsInterceptor() { - return Constants.SERVICE_METHOD_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override protected ClassMatch enhanceClass() { - return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, T4C_CONNECTION_CLASS); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java deleted file mode 100644 index 5cbbdc6b6..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/DriverInstrumentation.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; - -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; -import org.apache.skywalking.apm.plugin.jdbc.define.AbstractDriverInstrumentation; - -/** - * {@link DriverInstrumentation} presents that skywalking intercepts {@link oracle.jdbc.driver.OracleDriver}. - * - * @author zhangxin - */ -public class DriverInstrumentation extends AbstractDriverInstrumentation { - - @Override - protected ClassMatch enhanceClass() { - return NameMatch.byName("oracle.jdbc.driver.OracleDriver"); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java deleted file mode 100644 index 1c2e50ddb..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleCallableInstrumentation.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - -import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; - -public class OracleCallableInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OracleCallableStatement"; - public static final String CALLABLE_STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OracleCallableStatementWrapper"; - public static final String T4C_CALLABLE_STATMENT_CLASS = "oracle.jdbc.driver.T4CCallableStatement"; - - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[0]; - } - - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")); - } - - @Override public String getMethodsInterceptor() { - return PREPARED_STATEMENT_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override protected ClassMatch enhanceClass() { - return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, CALLABLE_STATEMENT_WRAPPER_CLASS, T4C_CALLABLE_STATMENT_CLASS); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java deleted file mode 100644 index 5aceca289..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OraclePrepareStatementInstrumentation.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - -import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.PREPARED_STATEMENT_INTERCEPT_CLASS; - -public class OraclePrepareStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OraclePreparedStatement"; - public static final String PREPARED_STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OraclePreparedStatementWrapper"; - public static final String T4C_PREPARED_STATEMENT_CLASS = "oracle.jdbc.driver.T4CPreparedStatement"; - - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[0]; - } - - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")); - } - - @Override public String getMethodsInterceptor() { - return PREPARED_STATEMENT_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override protected ClassMatch enhanceClass() { - return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, PREPARED_STATEMENT_WRAPPER_CLASS, T4C_PREPARED_STATEMENT_CLASS); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java deleted file mode 100644 index 20784ac8c..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/oracle/define/OracleStatementInstrumentation.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.jdbc.oracle.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMatch; - -import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.plugin.jdbc.oracle.Constants.STATEMENT_INTERCEPT_CLASS; - -public class OracleStatementInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - public static final String ENHANCE_CLASS = "oracle.jdbc.driver.OracleStatement"; - public static final String STATEMENT_WRAPPER_CLASS = "oracle.jdbc.driver.OracleStatementWrapper"; - public static final String T4C_STATEMENT_CLASS = "oracle.jdbc.driver.T4CStatement"; - - @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[0]; - } - - @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override public ElementMatcher getMethodsMatcher() { - return named("execute") - .or(named("executeQuery")) - .or(named("executeUpdate")) - .or(named("executeLargeUpdate")) - .or(named("executeBatchInternal")) - .or(named("executeUpdateInternal")) - .or(named("executeQuery")); - } - - @Override public String getMethodsInterceptor() { - return STATEMENT_INTERCEPT_CLASS; - } - - @Override public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override protected ClassMatch enhanceClass() { - return MultiClassNameMatch.byMultiClassMatch(ENHANCE_CLASS, STATEMENT_WRAPPER_CLASS, T4C_STATEMENT_CLASS); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def deleted file mode 100644 index ee8597f64..000000000 --- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/src/main/resources/skywalking-plugin.def +++ /dev/null @@ -1,21 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.DriverInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.ConnectionInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleCallableInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OraclePrepareStatementInstrumentation -oracle-10.x=org.apache.skywalking.apm.plugin.jdbc.oracle.define.OracleStatementInstrumentation diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index ff75c971c..ef555b379 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sniffer - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-sdk-plugin @@ -169,43 +169,4 @@ - - - - - include-ojdbc - - - ${basedir}/../../ci-dependencies/ojdbc14-10.2.0.4.0.jar - - - - oracle-10.x-plugin - - - - - include-resin-3 - - - ${basedir}/../../ci-dependencies/resin-3.0.9.jar - - - - resin-3.x-plugin - - - - - include-resin-4 - - - ${basedir}/../../ci-dependencies/resin-4.0.41.jar - - - - resin-4.x-plugin - - - diff --git a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml index 1b8dff661..08aee5e5b 100755 --- a/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml deleted file mode 100644 index eb59f1f39..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - 4.0.0 - - - apm-sdk-plugin - org.apache.skywalking - 6.0.0-alpha-SNAPSHOT - - - apm-resin-3.x-plugin - jar - - resin-3.x-plugin - http://maven.apache.org - - - UTF-8 - 3.0.9 - 3.0.1 - - - - - com.caucho - resin - ${resin.version} - provided - - - javax.servlet - javax.servlet-api - ${javax-servlet-api.version} - provided - - - diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup deleted file mode 100644 index 34b60bb84..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup +++ /dev/null @@ -1,75 +0,0 @@ - - - - - 4.0.0 - - - apm-sdk-plugin - org.apache.skywalking - 5.0.0-beta-SNAPSHOT - - - apm-resin-3.x-plugin - jar - - resin-3.x-plugin - http://maven.apache.org - - - UTF-8 - - - - - com.caucho - resin - 3.0.9 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - none - - jar - - - - - - - diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java deleted file mode 100644 index e61fbe7f2..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3Interceptor.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.plugin.resin.v3; - -import com.caucho.server.connection.CauchoRequest; -import com.caucho.server.http.HttpResponse; -import java.lang.reflect.Method; -import org.apache.skywalking.apm.agent.core.context.ContextCarrier; -import org.apache.skywalking.apm.agent.core.context.tag.Tags; -import org.apache.skywalking.apm.agent.core.context.CarrierItem; -import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; - -/** - * @author baiyang - */ -public class ResinV3Interceptor implements InstanceMethodsAroundInterceptor { - - @Override public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - CauchoRequest request = (CauchoRequest)allArguments[0]; - ContextCarrier contextCarrier = new ContextCarrier(); - CarrierItem next = contextCarrier.items(); - while (next.hasNext()) { - next = next.next(); - next.setHeadValue(request.getHeader(next.getHeadKey())); - } - - AbstractSpan span = ContextManager.createEntrySpan(request.getPageURI(), contextCarrier); - span.setComponent(ComponentsDefine.RESIN); - Tags.URL.set(span, appendRequestURL(request)); - SpanLayer.asHttp(span); - } - - @Override public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - HttpResponse response = (HttpResponse)allArguments[1]; - AbstractSpan span = ContextManager.activeSpan(); - - if (response.getStatusCode() >= 400) { - Tags.STATUS_CODE.set(span, Integer.toString(response.getStatusCode())); - span.errorOccurred(); - } - ContextManager.stopSpan(); - return ret; - } - - @Override - public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - AbstractSpan activeSpan = ContextManager.activeSpan(); - activeSpan.log(t); - activeSpan.errorOccurred(); - } - - /** - * Append request URL. - * - * @param request - * @return - */ - private String appendRequestURL(CauchoRequest request) { - StringBuffer sb = new StringBuffer(); - sb.append(request.getScheme()); - sb.append("://"); - sb.append(request.getServerName()); - sb.append(":"); - sb.append(request.getServerPort()); - sb.append(request.getPageURI()); - return sb.toString(); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java deleted file mode 100644 index 59d773082..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v3/define/ResinV3Instrumentation.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.resin.v3.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; -import org.apache.skywalking.apm.agent.core.plugin.match.NameMatch; - -import static net.bytebuddy.matcher.ElementMatchers.named; - -public class ResinV3Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { - - private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation"; - - private static final String METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.resin.v3.ResinV3Interceptor"; - - @Override - protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return null; - } - - @Override - protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("service"); - } - - @Override - public String getMethodsInterceptor() { - return METHOD_INTERCET_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override - protected ClassMatch enhanceClass() { - return NameMatch.byName(ENHANCE_CLASS); - } - - @Override - protected String[] witnessClasses() { - return new String[] {"com.caucho.server.connection.AbstractHttpResponse"}; - } -} diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def deleted file mode 100644 index 22d888e30..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/main/resources/skywalking-plugin.def +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resin-3.x=org.apache.skywalking.apm.plugin.resin.v3.define.ResinV3Instrumentation diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java deleted file mode 100644 index e2d458347..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v3/ResinV3InterceptorTest.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.plugin.resin.v3; - -import com.caucho.server.connection.CauchoRequest; -import com.caucho.server.http.HttpResponse; -import java.util.List; -import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; -import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper; -import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; -import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; -import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; -import org.apache.skywalking.apm.agent.test.tools.SpanAssert; -import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; -import org.hamcrest.MatcherAssert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.when; -import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent; - -/** - * ResinInterceptorTest - * - * @author baiyang - */ -@RunWith(PowerMockRunner.class) -@PowerMockRunnerDelegate(TracingSegmentRunner.class) -public class ResinV3InterceptorTest { - private ResinV3Interceptor interceptor; - @SegmentStoragePoint - private SegmentStorage segmentStorage; - - @Rule - public AgentServiceRule serviceRule = new AgentServiceRule(); - - @Mock - private CauchoRequest request; - @Mock - private HttpResponse response; - @Mock - private MethodInterceptResult methodInterceptResult; - - private Object[] arguments; - private Class[] argumentType; - - @Mock - private EnhancedInstance enhancedInstance; - - @Before - public void setUp() throws Exception { - interceptor = new ResinV3Interceptor(); - when(request.getPageURI()).thenReturn("/test/testRequestURL"); - when(request.getScheme()).thenReturn("http"); - when(request.getServerName()).thenReturn("localhost"); - when(request.getServerPort()).thenReturn(8080); - when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/test/testRequestURL")); - when(response.getStatusCode()).thenReturn(200); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; - } - - @Test - public void testWithoutSerializedContextData() throws Throwable { - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - } - - @Test - public void testWithSerializedContextData() throws Throwable { - when(request.getHeader(SW3CarrierItem.HEADER_NAME)).thenReturn("1.333.2345|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*"); - - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - assertTraceSegmentRef(traceSegment.getRefs().get(0)); - } - - @Test - public void testWithOccurException() throws Throwable { - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.handleMethodException(enhancedInstance, null, arguments, argumentType, new RuntimeException()); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - List logDataEntities = SpanHelper.getLogs(spans.get(0)); - assertThat(logDataEntities.size(), is(1)); - SpanAssert.assertException(logDataEntities.get(0), RuntimeException.class); - } - - private void assertTraceSegmentRef(TraceSegmentRef ref) { - MatcherAssert.assertThat(SegmentRefHelper.getSpanId(ref), is(3)); - assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1)); - MatcherAssert.assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.333.2345")); - } - - private void assertHttpSpan(AbstractTracingSpan span) { - assertThat(span.getOperationName(), is("/test/testRequestURL")); - assertComponent(span, ComponentsDefine.RESIN); - SpanAssert.assertTag(span, 0, "http://localhost:8080/test/testRequestURL"); - assertThat(span.isEntry(), is(true)); - SpanAssert.assertLayer(span, SpanLayer.HTTP); - } - -} diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml deleted file mode 100644 index 329d3a2eb..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - 4.0.0 - - - apm-sdk-plugin - org.apache.skywalking - 6.0.0-alpha-SNAPSHOT - - - apm-resin-4.x-plugin - jar - - resin-4.x-plugin - http://maven.apache.org - - - UTF-8 - 4.0.41 - 3.0.1 - - - - - com.caucho - resin - ${resin.version} - provided - - - javax.servlet - javax.servlet-api - ${javax-servlet-api.version} - provided - - - diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup deleted file mode 100644 index 5579a4417..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup +++ /dev/null @@ -1,76 +0,0 @@ - - - - - 4.0.0 - - - apm-sdk-plugin - org.apache.skywalking - 5.0.0-beta-SNAPSHOT - - - apm-resin-4.x-plugin - jar - - resin-4.x-plugin - http://maven.apache.org - - - UTF-8 - - - - - com.caucho - resin - 4.0.41 - provided - - - javax.servlet - javax.servlet-api - 3.0.1 - provided - - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - none - - jar - - - - - - - - diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java deleted file mode 100644 index 6665077a0..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4Interceptor.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.plugin.resin.v4; - -import com.caucho.server.http.CauchoRequest; -import java.lang.reflect.Method; -import javax.servlet.http.HttpServletResponse; -import org.apache.skywalking.apm.agent.core.context.ContextCarrier; -import org.apache.skywalking.apm.agent.core.context.tag.Tags; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.core.context.CarrierItem; -import org.apache.skywalking.apm.agent.core.context.ContextManager; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractSpan; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; - -/** - * Created by Baiyang on 2017/5/2. - */ -public class ResinV4Interceptor implements InstanceMethodsAroundInterceptor { - @Override - public void beforeMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, MethodInterceptResult result) throws Throwable { - CauchoRequest request = (CauchoRequest)allArguments[0]; - ContextCarrier contextCarrier = new ContextCarrier(); - CarrierItem next = contextCarrier.items(); - while (next.hasNext()) { - next = next.next(); - next.setHeadValue(request.getHeader(next.getHeadKey())); - } - AbstractSpan span = ContextManager.createEntrySpan(request.getPageURI(), contextCarrier); - span.setComponent(ComponentsDefine.RESIN); - Tags.URL.set(span, appendRequestURL(request)); - SpanLayer.asHttp(span); - - } - - @Override - public Object afterMethod(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Object ret) throws Throwable { - HttpServletResponse response = (HttpServletResponse)allArguments[1]; - AbstractSpan span = ContextManager.activeSpan(); - - if (response.getStatus() >= 400) { - Tags.STATUS_CODE.set(span, Integer.toString(response.getStatus())); - span.errorOccurred(); - } - ContextManager.stopSpan(); - return ret; - } - - @Override public void handleMethodException(EnhancedInstance objInst, Method method, Object[] allArguments, - Class[] argumentsTypes, Throwable t) { - AbstractSpan activeSpan = ContextManager.activeSpan(); - activeSpan.log(t); - activeSpan.errorOccurred(); - } - - /** - * Append request URL. - * - * @param request - * @return - */ - private String appendRequestURL(CauchoRequest request) { - StringBuffer sb = new StringBuffer(); - sb.append(request.getScheme()); - sb.append("://"); - sb.append(request.getServerName()); - sb.append(":"); - sb.append(request.getServerPort()); - sb.append(request.getPageURI()); - return sb.toString(); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java deleted file mode 100644 index 915d2a932..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/resin/v4/define/ResinV4Instrumentation.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.plugin.resin.v4.define; - -import net.bytebuddy.description.method.MethodDescription; -import net.bytebuddy.matcher.ElementMatcher; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch; - -import static net.bytebuddy.matcher.ElementMatchers.named; -import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName; - -public class ResinV4Instrumentation extends ClassInstanceMethodsEnhancePluginDefine { - private static final String ENHANCE_CLASS = "com.caucho.server.dispatch.ServletInvocation"; - - private static final String METHOD_INTERCET_CLASS = "org.apache.skywalking.apm.plugin.resin.v4.ResinV4Interceptor"; - - @Override - protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return null; - } - - @Override - protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] { - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("service"); - } - - @Override - public String getMethodsInterceptor() { - return METHOD_INTERCET_CLASS; - } - - @Override - public boolean isOverrideArgs() { - return false; - } - } - }; - } - - @Override - protected ClassMatch enhanceClass() { - return byName(ENHANCE_CLASS); - } - - @Override - protected String[] witnessClasses() { - return new String[] {"com.caucho.server.http.HttpServletResponseImpl"}; - } -} diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def deleted file mode 100644 index 781a23af5..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/main/resources/skywalking-plugin.def +++ /dev/null @@ -1,17 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resin-4.x=org.apache.skywalking.apm.plugin.resin.v4.define.ResinV4Instrumentation diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java deleted file mode 100644 index e5b5ac1f1..000000000 --- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/resin/v4/ResinV4InterceptorTest.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - - -package org.apache.skywalking.apm.plugin.resin.v4; - -import com.caucho.server.http.CauchoRequest; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.apache.skywalking.apm.agent.core.context.SW3CarrierItem; -import org.apache.skywalking.apm.agent.core.context.trace.SpanLayer; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance; -import org.apache.skywalking.apm.agent.test.helper.SegmentHelper; -import org.apache.skywalking.apm.agent.test.helper.SpanHelper; -import org.apache.skywalking.apm.agent.test.tools.SegmentStorage; -import org.apache.skywalking.apm.agent.test.tools.SegmentStoragePoint; -import org.apache.skywalking.apm.agent.test.tools.SpanAssert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.powermock.modules.junit4.PowerMockRunner; -import org.powermock.modules.junit4.PowerMockRunnerDelegate; -import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan; -import org.apache.skywalking.apm.agent.core.context.trace.LogDataEntity; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment; -import org.apache.skywalking.apm.agent.core.context.trace.TraceSegmentRef; -import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult; -import org.apache.skywalking.apm.agent.test.helper.SegmentRefHelper; -import org.apache.skywalking.apm.agent.test.tools.AgentServiceRule; -import org.apache.skywalking.apm.agent.test.tools.TracingSegmentRunner; -import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Mockito.when; -import static org.apache.skywalking.apm.agent.test.tools.SpanAssert.assertComponent; - -/** - * Created by Baiyang on 2017/5/6. - */ -@RunWith(PowerMockRunner.class) -@PowerMockRunnerDelegate(TracingSegmentRunner.class) -public class ResinV4InterceptorTest { - private ResinV4Interceptor interceptor; - - @SegmentStoragePoint - private SegmentStorage segmentStorage; - - @Rule - public AgentServiceRule serviceRule = new AgentServiceRule(); - - @Mock - private CauchoRequest request; - @Mock - private HttpServletResponse response; - @Mock - private MethodInterceptResult methodInterceptResult; - - private Object[] arguments; - private Class[] argumentType; - - @Mock - private EnhancedInstance enhancedInstance; - - @Before - public void setUp() throws Exception { - - interceptor = new ResinV4Interceptor(); - - when(request.getPageURI()).thenReturn("/test/testRequestURL"); - when(request.getScheme()).thenReturn("http"); - when(request.getServerName()).thenReturn("localhost"); - when(request.getServerPort()).thenReturn(8080); - when(request.getRequestURI()).thenReturn("/test/testRequestURL"); - when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/test/testRequestURL")); - when(response.getStatus()).thenReturn(200); - arguments = new Object[] {request, response}; - argumentType = new Class[] {request.getClass(), response.getClass()}; - } - - @Test - public void testWithoutSerializedContextData() throws Throwable { - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - } - - @Test - public void testWithSerializedContextData() throws Throwable { - when(request.getHeader(SW3CarrierItem.HEADER_NAME)).thenReturn("1.444.555|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*"); - - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - assertTraceSegmentRef(traceSegment.getRefs().get(0)); - } - - @Test - public void testWithOccurException() throws Throwable { - interceptor.beforeMethod(enhancedInstance, null, arguments, argumentType, methodInterceptResult); - interceptor.handleMethodException(enhancedInstance, null, arguments, argumentType, new RuntimeException()); - interceptor.afterMethod(enhancedInstance, null, arguments, argumentType, null); - - assertThat(segmentStorage.getTraceSegments().size(), is(1)); - TraceSegment traceSegment = segmentStorage.getTraceSegments().get(0); - List spans = SegmentHelper.getSpans(traceSegment); - - assertHttpSpan(spans.get(0)); - List logDataEntities = SpanHelper.getLogs(spans.get(0)); - assertThat(logDataEntities.size(), is(1)); - SpanAssert.assertException(logDataEntities.get(0), RuntimeException.class); - } - - private void assertTraceSegmentRef(TraceSegmentRef ref) { - assertThat(SegmentRefHelper.getEntryApplicationInstanceId(ref), is(1)); - assertThat(SegmentRefHelper.getSpanId(ref), is(3)); - assertThat(SegmentRefHelper.getTraceSegmentId(ref).toString(), is("1.444.555")); - } - - private void assertHttpSpan(AbstractTracingSpan span) { - assertThat(span.getOperationName(), is("/test/testRequestURL")); - assertComponent(span, ComponentsDefine.RESIN); - SpanAssert.assertTag(span, 0, "http://localhost:8080/test/testRequestURL"); - assertThat(span.isEntry(), is(true)); - SpanAssert.assertLayer(span, SpanLayer.HTTP); - } -} diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml index e5492ddda..0575b1789 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-3.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml index 8d8232452..42714fb0f 100644 --- a/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/rocketMQ-4.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml index 93e2a2936..10b6314c2 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml index d35f25114..957af2556 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-0.x-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + servicecomb-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml index 7c4322ab3..74437c9c1 100644 --- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + servicecomb-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml index f41ccda35..5d4cec4eb 100644 --- a/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sharding-jdbc-1.5.x-plugin/pom.xml @@ -21,7 +21,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml index 2222975b8..c19eb4c1c 100644 --- a/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/sofarpc-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml index 2d836b315..ff9326de3 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/concurrent-util-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml index 7947bd636..365fa0a0a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/pom.xml @@ -21,7 +21,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml index 766ef03e2..5fd201abd 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-3.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml index ba7ac3360..4248dcef7 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml index 143b425ff..ffe1883f1 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-commons/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml index c114fcede..b49c68aa4 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT spring-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml index 8c3218a3f..a62b10aff 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/pom.xml @@ -20,7 +20,7 @@ spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml index 912f3e1d0..2ae59e931 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking spring-cloud - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT netflix-plugins diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml index 71e65327e..10a7c0639 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/netflix-plugins/spring-cloud-feign-1.x-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking netflix-plugins - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-spring-cloud-feign-1.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml index 78ddb96f1..2d42db26a 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-cloud/pom.xml @@ -23,7 +23,7 @@ org.apache.skywalking spring-plugins - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT spring-cloud diff --git a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml index 1275fe7a6..c1d88e34a 100644 --- a/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spymemcached-2.x-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-spymemcached-2.x-plugin diff --git a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml index 448cb90c2..508a7ea85 100644 --- a/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/struts2-2.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml index 1f696db1e..32d103fdd 100644 --- a/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/tomcat-7.x-8.x-plugin/pom.xml @@ -20,7 +20,7 @@ apm-sdk-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml index 85b33a70d..ced7df7b3 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/pom.xml @@ -17,15 +17,13 @@ ~ --> - + 4.0.0 org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT undertow-plugins diff --git a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml index 2370a4da6..d298bcbf1 100644 --- a/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/undertow-plugins/undertow-2.x-plugin/pom.xml @@ -16,13 +16,11 @@ ~ --> - + undertow-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml index 791d7ec65..e042aadaf 100644 --- a/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/xmemcached-2.x-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.skywalking apm-sdk-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-xmemcached-2.x-plugin diff --git a/apm-sniffer/apm-test-tools/pom.xml b/apm-sniffer/apm-test-tools/pom.xml index bf4eaf6f3..25eaa54be 100644 --- a/apm-sniffer/apm-test-tools/pom.xml +++ b/apm-sniffer/apm-test-tools/pom.xml @@ -22,7 +22,7 @@ org.apache.skywalking apm-sniffer - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT apm-test-tools diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml index e1dfc473d..ae02f28a2 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-1.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml index 701ebd7d2..8d2a300d8 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-log4j-2.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml index 30f0475e0..638179c51 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-logback-1.x-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml index c3fac6c84..fa3f99ecd 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml index 368664ce9..79296c082 100644 --- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/pom.xml @@ -21,7 +21,7 @@ apm-toolkit-activation org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml index dbde36fff..fc2370531 100644 --- a/apm-sniffer/apm-toolkit-activation/pom.xml +++ b/apm-sniffer/apm-toolkit-activation/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml index 8640d285f..bb3b8f420 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/pom.xml @@ -21,7 +21,7 @@ optional-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 pom diff --git a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml index 79a4622d2..ab0dd5866 100644 --- a/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/optional-spring-plugins/spring-annotation-plugin/pom.xml @@ -21,7 +21,7 @@ optional-spring-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 jar diff --git a/apm-sniffer/optional-plugins/pom.xml b/apm-sniffer/optional-plugins/pom.xml index 023545f24..ac274029d 100644 --- a/apm-sniffer/optional-plugins/pom.xml +++ b/apm-sniffer/optional-plugins/pom.xml @@ -21,7 +21,7 @@ apm-sniffer org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml index ac0fee74c..40ceb0f20 100644 --- a/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml +++ b/apm-sniffer/optional-plugins/trace-ignore-plugin/pom.xml @@ -16,12 +16,11 @@ ~ --> - + optional-plugins org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml index ceca9d6ee..f373e3ddb 100644 --- a/apm-sniffer/pom.xml +++ b/apm-sniffer/pom.xml @@ -21,7 +21,7 @@ apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml index da9c65156..405058c09 100644 --- a/apm-webapp/pom.xml +++ b/apm-webapp/pom.xml @@ -17,13 +17,11 @@ ~ --> - + apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java b/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java deleted file mode 100644 index 013d96d3f..000000000 --- a/apm-webapp/src/test/java/org/apache/skywalking/apm/webapp/proxy/RewritePathFilterTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.apache.skywalking.apm.webapp.proxy; - -import com.netflix.zuul.context.RequestContext; -import org.junit.Before; -import org.junit.Test; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; -import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_DECORATION_FILTER_ORDER; - -public class RewritePathFilterTest { - - private RewritePathFilter filter = new RewritePathFilter(); - - @Before - public void init() { - filter.setPath("/graphql"); - } - - @Test - public void filterOrder() { - assertThat(filter.filterOrder(), is(PRE_DECORATION_FILTER_ORDER + 2)); - } - - @Test - public void filterType() { - assertThat(filter.filterType(), is("pre")); - } - - @Test - public void shouldFilter() { - assertFalse(filter.shouldFilter()); - RequestContext.getCurrentContext().set("requestURI"); - assertTrue(filter.shouldFilter()); - } - - @Test - public void run() { - filter.run(); - assertThat(RequestContext.getCurrentContext().get("requestURI"), is("/graphql")); - } -} \ No newline at end of file diff --git a/docs/en/guides/How-to-build.md b/docs/en/guides/How-to-build.md index dfc94a394..25059cedb 100644 --- a/docs/en/guides/How-to-build.md +++ b/docs/en/guides/How-to-build.md @@ -95,11 +95,3 @@ This document helps people to compile and build the project in your maven and se 6. Run `maven update`. Must remove the clean projects item before maven update(This will be clear the proto conversion Java file generated by the complie) 7. Run `./mvnw compile` complie collector-remote-grpc-provider and apm-protocol 8. Refresh project - -## Building Resin-3, Resin-4, and OJDBC sdk plugins -Due to license incompatibilities/restrictions these plugins under `apm-sniffer/apm-sdk-plugin/` are not built by default. -Download them manually into the `ci-dependencies/` directory and the plugins will be included in the maven reactor and built. -The names of the artifacts downloaded and placed in the `ci-dependencies/` directory must be exact: -* resin-3.0.9.jar -* resin-4.0.41.jar -* ojdbc14-10.2.0.4.0.jar diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md index b46fc940e..60f8635af 100644 --- a/docs/en/guides/How-to-release.md +++ b/docs/en/guides/How-to-release.md @@ -36,12 +36,12 @@ Use the following block as a template and place it in ~/.m2/settings.xml ## Prepare the release ``` ./mvnw release:clean -./mvnw release:prepare -DautoVersionSubmodules=true +./mvnw release:prepare -DautoVersionSubmodules=true -Pauto-submodule ``` ## Stage the release ``` -./mvnw release:perform -DskipTests -Ptravis-ci-submodule +./mvnw release:perform -DskipTests -Pauto-submodule ``` 1. Set version number as x.y.z, and tag as vx.y.z 1. The release will automatically be inserted into a temporary staging repository for you. @@ -50,7 +50,6 @@ Use the following block as a template and place it in ~/.m2/settings.xml ```shell switch to release version tag export RELEASE_VERSION=x.y.z (example: RELEASE_VERSION=5.0.0-alpha) -export RELEASE_ROUND=1 (example: RELEASE_ROUND=1) cd tools/releasing sh create_source_release.sh ``` @@ -78,7 +77,7 @@ with .asc, .sha512, .md5 1. Upload distribution package to the folder with .asc, .sha512 * Package name: apache-skywalking-incubating-x.y.z.tar.gz, apache-skywalking-incubating-x.y.z.zip * See Section "Find and download distribution in Apache Nexus Staging repositories" for more details -    * Create .sha512 package: `shasum -a 512 file > file.sha512` + * Create .sha512 package: `shasum -a 512 file > file.sha512` 1. Upload gpg public key, named KEY ## Make the internal announcements @@ -120,6 +119,7 @@ Release CommitID : * Git submodule * skywalking-ui: https://github.com/apache/incubator-skywalking-ui/tree/(Git Commit ID) * apm-protocol/apm-network/src/main/proto: https://github.com/apache/incubator-skywalking-data-collect-protocol/tree/(Git Commit ID) + * oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol https://github.com/apache/incubator-skywalking-query-protocol/tree/(Git Commit ID) Keys to verify the Release Candidate : @@ -127,7 +127,7 @@ Keys to verify the Release Candidate : Guide to build the release from source : - * https://github.com/apache/incubator-skywalking/blob/master/docs/en/How-to-build.md + * https://github.com/apache/incubator-skywalking/blob/x.y.z/docs/en/guides/How-to-build.md A vote regarding the quality of this test build will be initiated within the next couple of days. @@ -173,6 +173,7 @@ Release CommitID : * Git submodule * skywalking-ui: https://github.com/apache/incubator-skywalking-ui/tree/(Git Commit ID) * apm-protocol/apm-network/src/main/proto: https://github.com/apache/incubator-skywalking-data-collect-protocol/tree/(Git Commit ID) + * oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol https://github.com/apache/incubator-skywalking-query-protocol/tree/(Git Commit ID) Keys to verify the Release Candidate : @@ -180,7 +181,7 @@ Keys to verify the Release Candidate : Guide to build the release from source : - * https://github.com/apache/incubator-skywalking/blob/master/docs/en/How-to-build.md + * https://github.com/apache/incubator-skywalking/blob/x.y.z/docs/en/guides/How-to-build.md Voting will start now (xxxx date) and will remain open for at least 72 hours, Request all PPMC members to give their vote. [ ] +1 Release this package. @@ -255,6 +256,7 @@ Release CommitID : * Git submodule * skywalking-ui: https://github.com/apache/incubator-skywalking-ui/tree/(Git Commit ID) * apm-protocol/apm-network/src/main/proto: https://github.com/apache/incubator-skywalking-data-collect-protocol/tree/(Git Commit ID) + * oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol https://github.com/apache/incubator-skywalking-query-protocol/tree/(Git Commit ID) Keys to verify the Release Candidate : @@ -262,7 +264,7 @@ Keys to verify the Release Candidate : Guide to build the release from source : - * https://github.com/apache/incubator-skywalking/blob/master/docs/en/How-to-build.md + * https://github.com/apache/incubator-skywalking/blob/x.y.z/docs/en/guides/How-to-build.md Voting will start now (xxxx date) and will remain open for at least 72 hours, Request IPMC to give their vote. [ ] +1 Release this package. diff --git a/docs/en/setup/service-agent/java-agent/Supported-list.md b/docs/en/setup/service-agent/java-agent/Supported-list.md index b2fc63ed3..f3d9b9cad 100644 --- a/docs/en/setup/service-agent/java-agent/Supported-list.md +++ b/docs/en/setup/service-agent/java-agent/Supported-list.md @@ -54,6 +54,7 @@ * [Elastic Job](https://github.com/elasticjob/elastic-job) 2.x * OpenTracing community supported -¹Required dependencies for these components must be first manually downloaded before being built, due to license incompatibilities. For this reason these components are not by default included in the SkyWalking releases. +¹Due to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository, + go to [OpenSkywalking java plugin extension repository](https://github.com/OpenSkywalking/java-plugin-extensions) to get these. ²These plugins affect the performance or must be used under some conditions, from experiences. So only released in `/optional-plugins`, copy to `/plugins` in order to make them work. diff --git a/docs/en/setup/service-agent/java-agent/agent-optional-plugins/Oracle-Resin-plugins.md b/docs/en/setup/service-agent/java-agent/agent-optional-plugins/Oracle-Resin-plugins.md index 377667993..145ef5013 100644 --- a/docs/en/setup/service-agent/java-agent/agent-optional-plugins/Oracle-Resin-plugins.md +++ b/docs/en/setup/service-agent/java-agent/agent-optional-plugins/Oracle-Resin-plugins.md @@ -2,10 +2,5 @@ These plugins can't be provided in Apache release because of Oracle and Resin Licenses. If you want to know details, please read [Apache license legal document](https://www.apache.org/legal/resolved.html) -- How should we build these optional plugins in local? - -1. Resin 3: Download Resin 3.0.9 and place the jar at `/ci-dependencies/resin-3.0.9.jar`. -1. Resin 4: Download Resin 4.0.41 and place the jar at `/ci-dependencies/resin-4.0.41.jar`. -1. Oracle: Download Oracle OJDBC-14 Driver 10.2.0.4.0 and place the jar at `/ci-dependencies/ojdbc14-10.2.0.4.0.jar`. - -If you have troubles for finding these files, find them [here](https://github.com/OpenSkywalking/skywalking-ci-assist/tree/master/jars) +Due to license incompatibilities/restrictions these plugins are hosted and released in 3rd part repository, +go to [OpenSkywalking java plugin extension repository](https://github.com/OpenSkywalking/java-plugin-extensions) to get these. diff --git a/oap-server/pom.xml b/oap-server/pom.xml index a722022a4..81d5b89f8 100644 --- a/oap-server/pom.xml +++ b/oap-server/pom.xml @@ -17,13 +17,11 @@ ~ --> - + apm org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-alarm-plugin/pom.xml b/oap-server/server-alarm-plugin/pom.xml index 14fea192e..ea1e1e9fe 100644 --- a/oap-server/server-alarm-plugin/pom.xml +++ b/oap-server/server-alarm-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml index 49fb18b9c..4b40e2ad4 100644 --- a/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-kubernetes-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-cluster-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml index c1269ae81..6830ed6d6 100644 --- a/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-standalone-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-cluster-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml index 0ba6843d0..bbe3b6ae4 100644 --- a/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/cluster-zookeeper-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + org.apache.skywalking server-cluster-plugin - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-cluster-plugin/pom.xml b/oap-server/server-cluster-plugin/pom.xml index 2e6598061..d23af7a3e 100644 --- a/oap-server/server-cluster-plugin/pom.xml +++ b/oap-server/server-cluster-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml index b9b915406..9669ca019 100644 --- a/oap-server/server-core/pom.xml +++ b/oap-server/server-core/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-buffer/pom.xml b/oap-server/server-library/library-buffer/pom.xml index 852e31632..4ea880d5d 100644 --- a/oap-server/server-library/library-buffer/pom.xml +++ b/oap-server/server-library/library-buffer/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-client/pom.xml b/oap-server/server-library/library-client/pom.xml index 26cc854b1..b590aebc5 100644 --- a/oap-server/server-library/library-client/pom.xml +++ b/oap-server/server-library/library-client/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-module/pom.xml b/oap-server/server-library/library-module/pom.xml index 6df06f106..cb167958a 100644 --- a/oap-server/server-library/library-module/pom.xml +++ b/oap-server/server-library/library-module/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-server/pom.xml b/oap-server/server-library/library-server/pom.xml index da3e9d5c5..c8aa1252b 100644 --- a/oap-server/server-library/library-server/pom.xml +++ b/oap-server/server-library/library-server/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/library-util/pom.xml b/oap-server/server-library/library-util/pom.xml index 23e80456d..c4a8d0d96 100644 --- a/oap-server/server-library/library-util/pom.xml +++ b/oap-server/server-library/library-util/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-library org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-library/pom.xml b/oap-server/server-library/pom.xml index ac79fb6d1..3535e2a72 100644 --- a/oap-server/server-library/pom.xml +++ b/oap-server/server-library/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/pom.xml b/oap-server/server-query-plugin/pom.xml index 2d388c424..0e74482a8 100644 --- a/oap-server/server-query-plugin/pom.xml +++ b/oap-server/server-query-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index e550381cb..2d8dd7818 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-query-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/pom.xml index 0ad99c3d7..93291094f 100644 --- a/oap-server/server-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml index 786b6d6b8..78c24ac6b 100644 --- a/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-istio-telemetry-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml index 05381520a..b971d611f 100644 --- a/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-jvm-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml index 43a835120..3a13b778c 100644 --- a/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml index 3277ed59e..9d70d5bc3 100644 --- a/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml index c32295abd..38987adf0 100644 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml index 8dcf89a74..58699c128 100644 --- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml +++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-receiver-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-starter/pom.xml b/oap-server/server-starter/pom.xml index 91bf853a6..153a8713f 100644 --- a/oap-server/server-starter/pom.xml +++ b/oap-server/server-starter/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/pom.xml b/oap-server/server-storage-plugin/pom.xml index 48d5ac9b4..a9bd68b38 100644 --- a/oap-server/server-storage-plugin/pom.xml +++ b/oap-server/server-storage-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + oap-server org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml index 737e4ffbb..464f4c3bb 100644 --- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-storage-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml index 523467ea5..6a7e571a6 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/pom.xml @@ -17,13 +17,11 @@ ~ --> - + server-storage-plugin org.apache.skywalking - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index ea0ec9e2d..a2192cb76 100644 --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,12 @@ ~ --> - + 4.0.0 org.apache.skywalking apm - 6.0.0-alpha-SNAPSHOT + 6.0.0-beta-SNAPSHOT org.apache @@ -449,10 +448,9 @@ - - travis-ci-submodule + auto-submodule false @@ -484,94 +482,6 @@ - - - install-ojdbc - - - ${basedir}/ci-dependencies/ojdbc14-10.2.0.4.0.jar - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-ojdbc - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=ojdbc14-10.2.0.4.0.jar - -DgroupId=com.oracle - -DartifactId=ojdbc14 - -Dversion=10.2.0.4.0 - -Dpackaging=jar - - ${project.basedir}/ci-dependencies - - - - - - - - - - - install-resin-3 - - - ${basedir}/ci-dependencies/resin-3.0.9.jar - - - - - - install-resin-4 - - - ${basedir}/ci-dependencies/resin-4.0.41.jar - - - - - - org.codehaus.mojo - exec-maven-plugin - - - install-resin-4 - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=resin-4.0.41.jar - -DgroupId=com.caucho - -DartifactId=resin - -Dversion=4.0.41 - -Dpackaging=jar - - ${project.basedir}/ci-dependencies - - - - - - -