You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/02/11 09:49:13 UTC
[incubator-skywalking] branch master updated (6fc4579 -> ed82e49)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 6fc4579 Merge pull request #805 from peng-yongsheng/feature/getServiceTPSTrend
add eda2d81 Update span layer and server type by address id when those not equals to the values in cache.
new ed82e49 Merge pull request #806 from peng-yongsheng/feature/servertype
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:
.../define/service/INetworkAddressIDService.java | 4 +-
.../NetworkAddressRegisterSerialWorker.java | 44 ++++++------
.../provider/service/InstanceIDService.java | 4 +-
.../provider/service/NetworkAddressIDService.java | 22 ++++--
.../provider/buffer/SegmentBufferManager.java | 2 +-
.../standardization/ReferenceIdExchanger.java | 3 +-
.../parser/standardization/SpanIdExchanger.java | 7 +-
.../cache/service/NetworkAddressCacheService.java | 2 +
.../cache/guava/CacheModuleGuavaProvider.java | 4 +-
...e.java => NetworkAddressCacheGuavaService.java} | 42 +++++++----
.../storage/dao/cache/INetworkAddressCacheDAO.java | 5 +-
.../dao/register/INetworkAddressRegisterDAO.java | 2 +
.../storage/table/register/NetworkAddress.java | 12 +++-
.../table/register/NetworkAddressTable.java | 1 +
.../register/ServerType.java} | 19 ++---
.../storage/table/register/ServerTypeDefine.java | 82 ++++++++++++++++++++++
.../table/register/ServerTypeDefineTestCase.java} | 24 +++++--
.../es/dao/cache/NetworkAddressEsCacheDAO.java | 24 ++++++-
.../dao/register/NetworkAddressRegisterEsDAO.java | 10 +++
.../register/NetworkAddressEsTableDefine.java | 2 +
.../h2/dao/cache/NetworkAddressH2CacheDAO.java | 29 +++++++-
.../dao/register/NetworkAddressRegisterH2DAO.java | 19 +++++
.../register/NetworkAddressH2TableDefine.java | 2 +
23 files changed, 299 insertions(+), 66 deletions(-)
rename apm-collector/apm-collector-cache/collector-cache-guava-provider/src/main/java/org/apache/skywalking/apm/collector/cache/guava/service/{NetworAddressCacheGuavaService.java => NetworkAddressCacheGuavaService.java} (70%)
copy apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/{ui/service/ServiceInfo.java => table/register/ServerType.java} (78%)
create mode 100644 apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefine.java
copy apm-collector/apm-collector-storage/collector-storage-define/src/{main/java/org/apache/skywalking/apm/collector/storage/table/register/ServiceNameTable.java => test/java/org/apache/skywalking/apm/collector/storage/table/register/ServerTypeDefineTestCase.java} (56%)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.
[incubator-skywalking] 01/01: Merge pull request #806 from
peng-yongsheng/feature/servertype
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit ed82e49f491f06427e933591468863044aabb085
Merge: 6fc4579 eda2d81
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 11 17:49:09 2018 +0800
Merge pull request #806 from peng-yongsheng/feature/servertype
Update span layer and server type by address id.
.../define/service/INetworkAddressIDService.java | 4 +-
.../NetworkAddressRegisterSerialWorker.java | 44 ++++++------
.../provider/service/InstanceIDService.java | 4 +-
.../provider/service/NetworkAddressIDService.java | 22 ++++--
.../provider/buffer/SegmentBufferManager.java | 2 +-
.../standardization/ReferenceIdExchanger.java | 3 +-
.../parser/standardization/SpanIdExchanger.java | 7 +-
.../cache/service/NetworkAddressCacheService.java | 2 +
.../cache/guava/CacheModuleGuavaProvider.java | 4 +-
...e.java => NetworkAddressCacheGuavaService.java} | 42 +++++++----
.../storage/dao/cache/INetworkAddressCacheDAO.java | 5 +-
.../dao/register/INetworkAddressRegisterDAO.java | 2 +
.../storage/table/register/NetworkAddress.java | 12 +++-
.../table/register/NetworkAddressTable.java | 1 +
.../{NetworkAddressTable.java => ServerType.java} | 29 ++++++--
.../storage/table/register/ServerTypeDefine.java | 82 ++++++++++++++++++++++
.../table/register/ServerTypeDefineTestCase.java} | 23 ++++--
.../es/dao/cache/NetworkAddressEsCacheDAO.java | 24 ++++++-
.../dao/register/NetworkAddressRegisterEsDAO.java | 10 +++
.../register/NetworkAddressEsTableDefine.java | 2 +
.../h2/dao/cache/NetworkAddressH2CacheDAO.java | 29 +++++++-
.../dao/register/NetworkAddressRegisterH2DAO.java | 19 +++++
.../register/NetworkAddressH2TableDefine.java | 2 +
23 files changed, 310 insertions(+), 64 deletions(-)
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.