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 958510f9e18 Remove useless
AgentE2ETestEnvironment.agentPluginContainer (#32217)
958510f9e18 is described below
commit 958510f9e187a9b5cca8e9ef40ce0cf85f45fa80
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 21 20:14:45 2024 +0800
Remove useless AgentE2ETestEnvironment.agentPluginContainer (#32217)
* Remove useless PluginType
* Remove useless AgentE2ETestEnvironment.agentPluginContainer
* Remove useless AgentE2ETestEnvironment.agentPluginContainer
* Remove useless AgentE2ETestEnvironment.agentPluginContainer
* Rename AgentE2EEnvironmentProperties
* Rename AgentE2EEnvironmentProperties
* Rename AgentE2EEnvironmentProperties
---
.../agent/common/env/AgentE2ETestEnvironment.java | 71 ++++++++--------------
.../AgentE2EEnvironmentProperties.java} | 6 +-
.../env/{ => props}/AgentE2ETestConfiguration.java | 4 +-
.../env/props/AgentE2ETestImageConfiguration.java | 53 ++++++++++++++++
.../AgentE2ETestCaseArgumentsProvider.java | 2 +-
.../test/e2e/agent/file/FilePluginE2EIT.java | 2 +-
.../test/e2e/agent/file/cases/LogE2ETestCase.java | 2 +-
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 2 +-
.../e2e/agent/metrics/cases/MetricE2ETestCase.java | 2 +-
.../metrics/container/PrometheusContainer.java | 2 +-
.../container/PrometheusContainerFactory.java | 2 +-
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 2 +-
.../e2e/agent/jaeger/cases/JaegerE2ETestCase.java | 2 +-
.../agent/jaeger/container/JaegerContainer.java | 2 +-
.../jaeger/container/JaegerContainerFactory.java | 2 +-
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 2 +-
.../e2e/agent/zipkin/cases/ZipkinE2ETestCase.java | 2 +-
.../agent/zipkin/container/ZipkinContainer.java | 2 +-
.../zipkin/container/ZipkinContainerFactory.java | 2 +-
19 files changed, 98 insertions(+), 66 deletions(-)
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
index 1b63f84c063..b0c87c3e6a6 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
@@ -17,7 +17,9 @@
package org.apache.shardingsphere.test.e2e.agent.common.env;
+import lombok.AccessLevel;
import lombok.Getter;
+import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.test.e2e.agent.common.container.ITContainers;
@@ -26,6 +28,8 @@ import
org.apache.shardingsphere.test.e2e.agent.common.container.ShardingSphereJ
import
org.apache.shardingsphere.test.e2e.agent.common.container.ShardingSphereProxyContainer;
import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginContainerFactory;
import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginHTTPEndpointProvider;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestImageConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.common.fixture.executor.ProxyRequestExecutor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
@@ -39,24 +43,24 @@ import java.time.Duration;
import java.util.Collection;
import java.util.LinkedList;
import java.util.Optional;
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
/**
* Agent E2E test environment.
*/
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
@Slf4j
public final class AgentE2ETestEnvironment {
private static final AgentE2ETestEnvironment INSTANCE = new
AgentE2ETestEnvironment();
- private final AgentE2ETestConfiguration testConfig;
+ private final AgentE2ETestConfiguration testConfig =
AgentE2ETestConfiguration.getInstance();
+
+ private final AgentE2ETestImageConfiguration imageConfig =
AgentE2ETestImageConfiguration.getInstance();
@Getter
private final Collection<String> actualLogs = new LinkedList<>();
- private DockerITContainer agentPluginContainer;
-
private ITContainers containers;
@Getter
@@ -66,24 +70,6 @@ public final class AgentE2ETestEnvironment {
private boolean initialized;
- private String mysqlImage;
-
- private String proxyImage;
-
- private String jdbcProjectImage;
-
- private AgentE2ETestEnvironment() {
- testConfig = AgentE2ETestConfiguration.getInstance();
- initContainerImage();
- }
-
- private void initContainerImage() {
- Properties imageProps =
EnvironmentProperties.loadProperties("env/image.properties");
- proxyImage = imageProps.getProperty("proxy.image",
"apache/shardingsphere-proxy-agent-test:latest");
- jdbcProjectImage = imageProps.getProperty("jdbc.project.image",
"apache/shardingsphere-jdbc-agent-test:latest");
- mysqlImage = imageProps.getProperty("mysql.image", "mysql:8.0");
- }
-
/**
* Get instance.
*
@@ -100,30 +86,31 @@ public final class AgentE2ETestEnvironment {
if (!AgentE2ETestConfiguration.getInstance().containsTestParameter()) {
return;
}
+ Optional<DockerITContainer> agentPluginContainer =
TypedSPILoader.findService(AgentPluginContainerFactory.class,
testConfig.getPluginType()).map(AgentPluginContainerFactory::create);
if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
- createProxyEnvironment();
+ createProxyEnvironment(agentPluginContainer);
} else if
(AdapterType.JDBC.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
- createJDBCEnvironment();
+ createJDBCEnvironment(agentPluginContainer);
}
log.info("Waiting to collect data ...");
long collectDataWaitSeconds = testConfig.getCollectDataWaitSeconds();
if (collectDataWaitSeconds > 0L) {
Awaitility.await().ignoreExceptions().atMost(Duration.ofSeconds(collectDataWaitSeconds
+ 1L)).pollDelay(collectDataWaitSeconds, TimeUnit.SECONDS).until(() -> true);
}
- agentPluginURL = null == agentPluginContainer ? null : new
AgentPluginHTTPEndpointProvider().getHURL(agentPluginContainer,
testConfig.getDefaultExposePort());
+ agentPluginURL = agentPluginContainer.map(optional -> new
AgentPluginHTTPEndpointProvider().getHURL(optional,
testConfig.getDefaultExposePort())).orElse(null);
initialized = true;
}
- private void createProxyEnvironment() {
+ @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+ private void createProxyEnvironment(final Optional<DockerITContainer>
agentPluginContainer) {
containers = new ITContainers();
- MySQLContainer storageContainer = new MySQLContainer(mysqlImage);
+ MySQLContainer storageContainer = new
MySQLContainer(imageConfig.getMysqlImage());
GovernanceContainer governanceContainer =
GovernanceContainerFactory.newInstance("ZooKeeper");
- ShardingSphereProxyContainer proxyContainer = new
ShardingSphereProxyContainer(proxyImage, testConfig.getPluginType(),
testConfig.isLogEnabled() ? this::collectLogs : null);
+ ShardingSphereProxyContainer proxyContainer = new
ShardingSphereProxyContainer(imageConfig.getProxyImage(),
testConfig.getPluginType(), testConfig.isLogEnabled() ? this::collectLogs :
null);
proxyContainer.dependsOn(storageContainer);
proxyContainer.dependsOn(governanceContainer);
- Optional<DockerITContainer> pluginContainer =
getAgentPluginContainer();
- pluginContainer.ifPresent(proxyContainer::dependsOn);
- pluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
+ agentPluginContainer.ifPresent(proxyContainer::dependsOn);
+ agentPluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
containers.registerContainer(storageContainer);
containers.registerContainer(governanceContainer);
containers.registerContainer(proxyContainer);
@@ -135,28 +122,20 @@ public final class AgentE2ETestEnvironment {
}
}
- private void createJDBCEnvironment() {
+ @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+ private void createJDBCEnvironment(final Optional<DockerITContainer>
agentPluginContainer) {
containers = new ITContainers();
- Optional<DockerITContainer> pluginContainer =
getAgentPluginContainer();
- MySQLContainer storageContainer = new MySQLContainer(mysqlImage);
- ShardingSphereJdbcContainer jdbcContainer = new
ShardingSphereJdbcContainer(jdbcProjectImage, testConfig.getPluginType(),
testConfig.isLogEnabled() ? this::collectLogs : null);
+ MySQLContainer storageContainer = new
MySQLContainer(imageConfig.getMysqlImage());
+ ShardingSphereJdbcContainer jdbcContainer = new
ShardingSphereJdbcContainer(
+ imageConfig.getJdbcProjectImage(), testConfig.getPluginType(),
testConfig.isLogEnabled() ? this::collectLogs : null);
jdbcContainer.dependsOn(storageContainer);
- pluginContainer.ifPresent(jdbcContainer::dependsOn);
- pluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
+ agentPluginContainer.ifPresent(jdbcContainer::dependsOn);
+ agentPluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
containers.registerContainer(storageContainer);
containers.registerContainer(jdbcContainer);
containers.start();
}
- private Optional<DockerITContainer> getAgentPluginContainer() {
- Optional<AgentPluginContainerFactory> agentPluginContainerFactory =
TypedSPILoader.findService(AgentPluginContainerFactory.class,
testConfig.getPluginType());
- if (agentPluginContainerFactory.isPresent()) {
- agentPluginContainer = agentPluginContainerFactory.get().create();
- return Optional.of(agentPluginContainer);
- }
- return Optional.empty();
- }
-
private void collectLogs(final OutputFrame outputFrame) {
if (!initialized) {
actualLogs.add(outputFrame.getUtf8StringWithoutLineEnding());
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2EEnvironmentProperties.java
similarity index 91%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2EEnvironmentProperties.java
index 3252bc03b3e..e3be38b56bd 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2EEnvironmentProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.env;
+package org.apache.shardingsphere.test.e2e.agent.common.env.props;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -26,10 +26,10 @@ import java.io.InputStream;
import java.util.Properties;
/**
- * Environment properties.
+ * Agent E2E environment properties.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class EnvironmentProperties {
+public final class AgentE2EEnvironmentProperties {
/**
* Load properties.
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestConfiguration.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestConfiguration.java
similarity index 93%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestConfiguration.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestConfiguration.java
index 6c57e6b5f3a..fa0f70fbfbf 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestConfiguration.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.env;
+package org.apache.shardingsphere.test.e2e.agent.common.env.props;
import com.google.common.base.Strings;
import lombok.Getter;
@@ -43,7 +43,7 @@ public final class AgentE2ETestConfiguration {
private final long collectDataWaitSeconds;
private AgentE2ETestConfiguration() {
- Properties envProps =
EnvironmentProperties.loadProperties("env/engine-env.properties");
+ Properties envProps =
AgentE2EEnvironmentProperties.loadProperties("env/engine-env.properties");
adapter = envProps.getProperty("it.env.adapter");
pluginType = envProps.getProperty("it.env.plugin.type");
pluginImageName = envProps.getProperty("it.env.plugin.image");
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestImageConfiguration.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestImageConfiguration.java
new file mode 100644
index 00000000000..6cd5537afea
--- /dev/null
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/props/AgentE2ETestImageConfiguration.java
@@ -0,0 +1,53 @@
+/*
+ * 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.shardingsphere.test.e2e.agent.common.env.props;
+
+import lombok.Getter;
+
+import java.util.Properties;
+
+/**
+ * Agent E2E test image configuration.
+ */
+@Getter
+public final class AgentE2ETestImageConfiguration {
+
+ private static final AgentE2ETestImageConfiguration INSTANCE = new
AgentE2ETestImageConfiguration();
+
+ private final String mysqlImage;
+
+ private final String proxyImage;
+
+ private final String jdbcProjectImage;
+
+ private AgentE2ETestImageConfiguration() {
+ Properties imageProps =
AgentE2EEnvironmentProperties.loadProperties("env/image.properties");
+ mysqlImage = imageProps.getProperty("mysql.image", "mysql:8.0");
+ proxyImage = imageProps.getProperty("proxy.image",
"apache/shardingsphere-proxy-agent-test:latest");
+ jdbcProjectImage = imageProps.getProperty("jdbc.project.image",
"apache/shardingsphere-jdbc-agent-test:latest");
+ }
+
+ /**
+ * Get instance.
+ *
+ * @return singleton instance
+ */
+ public static AgentE2ETestImageConfiguration getInstance() {
+ return INSTANCE;
+ }
+}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestCaseArgumentsProvider.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestCaseArgumentsProvider.java
index 065217a7bca..c61c8d3497b 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestCaseArgumentsProvider.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestCaseArgumentsProvider.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.agent.common.framework;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCases;
import
org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCasesLoader;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.ArgumentsProvider;
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
index a7474e14a1c..56c5ee41974 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.file;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
index 8b5410a13b7..34bc378f388 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.file.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
index 4937841f4d8..b6d32e33afb 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.metrics;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
index 83888a065c2..0168bb5c252 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCase.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.agent.metrics.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
index 4100b645e9e..f5f9e4041b9 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.metrics.container;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
index 93ba9226d9c..5377f7294ed 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/container/PrometheusContainerFactory.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.agent.metrics.container;
import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginContainerFactory;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
/**
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
index 8be1a423775..9fcb0d3a7c5 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
index 56aa3398872..897aee5deec 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.jaeger.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
index bb9126002f4..75e804c970e 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger.container;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
index 430cf5cbc4a..136bdd87575 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/container/JaegerContainerFactory.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger.container;
import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginContainerFactory;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
/**
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
index b7d46e74f60..da78b141110 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
index 01b471756d5..a309dfd9e21 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.zipkin.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
index 0cca42cb6c6..f4f6126b669 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainer.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin.container;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
index 8c0448b9e70..a756aecdaa7 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/container/ZipkinContainerFactory.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin.container;
import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginContainerFactory;
-import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.props.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
/**
