Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize: ehance metrics and fix seata-server UT not work #3904

Merged
merged 31 commits into from
Sep 8, 2021
Merged

optimize: ehance metrics and fix seata-server UT not work #3904

merged 31 commits into from
Sep 8, 2021

Conversation

slievrly
Copy link
Member

@slievrly slievrly commented Jul 25, 2021 •
edited

Ⅰ. Describe what this PR did

optimize: fix seata-server UT not work

fixes #3903 #3993

https://maven.apache.org/surefire/maven-surefire-plugin/examples/junit-platform.html

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

slievrly and others added 22 commits July 24, 2021 19:28
@slievrly
optimize: add jib-maven-plugin
7fcdf68 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
bugfix: fix seataio/seata-server servlet-api conflict
f2f882e 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge remote-tracking branch 'upstream/develop' into develop_server
db6966b
@slievrly
optimize: fix seata-server UT not work
c10e586 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge remote-tracking branch 'upstream/develop' into develop_server
f2e08c2
@slievrly
optimize github template
296c0d6 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
add spring-boot-starter-test
d6a3ac3 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
optimize SB test
9ce4de8 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge branch 'develop' into develop_test
e4b2cb5
@slievrly
Merge remote-tracking branch 'upstream/develop' into develop_server
039b9cf
@slievrly
UT optimize
51b61fb 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge remote-tracking branch 'origin/develop_test' into develop_server
c5db1cf
@slievrly
Merge remote-tracking branch 'upstream/develop' into develop_server
4af92ff 
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	server/src/test/java/io/seata/server/lock/redis/RedisLockManagerTest.java
#	server/src/test/java/io/seata/server/session/redis/RedisSessionManagerTest.java
@slievrly
Merge branch 'develop' into develop_test
ac90999
@slievrly
temp
1628589 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge branch 'develop' into develop_test
da1753f
@slievrly
Merge remote-tracking branch 'upstream/develop' into develop_test
76265f4
@slievrly
ehance mertric and fix UT
da7a5a0 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge remote-tracking branch 'origin/develop_test' into develop_test
ef969bb
@slievrly
Merge branch 'develop' into develop_test
64c1122
@slievrly
ehance mertric and fix UT
b4ab256 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge remote-tracking branch 'origin/develop_test' into develop_test
2cfc6ba
@slievrly slievrly changed the title optimize: fix seata-server UT not work optimize: ehance mertric and fix seata-server UT not work Aug 31, 2021
@slievrly slievrly changed the title optimize: ehance mertric and fix seata-server UT not work optimize: ehance metrics and fix seata-server UT not work Aug 31, 2021
@slievrly
ehance mertric and fix UT
da4f021 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
ehance mertric and fix UT
6f65ec7 
Signed-off-by: slievrly <slievrly@163.com>
@codecov-commenter
Copy link

codecov-commenter commented Aug 31, 2021 •
edited

Codecov Report

Merging #3904 (95540d1) into develop (ad5e933) will increase coverage by 9.17%.
The diff coverage is 55.00%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3904      +/-   ##
=============================================
+ Coverage      40.17%   49.35%   +9.17%     
- Complexity      3081     3720     +639     
=============================================
  Files            692      692              
  Lines          23391    23419      +28     
  Branches        2900     2903       +3     
=============================================
+ Hits            9397    11558    +2161     
+ Misses         13120    10699    -2421     
- Partials         874     1162     +288
Impacted Files Coverage Δ
...va/io/seata/core/event/GlobalTransactionEvent.java 0.00% <0.00%> (ø)
.../io/seata/core/rpc/netty/NettyServerBootstrap.java 0.00% <0.00%> (ø)
...c/main/java/io/seata/core/event/GuavaEventBus.java 52.00% <40.00%> (-18.59%) ⬇️
...ava/io/seata/server/metrics/MetricsSubscriber.java 72.46% <40.00%> (+72.46%) ⬆️
...o/seata/server/coordinator/DefaultCoordinator.java 53.76% <88.88%> (+53.76%) ⬆️
server/src/main/java/io/seata/server/Server.java 80.00% <100.00%> (+80.00%) ⬆️
...in/java/io/seata/server/event/EventBusManager.java 66.66% <100.00%> (+66.66%) ⬆️
...ver/lock/distributed/DistributedLockerFactory.java 88.23% <100.00%> (+88.23%) ⬆️
...ver/storage/db/lock/DataBaseDistributedLocker.java 0.86% <0.00%> (+0.86%) ⬆️
...java/io/seata/server/AbstractTCInboundHandler.java 1.98% <0.00%> (+1.98%) ⬆️
... and 58 more

@slievrly
fix review
e2136b4 
Signed-off-by: slievrly <slievrly@163.com>
funky-eyes
funky-eyes approved these changes Sep 5, 2021
View reviewed changes
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM

@slievrly
fix review
cbd1823 
Signed-off-by: slievrly <slievrly@163.com>
@funky-eyes funky-eyes added this to the 1.5.0 milestone Sep 6, 2021
l81893521
l81893521 reviewed Sep 7, 2021
View reviewed changes
pom.xml Outdated Show resolved Hide resolved
slievrly and others added 2 commits September 7, 2021 14:52
@slievrly
fix review
444d32a 
Signed-off-by: slievrly <slievrly@163.com>
@slievrly
Merge branch 'develop' into develop_test
005030a
@slievrly
fix review
95540d1 
Signed-off-by: slievrly <slievrly@163.com>
l81893521
l81893521 approved these changes Sep 8, 2021
View reviewed changes
Copy link
Contributor

@l81893521 l81893521 left a comment

Choose a reason for hiding this comment

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

LGTM

@l81893521 l81893521 merged commit e95d54c into apache:develop Sep 8, 2021
UmmizzZ pushed a commit to UmmizzZ/seata that referenced this pull request Sep 30, 2021
@slievrly @UmmizzZ
optimize: ehance metrics and fix seata-server UT not work (apache#3904)
a15fd3f
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@l81893521 l81893521 l81893521 approved these changes

@funky-eyes funky-eyes funky-eyes approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.5.0 (1.5.1)
Development

Successfully merging this pull request may close these issues.

seata-server UT not work
4 participants
@slievrly @codecov-commenter @l81893521 @funky-eyes