diff --git a/.travis.yml b/.travis.yml index f8d4a737c6f58f6a50d2c6e74278a5a4971a1b6f..bd48465a720fb3fea73c5921de16400835a4f833 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 b70c1f362cabbb78a0f47817dcd59490521cfbb1..2952b80ab8434040d5935661a70f4f098a8e8fd3 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 e7ab921828d4230bf2e7e783ecbfdc0b1efc6d63..b7b8447267234cadfcaf0a71ed42ca62b8476846 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 de28e2bfe205b294be9d2a62cb7a761e716aa96b..252b157ceb18a0fdee404d0f642536da537d6a27 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 e9143dd19b82ae05529584ab2b77c183a04b2fd1..27bd7c3f6d1c88039a340e6f3bd6b2d6464a7264 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 390fa6306d49a437ab672177560069870f7aabbe..3e9fd16b5e2e06d47dc9f00f7da8fd06532d9710 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 c3ce08a4f26d89d48ad90029892b19d336e1da71..8cdfd56ed7573c76a63ef066be6d08877d045609 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 948907d287c87b4b8b4a68abad563b95e35a6d89..f9d47846318e2e86624844f541efeba95bb0b327 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 93ad8905d89b78ffff711ffa5f112a07557c22d9..21cd1b44e0f53a1d35f0858be3324fde528cbd5a 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 2603f92b45fc577e3c4885184eaeda2d2e62bcae..370d22414aa95633487300f6a404e85773c3c3c3 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 edf1c3b9cea65cc0ee7cb08780e59daca71b9dd0..ef4bf7ba694b05f9359c8a68e840792abe073882 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 bbbfb80144b512c10762bf785f52e4fa18c08786..95e096ecdbb106e27dab9fcb1e221c812038aa21 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 935d638ddcb52eb518286f0ef4ad8a70b83af035..8654e8615573788d1d7de3756b736fa67c3242d5 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 0b59e5d95557bd876e83f4d17efe97fe2a61a2e2..89dfa3e9a31d9e36291ad7f01cbf81d348659be0 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 cc95d79bff4722c8e1d648a72a3df21aa5e6dd12..6bf8c9686c3212c88e321a40da9ac6f4317c8aea 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 dd63db85d7b1b8177ca989ce3046ca6b08131eb1..eb1ab949f0ad69418f77d051c6efe7ea92e61c42 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 52706f5e040a06285a2e0cc64413ec56ca958862..f7815fcfa9f2b3c8914cf40d818a2893ab83d3b4 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 c3aa8fc0c1d290eeb20e05302181dd2a5f81b888..d062ece485b307ff4f642b41522555dc49bdbbb4 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 7a2f96e47ece3a33ff82530fb7137f95cb77e234..6c10012dcde90fc51bb5e4878fd64cf437a9ab64 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 95cedd091fe95ececeae78404945ff6a71321117..2b4162ce365f0b21aa892e09f360a00bad295e86 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 b7f401dde26f3d4c7c369116981437488a5b355d..2c83cfb6144bf30a574a3b6501c25a52ba95c29a 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 6efc106e1093ddfec093e734dbaab696e40fc699..60c53ef1906792c661e0496eca9c453b5ce94bf3 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 9aa4dfa865d291ddece3b05424b2937821bbffb2..7bb2dc1a92877e68d9e60f12e118f0e94fea237e 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 4657f8dd84272dafe00c1fee97c0f83fa38d2f2a..db342038917d0abcba2f066813ffb9d4933f254f 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 6e006cdb1a82f91e6d5a0a92d14e6b68a26d5305..715545af2e79892f242cf05205c055f4bccfe603 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 d4967d72449c86537faae84ab8014442dcc21ebb..d7a2630d8e103de2dcbf4e6374fa4acfa4f193eb 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 67266d617389727706736a90e885deb8c5812c34..ef5006793b6a8aeb8baf74a42cfb9d4731b4cf69 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 d2c6e80a4760cbb032ae4a76d2d74cff3a5c4974..f4e6931b943f92fe4d9e670ece666df1597928f7 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 71c0a02acc327729250e00e8639d879064b66aa0..60ce63482ec484a4414d630066557998bc9f2d59 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 36870b4ee0ddacd1d87f45052c1cba32585ff841..d554a9a98052f46b49cbdf07a0513df4a990ae16 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 5a1d01155593e4db8ebb07a70923979c39cba856..bf3117a52efe1cc6b1c741fa383978a91eaae7f1 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 cbdf65988b795f69c2cc6bc1b743b366f57b738f..f7ae52aa8a2a5b59345b9628a1763db34abaf287 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 bcb80c7a4a9b7ad8b80eedb3e35c0e0391fbe29d..a1e9b217af96ef87848b3258e1649b3376888c70 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 bf508fd582e98cd5c737a7ab3237076a27c573c8..4b28d747d8c282ff1b99e6db31d4b480e7d921f1 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 8c48f748d4225a1c83adfc38133c90d714993a2d..ba2e2e32a83565012738be6a9367af95b8d6a626 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 c4c2e7daab08d04ba63a3e933efaeb4a6259568d..18591cec7cfb315d6de35c2b2fc42d0a579008c3 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 309afd9a45d54a50aea1bc519fff1c2b173bc07b..a1dc32136242790aed3cde252f50575b8b11f7ab 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 1c2d5d55f95d470ba89b28c7f379fc72b51b6514..98a5d8f225aa7f468d54a50938cea51e8e2cf975 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 2cd2e1cd773aa2cb1c68a681ce903362014343ab..250a36f998ddf63a9e1a9491ece69d1bd9470edb 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 04c39f7d5a0c4b45161e2e8893e7e1c0fd7b2877..094b38f18eb3ba61b5c248bd82f26e32f363d602 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 f426bcec94367ab9f9a9d09aa09ef4fdfc84ef23..24514c4139e5ac7ed17737b09a2e44a232103e07 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 d8088c80a77b7da1de58f64c834d05a483c073ab..0000000000000000000000000000000000000000 --- 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 da58ddf94ce6427734f58878f42cd970cba27850..0000000000000000000000000000000000000000 --- 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 3a4e72de08cebd6cfa57f9fa9b644465af1b6fe0..0000000000000000000000000000000000000000 --- 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 d526ac5063b4818299e2b9faa9dc8200d67a1f4d..0000000000000000000000000000000000000000 --- 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 9c8a2ba3b6eea828f212435be62f07b6684f5b87..0000000000000000000000000000000000000000 --- 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 ea2b95cade4a03c78628da0b299bb801d5c00200..0000000000000000000000000000000000000000 --- 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 c85f2bc999cd296bb98b718584f53d556d458e3c..0000000000000000000000000000000000000000 --- 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 b39fa3e48ab2c93db7d9c74b1768d19dcc590510..0000000000000000000000000000000000000000 --- 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 f51b02d73194f2d2eccca5eba62b884223e6f908..0000000000000000000000000000000000000000 --- 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 5cbbdc6b6d3e9214bf8c337158af2a27e0853415..0000000000000000000000000000000000000000 --- 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 1c2e50ddb0cd67f38d0fef816cecfe93a6dd55a5..0000000000000000000000000000000000000000 --- 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 5aceca289e252d4cb0d1b80eff6d77c5b98a2021..0000000000000000000000000000000000000000 --- 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 20784ac8c364f1ed9ed87177d854bad35226d16a..0000000000000000000000000000000000000000 --- 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 ee8597f642f6134ca26f7122d95cb91676f84242..0000000000000000000000000000000000000000 --- 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 ff75c971c68ab55e9185b83259ab707da7bc29c9..ef555b379c6b67c17620db664c5ce13b7d4dfbe6 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 1b8dff661887e63e3ff6b7677a8f526744942b8c..08aee5e5b7236af3088f5711c24929e807a9805b 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 eb59f1f39fe2bb0773f67adc8a32773af20d9c8e..0000000000000000000000000000000000000000 --- 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 34b60bb844aada528ee73245fa1284ca669c95b9..0000000000000000000000000000000000000000 --- 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 e61fbe7f2ea2fc3b9c19ac4d2a71bb4be0f5eaaa..0000000000000000000000000000000000000000 --- 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 59d77308254cf06e17810dee714bba8b81af1292..0000000000000000000000000000000000000000 --- 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 22d888e30130346ace0ee3767ed005c74a025697..0000000000000000000000000000000000000000 --- 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 e2d458347d13d9dc0bce51679023fcbdc889b769..0000000000000000000000000000000000000000 --- 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 329d3a2ebad8e8a8b7f1f6a8742969fe2f646c7e..0000000000000000000000000000000000000000 --- 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 5579a4417c552d881cb788e2a7f88b5e9cac3f24..0000000000000000000000000000000000000000 --- 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 6665077a02ce9207d2a55b768ba0e66eb81c6546..0000000000000000000000000000000000000000 --- 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 915d2a9328e2754d2cbcb448e9a23f1af0a683c8..0000000000000000000000000000000000000000 --- 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 781a23af57ce31b5f14e315f24e3a5c6effd7fab..0000000000000000000000000000000000000000 --- 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 e5b5ac1f1977b53d9d2e7da86545c2bd59950caf..0000000000000000000000000000000000000000 --- 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 e5492ddda910174166867fb783c65af6f13f5e0e..0575b1789e3d641bd43bac7975ed0674d33408b0 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 8d82324521d7525fad2df28aa818c4d7f83d1532..42714fb0f40603efd4cd9faf0dc5bb9428cd86a0 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 93e2a2936ff28ed5796320eb6d30d94b1f8acfe4..10b6314c2b8e4f721b1ad72601f9c9ae74b7d57d 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 d35f251142eefd959435d1248cc59d0e679bcc2b..957af2556b75d18a4e9fb2af4f5d3a6fe2bbb904 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 7c4322ab3b061d665bf1a27f4e73a7f5678d444d..74437c9c1affe365ed05db816ef4d20928accdd0 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 f41ccda353250764d59e8007db5963f71d520ea5..5d4cec4ebbe32dd572cc0db6cab8b1fdbfd4b391 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 2222975b898196c54840154ae0a522ae4b724146..c19eb4c1c1ebb9dd7a216fe31abcaeca50e2e9c4 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 2d836b315e8b7c55e4ef0a25f9708f12fc5bbc93..ff9326de389c300ad3fe8413bbb76e7dff856ab8 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 7947bd6362b14b77c5dee81672f82bb1ed42bf14..365fa0a0a604e6e9362d08bc009497b27e12f16a 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 766ef03e201582a0669fe7cb8b50f04ffd564eb0..5fd201abda3391a9c26d572ed6de933b7d34a2ef 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 ba7ac3360cb806a4bfaa0b2ed3298256058bd859..4248dcef70468fb688e44649175196a039d6bb83 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 143b425ff4cc8a9664cf5b617886e4978d52750f..ffe1883f1a8a3249d9b93c68600dfebf31646cf3 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 c114fcedea0e13aed13106ce3eed8163d2f7a942..b49c68aa4061d486efca865f2e66352924a2019a 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 8c3218a3f5122ea869b7a29a696d35267505b14e..a62b10afff8eaf8be720e6d23e99b3d3902022c4 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 912f3e1d0b5431a6ae8b65ba0ac3c7095a496def..2ae59e9315fb7006d4ea67fef34162e0e3c730dd 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 71e65327e30daf5c0d257353e0b133390cef56aa..10a7c0639497efcdd756ad4cb4e4e3d56255495e 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 78ddb96f1c44d3257aab938dd5366f90b127236a..2d42db26afdf41afdccef23dd5e78a9130f0a93f 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 1275fe7a66fdc0094fdff6d29661d1e8819b7873..c1d88e34ae0298236d1d2ae6140050c4ae53cd05 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 448cb90c26560aa98deab07dc55f4e5652639200..508a7ea85f37f248a5be6e4c6f3ff005e6e50d57 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 1f696db1e8e45a0a64e4ef03f42185acc523dc7f..32d103fdd5d3d513cfc66ebefa9b46fe6a39a0c3 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 85b33a70d6db10bb44a294bfbabcce0e7c31a6bc..ced7df7b3fa304638930fc25527c4c7da68950ce 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 2370a4da61662e62f852d78d400bb9304a176731..d298bcbf1fe60b104725ae24e18e43bfa23af461 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 791d7ec65cd8a0181ba17fee74c53587a76260b2..e042aadaf61769094e1bfe51ae0cf53de2e99906 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 bf4eaf6f358bbc5dc2438d8d9be98ae94f65c9ab..25eaa54be78d31932df1425391175e22a8f9a880 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 e1dfc473d9c549b1232f60e9edd6546a3cba8e3b..ae02f28a2d3290911e4a344112e58802ed0b33f0 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 701ebd7d26baa5a54cc59d0183f3194a3d5a336e..8d2a300d873ef19746b38e672a06def6583f5aea 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 30f0475e00f6e96261b1059274f1ea0e5c5dcae5..638179c517809aefd2c5787d271fe6cec0c138d9 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 c3fac6c841a9ef3903a344f6b7ad34c303d6e5f7..fa3f99ecd9b17121ddc378ec6ff068eed92e793e 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 368664ce9c47fa25d5deee6b146cec8d59d10ad6..79296c0823ae8d15a57e06d46ab5b36fcda834fe 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 dbde36fff543ce9a05e34f0a41f0774708689e76..fc23705314f5b1e39b07e8fff295f005565fef19 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 8640d285f7c690277a0061aa1a937177b4783063..bb3b8f42069634562a1eccf37d9aeb5fb7326652 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 79a4622d2058ac479ad5e3c74c27b4f29451d891..ab0dd5866db7e776dbe7add3f95a0480e09cbe27 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 023545f24b7b883759f468251de3fafba4601843..ac274029d7207a3e5df3fe0042aa7fea93cdd83d 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 ac0fee74ce0b650d2a55765acc32e46c8bc7b666..40ceb0f200800153c4abac59eecd592301b6647c 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 ceca9d6ee6db00022823556ff36dc25af58912b8..f373e3ddb0fc842014f8f1fdee553dfee9ebf4a0 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 da9c6515618e7e1967e4894446223559a4beee15..405058c09eea4f2b1295d1eea6e17c9d1b405953 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 013d96d3f3321bf60973169d5eeb0447c72e9c50..0000000000000000000000000000000000000000 --- 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 dfc94a394eb87af8564e543b3e7538eac5729042..25059cedbccb3ef9092c292aceab85ed96059bd4 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 b46fc940e2826b5256a1341e98fedaf862da31ee..60f8635af72e612c41c77bf45733ce9b32b895f3 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 b2fc63ed3305c4e8164868b50c56abab9de91e12..f3d9b9cad42d99da619017a19f6696df3aaa6669 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 37766799358b156e09170f5ba6ddfca3cf47a7ac..145ef50133543b1abff1379c366dafc0ee8b86ea 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 a722022a419f4a639708492f9dc682a7adf46656..81d5b89f891c81d11cc9855befbbc08f0851b557 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 14fea192eaccd9bdb61daddc085e3e594bdbf9ce..ea1e1e9fe4abdaac7f001d3e3e989763cd3f6f34 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 49fb18b9cb55ca1223aaa30f2d65ec4513c3d71e..4b40e2ad456511c1dc19d3b2926f6eaf78631720 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 c1269ae81408feb670f7343b044056d905a3381e..6830ed6d6def8df1c7778e0884f2e53a566fa574 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 0ba6843d052f74fc28239b8b87963c961a97c4b8..bbe3b6ae4f0a3f1b15eef04205860d590ad33d41 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 2e6598061791a80bfd114644faf0e1bb0a05e5c3..d23af7a3eef5a6f072ce96e665c7d892728a1a57 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 b9b9154064c9e2420ba2f4cfe5399d19655c4ff3..9669ca0199a732ccdf1dde555bc746d13383cd01 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 852e31632eb0ecd4423e64c4502fdf53f27d34b4..4ea880d5d218e9b8b497bb8d8664b05c02d66dd3 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 26cc854b1f619fbc64347408fa586805172df929..b590aebc5d8a8033c53d1dca84de5eb0c1fbbe9d 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 6df06f1069a8428e0d692ef2162ab3708d8d2c90..cb167958a492cffd3a8aba075a99d329cdf03140 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 da3e9d5c53b6a84e52dbb3d3bfcd5134e92128da..c8aa1252b803860ca7707563da2ce6707795fdb7 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 23e80456d7de2f2d86d14922840246de9956c718..c4a8d0d966b9f107cdf3cbd93f455fd6601cf945 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 ac79fb6d1ae829b0509fa7660c6bd686d6fe0fc7..3535e2a72eac48f42141e1ff6c3eff965c1d56c7 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 2d388c424de49279e83f1a0ba8eb539bc74f6503..0e74482a81c75dc03c6532feea56640822376106 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 e550381cb795287f2b3e6aa6dfc4a9feac4a1c04..2d8dd78186e375490ad73954e9e9c90d0e2f0a0d 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 0ad99c3d73580cd0be5d6eaf7b52ea3b22143a92..93291094f24849173eb84f79843fef3a9e8d6b9c 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 786b6d6b8829aa99f106d7aab4158c910738cb46..78c24ac6b7d1d70161ff9bc16e971caca69c5975 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 05381520a509d6a9cb7f42b489e46fb2686d7b54..b971d611f559cec15be0f0b0ccd2f914d92e390f 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 43a8351203649a9408616a8d42215ef1e8cbe100..3a13b778c0dd7785315929430b2546066b0aeabb 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 3277ed59e2ad1eab3b3e30eef6e8c19d0571c15d..9d70d5bc3ac1e7c3af10faec259b37242348ab61 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 c32295abd29142d135fae17c0cf75c9a58c63b47..38987adf0ffd78501c0597e10f7126e5d6ed9d14 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 8dcf89a747de9f7474e4219864af1e6b47eef3c8..58699c128e757a70e885fd33cd49a84356fe55e7 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 91bf853a6ae99f36f4a62a850a2f64994efcd7cd..153a8713f0d427ab4d7e9409ee8eab6b019cfa26 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 48d5ac9b4ae7c6c98d44e126347be3d0abd6f55a..a9bd68b38d42779021dee2a191798ef773464bc7 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 737e4ffbb7ebc5810ea77db7a1c1c103f9151b81..464f4c3bb4b04f7103424eff99b4faa6e0388a61 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 523467ea5d7548fbbb59cbd9f4b4ef1de8407366..6a7e571a63d543eafce404af804e8ac2a654c568 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 ea0ec9e2d8d6dc65aba9f5f24b5109235420a0c7..a2192cb7615aa186a8e58c25c4122c9aa977a7db 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 - - - - - - -