This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch update/logbck-version
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 4544d99 Update logback version in application logback toolkit, based
on #813 , where I explained that the logback library is not really used, just
for compiling the bridge. But anyway, no harm to fix the risk
add 724b9c5 Application, Instance, Service register tested with elastic
search.
add 5445058 Merge branch 'master' into feature/register_test
add add26b8 Sleeping when id not get.
add abb3515 Merge pull request #816 from
peng-yongsheng/feature/register_test
add ede4260 Merge branch 'master' into feature/heartbeat_test
add a14207e Instance heart beat tested with elastic search. OK.
add 2cef97a Merge pull request #817 from
peng-yongsheng/feature/heartbeat_test
add 1435cbb Trace segment metric aggregate and alarm metric aggregate
tested.
add 37a5287 JVM metric aggregate tested.
add ab3615e Merge pull request #818 from
peng-yongsheng/feature/metric_check
new efcc8e8 Merge branch 'master' into update/logbck-version
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:
.../handler/InstanceDiscoveryServiceHandler.java | 2 +
.../ApplicationRegisterServiceHandlerTestCase.java | 46 ------
.../handler/JVMMetricServiceHandlerTestCase.java | 94 -----------
.../AgentDataMock.java} | 30 ++--
.../grpc/provider/handler/mock/JVMMetricMock.java | 159 +++++++++++++++++++
.../grpc/provider/handler/mock/RegisterMock.java | 176 +++++++++++++++++++++
.../grpc/provider/handler/mock/TimeBuilder.java | 2 +-
.../provider/handler/mock/TraceSegmentMock.java | 28 +---
.../alarm/provider/worker/AlarmAssertWorker.java | 31 ++--
.../ApplicationMetricAlarmListCopy.java | 1 -
.../register/ApplicationRegisterSerialWorker.java | 9 +-
.../register/InstanceRegisterSerialWorker.java | 9 +-
.../src/main/resources/log4j2.xml | 4 +-
.../es/base/dao/AbstractPersistenceEsDAO.java | 4 +-
.../collector/storage/es/base/dao/BatchEsDAO.java | 4 +
...stractApplicationComponentEsPersistenceDAO.java | 2 -
...stractApplicationAlarmListEsPersistenceDAO.java | 1 -
.../AbstractApplicationMetricEsPersistenceDAO.java | 2 -
...AbstractApplicationMappingEsPersistenceDAO.java | 2 -
...ApplicationReferenceMetricEsPersistenceDAO.java | 2 -
.../es/dao/cache/ApplicationEsCacheDAO.java | 4 +-
.../storage/es/dao/cache/InstanceEsCacheDAO.java | 4 +-
.../cpump/AbstractCpuMetricEsPersistenceDAO.java | 2 -
.../dao/gcmp/AbstractGCMetricEsPersistenceDAO.java | 2 -
.../AbstractInstanceMetricEsPersistenceDAO.java | 2 -
.../AbstractInstanceMappingEsPersistenceDAO.java | 2 -
...actInstanceReferenceMetricEsPersistenceDAO.java | 2 -
.../AbstractMemoryMetricEsPersistenceDAO.java | 2 -
.../AbstractMemoryPoolMetricEsPersistenceDAO.java | 2 -
.../smp/AbstractServiceMetricEsPersistenceDAO.java | 2 -
...ractServiceReferenceMetricEsPersistenceDAO.java | 2 -
...stractApplicationComponentH2PersistenceDAO.java | 1 +
...stractApplicationAlarmListH2PersistenceDAO.java | 1 +
.../AbstractApplicationMetricH2PersistenceDAO.java | 1 +
...AbstractApplicationMappingH2PersistenceDAO.java | 1 +
...ApplicationReferenceMetricH2PersistenceDAO.java | 1 +
.../cpump/AbstractCpuMetricH2PersistenceDAO.java | 1 +
.../dao/gcmp/AbstractGCMetricH2PersistenceDAO.java | 1 +
.../AbstractInstanceMetricH2PersistenceDAO.java | 3 +-
.../AbstractInstanceMappingH2PersistenceDAO.java | 1 +
...actInstanceReferenceMetricH2PersistenceDAO.java | 1 +
.../AbstractMemoryMetricH2PersistenceDAO.java | 1 +
.../AbstractMemoryPoolMetricH2PersistenceDAO.java | 1 +
.../smp/AbstractServiceMetricH2PersistenceDAO.java | 1 +
...ractServiceReferenceMetricH2PersistenceDAO.java | 1 +
45 files changed, 418 insertions(+), 232 deletions(-)
delete mode 100644
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/ApplicationRegisterServiceHandlerTestCase.java
delete mode 100644
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/JVMMetricServiceHandlerTestCase.java
rename
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/{InstHeartBeatServiceTestCase.java
=> mock/AgentDataMock.java} (60%)
create mode 100644
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/JVMMetricMock.java
create mode 100644
apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/test/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/mock/RegisterMock.java
--
To stop receiving notification emails like this one, please contact
wush...@apache.org.
