Rabbitmq plugin test migration #3788

viswaramamoorthy · 2019-11-05T13:40:41Z

Please answer these questions before submitting pull request

Why submit this pull request?
Bug fix
New feature provided
Improve performance
Related issues

Bug fix

Bug description.
Migrated RabbitMQ plugin e2e test cases
How to fix?

New feature or improvement

Describe the details and related test reports.

wu-sheng · 2019-11-05T13:44:49Z

Add your job to Jenkinsfile-Agent-Test file, workload 1 group. Otherwise, this would not be tested in CI.

wu-sheng · 2019-11-05T13:45:19Z

FYI @arugal @Aderm

...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java

test/plugin/scenarios/rabbitmq-scenario/src/main/resources/log4j2.xml

Jenkinsfile-Agent-Test

arugal · 2019-11-05T16:39:50Z

Jenkinsfile-Agent-Test

+                            steps {
+                                sh 'bash test/plugin/run.sh rabbitmq-scenario'
+                            }
+                        }


Missing Test Case Report, please refer to the local-test-and-pull-request-to-the-upstream .

@arugal I helped on fixing this part.

...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java

ghost · 2019-11-06T07:43:14Z

test/plugin/scenarios/rabbitmq-scenario/pom.xml

+            <id>spring-milestones</id>
+            <url>http://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>


does this pluginRepositories needs？

Please notice this, I don't think we need spring repo. Maven central should be enough, right?

@viswaramamoorthy could you remove this?

test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties

viswaramamoorthy · 2019-11-06T13:43:32Z

I am not familiar with this framework. one of you can take over this PR.

wu-sheng · 2019-11-07T00:42:54Z

@viswaramamoorthy The test is not hard, it is just demo codes with the real agent, and check the segments sent by the agent. You should understand it, it will help you to make sure the plugin is right.

dmsolr · 2019-11-07T10:38:33Z

Hi @viswaramamoorthy
It is almost to be good. follows the reviewer's suggestion and fix them.

viswaramamoorthy · 2019-11-07T13:52:53Z

I ran rabbitmq-scenario locally using run.sh. I saw few basic errors.

is run.sh expected work locally for e.g. my laptop? I have docker installed.

arugal · 2019-11-07T14:00:27Z

I ran rabbitmq-scenario locally using run.sh. I saw few basic errors.

is run.sh expected work locally for e.g. my laptop? I have docker installed.

Hello, has healthcheck-url been added? this is the log for workload1-group1 because the failed due to a lack of healthcheck-url.

[2019-11-07T01:30:10.520Z] [ERROR] rabbitmq-scenario-5.5.1 url=http://localhost:8080/rabbitmq-case/case/healthcheck, status=HTTP/1.1 404 
 health check failed!

viswaramamoorthy · 2019-11-07T14:33:02Z

Local error is not due to health check, it is complaining about missing or docker image permission. see below.

Pulling rabbitmq-scenario-5.5.1-local (skywalking/agent-test-jvm:local)...
ERROR: The image for the service you're trying to recreate has been removed. If you continue, volume data could be lost. Consider backing up your data before continuing.

Anyway, I have added healthcheck and made changes to log messages. check

arugal · 2019-11-07T14:50:36Z

Local error is not due to health check, it is complaining about missing or docker image permission. see below.

Run locally use bash test/plugin/run.sh -f rabbitmq-scenario

Anyway, I have added healthcheck and made changes to log messages. check

Good, let's wait for the test result.

Todo list:

merge the master branch code
modify Jenkinsfile-Agent-Test#Test Cases Report
update The elapsed time list of plugins according to test results
...

viswaramamoorthy · 2019-11-07T15:30:03Z

@arugal That is the issue. run,sh is an issue. build_id has to be defaulted to latest so the built docker image can be run. It is defaulted to "local" because of this, docker compose generated looks for " skywalking/agent-test-jvm:local" that never exists and hence container not starting

I have shown the problem in bold below. check

