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:50 UTC
[incubator-skywalking] branch alarm updated (2e90b3c -> 71b0ee8)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch alarm
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git.
from 2e90b3c Fix javadoc issue.
add cad40e8 Add LICENSE full text into source license and remove NOTICE (#1624)
add a0a4636 update build md (#1626)
add 1aa87fa 6.x.doc (#1627)
add 620536d fixed #1573. I had test on my env. (#1629)
add b4ebb5b Add miss setting file. (#1633)
add f0f4cde add the methods that are not in the graphql resolver and the classes … (#1634)
add 800a535 Add generate indicator and dispatcher about service topology but not test. (#1638)
add 8ed4920 Add Anxin Insurance to powered-by.md (#1640)
add 6e6aeb4 Update README.md (#1643)
new 71b0ee8 Merge commit '6e6aeb4a12c15aa643da38696001a11565b6b187' into alarm
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:
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 +-
.../LICENSE-antd.txt | 0
.../LICENSE-gogo-protobuf.txt | 5 +-
.../server/core/analysis/DispatcherManager.java | 4 +
...ndicator.java => ServiceCallsSumIndicator.java} | 41 ++--
.../generated/service/ServiceDispatcher.java | 12 +-
.../ServiceRelationAvgIndicator.java | 9 +-
...=> ServiceRelationClientCallsSumIndicator.java} | 41 ++--
.../servicerelation/ServiceRelationDispatcher.java | 29 +++
...=> ServiceRelationServerCallsSumIndicator.java} | 41 ++--
.../{DoubleAvgIndicator.java => SumIndicator.java} | 22 +-
.../service/ServiceComponentDispatcher.java} | 23 +-
.../service/ServiceComponentIndicator.java} | 82 +++----
.../service/ServiceMappingDispatcher.java} | 23 +-
.../service/ServiceMappingIndicator.java} | 82 +++----
.../skywalking/oap/server/core/source/Scope.java | 3 +-
...ceInstanceJVMCPU.java => ServiceComponent.java} | 12 +-
...viceInstanceJVMCPU.java => ServiceMapping.java} | 12 +-
.../config/ComponentLibraryCatalogFileTest.java} | 14 +-
.../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 +
.../{Alarms.java => BatchMetricConditions.java} | 9 +-
.../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, 1021 insertions(+), 314 deletions(-)
copy apm-dist/release-docs/licenses/ui-licenses/LICENSE-rc-drawer-menu => licenses/LICENSE-antd.txt (100%)
copy {apm-dist/release-docs/licenses => licenses}/LICENSE-gogo-protobuf.txt (98%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/{ServiceAvgIndicator.java => ServiceCallsSumIndicator.java} (71%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/{ServiceRelationAvgIndicator.java => ServiceRelationClientCallsSumIndicator.java} (74%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/{ServiceRelationAvgIndicator.java => ServiceRelationServerCallsSumIndicator.java} (74%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/{DoubleAvgIndicator.java => SumIndicator.java} (60%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/service/ServiceDispatcher.java => manual/service/ServiceComponentDispatcher.java} (63%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/service/ServiceAvgIndicator.java => manual/service/ServiceComponentIndicator.java} (50%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/service/ServiceDispatcher.java => manual/service/ServiceMappingDispatcher.java} (63%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/{generated/service/ServiceAvgIndicator.java => manual/service/ServiceMappingIndicator.java} (50%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceJVMCPU.java => ServiceComponent.java} (76%)
copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/{ServiceInstanceJVMCPU.java => ServiceMapping.java} (76%)
copy oap-server/server-core/src/{main/java/org/apache/skywalking/oap/server/core/config/InitialComponentCatalogException.java => test/java/org/apache/skywalking/oap/server/core/config/ComponentLibraryCatalogFileTest.java} (63%)
create mode 100644 oap-server/server-core/src/test/resources/component-libraries.yml
copy oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/{Alarms.java => BatchMetricConditions.java} (87%)
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceComponentSpanListener.java
create mode 100644 oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/service/ServiceMappingSpanListener.java
create mode 100644 oap-server/server-starter/src/main/resources/component-libraries.yml
[incubator-skywalking] 01/01: Merge commit
'6e6aeb4a12c15aa643da38696001a11565b6b187' into alarm
Posted by wu...@apache.org.
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(-)