This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 17e8cc3ab56 Add AgentPluginHTTPEndpointProvider (#32213)
17e8cc3ab56 is described below
commit 17e8cc3ab56d10b28638bfb799af366928b5ee8d
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 21 15:44:58 2024 +0800
Add AgentPluginHTTPEndpointProvider (#32213)
* Add ContainerHTTPEndpointProvider
* Rename AgentPluginHTTPEndpointProvider
* Rename AgentPluginHTTPEndpointProvider
* Rename AgentPluginHTTPEndpointProvider
* Rename AgentPluginHTTPEndpointProvider
---
.../AgentPluginHTTPEndpointProvider.java} | 36 ++++------
.../container/{ => plugin}/JaegerContainer.java | 17 ++---
.../{ => plugin}/PrometheusContainer.java | 13 ++--
.../container/{ => plugin}/ZipkinContainer.java | 13 ++--
.../common/env/AgentE2ETestConfiguration.java | 12 +++-
.../agent/common/env/AgentE2ETestEnvironment.java | 79 ++++++++--------------
.../src/test/resources/env/engine-env.properties | 2 +-
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 2 +-
.../src/test/resources/env/engine-env.properties | 4 +-
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 2 +-
.../src/test/resources/env/engine-env.properties | 6 +-
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 2 +-
.../src/test/resources/env/engine-env.properties | 4 +-
13 files changed, 79 insertions(+), 113 deletions(-)
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/AgentPluginHTTPEndpointProvider.java
similarity index 59%
copy from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
copy to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/AgentPluginHTTPEndpointProvider.java
index 37d688dd224..6f7f129379f 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/AgentPluginHTTPEndpointProvider.java
@@ -15,31 +15,23 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.container;
+package org.apache.shardingsphere.test.e2e.agent.common.container.plugin;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
-import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-public final class ZipkinContainer extends DockerITContainer {
-
- private static final int EXPOSED_PORT = 9411;
-
- public ZipkinContainer(final String image) {
- super("zipkin", image);
- }
-
- @Override
- protected void configure() {
- withExposedPorts(EXPOSED_PORT);
- setWaitStrategy(new HttpWaitStrategy().forPort(EXPOSED_PORT));
- }
-
- @Override
- public String getAbbreviation() {
- return "zipkin";
- }
+/**
+ * Agent plugin HTTP endpoint provider.
+ */
+public final class AgentPluginHTTPEndpointProvider {
- public String getHttpUrl() {
- return String.format("http://%s:%s";, getHost(),
getMappedPort(EXPOSED_PORT));
+ /**
+ * Get HTTP URL.
+ *
+ * @param container docker container
+ * @param defaultExposePort default expose port
+ * @return HTTP URL
+ */
+ public String getHURL(final DockerITContainer container, final int
defaultExposePort) {
+ return String.format("http://%s:%s";, container.getHost(),
container.getMappedPort(defaultExposePort));
}
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/JaegerContainer.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/JaegerContainer.java
similarity index 77%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/JaegerContainer.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/JaegerContainer.java
index 2b0802c1538..3d19155b83b 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/JaegerContainer.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/JaegerContainer.java
@@ -15,12 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.container;
+package org.apache.shardingsphere.test.e2e.agent.common.container.plugin;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.Map;
/**
@@ -34,23 +35,17 @@ public final class JaegerContainer extends
DockerITContainer {
@Override
protected void configure() {
- withExposedPorts(4317, 16686);
+ withExposedPorts(4317,
AgentE2ETestConfiguration.getInstance().getDefaultExposePort());
getContainerEnvironments().forEach(this::addEnv);
- setWaitStrategy(new HttpWaitStrategy().forPort(16686));
+ setWaitStrategy(new
HttpWaitStrategy().forPort(AgentE2ETestConfiguration.getInstance().getDefaultExposePort()));
}
private Map<String, String> getContainerEnvironments() {
- Map<String, String> result = new HashMap<>(1, 1F);
- result.put("COLLECTOR_OTLP_ENABLED", Boolean.TRUE.toString());
- return result;
+ return Collections.singletonMap("COLLECTOR_OTLP_ENABLED",
Boolean.TRUE.toString());
}
@Override
public String getAbbreviation() {
return "jaeger";
}
-
- public String getHttpUrl() {
- return String.format("http://%s:%s";, getHost(), getMappedPort(16686));
- }
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/PrometheusContainer.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/PrometheusContainer.java
similarity index 82%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/PrometheusContainer.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/PrometheusContainer.java
index 6f0032f1f49..09aef280b34 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/PrometheusContainer.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/PrometheusContainer.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.container;
+package org.apache.shardingsphere.test.e2e.agent.common.container.plugin;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
@@ -26,8 +27,6 @@ import
org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
*/
public final class PrometheusContainer extends DockerITContainer {
- private static final int EXPOSED_PORT = 9090;
-
public PrometheusContainer(final String image) {
super("prometheus", image);
}
@@ -35,12 +34,8 @@ public final class PrometheusContainer extends
DockerITContainer {
@Override
protected void configure() {
withClasspathResourceMapping("/env/prometheus/prometheus.yml",
"/etc/prometheus/prometheus.yml", BindMode.READ_ONLY);
- setWaitStrategy(new
HttpWaitStrategy().forPort(EXPOSED_PORT).forPath("/-/ready"));
- withExposedPorts(EXPOSED_PORT);
- }
-
- public String getHttpUrl() {
- return String.format("http://%s:%s";, getHost(),
getMappedPort(EXPOSED_PORT));
+ setWaitStrategy(new
HttpWaitStrategy().forPort(AgentE2ETestConfiguration.getInstance().getDefaultExposePort()).forPath("/-/ready"));
+
withExposedPorts(AgentE2ETestConfiguration.getInstance().getDefaultExposePort());
}
@Override
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/ZipkinContainer.java
similarity index 81%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/ZipkinContainer.java
index 37d688dd224..9c282a27cae 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/ZipkinContainer.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/container/plugin/ZipkinContainer.java
@@ -15,31 +15,26 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.container;
+package org.apache.shardingsphere.test.e2e.agent.common.container.plugin;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
public final class ZipkinContainer extends DockerITContainer {
- private static final int EXPOSED_PORT = 9411;
-
public ZipkinContainer(final String image) {
super("zipkin", image);
}
@Override
protected void configure() {
- withExposedPorts(EXPOSED_PORT);
- setWaitStrategy(new HttpWaitStrategy().forPort(EXPOSED_PORT));
+
withExposedPorts(AgentE2ETestConfiguration.getInstance().getDefaultExposePort());
+ setWaitStrategy(new
HttpWaitStrategy().forPort(AgentE2ETestConfiguration.getInstance().getDefaultExposePort()));
}
@Override
public String getAbbreviation() {
return "zipkin";
}
-
- public String getHttpUrl() {
- return String.format("http://%s:%s";, getHost(),
getMappedPort(EXPOSED_PORT));
- }
}
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/AgentE2ETestConfiguration.java
index 526d66de0c0..5291373cacb 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/AgentE2ETestConfiguration.java
@@ -32,14 +32,20 @@ public final class AgentE2ETestConfiguration {
private final String adapter;
- private final String plugin;
+ private final String pluginType;
+
+ private final String pluginImageName;
+
+ private final int defaultExposePort;
private final long collectDataWaitSeconds;
private AgentE2ETestConfiguration() {
Properties envProps =
EnvironmentProperties.loadProperties("env/engine-env.properties");
adapter = envProps.getProperty("it.env.adapter");
- plugin = envProps.getProperty("it.env.plugin");
+ pluginType = envProps.getProperty("it.env.plugin.type");
+ pluginImageName = envProps.getProperty("it.env.plugin.image");
+ defaultExposePort =
Integer.parseInt(envProps.getProperty("it.env.plugin.default.expose.port",
"0"));
collectDataWaitSeconds =
Long.parseLong(envProps.getProperty("it.env.collect.data.wait.seconds", "0"));
}
@@ -58,6 +64,6 @@ public final class AgentE2ETestConfiguration {
* @return contains or not
*/
public boolean containsTestParameter() {
- return !Strings.isNullOrEmpty(adapter) &&
!Strings.isNullOrEmpty(plugin);
+ return !Strings.isNullOrEmpty(adapter) &&
!Strings.isNullOrEmpty(pluginType);
}
}
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 049f778ef3e..8e0f2bf4292 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
@@ -19,13 +19,14 @@ package org.apache.shardingsphere.test.e2e.agent.common.env;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
+import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.AgentPluginHTTPEndpointProvider;
import org.apache.shardingsphere.test.e2e.agent.common.container.ITContainers;
-import
org.apache.shardingsphere.test.e2e.agent.common.container.JaegerContainer;
+import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.JaegerContainer;
import
org.apache.shardingsphere.test.e2e.agent.common.container.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.agent.common.container.PrometheusContainer;
+import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.PrometheusContainer;
import
org.apache.shardingsphere.test.e2e.agent.common.container.ShardingSphereJdbcContainer;
import
org.apache.shardingsphere.test.e2e.agent.common.container.ShardingSphereProxyContainer;
-import
org.apache.shardingsphere.test.e2e.agent.common.container.ZipkinContainer;
+import
org.apache.shardingsphere.test.e2e.agent.common.container.plugin.ZipkinContainer;
import org.apache.shardingsphere.test.e2e.agent.common.enums.PluginType;
import
org.apache.shardingsphere.test.e2e.agent.common.fixture.executor.ProxyRequestExecutor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
@@ -56,35 +57,19 @@ public final class AgentE2ETestEnvironment {
@Getter
private final Collection<String> actualLogs = new LinkedList<>();
- @Getter
- private String prometheusHttpUrl;
+ private DockerITContainer agentPluginContainer;
- @Getter
- private String zipKinHttpUrl;
+ private ITContainers containers;
@Getter
- private String jaegerHttpUrl;
-
- private PrometheusContainer prometheusContainer;
-
- private ZipkinContainer zipkinContainer;
-
- private JaegerContainer jaegerContainer;
-
- private ITContainers containers;
+ private String agentPluginURL;
private ProxyRequestExecutor proxyRequestExecutor;
private boolean initialized;
- private String jaegerImage;
-
- private String zipkinImage;
-
private String mysqlImage;
- private String prometheusImage;
-
private String proxyImage;
private String jdbcProjectImage;
@@ -99,9 +84,6 @@ public final class AgentE2ETestEnvironment {
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");
- jaegerImage = imageProps.getProperty("jaeger.image",
"jaegertracing/all-in-one:1.41");
- zipkinImage = imageProps.getProperty("zipkin.image",
"openzipkin/zipkin:3.2");
- prometheusImage = imageProps.getProperty("prometheus.image",
"prom/prometheus:v2.41.0");
}
/**
@@ -130,6 +112,7 @@ public final class AgentE2ETestEnvironment {
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());
initialized = true;
}
@@ -137,19 +120,18 @@ public final class AgentE2ETestEnvironment {
containers = new ITContainers();
MySQLContainer storageContainer = new MySQLContainer(mysqlImage);
GovernanceContainer governanceContainer =
GovernanceContainerFactory.newInstance("ZooKeeper");
- ShardingSphereProxyContainer proxyContainer =
PluginType.FILE.getValue().equalsIgnoreCase(testConfig.getPlugin())
- ? new ShardingSphereProxyContainer(proxyImage,
testConfig.getPlugin(), this::collectLogs)
- : new ShardingSphereProxyContainer(proxyImage,
testConfig.getPlugin());
+ ShardingSphereProxyContainer proxyContainer =
PluginType.FILE.getValue().equalsIgnoreCase(testConfig.getPluginType())
+ ? new ShardingSphereProxyContainer(proxyImage,
testConfig.getPluginType(), this::collectLogs)
+ : new ShardingSphereProxyContainer(proxyImage,
testConfig.getPluginType());
proxyContainer.dependsOn(storageContainer);
proxyContainer.dependsOn(governanceContainer);
- Optional<DockerITContainer> pluginContainer = getPluginContainer();
+ Optional<DockerITContainer> pluginContainer =
getAgentPluginContainer();
pluginContainer.ifPresent(proxyContainer::dependsOn);
pluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
containers.registerContainer(storageContainer);
containers.registerContainer(governanceContainer);
containers.registerContainer(proxyContainer);
containers.start();
- initHttpUrl();
try {
proxyRequestExecutor = new
ProxyRequestExecutor(proxyContainer.getConnection());
proxyRequestExecutor.start();
@@ -159,30 +141,31 @@ public final class AgentE2ETestEnvironment {
private void createJDBCEnvironment() {
containers = new ITContainers();
- Optional<DockerITContainer> pluginContainer = getPluginContainer();
+ Optional<DockerITContainer> pluginContainer =
getAgentPluginContainer();
MySQLContainer storageContainer = new MySQLContainer(mysqlImage);
- ShardingSphereJdbcContainer jdbcContainer =
PluginType.FILE.getValue().equalsIgnoreCase(testConfig.getPlugin())
- ? new ShardingSphereJdbcContainer(jdbcProjectImage,
testConfig.getPlugin(), this::collectLogs)
- : new ShardingSphereJdbcContainer(jdbcProjectImage,
testConfig.getPlugin());
+ ShardingSphereJdbcContainer jdbcContainer =
PluginType.FILE.getValue().equalsIgnoreCase(testConfig.getPluginType())
+ ? new ShardingSphereJdbcContainer(jdbcProjectImage,
testConfig.getPluginType(), this::collectLogs)
+ : new ShardingSphereJdbcContainer(jdbcProjectImage,
testConfig.getPluginType());
jdbcContainer.dependsOn(storageContainer);
pluginContainer.ifPresent(jdbcContainer::dependsOn);
pluginContainer.ifPresent(optional ->
containers.registerContainer(optional));
containers.registerContainer(storageContainer);
containers.registerContainer(jdbcContainer);
containers.start();
- initHttpUrl();
}
- private Optional<DockerITContainer> getPluginContainer() {
- if
(PluginType.PROMETHEUS.getValue().equalsIgnoreCase(testConfig.getPlugin())) {
- prometheusContainer = new PrometheusContainer(prometheusImage);
- return Optional.of(prometheusContainer);
- } else if
(PluginType.ZIPKIN.getValue().equalsIgnoreCase(testConfig.getPlugin())) {
- zipkinContainer = new ZipkinContainer(zipkinImage);
- return Optional.of(zipkinContainer);
- } else if
(PluginType.JAEGER.getValue().equalsIgnoreCase(testConfig.getPlugin())) {
- jaegerContainer = new JaegerContainer(jaegerImage);
- return Optional.of(jaegerContainer);
+ private Optional<DockerITContainer> getAgentPluginContainer() {
+ if
(PluginType.PROMETHEUS.getValue().equalsIgnoreCase(testConfig.getPluginType()))
{
+ agentPluginContainer = new
PrometheusContainer(testConfig.getPluginImageName());
+ return Optional.of(agentPluginContainer);
+ }
+ if
(PluginType.ZIPKIN.getValue().equalsIgnoreCase(testConfig.getPluginType())) {
+ agentPluginContainer = new
ZipkinContainer(testConfig.getPluginImageName());
+ return Optional.of(agentPluginContainer);
+ }
+ if
(PluginType.JAEGER.getValue().equalsIgnoreCase(testConfig.getPluginType())) {
+ agentPluginContainer = new
JaegerContainer(testConfig.getPluginImageName());
+ return Optional.of(agentPluginContainer);
}
return Optional.empty();
}
@@ -193,12 +176,6 @@ public final class AgentE2ETestEnvironment {
}
}
- private void initHttpUrl() {
- prometheusHttpUrl = null != prometheusContainer ?
prometheusContainer.getHttpUrl() : null;
- zipKinHttpUrl = null != zipkinContainer ? zipkinContainer.getHttpUrl()
: null;
- jaegerHttpUrl = null != jaegerContainer ? jaegerContainer.getHttpUrl()
: null;
- }
-
/**
* Destroy environment.
*/
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
index 49214bc5bb9..735ca698560 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/logging/file/src/test/resources/env/engine-env.properties
@@ -17,5 +17,5 @@
# The value of it.env.adapter is proxy or jdbc
it.env.adapter=
-it.env.plugin=file
+it.env.plugin.type=file
it.env.collect.data.wait.seconds=15
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 6fb268a7f86..4937841f4d8 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
@@ -36,7 +36,7 @@ class MetricsPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final MetricE2ETestCase metricTestCase) {
-
MetricAssert.assertIs(AgentE2ETestEnvironment.getInstance().getPrometheusHttpUrl(),
metricTestCase);
+
MetricAssert.assertIs(AgentE2ETestEnvironment.getInstance().getAgentPluginURL(),
metricTestCase);
}
private static boolean isEnabled() {
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
index d8451b0389b..759e123985b 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/env/engine-env.properties
@@ -17,5 +17,7 @@
# The value of it.env.adapter is proxy or jdbc
it.env.adapter=
-it.env.plugin=prometheus
+it.env.plugin.type=prometheus
+it.env.plugin.image=prom/prometheus:v2.41.0
+it.env.plugin.default.expose.port=9090
it.env.collect.data.wait.seconds=35
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 2c62a9caaa5..8be1a423775 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
@@ -36,7 +36,7 @@ class JaegerPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertTraceAgent(final JaegerE2ETestCase testCase) {
-
JaegerSpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getJaegerHttpUrl(),
testCase);
+
JaegerSpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getAgentPluginURL(),
testCase);
}
private static boolean isEnabled() {
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
index d4a38d8bcc3..d88f01a3226 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/resources/env/engine-env.properties
@@ -16,6 +16,8 @@
#
# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=
-it.env.plugin=jaeger
+it.env.adapter=proxy
+it.env.plugin.type=jaeger
+it.env.plugin.image=jaegertracing/all-in-one:1.41
+it.env.plugin.default.expose.port=16686
it.env.collect.data.wait.seconds=15
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 fa158b7913e..b7d46e74f60 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
@@ -36,7 +36,7 @@ class ZipkinPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertTraceAgent(final ZipkinE2ETestCase testCase) {
-
ZipkinSpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getZipKinHttpUrl(),
testCase);
+
ZipkinSpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getAgentPluginURL(),
testCase);
}
private static boolean isEnabled() {
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
index 7f67c904263..d65db423fc5 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/resources/env/engine-env.properties
@@ -17,5 +17,7 @@
# The value of it.env.adapter is proxy or jdbc
it.env.adapter=
-it.env.plugin=zipkin
+it.env.plugin.type=zipkin
+it.env.plugin.image=openzipkin/zipkin:3.2
+it.env.plugin.default.expose.port=9411
it.env.collect.data.wait.seconds=15
