This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch conflict
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 53bacfc Fix sampling and Kafka reporter conflicting.
add 6227db1 Save error trace segment even that segment will abandoned by
sampling mechanism (#5407)
add 5b078b3 Merge branch 'master' into conflict
No new revisions were added by this update.
Summary of changes:
docs/en/setup/backend/trace-sampling.md | 7 +++++-
.../analyzer/provider/AnalyzerModuleConfig.java | 7 ++++++
.../parser/listener/SegmentAnalysisListener.java | 26 ++++++++++++----------
.../src/main/resources/application.yml | 1 +
4 files changed, 28 insertions(+), 13 deletions(-)
