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 3b88c08e726 Default disable agent e2e test (#30978)
3b88c08e726 is described below
commit 3b88c08e726119d955b6a6d3809072e836c5ab3d
Author: jiangML <[email protected]>
AuthorDate: Fri Apr 19 21:29:27 2024 +0800
Default disable agent e2e test (#30978)
---
.../e2e/agent/common/env/E2ETestEnvironment.java | 20 ++++++++++++++++++--
.../test/e2e/agent/file/FilePluginE2EIT.java | 7 ++++++-
.../src/test/resources/env/engine-env.properties | 2 +-
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 6 ++++++
.../src/test/resources/env/engine-env.properties | 2 +-
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 6 ++++++
.../test/e2e/agent/jaeger/asserts/SpanAssert.java | 3 ---
.../src/test/resources/env/engine-env.properties | 2 +-
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 6 ++++++
.../src/test/resources/env/engine-env.properties | 2 +-
10 files changed, 46 insertions(+), 10 deletions(-)
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
index c0bda41396e..da2fbde3f47 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.common.env;
+import com.google.common.base.Strings;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.e2e.agent.common.container.ITContainers;
@@ -83,8 +84,8 @@ public final class E2ETestEnvironment {
private E2ETestEnvironment() {
Properties props =
EnvironmentProperties.loadProperties("env/engine-env.properties");
- adapter = props.getProperty("it.env.adapter", "proxy");
- plugin = props.getProperty("it.env.plugin", "file");
+ adapter = props.getProperty("it.env.adapter");
+ plugin = props.getProperty("it.env.plugin");
collectDataWaitSeconds =
Long.parseLong(props.getProperty("it.env.collect.data.wait.seconds", "0"));
}
@@ -101,6 +102,9 @@ public final class E2ETestEnvironment {
* Init environment.
*/
public void init() {
+ if (!containsTestParameter()) {
+ return;
+ }
if (AdapterType.PROXY.getValue().equalsIgnoreCase(adapter)) {
createProxyEnvironment();
} else if (AdapterType.JDBC.getValue().equalsIgnoreCase(adapter)) {
@@ -180,6 +184,9 @@ public final class E2ETestEnvironment {
* Destroy environment.
*/
public void destroy() {
+ if (!containsTestParameter()) {
+ return;
+ }
if (null != proxyRequestExecutor) {
proxyRequestExecutor.stop();
}
@@ -187,4 +194,13 @@ public final class E2ETestEnvironment {
containers.stop();
}
}
+
+ /**
+ * Judge whether contains test parameter.
+ *
+ * @return contains or not
+ */
+ public boolean containsTestParameter() {
+ return !Strings.isNullOrEmpty(adapter) &&
!Strings.isNullOrEmpty(plugin);
+ }
}
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 1671b577190..8ab025e02ba 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
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.file.asserts.ContentAssert;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
import java.util.Collection;
@@ -33,10 +34,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
@Slf4j
class FilePluginE2EIT {
+ @EnabledIf("isEnabled")
@Test
void assertWithAgent() {
Collection<String> actualLogLines =
E2ETestEnvironment.getInstance().getActualLogs();
- log.info("actualLogLines size:{}", actualLogLines.size());
assertFalse(actualLogLines.isEmpty(), "Actual log is empty");
if
(AdapterType.PROXY.getValue().equalsIgnoreCase(E2ETestEnvironment.getInstance().getAdapter()))
{
assertProxyWithAgent(actualLogLines);
@@ -52,4 +53,8 @@ class FilePluginE2EIT {
private void assertJdbcWithAgent(final Collection<String> actualLogLines) {
ContentAssert.assertIs(actualLogLines, "Build meta data contexts
finished, cost\\s(?=[1-9]+\\d*)");
}
+
+ private static boolean isEnabled() {
+ return E2ETestEnvironment.getInstance().containsTestParameter();
+ }
}
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 9de23f80885..49214bc5bb9 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
@@ -16,6 +16,6 @@
#
# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=proxy
+it.env.adapter=
it.env.plugin=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 e0e8ca03525..0b2f921cbdd 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
@@ -28,6 +28,7 @@ import
org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricQueryAsserti
import org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricTestCase;
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsMetaDataResult;
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsQueryResult;
+import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -43,6 +44,7 @@ import java.util.stream.Stream;
@Slf4j
class MetricsPluginE2EIT {
+ @EnabledIf("isEnabled")
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final MetricTestCase metricTestCase) {
@@ -75,6 +77,10 @@ class MetricsPluginE2EIT {
}
}
+ private static boolean isEnabled() {
+ return E2ETestEnvironment.getInstance().containsTestParameter();
+ }
+
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
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 e9d66463e93..d8451b0389b 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
@@ -16,6 +16,6 @@
#
# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=jdbc
+it.env.adapter=
it.env.plugin=prometheus
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 70f7e0f2a56..53ed6d8510e 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
@@ -22,6 +22,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.SpanAssert;
import
org.apache.shardingsphere.test.e2e.agent.jaeger.cases.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.jaeger.cases.SpanTestCase;
+import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -34,12 +35,17 @@ import java.util.stream.Stream;
@ExtendWith(AgentTestActionExtension.class)
class JaegerPluginE2EIT {
+ @EnabledIf("isEnabled")
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final SpanTestCase spanTestCase) {
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getJaegerHttpUrl(),
spanTestCase);
}
+ private static boolean isEnabled() {
+ return E2ETestEnvironment.getInstance().containsTestParameter();
+ }
+
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/SpanAssert.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/SpanAssert.java
index de0dca889f6..71bbf7488f1 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/SpanAssert.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/SpanAssert.java
@@ -19,7 +19,6 @@ package
org.apache.shardingsphere.test.e2e.agent.jaeger.asserts;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
import org.apache.shardingsphere.test.e2e.agent.common.util.OkHttpUtils;
import org.apache.shardingsphere.test.e2e.agent.jaeger.cases.SpanTestCase;
@@ -42,7 +41,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
/**
* Span assert.
*/
-@Slf4j
public final class SpanAssert {
/**
@@ -52,7 +50,6 @@ public final class SpanAssert {
* @param expected expected span
*/
public static void assertIs(final String baseUrl, final SpanTestCase
expected) {
- log.info("SpanAssert baseUrl:{}", baseUrl);
assertTagKey(baseUrl, expected);
expected.getTagCases().stream().filter(TagAssertion::isNeedAssertValue).forEach(each
-> assertTagValue(baseUrl, expected, each));
}
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 007098358bf..d4a38d8bcc3 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,6 @@
#
# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=proxy
+it.env.adapter=
it.env.plugin=jaeger
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 bee24b720a2..f13cffc5224 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
@@ -22,6 +22,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.zipkin.asserts.SpanAssert;
import
org.apache.shardingsphere.test.e2e.agent.zipkin.cases.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.SpanTestCase;
+import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
@@ -34,12 +35,17 @@ import java.util.stream.Stream;
@ExtendWith(AgentTestActionExtension.class)
class ZipkinPluginE2EIT {
+ @EnabledIf("isEnabled")
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final SpanTestCase spanTestCase) {
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getZipKinHttpUrl(),
spanTestCase);
}
+ private static boolean isEnabled() {
+ return E2ETestEnvironment.getInstance().containsTestParameter();
+ }
+
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
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 ef8221ff738..7f67c904263 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
@@ -16,6 +16,6 @@
#
# The value of it.env.adapter is proxy or jdbc
-it.env.adapter=proxy
+it.env.adapter=
it.env.plugin=zipkin
it.env.collect.data.wait.seconds=15
