You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/12/06 06:34:02 UTC
[skywalking] branch e2e/solly created (now b2fb13e)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch e2e/solly
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at b2fb13e test: remove so11y from SimpleE2E
This branch includes the following new commits:
new b2fb13e test: remove so11y from SimpleE2E
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: test: remove so11y from SimpleE2E
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch e2e/solly
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit b2fb13eddef2bf8e2caaa97b023ed87a3048ffd8
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Sun Dec 6 14:32:29 2020 +0800
test: remove so11y from SimpleE2E
---
.../apache/skywalking/e2e/simple/SimpleE2E.java | 56 ----------------------
1 file changed, 56 deletions(-)
diff --git a/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java b/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
index bc5268b..912480b 100644
--- a/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
+++ b/test/e2e/e2e-test/src/test/java/org/apache/skywalking/e2e/simple/SimpleE2E.java
@@ -28,8 +28,6 @@ import org.apache.skywalking.e2e.metrics.AtLeastOneOfMetricsMatcher;
import org.apache.skywalking.e2e.metrics.Metrics;
import org.apache.skywalking.e2e.metrics.MetricsQuery;
import org.apache.skywalking.e2e.metrics.MetricsValueMatcher;
-import org.apache.skywalking.e2e.metrics.ReadMetrics;
-import org.apache.skywalking.e2e.metrics.ReadMetricsQuery;
import org.apache.skywalking.e2e.retryable.RetryableTest;
import org.apache.skywalking.e2e.service.Service;
import org.apache.skywalking.e2e.service.ServicesMatcher;
@@ -71,8 +69,6 @@ import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_METRICS
import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_MULTIPLE_LINEAR_METRICS;
import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_CLIENT_METRICS;
import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SERVICE_RELATION_SERVER_METRICS;
-import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SO11Y_LABELED_METRICS;
-import static org.apache.skywalking.e2e.metrics.MetricsQuery.ALL_SO11Y_LINER_METRICS;
import static org.apache.skywalking.e2e.utils.Times.now;
import static org.apache.skywalking.e2e.utils.Yamls.load;
@@ -199,58 +195,6 @@ public class SimpleE2E extends SkyWalkingTestAdapter {
verifyServiceInstanceRelationMetrics(topology.getCalls());
}
- @RetryableTest
- void so11y() throws Exception {
- List<Service> services = graphql.services(new ServicesQuery().start(startTime).end(now()));
-
- services = services.stream().filter(s -> s.getLabel().equals("oap::oap-server")).collect(Collectors.toList());
- LOGGER.info("services: {}", services);
- load("expected/simple/so11y-services.yml").as(ServicesMatcher.class).verify(services);
- for (final Service service : services) {
- final Instances instances = graphql.instances(
- new InstancesQuery().serviceId(service.getKey()).start(startTime).end(now())
- );
-
- LOGGER.info("instances: {}", instances);
-
- load("expected/simple/so11y-instances.yml").as(InstancesMatcher.class).verify(instances);
- for (Instance instance : instances.getInstances()) {
- for (String metricsName : ALL_SO11Y_LINER_METRICS) {
- LOGGER.info("verifying service instance response time: {}", instance);
- final ReadMetrics instanceMetrics = graphql.readMetrics(
- new ReadMetricsQuery().stepByMinute().metricsName(metricsName)
- .serviceName(service.getLabel()).instanceName(instance.getLabel())
- );
-
- LOGGER.info("{}: {}", metricsName, instanceMetrics);
- final AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher();
- final MetricsValueMatcher greaterThanZero = new MetricsValueMatcher();
- greaterThanZero.setValue("gt 0");
- instanceRespTimeMatcher.setValue(greaterThanZero);
- instanceRespTimeMatcher.verify(instanceMetrics.getValues());
- }
- for (String metricsName : ALL_SO11Y_LABELED_METRICS) {
- LOGGER.info("verifying service instance response time: {}", instance);
- final List<ReadMetrics> instanceMetrics = graphql.readLabeledMetrics(
- new ReadMetricsQuery().stepByMinute().metricsName(metricsName)
- .serviceName(service.getLabel()).instanceName(instance.getLabel())
- );
-
- LOGGER.info("{}: {}", metricsName, instanceMetrics);
- Metrics allValues = new Metrics();
- for (ReadMetrics readMetrics : instanceMetrics) {
- allValues.getValues().addAll(readMetrics.getValues().getValues());
- }
- final AtLeastOneOfMetricsMatcher instanceRespTimeMatcher = new AtLeastOneOfMetricsMatcher();
- final MetricsValueMatcher greaterThanZero = new MetricsValueMatcher();
- greaterThanZero.setValue("gt 0");
- instanceRespTimeMatcher.setValue(greaterThanZero);
- instanceRespTimeMatcher.verify(allValues);
- }
- }
- }
- }
-
private Instances verifyServiceInstances(final Service service) throws Exception {
final Instances instances = graphql.instances(
new InstancesQuery().serviceId(service.getKey()).start(startTime).end(now())