This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
The following commit(s) were added to refs/heads/main by this push:
new 4adb343091 Archive the expired plugins `impala-jdbc-2.6.x-plugin`.
(#673)
4adb343091 is described below
commit 4adb343091e0551e4ab12a5d82eb21c05c9a9ca4
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Thu Mar 7 11:31:08 2024 +0800
Archive the expired plugins `impala-jdbc-2.6.x-plugin`. (#673)
---
.github/workflows/plugins-test.3.yaml | 1 -
CHANGES.md | 3 +-
apm-sniffer/apm-sdk-plugin/pom.xml | 1 -
.../impala-jdbc-2.6.x-plugin/pom.xml | 10 +-
.../impala/CreateCallableStatementInterceptor.java | 0
.../impala/CreatePreparedStatementInterceptor.java | 0
.../jdbc/impala/CreateStatementInterceptor.java | 0
...PreparedStatementExecuteMethodsInterceptor.java | 0
.../plugin/jdbc/impala/SetCatalogInterceptor.java | 0
.../impala/StatementExecuteMethodsInterceptor.java | 0
.../impala/define/ConnectionInstrumentation.java | 0
.../jdbc/impala/define/DriverInstrumentation.java | 0
...paredStatementIgnoredSetterInstrumentation.java | 0
.../define/PreparedStatementInstrumentation.java | 0
...PreparedStatementNullSetterInstrumentation.java | 0
.../PreparedStatementSetterInstrumentation.java | 0
.../impala/define/StatementInstrumentation.java | 0
.../src/main/resources/skywalking-plugin.def | 0
.../CreateCallableStatementInterceptorTest.java | 0
.../CreatePreparedStatementInterceptorTest.java | 0
.../impala/CreateStatementInterceptorTest.java | 0
...aredStatementExecuteMethodsInterceptorTest.java | 0
.../StatementExecuteMethodsInterceptorTest.java | 0
.../{apm-sdk-plugin => expired-plugins}/pom.xml | 153 ++-------------------
apm-sniffer/pom.xml | 1 +
.../service-agent/java-agent/Optional-plugins.md | 20 ++-
docs/en/setup/service-agent/java-agent/README.md | 4 +
.../service-agent/java-agent/Supported-list.md | 5 +-
.../impala-jdbc-2.6.x-scenario/bin/startup.sh | 21 ---
.../config/expectedData.yaml | 117 ----------------
.../impala-jdbc-2.6.x-scenario/configuration.yml | 81 -----------
.../scenarios/impala-jdbc-2.6.x-scenario/pom.xml | 135 ------------------
.../src/main/assembly/assembly.xml | 41 ------
.../apm/testcase/impalajdbc/Application.java | 34 -----
.../apm/testcase/impalajdbc/ImpalaJdbcConfig.java | 46 -------
.../apm/testcase/impalajdbc/SQLExecutor.java | 77 -----------
.../impalajdbc/controller/CaseController.java | 88 ------------
.../src/main/resources/application.yaml | 23 ----
.../src/main/resources/jdbc.properties | 17 ---
.../src/main/resources/log4j2.xml | 30 ----
.../support-version.list | 21 ---
41 files changed, 42 insertions(+), 887 deletions(-)
diff --git a/.github/workflows/plugins-test.3.yaml
b/.github/workflows/plugins-test.3.yaml
index a4cfe3cb54..7451dcf4b5 100644
--- a/.github/workflows/plugins-test.3.yaml
+++ b/.github/workflows/plugins-test.3.yaml
@@ -108,7 +108,6 @@ jobs:
- grpc-generic-call-scenario
- shenyu-2.4.x-grpc-scenario
- shenyu-2.4.x-sofarpc-scenario
- - impala-jdbc-2.6.x-scenario
steps:
- uses: actions/checkout@v2
with:
diff --git a/CHANGES.md b/CHANGES.md
index 14032134e8..222b2b7a7f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,9 +15,10 @@ Release Notes.
* Convert the Redisson span into an async span.
* Rename system env name from `sw_plugin_kafka_producer_config` to
`SW_PLUGIN_KAFKA_PRODUCER_CONFIG`.
* Support for ActiveMQ-Artemis messaging tracing.
+* Archive the expired plugins `impala-jdbc-2.6.x-plugin`.
#### Documentation
-
+* Update docs to describe `expired-plugins`.
All issues and pull requests are
[here](https://github.com/apache/skywalking/milestone/204?closed=1)
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/pom.xml
index bfb4f47444..1c8c1cb97c 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/pom.xml
@@ -125,7 +125,6 @@
<module>micronaut-plugins</module>
<module>nats-2.14.x-2.15.x-plugin</module>
<module>jedis-plugins</module>
- <module>impala-jdbc-2.6.x-plugin</module>
<module>apm-armeria-plugins</module>
<module>jetty-thread-pool-plugin</module>
<module>jersey-2.x-plugin</module>
diff --git a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/pom.xml
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/pom.xml
similarity index 88%
rename from apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/pom.xml
rename to apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/pom.xml
index 3c0c748fd9..8ced3f47b9 100644
--- a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/pom.xml
+++ b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
- <artifactId>apm-sdk-plugin</artifactId>
+ <artifactId>expired-plugins</artifactId>
<version>9.2.0-SNAPSHOT</version>
</parent>
@@ -43,12 +43,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/SetCatalogInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/SetCatalogInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/SetCatalogInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/SetCatalogInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptor.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptor.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptor.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptor.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/ConnectionInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/ConnectionInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/ConnectionInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/ConnectionInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/DriverInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/DriverInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/DriverInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/DriverInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementIgnoredSetterInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementIgnoredSetterInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementIgnoredSetterInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementIgnoredSetterInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementNullSetterInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementNullSetterInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementNullSetterInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementNullSetterInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementSetterInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementSetterInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementSetterInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/PreparedStatementSetterInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/StatementInstrumentation.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/StatementInstrumentation.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/StatementInstrumentation.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/impala/define/StatementInstrumentation.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/resources/skywalking-plugin.def
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/resources/skywalking-plugin.def
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/main/resources/skywalking-plugin.def
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/main/resources/skywalking-plugin.def
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptorTest.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptorTest.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptorTest.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateCallableStatementInterceptorTest.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptorTest.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptorTest.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptorTest.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreatePreparedStatementInterceptorTest.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptorTest.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptorTest.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptorTest.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/CreateStatementInterceptorTest.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptorTest.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptorTest.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptorTest.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/PreparedStatementExecuteMethodsInterceptorTest.java
diff --git
a/apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptorTest.java
b/apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptorTest.java
similarity index 100%
rename from
apm-sniffer/apm-sdk-plugin/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptorTest.java
rename to
apm-sniffer/expired-plugins/impala-jdbc-2.6.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/jdbc/impala/StatementExecuteMethodsInterceptorTest.java
diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml
b/apm-sniffer/expired-plugins/pom.xml
similarity index 50%
copy from apm-sniffer/apm-sdk-plugin/pom.xml
copy to apm-sniffer/expired-plugins/pom.xml
index bfb4f47444..708f47aaa2 100644
--- a/apm-sniffer/apm-sdk-plugin/pom.xml
+++ b/apm-sniffer/expired-plugins/pom.xml
@@ -18,145 +18,33 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
<parent>
- <groupId>org.apache.skywalking</groupId>
<artifactId>java-agent-sniffer</artifactId>
+ <groupId>org.apache.skywalking</groupId>
<version>9.2.0-SNAPSHOT</version>
</parent>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>apm-sdk-plugin</artifactId>
- <modules>
- <module>dubbo-plugin</module>
- <module>jdbc-commons</module>
- <module>httpClient-4.x-plugin</module>
- <module>redisson-3.x-plugin</module>
- <module>tomcat-7.x-8.x-plugin</module>
- <module>tomcat-10x-plugin</module>
- <module>motan-plugin</module>
- <module>mongodb-3.x-plugin</module>
- <module>mongodb-4.x-plugin</module>
- <module>feign-default-http-9.x-plugin</module>
- <module>okhttp-3.x-plugin</module>
- <module>okhttp-4.x-plugin</module>
- <module>okhttp-common</module>
- <module>spring-plugins</module>
- <module>struts2-2.x-plugin</module>
- <module>nutz-plugins</module>
- <module>jetty-plugin</module>
- <module>spymemcached-2.x-plugin</module>
- <module>xmemcached-2.x-plugin</module>
- <module>grpc-1.x-plugin</module>
- <module>mysql-5.x-plugin</module>
- <module>mysql-6.x-plugin</module>
- <module>mysql-8.x-plugin</module>
- <module>mysql-common</module>
- <module>h2-1.x-plugin</module>
- <module>postgresql-8.x-plugin</module>
- <module>rocketMQ-3.x-plugin</module>
- <module>rocketMQ-4.x-plugin</module>
- <module>elastic-job-2.x-plugin</module>
- <module>elasticjob-3.x-plugin</module>
- <module>mongodb-2.x-plugin</module>
- <module>httpasyncclient-4.x-plugin</module>
- <module>kafka-commons</module>
- <module>kafka-plugin</module>
- <module>servicecomb-plugin</module>
- <module>hystrix-1.x-plugin</module>
- <module>sofarpc-plugin</module>
- <module>activemq-5.x-plugin</module>
- <module>elasticsearch-common</module>
- <module>elasticsearch-5.x-plugin</module>
- <module>elasticsearch-6.x-plugin</module>
- <module>elasticsearch-7.x-plugin</module>
- <module>undertow-plugins</module>
- <module>rabbitmq-plugin</module>
- <module>dubbo-conflict-patch</module>
- <module>canal-1.x-plugin</module>
- <module>dubbo-2.7.x-plugin</module>
- <module>dubbo-2.7.x-conflict-patch</module>
- <module>dubbo-3.x-plugin</module>
- <module>dubbo-3.x-conflict-patch</module>
- <module>vertx-plugins</module>
- <module>resteasy-plugin</module>
- <module>solrj-7.x-plugin</module>
- <module>cassandra-java-driver-3.x-plugin</module>
- <module>light4j-plugins</module>
- <module>pulsar-2.2-2.7-plugin</module>
- <module>netty-socketio-plugin</module>
- <module>httpclient-3.x-plugin</module>
- <module>play-2.x-plugin</module>
- <module>lettuce-5.x-plugin</module>
- <module>avro-plugin</module>
- <module>finagle-6.25.x-plugin</module>
- <module>quasar-plugin</module>
- <module>mariadb-2.x-plugin</module>
- <module>influxdb-2.x-plugin</module>
- <module>baidu-brpc-plugin</module>
- <module>baidu-brpc-3.x-plugin</module>
- <module>hbase-1.x-2.x-plugin</module>
- <module>graphql-plugin</module>
- <module>xxl-job-2.x-plugin</module>
- <module>thrift-plugin</module>
- <module>httpclient-commons</module>
- <module>asynchttpclient-2.x-plugin</module>
- <module>dbcp-2.x-plugin</module>
- <module>mssql-commons</module>
- <module>mssql-jtds-1.x-plugin</module>
- <module>mssql-jdbc-plugin</module>
- <module>cxf-3.x-plugin</module>
- <module>jsonrpc4j-1.x-plugin</module>
- <module>neo4j-4.x-plugin</module>
- <module>shardingsphere-plugins</module>
- <module>druid-1.x-plugin</module>
- <module>hikaricp-3.x-4.x-plugin</module>
- <module>httpclient-5.x-plugin</module>
- <module>clickhouse-0.3.2.x-plugin</module>
- <module>clickhouse-0.3.1-plugin</module>
- <module>kylin-jdbc-2.6.x-3.x-4.x-plugin</module>
- <module>okhttp-2.x-plugin</module>
- <module>pulsar-common</module>
- <module>pulsar-2.8.x-plugin</module>
- <module>undertow-worker-thread-pool-plugin</module>
- <module>tomcat-thread-pool-plugin</module>
- <module>guava-eventbus-plugin</module>
- <module>hutool-plugins</module>
- <module>micronaut-plugins</module>
- <module>nats-2.14.x-2.15.x-plugin</module>
- <module>jedis-plugins</module>
- <module>impala-jdbc-2.6.x-plugin</module>
- <module>apm-armeria-plugins</module>
- <module>jetty-thread-pool-plugin</module>
- <module>jersey-2.x-plugin</module>
- <module>jersey-3.x-plugin</module>
- <module>grizzly-2.3.x-4.x-plugin</module>
- <module>grizzly-2.3.x-4.x-work-threadpool-plugin</module>
- <module>rocketMQ-5.x-plugin</module>
- <module>websphere-liberty-23.x-plugin</module>
- <module>aerospike-plugin</module>
- <module>rocketMQ-client-java-5.x-plugin</module>
- <module>activemq-artemis-jakarta-client-2.x-plugin</module>
- </modules>
+ <artifactId>expired-plugins</artifactId>
<packaging>pom</packaging>
-
- <name>apm-sdk-plugin</name>
- <url>http://maven.apache.org</url>
-
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <sdk.plugin.related.dir />
<shade.net.bytebuddy.source>net.bytebuddy</shade.net.bytebuddy.source>
<shade.net.bytebuddy.target>${shade.package}.${shade.net.bytebuddy.source}</shade.net.bytebuddy.target>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <sdk.plugin.related.dir />
<agent.package.dest.dir>${project.build.directory}${sdk.plugin.related.dir}/../../../../skywalking-agent
</agent.package.dest.dir>
- <plugin.dest.dir>${agent.package.dest.dir}/plugins</plugin.dest.dir>
+
<expired.plugin.dest.dir>${agent.package.dest.dir}/expired-plugins</expired.plugin.dest.dir>
<ant-contrib.version>1.0b3</ant-contrib.version>
<ant-nodeps.version>1.8.1</ant-nodeps.version>
</properties>
+ <modules>
+ <module>impala-jdbc-2.6.x-plugin</module>
+ </modules>
+
<dependencies>
<dependency>
<groupId>org.apache.skywalking</groupId>
@@ -164,12 +52,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>net.bytebuddy</groupId>
- <artifactId>byte-buddy</artifactId>
- <version>${bytebuddy.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>java-agent-util</artifactId>
@@ -182,15 +64,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-inline</artifactId>
- </dependency>
</dependencies>
<build>
@@ -232,11 +105,10 @@
<if>
<equals arg1="${project.packaging}"
arg2="jar" />
<then>
- <mkdir dir="${plugin.dest.dir}" />
- <copy
file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile="${plugin.dest.dir}/${project.artifactId}-${project.version}.jar"
overwrite="true" />
+ <mkdir
dir="${expired.plugin.dest.dir}" />
+ <copy
file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
tofile="${expired.plugin.dest.dir}/${project.artifactId}-${project.version}.jar"
overwrite="true" />
</then>
</if>
-
</target>
</configuration>
</execution>
@@ -262,4 +134,5 @@
</plugin>
</plugins>
</build>
+
</project>
diff --git a/apm-sniffer/pom.xml b/apm-sniffer/pom.xml
index c9d2dbdaf4..25c5c2de53 100644
--- a/apm-sniffer/pom.xml
+++ b/apm-sniffer/pom.xml
@@ -38,6 +38,7 @@
<module>optional-plugins</module>
<module>optional-reporter-plugins</module>
<module>bytebuddy-patch</module>
+ <module>expired-plugins</module>
</modules>
<properties>
diff --git a/docs/en/setup/service-agent/java-agent/Optional-plugins.md
b/docs/en/setup/service-agent/java-agent/Optional-plugins.md
index 5c7a7f7976..8b8a0ec1c3 100644
--- a/docs/en/setup/service-agent/java-agent/Optional-plugins.md
+++ b/docs/en/setup/service-agent/java-agent/Optional-plugins.md
@@ -1,8 +1,13 @@
# Optional Plugins
-Java agent plugins are all pluggable. Optional plugins could be provided in
`optional-plugins` folder under agent or 3rd party repositories.
+Java agent plugins are all pluggable. Optional plugins could be provided in
`optional-plugins` and `expired-plugins` folder under agent or 3rd party
repositories.
For using these plugins, you need to put the target plugin jar file into
`/plugins`.
-Now, we have the following known optional plugins.
+Now, we have the following known 2 kinds of optional plugins.
+
+## Optional Level 2 Plugins
+These plugins affect the performance or must be used under some conditions,
from experiences.
+So only released in `/optional-plugins` or `/bootstrap-plugins`, copy to
`/plugins` in order to make them work.
+
* [Plugin of tracing Spring annotation
beans](agent-optional-plugins/Spring-annotation-plugin.md)
* [Plugin of tracing Oracle and
Resin](agent-optional-plugins/Oracle-Resin-plugins.md)
* [Filter traces through specified endpoint name
patterns](agent-optional-plugins/trace-ignore-plugin.md)
@@ -24,4 +29,13 @@ Now, we have the following known optional plugins.
* Plugin of trace sampler CPU policy in the optional plugin folder. Please
only activate this plugin when you need to disable trace collecting when the
agent process CPU usage is too high(over threshold).
* Plugin for Spring 6.x and RestTemplate 6.x are in the optional plugin
folder. Spring 6 requires Java 17 but SkyWalking is still compatible with Java
8. So, we put it in the optional plugin folder.
* Plugin of nacos-client 2.x lib in optional plugin folder. The reason is many
business irrelevant traces are generated, which cause extra payload to agents
and backends, also spend more CPU, memory and network.
-* Plugin of netty-http 4.1.x lib in optional plugin folder. The reason is some
frameworks use Netty HTTP as kernel, which could double the unnecessary spans
and create incorrect RPC relative metrics.
\ No newline at end of file
+* Plugin of netty-http 4.1.x lib in optional plugin folder. The reason is some
frameworks use Netty HTTP as kernel, which could double the unnecessary spans
and create incorrect RPC relative metrics.
+
+## Optional Level 3 Plugins. Expired Plugins
+These plugins are not tested in the CI/CD pipeline, as the previous added
tests are not able to run according to the latest
+CI/CD infrastructure limitations, lack of maintenance, or dependencies/images
not available(e.g. removed from DockerHub).
+
+**Warning, there is no guarantee of working and maintenance. The committer
team may remove them from the agent package
+in the future without further notice.**
+
+* Plugin of Spring Impala 2.6.x was tested through parrot-stream released
images. The images are not available since Mar. 2024. This plugin is expired
due to lack of testing.
\ No newline at end of file
diff --git a/docs/en/setup/service-agent/java-agent/README.md
b/docs/en/setup/service-agent/java-agent/README.md
index 139fb50a5a..f6702c006f 100755
--- a/docs/en/setup/service-agent/java-agent/README.md
+++ b/docs/en/setup/service-agent/java-agent/README.md
@@ -33,6 +33,10 @@ package looks like this.
+-- bootstrap-plugins
jdk-http-plugin.jar
.....
+ +-- expired-plugins
+ # Expired plugins are moved to this folder. No guarantee of working
and maintenance.
+ apm-impala-2.6.x-plugin.jar
+ .....
+-- logs
skywalking-agent.jar
```
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 9e69ad72b4..da1aef6411 100644
--- a/docs/en/setup/service-agent/java-agent/Supported-list.md
+++ b/docs/en/setup/service-agent/java-agent/Supported-list.md
@@ -55,7 +55,7 @@ metrics based on the tracing data.
* [Mssql-jdbc](https://github.com/microsoft/mssql-jdbc) 6.x -> 8.x
* [ClickHouse-jdbc](https://github.com/ClickHouse/clickhouse-jdbc) 0.3.x
* [Apache-Kylin-Jdbc](https://github.com/apache/kylin.git) 2.6.x -> 3.x ->
4.x
- *
[Impala-jdbc](https://www.cloudera.com/downloads/connectors/impala/jdbc/2-6-29.html)
2.6.x
+ *
[Impala-jdbc](https://www.cloudera.com/downloads/connectors/impala/jdbc/2-6-29.html)
2.6.x (Optional³)
* RPC Frameworks
* [Dubbo](https://github.com/alibaba/dubbo) 2.5.4 -> 2.6.0
* [Dubbox](https://github.com/dangdangdotcom/dubbox) 2.8.4
@@ -171,3 +171,6 @@ ___
go to [SkyAPM java plugin extension
repository](https://github.com/SkyAPM/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` or
`/bootstrap-plugins`, copy to `/plugins` in order to make them work.
+
+³These plugins are not tested in the CI/CD pipeline, as the previous added
tests are not able to run according to the latest
+CI/CD infrastructure limitations, lack of maintenance, or dependencies/images
not available(e.g. removed from DockerHub).
diff --git a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/bin/startup.sh
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/bin/startup.sh
deleted file mode 100644
index 872fc138ca..0000000000
--- a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/bin/startup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-home="$(cd "$(dirname $0)"; pwd)"
-
-java -jar -Dskywalking.plugin.jdbc.trace_sql_parameters=true ${agent_opts}
${home}/../libs/impala-jdbc-2.6.x-scenario.jar &
\ No newline at end of file
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/config/expectedData.yaml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/config/expectedData.yaml
deleted file mode 100644
index c6bcc6455e..0000000000
--- a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/config/expectedData.yaml
+++ /dev/null
@@ -1,117 +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.
-segmentItems:
- - serviceName: impala-jdbc-2.6.x-scenario
- segmentSize: ge 1
- segments:
- - segmentId: not null
- spans:
- - operationName: Impala/JDBC/Statement/execute
- parentSpanId: 0
- spanId: 1
- spanLayer: Database
- startTime: nq 0
- endTime: nq 0
- componentId: 133
- isError: false
- spanType: Exit
- peer: impala-server:21050
- skipAnalysis: 'false'
- tags:
- - {key: db.type, value: Impala}
- - { key: db.instance, value: '' }
- - key: db.statement
- value: "CREATE TABLE IF NOT EXISTS default.impala_test (test_id
BIGINT, test_name STRING);"
- - operationName: Impala/JDBC/Statement/execute
- parentSpanId: 0
- spanId: 2
- spanLayer: Database
- startTime: nq 0
- endTime: nq 0
- componentId: 133
- isError: false
- spanType: Exit
- peer: impala-server:21050
- skipAnalysis: 'false'
- tags:
- - {key: db.type, value: Impala}
- - { key: db.instance, value: '' }
- - key: db.statement
- value: "INSERT INTO impala_test VALUES (123, 'test');"
- - operationName: Impala/JDBC/PreparedStatement/executeQuery
- parentSpanId: 0
- spanId: 3
- spanLayer: Database
- startTime: nq 0
- endTime: nq 0
- componentId: 133
- isError: false
- spanType: Exit
- peer: impala-server:21050
- skipAnalysis: 'false'
- tags:
- - {key: db.type, value: Impala}
- - { key: db.instance, value: '' }
- - key: db.statement
- value: "SELECT COUNT(*) FROM impala_test;"
- - operationName: Impala/JDBC/PreparedStatement/executeQuery
- parentSpanId: 0
- spanId: 4
- spanLayer: Database
- startTime: nq 0
- endTime: nq 0
- componentId: 133
- isError: false
- spanType: Exit
- peer: impala-server:21050
- skipAnalysis: 'false'
- tags:
- - {key: db.type, value: Impala}
- - { key: db.instance, value: '' }
- - key: db.statement
- value: 'SELECT COUNT(*) FROM impala_test WHERE test_id = ?;'
- - { key: db.sql.parameters, value: '[123]'}
- - operationName: Impala/JDBC/Connection/close
- parentSpanId: 0
- spanId: 5
- spanLayer: Database
- startTime: nq 0
- endTime: nq 0
- componentId: 133
- isError: false
- spanType: Exit
- peer: impala-server:21050
- skipAnalysis: 'false'
- tags:
- - {key: db.type, value: Impala}
- - { key: db.instance, value: '' }
- - { key: db.statement, value: '' }
- - operationName: HEAD:/impala-jdbc-2.6.x-scenario/case/healthCheck
- parentSpanId: -1
- spanId: 0
- startTime: nq 0
- endTime: nq 0
- spanLayer: Http
- isError: false
- spanType: Entry
- peer: ''
- componentId: 1
- tags:
- - { key: url, value:
'http://localhost:8080/impala-jdbc-2.6.x-scenario/case/healthCheck' }
- - { key: http.method, value: HEAD }
- - { key: http.status_code, value: '200' }
- logs: [ ]
- skipAnalysis: 'false'
diff --git a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/configuration.yml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/configuration.yml
deleted file mode 100644
index af968fbcd9..0000000000
--- a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/configuration.yml
+++ /dev/null
@@ -1,81 +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.
-
-type: jvm
-entryService:
http://localhost:8080/impala-jdbc-2.6.x-scenario/case/impala-jdbc-2.6.x-scenario
-healthCheck: http://localhost:8080/impala-jdbc-2.6.x-scenario/case/healthCheck
-startScript: ./bin/startup.sh
-environment:
-depends_on:
- - impala-server
-dependencies:
- postgres:
- hostname: postgres
- image: parrotstream/postgres:10.5
- environment:
- - POSTGRES_PASSWORD=postgres
- expose:
- - 5432
- zookeeper:
- hostname: zookeeper
- image: parrotstream/zookeeper:latest
- expose:
- - 2181
- - 2888
- - 3888
- hadoop:
- hostname: hadoop
- image: parrotstream/hadoop:3.0.3
- links:
- - zookeeper
- expose:
- - 9870
- - 9864
- - 9820
- - 8042
- - 8088
- - 8188
- - 19888
- hive:
- hostname: hive
- image: parrotstream/hive:1.1.0-cdh5.11.1
- environment:
- - PGPASSWORD=postgres
- links:
- - hadoop
- - zookeeper
- - postgres
- expose:
- - 10000
- - 10001
- - 10002
- - 10003
- - 9083
- - 50111
- - 9999
- impala-server:
- hostname: impala-server
- image: parrotstream/impala:latest
- links:
- - hadoop
- - hive
- - zookeeper
- expose:
- - 21000
- - 21050
- - 25000
- - 25010
- - 25020
\ No newline at end of file
diff --git a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/pom.xml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/pom.xml
deleted file mode 100644
index 30223782b0..0000000000
--- a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/pom.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-
- <groupId>org.apache.skywalking.apm.testcase</groupId>
- <artifactId>impala-jdbc-2.6.x-scenario</artifactId>
- <version>1.0.0</version>
- <packaging>jar</packaging>
-
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <compiler.version>1.8</compiler.version>
- <test.framework.version>2.6.26.1031</test.framework.version>
- <docker.image.version>${test.framework.version}</docker.image.version>
- <spring.boot.version>2.1.6.RELEASE</spring.boot.version>
- <lombok.version>1.18.20</lombok.version>
- <impala.jdbc.verion>2.6.26.1031</impala.jdbc.verion>
- </properties>
-
- <name>skywalking-impala-jdbc-2.6.x-scenario</name>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring.boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>Impala</groupId>
- <artifactId>ImpalaJDBC42</artifactId>
- <version>${test.framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-log4j2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
- <!-- NOT RECOMMENDED: (see
https://maven.apache.org/repository/guide-central-repository-upload.html#faq-and-common-mistakes)
-->
- <repositories>
- <repository>
- <id>cloudera.repo</id>
-
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
- </repository>
- </repositories>
-
- <build>
- <finalName>impala-jdbc-2.6.x-scenario</finalName>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring.boot.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>repackage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${compiler.version}</source>
- <target>${compiler.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- <outputDirectory>./target/</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/assembly/assembly.xml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/assembly/assembly.xml
deleted file mode 100644
index 8580373fc9..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<assembly
-
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
- <fileSet>
- <directory>./bin</directory>
- <fileMode>0775</fileMode>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
-
<source>${project.build.directory}/impala-jdbc-2.6.x-scenario.jar</source>
- <outputDirectory>./libs</outputDirectory>
- <fileMode>0775</fileMode>
- </file>
- </files>
-</assembly>
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/Application.java
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/Application.java
deleted file mode 100644
index 4f85f6924f..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/Application.java
+++ /dev/null
@@ -1,34 +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.testcase.impalajdbc;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class Application {
-
- public static void main(String[] args) {
- try {
- SpringApplication.run(Application.class, args);
- } catch (Exception e) {
- // Never do this
- }
- }
-}
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/ImpalaJdbcConfig.java
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/ImpalaJdbcConfig.java
deleted file mode 100644
index 68d4d1d603..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/ImpalaJdbcConfig.java
+++ /dev/null
@@ -1,46 +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.testcase.impalajdbc;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class ImpalaJdbcConfig {
- private static final Logger LOGGER =
LogManager.getLogger(ImpalaJdbcConfig.class);
- private static String URL;
-
- static {
- InputStream inputStream =
ImpalaJdbcConfig.class.getClassLoader().getResourceAsStream("jdbc.properties");
- Properties properties = new Properties();
- try {
- properties.load(inputStream);
- } catch (IOException e) {
- LOGGER.error("Failed to load config", e);
- }
-
- URL = properties.getProperty("impala.url");
- }
-
- public static String getUrl() {
- return URL;
- }
-}
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/SQLExecutor.java
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/SQLExecutor.java
deleted file mode 100644
index ce8155ee39..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/SQLExecutor.java
+++ /dev/null
@@ -1,77 +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.testcase.impalajdbc;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-public class SQLExecutor implements AutoCloseable {
-
- private static final Logger LOGGER =
LogManager.getLogger(SQLExecutor.class);
-
- private Connection connection;
- private static final String STATEMENT_CREATE_TABLE_SQL = "CREATE TABLE IF
NOT EXISTS default.impala_test (test_id BIGINT, test_name STRING);";
- private static final String IMPALA_DRIVER =
"com.cloudera.impala.jdbc.Driver";
-
- public SQLExecutor() throws SQLException {
- try {
- Class.forName(IMPALA_DRIVER);
- } catch (ClassNotFoundException ex) {
- LOGGER.error(ex);
- }
- connection = DriverManager.getConnection(ImpalaJdbcConfig.getUrl());
- connection.createStatement().execute(STATEMENT_CREATE_TABLE_SQL);
- }
-
- public void execute(String sql) throws SQLException {
- Statement statement = connection.createStatement();
- statement.execute(sql);
- }
-
- public void queryData(String sql) throws SQLException {
- PreparedStatement preparedStatement = connection.prepareStatement(sql);
- preparedStatement.executeQuery();
- }
-
- public void queryData(String sql, int id) throws SQLException {
- PreparedStatement preparedStatement = connection.prepareStatement(sql);
- preparedStatement.setInt(1, id);
- preparedStatement.executeQuery();
- }
-
- public void closeConnection() throws SQLException {
- if (this.connection != null) {
- this.connection.close();
- }
- }
-
- @Override
- public void close() throws Exception {
- closeConnection();
- }
-
- public Connection getConnection() {
- return connection;
- }
-}
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/controller/CaseController.java
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/controller/CaseController.java
deleted file mode 100644
index dca9840eb4..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/impalajdbc/controller/CaseController.java
+++ /dev/null
@@ -1,88 +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.testcase.impalajdbc.controller;
-
-import lombok.extern.log4j.Log4j2;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.skywalking.apm.testcase.impalajdbc.SQLExecutor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Socket;
-
-@RestController
-@RequestMapping("/case")
-@Log4j2
-public class CaseController {
-
- private static final Logger LOGGER =
LogManager.getLogger(CaseController.class);
-
- private static final String SUCCESS = "Success";
-
- private static final String STATEMENT_INSERT_DATA_SQL = "INSERT INTO
impala_test VALUES (123, 'test');";
- private static final String STATEMENT_QUERY_DATA_SQL = "SELECT COUNT(*)
FROM impala_test;";
- private static final String STATEMENT_QUERY_DATA_SQL_PARAM = "SELECT
COUNT(*) FROM impala_test WHERE test_id = ?;";
-
- @RequestMapping("/impala-jdbc-2.6.x-scenario")
- @ResponseBody
- public String testcase() throws Exception {
- Thread.sleep(2000);
- return SUCCESS;
- }
-
- @RequestMapping("/healthCheck")
- @ResponseBody
- public String healthCheck() throws Exception {
- if (!telnet("impala-server", 21050, 1000)) { //
- Thread.sleep(5000); // WAIT UTIL CLIENT TIMEOUT
- } else {
- try (SQLExecutor sqlExecute = new SQLExecutor()) {
- sqlExecute.execute(STATEMENT_INSERT_DATA_SQL);
- sqlExecute.queryData(STATEMENT_QUERY_DATA_SQL);
- sqlExecute.queryData(STATEMENT_QUERY_DATA_SQL_PARAM, 123);
- } catch (Exception ex) {
- LOGGER.error("Failed to execute sql.", ex);
- throw ex;
- }
- }
- return SUCCESS;
- }
-
- private boolean telnet(String hostname, int port, int timeout) {
- Socket socket = new Socket();
- boolean isConnected = false;
- try {
- socket.connect(new InetSocketAddress(hostname, port), timeout);
- isConnected = socket.isConnected();
- } catch (IOException e) {
- LOGGER.warn("connect to impala server failed");
- } finally {
- try {
- socket.close();
- } catch (IOException e) {
- LOGGER.warn("close failed");
- }
- }
- return isConnected;
- }
-}
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/application.yaml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/application.yaml
deleted file mode 100644
index 786ec3440e..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/application.yaml
+++ /dev/null
@@ -1,23 +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.
-#
-#
-server:
- port: 8080
- servlet:
- context-path: /impala-jdbc-2.6.x-scenario
-logging:
- config: classpath:log4j2.xml
\ No newline at end of file
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/jdbc.properties
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/jdbc.properties
deleted file mode 100644
index 988356c8f8..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/jdbc.properties
+++ /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.
-
-impala.url=jdbc:impala://impala-server:21050
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/log4j2.xml
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/log4j2.xml
deleted file mode 100644
index 9849ed5a8a..0000000000
---
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- ~
- -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_ERR">
- <PatternLayout charset="UTF-8" pattern="[%d{yyyy-MM-dd
HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="WARN">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git
a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/support-version.list
b/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/support-version.list
deleted file mode 100644
index e795caf90a..0000000000
--- a/test/plugin/scenarios/impala-jdbc-2.6.x-scenario/support-version.list
+++ /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.
-
-# lists your version here (Contains only the last version number of each minor
version.)
-
-2.6.26.1031
-2.6.24.1029
-2.6.20.1024
\ No newline at end of file
