You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/11/23 07:06:07 UTC
[incubator-skywalking] branch mysql-style updated (76eb00a ->
cffdd7f)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch mysql-style
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 76eb00a Support create table in mysql. Add column name override mechanism.
add 7c8a683 gRPC client usage improve (#1946)
add fd47fcb Remote clients selector error: / by zero (#1949)
add e697385 feat:support set config from system.envs. (#1919)
new cffdd7f Merge commit 'e697385b5380c775b02ab46d6d5cefe2c2775c18' into mysql-style
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:
.../core/remote/TraceSegmentServiceClient.java | 32 ++--
docs/en/setup/backend/backend-setting-override.md | 36 +++-
oap-server/pom.xml | 21 ++-
.../plugin/kubernetes/KubernetesCoordinator.java | 27 +--
.../kubernetes/KubernetesCoordinatorTest.java | 18 +-
.../plugin/standalone/StandaloneManager.java | 9 +-
.../plugin/standalone/StandaloneManagerTest.java | 5 +-
.../plugin/zookeeper/ZookeeperCoordinator.java | 15 +-
.../ClusterModuleZookeeperProviderTestCase.java | 7 +-
oap-server/server-core/pom.xml | 14 +-
.../oap/server/core/CoreModuleProvider.java | 53 ++----
.../core/analysis/data/NonMergeDataCollection.java | 4 +-
.../oap/server/core/cluster/RemoteInstance.java | 36 +---
.../service/NetworkAddressInventoryRegister.java | 2 +-
.../service/ServiceInstanceInventoryRegister.java | 2 +-
.../server/core/remote/RemoteServiceHandler.java | 23 ++-
.../client/Address.java} | 45 ++---
.../core/remote/client/GRPCRemoteClient.java | 120 +++++++++---
.../server/core/remote/client/RemoteClient.java | 8 +-
.../core/remote/client/RemoteClientManager.java | 149 ++++++++++++---
.../core/remote/client/SelfRemoteClient.java | 24 ++-
.../core/storage/ttl/DataTTLKeeperTimer.java | 25 +--
.../core/remote/RemoteServiceHandlerTestCase.java | 142 ++++++++++++++
.../remote/client/GRPCRemoteClientRealClient.java | 90 +++++++++
.../remote/client/GRPCRemoteClientRealServer.java | 50 +++++
.../remote/client/GRPCRemoteClientTestCase.java | 109 +++++++++++
.../remote/client/RemoteClientManagerTestCase.java | 95 ++++++++++
.../oap/server/library/client/Client.java | 3 +-
.../client/elasticsearch/ElasticSearchClient.java | 2 +-
.../oap/server/library/client/grpc/GRPCClient.java | 11 +-
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 15 +-
.../elasticsearch/ElasticSearchClientTestCase.java | 2 +-
oap-server/server-library/library-util/pom.xml | 16 +-
...tils.java => PlaceholderConfigurerSupport.java} | 21 +--
.../library/util/PropertyPlaceholderHelper.java | 208 +++++++++++++++++++++
.../oap/server/library/util/StringUtils.java | 12 ++
.../util/PropertyPlaceholderHelperTest.java | 90 +++++++++
.../src/test/resources/application.yml | 82 ++++++++
.../src/main/proto/policy/v1beta1/value_type.proto | 4 +-
.../rest/NetworkAddressRegisterServletHandler.java | 2 +-
.../standardization/ReferenceIdExchanger.java | 2 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 2 +-
.../src/main/assembly/application.yml | 82 ++++----
.../starter/config/ApplicationConfigLoader.java | 24 ++-
.../src/main/resources/application.yml | 85 +++++----
.../server-starter/src/main/resources/log4j2.xml | 1 +
.../StorageModuleElasticsearchProvider.java | 2 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 44 +----
48 files changed, 1449 insertions(+), 422 deletions(-)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{cluster/RemoteInstance.java => remote/client/Address.java} (57%)
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandlerTestCase.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealClient.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientRealServer.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClientTestCase.java
create mode 100644 oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/remote/client/RemoteClientManagerTestCase.java
copy oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/{StringUtils.java => PlaceholderConfigurerSupport.java} (66%)
create mode 100644 oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelper.java
create mode 100644 oap-server/server-library/library-util/src/test/java/org/apache/skywalking/oap/server/library/util/PropertyPlaceholderHelperTest.java
create mode 100644 oap-server/server-library/library-util/src/test/resources/application.yml
[incubator-skywalking] 01/01: Merge commit
'e697385b5380c775b02ab46d6d5cefe2c2775c18' into mysql-style
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch mysql-style
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit cffdd7fe45b86db30552195a3f3c5f6102e73b19
Merge: 76eb00a e697385
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Nov 23 15:05:57 2018 +0800
Merge commit 'e697385b5380c775b02ab46d6d5cefe2c2775c18' into mysql-style
# Conflicts:
# oap-server/server-starter/src/main/resources/application.yml
.../core/remote/TraceSegmentServiceClient.java | 32 ++--
docs/en/setup/backend/backend-setting-override.md | 36 +++-
oap-server/pom.xml | 21 ++-
.../plugin/kubernetes/KubernetesCoordinator.java | 27 +--
.../kubernetes/KubernetesCoordinatorTest.java | 18 +-
.../plugin/standalone/StandaloneManager.java | 9 +-
.../plugin/standalone/StandaloneManagerTest.java | 5 +-
.../plugin/zookeeper/ZookeeperCoordinator.java | 15 +-
.../ClusterModuleZookeeperProviderTestCase.java | 7 +-
oap-server/server-core/pom.xml | 14 +-
.../oap/server/core/CoreModuleProvider.java | 53 ++----
.../core/analysis/data/NonMergeDataCollection.java | 4 +-
.../oap/server/core/cluster/RemoteInstance.java | 36 +---
.../service/NetworkAddressInventoryRegister.java | 2 +-
.../service/ServiceInstanceInventoryRegister.java | 2 +-
.../server/core/remote/RemoteServiceHandler.java | 23 ++-
.../client/Address.java} | 45 ++---
.../core/remote/client/GRPCRemoteClient.java | 120 +++++++++---
.../server/core/remote/client/RemoteClient.java | 8 +-
.../core/remote/client/RemoteClientManager.java | 149 ++++++++++++---
.../core/remote/client/SelfRemoteClient.java | 24 ++-
.../core/storage/ttl/DataTTLKeeperTimer.java | 25 +--
.../core/remote/RemoteServiceHandlerTestCase.java | 142 ++++++++++++++
.../remote/client/GRPCRemoteClientRealClient.java | 90 +++++++++
.../remote/client/GRPCRemoteClientRealServer.java | 50 +++++
.../remote/client/GRPCRemoteClientTestCase.java | 109 +++++++++++
.../remote/client/RemoteClientManagerTestCase.java | 95 ++++++++++
.../oap/server/library/client/Client.java | 3 +-
.../client/elasticsearch/ElasticSearchClient.java | 2 +-
.../oap/server/library/client/grpc/GRPCClient.java | 11 +-
.../client/jdbc/hikaricp/JDBCHikariCPClient.java | 15 +-
.../elasticsearch/ElasticSearchClientTestCase.java | 2 +-
oap-server/server-library/library-util/pom.xml | 16 +-
...tils.java => PlaceholderConfigurerSupport.java} | 21 +--
.../library/util/PropertyPlaceholderHelper.java | 208 +++++++++++++++++++++
.../oap/server/library/util/StringUtils.java | 12 ++
.../util/PropertyPlaceholderHelperTest.java | 90 +++++++++
.../src/test/resources/application.yml | 82 ++++++++
.../src/main/proto/policy/v1beta1/value_type.proto | 4 +-
.../rest/NetworkAddressRegisterServletHandler.java | 2 +-
.../standardization/ReferenceIdExchanger.java | 2 +-
.../transform/SpringSleuthSegmentBuilderTest.java | 2 +-
.../src/main/assembly/application.yml | 82 ++++----
.../starter/config/ApplicationConfigLoader.java | 24 ++-
.../src/main/resources/application.yml | 85 +++++----
.../server-starter/src/main/resources/log4j2.xml | 1 +
.../StorageModuleElasticsearchProvider.java | 2 +-
.../storage/plugin/jdbc/h2/H2StorageProvider.java | 44 +----
48 files changed, 1449 insertions(+), 422 deletions(-)
diff --cc oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
index 0a2a04d,f0e9084..20ea0bc
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleProvider.java
@@@ -63,10 -36,8 +36,9 @@@ import org.apache.skywalking.oap.server
import org.apache.skywalking.oap.server.core.storage.PersistenceTimer;
import org.apache.skywalking.oap.server.core.storage.annotation.StorageAnnotationListener;
import org.apache.skywalking.oap.server.core.storage.model.IModelGetter;
+import org.apache.skywalking.oap.server.core.storage.model.IModelOverride;
import org.apache.skywalking.oap.server.core.storage.ttl.DataTTLKeeperTimer;
import org.apache.skywalking.oap.server.library.module.*;
- import org.apache.skywalking.oap.server.library.module.ModuleDefine;
import org.apache.skywalking.oap.server.library.server.ServerException;
import org.apache.skywalking.oap.server.library.server.grpc.GRPCServer;
import org.apache.skywalking.oap.server.library.server.jetty.JettyServer;