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/04/11 06:42:44 UTC
[skywalking] branch test/coverage created (now 564b0b2)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch test/coverage
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 564b0b2 Count the coverage in E2E tests
This branch includes the following new commits:
new 564b0b2 Count the coverage in E2E tests
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: Count the coverage in E2E tests
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch test/coverage
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 564b0b2de0c19d20a5983c3597b762ea074aa09c
Author: kezhenxu94 <ke...@163.com>
AuthorDate: Sat Apr 11 14:41:26 2020 +0800
Count the coverage in E2E tests
---
.../main/resources/application.yml => lombok.config | 12 +++---------
.../core/profile/ProfileTaskMutationService.java | 2 +-
.../entity/ProfileTaskCreationResult.java | 2 +-
.../oap/query/graphql/resolver/ProfileMutation.java | 2 +-
.../src/main/resources/application.yml | 2 +-
test/e2e/e2e-test/docker/Dockerfile.consumer | 3 ++-
test/e2e/e2e-test/docker/Dockerfile.provider | 3 ++-
test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml | 10 +++++++++-
test/e2e/e2e-test/jacoco/jacocoagent.jar | Bin 0 -> 281989 bytes
9 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/test/e2e/e2e-service-consumer/src/main/resources/application.yml b/lombok.config
similarity index 86%
copy from test/e2e/e2e-service-consumer/src/main/resources/application.yml
copy to lombok.config
index 61b30de..7d97bd9 100644
--- a/test/e2e/e2e-service-consumer/src/main/resources/application.yml
+++ b/lombok.config
@@ -1,3 +1,4 @@
+#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -12,13 +13,6 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
+#
-server:
- port: 9092
-
-spring:
- main:
- banner-mode: 'off'
-
-e2e:
- provider-base-url: ${PROVIDER_URL:http://127.0.0.1:9090}
\ No newline at end of file
+lombok.addLombokGeneratedAnnotation = true
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
index 0ec093d..71ab5d4 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskMutationService.java
@@ -26,7 +26,7 @@ import org.apache.skywalking.apm.util.StringUtil;
import org.apache.skywalking.oap.server.core.analysis.DownSampling;
import org.apache.skywalking.oap.server.core.analysis.TimeBucket;
import org.apache.skywalking.oap.server.core.analysis.worker.NoneStreamingProcessor;
-import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult;
+import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskCreationResult;
import org.apache.skywalking.oap.server.core.query.entity.ProfileTask;
import org.apache.skywalking.oap.server.core.storage.StorageModule;
import org.apache.skywalking.oap.server.core.storage.profile.IProfileTaskQueryDAO;
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java
similarity index 95%
rename from oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java
rename to oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java
index 5a88422..d4fb580 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/entity/ProfileTaskCreationResult.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskCreationResult.java
@@ -16,7 +16,7 @@
*
*/
-package org.apache.skywalking.oap.server.core.profile.entity;
+package org.apache.skywalking.oap.server.core.query.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java
index 4849c9e..f65a70d 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import org.apache.skywalking.oap.query.graphql.type.ProfileTaskCreationRequest;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.profile.ProfileTaskMutationService;
-import org.apache.skywalking.oap.server.core.profile.entity.ProfileTaskCreationResult;
+import org.apache.skywalking.oap.server.core.query.entity.ProfileTaskCreationResult;
import org.apache.skywalking.oap.server.library.module.ModuleManager;
/**
diff --git a/test/e2e/e2e-service-consumer/src/main/resources/application.yml b/test/e2e/e2e-service-consumer/src/main/resources/application.yml
index 61b30de..d85955b 100644
--- a/test/e2e/e2e-service-consumer/src/main/resources/application.yml
+++ b/test/e2e/e2e-service-consumer/src/main/resources/application.yml
@@ -21,4 +21,4 @@ spring:
banner-mode: 'off'
e2e:
- provider-base-url: ${PROVIDER_URL:http://127.0.0.1:9090}
\ No newline at end of file
+ provider-base-url: ${PROVIDER_URL:http://127.0.0.1:9090}
diff --git a/test/e2e/e2e-test/docker/Dockerfile.consumer b/test/e2e/e2e-test/docker/Dockerfile.consumer
index b1802e1..77abb95 100644
--- a/test/e2e/e2e-test/docker/Dockerfile.consumer
+++ b/test/e2e/e2e-test/docker/Dockerfile.consumer
@@ -26,9 +26,10 @@ RUN tar -zxf apache-skywalking-apm*.gz --strip=1 || true
RUN mv apache-skywalking-apm-bin/* . || true
VOLUME /services
+VOLUME /jacoco
ADD e2e-service-consumer/target/e2e-service-consumer-1.0.0.jar /services/
ENV SW_AGENT_PROPS=""
-CMD ["sh", "-c", "java -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-consumer-1.0.0.jar"]
\ No newline at end of file
+CMD ["sh", "-c", "java -javaagent:/jacoco/jacocoagent.jar=destfile=/jacoco/jacoco.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.* -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-consumer-1.0.0.jar"]
diff --git a/test/e2e/e2e-test/docker/Dockerfile.provider b/test/e2e/e2e-test/docker/Dockerfile.provider
index fdb1cd5..b202e80 100644
--- a/test/e2e/e2e-test/docker/Dockerfile.provider
+++ b/test/e2e/e2e-test/docker/Dockerfile.provider
@@ -26,9 +26,10 @@ RUN tar -zxf apache-skywalking-apm*.gz --strip=1 || true
RUN mv apache-skywalking-apm-bin/* . || true
VOLUME /services
+VOLUME /jacoco
ADD e2e-service-provider/target/e2e-service-provider-1.0.0.jar /services/
ENV SW_AGENT_PROPS=""
-CMD ["sh", "-c", "java -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-provider-1.0.0.jar"]
\ No newline at end of file
+CMD ["sh", "-c", "java -javaagent:/jacoco/jacocoagent.jar=destfile=/jacoco/jacoco.exec,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*,classdumpdir=/jacoco/classes/agent -javaagent:/skywalking/agent/skywalking-agent.jar=logging.output=CONSOLE,$SW_AGENT_PROPS -jar /services/e2e-service-provider-1.0.0.jar"]
diff --git a/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml b/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml
index 60fca0b..bff7441 100644
--- a/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml
+++ b/test/e2e/e2e-test/docker/simple/jdk/docker-compose.yml
@@ -24,6 +24,10 @@ services:
networks:
- e2e
restart: on-failure
+ volumes:
+ - ../../../jacoco:/jacoco
+ environment:
+ - JAVA_OPTS=-javaagent:/jacoco/jacocoagent.jar=destfile=/jacoco/jacoco.exec,classdumpdir=/jacoco/classes/oap,includes=org.apache.skywalking.*,excludes=org.apache.skywalking.apm.dependencies.*:org.apache.skywalking.oap.query.*:org.apache.skywalking.oap.server.core.query.*
healthcheck:
test: ["CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800"]
interval: 5s
@@ -36,6 +40,8 @@ services:
- 8080
networks:
- e2e
+ volumes:
+ - ../../../jacoco:/jacoco
environment:
- SW_OAP_ADDRESS=oap:12800
depends_on:
@@ -52,6 +58,8 @@ services:
- e2e
expose:
- 9090
+ volumes:
+ - ../../../jacoco:/jacoco
environment:
- SW_AGENT_COLLECTOR_BACKEND_SERVICES=oap:11800
depends_on:
@@ -59,4 +67,4 @@ services:
condition: service_healthy
networks:
- e2e:
\ No newline at end of file
+ e2e:
diff --git a/test/e2e/e2e-test/jacoco/jacocoagent.jar b/test/e2e/e2e-test/jacoco/jacocoagent.jar
new file mode 100644
index 0000000..3d840bc
Binary files /dev/null and b/test/e2e/e2e-test/jacoco/jacocoagent.jar differ