build_id="local"
......
print_help() {
echo "Usage: run.sh [OPTION] SCENARIO_NAME"
echo -e "\t-f, --force_build \t\t do force to build Plugin-Test tools and images"
echo -e "\t--build_id, \t\t\t specify Plugin_Test's image tag. Defalt: latest"

arugal · 2019-11-07T15:40:17Z

ha, use bash test/plugin/run.sh -f rabbitmq-scenario set the BUILD_ID, maybe you need to pull the latest code?

skywalking/test/plugin/run.sh

Line 148 in 6206074

    
           [[ "$force_build" == "on" ]] && ${mvnw} -f ${home}/pom.xml clean package -DskipTests -DBUILD_NO=${BUILD_NO:=local} docker:build

dmsolr · 2019-11-07T15:43:59Z

Hi, @viswaramamoorthy ~~I updated the default value of BUILD_ID without usage.~~ (I have a mistake. In fact, it has deleted.)
I have merged the master into your pr. Now, you need to pull the latest code. and retry it.

wu-sheng · 2019-11-08T00:37:10Z

Related to #3583

wu-sheng · 2019-11-08T01:14:06Z

Please follow this, https://github.com/apache/skywalking/blob/master/docs/en/guides/Plugin-test.md#the-elapsed-time-list-of-plugins. And add your task into the fastest one when it is ready to be merged.

arugal · 2019-11-08T01:40:02Z

/run agent-plugin-test-1

test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml

viswaramamoorthy · 2019-11-09T15:01:26Z

@arugal @wu-sheng I have pushed commit with code review comment changes.

...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java

arugal · 2019-11-10T02:26:12Z

test/plugin/scenarios/rabbitmq-scenario/pom.xml

+            <id>spring-milestones</id>
+            <url>http://repo.spring.io/milestone</url>
+        </pluginRepository>
+    </pluginRepositories>


...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java

test/plugin/scenarios/rabbitmq-scenario/src/main/resources/log4j2.xml

...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java

wu-sheng · 2019-11-12T02:14:10Z

@viswaramamoorthy Please follow the review.

wu-sheng · 2019-11-12T15:00:32Z

@viswaramamoorthy Code frozen is over. Please keep the update, after all checked, this could be merged.

viswaramamoorthy · 2019-11-12T15:36:13Z

I am away from my computer for couple of days. If someone can take that final comment and fix, they can. Or I will send update in two days.

…

On Tue, Nov 12, 2019, 10:01 AM 吴晟 Wu Sheng ***@***.***> wrote: @viswaramamoorthy <https://github.com/viswaramamoorthy> Code frozen is over. Please keep the update, after all checked, this could be merged. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3788?email_source=notifications&email_token=AF5E7VPIOFXNUOZMDP6LC7DQTLAL3A5CNFSM4JJCXSVKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOED2QYVY#issuecomment-552930391>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AF5E7VNS2TIMZFKVCQPEK43QTLAL3ANCNFSM4JJCXSVA> .

wu-sheng · 2019-11-12T15:53:25Z

>I am away from my computer for couple of days. If someone can take that
final comment and fix, they can. Or I will send update in two days.

Got it, we will wait.

wu-sheng · 2019-11-14T14:34:12Z

@viswaramamoorthy Please solve the conflicts and update to the master branch.

wu-sheng · 2019-11-14T23:42:11Z

@viswaramamoorthy you need to solve the conflict.

Remove the repo addresses.

wu-sheng

@Aderm @dmsolr Please recheck. I helped on fixing the missing two issues. It should be good to go.

arugal · 2019-11-15T06:57:02Z

LGTM

wu-sheng · 2019-11-15T07:14:15Z

/run agent-plugin-test-2

viswaramamoorthy mentioned this pull request Nov 5, 2019

Rabbitmq instrument consumer class correctly to get duration reported… #3761

Merged

3 tasks

wu-sheng requested review from dmsolr and kezhenxu94 November 5, 2019 13:45

wu-sheng added agent Language agent related. plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor. test Test requirements about performance, feature or before release. labels Nov 5, 2019

viswaramamoorthy force-pushed the 3753-rabbitmq-e2e-tests branch from 0206b79 to 02757ba Compare November 5, 2019 14:53

dmsolr reviewed Nov 5, 2019

View reviewed changes

viswaramamoorthy force-pushed the 3753-rabbitmq-e2e-tests branch 2 times, most recently from 4d8964c to 7167d88 Compare November 5, 2019 15:41

arugal reviewed Nov 5, 2019

View reviewed changes

...rio/src/main/java/org/apache/skywalking/apm/testcase/rabbitmq/controller/CaseController.java Show resolved Hide resolved

kezhenxu94 changed the title ~~Rabbitmq plugin e2e test migration~~ Rabbitmq plugin test migration Nov 6, 2019

ghost reviewed Nov 6, 2019

View reviewed changes

test/plugin/scenarios/rabbitmq-scenario/src/main/resources/application.properties Outdated Show resolved Hide resolved

viswaramamoorthy force-pushed the 3753-rabbitmq-e2e-tests branch from b701050 to cd18477 Compare November 7, 2019 14:31

Rabbitmq plugin e2e test migration

b67c1ef

viswaramamoorthy force-pushed the 3753-rabbitmq-e2e-tests branch from 33ce9ac to b67c1ef Compare November 7, 2019 20:00

arugal reviewed Nov 8, 2019

View reviewed changes

test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml Outdated Show resolved Hide resolved

arugal reviewed Nov 8, 2019

View reviewed changes

test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml Outdated Show resolved Hide resolved

arugal reviewed Nov 8, 2019

View reviewed changes

test/plugin/scenarios/rabbitmq-scenario/config/expectedData.yaml Show resolved Hide resolved

wu-sheng and others added 3 commits November 9, 2019 19:37

Merge branch 'master' into 3753-rabbitmq-e2e-tests

b25635c

3753-code review fixes

f510f01

Merge branch 'master' into 3753-rabbitmq-e2e-tests

11e4e55

wu-sheng requested a review from dmsolr November 10, 2019 02:26

arugal reviewed Nov 10, 2019

View reviewed changes

Merge branch 'master' into 3753-rabbitmq-e2e-tests

9944695

wu-sheng added this to the 6.6.0 milestone Nov 13, 2019

3753-test-case-improvements

2bc83a3

Merge branch 'master' into 3753-rabbitmq-e2e-tests

4a5055f

wu-sheng added 3 commits November 15, 2019 08:37

Merge branch 'master' into 3753-rabbitmq-e2e-tests

4c26741

Update pom.xml

6aa8fc6

Remove the repo addresses.

Update Plugin-test.md

9ebe32a

wu-sheng approved these changes Nov 15, 2019

View reviewed changes

arugal approved these changes Nov 15, 2019

View reviewed changes

wu-sheng merged commit d0a1cdd into apache:master Nov 15, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rabbitmq plugin test migration #3788

Rabbitmq plugin test migration #3788

viswaramamoorthy commented Nov 5, 2019

wu-sheng commented Nov 5, 2019

wu-sheng commented Nov 5, 2019

arugal Nov 5, 2019 •

edited

wu-sheng Nov 15, 2019

ghost Nov 6, 2019

wu-sheng Nov 8, 2019

arugal Nov 10, 2019

wu-sheng Nov 14, 2019

viswaramamoorthy commented Nov 6, 2019

wu-sheng commented Nov 7, 2019

dmsolr commented Nov 7, 2019

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019 •

edited

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019 •

edited

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019

dmsolr commented Nov 7, 2019 •

edited

wu-sheng commented Nov 8, 2019

wu-sheng commented Nov 8, 2019

arugal commented Nov 8, 2019

viswaramamoorthy commented Nov 9, 2019

arugal Nov 10, 2019

wu-sheng commented Nov 12, 2019

wu-sheng commented Nov 12, 2019

viswaramamoorthy commented Nov 12, 2019 via email

wu-sheng commented Nov 12, 2019

wu-sheng commented Nov 14, 2019

wu-sheng commented Nov 14, 2019

wu-sheng left a comment

arugal commented Nov 15, 2019

wu-sheng commented Nov 15, 2019

Rabbitmq plugin test migration #3788

Rabbitmq plugin test migration #3788

Conversation

viswaramamoorthy commented Nov 5, 2019

Bug fix

New feature or improvement

wu-sheng commented Nov 5, 2019

wu-sheng commented Nov 5, 2019

arugal Nov 5, 2019 • edited

Choose a reason for hiding this comment

wu-sheng Nov 15, 2019

Choose a reason for hiding this comment

ghost Nov 6, 2019

Choose a reason for hiding this comment

wu-sheng Nov 8, 2019

Choose a reason for hiding this comment

arugal Nov 10, 2019

Choose a reason for hiding this comment

wu-sheng Nov 14, 2019

Choose a reason for hiding this comment

viswaramamoorthy commented Nov 6, 2019

wu-sheng commented Nov 7, 2019

dmsolr commented Nov 7, 2019

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019 • edited

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019 • edited

viswaramamoorthy commented Nov 7, 2019

arugal commented Nov 7, 2019

dmsolr commented Nov 7, 2019 • edited

wu-sheng commented Nov 8, 2019

wu-sheng commented Nov 8, 2019

arugal commented Nov 8, 2019

viswaramamoorthy commented Nov 9, 2019

arugal Nov 10, 2019

Choose a reason for hiding this comment

wu-sheng commented Nov 12, 2019

wu-sheng commented Nov 12, 2019

viswaramamoorthy commented Nov 12, 2019 via email

wu-sheng commented Nov 12, 2019

wu-sheng commented Nov 14, 2019

wu-sheng commented Nov 14, 2019

wu-sheng left a comment

Choose a reason for hiding this comment

arugal commented Nov 15, 2019

wu-sheng commented Nov 15, 2019

arugal Nov 5, 2019 •

edited

arugal commented Nov 7, 2019 •

edited

arugal commented Nov 7, 2019 •

edited

dmsolr commented Nov 7, 2019 •

edited