This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 9ec3bbc72b2 Rename AgentE2EHttpUtils (#36271)
9ec3bbc72b2 is described below
commit 9ec3bbc72b25f3f6e9256f8ed55b8d64a3b3f781
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 12 17:45:40 2025 +0800
Rename AgentE2EHttpUtils (#36271)
---
.../engine/util/{HttpUtils.java => AgentE2EHttpUtils.java} | 10 +++++-----
.../test/e2e/agent/metrics/asserts/MetricAssert.java | 6 +++---
.../test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java | 4 ++--
.../test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/HttpUtils.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/AgentE2EHttpUtils.java
similarity index 88%
rename from
test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/HttpUtils.java
rename to
test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/AgentE2EHttpUtils.java
index 85b5f53b434..b63c82559fb 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/HttpUtils.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/util/AgentE2EHttpUtils.java
@@ -27,15 +27,15 @@ import java.util.concurrent.TimeUnit;
import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
- * HTTP utility class.
+ * Agent E2E HTTP utility class.
*/
-public final class HttpUtils {
+public final class AgentE2EHttpUtils {
- private static final HttpUtils OK_HTTP_UTILS = new HttpUtils();
+ private static final AgentE2EHttpUtils OK_HTTP_UTILS = new
AgentE2EHttpUtils();
private final OkHttpClient client;
- private HttpUtils() {
+ private AgentE2EHttpUtils() {
client = new OkHttpClient.Builder().connectTimeout(10L,
TimeUnit.SECONDS).readTimeout(10L, TimeUnit.SECONDS).writeTimeout(10L,
TimeUnit.SECONDS).build();
}
@@ -44,7 +44,7 @@ public final class HttpUtils {
*
* @return instance
*/
- public static HttpUtils getInstance() {
+ public static AgentE2EHttpUtils getInstance() {
return OK_HTTP_UTILS;
}
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/asserts/MetricAssert.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/asserts/MetricAssert.java
index 7d4cdc9c8b7..5690803483a 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/asserts/MetricAssert.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/asserts/MetricAssert.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
-import org.apache.shardingsphere.test.e2e.agent.engine.util.HttpUtils;
+import org.apache.shardingsphere.test.e2e.agent.engine.util.AgentE2EHttpUtils;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.response.MetricsMetaDataResponse;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.response.MetricsMetaDataResponse.Metric;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.response.MetricsQueryResponse;
@@ -59,7 +59,7 @@ public final class MetricAssert {
private static void assertMetaData(final String metaDataURL, final
MetricE2ETestCase expected) {
String metricName = getMetricName(expected);
String metaDataQueryURL = String.join("", metaDataURL, "?metric=",
encode(metricName));
- MetricsMetaDataResponse actual =
JsonUtils.fromJsonString(HttpUtils.getInstance().query(metaDataQueryURL),
MetricsMetaDataResponse.class);
+ MetricsMetaDataResponse actual =
JsonUtils.fromJsonString(AgentE2EHttpUtils.getInstance().query(metaDataQueryURL),
MetricsMetaDataResponse.class);
assertThat(String.format("Metric `%s` status is not success, error is
`%s`", expected.getMetricName(), actual.getError()), actual.getStatus(),
is("success"));
assertFalse(actual.getData().isEmpty(), String.format("Metric `%s` is
empty.", expected.getMetricName()));
Collection<Metric> metrics = actual.getData().get(metricName);
@@ -81,7 +81,7 @@ public final class MetricAssert {
@SneakyThrows(IOException.class)
private static void assertQueryData(final String queryURL, final
MetricQueryAssertion expected) {
String queryURLWithParam = String.join("", queryURL, "?query=",
encode(expected.getQuery()));
- MetricsQueryResponse actual =
JsonUtils.fromJsonString(HttpUtils.getInstance().query(queryURLWithParam),
MetricsQueryResponse.class);
+ MetricsQueryResponse actual =
JsonUtils.fromJsonString(AgentE2EHttpUtils.getInstance().query(queryURLWithParam),
MetricsQueryResponse.class);
assertThat(String.format("The query `%s` is not success, error message
is `%s`", expected.getQuery(), actual.getError()), actual.getStatus(),
is("success"));
assertFalse(actual.getData().getResult().isEmpty(), String.format("The
query `%s` is empty.", expected.getQuery()));
actual.getData().getResult().forEach(each -> assertMetricData(each,
expected));
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
index 4172e54c7e9..71623c3b2b0 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/asserts/JaegerSpanAssert.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.agent.jaeger.asserts;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
-import org.apache.shardingsphere.test.e2e.agent.engine.util.HttpUtils;
+import org.apache.shardingsphere.test.e2e.agent.engine.util.AgentE2EHttpUtils;
import
org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.response.JaegerSpanResponse;
import
org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.response.JaegerSpanResponse.Tag;
import
org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.response.JaegerTraceResponse;
@@ -79,6 +79,6 @@ public final class JaegerSpanAssert {
@SneakyThrows(IOException.class)
private static Collection<JaegerTraceResponseData>
queryTraceResponses(final String queryURL) {
- return
JsonUtils.fromJsonString(HttpUtils.getInstance().query(queryURL),
JaegerTraceResponse.class).getData();
+ return
JsonUtils.fromJsonString(AgentE2EHttpUtils.getInstance().query(queryURL),
JaegerTraceResponse.class).getData();
}
}
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
index 2f37b65ecca..594ae48e019 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/asserts/ZipkinSpanAssert.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.agent.zipkin.asserts;
import com.fasterxml.jackson.core.type.TypeReference;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
-import org.apache.shardingsphere.test.e2e.agent.engine.util.HttpUtils;
+import org.apache.shardingsphere.test.e2e.agent.engine.util.AgentE2EHttpUtils;
import
org.apache.shardingsphere.test.e2e.agent.zipkin.asserts.response.ZipkinSpanResponse;
import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.ZipkinE2ETestCase;
import
org.apache.shardingsphere.test.e2e.agent.zipkin.cases.ZipkinTagAssertion;
@@ -75,7 +75,7 @@ public final class ZipkinSpanAssert {
@SneakyThrows(IOException.class)
private static Collection<ZipkinSpanResponse> queryTraceResponses(final
ZipkinE2ETestCase expected, final String url) {
- List<List<ZipkinSpanResponse>> result =
JsonUtils.fromJsonString(HttpUtils.getInstance().query(url), new
TypeReference<List<List<ZipkinSpanResponse>>>() {
+ List<List<ZipkinSpanResponse>> result =
JsonUtils.fromJsonString(AgentE2EHttpUtils.getInstance().query(url), new
TypeReference<List<List<ZipkinSpanResponse>>>() {
});
return
result.stream().findFirst().orElse(Collections.emptyList()).stream().filter(each
->
expected.getSpanName().equalsIgnoreCase(each.getName())).collect(Collectors.toList());
}
