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 fd1f4fe Support for ShardingSphere 5.0.0 (#98)
fd1f4fe is described below
commit fd1f4fe609ef8a98e98bdc092c7389927c76ab22
Author: Dachuan J <[email protected]>
AuthorDate: Fri Jan 28 10:57:23 2022 +0800
Support for ShardingSphere 5.0.0 (#98)
* Update ShardingSphere to 5.0.0
* Change docs
---
.github/workflows/plugins-test.2.yaml | 2 +-
CHANGES.md | 1 +
.../apm-sdk-plugin/shardingsphere-plugins/pom.xml | 2 +-
.../pom.xml | 6 +-
.../apm/plugin/shardingsphere/v500}/Constant.java | 2 +-
.../shardingsphere/v500}/ExecuteInterceptor.java | 2 +-
.../v500}/JDBCRootInvokeInterceptor.java | 2 +-
.../shardingsphere/v500}/ParseInterceptor.java | 2 +-
.../v500}/ProxyRootInvokeInterceptor.java | 2 +-
.../shardingsphere/v500}/RewriteInterceptor.java | 2 +-
.../shardingsphere/v500}/RouteInterceptor.java | 2 +-
...AbstractShardingSphereV500Instrumentation.java} | 4 +-
.../v500}/define/ExecuteInstrumentation.java | 7 +-
.../define/JDBCRootInvokeInstrumentation.java | 7 +-
.../v500}/define/ParseInstrumentation.java | 7 +-
.../define/ProxyRootInvokeInstrumentation.java | 7 +-
.../v500}/define/RewriteInstrumentation.java | 7 +-
.../v500}/define/RouteInstrumentation.java | 7 +-
.../src/main/resources/skywalking-plugin.def | 8 +-
.../shardingsphere/v500}/InterceptorTest.java | 2 +-
.../src/main/resources/skywalking-plugin.def | 21 --
.../setup/service-agent/java-agent/Plugin-list.md | 2 +-
.../service-agent/java-agent/Supported-list.md | 2 +-
.../config/expectedData.yaml | 218 ---------------------
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 213 ++++++++++++++++++++
.../configuration.yml | 4 +-
.../pom.xml | 10 +-
.../src/main/assembly/assembly.xml | 2 +-
.../apm/testcase/shardingsphere/Application.java | 0
.../shardingsphere/controller/CaseController.java | 0
.../shardingsphere/service/api/entity/Order.java | 0
.../service/api/entity/OrderItem.java | 0
.../service/api/repository/CommonRepository.java | 0
.../api/repository/OrderItemRepository.java | 0
.../service/api/repository/OrderRepository.java | 0
.../service/api/service/CommonService.java | 0
.../service/api/service/CommonServiceImpl.java | 0
...dingDatabasesAndTablesConfigurationPrecise.java | 9 +-
.../jdbc/JDBCOrderItemRepositoryImpl.java | 0
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 0
.../service/repository/service/RawPojoService.java | 0
.../service/utility/config/DataSourceUtil.java | 2 +-
.../utility/config/ExampleConfiguration.java | 0
.../src/main/resources/application.properties | 2 +-
.../support-version.list | 2 +-
46 files changed, 275 insertions(+), 295 deletions(-)
diff --git a/.github/workflows/plugins-test.2.yaml
b/.github/workflows/plugins-test.2.yaml
index a67c2a2..19773ad 100644
--- a/.github/workflows/plugins-test.2.yaml
+++ b/.github/workflows/plugins-test.2.yaml
@@ -67,7 +67,7 @@ jobs:
- shardingsphere-3.x-scenario
- shardingsphere-4.0.x-scenario
- shardingsphere-4.x-scenario
- - shardingsphere-5.0.0-beta-scenario
+ - shardingsphere-5.0.0-scenario
- sofarpc-scenario
- solrj-7.x-scenario
- spring-3.0.x-scenario
diff --git a/CHANGES.md b/CHANGES.md
index 3b40298..71b97f1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -25,6 +25,7 @@ Release Notes.
* Migrate base images to Temurin and add images for ARM.
* (Plugin Test) Fix compiling issues in many plugin tests due to they didn't
lock the Spring version, and Spring 3 is
incompatible with 2.x APIs and JDK8 compiling.
+* Support ShardingSphere 5.0.0
#### Documentation
diff --git a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/pom.xml
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/pom.xml
index a934c1a..0e61307 100644
--- a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/pom.xml
@@ -31,7 +31,7 @@
<module>sharding-sphere-3.x-plugin</module>
<module>sharding-sphere-4.0.x-plugin</module>
<module>sharding-sphere-4.1.0-plugin</module>
- <module>shardingsphere-5.0.0-beta-plugin</module>
+ <module>sharding-sphere-5.0.0-plugin</module>
</modules>
<properties>
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/pom.xml
similarity index 93%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/pom.xml
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/pom.xml
index 9f88b25..54e8b64 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/pom.xml
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/pom.xml
@@ -25,15 +25,15 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apm-shardingsphere-5.0.0-beta-plugin</artifactId>
+ <artifactId>apm-shardingsphere-5.0.0-plugin</artifactId>
<packaging>jar</packaging>
- <name>shardingsphere-5.0.0-beta-plugin</name>
+ <name>sharding-sphere-5.0.0-plugin</name>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <shardingsphere.version>5.0.0-beta</shardingsphere.version>
+ <shardingsphere.version>5.0.0</shardingsphere.version>
</properties>
<dependencies>
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/Constant.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/Constant.java
similarity index 93%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/Constant.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/Constant.java
index 6848fcf..acf48f9 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/Constant.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/Constant.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
public final class Constant {
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ExecuteInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ExecuteInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ExecuteInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ExecuteInterceptor.java
index c68abb3..67b6f9f 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ExecuteInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ExecuteInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/JDBCRootInvokeInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/JDBCRootInvokeInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/JDBCRootInvokeInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/JDBCRootInvokeInterceptor.java
index c482fb5..1f6085b 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/JDBCRootInvokeInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/JDBCRootInvokeInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ParseInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ParseInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ParseInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ParseInterceptor.java
index 27188e7..0dd6e73 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ParseInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ParseInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
import org.apache.skywalking.apm.agent.core.context.tag.Tags;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ProxyRootInvokeInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ProxyRootInvokeInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ProxyRootInvokeInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ProxyRootInvokeInterceptor.java
index ea2b24c..677091f 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/ProxyRootInvokeInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/ProxyRootInvokeInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RewriteInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RewriteInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RewriteInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RewriteInterceptor.java
index 8fc2aef..a708dbf 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RewriteInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RewriteInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RouteInterceptor.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RouteInterceptor.java
similarity index 97%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RouteInterceptor.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RouteInterceptor.java
index 33e5b0b..38f5e22 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/RouteInterceptor.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/RouteInterceptor.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.skywalking.apm.agent.core.context.ContextManager;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/AbstractShardingSphereV500BetaInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/AbstractShardingSphereV500Instrumentation.java
similarity index 85%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/AbstractShardingSphereV500BetaInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/AbstractShardingSphereV500Instrumentation.java
index 48aeca9..bd32618 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/AbstractShardingSphereV500BetaInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/AbstractShardingSphereV500Instrumentation.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
-public abstract class AbstractShardingSphereV500BetaInstrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
+public abstract class AbstractShardingSphereV500Instrumentation extends
ClassInstanceMethodsEnhancePluginDefine {
@Override
protected final String[] witnessClasses() {
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ExecuteInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ExecuteInstrumentation.java
similarity index 91%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ExecuteInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ExecuteInstrumentation.java
index 4570a39..0e8bb4c 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ExecuteInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ExecuteInstrumentation.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
@@ -24,7 +24,6 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
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.shardingsphere.v500beta.ExecuteInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -33,7 +32,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
* {@link ExecuteInstrumentation} presents that skywalking intercepts {@link
*
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback}.
*/
-public class ExecuteInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class ExecuteInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String ENHANCE_CLASS =
"org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback";
@@ -48,7 +47,7 @@ public class ExecuteInstrumentation extends
AbstractShardingSphereV500BetaInstru
@Override
public String getMethodsInterceptor() {
- return ExecuteInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.ExecuteInterceptor";
}
@Override
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/JDBCRootInvokeInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/JDBCRootInvokeInstrumentation.java
similarity index 93%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/JDBCRootInvokeInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/JDBCRootInvokeInstrumentation.java
index fcc9c6d..f71c933 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/JDBCRootInvokeInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/JDBCRootInvokeInstrumentation.java
@@ -16,14 +16,13 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.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.match.ClassMatch;
-import
org.apache.skywalking.apm.plugin.shardingsphere.v500beta.JDBCRootInvokeInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments;
@@ -41,7 +40,7 @@ import static
org.apache.skywalking.apm.agent.core.plugin.match.MultiClassNameMa
* <li>{@link
org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSpherePreparedStatement#executeBatch}</li>
* </ul>
*/
-public class JDBCRootInvokeInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class JDBCRootInvokeInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String[] ENHANCE_CLASSES = {
"org.apache.shardingsphere.driver.jdbc.core.statement.ShardingSphereStatement",
@@ -64,7 +63,7 @@ public class JDBCRootInvokeInstrumentation extends
AbstractShardingSphereV500Bet
@Override
public String getMethodsInterceptor() {
- return JDBCRootInvokeInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.JDBCRootInvokeInterceptor";
}
@Override
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ParseInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ParseInstrumentation.java
similarity index 91%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ParseInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ParseInstrumentation.java
index 4feba63..5277bd5 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ParseInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ParseInstrumentation.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
@@ -24,14 +24,13 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
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.shardingsphere.v500beta.ParseInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
/**
* {@link ParseInstrumentation} presents that skywalking intercepts {@link
org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine}.
*/
-public class ParseInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class ParseInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String ENHANCE_CLASS =
"org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine";
@@ -46,7 +45,7 @@ public class ParseInstrumentation extends
AbstractShardingSphereV500BetaInstrume
@Override
public String getMethodsInterceptor() {
- return ParseInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.ParseInterceptor";
}
@Override
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ProxyRootInvokeInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ProxyRootInvokeInstrumentation.java
similarity index 90%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ProxyRootInvokeInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ProxyRootInvokeInstrumentation.java
index ddf194c..38194b1 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/ProxyRootInvokeInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/ProxyRootInvokeInstrumentation.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
@@ -24,14 +24,13 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
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.shardingsphere.v500beta.ProxyRootInvokeInterceptor;
import static net.bytebuddy.matcher.ElementMatchers.named;
/**
* ProxyRootInvokeInstrumentation presents that skywalking intercepts
org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask.
*/
-public class ProxyRootInvokeInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class ProxyRootInvokeInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String ENHANCE_CLASS =
"org.apache.shardingsphere.proxy.frontend.command.CommandExecutorTask";
@@ -46,7 +45,7 @@ public class ProxyRootInvokeInstrumentation extends
AbstractShardingSphereV500Be
@Override
public String getMethodsInterceptor() {
- return ProxyRootInvokeInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.ProxyRootInvokeInterceptor";
}
@Override
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RewriteInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RewriteInstrumentation.java
similarity index 91%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RewriteInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RewriteInstrumentation.java
index b780633..e4409a5 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RewriteInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RewriteInstrumentation.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
@@ -25,12 +25,11 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
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.shardingsphere.v500beta.RewriteInterceptor;
/**
* {@link RewriteInstrumentation} presents that skywalking intercepts {@link
org.apache.shardingsphere.infra.rewrite.SQLRewriteEntry}.
*/
-public class RewriteInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class RewriteInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String ENHANCE_CLASS =
"org.apache.shardingsphere.infra.rewrite.SQLRewriteEntry";
@@ -46,7 +45,7 @@ public class RewriteInstrumentation extends
AbstractShardingSphereV500BetaInstru
@Override
public String getMethodsInterceptor() {
- return RewriteInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.RewriteInterceptor";
}
@Override
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RouteInstrumentation.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RouteInstrumentation.java
similarity index 91%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RouteInstrumentation.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RouteInstrumentation.java
index f31dc03..11e0391 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/define/RouteInstrumentation.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/define/RouteInstrumentation.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500.define;
import net.bytebuddy.description.method.MethodDescription;
import net.bytebuddy.matcher.ElementMatcher;
@@ -25,12 +25,11 @@ import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint;
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.shardingsphere.v500beta.RouteInterceptor;
/**
* {@link RouteInstrumentation} presents that skywalking intercepts {@link
org.apache.shardingsphere.infra.route.engine.SQLRouteEngine}.
*/
-public class RouteInstrumentation extends
AbstractShardingSphereV500BetaInstrumentation {
+public class RouteInstrumentation extends
AbstractShardingSphereV500Instrumentation {
private static final String ENHANCE_CLASS =
"org.apache.shardingsphere.infra.route.engine.SQLRouteEngine";
@@ -46,7 +45,7 @@ public class RouteInstrumentation extends
AbstractShardingSphereV500BetaInstrume
@Override
public String getMethodsInterceptor() {
- return RouteInterceptor.class.getName();
+ return
"org.apache.skywalking.apm.plugin.shardingsphere.v500.RouteInterceptor";
}
@Override
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/resources/skywalking-plugin.def
similarity index 55%
copy from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
copy to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/resources/skywalking-plugin.def
index 6771201..1f3ee69 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/main/resources/skywalking-plugin.def
@@ -13,5 +13,9 @@
# 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
-server.contextPath=/shardingsphere-5.0.0-beta-scenario
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.ProxyRootInvokeInstrumentation
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.JDBCRootInvokeInstrumentation
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.ParseInstrumentation
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.RouteInstrumentation
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.RewriteInstrumentation
+sharding-sphere-5.0.0=org.apache.skywalking.apm.plugin.shardingsphere.v500.define.ExecuteInstrumentation
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/InterceptorTest.java
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/InterceptorTest.java
similarity index 99%
rename from
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/InterceptorTest.java
rename to
apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/InterceptorTest.java
index 149fa07..985c5a5 100644
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500beta/InterceptorTest.java
+++
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/sharding-sphere-5.0.0-plugin/src/test/java/org/apache/skywalking/apm/plugin/shardingsphere/v500/InterceptorTest.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.apm.plugin.shardingsphere.v500beta;
+package org.apache.skywalking.apm.plugin.shardingsphere.v500;
import org.apache.shardingsphere.infra.binder.LogicSQL;
import org.apache.skywalking.apm.agent.core.context.trace.AbstractTracingSpan;
diff --git
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/resources/skywalking-plugin.def
b/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-plugin/src/main/resources/skywalking-plugin.def
deleted file mode 100644
index 25a0f05..0000000
---
a/apm-sniffer/apm-sdk-plugin/shardingsphere-plugins/shardingsphere-5.0.0-beta-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.
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.ProxyRootInvokeInstrumentation
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.JDBCRootInvokeInstrumentation
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.ParseInstrumentation
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.RouteInstrumentation
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.RewriteInstrumentation
-shardingsphere-5.0.0-beta=org.apache.skywalking.apm.plugin.shardingsphere.v500beta.define.ExecuteInstrumentation
diff --git a/docs/en/setup/service-agent/java-agent/Plugin-list.md
b/docs/en/setup/service-agent/java-agent/Plugin-list.md
index 9ebd2d4..d8f5c5f 100644
--- a/docs/en/setup/service-agent/java-agent/Plugin-list.md
+++ b/docs/en/setup/service-agent/java-agent/Plugin-list.md
@@ -79,7 +79,7 @@
- sharding-sphere-3.x
- sharding-sphere-4.0.0
- sharding-sphere-4.1.0
-- shardingsphere-5.0.0-beta
+- sharding-sphere-5.0.0
- sofarpc
- solrj-7.x
- spring-annotation
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 6e1f939..016c45e 100644
--- a/docs/en/setup/service-agent/java-agent/Supported-list.md
+++ b/docs/en/setup/service-agent/java-agent/Supported-list.md
@@ -35,7 +35,7 @@ metrics based on the tracing data.
* Mysql Driver 5.x, 6.x, 8.x
* Oracle Driver (Optional¹)
* H2 Driver 1.3.x -> 1.4.x
- * [ShardingSphere](https://github.com/apache/shardingsphere) 3.0.0, 4.0.0,
4.0.1, 4.1.0, 4.1.1, 5.0.0-beta
+ * [ShardingSphere](https://github.com/apache/shardingsphere) 3.0.0, 4.0.0,
4.0.1, 4.1.0, 4.1.1, 5.0.0
* PostgreSQL Driver 8.x, 9.x, 42.x
* Mariadb Driver 2.x, 1.8
* [InfluxDB](https://github.com/influxdata/influxdb-java) 2.5 -> 2.17
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/config/expectedData.yaml
b/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/config/expectedData.yaml
deleted file mode 100644
index 3796a2d..0000000
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/config/expectedData.yaml
+++ /dev/null
@@ -1,218 +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: shardingsphere-5.0.0-beta-scenario
- segmentSize: gt 0
- segments:
- - segmentId: not null
- spans:
- - operationName: H2/JDBI/PreparedStatement/executeQuery
- parentSpanId: 0
- spanId: 1
- spanLayer: Database
- startTime: not null
- endTime: not null
- componentId: 32
- isError: false
- spanType: Exit
- peer: localhost:-1
- skipAnalysis: false
- tags:
- - {key: db.type, value: sql}
- - {key: db.instance, value: demo_ds_1}
- - {key: db.statement, value: SELECT * FROM t_order_0}
- - operationName: /ShardingSphere/executeSQL/
- parentSpanId: -1
- spanId: 0
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- refs:
- - parentEndpoint: GET:/shardingsphere-5.0.0-beta-scenario/case/execute
- networkAddress: ''
- refType: CrossThread
- parentSpanId: 2
- parentTraceSegmentId: not null
- parentServiceInstance: not null
- parentService: shardingsphere-5.0.0-beta-scenario
- traceId: not null
- - segmentId: not null
- spans:
- - operationName: H2/JDBI/PreparedStatement/executeQuery
- parentSpanId: 0
- spanId: 1
- spanLayer: Database
- startTime: not null
- endTime: not null
- componentId: 32
- isError: false
- spanType: Exit
- peer: localhost:-1
- skipAnalysis: false
- tags:
- - {key: db.type, value: sql}
- - {key: db.instance, value: demo_ds_0}
- - {key: db.statement, value: SELECT * FROM t_order_1}
- - operationName: /ShardingSphere/executeSQL/
- parentSpanId: -1
- spanId: 0
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- refs:
- - parentEndpoint: GET:/shardingsphere-5.0.0-beta-scenario/case/execute
- networkAddress: ''
- refType: CrossThread
- parentSpanId: 2
- parentTraceSegmentId: not null
- parentServiceInstance: not null
- parentService: shardingsphere-5.0.0-beta-scenario
- traceId: not null
- - segmentId: not null
- spans:
- - operationName: H2/JDBI/PreparedStatement/executeQuery
- parentSpanId: 0
- spanId: 1
- spanLayer: Database
- startTime: not null
- endTime: not null
- componentId: 32
- isError: false
- spanType: Exit
- peer: localhost:-1
- skipAnalysis: false
- tags:
- - {key: db.type, value: sql}
- - {key: db.instance, value: demo_ds_1}
- - {key: db.statement, value: SELECT * FROM t_order_1}
- - operationName: /ShardingSphere/executeSQL/
- parentSpanId: -1
- spanId: 0
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- refs:
- - parentEndpoint: GET:/shardingsphere-5.0.0-beta-scenario/case/execute
- networkAddress: ''
- refType: CrossThread
- parentSpanId: 2
- parentTraceSegmentId: not null
- parentServiceInstance: not null
- parentService: shardingsphere-5.0.0-beta-scenario
- traceId: not null
- - segmentId: not null
- spans:
- - operationName: /ShardingSphere/parseSQL/
- parentSpanId: 0
- spanId: 1
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- tags:
- - {key: db.statement, value: SELECT * FROM t_order}
- - operationName: /ShardingSphere/routeSQL/
- parentSpanId: 2
- spanId: 3
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- - operationName: /ShardingSphere/rewriteSQL/
- parentSpanId: 2
- spanId: 4
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- - operationName: H2/JDBI/PreparedStatement/executeQuery
- parentSpanId: 5
- spanId: 6
- spanLayer: Database
- startTime: not null
- endTime: not null
- componentId: 32
- isError: false
- spanType: Exit
- peer: localhost:-1
- skipAnalysis: false
- tags:
- - {key: db.type, value: sql}
- - {key: db.instance, value: demo_ds_0}
- - {key: db.statement, value: SELECT * FROM t_order_0}
- - operationName: /ShardingSphere/executeSQL/
- parentSpanId: 2
- spanId: 5
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- - operationName: /ShardingSphere/JDBCRootInvoke/
- parentSpanId: 0
- spanId: 2
- spanLayer: Unknown
- startTime: not null
- endTime: not null
- componentId: 60
- isError: false
- spanType: Local
- peer: ''
- skipAnalysis: false
- - operationName: GET:/shardingsphere-5.0.0-beta-scenario/case/execute
- parentSpanId: -1
- spanId: 0
- spanLayer: Http
- startTime: not null
- endTime: not null
- componentId: 1
- isError: false
- spanType: Entry
- peer: ''
- skipAnalysis: false
- tags:
- - {key: url, value:
'http://localhost:8080/shardingsphere-5.0.0-beta-scenario/case/execute'}
- - {key: http.method, value: GET}
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/bin/startup.sh
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/bin/startup.sh
similarity index 91%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/bin/startup.sh
rename to test/plugin/scenarios/shardingsphere-5.0.0-scenario/bin/startup.sh
index b78ea92..c4d5a38 100644
--- a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/bin/startup.sh
+++ b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/bin/startup.sh
@@ -18,4 +18,4 @@
home="$(cd "$(dirname $0)"; pwd)"
-java -jar ${agent_opts} ${home}/../libs/shardingsphere-5.0.0-beta-scenario.jar
&
+java -jar ${agent_opts} ${home}/../libs/shardingsphere-5.0.0-scenario.jar &
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml
new file mode 100644
index 0000000..448a41f
--- /dev/null
+++
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/config/expectedData.yaml
@@ -0,0 +1,213 @@
+# 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: shardingsphere-5.0.0-scenario
+ segmentSize: gt 0
+ segments:
+ - segmentId: not null
+ spans:
+ - operationName: H2/JDBI/PreparedStatement/executeQuery
+ operationId: 0
+ parentSpanId: -1
+ spanId: 0
+ spanLayer: Database
+ startTime: not null
+ endTime: not null
+ componentId: 32
+ isError: false
+ spanType: Exit
+ peer: localhost:-1
+ skipAnalysis: false
+ tags:
+ - { key: db.type, value: sql}
+ - { key: db.instance, value: not null}
+ - { key: db.statement, value: not null}
+ - segmentId: not null
+ spans:
+ - operationName: H2/JDBI/Statement/executeUpdate
+ operationId: 0
+ parentSpanId: 0
+ spanId: 1
+ spanLayer: Database
+ startTime: not null
+ endTime: not null
+ componentId: 32
+ isError: false
+ spanType: Exit
+ peer: localhost:-1
+ skipAnalysis: false
+ tags:
+ - { key: db.type, value: sql }
+ - { key: db.instance, value: not null }
+ - { key: db.statement, value: not null }
+ - operationName: /ShardingSphere/executeSQL/
+ operationId: 0
+ parentSpanId: -1
+ spanId: 0
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ refs:
+ - { parentEndpoint:
'HEAD:/shardingsphere-5.0.0-scenario/case/healthCheck', networkAddress: '',
+ refType: CrossThread, parentSpanId: not null,
parentTraceSegmentId: not null,
+ parentServiceInstance: not null, parentService:
shardingsphere-5.0.0-scenario,
+ traceId: not null }
+ - segmentId: not null
+ spans:
+ - operationName: H2/JDBI/Connection/close
+ operationId: 0
+ parentSpanId: -1
+ spanId: 0
+ spanLayer: Database
+ startTime: not null
+ endTime: not null
+ componentId: 32
+ isError: false
+ spanType: Exit
+ peer: localhost:-1
+ skipAnalysis: false
+ tags:
+ - { key: db.type, value: sql }
+ - { key: db.instance, value: not null }
+ - { key: db.statement, value: '' }
+ - segmentId: not null
+ spans:
+ - operationName: H2/JDBI/PreparedStatement/executeQuery
+ operationId: 0
+ parentSpanId: 0
+ spanId: 1
+ spanLayer: Database
+ startTime: not null
+ endTime: not null
+ componentId: 32
+ isError: false
+ spanType: Exit
+ peer: localhost:-1
+ skipAnalysis: false
+ tags:
+ - { key: db.type, value: sql }
+ - { key: db.instance, value: not null }
+ - { key: db.statement, value: not null }
+ - operationName: /ShardingSphere/executeSQL/
+ operationId: 0
+ parentSpanId: -1
+ spanId: 0
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ refs:
+ - { parentEndpoint:
'GET:/shardingsphere-5.0.0-scenario/case/execute', networkAddress: '',
+ refType: CrossThread, parentSpanId: not null,
parentTraceSegmentId: not null,
+ parentServiceInstance: not null, parentService:
shardingsphere-5.0.0-scenario,
+ traceId: not null }
+ - segmentId: not null
+ spans:
+ - operationName: /ShardingSphere/parseSQL/
+ parentSpanId: 0
+ spanId: 1
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ tags:
+ - { key: db.statement, value: not null }
+ - operationName: /ShardingSphere/routeSQL/
+ parentSpanId: 2
+ spanId: 3
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ - operationName: /ShardingSphere/rewriteSQL/
+ parentSpanId: 2
+ spanId: 4
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ - operationName: H2/JDBI/PreparedStatement/executeQuery
+ parentSpanId: 5
+ spanId: 6
+ spanLayer: Database
+ startTime: not null
+ endTime: not null
+ componentId: 32
+ isError: false
+ spanType: Exit
+ peer: localhost:-1
+ skipAnalysis: false
+ tags:
+ - { key: db.type, value: sql }
+ - { key: db.instance, value: not null }
+ - { key: db.statement, value: not null }
+ - operationName: /ShardingSphere/executeSQL/
+ parentSpanId: 2
+ spanId: 5
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ - operationName: /ShardingSphere/JDBCRootInvoke/
+ parentSpanId: 0
+ spanId: 2
+ spanLayer: Unknown
+ startTime: not null
+ endTime: not null
+ componentId: 60
+ isError: false
+ spanType: Local
+ peer: ''
+ skipAnalysis: false
+ - operationName: GET:/shardingsphere-5.0.0-scenario/case/execute
+ parentSpanId: -1
+ spanId: 0
+ spanLayer: Http
+ startTime: not null
+ endTime: not null
+ componentId: 1
+ isError: false
+ spanType: Entry
+ peer: ''
+ skipAnalysis: false
+ tags:
+ - { key: url, value:
'http://localhost:8080/shardingsphere-5.0.0-scenario/case/execute' }
+ - { key: http.method, value: GET }
\ No newline at end of file
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/configuration.yml
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/configuration.yml
similarity index 82%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/configuration.yml
rename to test/plugin/scenarios/shardingsphere-5.0.0-scenario/configuration.yml
index 581097b..72a3ad2 100644
--- a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/configuration.yml
+++ b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/configuration.yml
@@ -15,6 +15,6 @@
# limitations under the License.
type: jvm
-entryService:
http://localhost:8080/shardingsphere-5.0.0-beta-scenario/case/execute
-healthCheck:
http://localhost:8080/shardingsphere-5.0.0-beta-scenario/case/healthCheck
+entryService: http://localhost:8080/shardingsphere-5.0.0-scenario/case/execute
+healthCheck:
http://localhost:8080/shardingsphere-5.0.0-scenario/case/healthCheck
startScript: ./bin/startup.sh
diff --git a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/pom.xml
similarity index 93%
rename from test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml
rename to test/plugin/scenarios/shardingsphere-5.0.0-scenario/pom.xml
index de81967..49f2bcd 100644
--- a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/pom.xml
+++ b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/pom.xml
@@ -22,14 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.example</groupId>
- <artifactId>shardingsphere-5.0.0-beta-scenario</artifactId>
- <version>5.0.0-beta</version>
+ <artifactId>shardingsphere-5.0.0-scenario</artifactId>
+ <version>5.0.0</version>
- <name>skywalking-shardingsphere-5.0.0-beta-scenario</name>
+ <name>skywalking-shardingsphere-5.0.0-scenario</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <test.framework.version>5.0.0-beta</test.framework.version>
+ <test.framework.version>5.0.0</test.framework.version>
<spring.version>4.3.8.RELEASE</spring.version>
<spring.boot.version>1.5.2.RELEASE</spring.boot.version>
@@ -63,7 +63,7 @@
</dependency>
</dependencies>
<build>
- <finalName>shardingsphere-5.0.0-beta-scenario</finalName>
+ <finalName>shardingsphere-5.0.0-scenario</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/assembly/assembly.xml
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/assembly/assembly.xml
similarity index 98%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/assembly/assembly.xml
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/assembly/assembly.xml
index b34d881..5d9e1a8 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/assembly/assembly.xml
+++
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/assembly/assembly.xml
@@ -33,7 +33,7 @@
<files>
<file>
-
<source>${project.build.directory}/shardingsphere-5.0.0-beta-scenario.jar</source>
+
<source>${project.build.directory}/shardingsphere-5.0.0-scenario.jar</source>
<outputDirectory>./libs</outputDirectory>
<fileMode>0775</fileMode>
</file>
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/Application.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/controller/CaseController.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/Order.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/entity/OrderItem.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/CommonRepository.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderItemRepository.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/repository/OrderRepository.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonService.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/api/service/CommonServiceImpl.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
similarity index 93%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
index aa086cc..3774f16 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
+++
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/config/ShardingDatabasesAndTablesConfigurationPrecise.java
@@ -60,6 +60,7 @@ public final class
ShardingDatabasesAndTablesConfigurationPrecise implements Exa
Properties tableOrderItemInlineProperties = new Properties();
tableOrderItemInlineProperties.setProperty("algorithm-expression",
"t_order_item_${order_id % 2}");
shardingRuleConfig.getShardingAlgorithms().put("t_order_item_inline",
new ShardingSphereAlgorithmConfiguration("INLINE",
tableOrderItemInlineProperties));
+ shardingRuleConfig.getKeyGenerators().put("snowflake", new
ShardingSphereAlgorithmConfiguration("SNOWFLAKE", getProperties()));
Properties properties = new Properties();
properties.setProperty(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY.getKey(),
"16");
properties.setProperty(ConfigurationPropertyKey.SQL_SHOW.getKey(),
"true");
@@ -68,7 +69,7 @@ public final class
ShardingDatabasesAndTablesConfigurationPrecise implements Exa
private static ShardingTableRuleConfiguration
getOrderTableRuleConfiguration() {
ShardingTableRuleConfiguration result = new
ShardingTableRuleConfiguration("t_order", "demo_ds_${0..1}.t_order_${[0, 1]}");
- result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "SNOWFLAKE"));
+ result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "snowflake"));
result.setTableShardingStrategy(new
StandardShardingStrategyConfiguration("order_id", "t_order_inline"));
return result;
}
@@ -91,4 +92,10 @@ public final class
ShardingDatabasesAndTablesConfigurationPrecise implements Exa
result.put("demo_ds_1", DataSourceUtil.getDataSource("demo_ds_1"));
return result;
}
+
+ private static Properties getProperties() {
+ Properties result = new Properties();
+ result.setProperty("worker-id", "123");
+ return result;
+ }
}
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderItemRepositoryImpl.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/jdbc/JDBCOrderRepositoryImpl.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/repository/service/RawPojoService.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
similarity index 98%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
index 5a2bfa5..ad2b40e 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
+++
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/DataSourceUtil.java
@@ -34,7 +34,7 @@ public class DataSourceUtil {
public static void createDataSource(final String dataSourceName) {
JdbcDataSource result = new JdbcDataSource();
- result.setUrl("jdbc:h2:mem:" + dataSourceName + ";DB_CLOSE_DELAY=-1");
+ result.setUrl("jdbc:h2:mem:" + dataSourceName +
";DB_CLOSE_DELAY=-1;;DATABASE_TO_UPPER=FALSE");
result.setUser("sa");
result.setPassword("");
DATA_SOURCE_MAP.put(dataSourceName, result);
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java
similarity index 100%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/java/org/apache/skywalking/apm/testcase/shardingsphere/service/utility/config/ExampleConfiguration.java
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/resources/application.properties
similarity index 93%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/resources/application.properties
index 6771201..a8a85b2 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/src/main/resources/application.properties
+++
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/src/main/resources/application.properties
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
server.port=8080
-server.contextPath=/shardingsphere-5.0.0-beta-scenario
+server.contextPath=/shardingsphere-5.0.0-scenario
diff --git
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/support-version.list
b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/support-version.list
similarity index 98%
rename from
test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/support-version.list
rename to
test/plugin/scenarios/shardingsphere-5.0.0-scenario/support-version.list
index 8da735b..e1674dd 100644
---
a/test/plugin/scenarios/shardingsphere-5.0.0-beta-scenario/support-version.list
+++ b/test/plugin/scenarios/shardingsphere-5.0.0-scenario/support-version.list
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-5.0.0-beta
+5.0.0
