You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2020/01/19 04:33:36 UTC

[GitHub] [skywalking] mrproliu opened a new pull request #4268: merge e2e profile test project

mrproliu opened a new pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268
 
 
   …orage types
   
   Please answer these questions before submitting pull request
   
   - Why submit this pull request?
   - [ ] Bug fix
   - [ ] New feature provided
   - [x] Improve performance
   
   - Related issues
   #4104 
   
   ___
   ### New feature or improvement
   - The current e2e test cases for profile use different storage to distinguish different projects. Now merge the test projects into one. Use `env` to distinguish different storage.
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] mrproliu removed a comment on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
mrproliu removed a comment on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575972277
 
 
   /run CI

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368266217
 
 

 ##########
 File path: test/e2e/e2e-profile/e2e-profile-test-runner/src/docker/clusterize.awk
 ##########
 @@ -0,0 +1,64 @@
+# 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.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+#!/usr/bin/awk -f
+
+BEGIN {
 
 Review comment:
   The file name `clusterize.awk` should be changed (after copying), `clusterize.awk` is originally used to modify the `application.yml` to make it run in cluster mode (to test coordinators), here should be named with something like `adapt_storage` or other storage related names, if you like

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265760
 
 

 ##########
 File path: test/e2e/run.sh
 ##########
 @@ -70,6 +73,7 @@ do
          -De2e.container.version="${E2E_VERSION}" \
          -Delasticsearch.version="${ES_VERSION}" \
          -Dsw.home="${base_dir}/$test_case/${DIST_PACKAGE//.tar.gz/}" \
+         `if [ ! -z "${env}" ] ; then echo -P"${env}"; fi` \
 
 Review comment:
   same here

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265731
 
 

 ##########
 File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml
 ##########
 @@ -46,5 +46,254 @@
 
     </dependencies>
 
+    <properties>
+        <provider.name>e2e-profile-service</provider.name>
+        <e2e.container.version>1.1</e2e.container.version>
+        <e2e.container.name.prefix>skywalking-e2e-container-${build.id}-profile</e2e.container.name.prefix>
+    </properties>
+
+    <profiles>
+        <!--mysql environment -->
+        <profile>
+            <id>mysql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <containerNamePattern>%a-%t-%i</containerNamePattern>
+                            <images>
+                                <image>
+                                    <name>mysql/mysql-server:${mysql.version}</name>
+                                    <alias>${e2e.container.name.prefix}-datasource</alias>
+                                    <run>
+                                        <wait>
+                                            <log>Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306</log>
+                                            <time>120000</time>
+                                        </wait>
+                                        <env>
+                                            <MYSQL_ROOT_PASSWORD>root@1234</MYSQL_ROOT_PASSWORD>
+                                            <MYSQL_DATABASE>swtest</MYSQL_DATABASE>
+                                            <MYSQL_ROOT_HOST>%</MYSQL_ROOT_HOST>
+                                        </env>
+                                        <ports>
+                                            <port>mysql.port:3306</port>
+                                        </ports>
+                                    </run>
+                                </image>
+                                <image>
+                                    <name>skyapm/e2e-container:${e2e.container.version}</name>
+                                    <alias>${e2e.container.name.prefix}-runner</alias>
+                                    <run>
+                                        <env>
+                                            <STORAGE>mysql</STORAGE>
+                                            <SW_JDBC_URL>jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest</SW_JDBC_URL>
+                                            <INSTRUMENTED_SERVICE_1>
+                                                ${provider.name}-${project.version}.jar
+                                            </INSTRUMENTED_SERVICE_1>
+                                            <INSTRUMENTED_SERVICE_1_OPTS>
+                                                -DSW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800
+                                                -DSW_AGENT_PROFILE_ACTIVE=true
+                                                -DSW_AGENT_NAME=${provider.name}
+                                                -Dserver.port=9090
+                                            </INSTRUMENTED_SERVICE_1_OPTS>
+                                        </env>
+                                        <dependsOn>
+                                            <container>${e2e.container.name.prefix}-datasource</container>
+                                        </dependsOn>
+                                        <links>
+                                            <link>${e2e.container.name.prefix}-datasource</link>
+                                        </links>
+                                        <ports>
+                                            <port>+webapp.host:webapp.port:8081</port>
+                                            <port>+service.host:service.port:9090</port>
+                                        </ports>
+                                        <volumes>
+                                            <bind>
+                                                <volume>${sw.home}:/sw</volume>
+                                                <volume>${project.build.directory}:/home</volume>
+                                                <volume>../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar</volume>
+                                                <volume>${project.basedir}/src/docker/rc.d:/rc.d:ro</volume>
+                                                <volume>${project.basedir}/src/docker/clusterize.awk:/clusterize.awk</volume>
+                                            </bind>
+                                        </volumes>
+                                        <wait>
+                                            <log>SkyWalking e2e container is ready for tests</log>
+                                            <time>3000000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--h2 environment -->
+        <profile>
+            <id>h2</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <containerNamePattern>%a-%t-%i</containerNamePattern>
+                            <imagePullPolicy>Always</imagePullPolicy>
+                            <images>
+                                <image>
+                                    <name>skyapm/e2e-container:${e2e.container.version}</name>
+                                    <alias>${e2e.container.name.prefix}</alias>
+                                    <run>
+                                        <env>
+                                            <STORAGE>h2</STORAGE>
+                                            <INSTRUMENTED_SERVICE_1>
+                                                ${provider.name}-${project.version}.jar
+                                            </INSTRUMENTED_SERVICE_1>
+                                            <INSTRUMENTED_SERVICE_1_OPTS>
+                                                -DSW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800
+                                                -DSW_AGENT_PROFILE_ACTIVE=true
+                                                -DSW_AGENT_NAME=${provider.name}
+                                                -Dserver.port=9090
+                                            </INSTRUMENTED_SERVICE_1_OPTS>
+                                        </env>
+                                        <ports>
+                                            <port>+webapp.host:webapp.port:8081</port>
+                                            <port>+service.host:service.port:9090</port>
+                                        </ports>
+                                        <volumes>
+                                            <bind>
+                                                <volume>${sw.home}:/sw</volume>
+                                                <volume>../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar</volume>
+                                                <volume>${project.basedir}/src/docker/rc.d:/rc.d:ro</volume>
+                                                <volume>${project.basedir}/src/docker/clusterize.awk:/clusterize.awk</volume>
+                                            </bind>
+                                        </volumes>
+                                        <wait>
+                                            <log>SkyWalking e2e container is ready for tests</log>
+                                            <time>3000000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--elasticsearch environment -->
 
 Review comment:
   ```suggestion
           <!--elasticsearch storage -->
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] mrproliu commented on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
mrproliu commented on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575972277
 
 
   /run CI

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 merged pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 merged pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268
 
 
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] codecov-io edited a comment on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575968756
 
 
   # [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=h1) Report
   > Merging [#4268](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=desc) into [master](https://codecov.io/gh/apache/skywalking/commit/8e0c40375528ab75e70be467565a3d16d344bd85?src=pr&el=desc) will **increase** coverage by `<.01%`.
   > The diff coverage is `11.36%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/skywalking/pull/4268/graphs/tree.svg?width=650&token=qrILxY5yA8&height=150&src=pr)](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree)
   
   ```diff
   @@            Coverage Diff             @@
   ##           master    #4268      +/-   ##
   ==========================================
   + Coverage   26.89%   26.89%   +<.01%     
   ==========================================
     Files        1162     1162              
     Lines       25399    25389      -10     
     Branches     3628     3626       -2     
   ==========================================
   - Hits         6830     6828       -2     
   + Misses      17964    17955       -9     
   - Partials      605      606       +1
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree) | Coverage Δ | |
   |---|---|---|
   | [...king/oap/server/core/alarm/provider/AlarmRule.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-b2FwLXNlcnZlci9zZXJ2ZXItYWxhcm0tcGx1Z2luL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9za3l3YWxraW5nL29hcC9zZXJ2ZXIvY29yZS9hbGFybS9wcm92aWRlci9BbGFybVJ1bGUuamF2YQ==) | `13.33% <ø> (ø)` | :arrow_up: |
   | [...king/oap/server/core/query/MetricQueryService.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-b2FwLXNlcnZlci9zZXJ2ZXItY29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2t5d2Fsa2luZy9vYXAvc2VydmVyL2NvcmUvcXVlcnkvTWV0cmljUXVlcnlTZXJ2aWNlLmphdmE=) | `0% <0%> (ø)` | :arrow_up: |
   | [...kywalking/oap/server/core/query/DurationUtils.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-b2FwLXNlcnZlci9zZXJ2ZXItY29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2t5d2Fsa2luZy9vYXAvc2VydmVyL2NvcmUvcXVlcnkvRHVyYXRpb25VdGlscy5qYXZh) | `0% <0%> (ø)` | :arrow_up: |
   | [...ng/oap/server/core/alarm/provider/RunningRule.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-b2FwLXNlcnZlci9zZXJ2ZXItYWxhcm0tcGx1Z2luL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9za3l3YWxraW5nL29hcC9zZXJ2ZXIvY29yZS9hbGFybS9wcm92aWRlci9SdW5uaW5nUnVsZS5qYXZh) | `73.04% <100%> (-0.96%)` | :arrow_down: |
   | [.../agent/core/profile/ProfileTaskChannelService.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvcHJvZmlsZS9Qcm9maWxlVGFza0NoYW5uZWxTZXJ2aWNlLmphdmE=) | `35.63% <0%> (+6.89%)` | :arrow_up: |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=footer). Last update [8e0c403...194f50a](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] codecov-io edited a comment on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575968756
 
 
   # [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=h1) Report
   > Merging [#4268](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=desc) into [master](https://codecov.io/gh/apache/skywalking/commit/e9860e87fcd0c31b1c0475d191594bb4baaa38da?src=pr&el=desc) will **not change** coverage.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/skywalking/pull/4268/graphs/tree.svg?width=650&token=qrILxY5yA8&height=150&src=pr)](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree)
   
   ```diff
   @@           Coverage Diff           @@
   ##           master    #4268   +/-   ##
   =======================================
     Coverage   26.89%   26.89%           
   =======================================
     Files        1162     1162           
     Lines       25400    25400           
     Branches     3628     3628           
   =======================================
     Hits         6832     6832           
     Misses      17963    17963           
     Partials      605      605
   ```
   
   
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=footer). Last update [e9860e8...4c1d604](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] codecov-io edited a comment on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575968756
 
 
   # [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=h1) Report
   > Merging [#4268](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=desc) into [master](https://codecov.io/gh/apache/skywalking/commit/4c1d60487cb1e4809858f844e1b75d6fa3d482d7?src=pr&el=desc) will **decrease** coverage by `<.01%`.
   > The diff coverage is `84.61%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/skywalking/pull/4268/graphs/tree.svg?width=650&token=qrILxY5yA8&height=150&src=pr)](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree)
   
   ```diff
   @@            Coverage Diff             @@
   ##           master    #4268      +/-   ##
   ==========================================
   - Coverage   26.89%   26.89%   -0.01%     
   ==========================================
     Files        1162     1162              
     Lines       25400    25399       -1     
     Branches     3628     3628              
   ==========================================
   - Hits         6832     6830       -2     
   - Misses      17963    17964       +1     
     Partials      605      605
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree) | Coverage Δ | |
   |---|---|---|
   | [...ng/oap/server/core/alarm/provider/RunningRule.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-b2FwLXNlcnZlci9zZXJ2ZXItYWxhcm0tcGx1Z2luL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9za3l3YWxraW5nL29hcC9zZXJ2ZXIvY29yZS9hbGFybS9wcm92aWRlci9SdW5uaW5nUnVsZS5qYXZh) | `74% <84.61%> (-0.84%)` | :arrow_down: |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=footer). Last update [4c1d604...8e0c403](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265675
 
 

 ##########
 File path: .github/workflows/e2e.yaml
 ##########
 @@ -111,10 +111,10 @@ jobs:
           ./mvnw -Dcheckstyle.skip -Drat.skip -T2 -Dmaven.compile.fork -Dmaven.compiler.maxmem=3072 -DskipTests clean install
           ./mvnw -f test/e2e/pom.xml -pl e2e-base clean install
       - name: Profile Tests H2(JDK8)
-        run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-h2-test-runner
+        run: export E2E_VERSION=jdk8-1.3 && bash -x test/e2e/run.sh e2e-profile/e2e-profile-test-runner --env=h2
 
 Review comment:
   change the name `env` to `storage` please, we may have other `env` in the future

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265716
 
 

 ##########
 File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml
 ##########
 @@ -46,5 +46,254 @@
 
     </dependencies>
 
+    <properties>
+        <provider.name>e2e-profile-service</provider.name>
+        <e2e.container.version>1.1</e2e.container.version>
+        <e2e.container.name.prefix>skywalking-e2e-container-${build.id}-profile</e2e.container.name.prefix>
+    </properties>
+
+    <profiles>
+        <!--mysql environment -->
+        <profile>
+            <id>mysql</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <configuration>
+                            <containerNamePattern>%a-%t-%i</containerNamePattern>
+                            <images>
+                                <image>
+                                    <name>mysql/mysql-server:${mysql.version}</name>
+                                    <alias>${e2e.container.name.prefix}-datasource</alias>
+                                    <run>
+                                        <wait>
+                                            <log>Socket: '/var/run/mysqld/mysqlx.sock' bind-address: '::' port: 3306</log>
+                                            <time>120000</time>
+                                        </wait>
+                                        <env>
+                                            <MYSQL_ROOT_PASSWORD>root@1234</MYSQL_ROOT_PASSWORD>
+                                            <MYSQL_DATABASE>swtest</MYSQL_DATABASE>
+                                            <MYSQL_ROOT_HOST>%</MYSQL_ROOT_HOST>
+                                        </env>
+                                        <ports>
+                                            <port>mysql.port:3306</port>
+                                        </ports>
+                                    </run>
+                                </image>
+                                <image>
+                                    <name>skyapm/e2e-container:${e2e.container.version}</name>
+                                    <alias>${e2e.container.name.prefix}-runner</alias>
+                                    <run>
+                                        <env>
+                                            <STORAGE>mysql</STORAGE>
+                                            <SW_JDBC_URL>jdbc:mysql://${e2e.container.name.prefix}-datasource:3306/swtest</SW_JDBC_URL>
+                                            <INSTRUMENTED_SERVICE_1>
+                                                ${provider.name}-${project.version}.jar
+                                            </INSTRUMENTED_SERVICE_1>
+                                            <INSTRUMENTED_SERVICE_1_OPTS>
+                                                -DSW_AGENT_COLLECTOR_BACKEND_SERVICES=127.0.0.1:11800
+                                                -DSW_AGENT_PROFILE_ACTIVE=true
+                                                -DSW_AGENT_NAME=${provider.name}
+                                                -Dserver.port=9090
+                                            </INSTRUMENTED_SERVICE_1_OPTS>
+                                        </env>
+                                        <dependsOn>
+                                            <container>${e2e.container.name.prefix}-datasource</container>
+                                        </dependsOn>
+                                        <links>
+                                            <link>${e2e.container.name.prefix}-datasource</link>
+                                        </links>
+                                        <ports>
+                                            <port>+webapp.host:webapp.port:8081</port>
+                                            <port>+service.host:service.port:9090</port>
+                                        </ports>
+                                        <volumes>
+                                            <bind>
+                                                <volume>${sw.home}:/sw</volume>
+                                                <volume>${project.build.directory}:/home</volume>
+                                                <volume>../${provider.name}/target/${provider.name}-${project.version}.jar:/home/${provider.name}-${project.version}.jar</volume>
+                                                <volume>${project.basedir}/src/docker/rc.d:/rc.d:ro</volume>
+                                                <volume>${project.basedir}/src/docker/clusterize.awk:/clusterize.awk</volume>
+                                            </bind>
+                                        </volumes>
+                                        <wait>
+                                            <log>SkyWalking e2e container is ready for tests</log>
+                                            <time>3000000</time>
+                                        </wait>
+                                    </run>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <!--h2 environment -->
 
 Review comment:
   ```suggestion
           <!--h2 storage -->
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] mrproliu commented on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
mrproliu commented on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575966420
 
 
   @kezhenxu94 This is a modification of the e2e test case, please help check it.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] wu-sheng commented on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
