This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch feature/elasticsearch-client
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
discard e12f52b Rebuilt ElasticSearch client on top of their REST API
add 1c0fc98 Support configure sampling rate dynamically for service
dimension on the backend side (#7554)
add 040115d Fix CI job `check-dependency-license` failure (#7601)
add eb7fae2 Fix dynamic configuration watch implementation current value
not null when the config is deleted. (#7606)
add 313edd3 Fix `ZookeeperConfigWatcherRegister.readConfig()` could cause
`NPE` when `data.getData()` is null (#7611)
add 444adc6 Lock Java agent version in E2E tests (#7625)
new db0dbd8 Rebuilt ElasticSearch client on top of their REST API
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e12f52b)
\
N -- N -- N refs/heads/feature/elasticsearch-client (db0dbd8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/ci-it.yaml | 9 +-
CHANGES.md | 9 +
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 ++++++++++
.../trace/UninstrumentedGatewaysConfig.java | 8 +-
.../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 +-
.../core/alarm/provider/AlarmRulesWatcher.java | 5 +-
oap-server/server-bootstrap/pom.xml | 1 +
.../src/main/resources/application.yml | 4 +-
.../resources/trace-sampling-policy-settings.yml | 14 +-
.../zookeeper/ZookeeperConfigWatcherRegister.java | 6 +-
.../server/core/analysis/ApdexThresholdConfig.java | 8 +-
.../group/EndpointNameGroupingRuleWatcher.java | 2 +-
.../server/core/logging/LoggingConfigWatcher.java | 13 +-
.../discovery/AgentConfigurationsWatcher.java | 5 +-
test/e2e/e2e-test/docker/Dockerfile.consumer | 2 +-
test/e2e/e2e-test/docker/Dockerfile.provider | 2 +-
test/e2e/e2e-test/docker/kafka/Dockerfile.provider | 2 +-
34 files changed, 794 insertions(+), 530 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
