add webflux webclient plugin #5493

vcjmhg · 2020-09-15T12:43:28Z

Please answer these questions before submitting a pull request

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

Bug fix

Bug description.
How to fix?

New feature or improvement

This plugin can collect the information of webflux

Interceptor Method

org.springframework.web.reactive.function.client.ExchangeFunctions$DefaultExchangeFunction$exchange()

Why I chose the mehod?

No matter what the webclient calls exchange() or retrieve(), the asynchronous request is finally executed through org.springframework.web.reactive.function.client.ExchangeFunctions$DefaultExchangeFunction$exchange() and return Mono<ClientResponse> .So I chose exchange() as the Interceptor Method.

Result

ramain the last

update localbase

update to date of time

update project

codecov · 2020-09-15T12:56:51Z

Codecov Report

Merging #5493 into master will increase coverage by 0.88%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##             master    #5493      +/-   ##
============================================
+ Coverage     51.29%   52.17%   +0.88%     
- Complexity     3301     3350      +49     
============================================
  Files          1604      897     -707     
  Lines         34051    22141   -11910     
  Branches       3706     2119    -1587     
============================================
- Hits          17466    11552    -5914     
+ Misses        15723     9660    -6063     
- Partials        862      929      +67

Impacted Files	Coverage Δ	Complexity Δ
.../apm/network/trace/component/ComponentsDefine.java	`98.75% <100.00%> (+0.01%)`	`1.00 <0.00> (ø)`
...p/server/core/analysis/metrics/MinLongMetrics.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
...er/exporter/provider/grpc/GRPCExporterSetting.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
...king/oap/server/configuration/api/ConfigTable.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
...g/oap/server/cluster/plugin/etcd/EtcdEndpoint.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
...skywalking/oap/server/receiver/envoy/als/Role.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
.../server/receiver/envoy/als/DependencyResource.java	`0.00% <0.00%> (-100.00%)`	`0.00% <0.00%> (ø%)`
...erver/cluster/plugin/consul/ConsulCoordinator.java	`0.00% <0.00%> (-97.06%)`	`0.00% <0.00%> (ø%)`
...ent/core/context/status/ExceptionCheckContext.java	`0.00% <0.00%> (-90.91%)`	`0.00% <0.00%> (ø%)`
...t/status/HierarchyMatchExceptionCheckStrategy.java	`9.09% <0.00%> (-90.91%)`	`1.00% <0.00%> (ø%)`
... and 1107 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b560bae...2cd47d4. Read the comment docs.

wu-sheng · 2020-09-15T13:18:29Z

Your test case seems to include the context propagation, but your screenshot seems to not include that important part.

wu-sheng · 2020-09-15T13:27:18Z

Please read check-javaagent-plugin-list.sh, you seem missing a document update.

vcjmhg · 2020-09-15T14:06:20Z

Your test case seems to include the context propagation, but your screenshot seems to not include that important part.

Dear sir,do you mean the expectedData.yaml is incorrect ?And it missed some important part,is it?

wu-sheng · 2020-09-15T14:13:16Z

Dear sir,do you mean the expectedData.yaml is incorrect ?And it missed some important part,is it?

Your screenshot. Webflux doesn't call another service.

wu-sheng · 2020-09-15T14:15:04Z

Also, webflux case fails, you need to recheck.

vcjmhg · 2020-09-15T14:16:53Z

Also, webflux case fails, you need to recheck.

Thank you,sir. I will recheck it.

…expectedData.yaml

wu-sheng · 2020-09-16T13:05:51Z

You don't need to keep update your branch. You could focus on your plugin and tests. We just need the sync before merging.

vcjmhg · 2020-09-16T13:51:31Z

You don't need to keep update your branch. You could focus on your plugin and tests. We just need the sync before merging.

ok,I got it.And I will do what you said.

vcjmhg · 2020-09-17T07:40:55Z

@wu-sheng ,Mr. Wu,when I test in my pc, the test case has passed. The result is just like this:

But when test with CI, it always blocked .And the reason showed in log is that webflux-webclient-scenario.jar is not a file.

I has update Plugin-list.md and submodule project.So I don't know why it failed when test with CI. Could you please give me some suggestions or point out some of the problems?

wu-sheng · 2020-09-17T07:45:43Z

@dmsolr @kezhenxu94 Could you take a look?

kezhenxu94

The newly-added module is not packaged before webflux-dist module, so the error message occurred, see my comment inline, please also note that there is another failure in the CI

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

oap-server/server-bootstrap/src/main/resources/component-libraries.yml

…ine.java

