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/10/27 14:43:37 UTC
[incubator-skywalking] branch h2-storage updated (7f58ddd ->
2a0502d)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch h2-storage
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 7f58ddd 1. Fix Thermodynamic query bug 2. Fix service inventory query bug 3. Fix missing traceid in trace query bug
add 072ee39 Fix issue that the oap package miss configure file (#1826)
add b11d479 Add service and instance reset function (#1790)
add 2a0502d Merge branch 'master' into h2-storage
No new revisions were added by this update.
Summary of changes:
.../apm/commons/datacarrier/DataCarrier.java | 6 +
.../apm/commons/datacarrier/buffer/Buffer.java | 6 +
.../skywalking/apm/agent/core/conf/Config.java | 18 ++-
.../agent/core/conf/SnifferConfigInitializer.java | 23 ++-
.../core/dictionary/NetworkAddressDictionary.java | 7 +-
.../core/dictionary/OperationNameDictionary.java | 11 ++
.../apm/agent/core/listener/ResetConfListener.java | 84 +++++++++++
.../apm/agent/core/listener/ResetStatus.java | 23 +--
.../apm/agent/core/listener/Reseter.java | 159 +++++++++++++++++++++
.../core/remote/AppAndServiceRegisterClient.java | 49 ++++---
.../core/remote/TraceSegmentServiceClient.java | 9 +-
...ache.skywalking.apm.agent.core.boot.BootService | 1 +
.../apm/agent/core/boot/ServiceManagerTest.java | 2 +-
apm-sniffer/config/agent.config | 9 ++
.../service/ServiceInstanceInventoryRegister.java | 2 +-
.../src/main/resources/query-protocol | 2 +-
.../register/provider/RegisterModuleProvider.java | 7 -
.../handler/v5/ServiceInstancePingPkgHandler.java | 60 ++++++++
.../main/{resources => assembly}/application.yml | 22 ++-
19 files changed, 433 insertions(+), 67 deletions(-)
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/ResetConfListener.java
copy oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java => apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/ResetStatus.java (75%)
create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/listener/Reseter.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-register-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/register/provider/handler/v5/ServiceInstancePingPkgHandler.java
copy oap-server/server-starter/src/main/{resources => assembly}/application.yml (79%)