This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch kezhenxu94-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from c955e50 Update CHANGES.md
add 97f5411 Add the implementation of ConfigurationDiscovery on the OAP
side. (#6220)
add def8f4c Merge branch 'master' into kezhenxu94-patch-1
No new revisions were added by this update.
Summary of changes:
CHANGES.md | 1 +
.../component/command/CommandDeserializer.java | 2 +
.../command/ConfigurationDiscoveryCommand.java | 92 +++++++++++++++++
apm-protocol/apm-network/src/main/proto | 2 +-
docs/en/setup/backend/backend-receivers.md | 7 +-
docs/en/setup/backend/configuration-vocabulary.md | 1 +
docs/en/setup/backend/dynamic-config.md | 1 +
docs/en/setup/service-agent/java-agent/README.md | 3 +
.../java-agent/configuration-discovery.md | 29 ++++++
oap-server/server-bootstrap/pom.xml | 5 +
.../src/main/resources/application.yml | 5 +
.../pom.xml | 8 +-
.../discovery/AgentConfigurations.java} | 35 +++----
.../discovery/AgentConfigurationsReader.java | 75 ++++++++++++++
.../discovery/AgentConfigurationsTable.java} | 17 +++-
.../discovery/AgentConfigurationsWatcher.java | 60 +++++++++++
.../discovery/ConfigurationDiscoveryModule.java} | 10 +-
.../ConfigurationDiscoveryModuleConfig.java} | 18 ++--
.../discovery/ConfigurationDiscoveryProvider.java} | 58 ++++++-----
.../grpc/ConfigurationDiscoveryServiceHandler.java | 88 ++++++++++++++++
...ywalking.oap.server.library.module.ModuleDefine | 2 +-
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../discovery/AgentConfigurationsReaderTest.java | 56 +++++++++++
.../discovery/AgentConfigurationsWatcherTest.java | 111 +++++++++++++++++++++
.../test/resources/agent-dynamic-configuration.yml | 11 +-
oap-server/server-receiver-plugin/pom.xml | 1 +
test/e2e/e2e-protocol/src/main/proto | 2 +-
27 files changed, 617 insertions(+), 85 deletions(-)
create mode 100644
apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ConfigurationDiscoveryCommand.java
create mode 100644
docs/en/setup/service-agent/java-agent/configuration-discovery.md
copy oap-server/{analyzer/log-analyzer =>
server-receiver-plugin/configuration-discovery-receiver-plugin}/pom.xml (87%)
copy
oap-server/{server-configuration/configuration-etcd/src/main/java/org/apache/skywalking/oap/server/configuration/etcd/EtcdServerSettings.java
=>
server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurations.java}
(59%)
create mode 100644
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsReader.java
copy
oap-server/{oal-rt/src/main/java/org/apache/skywalking/oal/rt/output/AllDispatcherContext.java
=>
server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsTable.java}
(67%)
create mode 100644
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsWatcher.java
copy
oap-server/{server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java
=>
server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryModule.java}
(79%)
copy
oap-server/{server-configuration/configuration-consul/src/main/java/org/apache/skywalking/oap/server/configuration/consul/ConsulConfigurationCenterSettings.java
=>
server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryModuleConfig.java}
(70%)
copy
oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmModuleProvider.java
=>
server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/ConfigurationDiscoveryProvider.java}
(60%)
create mode 100644
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/handler/grpc/ConfigurationDiscoveryServiceHandler.java
copy oap-server/{analyzer/agent-analyzer =>
server-receiver-plugin/configuration-discovery-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine
(89%)
copy oap-server/{analyzer/agent-analyzer =>
server-receiver-plugin/configuration-discovery-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider
(89%)
create mode 100644
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsReaderTest.java
create mode 100644
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/java/org/apache/skywalking/oap/server/recevier/configuration/discovery/AgentConfigurationsWatcherTest.java
copy
test/e2e/e2e-test/src/test/resources/expected/storage/dashboardConfiguration-change.yml
=>
oap-server/server-receiver-plugin/configuration-discovery-receiver-plugin/src/test/resources/agent-dynamic-configuration.yml
(82%)