wu-sheng commented on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575967357
 
 
   @dmsolr please compare this with your PR too.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] codecov-io edited a comment on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
codecov-io edited a comment on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575968756
 
 
   # [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=h1) Report
   > Merging [#4268](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=desc) into [master](https://codecov.io/gh/apache/skywalking/commit/90f3c4de557b427426dc33a86f3223be6a831794?src=pr&el=desc) will **decrease** coverage by `0.03%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/skywalking/pull/4268/graphs/tree.svg?width=650&token=qrILxY5yA8&height=150&src=pr)](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree)
   
   ```diff
   @@            Coverage Diff             @@
   ##           master    #4268      +/-   ##
   ==========================================
   - Coverage   26.92%   26.89%   -0.04%     
   ==========================================
     Files        1162     1162              
     Lines       25400    25400              
     Branches     3628     3628              
   ==========================================
   - Hits         6840     6832       -8     
   - Misses      17956    17963       +7     
   - Partials      604      605       +1
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree) | Coverage Δ | |
   |---|---|---|
   | [.../agent/core/profile/ProfileTaskChannelService.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvcHJvZmlsZS9Qcm9maWxlVGFza0NoYW5uZWxTZXJ2aWNlLmphdmE=) | `28.73% <0%> (-8.05%)` | :arrow_down: |
   | [...walking/apm/agent/core/context/TracingContext.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvY29udGV4dC9UcmFjaW5nQ29udGV4dC5qYXZh) | `60.88% <0%> (-0.45%)` | :arrow_down: |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=footer). Last update [90f3c4d...e9860e8](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265752
 
 

 ##########
 File path: test/e2e/run.sh
 ##########
 @@ -36,6 +36,9 @@ while [[ $# -gt 0 ]]; do
     --profiles=*)
       profiles=${1#*=}
       ;;
+    --env=*)
 
 Review comment:
   `env` -> `storage` please

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] codecov-io commented on issue #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
codecov-io commented on issue #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#issuecomment-575968756
 
 
   # [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=h1) Report
   > Merging [#4268](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=desc) into [master](https://codecov.io/gh/apache/skywalking/commit/90f3c4de557b427426dc33a86f3223be6a831794?src=pr&el=desc) will **decrease** coverage by `0.09%`.
   > The diff coverage is `n/a`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/skywalking/pull/4268/graphs/tree.svg?width=650&token=qrILxY5yA8&height=150&src=pr)](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree)
   
   ```diff
   @@            Coverage Diff            @@
   ##           master    #4268     +/-   ##
   =========================================
   - Coverage   26.92%   26.83%   -0.1%     
   =========================================
     Files        1162     1162             
     Lines       25400    25400             
     Branches     3628     3628             
   =========================================
   - Hits         6840     6817     -23     
   - Misses      17956    17978     +22     
   - Partials      604      605      +1
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=tree) | Coverage Δ | |
   |---|---|---|
   | [...alking/apm/agent/core/remote/AgentIDDecorator.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvcmVtb3RlL0FnZW50SUREZWNvcmF0b3IuamF2YQ==) | `67.85% <0%> (-17.86%)` | :arrow_down: |
   | [...ache/skywalking/apm/agent/core/jvm/JVMService.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvanZtL0pWTVNlcnZpY2UuamF2YQ==) | `60.65% <0%> (-16.4%)` | :arrow_down: |
   | [.../agent/core/profile/ProfileTaskChannelService.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvcHJvZmlsZS9Qcm9maWxlVGFza0NoYW5uZWxTZXJ2aWNlLmphdmE=) | `28.73% <0%> (-8.05%)` | :arrow_down: |
   | [...walking/apm/agent/core/context/TracingContext.java](https://codecov.io/gh/apache/skywalking/pull/4268/diff?src=pr&el=tree#diff-YXBtLXNuaWZmZXIvYXBtLWFnZW50LWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NreXdhbGtpbmcvYXBtL2FnZW50L2NvcmUvY29udGV4dC9UcmFjaW5nQ29udGV4dC5qYXZh) | `60.88% <0%> (-0.45%)` | :arrow_down: |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=continue).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=footer). Last update [90f3c4d...47c9211](https://codecov.io/gh/apache/skywalking/pull/4268?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
   

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

[GitHub] [skywalking] kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project

Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #4268: merge e2e profile test project
URL: https://github.com/apache/skywalking/pull/4268#discussion_r368265708
 
 

 ##########
 File path: test/e2e/e2e-profile/e2e-profile-test-runner/pom.xml
 ##########
 @@ -46,5 +46,254 @@
 
     </dependencies>
 
+    <properties>
+        <provider.name>e2e-profile-service</provider.name>
+        <e2e.container.version>1.1</e2e.container.version>
+        <e2e.container.name.prefix>skywalking-e2e-container-${build.id}-profile</e2e.container.name.prefix>
+    </properties>
+
+    <profiles>
+        <!--mysql environment -->
 
 Review comment:
   ```suggestion
           <!--mysql storage -->
   ```

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services