You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/29 17:37:41 UTC
[shardingsphere] branch master updated: Fix agent test cases (#23175)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 200e4fa9b4a Fix agent test cases (#23175)
200e4fa9b4a is described below
commit 200e4fa9b4aebf4f2f63d3fed17c77b478940d79
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 30 01:37:33 2022 +0800
Fix agent test cases (#23175)
* Rename shardingsphere-agent-bootstrap to shardingsphere-agent-core
* Revise javadoc
* Fix agent test cases
---
.../shardingsphere/agent/core/classloader/AgentClassLoader.java | 2 +-
.../plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java | 4 ++--
.../agent/core/transformer/AgentTransformerTest.java | 4 ++--
agent/core/src/test/resources/conf/advisors.yaml | 4 ++--
.../core/config/validator/PluginConfigurationValidator.java | 1 +
agent/plugins/logging/pom.xml | 2 ++
agent/plugins/metrics/pom.xml | 1 +
agent/plugins/tracing/pom.xml | 8 ++++++++
agent/plugins/tracing/type/pom.xml | 7 +------
9 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
index 65cb6d737a6..5f284f4ddfd 100644
--- a/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
+++ b/agent/core/src/main/java/org/apache/shardingsphere/agent/core/classloader/AgentClassLoader.java
@@ -36,7 +36,7 @@ import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
/**
- * Agent class loader.
+ * Agent class loader.
*/
public final class AgentClassLoader extends ClassLoader {
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
index 9f3f4b315b4..ce274bf7431 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/yaml/loader/YamlAdvisorsConfigurationLoaderTest.java
@@ -42,8 +42,8 @@ public final class YamlAdvisorsConfigurationLoaderTest {
}
private void assertYamlAdvisorConfiguration(final YamlAdvisorConfiguration actual) {
- assertThat(actual.getTarget(), is("org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlTargetObjectFixture"));
- assertThat(actual.getAdvice(), is("org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlAdviceFixture"));
+ assertThat(actual.getTarget(), is("org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlTargetObjectFixture"));
+ assertThat(actual.getAdvice(), is("org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlAdviceFixture"));
assertThat(actual.getPointcuts().size(), is(8));
List<YamlPointcutConfiguration> actualYamlPointcutConfigs = new ArrayList<>(actual.getPointcuts());
assertYamlPointcutConfiguration(actualYamlPointcutConfigs.get(0), null, "constructor", Collections.emptyList());
diff --git a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
index 694073ba2a9..dd8db56eebe 100644
--- a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
+++ b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/transformer/AgentTransformerTest.java
@@ -55,7 +55,7 @@ public final class AgentTransformerTest {
Map<String, AdvisorConfiguration> advisorConfigs = Collections.singletonMap(advisorConfig.getTargetClassName(), advisorConfig);
byteBuddyAgent = new AgentBuilder.Default().with(new ByteBuddy().with(TypeValidation.ENABLED))
.ignore(ElementMatchers.isSynthetic()).or(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.")
- .and(ElementMatchers.not(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.bootstrap.transformer.fixture"))))
+ .and(ElementMatchers.not(ElementMatchers.nameStartsWith("org.apache.shardingsphere.agent.core.transformer.fixture"))))
.with(AgentBuilder.RedefinitionStrategy.RETRANSFORMATION)
.with(new LoggingListener())
.type(new AgentJunction(advisorConfigs))
@@ -65,7 +65,7 @@ public final class AgentTransformerTest {
}
private static AdvisorConfiguration createAdvisorConfiguration() {
- AdvisorConfiguration result = new AdvisorConfiguration("org.apache.shardingsphere.agent.bootstrap.transformer.fixture.targeted.TargetObjectFixture");
+ AdvisorConfiguration result = new AdvisorConfiguration("org.apache.shardingsphere.agent.core.transformer.fixture.targeted.TargetObjectFixture");
result.getAdvisors().add(new MethodAdvisorConfiguration(ElementMatchers.isConstructor().and(ElementMatchers.takesArguments(1)), FooAdvice.class.getName()));
result.getAdvisors().add(new MethodAdvisorConfiguration(ElementMatchers.isConstructor().and(ElementMatchers.takesArguments(1)), BarAdvice.class.getName()));
result.getAdvisors().add(new MethodAdvisorConfiguration(ElementMatchers.named("call"), FooAdvice.class.getName()));
diff --git a/agent/core/src/test/resources/conf/advisors.yaml b/agent/core/src/test/resources/conf/advisors.yaml
index 22b2201836a..12f584edbb0 100644
--- a/agent/core/src/test/resources/conf/advisors.yaml
+++ b/agent/core/src/test/resources/conf/advisors.yaml
@@ -16,8 +16,8 @@
#
advisors:
- - target: org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlTargetObjectFixture
- advice: org.apache.shardingsphere.agent.bootstrap.plugin.yaml.fixture.YamlAdviceFixture
+ - target: org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlTargetObjectFixture
+ advice: org.apache.shardingsphere.agent.core.plugin.yaml.fixture.YamlAdviceFixture
pointcuts:
- type: constructor
- type: constructor
diff --git a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
index 7d415f0b088..d2877ffafbd 100644
--- a/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
+++ b/agent/plugins/core/src/main/java/org/apache/shardingsphere/agent/plugin/core/config/validator/PluginConfigurationValidator.java
@@ -52,6 +52,7 @@ public final class PluginConfigurationValidator {
/**
* Validate port.
+ *
* @param type plugin type
* @param pluginConfig to be validated plugin configuration
*/
diff --git a/agent/plugins/logging/pom.xml b/agent/plugins/logging/pom.xml
index 5723799498a..487e071ff7b 100644
--- a/agent/plugins/logging/pom.xml
+++ b/agent/plugins/logging/pom.xml
@@ -35,6 +35,7 @@
<properties>
<target.directory>${project.basedir}/../target/plugins</target.directory>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -43,6 +44,7 @@
<scope>provided</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/agent/plugins/metrics/pom.xml b/agent/plugins/metrics/pom.xml
index a049e3fc86d..b17251e050a 100644
--- a/agent/plugins/metrics/pom.xml
+++ b/agent/plugins/metrics/pom.xml
@@ -32,6 +32,7 @@
<module>core</module>
<module>type</module>
</modules>
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
diff --git a/agent/plugins/tracing/pom.xml b/agent/plugins/tracing/pom.xml
index 6665ee29a9c..b2ca57b003b 100644
--- a/agent/plugins/tracing/pom.xml
+++ b/agent/plugins/tracing/pom.xml
@@ -41,6 +41,13 @@
<dependencyManagement>
<dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-agent-plugin-core</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
@@ -51,6 +58,7 @@
<artifactId>opentracing-util</artifactId>
<version>${opentracing.version}</version>
</dependency>
+
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-mock</artifactId>
diff --git a/agent/plugins/tracing/type/pom.xml b/agent/plugins/tracing/type/pom.xml
index 36cfbf4e573..00a1a7aa2bb 100644
--- a/agent/plugins/tracing/type/pom.xml
+++ b/agent/plugins/tracing/type/pom.xml
@@ -46,18 +46,13 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.shardingsphere</groupId>
<artifactId>shardingsphere-agent-tracing-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-agent-plugin-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>