...narios/webflux-scenario/webflux-webclient-scenario/src/main/resources/application.properties

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

.../apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java

� Conflicts: � test/plugin/scenarios/webflux-scenario/support-version.list � test/plugin/scenarios/webflux-scenario/webflux-projectA-scenario/src/main/java/org/apache/skywalking/apm/testcase/sc/webflux/projectA/controller/TestController.java

wu-sheng · 2020-09-26T12:59:50Z

test/plugin/scenarios/webflux-scenario/support-version.list

+2.1.1.RELEASE
+2.1.2.RELEASE
+2.1.3.RELEASE
+2.1.4.RELEASE
+2.1.5.RELEASE
+2.1.6.RELEASE


Recently, we are reducing the unnecessary tests, you could run all these locally, but in the upstream CI, we recommend the latest mini version num, 2.1.6 for all 2.1.x.

Need I modify it ? Just like this:

2.1.6.RELEASE 2.1.7.RELEASE 2.1.8.RELEASE 2.1.9.RELEASE 2.1.10.RELEASE 2.1.11.RELEASE 2.1.12.RELEASE 2.1.13.RELEASE 2.1.14.RELEASE 2.1.15.RELEASE

I think just 2.1.15? Do they have big difference?

The differences between 2.1.x versions are mainly bug fixes. It seems that the difference will not affect our test results.But the version has released to 2.3.x and these versions will include new feature additions . So I don't whether we need to add test for different version of 2.x ?
The specific differences can be seen in the following link：https://github.com/spring-projects/spring-boot/tags

Basically, we recommend using the latest versions of 2.1.x, 2.2.x, and 2.3.x

ok,I got it . I wiil modify it immediately.

wu-sheng

Test codes look good to me, please add comments for all src codes. @kezhenxu94 Could you recheck?

wu-sheng

LGTM

wu-sheng

The Webflux plugin seems still unstable. I saw it passed once, but when I re-run it, it has failed twice. Could you help on rechecking?

vcjmhg · 2020-09-27T07:59:07Z

test/plugin/scenarios/webflux-scenario/support-version.list

+2.1.17.RELEASE
+2.2.10.RELEASE
+2.3.4.RELEASE


The version of 2.1x.RELEASE seems has passed ,but 2.2.x failed.It seem context-path has not activated,I will check it.

The reason for the failure of the 2.2.10 and 2.3.4 is the change in webflux's dependency on netty after 2.2.x.And I have solved it and the test has passed in my pc.

vcjmhg and others added 6 commits May 27, 2020 10:58

Merge pull request #1 from apache/master

d111e5d

ramain the last

Merge pull request #2 from apache/master

ad67170

update localbase

Merge pull request #4 from apache/master

cd07f9b

update to date of time

Merge pull request #6 from apache/master

0e9e126

update project

Merge branch 'master' of https://github.com/apache/skywalking

d6a6dad

finish webflux webclient plugin test

cec57d6

wu-sheng requested a review from ascrutae September 15, 2020 13:17

wu-sheng added agent Language agent related. feature New feature plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor. labels Sep 15, 2020

vcjmhg force-pushed the dev branch from 773dc85 to cec57d6 Compare September 16, 2020 11:16

Merge branch 'master' of https://github.com/apache/skywalking into dev

51483a7

vcjmhg force-pushed the dev branch from e7c7c2f to 35d27db Compare September 16, 2020 12:40

add plugin information in Plugin-list.md and modefiy some content in …

ab0009c

…expectedData.yaml

kezhenxu94 reviewed Sep 17, 2020

View reviewed changes

test/plugin/scenarios/webflux-scenario/pom.xml Outdated Show resolved Hide resolved

kezhenxu94 reviewed Sep 17, 2020

View reviewed changes

oap-server/server-bootstrap/src/main/resources/component-libraries.yml Outdated Show resolved Hide resolved

make plugin name in component-libraries.yml same with in ComponentDef…

94fddff

…ine.java

vcjmhg force-pushed the dev branch from 35d27db to 94fddff Compare September 17, 2020 10:59

dmsolr reviewed Sep 17, 2020

View reviewed changes

...narios/webflux-scenario/webflux-webclient-scenario/src/main/resources/application.properties Outdated Show resolved Hide resolved

wu-sheng requested a review from kezhenxu94 September 22, 2020 15:10

wu-sheng reviewed Sep 22, 2020

View reviewed changes

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

wu-sheng reviewed Sep 22, 2020

View reviewed changes

.../apache/skywalking/apm/testcase/sc/webflux/projectB/controller/TestAnnotationController.java Show resolved Hide resolved

