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.

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

optimize: seata-distribution add apm-seata-skywalking #3834

Merged
merged 9 commits into from
Jun 27, 2021

Conversation

zhaoyuguang
Copy link
Member

fix #3830
package seata
export SKYWALKING_ENABLE=true
run seata-server.sh

@@ -91,7 +91,7 @@ if exist %BASEDIR%/logs (
md "%BASEDIR%/logs"
)

Copy link
Member

Choose a reason for hiding this comment

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

if "%SKYWALKING_ENABLE%"=="true"

Copy link
Member Author

Choose a reason for hiding this comment

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

fix, but without Window environment, to verify correctness

@codecov-commenter
Copy link

codecov-commenter commented Jun 22, 2021

Codecov Report

Merging #3834 (6edbfca) into develop (0db08f5) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3834      +/-   ##
=============================================
- Coverage      40.72%   40.71%   -0.02%     
+ Complexity      2990     2989       -1     
=============================================
  Files            676      676              
  Lines          22608    22608              
  Branches        2805     2805              
=============================================
- Hits            9207     9204       -3     
- Misses         12554    12556       +2     
- Partials         847      848       +1     
Impacted Files Coverage Δ
...n/src/main/java/io/seata/common/util/IdWorker.java 77.08% <0.00%> (-6.25%) ⬇️

…sw_dis_0

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
# plugin.springannotation.classname_match_regex=${SW_SPRINGANNOTATION_CLASSNAME_MATCH_REGEX:}

# If set to true, to identify the current node as Seata Server
plugin.seata.server=${SW_SEATA_SERVER:true}
Copy link
Contributor

Choose a reason for hiding this comment

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

the current config should be mark as unchangeable

Copy link
Member Author

Choose a reason for hiding this comment

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

fix

Copy link
Member

@slievrly slievrly left a comment

Choose a reason for hiding this comment

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

LGTM

@zhaoyuguang zhaoyuguang changed the title seata-distribution add apm-seata-skywalking feature: seata-distribution add apm-seata-skywalking Jun 27, 2021
@zhaoyuguang zhaoyuguang changed the title feature: seata-distribution add apm-seata-skywalking optimize: seata-distribution add apm-seata-skywalking Jun 27, 2021
…sw_dis_0

# Conflicts:
#	changes/1.5.0.md
#	changes/en-us/1.5.0.md
Copy link
Contributor

@caohdgege caohdgege left a comment

Choose a reason for hiding this comment

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

LGTM

@caohdgege caohdgege merged commit 17b0503 into apache:develop Jun 27, 2021
@slievrly slievrly added this to the 1.5.0 milestone Aug 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

optimize: seata-distribution add apm-seata-skywalking
4 participants