This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch ci/fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 0ac3b2f Fix CI job `check-dependency-license` failure
add 1c0fc98 Support configure sampling rate dynamically for service
dimension on the backend side (#7554)
add 76d625b Merge branch 'master' into ci/fix
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
apm-dist-es7/src/main/assembly/binary-es7.xml | 1 +
apm-dist/src/main/assembly/binary.xml | 1 +
docs/en/setup/backend/configuration-vocabulary.md | 3 +-
docs/en/setup/backend/dynamic-config.md | 3 +-
docs/en/setup/backend/trace-sampling.md | 28 +-
.../analyzer/provider/AnalyzerModuleConfig.java | 18 +-
.../analyzer/provider/AnalyzerModuleProvider.java | 17 +-
.../trace/TraceLatencyThresholdsAndWatcher.java | 78 -----
.../provider/trace/TraceSampleRateWatcher.java | 71 ----
.../provider/trace/TraceSamplingPolicyWatcher.java | 177 ++++++++++
.../parser/listener/SegmentAnalysisListener.java | 13 +-
.../trace/parser/listener/TraceSegmentSampler.java | 16 +-
.../provider/trace/sampling/SamplingPolicy.java} | 16 +-
.../trace/sampling/SamplingPolicySettings.java} | 50 ++-
.../sampling/SamplingPolicySettingsReader.java | 89 +++++
.../TraceLatencyThresholdsAndWatcherTest.java | 119 -------
.../provider/trace/TraceSampleRateWatcherTest.java | 120 -------
.../trace/TraceSamplingPolicyWatcherTest.java | 370 +++++++++++++++++++++
.../SamplingPolicySettingsReaderTest.java} | 34 +-
.../resources/trace-sampling-policy-settings.yml | 11 +-
oap-server/server-bootstrap/pom.xml | 1 +
.../src/main/resources/application.yml | 4 +-
.../resources/trace-sampling-policy-settings.yml | 14 +-
24 files changed, 755 insertions(+), 500 deletions(-)
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceLatencyThresholdsAndWatcher.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceSampleRateWatcher.java
create mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceSamplingPolicyWatcher.java
copy
oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Pagination.java
=>
analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/sampling/SamplingPolicy.java}
(83%)
copy
oap-server/{server-configuration/configuration-api/src/main/java/org/apache/skywalking/oap/server/configuration/api/GroupConfigTable.java
=>
analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/sampling/SamplingPolicySettings.java}
(51%)
create mode 100644
oap-server/analyzer/agent-analyzer/src/main/java/org/apache/skywalking/oap/server/analyzer/provider/trace/sampling/SamplingPolicySettingsReader.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceLatencyThresholdsAndWatcherTest.java
delete mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceSampleRateWatcherTest.java
create mode 100644
oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/TraceSamplingPolicyWatcherTest.java
copy
oap-server/{server-core/src/test/java/org/apache/skywalking/oap/server/core/config/group/EndpointGroupingRuleReaderTest.java
=>
analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/sampling/SamplingPolicySettingsReaderTest.java}
(52%)
copy test/e2e/e2e-test/src/test/resources/expected/alarm/services.yml =>
oap-server/analyzer/agent-analyzer/src/test/resources/trace-sampling-policy-settings.yml
(85%)
mode change 100644 => 100755
copy lombok.config =>
oap-server/server-bootstrap/src/main/resources/trace-sampling-policy-settings.yml
(52%)
mode change 100644 => 100755