vcjmhg and others added 8 commits September 23, 2020 10:00

Merge branch 'master' into dev

14cee16

Merge branch 'master' into dev

12a0ba0

Merge branch 'master' into dev

2efb263

Merge branch 'master' into dev

7e303fb

Merge branch 'master' into dev

0ff7731

fix the problem that can't send ref data correctly

e206610

Merge branch 'dev' of github.com:vcjmhg/skywalking into dev

3b18be6

vcjmhg force-pushed the dev branch from 80bd283 to 3b18be6 Compare September 26, 2020 06:05

Merge branch 'master' into dev

4e536b5

wu-sheng reviewed Sep 26, 2020

View reviewed changes

vcjmhg and others added 3 commits September 27, 2020 12:23

modify the version of test

2941c68

Merge branch 'master' into dev

4c6aeca

Merge branch 'dev' of github.com:vcjmhg/skywalking into dev

3b19c55

wu-sheng approved these changes Sep 27, 2020

View reviewed changes

wu-sheng requested a review from dmsolr September 27, 2020 06:37

wu-sheng added this to the 8.2.0 milestone Sep 27, 2020

wu-sheng requested changes Sep 27, 2020

View reviewed changes

increase the version of netty

2cd47d4

vcjmhg commented Sep 27, 2020

View reviewed changes

wu-sheng approved these changes Sep 27, 2020

View reviewed changes

wu-sheng merged commit 806666b into apache:master Sep 27, 2020

vcjmhg deleted the dev branch September 28, 2020 01:07

vcjmhg restored the dev branch September 28, 2020 01:07

vcjmhg deleted the dev branch July 26, 2021 11:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add webflux webclient plugin #5493

add webflux webclient plugin #5493

vcjmhg commented Sep 15, 2020

codecov bot commented Sep 15, 2020 •

edited

wu-sheng commented Sep 15, 2020

wu-sheng commented Sep 15, 2020

vcjmhg commented Sep 15, 2020 •

edited

wu-sheng commented Sep 15, 2020

wu-sheng commented Sep 15, 2020

vcjmhg commented Sep 15, 2020

wu-sheng commented Sep 16, 2020

vcjmhg commented Sep 16, 2020

vcjmhg commented Sep 17, 2020

wu-sheng commented Sep 17, 2020

kezhenxu94 left a comment

wu-sheng Sep 26, 2020

vcjmhg Sep 26, 2020 •

edited

wu-sheng Sep 26, 2020

vcjmhg Sep 27, 2020

wu-sheng Sep 27, 2020

vcjmhg Sep 27, 2020

wu-sheng left a comment

wu-sheng left a comment

wu-sheng left a comment

vcjmhg Sep 27, 2020

vcjmhg Sep 27, 2020

add webflux webclient plugin #5493

add webflux webclient plugin #5493

Conversation

vcjmhg commented Sep 15, 2020

Bug fix

New feature or improvement

Interceptor Method

Result

codecov bot commented Sep 15, 2020 • edited

Codecov Report

wu-sheng commented Sep 15, 2020

wu-sheng commented Sep 15, 2020

vcjmhg commented Sep 15, 2020 • edited

wu-sheng commented Sep 15, 2020

wu-sheng commented Sep 15, 2020

vcjmhg commented Sep 15, 2020

wu-sheng commented Sep 16, 2020

vcjmhg commented Sep 16, 2020

vcjmhg commented Sep 17, 2020

wu-sheng commented Sep 17, 2020

kezhenxu94 left a comment

Choose a reason for hiding this comment

wu-sheng Sep 26, 2020

Choose a reason for hiding this comment

vcjmhg Sep 26, 2020 • edited

Choose a reason for hiding this comment

wu-sheng Sep 26, 2020

Choose a reason for hiding this comment

vcjmhg Sep 27, 2020

Choose a reason for hiding this comment

wu-sheng Sep 27, 2020

Choose a reason for hiding this comment

vcjmhg Sep 27, 2020

Choose a reason for hiding this comment

wu-sheng left a comment

Choose a reason for hiding this comment

wu-sheng left a comment

Choose a reason for hiding this comment

wu-sheng left a comment

Choose a reason for hiding this comment

vcjmhg Sep 27, 2020

Choose a reason for hiding this comment

vcjmhg Sep 27, 2020

Choose a reason for hiding this comment

codecov bot commented Sep 15, 2020 •

edited

vcjmhg commented Sep 15, 2020 •

edited

vcjmhg Sep 26, 2020 •

edited