Skip to content

Move shardingsphere plugins into one folder#7546

Merged
wu-sheng merged 5 commits into
apache:masterfrom
TeslaCN:7173_move_plugins
Aug 26, 2021
Merged

Move shardingsphere plugins into one folder#7546
wu-sheng merged 5 commits into
apache:masterfrom
TeslaCN:7173_move_plugins

Conversation

@TeslaCN
Copy link
Copy Markdown
Member

@TeslaCN TeslaCN commented Aug 23, 2021 •
edited
Loading

@codecov
Copy link
Copy Markdown

codecov Bot commented Aug 23, 2021 •
edited
Loading

Codecov Report

Merging #7546 (0d7366a) into master (944b47b) will decrease coverage by 11.23%.
The diff coverage is 56.00%.

❗ Current head 0d7366a differs from pull request most recent head f04aa57. Consider uploading reports for the commit f04aa57 to get more accurate results
Impacted file tree graph

@@              Coverage Diff              @@
##             master    #7546       +/-   ##
=============================================
- Coverage     53.99%   42.76%   -11.24%     
+ Complexity     4386     3069     -1317     
=============================================
  Files          1903     1899        -4     
  Lines         41371    41248      -123     
  Branches       4632     4635        +3     
=============================================
- Hits          22340    17641     -4699     
- Misses        17889    22488     +4599     
+ Partials       1142     1119       -23
Impacted Files Coverage Δ
.../apm/plugin/shardingsphere/ExecuteInterceptor.java 58.33% <ø> (ø)
...ugin/shardingsphere/JDBCRootInvokeInterceptor.java 75.00% <ø> (ø)
...ng/apm/plugin/shardingsphere/ParseInterceptor.java 75.00% <ø> (ø)
...gin/shardingsphere/ProxyRootInvokeInterceptor.java 75.00% <ø> (ø)
.../plugin/shardingsphere/v40/ExecuteInterceptor.java 58.33% <ø> (ø)
.../shardingsphere/v40/JDBCRootInvokeInterceptor.java 75.00% <ø> (ø)
...pm/plugin/shardingsphere/v40/ParseInterceptor.java 75.00% <ø> (ø)
...shardingsphere/v40/ProxyRootInvokeInterceptor.java 75.00% <ø> (ø)
.../plugin/shardingsphere/v41/ExecuteInterceptor.java 58.33% <ø> (ø)
.../shardingsphere/v41/JDBCRootInvokeInterceptor.java 75.00% <ø> (ø)
... and 317 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 af325b6...f04aa57. Read the comment docs.

@TeslaCN TeslaCN force-pushed the 7173_move_plugins branch from f6cb3b6 to f5713dd Compare August 23, 2021 17:23
@TeslaCN TeslaCN mentioned this pull request Aug 23, 2021
Closed
3 tasks
@wu-sheng
Copy link
Copy Markdown
Member

wu-sheng commented Aug 26, 2021

@TeslaCN How does this go?

@TeslaCN
Copy link
Copy Markdown
Member Author

TeslaCN commented Aug 26, 2021

@TeslaCN How does this go?

I'm investigating why shardingsphere-4.x-scenario failed.

@wu-sheng
Copy link
Copy Markdown
Member

wu-sheng commented Aug 26, 2021

Check the final package. I think you missed this, then the final package is unexpected, then you can't find the correct shardingsphere plugins in the final package folder.

skywalking/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml

Line 53 in af325b6

<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>

@wu-sheng wu-sheng added agent Language agent related. chore Chores about the project, like code cleaning up, typos, upgrading dependencies, etc. plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor. labels Aug 26, 2021
@wu-sheng wu-sheng self-requested a review August 26, 2021 09:37
@TeslaCN
Copy link
Copy Markdown
Member Author

TeslaCN commented Aug 26, 2021

Check the final package. I think you missed this, then the final package is unexpected, then you can't find the correct shardingsphere plugins in the final package folder.

skywalking/apm-sniffer/apm-sdk-plugin/spring-plugins/pom.xml

Line 53 in af325b6

<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>

Thanks!

@wu-sheng wu-sheng added this to the 8.8.0 milestone Aug 26, 2021
@wu-sheng wu-sheng marked this pull request as ready for review August 26, 2021 09:56
wu-sheng
wu-sheng approved these changes Aug 26, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@wu-sheng wu-sheng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests work now. Wait for all confirmations.

@wu-sheng wu-sheng merged commit e6447d5 into apache:master Aug 26, 2021
@TeslaCN TeslaCN deleted the 7173_move_plugins branch August 26, 2021 10:47
@wu-sheng wu-sheng modified the milestones: 8.8.0, Java - 8.8.0 Aug 27, 2021
wu-sheng added a commit that referenced this pull request Aug 31, 2021
@wu-sheng
Merge branch 'master' into banyandb-integration
33065da 
* master: (41 commits)
  Fix `ZookeeperConfigWatcherRegister.readConfig()` could cause `NPE` when `data.getData()` is null (#7611)
  Fix dynamic configuration watch implementation current value not null when the config is deleted. (#7606)
  Fix CI job `check-dependency-license` failure (#7601)
  Support configure sampling rate dynamically for service dimension on the backend side (#7554)
  Use new GitHub issue form template (#7604)
  Refine backend doc (#7595)
  Update mal.md (#7596)
  Update menu.yml (#7594)
  Remove menu of java agent doc. (#7593)
  Remove agent codes and clean up (#7588)
  refine backend doc (#7587)
  Doc: Reorganize dynamic configuration doc (#7586)
  sync ui and update CHANGES log (#7585)
  Fix issue#7527, add desc sort function in IBrowserLogQueryDAO of H2 and ES (#7580)
  Move shardingsphere plugins into one folder (#7546)
  Escape `.` in `String.replaceFirst` as it acts as a wildcard (#7576)
  Fix dead link (#7575)
  Support k8s configmap grouped dynamic configurations (#7570)
  Fix dead link (#7560)
  refine backend doc (#7559)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wu-sheng wu-sheng wu-sheng approved these changes

Assignees

No one assigned

Labels

agent Language agent related. chore Chores about the project, like code cleaning up, typos, upgrading dependencies, etc. plugin Plugin for agent or collector. Be used to extend the capabilities of default implementor.

Projects

None yet

Milestone

Java - 8.8.0

Development

Successfully merging this pull request may close these issues.

Discussion about update agent plugins for ShardingSphere

2 participants

@TeslaCN @wu-sheng