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/09/07 13:17:51 UTC
[incubator-skywalking] 01/01: Merge commit
'6e6aeb4a12c15aa643da38696001a11565b6b187' into alarm
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch alarm
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
commit 71b0ee87d3362bbb6184cafb14d11b49c2e1b924
Merge: 2e90b3c 6e6aeb4
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Sep 7 21:17:43 2018 +0800
Merge commit '6e6aeb4a12c15aa643da38696001a11565b6b187' into alarm
# Conflicts:
# oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
LICENSE | 41 +++-
NOTICE | 23 --
README.md | 2 +-
.../motan/define/MotanConsumerInstrumentation.java | 33 ++-
.../motan/define/MotanProviderInstrumentation.java | 33 +--
docs/en/guides/How-to-build.md | 3 +-
docs/powered-by.md | 2 +-
licenses/LICENSE-antd.txt | 22 ++
licenses/LICENSE-gogo-protobuf.txt | 35 +++
.../server/core/analysis/DispatcherManager.java | 4 +
.../ServiceCallsSumIndicator.java} | 68 ++----
.../generated/service/ServiceDispatcher.java | 12 +-
.../ServiceRelationAvgIndicator.java | 9 +-
...=> ServiceRelationClientCallsSumIndicator.java} | 41 ++--
.../servicerelation/ServiceRelationDispatcher.java | 29 +++
...=> ServiceRelationServerCallsSumIndicator.java} | 41 ++--
.../indicator/SumIndicator.java} | 32 ++-
.../service/ServiceComponentDispatcher.java} | 23 +-
.../manual/service/ServiceComponentIndicator.java | 122 ++++++++++
.../service/ServiceMappingDispatcher.java} | 23 +-
.../manual/service/ServiceMappingIndicator.java | 122 ++++++++++
.../skywalking/oap/server/core/source/Scope.java | 3 +-
.../source/{Scope.java => ServiceComponent.java} | 15 +-
.../source/{Scope.java => ServiceMapping.java} | 15 +-
.../config/ComponentLibraryCatalogFileTest.java} | 19 +-
.../src/test/resources/component-libraries.yml | 264 +++++++++++++++++++++
.../oap/query/graphql/resolver/AlarmQuery.java | 2 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 5 +
.../oap/query/graphql/resolver/MetricQuery.java | 9 +-
.../oap/query/graphql/type/AlarmMessage.java | 1 +
...larmMessage.java => BatchMetricConditions.java} | 12 +-
.../skywalking/oap/query/graphql/type/Span.java | 1 +
.../trace/provider/TraceModuleProvider.java | 3 +
.../trace/provider/parser/SegmentParse.java | 2 +-
.../service/ServiceComponentSpanListener.java | 77 ++++++
.../service/ServiceMappingSpanListener.java | 86 +++++++
.../SegmentStandardizationWorker.java | 20 +-
.../src/main/resources/component-libraries.yml | 264 +++++++++++++++++++++
38 files changed, 1292 insertions(+), 226 deletions(-)