From 7c406c30cefcb938ff71a9fa8da81f38c9082ceb Mon Sep 17 00:00:00 2001 From: Zhenxu Ke Date: Sun, 6 Dec 2020 15:27:57 +0800 Subject: [PATCH] test: remove so11y from SimpleE2E (#5957) --- .../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 bc5268b065..912480bc25 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 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 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()) -- GitLab